Merge branch 'master' into DRMain

# Conflicts: # LTTP_RND_GeneralBugfixes.asm # catfish.asm # compasses.asm # darkworldspawn.asm # hooks.asm # inventory.asm # newitems.asm # shopkeeper.asm # stats.asm # tables.asm Adn some updates from DR
2021-05-13 12:11:40 -06:00
parent d015310e4d b76efe6df4
commit 842bb043e6
61 changed files with 2294 additions and 859 deletions
--- a/keydropshuffle.asm
+++ b/keydropshuffle.asm
@@ -173,7 +173,7 @@ KeyGetPlayer:
 LoadProperties_PreserveItemMaybe:
 {
    lda.l ShuffleKeyDrops : bne +
-        jsl Sprite_LoadProperties : rtl
+        JML Sprite_LoadProperties
    + lda $0e80, x : pha
    jsl Sprite_LoadProperties
    pla : sta $0e80, x