alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Re-implemented mirror scroll during escape behavior to not affect entrance and include the throne spawn point

Browse Source
This commit is contained in:
aerinon
2022-06-16 12:32:31 -06:00
parent 2579038832
commit 92c155f5c0
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks.asm
View File

@@ -2439,8 +2439,8 @@ NOP #6 ; remove check
org $068841 ; <- 30841 - sprite_prep.asm:269 (LDA $0D00, X : ADD.b #$03 : STA $0D00, X) org $068841 ; <- 30841 - sprite_prep.asm:269 (LDA $0D00, X : ADD.b #$03 : STA $0D00, X)
JSL.l Mantle_CorrectPosition : NOP #2 JSL.l Mantle_CorrectPosition : NOP #2
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $02D6FC ; <- bank02 : Underworld_LoadEntrance.not_a_respawn (LDA.w $010E : AND.w #$00FF) org $0297FD ; <- bank02 : Module07_19_MirrorFade (STZ.b $11 : STZ.b $14)
JSL MirrorScrollSpawnZelda : NOP #2 JSL MirrorScrollSpawnZelda
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $0DFA53 ; <- 6FA53 - hud check for lantern org $0DFA53 ; <- 6FA53 - hud check for lantern
JSL.l LampCheck JSL.l LampCheck

15
mantle.asm
View File

@@ -12,16 +12,11 @@ Mantle_CorrectPosition:
LDA $0D00, X : !ADD.b #$03 ; thing we did originally LDA $0D00, X : !ADD.b #$03 ; thing we did originally
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
MirrorScrollSpawnZelda: MirrorScrollSpawnZelda:
SEP #$20 LDA.l MirrorEquipment : CMP.b #$01 : BNE + ;mirror scroll
LDA.l StartingEntrance : CMP.b #$02 : BNE + LDA.l StartingEntrance : CMP.b #$02 : BEQ ++ ; zelda's cell
LDA.l MirrorEquipment : CMP.b #$01 : BNE + CMP.b #$04 : BNE +
REP #$20 ++ INC $04AA
PLA ; remove JSL 16 bits
PEA.w Underworld_LoadSpawnEntrance-1
RTL
+ REP #$20
; what we replaced ; what we replaced
LDA.w $010E : AND.w #$00FF + STZ.b $11 : STZ.b $14
RTL RTL