Update battle scripts with more defines

asm/macros/battle_script.inc

@@ -1284,46 +1284,6 @@
 	various \battler, 8
 	.endm
 
-	.macro arenajudgmentwindow
-	various BS_ATTACKER, VARIOUS_ARENA_JUDGMENT_WINDOW
-	.endm
-
-	.macro arenaopponentmonlost
-	various BS_ATTACKER, VARIOUS_ARENA_OPPONENT_MON_LOST
-	.endm
-
-	.macro arenaplayermonlost
-	various BS_ATTACKER, VARIOUS_ARENA_PLAYER_MON_LOST
-	.endm
-
-	.macro arenabothmonlost
-	various BS_ATTACKER, VARIOUS_ARENA_BOTH_MONS_LOST
-	.endm
-
-	.macro forfeityesnobox battler:req
-	various \battler, VARIOUS_EMIT_YESNOBOX
-	.endm
-
-	.macro various14 battler:req
-	various \battler, 14
-	.endm
-
-	.macro various15 battler:req
-	various \battler, 15
-	.endm
-
-	.macro arenajudmengtstring id:req
-	various \id, VARIOUS_ARENA_JUDGMENT_STRING
-	.endm
-
-	.macro arenawaitmessage id:req
-	various \id, VARIOUS_ARENA_WAIT_STRING
-	.endm
-
-	.macro waitcry battler:req
-	various \battler, VARIOUS_WAIT_CRY
-	.endm
-
 	.macro returnopponentmon1toball battler:req
 	various \battler, VARIOUS_RETURN_OPPONENT_MON1
 	.endm
@@ -1332,28 +1292,12 @@
 	various \battler, VARIOUS_RETURN_OPPONENT_MON2
 	.endm
 
-	.macro volumedown
+	.macro various11 battler:req
-	various BS_ATTACKER, VARIOUS_VOLUME_DOWN
+	various \battler, 11
 	.endm
 
-	.macro volumeup
+	.macro waitfanfare battler:req
-	various BS_ATTACKER, VARIOUS_VOLUME_UP
+	various \battler, 12
-	.endm
-
-	.macro setalreadystatusedmoveattempt battler:req
-	various \battler, 23
-	.endm
-
-	.macro various24 battler:req
-	various \battler, 24
-	.endm
-
-	.macro setoutcomeonteleport battler:req
-	various \battler, VARIOUS_SET_TELEPORT_OUTCOME
-	.endm
-
-	.macro playtrainerdefeatbgm battler:req
-	various \battler, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC
 	.endm
 
 @ helpful macros

include/constants/battle_anim.h

@@ -370,7 +370,9 @@
 #define B_ANIM_FOCUS_PUNCH_SETUP        0x14
 #define B_ANIM_INGRAIN_HEAL             0x15
 #define B_ANIM_WISH_HEAL                0x16
-#define B_ANIM_x19                      0x19
+#define B_ANIM_MON_SCARED               0x17
+#define B_ANIM_GHOST_GET_OUT            0x18
+#define B_ANIM_SILPH_SCOPED             0x19
 
 // special animations table
 #define B_ANIM_LVL_UP                   0x0

include/constants/battle_script_commands.h

@@ -75,7 +75,7 @@
 #define VARIOUS_RETURN_OPPONENT_MON1            9
 #define VARIOUS_RETURN_OPPONENT_MON2            10
 #define VARIOUS_CASE_11                         11
-#define VARIOUS_CASE_12                         12
+#define VARIOUS_WAIT_FANFARE                    12
 
 // atk80, dmg manipulation
 #define ATK80_DMG_CHANGE_SIGN                               0

src/battle_script_commands.c

@@ -3773,7 +3773,7 @@ static void atk45_playanimation(void)
     if (gBattlescriptCurrInstr[2] == B_ANIM_STATS_CHANGE
      || gBattlescriptCurrInstr[2] == B_ANIM_SNATCH_MOVE
      || gBattlescriptCurrInstr[2] == B_ANIM_SUBSTITUTE_FADE
-     || gBattlescriptCurrInstr[2] == B_ANIM_x19)
+     || gBattlescriptCurrInstr[2] == B_ANIM_SILPH_SCOPED)
     {
         BtlController_EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
         MarkBattlerForControllerExec(gActiveBattler);
@@ -6236,7 +6236,7 @@ static void atk76_various(void)
             gBattleCommunication[5] = 1;
         }
         break;
-    case VARIOUS_CASE_12:
+    case VARIOUS_WAIT_FANFARE:
         if (!IsFanfareTaskInactive())
             return;
         break;