From 478d4fc7f3597dada8ce276e75e5c6787667a4f2 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 21 May 2022 14:55:42 -0500 Subject: [PATCH] Fix issue with mirror portals showing up on map checks when they shouldn't --- hooks.asm | 2 ++ owrando.asm | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/hooks.asm b/hooks.asm index 5472051..9f34e18 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2386,6 +2386,8 @@ MirrorBonk_BranchGamma: JML.l OWMirrorSpriteMove org $02FBAB JSL.l OWMirrorSpriteRestore : NOP +org $0ABFBF +JSL.l OWMirrorSpriteOnMap : BRA + : NOP #6 : + ;================================================================================ ;================================================================================ diff --git a/owrando.asm b/owrando.asm index 27cf3aa..2ada715 100644 --- a/owrando.asm +++ b/owrando.asm @@ -196,6 +196,16 @@ OWWhirlpoolUpdate: rtl } +OWMirrorSpriteOnMap: +{ + lda $1ac0,x : bit #$f0 : beq .continue + lda #$00 : rtl + .continue + ora $1ab0,x + ora $1ad0,x + ora $1ae0,x + rtl +} OWPreserveMirrorSprite: { lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .vanilla ; if OW Crossed, skip world check and continue