script names parity

pmret · Sep 23, 2024 · 80d2327 · 80d2327
1 parent e3fd3b8
commit 80d2327
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 78 deletions.
diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c
@@ -691,7 +691,7 @@ EvtScript N(EVS_HandlePhase) = {
     End
 };
 
-EvtScript N(returnHome2) = {
+EvtScript N(EVS_ReturnHome_Success) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME)
     Call(MoveBattleCamOver, 10)
@@ -733,7 +733,7 @@ EvtScript N(returnHome2) = {
     End
 };
 
-EvtScript N(EVS_ReturnHome) = {
+EvtScript N(EVS_ReturnHome_Miss) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE)
     Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Backfire2)
@@ -1006,11 +1006,11 @@ EvtScript N(EVS_Attack_BodySlam) = {
     Switch(LVar0)
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
         CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE)
-            ExecWait(N(returnHome2))
+            ExecWait(N(EVS_ReturnHome_Success))
         EndCaseGroup
     EndSwitch
     Return

diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c
@@ -397,7 +397,7 @@ EvtScript N(EVS_ExecuteAction) = {
     End
 };
 
-EvtScript N(returnHome2) = {
+EvtScript N(EVS_ReturnHome_Success) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME)
     Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A)
@@ -426,7 +426,7 @@ EvtScript N(returnHome2) = {
     End
 };
 
-EvtScript N(EVS_ReturnHome) = {
+EvtScript N(EVS_ReturnHome_Miss) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE)
     Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A)
@@ -552,7 +552,7 @@ EvtScript N(smack) = {
         Call(RemoveActorDecoration, ACTOR_SELF, PRT_ZERO, 0)
         Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle)
         Wait(10)
-        ExecWait(N(EVS_ReturnHome))
+        ExecWait(N(EVS_ReturnHome_Miss))
         Return
     EndIf
     Add(LVarE, 1)
@@ -640,12 +640,12 @@ EvtScript N(smack) = {
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
             Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
         CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE)
             Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle)
-            ExecWait(N(returnHome2))
+            ExecWait(N(EVS_ReturnHome_Success))
         EndCaseGroup
     EndSwitch
     Return
@@ -1069,7 +1069,7 @@ EvtScript N(fanSmack) = {
         Call(RemoveActorDecoration, ACTOR_SELF, PRT_ZERO, 0)
         Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle)
         Wait(10)
-        ExecWait(N(EVS_ReturnHome))
+        ExecWait(N(EVS_ReturnHome_Miss))
         Return
     EndIf
     Add(LVarE, 1)
@@ -1213,13 +1213,13 @@ EvtScript N(fanSmack) = {
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
             Wait(10)
             Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
         EndCaseGroup
         CaseOrEq(1)
         CaseOrEq(3)
             Wait(10)
             Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle)
-            ExecWait(N(returnHome2))
+            ExecWait(N(EVS_ReturnHome_Success))
         EndCaseGroup
     EndSwitch
     Return

diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c
@@ -769,7 +769,7 @@ EvtScript N(EVS_HandlePhase) = {
     End
 };
 
-EvtScript N(EVS_ReturnHome) = {
+EvtScript N(EVS_ReturnHome_Miss) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE)
     Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle)
@@ -820,7 +820,7 @@ EvtScript N(EVS_ReturnHome) = {
     End
 };
 
-EvtScript N(returnHome2) = {
+EvtScript N(EVS_ReturnHome_Success) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_VIEW_ENEMIES)
     Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle)
@@ -953,7 +953,7 @@ EvtScript N(EVS_Attack_Headbonk1) = {
         EndThread
         Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TRIP)
         Wait(20)
-        ExecWait(N(EVS_ReturnHome))
+        ExecWait(N(EVS_ReturnHome_Miss))
         Return
     EndIf
     ChildThread
@@ -979,7 +979,7 @@ EvtScript N(EVS_Attack_Headbonk1) = {
     Switch(LVar0)
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
             Return
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
@@ -1025,7 +1025,7 @@ EvtScript N(EVS_Attack_Headbonk1) = {
     Call(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS)
     Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE)
     Call(SetActionResult, LVarF)
-    ExecWait(N(returnHome2))
+    ExecWait(N(EVS_ReturnHome_Success))
     Return
     End
 };
@@ -1058,7 +1058,7 @@ EvtScript N(EVS_Attack_Headbonk2) = {
         EndThread
         Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TRIP)
         Wait(20)
-        ExecWait(N(EVS_ReturnHome))
+        ExecWait(N(EVS_ReturnHome_Miss))
         Return
     EndIf
     ChildThread
@@ -1084,7 +1084,7 @@ EvtScript N(EVS_Attack_Headbonk2) = {
     Switch(LVar0)
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
             Return
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
@@ -1132,7 +1132,7 @@ EvtScript N(EVS_Attack_Headbonk2) = {
     Call(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS)
     Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE)
     Call(SetActionResult, LVarF)
-    ExecWait(N(returnHome2))
+    ExecWait(N(EVS_ReturnHome_Success))
     Return
     End
 };
@@ -1165,7 +1165,7 @@ EvtScript N(EVS_Attack_Headbonk3) = {
         EndThread
         Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TRIP)
         Wait(20)
-        ExecWait(N(EVS_ReturnHome))
+        ExecWait(N(EVS_ReturnHome_Miss))
         Return
     EndIf
     ChildThread
@@ -1191,7 +1191,7 @@ EvtScript N(EVS_Attack_Headbonk3) = {
     Switch(LVar0)
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
             Return
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
@@ -1248,7 +1248,7 @@ EvtScript N(EVS_Attack_Headbonk3) = {
     Call(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS)
     Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE)
     Call(SetActionResult, LVarF)
-    ExecWait(N(returnHome2))
+    ExecWait(N(EVS_ReturnHome_Success))
     Return
     End
 };
@@ -1285,7 +1285,7 @@ EvtScript N(EVS_Move_Multibonk) = {
         EndThread
         Call(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TRIP)
         Wait(20)
-        ExecWait(N(EVS_ReturnHome))
+        ExecWait(N(EVS_ReturnHome_Miss))
         Return
     EndIf
     ChildThread
@@ -1311,7 +1311,7 @@ EvtScript N(EVS_Move_Multibonk) = {
     Switch(LVar0)
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
             Return
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
@@ -1412,13 +1412,13 @@ EvtScript N(EVS_Move_Multibonk) = {
     Switch(LVar0)
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
             Return
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
         CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE)
             IfEq(LFlag0, TRUE)
-                ExecWait(N(returnHome2))
+                ExecWait(N(EVS_ReturnHome_Success))
                 Return
             EndIf
         EndCaseGroup

diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c
@@ -465,7 +465,7 @@ EvtScript N(firstStrike) = {
     End
 };
 
-EvtScript N(returnHomeOnMiss) = {
+EvtScript N(EVS_ReturnHome_Miss) = {
     Call(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK)
     Thread
         Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME)
@@ -498,7 +498,7 @@ EvtScript N(returnHomeOnMiss) = {
     End
 };
 
-EvtScript N(EVS_ReturnHome) = {
+EvtScript N(EVS_ReturnHome_Success) = {
     Call(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK)
     Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE)
     Call(PartnerYieldTurn)
@@ -691,11 +691,11 @@ EvtScript N(shellToss) = {
     Switch(LVar0)
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Success))
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
         CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE)
-            ExecWait(N(returnHomeOnMiss))
+            ExecWait(N(EVS_ReturnHome_Miss))
         EndCaseGroup
     EndSwitch
     Return
@@ -873,9 +873,9 @@ EvtScript N(powerShell) = {
     Call(GetPartnerActionSuccess, LVar0)
     Switch(LVar0)
         CaseGt(0)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Success))
         CaseDefault
-            ExecWait(N(returnHomeOnMiss))
+            ExecWait(N(EVS_ReturnHome_Miss))
     EndSwitch
     Return
     End

diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c
@@ -342,7 +342,7 @@ EvtScript N(EVS_ExecuteAction) = {
     End
 };
 
-EvtScript N(returnHome2) = {
+EvtScript N(EVS_ReturnHome_Success) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME)
     Call(SetGoalToHome, ACTOR_PARTNER)
@@ -353,7 +353,7 @@ EvtScript N(returnHome2) = {
     End
 };
 
-EvtScript N(EVS_ReturnHome) = {
+EvtScript N(EVS_ReturnHome_Miss) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE)
     Call(SetGoalToHome, ACTOR_PARTNER)
@@ -952,11 +952,11 @@ EvtScript N(EVS_Move_SpinyFlip) = {
     Switch(LVar0)
         CaseOrEq(HIT_RESULT_NICE)
         CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE)
-            ExecWait(N(returnHome2))
+            ExecWait(N(EVS_ReturnHome_Success))
         EndCaseGroup
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
         EndCaseGroup
     EndSwitch
     Return
@@ -1104,11 +1104,11 @@ EvtScript N(EVS_Move_SpinySurge) = {
     Switch(LVar0)
         CaseOrEq(HIT_RESULT_NICE)
         CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE)
-            ExecWait(N(returnHome2))
+            ExecWait(N(EVS_ReturnHome_Success))
         EndCaseGroup
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
         EndCaseGroup
     EndSwitch
     Return
@@ -1788,7 +1788,7 @@ EvtScript N(EVS_Move_Hurricane) = {
     Wait(34)
     Call(SetActorRotation, ACTOR_PARTNER, 0, 0, 0)
     Call(SetActorRotationOffset, ACTOR_PARTNER, 0, 0, 0)
-    ExecWait(N(EVS_ReturnHome))
+    ExecWait(N(EVS_ReturnHome_Miss))
     Call(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk)
     Call(N(AllEnemiesBlownAway))
     Call(PartnerYieldTurn)

diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c
@@ -878,7 +878,7 @@ EvtScript N(EVS_HandlePhase) = {
     End
 };
 
-EvtScript N(returnHome2) = {
+EvtScript N(EVS_ReturnHome_Success) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_RETURN_HOME)
     Call(SetAnimation, ACTOR_PARTNER, -1, LVarA)
@@ -903,7 +903,7 @@ EvtScript N(returnHome2) = {
     End
 };
 
-EvtScript N(EVS_ReturnHome) = {
+EvtScript N(EVS_ReturnHome_Miss) = {
     Call(PartnerYieldTurn)
     Call(UseBattleCamPreset, BTL_CAM_PARTNER_MISTAKE)
     Call(SetAnimation, ACTOR_PARTNER, -1, LVarA)
@@ -999,12 +999,12 @@ EvtScript N(skyDive) = {
         CaseOrEq(HIT_RESULT_HIT)
         CaseOrEq(HIT_RESULT_NO_DAMAGE)
             SetConst(LVarA, ANIM_BattleParakarry_Think)
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
         CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE)
             SetConst(LVarA, ANIM_BattleParakarry_Dive)
-            ExecWait(N(returnHome2))
+            ExecWait(N(EVS_ReturnHome_Success))
         EndCaseGroup
     EndSwitch
     Call(EnableIdleScript, ACTOR_PARTNER, IDLE_SCRIPT_ENABLE)
@@ -1082,12 +1082,12 @@ EvtScript N(shellShot) = {
             Else
                 SetConst(LVarA, ANIM_BattleParakarry_Think)
             EndIf
-            ExecWait(N(EVS_ReturnHome))
+            ExecWait(N(EVS_ReturnHome_Miss))
         EndCaseGroup
         CaseOrEq(HIT_RESULT_NICE)
         CaseOrEq(HIT_RESULT_NICE_NO_DAMAGE)
             SetConst(LVarA, ANIM_BattleParakarry_ShellFly)
-            ExecWait(N(returnHome2))
+            ExecWait(N(EVS_ReturnHome_Success))
         EndCaseGroup
     EndSwitch
     Return