Update macros for battle_scripts_2

5 files changed, 9 insertions, 10 deletions

diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 8f223f791..5de053b8c 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -1292,7 +1292,7 @@
 	various \battler, VARIOUS_RETURN_OPPONENT_MON2
 	.endm
 
-	.macro various11 battler:req
+	.macro checkpokeflute battler:req
 	various \battler, 11
 	.endm
 
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index cb89649b5..305e7f252 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -18,7 +18,6 @@
 	.section script_data, "aw", %progbits
 	.align 2
 
-
 gBattlescriptsForBallThrow:: @ 81D99B4
 	.4byte BattleScript_81D9A14
 	.4byte BattleScript_81D9A14
@@ -53,13 +52,13 @@ gBattlescriptsForSafariActions:: @ 81D9A08
 	.4byte BattleScript_81D9BE1
 
 BattleScript_81D9A14:: @ 81D9A14
-	jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_OLD_MAN_TUTORIAL, BattleScript_81D9A34
-	jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_POKEDUDE, BattleScript_81D9A38
+	jumpifbattletype BATTLE_TYPE_OLD_MAN_TUTORIAL, BattleScript_81D9A34
+	jumpifbattletype BATTLE_TYPE_POKEDUDE, BattleScript_81D9A38
 	printstring STRINGID_PLAYERUSEDITEM
 	handleballthrow
 
 BattleScript_81D9A34:: @ 81D9A34
-	printstring STRINGID_WALLYUSEDITEM
+	printstring STRINGID_OLDMANUSEDITEM
 	handleballthrow
 
 BattleScript_81D9A38:: @ 81D9A38
@@ -106,7 +105,7 @@ gUnknown_81D9A88:: @ 81D9A88
 BattleScript_ShakeBallThrow:: @ 81D9A93
 	printfromtable gBallEscapeStringIds
 	waitmessage 64
-	jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_81D9AC0
+	jumpifnotbattletype BATTLE_TYPE_SAFARI, BattleScript_81D9AC0
 	jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_81D9AC0
 	printstring STRINGID_OUTOFSAFARIBALLS
 	waitmessage 64
@@ -191,7 +190,7 @@ BattleScript_81D9B7C:: @ 81D9B7C
 	finishturn
 
 BattleScript_81D9B86:: @ 81D9B86
-	various11 BS_ATTACKER
+	checkpokeflute BS_ATTACKER
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 1, BattleScript_81D9B9F
 	printstring STRINGID_POKEFLUTECATCHY
 	waitmessage 64
diff --git a/include/battle_string_ids.h b/include/battle_string_ids.h
index c646b2ebf..155e9f7bf 100644
--- a/include/battle_string_ids.h
+++ b/include/battle_string_ids.h
@@ -258,7 +258,7 @@
 #define STRINGID_NOPPLEFT 255
 #define STRINGID_BUTNOPPLEFT 256
 #define STRINGID_PLAYERUSEDITEM 257
-#define STRINGID_WALLYUSEDITEM 258
+#define STRINGID_OLDMANUSEDITEM 258
 #define STRINGID_TRAINERBLOCKEDBALL 259
 #define STRINGID_DONTBEATHIEF 260
 #define STRINGID_ITDODGEDBALL 261
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index cbe3a8209..49ecfeafa 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -74,7 +74,7 @@
 #define VARIOUS_CASE_8                          8
 #define VARIOUS_RETURN_OPPONENT_MON1            9
 #define VARIOUS_RETURN_OPPONENT_MON2            10
-#define VARIOUS_CASE_11                         11
+#define VARIOUS_CHECK_POKEFLUTE                 11
 #define VARIOUS_WAIT_FANFARE                    12
 
 // atk80, dmg manipulation
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 8442ebfc5..d8ea3cdc7 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -6183,7 +6183,7 @@ static void atk76_various(void)
             }
         }
         break;
-    case VARIOUS_CASE_11:
+    case VARIOUS_CHECK_POKEFLUTE:
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         monToCheck = 0;
         for (i = 0; i < gBattlersCount; ++i)