Merge remote-tracking branch 'codemann/OWMain' into overworld_kara

This commit is contained in:
2022-01-01 15:30:19 -08:00
3 changed files with 37 additions and 1 deletions

View File

@@ -2322,6 +2322,9 @@ FakeFlipperProtection:
JSL protectff
RTS
;--------------------------------------------------------------------------------
org $02B46C ; <- bank_02.asm:9722 (STZ.b $00 : STZ.b $02)
JSL FlipperScrollWarp
;--------------------------------------------------------------------------------
;org $078F27 ; <- 38F27
;JSL.l FlipperReset
;--------------------------------------------------------------------------------
@@ -2368,6 +2371,7 @@ JML.l MirrorBonk
MirrorBonk_NormalReturn:
org $07A9D1 ; <- 3A9D1 - Bank07.asm:6649 (BRANCH_GAMMA:)
MirrorBonk_BranchGamma:
JML.l OWMirrorSpriteMove
;================================================================================
;================================================================================