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

Fixed issue with mirror portal deleting after mirror bonk in Crossed OW

Browse Source
This commit is contained in:
codemann8
2022-02-22 19:55:02 -06:00
parent e01e8569d7
commit cb48137fa7
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hooks.asm
View File

@@ -2383,6 +2383,8 @@ MirrorBonk_NormalReturn:
org $07A9D1 ; <- 3A9D1 - Bank07.asm:6649 (BRANCH_GAMMA:) org $07A9D1 ; <- 3A9D1 - Bank07.asm:6649 (BRANCH_GAMMA:)
MirrorBonk_BranchGamma: MirrorBonk_BranchGamma:
JML.l OWMirrorSpriteMove JML.l OWMirrorSpriteMove
org $02FBAB
JSL.l OWMirrorSpriteRestore : NOP
;================================================================================ ;================================================================================
;================================================================================ ;================================================================================

7
owrando.asm
View File

@@ -164,6 +164,13 @@ OWMirrorSpriteMove:
lda $1acf : eor #$80 : sta $1acf lda $1acf : eor #$80 : sta $1acf
+ lda #$2c : jml.l $07A985 ; what we wrote over + lda #$2c : jml.l $07A985 ; what we wrote over
} }
OWMirrorSpriteRestore:
{
lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq +
lda $1acf : and #$0f : sta $1acf
+ rep #$30 : lda.w $04AC ; what we wrote over
rtl
}
OWFluteCancel: OWFluteCancel:
{ {