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

Moved some mirror code out to new function

Browse Source
This commit is contained in:
codemann8
2022-05-21 20:51:54 -05:00
parent 9b48477418
commit 9b846498a2
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks.asm
View File

@@ -2379,15 +2379,15 @@ JSL.l FreeDuckCheck : BEQ +
+ +
;================================================================================ ;================================================================================
org $07A9AC ; <- 3A9AC - Bank07.asm:6628 (LDA $0C : ORA $0E : STA $00 : AND.b #$0C : BEQ BRANCH_BETA) org $07A9AC ; <- 3A9AC - Bank07.asm:6628 (LDA $0C : ORA $0E : STA $00 : AND.b #$0C : BEQ BRANCH_BETA)
JML.l MirrorBonk JML MirrorBonk
MirrorBonk_NormalReturn: 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
org $02FBAB org $02FBAB
JSL.l OWMirrorSpriteRestore : NOP JSL.l OWMirrorSpriteRestore : NOP
org $0ABFBF org $0ABFBF
JSL.l OWMirrorSpriteOnMap : BRA + : NOP #6 : + JSL.l OWMirrorSpriteOnMap : BRA + : NOP #6 : +
JML OWMirrorSpriteBonk
;================================================================================ ;================================================================================
;================================================================================ ;================================================================================

5
owrando.asm
View File

@@ -226,6 +226,11 @@ OWMirrorSpriteMove:
{ {
lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq + lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq +
lda.w $1acf : ora.b #$40 : sta.w $1acf lda.w $1acf : ora.b #$40 : sta.w $1acf
+ rts
}
OWMirrorSpriteBonk:
{
jsr.w OWMirrorSpriteMove
lda.b #$2c : jml SetGameModeLikeMirror ; what we wrote over lda.b #$2c : jml SetGameModeLikeMirror ; what we wrote over
} }
OWMirrorSpriteRestore: OWMirrorSpriteRestore: