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/spiral.asm
+++ b/spiral.asm
@@ -182,7 +182,7 @@ InroomStairsWarp: {
        sta $02
        stz $07
        lda $01 : and #$10 : lsr #4
-        brl .layer
+        JMP .layer
    .notEdge
    lda $01 : and #$03 : cmp #$03 : bne .normal
        txa : and #$06 : sta $07