lower helmet chuchu health, housekeeping

Sprites/Enemies/anti_kirby.asm

@@ -81,7 +81,7 @@ Sprite_AntiKirby_Main:
   JSL Sprite_CheckIfRecoiling
 
   LDA.w SprAction, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw AntiKirby_Main
   dw AntiKirby_Hurt

Sprites/Enemies/booki.asm

@@ -60,7 +60,7 @@ Sprite_Booki_Prep:
 Sprite_Booki_Main:
 {
   LDA.w SprAction, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw StalkPlayer
   dw HideFromPlayer
@@ -122,7 +122,7 @@ Sprite_Booki_Move:
   .no_damage
 
   LDA.w SprMiscB, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw SlowFloat
   dw FloatAway

Sprites/Enemies/business_scrub.asm

@@ -60,14 +60,10 @@ Sprite_BusinessScrub_Prep:
 {
   PHB : PHK : PLB
   LDA.w SprSubtype, X : CMP.b #$01 : BEQ .pea_shot
-                        CMP.b #$02 : BEQ .cutscene_scrub
   JMP +
   .pea_shot
     LDA.b #$06 : STA.w SprAction, X ; Pea Shot State
     LDA.b #$20 : STA.b SprPrize, X
-    JMP +
-  .cutscene_scrub
-    LDA.b #$08 : STA.w SprAction, X
   +
   PLB
   RTL
@@ -84,7 +80,7 @@ Sprite_BusinessScrub_Prep:
 Sprite_BusinessScrub_Main:
 {
   LDA.w SprAction, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw BusinessScrub_Hiding
   dw BusinessScrub_Attack
@@ -96,8 +92,6 @@ Sprite_BusinessScrub_Main:
   dw BusinessScrub_PeaShot
   dw BusinessScrub_HidingDefeated
 
-  dw BusinessScrub_CutsceneStart
-
   ; 0x00
   BusinessScrub_Hiding:
   {
@@ -239,12 +233,6 @@ Sprite_BusinessScrub_Main:
 
     RTS
   }
-
-  BusinessScrub_CutsceneStart:
-  {
-    ; TODO: Add deku dream cutscene
-    RTS
-  }
 }
 
 ; =========================================================

Sprites/Enemies/eon_scrub.asm

@@ -12,7 +12,7 @@
 Sprite_EonScrub_Main:
 {
   LDA.w SprAction, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw EonScrub_Stalking
   dw EonScrub_Attack

Sprites/Enemies/goriya.asm

@@ -60,7 +60,7 @@ Sprite_Goriya_Prep:
 Sprite_Goriya_Main:
 {
   LDA.w SprAction, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw Goriya_WalkingUp
   dw Goriya_WalkingDown
@@ -191,7 +191,7 @@ Sprite_Goriya_Move:
   +
 
   LDA.w SprMiscB, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw Goriya_MoveUp
   dw Goriya_MoveDown

Sprites/Enemies/helmet_chuchu.asm

@@ -66,7 +66,7 @@ Sprite_HelmetChuchu_Prep:
   RTL
 
   .health
-    db $08, $0C, $40, $C0
+    db $08, $0C, $0F, $10
 }
 
 ; =========================================================
@@ -222,7 +222,7 @@ Sprite_Chuchu_Move:
   JSL Sprite_CheckIfRecoiling
 
   LDA.w SprMiscB, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw BounceTowardPlayer
   dw RecoilFromPlayer

Sprites/Enemies/leever.asm

@@ -47,7 +47,7 @@ Sprite_Leever_Main:
 {
   JSL Sprite_DamageFlash_Long
   LDA.w SprAction, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw Leever_Underground
   dw Leever_Emerge

Sprites/Enemies/octorok.asm

@@ -74,7 +74,7 @@ Sprite_Octorok_Main:
   .not_water_tile
 
   LDA.w SprAction, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw Octorok_MoveDown
   dw Octorok_MoveUp
@@ -206,7 +206,7 @@ Sprite_WaterOctorok_Main:
   JSR Sprite_WaterOctorok_Attack
 
   LDA.w SprAction, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw WaterOctorok_FaceDown
   dw WaterOctorok_FaceUp
@@ -255,7 +255,7 @@ Sprite_WaterOctorok_Attack:
   JSL Sprite_CheckDamageToPlayer
 
   LDA.w SprMiscG, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw WaterOctorok_Hidden
   dw WaterOctorok_PoppingUp

Sprites/Enemies/poltergeist.asm

@@ -136,7 +136,7 @@ Sprite_Poltergeist_Prep:
 
 Sprite_Poltergeist_Main:
 {
-  LDA.w SprAction, X : JSL UseImplicitRegIndexedLocalJumpTable
+  LDA.w SprAction, X : JSL JumpTableLocal
 
   dw PictureFrame
   dw Chair

Sprites/Enemies/sea_urchin.asm

@@ -60,7 +60,7 @@ Sprite_SeaUrchin_Prep:
 Sprite_SeaUrchin_Main:
 {
   LDA.w SprAction, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw Idle
   dw Death

Sprites/Enemies/thunder_ghost.asm

@@ -146,7 +146,7 @@ Sprite_ThunderGhost_Move:
   .Continue
 
   LDA.w SprMiscB, X
-  JSL UseImplicitRegIndexedLocalJumpTable
+  JSL JumpTableLocal
 
   dw ThunderGhostMove