add puffstool ai states, optimize draw code

Sprites/Enemies/puffstool.asm

@@ -27,11 +27,13 @@
 !ImperviousArrow    = 00  ; 01 = Impervious to arrows
 !ImpervSwordHammer  = 00  ; 01 = Impervious to sword and hammer attacks
 !Boss               = 00  ; 00 = normal sprite, 01 = sprite is a boss
+
 %Set_Sprite_Properties(Sprite_Puffstool_Prep, Sprite_Puffstool_Long)
 
 ; =========================================================
 
 Sprite_Puffstool_Long:
+{
   PHB : PHK : PLB
 
   JSR Sprite_Puffstool_Draw ; Call the draw code
@@ -43,35 +45,48 @@ JSR Sprite_Puffstool_Main ; Call the main sprite code
   .SpriteIsNotActive
   PLB ; Get back the databank we stored previously
   RTL ; Go back to original code
+}
 
 ; =========================================================
 
 Sprite_Puffstool_Prep:
+{
   PHB : PHK : PLB
     
-    ; Add more code here to initialize data
+
 
   PLB
   RTL
+}
 
 ; =========================================================
 
 Sprite_Puffstool_Main:
-LDA.w SprAction, X; Load the SprAction
-JSL UseImplicitRegIndexedLocalJumpTable; Goto the SprAction we are currently in
-dw Action00
-
-
-Action00:
-
+{
+  LDA.w SprAction, X
+  JSL UseImplicitRegIndexedLocalJumpTable
+  dw Puffstool_Walking
+  dw Puffstool_Stunned
 
 
+  Puffstool_Walking:
+  {
+    %PlayAnimation(0,6,10)
     RTS
+  }
+
+  Puffstool_Stunned:
+  {
+    %PlayAnimation(7,7,10)
+    RTS
+  }
+}
 
 
 ; =========================================================
 
 Sprite_Puffstool_Draw:
+{
   JSL Sprite_PrepOamCoord
   JSL Sprite_OAM_AllocateDeferToPlayer
 
@@ -94,7 +109,7 @@ ASL A : TAX
 
   REP #$20
 
-LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y
+  LDA $00 : STA ($90), Y
   AND.w #$0100 : STA $0E 
   INY
   LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y
@@ -116,7 +131,7 @@ PHY
       
   TYA : LSR #2 : TAY
       
-LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
+  LDA.b #$02 : ORA $0F : STA ($92), Y ; store size in oam buffer
       
   PLY : INY
       
@@ -132,15 +147,6 @@ RTS
   db $00, $02, $04, $06, $08, $0A, $0C, $0E
   .nbr_of_tiles
   db 1, 1, 1, 1, 1, 1, 1, 0
-.x_offsets
-dw 0, 0
-dw 0, 0
-dw 0, 0
-dw 0, 0
-dw 0, 0
-dw 0, 0
-dw 0, 0
-dw 0
   .y_offsets
   dw -8, 0
   dw 0, -8
@@ -168,12 +174,4 @@ db $33, $33
   db $73, $73
   db $73, $73
   db $3D
-.sizes
-db $02, $02
-db $02, $02
-db $02, $02
-db $02, $02
-db $02, $02
-db $02, $02
-db $02, $02
-db $02
+}