diff --git a/hooks.asm b/hooks.asm index 029e9e0..a354271 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2439,8 +2439,8 @@ NOP #6 ; remove check org $068841 ; <- 30841 - sprite_prep.asm:269 (LDA $0D00, X : ADD.b #$03 : STA $0D00, X) JSL.l Mantle_CorrectPosition : NOP #2 ;-------------------------------------------------------------------------------- -org $02D6FC ; <- bank02 : Underworld_LoadEntrance.not_a_respawn (LDA.w $010E : AND.w #$00FF) -JSL MirrorScrollSpawnZelda : NOP #2 +org $0297FD ; <- bank02 : Module07_19_MirrorFade (STZ.b $11 : STZ.b $14) +JSL MirrorScrollSpawnZelda ;-------------------------------------------------------------------------------- org $0DFA53 ; <- 6FA53 - hud check for lantern JSL.l LampCheck diff --git a/mantle.asm b/mantle.asm index f5f0f98..4496898 100644 --- a/mantle.asm +++ b/mantle.asm @@ -12,16 +12,11 @@ Mantle_CorrectPosition: LDA $0D00, X : !ADD.b #$03 ; thing we did originally RTL ;-------------------------------------------------------------------------------- - MirrorScrollSpawnZelda: - SEP #$20 - LDA.l StartingEntrance : CMP.b #$02 : BNE + - LDA.l MirrorEquipment : CMP.b #$01 : BNE + - REP #$20 - PLA ; remove JSL 16 bits - PEA.w Underworld_LoadSpawnEntrance-1 - RTL - + REP #$20 + LDA.l MirrorEquipment : CMP.b #$01 : BNE + ;mirror scroll + LDA.l StartingEntrance : CMP.b #$02 : BEQ ++ ; zelda's cell + CMP.b #$04 : BNE + + ++ INC $04AA ; what we replaced - LDA.w $010E : AND.w #$00FF + + STZ.b $11 : STZ.b $14 RTL \ No newline at end of file