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/normal.asm
+++ b/normal.asm
@@ -399,8 +399,7 @@ StraightStairsTrapDoor:
            lda #$05 : sta $11
            inc $0468 : stz $068e : stz $0690
        ++ rtl
-    + jsl Dungeon_ApproachFixedColor ; what we wrote over
-    rtl
+    + JML Dungeon_ApproachFixedColor ; what we wrote over
 }

 InroomStairsTrapDoor: