Merge branch 'sram_rework' into dr_sram

2022-04-20 00:30:35 -04:00
parent 281beeeb58 5d943d9a6d
commit 9c41ffb55b
78 changed files with 2624 additions and 1640 deletions
--- a/keydropshuffle.asm
+++ b/keydropshuffle.asm
@@ -26,7 +26,7 @@ Sprite_LoadProperties:
 org $288000 ;140000
 ShuffleKeyDrops:
 db 0
-MultiClientFlags: ; 140001 -> stored in SRAM at 7ef33d
+MultiClientFlagsROM: ; 140001 -> stored in SRAM at 7ef33d
 db 0

 LootTable: ;PC: 140002
@@ -113,7 +113,7 @@ SpriteKeyDrawGFX:

 KeyGet:
 {
-    lda $7ef36f ; what we wrote over
+    lda CurrentSmallKeys ; what we wrote over
    pha
        lda.l ShuffleKeyDrops : bne +
            - pla : rtl