diff --git a/doorrando/drhooks.asm b/doorrando/drhooks.asm index e280ef5..8904c29 100644 --- a/doorrando/drhooks.asm +++ b/doorrando/drhooks.asm @@ -216,3 +216,10 @@ rts org $82C157 JSL AlwaysPushThroughFDoors + +; Modified from OWR - will need to remove once merged +org $85AF75 +Sprite_6C_MirrorPortal: +JSL FixOvalFadeOutMirror : NOP #2 ; LDA $7EF3CA : BNE $05AFDF +org $85AFDF +Sprite_6C_MirrorPortal_missing_mirror: diff --git a/doorrando/overrides.asm b/doorrando/overrides.asm index 234d614..75f9113 100644 --- a/doorrando/overrides.asm +++ b/doorrando/overrides.asm @@ -122,9 +122,15 @@ BlindZeldaDespawnFix: PLA : PLA : PEA.w SpritePrep_BlindMaiden_despawn_follower-1 : RTL + PLA : PLA : PEA.w SpritePrep_BlindMaiden_kill_the_girl-1 : RTL - BigKeyDoorCheck: CPY.w #$001E : BNE + ; skip if it isn't a BK door LDA.l DRFlags : AND #$0400 : BNE + ; skip if the flag is set - bk doors can be double-sided PLA : PEA.w RoomDraw_OneSidedShutters_South_onesided_shutter_or_big_key_door-1 + LDA.w #$0000 : RTL + +FixOvalFadeOutMirror: + LDA.b $10 : CMP.b #$0F : BEQ .skip_activation + LDA.l CurrentWorld : BNE .skip_activation + RTL + .skip_activation + PLA : PLA : PLA : JML Sprite_6C_MirrorPortal_missing_mirror \ No newline at end of file