Cleanup KydrogBoss

Sprites/Bosses/kydrog_boss.asm

@@ -1,13 +1,5 @@
 ; =========================================================
 ;  Kydrog Boss
-
-; =========================================================
-;  RAM Addresses
-
-!ConsecutiveHits = $AC             ;0x01
-!KydrogPhase     = $7A             ;0x01
-!WalkSpeed       = 10              ;0x01
-
 ; =========================================================
 
 !SPRID              = Sprite_KydrogBoss
@@ -40,24 +32,21 @@
 
 %Set_Sprite_Properties(Sprite_KydrogBoss_Prep, Sprite_KydrogBoss_Long)
 
-; =========================================================
+!ConsecutiveHits    = $AC ; 0x01
+!KydrogPhase        = $7A ; 0x01
+!WalkSpeed          = 10  ; 0x01
 
 Sprite_KydrogBoss_Long:
 {
   PHB : PHK : PLB
-
   JSR Sprite_KydrogBoss_Draw ; Call the draw code
   JSR Sprite_CheckIfFrozen
-  JSL Sprite_CheckActive   ; Check if game is not paused
+  JSL Sprite_CheckActive : BCC .SpriteIsNotActive
-  BCC .SpriteIsNotActive   ; Skip Main code is sprite is innactive
+    JSR Sprite_KydrogBoss_CheckIfDead
-
+    JSR Sprite_KydrogBoss_Main
-  JSR Sprite_KydrogBoss_CheckIfDead ; Check if sprite is dead
-  JSR Sprite_KydrogBoss_Main ; Call the main sprite code
-
   .SpriteIsNotActive
-  
+  PLB
-  PLB ; Get back the databank we stored previously
+  RTL
-  RTL ; Go back to original code
 }
 
 ; =========================================================
@@ -87,7 +76,6 @@ Sprite_KydrogBoss_CheckIfDead:
 Sprite_KydrogBoss_Prep:
 {
   PHB : PHK : PLB
-    
   LDA #$00 : STA !KydrogPhase
 
   LDA.b #$A0 : STA $0E50, X ; health
@@ -172,11 +160,9 @@ Sprite_KydrogBoss_Main:
   {
     %StartOnFrame(15)
     %PlayAnimation(15, 16, 8) ; Arms Crossed Animation
-
     ; JSR SetupMovieEffect
     ; JSR MovieEffect
     ; LDX.b #$00
-    
     LDA.w SprTimerD, X : BNE +
       %GotoAction(1) ; Goto KydrogBoss_WalkState
     +
@@ -209,15 +195,12 @@ Sprite_KydrogBoss_Main:
     LDA #$50 : STA $09, X
     JSL Sprite_DirectionToFacePlayer
     TYA : CMP.b #$02 : BCC .WalkRight
-    
     .WalkForward
       %StopIfTooClose()
       JSL Sprite_IsBelowPlayer ; Check if sprite is below player
       TYA : BNE .WalkBackwards ; If 1, go to KydrogBoss_WalkBackwards
-      
       %GotoAction(2) ; Goto KydrogBoss_WalkForward
       RTS
-
     .WalkBackwards
       %GotoAction(5) ; Goto KydrogBoss_WalkBackwards
       RTS
@@ -227,7 +210,6 @@ Sprite_KydrogBoss_Main:
       JSL Sprite_IsToRightOfPlayer : TYA : BNE .WalkLeft
       %GotoAction(4)
       RTS
-    
     .WalkLeft
       %GotoAction(3) ; Goto KydrogBoss_WalkLeft
       RTS
@@ -336,12 +318,9 @@ Sprite_KydrogBoss_Main:
     PLX
 
     JSL Sprite_DamageFlash_Long
-    
     %RandomStalfosOffspring()
-    
     LDA.w SprTimerD, X : BNE +
       %GotoAction(1)
-
     +
 
     JSL GetRandomInt : AND.b #$1F : BNE ++
@@ -359,7 +338,6 @@ Sprite_KydrogBoss_Main:
   {
     %StartOnFrame(15)
     %PlayAnimation(15, 16, 8) ; Arms Crossed Animation
-    
     PHX
     JSL Sprite_CheckDamageFromPlayer
     %DoDamageToPlayerSameLayerOnContact()
@@ -379,7 +357,6 @@ Sprite_KydrogBoss_Main:
   {
     %StartOnFrame(17)
     %PlayAnimation(17, 17, 10)
-    
     PHX
     JSL Sprite_CheckDamageFromPlayer
     %DoDamageToPlayerSameLayerOnContact()
@@ -391,7 +368,6 @@ Sprite_KydrogBoss_Main:
 
     LDA.w SprTimerD, X : BNE +
       JSR Kydrog_ThrowBoneAtPlayer
-
       %GotoAction(1)
     +
     RTS
@@ -453,7 +429,6 @@ Sprite_KydrogBoss_Main:
     .not_off_screen
 
     .wait_a_second
-
     RTS
   }
 
@@ -477,9 +452,7 @@ Sprite_KydrogBoss_Main:
     .not_done
     JSL Sprite_Move
     RTS
-
   }
-
 }
 
 ; =========================================================
@@ -520,7 +493,6 @@ CheckForNextPhase:
     STA !KydrogPhase
   .return
   RTS
-  
 }
 
 ; =========================================================
@@ -559,13 +531,10 @@ KydrogBoss_Set_Damage:
   LDX.b #$00
 
   .loop
-
   LDA .damageProperties, X : STA $7F6CB0, X
-
   INX : CPX.b #$10 : BNE .loop
 
   PLX
-
   RTS
 
   .damageProperties
@@ -598,9 +567,7 @@ Sprite_Offspring_Spawn:
   JSL Sprite_SpawnDynamically : BMI .return ;89
 
   LDA.b #$02 : STA.w SprSubtype, Y
-      
   PHX
-      
   REP #$20
   LDA $0FD8 : CLC : ADC.w #$000C
   SEP #$20
@@ -615,9 +582,7 @@ Sprite_Offspring_Spawn:
 
   STZ $0D60, X : STZ $0D70, X
   LDA.b #$05 : STA.w SprBump, X
-      
   PLX
-      
   .return
 
   RTS
@@ -626,40 +591,24 @@ Sprite_Offspring_Spawn:
 Kydrog_ThrowBoneAtPlayer:
 {
   LDA.b #$A7 : JSL Sprite_SpawnDynamically : BMI .spawn_failed
-  
     LDA.b #$01 : STA $0D90, Y ; Sprite state "falling into a pit"
-  
     JSL Sprite_SetSpawnedCoords
-  
     PHX
-  
     TYX
 
     LDA.w SprX, X : CLC : ADC.b #$10 : STA.w SprX, X
     LDA.w SprY, X : SEC : SBC.b #$04 : STA.w SprY, X
-  
     LDA.b #$20 : JSL Sprite_ApplySpeedTowardsPlayer
-  
     LDA.b #$21 : STA $0E40, X : STA $0BA0, X
-  
     LDA $0E60, X : ORA.b #$40 : STA $0E60, X
-  
     LDA.b #$48 : STA $0CAA, X
-  
     LDA.b #$10 : STA.w SprTimerC, X
-  
     LDA.b #$14 : STA $0F60, X
-  
     LDA.b #$07 : STA $0F50, X
-  
     LDA.b #$20 : STA.w SprBump, X
-  
     PLX
-  
     LDA.b #$02 : JSL Sound_SetSfx2PanLong
-
   .spawn_failed
-
   RTS
 }
 
@@ -674,7 +623,6 @@ GetNumberSpawnStalfos:
 
   .x_loop
     DEX
-    
     LDY.b #$04
     .y_loop
       DEY
@@ -713,7 +661,6 @@ Sprite_KydrogBoss_Draw:
     LDA.w SprFlash, X : STA $08
 
     PHX ; Store Sprite ID
-    
     REP #$20
     LDA .nbr_of_tiles, Y ;amount of tiles -1 ; doesn't need to be 16 bit ;Y = 00, 02, 04, 06
     REP #$30
@@ -755,13 +702,10 @@ Sprite_KydrogBoss_Draw:
 
     REP #$30
     PHY
-        
     TYA : LSR #2 : TAY ; divide Y by 4
     SEP #$20 ;set A back to 8bit but not X and Y
     LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
-        
     PLY : INY
-        
     PLX : DEX : BPL .nextTile
 
     SEP #$30