Make Twinrova hitbox more consistent

Sprites/Bosses/twinrova.asm

@@ -39,19 +39,16 @@
 
 Sprite_Twinrova_Long:
 {
-    PHB : PHK : PLB
-
-    JSR Sprite_Twinrova_Draw 
-    JSL Sprite_DrawShadow
-
-    JSL Sprite_CheckActive : BCC .SpriteIsNotActive 
+PHB : PHK : PLB
+JSR Sprite_Twinrova_Draw
+JSL Sprite_DrawShadow
 
+JSL Sprite_CheckActive : BCC .SpriteIsNotActive
   JSR Sprite_Twinrova_CheckIfDead
   JSR Sprite_Twinrova_Main
-
-  .SpriteIsNotActive
-    PLB
-    RTL
+.SpriteIsNotActive
+PLB
+RTL
 }
 
 ; =========================================================
@@ -159,6 +156,11 @@ Sprite_Twinrova_Main:
   JSL Sprite_PlayerCantPassThrough
   JSL Sprite_DamageFlash_Long
 
+  PHX
+  JSL Sprite_CheckDamageFromPlayer
+  %DoDamageToPlayerSameLayerOnContact()
+  PLX
+
   LDA.w SprAction, X
   JSL   UseImplicitRegIndexedLocalJumpTable
 
@@ -194,15 +196,13 @@ Sprite_Twinrova_Main:
     LDA.w SprHealth, X : CMP.b #$20 : BCS .phase_1
       ; -------------------------------------------
       ; Phase 2
+      LDA.b #$70 : STA.w SprTimerD, X
       LDA.w SprTimerE, X : BNE .kotake
-        LDA #$70 : STA.w SprTimerD, X
         %GotoAction(8) ; Koume Mode
         RTS
       .kotake
-        LDA #$70 : STA.w SprTimerD, X
         %GotoAction(9) ; Kotake Mode
         RTS
-
     ; ---------------------------------------------
     .phase_1
     LDA $0DA0 : BEQ .not_flashing
@@ -249,17 +249,10 @@ Sprite_Twinrova_Main:
   Twinrova_MoveForwards:
   {
     %Twinrova_Front()
-
-    PHX 
-    JSL Sprite_CheckDamageFromPlayer
-    %DoDamageToPlayerSameLayerOnContact()
-    PLX 
-
     LDA #$10 ; speed
     LDY #$10 ; height
     JSL Sprite_FloatTowardPlayer
     JSL Sprite_CheckTileCollision
-
     %GotoAction(1)
     RTS
   }
@@ -269,16 +262,9 @@ Sprite_Twinrova_Main:
   Twinrova_MoveBackwards:
   {
     %Twinrova_Back()
-
-    PHX 
-    JSL Sprite_CheckDamageFromPlayer
-    %DoDamageToPlayerSameLayerOnContact()
-    PLX 
-
     LDA #$20 : LDY #$10
     JSL Sprite_FloatTowardPlayer
     JSL Sprite_CheckTileCollision
-
     %GotoAction(1)
     RTS
   }
@@ -291,7 +277,6 @@ Sprite_Twinrova_Main:
     %Twinrova_Attack()
 
     LDA #$01 : STA $0360
-
     LDA $0CAA : AND.b #$03 : STA $0CAA
     LDA.w SprTimerD, X : BNE +
       LDA $0CAA : ORA.b #$03 : STA $0CAA
@@ -403,11 +388,6 @@ Sprite_Twinrova_Main:
     %StartOnFrame(8)
     %Show_Koume()
 
-    PHX
-    JSL Sprite_CheckDamageFromPlayer
-    %DoDamageToPlayerSameLayerOnContact()
-    PLX 
-
     JSL GetRandomInt : AND.b #$3F : BNE ++
       JSR AddPitHazard
       JSR Ganon_SpawnFallingTilesOverlord
@@ -435,11 +415,6 @@ Sprite_Twinrova_Main:
     %StartOnFrame(9)
     %Show_Kotake()
 
-    PHX
-    JSL Sprite_CheckDamageFromPlayer
-    %DoDamageToPlayerSameLayerOnContact()
-    PLX 
-
     JSL Sprite_IsBelowPlayer
     CPY #$01 : BEQ .not_below
       JSL GetRandomInt : AND.b #$3F : BNE ++
@@ -474,7 +449,6 @@ Sprite_Twinrova_Main:
 
 ; =========================================================
 ; Handles dynamic floaty movement for Twinrova
-; =========================================================
 
 RageModeMove:
 {