alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with mirror portals showing up on map checks when they shouldn't

Browse Source
This commit is contained in:
codemann8
2022-05-21 14:55:42 -05:00
parent 57bc6a1f59
commit 478d4fc7f3
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hooks.asm
View File

@@ -2386,6 +2386,8 @@ MirrorBonk_BranchGamma:
JML.l OWMirrorSpriteMove JML.l OWMirrorSpriteMove
org $02FBAB org $02FBAB
JSL.l OWMirrorSpriteRestore : NOP JSL.l OWMirrorSpriteRestore : NOP
org $0ABFBF
JSL.l OWMirrorSpriteOnMap : BRA + : NOP #6 : +
;================================================================================ ;================================================================================
;================================================================================ ;================================================================================

10
owrando.asm
View File

@@ -196,6 +196,16 @@ OWWhirlpoolUpdate:
rtl rtl
} }
OWMirrorSpriteOnMap:
{
lda $1ac0,x : bit #$f0 : beq .continue
lda #$00 : rtl
.continue
ora $1ab0,x
ora $1ad0,x
ora $1ae0,x
rtl
}
OWPreserveMirrorSprite: OWPreserveMirrorSprite:
{ {
lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .vanilla ; if OW Crossed, skip world check and continue lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .vanilla ; if OW Crossed, skip world check and continue