From f0f27a0a1e3465f889e0a0a0dc03d40540cc20d0 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 10 Aug 2024 13:59:17 -0400 Subject: [PATCH] fix maple shopkeeping bug --- Sprites/NPCs/mermaid.asm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Sprites/NPCs/mermaid.asm b/Sprites/NPCs/mermaid.asm index 66bc594..cb9dfeb 100644 --- a/Sprites/NPCs/mermaid.asm +++ b/Sprites/NPCs/mermaid.asm @@ -116,10 +116,8 @@ Sprite_Mermaid_Main: LDA.w SprX, X : INC : STA.w SprX, X LDA.w SprTimerA, X : BNE + INC.w SprAction, X - LDA.b #$04 : STA.w SprTimerA, X + - RTS } @@ -134,16 +132,11 @@ Sprite_Mermaid_Main: ++ LDA.w SprTimerA, X : BEQ + - - LDA.b #-10 : STA.w SprYSpeed, X STZ.w SprXSpeed, X LDA.b #$01 : STA.w SprMiscD, X LDA.b #$04 : STA.w SprTimerA, X + - - - RTS } @@ -213,6 +206,7 @@ Sprite_Mermaid_Main: Maple_NotEnoughRupees: { %ShowUnconditionalMessage($0189) ; You don't have enough rupees! + %GotoAction(3) RTS }