Update boss sprites and macros

Core/sprite_macros.asm

@@ -41,34 +41,23 @@ macro Set_Sprite_Properties(SprPrep, SprMain)
 }
 endmacro
 
-macro loop(body, ...)
-  !x #= 0
-  while !x < sizeof(...)
-    !x #= !x+1
-  endwhile
-endmacro
-
 macro sta(...)
   %loop(STA, ...)
 endmacro
 
-macro sta_x(...)
+macro m16()
-  %loop(STA.w, ..., X)
-endmacro
-
-macro mode16()
   REP #$30
 endmacro
 
-macro mode8()
+macro m8()
   SEP #$30
 endmacro
 
-macro accum16()
+macro a16()
   REP #$20
 endmacro
 
-macro accum8()
+macro a8()
   SEP #$20
 endmacro
 

Core/symbols.asm

@@ -689,8 +689,6 @@ SpriteRanCheck = $8E
 ;    0x00 indicates no sprite in this slot
 UWDEATH         = $7FDF80
 
-; =========================================================
-
 RebuildHUD_long = $0DFA58
 
 ; =========================================================

Sprites/Bosses/kydreeok.asm

@@ -247,7 +247,7 @@ Sprite_Kydreeok_Main:
     SEP #$20
     JSR StopIfOutOfBounds
 
-    ;if both velocities are 0 go back to the Stalk_Player_XORY to re-set the course
+    ; if both velocities are 0 go back to the Stalk_Player_XORY to re-set the course
     LDA.w SprYSpeed, X : BNE .notZero
       LDA.w SprXSpeed, X : BNE .notZero
         %GotoAction(3) ; Kydreeok_MoveXorY
@@ -258,7 +258,7 @@ Sprite_Kydreeok_Main:
     JSL Sprite_CheckDamageFromPlayer
     JSL Sprite_CheckDamageToPlayer
 
-    PLX ;restores X
+    PLX
 
     RTS
   }

Sprites/Bosses/octoboss.asm

@@ -211,7 +211,7 @@ Sprite_Octoboss_Secondary:
       ; and use the macro GetTilePos($x,$y)
 
       PHX
-      %mode16()
+      %m16()
 
       %GetTilePos($0F, $07)
       LDA.w #$068F : JSL Overworld_DrawMap16_Persist
@@ -231,7 +231,7 @@ Sprite_Octoboss_Secondary:
       %GetTilePos($11, $08)
       LDA.w #$06A4 : JSL Overworld_DrawMap16_Persist
 
-      %mode8()
+      %m8()
       PLX
       LDA.b #$01 : STA.b $14
     +
@@ -432,27 +432,22 @@ Sprite_Octoboss_Secondary:
 
     LDA.w SprTimerC, X : CMP.b #$40 : BNE +
       PHX
-      %mode16()
+      %m16()
 
       %GetTilePos($0F, $07)
       LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
-
       %GetTilePos($10, $07)
       LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
-
       %GetTilePos($11, $07)
       LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
-
       %GetTilePos($0F, $08)
       LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
-
       %GetTilePos($10, $08)
       LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
-
       %GetTilePos($11, $08)
       LDA.w #$0034 : JSL Overworld_DrawMap16_Persist
 
-      %mode8()
+      %m8()
       PLX
       LDA.b #$01 : STA.b $14
     +