scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add custom magic bubble gfx

Browse Source
This commit is contained in:
scawful
2024-07-07 17:49:52 -04:00
parent 9a348dd3cd
commit 5dfbd97a24
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Masks/mask_routines.asm
View File

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