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

Mirror Portal + Entrance Fix

Browse Source
This commit is contained in:
aerinon
2023-03-01 15:41:54 -07:00
parent b9c8984d6d
commit 13879317fe
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doorrando/drhooks.asm
View File

@@ -216,3 +216,10 @@ rts
org $82C157 org $82C157
JSL AlwaysPushThroughFDoors 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:

8
doorrando/overrides.asm
View File

@@ -122,9 +122,15 @@ BlindZeldaDespawnFix:
PLA : PLA : PEA.w SpritePrep_BlindMaiden_despawn_follower-1 : RTL PLA : PLA : PEA.w SpritePrep_BlindMaiden_despawn_follower-1 : RTL
+ PLA : PLA : PEA.w SpritePrep_BlindMaiden_kill_the_girl-1 : RTL + PLA : PLA : PEA.w SpritePrep_BlindMaiden_kill_the_girl-1 : RTL
BigKeyDoorCheck: BigKeyDoorCheck:
CPY.w #$001E : BNE + ; skip if it isn't a BK door 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 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 PLA : PEA.w RoomDraw_OneSidedShutters_South_onesided_shutter_or_big_key_door-1
+ LDA.w #$0000 : RTL + 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