More RAM labels

Fixed tablets checking for item collected, uses NpcFlags+1 Deleted mantle.asm, moved to lampmantlecone.asm
2022-11-24 18:34:35 -05:00
parent da8576546d
commit 7426ce5945
52 changed files with 1048 additions and 778 deletions
--- a/darkroomitems.asm
+++ b/darkroomitems.asm
@@ -1,6 +1,6 @@
 CheckReceivedItemPropertiesBeforeLoad:
    LDA.b RoomIndex : BEQ .normalCode
-    LDA.l $7EC005 : BNE .lightOff
+    LDA.l RoomFade : BNE .lightOff
    .normalCode
    LDA.l AddReceivedItemExpanded_properties, X ;Restore Rando Code
    RTL
@@ -22,6 +22,6 @@ CheckReceivedItemPropertiesBeforeLoad:

    SEP #$30
    PLB : PLY : PLX
-    INC.b $15
+    INC.b NMICGRAM
    LDA.b #$00
    RTL