Merge branch 'DRUnstable' into DRVolatile

# Conflicts:
#	hooks.asm
#	music.asm
#	newhud.asm
This commit is contained in:
aerinon
2023-09-20 13:34:52 -06:00
2 changed files with 18 additions and 1 deletions

View File

@@ -2660,6 +2660,10 @@ org $82E297 ; LDA.w #$0002 : STA.b $2F
JSL WalkUpOnOverworld
NOP
org $82E36F
JSL CheckStairsAdjustment
NOP
org $82D7D2 ; BEQ .face_up
NOP #2 ; this fixes Link's direction after mirroring and falling after entering through back of tavern