alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'DRUnstable' into DRVolatile

Browse Source 
# Conflicts:
#	hooks.asm
#	music.asm
#	newhud.asm
This commit is contained in:
aerinon
2023-09-20 13:34:52 -06:00
parent a8a1eaa1b9 1290751307
commit 4eaa214626
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
doorframefixes.asm
View File

@@ -74,4 +74,17 @@ WalkUpOnOverworld:
RTL
.normal
LDA #$0002 : STA $2F ; what we overwrote
RTL
RTL
;--------------------------------------------------------------------------------
; CheckStairsAdjustment
;--------------------------------------------------------------------------------
CheckStairsAdjustment:
LDA.b $A0
CMP.w #$0124 ; vanilla check, rooms $0124 to $0127 have a lower exit position (currently ER ignores the entrance location)
BCC .done
LDA.w #$FFFF-1
CMP.w $0696 ; tavern back ($0696 == #$FFFF) should always have carry cleared
.done
RTL
; if carry cleared, shift position up