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

cleanup mermaid/maple

Browse Source
This commit is contained in:
scawful
2024-06-17 19:09:42 -04:00
parent cf122b85a4
commit 437531c1a0
1 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Sprites/NPCs/mermaid.asm
View File

@@ -33,6 +33,7 @@
Sprite_Mermaid_Long: Sprite_Mermaid_Long:
{
PHB : PHK : PLB PHB : PHK : PLB
LDA.w SprMiscE, X : BEQ .MermaidDraw LDA.w SprMiscE, X : BEQ .MermaidDraw
@@ -49,6 +50,7 @@ JSR Sprite_Mermaid_Main ; Call the main sprite code
.SpriteIsNotActive .SpriteIsNotActive
PLB ; Get back the databank we stored previously PLB ; Get back the databank we stored previously
RTL ; Go back to original code RTL ; Go back to original code
}
Sprite_Mermaid_Prep: Sprite_Mermaid_Prep:
@@ -67,17 +69,18 @@ Sprite_Mermaid_Prep:
Sprite_Mermaid_Main: Sprite_Mermaid_Main:
LDA.w SprAction, X; Load the SprAction {
JSL UseImplicitRegIndexedLocalJumpTable; Goto the SprAction we are currently in LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable
dw MermaidWait dw MermaidWait
dw MermaidDive dw MermaidDive
dw MermaidSwim dw MermaidSwim
dw MapleIdle dw MapleIdle
MermaidWait: MermaidWait:
{ {
%PlayAnimation(0,0, 20) %PlayAnimation(0,0, 20)
JSL Sprite_PlayerCantPassThrough
LDA.w SprTimerA, X : BNE + LDA.w SprTimerA, X : BNE +
LDA.b #$20 : STA.w SprTimerA, X LDA.b #$20 : STA.w SprTimerA, X
@@ -101,7 +104,6 @@ RTS
MermaidSwim: MermaidSwim:
{ {
%PlayAnimation(3,3, 20) %PlayAnimation(3,3, 20)
JSL Sprite_Move JSL Sprite_Move
@@ -110,7 +112,6 @@ LDA.w SprTimerA, X : BEQ +
+ +
RTS RTS
} }
MapleIdle: MapleIdle:
@@ -119,6 +120,7 @@ MapleIdle:
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
RTS RTS
} }
}
Sprite_Mermaid_Draw: Sprite_Mermaid_Draw:
{ {