From 5dfbd97a2462a052318f20178038c8e246bf0979 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 7 Jul 2024 17:49:52 -0400
Subject: [PATCH] add custom magic bubble gfx

---
 Masks/mask_routines.asm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Masks/mask_routines.asm b/Masks/mask_routines.asm
index b3ca436..61d6c89 100644
--- a/Masks/mask_routines.asm
+++ b/Masks/mask_routines.asm
@@ -537,10 +537,7 @@ DekuLink_ShootBubbleOrStartHover:
   ; Otherwise, shoot the magic bubble 
   LDA.b #$0E
   JSL AncillaAdd_MagicBubbleShot
-
-  ; TODO: Update the draw code to use dynamic magic bubble
-  ; JSL MagicBubbleSwapDynamicGfx
-  ; INC.w $02C3 ; block anim step
+  JSL MagicBubbleSwapDynamicGfx
   RTL
 }
 
@@ -1144,6 +1141,7 @@ MagicBubbleShot_Dissipate:
         ; JSL FireRodShot_BecomeSkullWoodsFire
         ; PLX
   .no_burn
+  JSL RestoreCaneBlockHammerGfx
   RTS
 }
 
@@ -1162,6 +1160,11 @@ MagicBubbleShot_Halted:
   JSR Ancilla_CheckBasicSpriteCollision
   JSR Ancilla_BoundsCheck
 
+  INC.w $02C3 ; block anim step
+  LDA.w $02C3 : CMP.b #$02 : BNE +
+    STZ.w $02C3
+  +
+
   LDY.b #$00
   LDA.w AnciTimerA, X
   BEQ MagicBubbleShot_Dissipate
@@ -1225,7 +1228,8 @@ MagicBubbleShot_Halted:
   RTS
 
   .char
-  db $A2, $A0, $8E
+  ; db $A2, $A0, $8E
+  db $0C, $0C, $0C
 }
 
 MagicBubbleGfx: