From 495a8c93f79a16b77108b482ad96e8f845557f9f Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 24 Mar 2024 17:42:34 -0500 Subject: [PATCH] Removed unused superbunny mirror bonk freeze code --- doorrando/drhooks.asm | 7 ------- doorrando/overrides.asm | 10 ---------- 2 files changed, 17 deletions(-) diff --git a/doorrando/drhooks.asm b/doorrando/drhooks.asm index 5466607..a6c0bc1 100644 --- a/doorrando/drhooks.asm +++ b/doorrando/drhooks.asm @@ -216,13 +216,6 @@ 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 $85AFDF -; org $85AFDF -; Sprite_6C_MirrorPortal_missing_mirror: - org $80E766 JML ConditionalLoadCommonSprites_Do3To4Low : NOP #2 LoadCommonSprites_Prep3To4Low: diff --git a/doorrando/overrides.asm b/doorrando/overrides.asm index be394e8..07d999a 100644 --- a/doorrando/overrides.asm +++ b/doorrando/overrides.asm @@ -131,13 +131,3 @@ BigKeyDoorCheck: LDA.l DRFlags : AND.w #$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 GameMode : CMP.b #$0F : BEQ .skip_activation -; LDA.l InvertedMode : BNE + -; LDA.l CurrentWorld : BNE .skip_activation -; RTL -; + LDA.l CurrentWorld : BEQ .skip_activation -; RTL -; .skip_activation -; PLA : PLA : PLA : JML Sprite_6C_MirrorPortal_missing_mirror