cleans up trainer battle scripts

* adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro
2018-12-02 07:17:54 -05:00
parent 2912ec0e37
commit bad5323642
104 changed files with 723 additions and 687 deletions
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -629,60 +629,95 @@
 	.endm

 	@ If the Trainer flag for Trainer index is not set, this command does absolutely nothing.
-	.macro trainerbattle type:req, trainer:req, word:req, pointer1:req, pointer2, pointer3, pointer4
+	.macro trainerbattle type, trainer, local_id, pointer1, pointer2, pointer3, pointer4
 	.byte 0x5c
 	.byte \type
 	.2byte \trainer
-	.2byte \word
-	.if \type == 0
+	.2byte \local_id
+	.if \type == TRAINER_BATTLE_NORMAL
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
-	.elseif \type == 1
+	.elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
 		.4byte \pointer3 @ event script
-	.elseif \type == 2
+	.elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
 		.4byte \pointer3 @ event script
-	.elseif \type == 3
+	.elseif \type == TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT
 		.4byte \pointer1 @ text
-	.elseif \type == 4
+	.elseif \type == TRAINER_BATTLE_DOUBLE
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
 		.4byte \pointer3 @ text
-	.elseif \type == 5
+	.elseif \type == TRAINER_BATTLE_REMATCH
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
-	.elseif \type == 6
+	.elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
 		.4byte \pointer3 @ text
 		.4byte \pointer4 @ event script
-	.elseif \type == 7
+	.elseif \type == TRAINER_BATTLE_REMATCH_DOUBLE
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
 		.4byte \pointer3 @ text
-	.elseif \type == 8
+	.elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
 		.4byte \pointer3 @ text
 		.4byte \pointer4 @ event script
-	.elseif \type == 9
+	.elseif \type == TRAINER_BATTLE_9
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
-	.elseif \type == 10
+	.elseif \type == TRAINER_BATTLE_SET_TRAINER_A
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
-	.elseif \type == 11
+	.elseif \type == TRAINER_BATTLE_SET_TRAINER_B
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
-	.elseif \type == 12
+	.elseif \type == TRAINER_BATTLE_12
 		.4byte \pointer1 @ text
 		.4byte \pointer2 @ text
 	.endif
 	.endm

+	NO_MUSIC = FALSE
+
+	@ Starts a normal trainer battle
+	.macro trainerbattle_normal trainer, intro_text, lose_text, event_script=FALSE, music=TRUE
+	.if \event_script == FALSE
+	trainerbattle TRAINER_BATTLE_NORMAL, \trainer, 0, \intro_text, \lose_text
+	.elseif \event_script != FALSE && \music == TRUE
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, \trainer, 0, \intro_text, \lose_text, \event_script
+	.else
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \event_script
+	.endif
+	.endm
+
+	@ Starts a double trainer battle
+	.macro trainerbattle_double trainer, intro_text, lose_text, not_enough_pkmn_text, event_script=FALSE, music=TRUE
+	.if \event_script == FALSE
+	trainerbattle TRAINER_BATTLE_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text
+	.elseif \event_script != FALSE && \music == TRUE
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script
+	.else
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script
+	.endif
+	.endm
+
+	.macro trainerbattle_rematch trainer, intro_text, lose_text
+	trainerbattle TRAINER_BATTLE_REMATCH, \trainer, 0, \intro_text, \lose_text
+	.endm
+
+	.macro trainerbattle_rematch_double trainer, intro_text, lose_text, not_enough_pkmn_text
+	trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text
+	.endm
+
+	.macro trainerbattle_no_intro trainer, lose_text
+	trainerbattle TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT, \trainer, 0, \lose_text
+	.endm

 	@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes.
 	.macro trainerbattlebegin
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,4 +1,5 @@
 #include "constants/battle_frontier.h"
+#include "constants/battle_setup.h"
 #include "constants/field_effects.h"
 #include "constants/flags.h"
 #include "constants/items.h"
@@ -11734,7 +11735,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
 	step_end

 EventScript_2C83F0:: @ 82C83F0
-	trainerbattle 12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
+	trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
 	setvar VAR_0x8004, 11
 	special sp194_trainer_tower
 	waitmessage
--- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
@@ -6,7 +6,7 @@ AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5
 	end

 AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE
-	trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01
+	trainerbattle_normal TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01
 	msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE
 	end

@@ -24,4 +24,3 @@ AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B
 AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60
 	.string "Isn’t it fun here?\n"
 	.string "I get excited just being here!$"
-
--- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
@@ -53,7 +53,7 @@ AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09
 	end

 AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13
-	trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80
+	trainerbattle_normal TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80
 	msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
@@ -2,7 +2,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6
 	.byte 0

 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7
-	trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7
+	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0
@@ -17,12 +17,12 @@ AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7
 	end

 AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0
-	trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509
+	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509
 	msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE
 	end

 AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B
-	trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B
+	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms2_1F_EventScript_238154
@@ -37,17 +37,17 @@ AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B
 	end

 AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154
-	trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668
+	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668
 	msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE
 	end

 AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F
-	trainerbattle 0, TRAINER_JANI, 0, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8
+	trainerbattle_normal TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8
 	msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE
 	end

 AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186
-	trainerbattle 0, TRAINER_GARRISON, 0, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779
+	trainerbattle_normal TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779
 	msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE
 	end

@@ -149,4 +149,3 @@ AbandonedShip_Rooms2_1F_Text_238779: @ 8238779
 AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9
 	.string "In a cabin somewhere on board,\n"
 	.string "I saw something sparkle.$"
-
--- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
@@ -6,12 +6,12 @@ AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93
 	end

 AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C
-	trainerbattle 0, TRAINER_DEMETRIUS, 0, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A
+	trainerbattle_normal TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A
 	msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE
 	end

 AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3
-	trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF
+	trainerbattle_normal TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE
@@ -28,7 +28,7 @@ AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF
 	end

 AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE
-	trainerbattle 5, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2
+	trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2
 	msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/AquaHideout_1F/scripts.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
@@ -44,7 +44,7 @@ AquaHideout_1F_EventScript_2334EE:: @ 82334EE
 	end

 AquaHideout_1F_EventScript_2334F8:: @ 82334F8
-	trainerbattle 2, TRAINER_GRUNT_1, 0, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513
+	trainerbattle_normal TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513
 	msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/AquaHideout_B1F/scripts.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
@@ -85,7 +85,7 @@ AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C
 	end

 AquaHideout_B1F_EventScript_233A85:: @ 8233A85
-	trainerbattle 2, TRAINER_GRUNT_2, 0, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0
+	trainerbattle_normal TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0
 	msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE
 	end

@@ -97,7 +97,7 @@ AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0
 	end

 AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0
-	trainerbattle 2, TRAINER_GRUNT_3, 0, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB
+	trainerbattle_normal TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB
 	msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE
 	end

@@ -107,12 +107,12 @@ AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB
 	end

 AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5
-	trainerbattle 0, TRAINER_GRUNT_21, 0, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA
+	trainerbattle_normal TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA
 	msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE
 	end

 AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC
-	trainerbattle 0, TRAINER_GRUNT_25, 0, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E
+	trainerbattle_normal TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E
 	msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/AquaHideout_B2F/scripts.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -24,7 +24,7 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
 	end

 AquaHideout_B2F_EventScript_233E09:: @ 8233E09
-	trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25
+	trainerbattle_normal TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25
 	msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
 	release
 	end
@@ -67,7 +67,7 @@ AquaHideout_B2F_Movement_233E85: @ 8233E85
 	step_end

 AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A
-	trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5
+	trainerbattle_normal TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5
 	msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE
 	end

@@ -77,12 +77,12 @@ AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5
 	end

 AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF
-	trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE
+	trainerbattle_normal TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE
 	msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE
 	end

 AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6
-	trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC
+	trainerbattle_normal TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC
 	msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -153,7 +153,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 	end

 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
-	trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
+	trainerbattle TRAINER_BATTLE_9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
 	setvar VAR_0x8004, 10
 	special CallBattlePyramidFunction
 	waitmessage
--- a/data/maps/DewfordTown_Gym/scripts.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
@@ -156,7 +156,7 @@ DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1
 	return

 DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2
-	trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7
+	trainerbattle_normal TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq DewfordTown_Gym_EventScript_1FC89C
@@ -211,12 +211,12 @@ DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
 	end

 DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C
-	trainerbattle 7, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE
+	trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE
 	msgbox DewfordTown_Gym_Text_1FD37B, MSGBOX_AUTOCLOSE
 	end

 DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7
-	trainerbattle 2, TRAINER_TAKAO, 0, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2
+	trainerbattle_normal TRAINER_TAKAO, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2
 	msgbox DewfordTown_Gym_Text_1FCBCA, MSGBOX_AUTOCLOSE
 	end

@@ -226,7 +226,7 @@ DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2
 	end

 DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9
-	trainerbattle 2, TRAINER_JOCELYN, 0, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4
+	trainerbattle_normal TRAINER_JOCELYN, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4
 	msgbox DewfordTown_Gym_Text_1FCC6B, MSGBOX_AUTOCLOSE
 	end

@@ -236,7 +236,7 @@ DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4
 	end

 DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB
-	trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916
+	trainerbattle_normal TRAINER_LAURA, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916
 	msgbox DewfordTown_Gym_Text_1FCD4F, MSGBOX_AUTOCLOSE
 	end

@@ -246,7 +246,7 @@ DewfordTown_Gym_EventScript_1FC916:: @ 81FC916
 	end

 DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D
-	trainerbattle 2, TRAINER_BRENDEN, 0, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938
+	trainerbattle_normal TRAINER_BRENDEN, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938
 	msgbox DewfordTown_Gym_Text_1FCEAB, MSGBOX_AUTOCLOSE
 	end

@@ -256,7 +256,7 @@ DewfordTown_Gym_EventScript_1FC938:: @ 81FC938
 	end

 DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F
-	trainerbattle 2, TRAINER_CRISTIAN, 0, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A
+	trainerbattle_normal TRAINER_CRISTIAN, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A
 	msgbox DewfordTown_Gym_Text_1FCF26, MSGBOX_AUTOCLOSE
 	end

@@ -266,7 +266,7 @@ DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A
 	end

 DewfordTown_Gym_EventScript_1FC961:: @ 81FC961
-	trainerbattle 2, TRAINER_LILITH, 0, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C
+	trainerbattle_normal TRAINER_LILITH, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C
 	msgbox DewfordTown_Gym_Text_1FCE08, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -40,7 +40,7 @@ EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42
 EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45
 	playbgm MUS_DAIGO, 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC
+	trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_228EAC
 	goto EverGrandeCity_ChampionsRoom_EventScript_228A61
 	end

--- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -45,7 +45,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3
 	goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A
 	playbgm MUS_SITENNOU, 0
 	msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_228895
+	trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895
 	goto EverGrandeCity_DrakesRoom_EventScript_228724
 	end

--- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -45,7 +45,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469
 	goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490
 	playbgm MUS_SITENNOU, 0
 	msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_2285B4
+	trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4
 	goto EverGrandeCity_GlaciasRoom_EventScript_22849A
 	end

--- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -45,7 +45,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB
 	goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2
 	playbgm MUS_SITENNOU, 0
 	msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_228325
+	trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325
 	goto EverGrandeCity_PhoebesRoom_EventScript_2281FC
 	end

--- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -52,7 +52,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64
 	goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B
 	playbgm MUS_SITENNOU, 0
 	msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_2280A2
+	trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2
 	goto EverGrandeCity_SidneysRoom_EventScript_227F95
 	end

--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4
 	end

 FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
-	trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD
+	trainerbattle_normal TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq FortreeCity_Gym_EventScript_21668D
@@ -67,37 +67,37 @@ FortreeCity_Gym_EventScript_21666A:: @ 821666A
 	return

 FortreeCity_Gym_EventScript_21668D:: @ 821668D
-	trainerbattle 7, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292
+	trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292
 	msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE
 	end

 FortreeCity_Gym_EventScript_2166A8:: @ 82166A8
-	trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3
+	trainerbattle_normal TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3
 	msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE
 	end

 FortreeCity_Gym_EventScript_2166BF:: @ 82166BF
-	trainerbattle 0, TRAINER_EDWARDO, 0, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7
+	trainerbattle_normal TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7
 	msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE
 	end

 FortreeCity_Gym_EventScript_2166D6:: @ 82166D6
-	trainerbattle 0, TRAINER_FLINT, 0, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4
+	trainerbattle_normal TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4
 	msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE
 	end

 FortreeCity_Gym_EventScript_2166ED:: @ 82166ED
-	trainerbattle 0, TRAINER_ASHLEY, 0, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51
+	trainerbattle_normal TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51
 	msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE
 	end

 FortreeCity_Gym_EventScript_216704:: @ 8216704
-	trainerbattle 0, TRAINER_HUMBERTO, 0, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18
+	trainerbattle_normal TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18
 	msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE
 	end

 FortreeCity_Gym_EventScript_21671B:: @ 821671B
-	trainerbattle 0, TRAINER_DARIUS, 0, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2
+	trainerbattle_normal TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2
 	msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -80,7 +80,7 @@ JaggedPass_EventScript_230718:: @ 8230718
 	waitmovement 0
 	msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT
 	closemessage
-	trainerbattle 3, TRAINER_GRUNT_30, 0, JaggedPass_Text_230D2D
+	trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D
 	setflag FLAG_0x139
 	applymovement 5, JaggedPass_Movement_2725A2
 	waitmovement 0
@@ -98,12 +98,12 @@ JaggedPass_EventScript_230766:: @ 8230766
 	end

 JaggedPass_EventScript_230785:: @ 8230785
-	trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_230888, JaggedPass_Text_2308FF
+	trainerbattle_normal TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF
 	msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE
 	end

 JaggedPass_EventScript_23079C:: @ 823079C
-	trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8
+	trainerbattle_normal TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq JaggedPass_EventScript_2307E4
@@ -119,12 +119,12 @@ JaggedPass_EventScript_2307C8:: @ 82307C8
 	end

 JaggedPass_EventScript_2307E4:: @ 82307E4
-	trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_230A76, JaggedPass_Text_230AAA
+	trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_230A76, JaggedPass_Text_230AAA
 	msgbox JaggedPass_Text_230AD7, MSGBOX_AUTOCLOSE
 	end

 JaggedPass_EventScript_2307FB:: @ 82307FB
-	trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827
+	trainerbattle_normal TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq JaggedPass_EventScript_230843
@@ -140,17 +140,17 @@ JaggedPass_EventScript_230827:: @ 8230827
 	end

 JaggedPass_EventScript_230843:: @ 8230843
-	trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_230C28, JaggedPass_Text_230C60
+	trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_230C28, JaggedPass_Text_230C60
 	msgbox JaggedPass_Text_230C94, MSGBOX_AUTOCLOSE
 	end

 JaggedPass_EventScript_23085A:: @ 823085A
-	trainerbattle 0, TRAINER_JULIO, 0, JaggedPass_Text_230DF7, JaggedPass_Text_230E38
+	trainerbattle_normal TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38
 	msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE
 	end

 JaggedPass_EventScript_230871:: @ 8230871
-	trainerbattle 0, TRAINER_AUTUMN, 0, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD
+	trainerbattle_normal TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD
 	msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -59,7 +59,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B
 	return

 LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C
-	trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1
+	trainerbattle_normal TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864
@@ -114,12 +114,12 @@ LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841
 	return

 LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864
-	trainerbattle 7, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E
+	trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E
 	msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, MSGBOX_AUTOCLOSE
 	end

 LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F
-	trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A
 	msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, MSGBOX_AUTOCLOSE
 	end

@@ -133,37 +133,37 @@ LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A
 	end

 LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF
-	trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A
 	msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, MSGBOX_AUTOCLOSE
 	end

 LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA
-	trainerbattle 2, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A
 	msgbox LavaridgeTown_Gym_B1F_Text_1FED02, MSGBOX_AUTOCLOSE
 	end

 LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5
-	trainerbattle 2, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A
 	msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, MSGBOX_AUTOCLOSE
 	end

 LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900
-	trainerbattle 2, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A
 	msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, MSGBOX_AUTOCLOSE
 	end

 LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B
-	trainerbattle 2, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A
 	msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, MSGBOX_AUTOCLOSE
 	end

 LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936
-	trainerbattle 2, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A
 	msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, MSGBOX_AUTOCLOSE
 	end

 LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951
-	trainerbattle 2, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A
 	msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -309,32 +309,32 @@ LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD
 	end

 LilycoveCity_EventScript_1E2EDE:: @ 81E2EDE
-	trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_1E3275
+	trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_1E3275
 	goto LilycoveCity_EventScript_1E2F3E
 	end

 LilycoveCity_EventScript_1E2EEE:: @ 81E2EEE
-	trainerbattle 3, TRAINER_MAY_13, 0, LilycoveCity_Text_1E3275
+	trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_1E3275
 	goto LilycoveCity_EventScript_1E2F3E
 	end

 LilycoveCity_EventScript_1E2EFE:: @ 81E2EFE
-	trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_1E3275
+	trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_1E3275
 	goto LilycoveCity_EventScript_1E2F3E
 	end

 LilycoveCity_EventScript_1E2F0E:: @ 81E2F0E
-	trainerbattle 3, TRAINER_BRENDAN_14, 0, LilycoveCity_Text_1E3777
+	trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_1E3777
 	goto LilycoveCity_EventScript_1E2FAA
 	end

 LilycoveCity_EventScript_1E2F1E:: @ 81E2F1E
-	trainerbattle 3, TRAINER_BRENDAN_15, 0, LilycoveCity_Text_1E3777
+	trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_1E3777
 	goto LilycoveCity_EventScript_1E2FAA
 	end

 LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E
-	trainerbattle 3, TRAINER_BRENDAN_13, 0, LilycoveCity_Text_1E3777
+	trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_1E3777
 	goto LilycoveCity_EventScript_1E2FAA
 	end

--- a/data/maps/MagmaHideout_1F/scripts.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
@@ -7,12 +7,12 @@ MagmaHideout_1F_MapScript1_239886: @ 8239886
 	end

 MagmaHideout_1F_EventScript_23988C:: @ 823988C
-	trainerbattle 0, TRAINER_GRUNT_38, 0, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964
+	trainerbattle_normal TRAINER_GRUNT_38, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964
 	msgbox MagmaHideout_1F_Text_2399B1, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_1F_EventScript_2398A3:: @ 82398A3
-	trainerbattle 0, TRAINER_GRUNT_39, 0, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA
+	trainerbattle_normal TRAINER_GRUNT_39, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA
 	msgbox MagmaHideout_1F_Text_239ACD, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MagmaHideout_2F_1R/scripts.inc
+++ b/data/maps/MagmaHideout_2F_1R/scripts.inc
@@ -2,22 +2,22 @@ MagmaHideout_2F_1R_MapScripts:: @ 8239B50
 	.byte 0

 MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51
-	trainerbattle 0, TRAINER_GRUNT_51, 0, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B
+	trainerbattle_normal TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B
 	msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68
-	trainerbattle 0, TRAINER_GRUNT_40, 0, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09
+	trainerbattle_normal TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09
 	msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F
-	trainerbattle 0, TRAINER_GRUNT_41, 0, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75
+	trainerbattle_normal TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75
 	msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96
-	trainerbattle 0, TRAINER_GRUNT_42, 0, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA
+	trainerbattle_normal TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA
 	msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MagmaHideout_2F_2R/scripts.inc
+++ b/data/maps/MagmaHideout_2F_2R/scripts.inc
@@ -2,22 +2,22 @@ MagmaHideout_2F_2R_MapScripts:: @ 8239E07
 	.byte 0

 MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08
-	trainerbattle 0, TRAINER_GRUNT_52, 0, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5
+	trainerbattle_normal TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5
 	msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F
-	trainerbattle 0, TRAINER_GRUNT_43, 0, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71
+	trainerbattle_normal TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71
 	msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36
-	trainerbattle 0, TRAINER_GRUNT_44, 0, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050
+	trainerbattle_normal TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050
 	msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D
-	trainerbattle 0, TRAINER_GRUNT_45, 0, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C
+	trainerbattle_normal TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C
 	msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MagmaHideout_3F_1R/scripts.inc
+++ b/data/maps/MagmaHideout_3F_1R/scripts.inc
@@ -2,12 +2,12 @@ MagmaHideout_3F_1R_MapScripts:: @ 823A1B2
 	.byte 0

 MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3
-	trainerbattle 0, TRAINER_GRUNT_46, 0, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229
+	trainerbattle_normal TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229
 	msgbox MagmaHideout_3F_1R_Text_23A246, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA
-	trainerbattle 0, TRAINER_GRUNT_53, 0, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353
+	trainerbattle_normal TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353
 	msgbox MagmaHideout_3F_1R_Text_23A37C, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MagmaHideout_3F_2R/scripts.inc
+++ b/data/maps/MagmaHideout_3F_2R/scripts.inc
@@ -2,7 +2,7 @@ MagmaHideout_3F_2R_MapScripts:: @ 823A3D4
 	.byte 0

 MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5
-	trainerbattle 0, TRAINER_GRUNT_47, 0, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB
+	trainerbattle_normal TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB
 	msgbox MagmaHideout_3F_2R_Text_23A4EF, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -57,7 +57,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	waitmovement 0
 	msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT
 	closemessage
-	trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5
+	trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_23ABB5
 	msgbox MagmaHideout_4F_Text_23ABE2, MSGBOX_DEFAULT
 	closemessage
 	clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
@@ -109,22 +109,22 @@ MagmaHideout_4F_Movement_23A680: @ 823A680
 	step_end

 MagmaHideout_4F_EventScript_23A68C:: @ 823A68C
-	trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775
+	trainerbattle_normal TRAINER_GRUNT_48, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775
 	msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3
-	trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B
+	trainerbattle_normal TRAINER_GRUNT_49, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B
 	msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA
-	trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7
+	trainerbattle_normal TRAINER_GRUNT_50, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7
 	msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE
 	end

 MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1
-	trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994
+	trainerbattle_normal TRAINER_TABITHA_3, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994
 	msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -208,7 +208,7 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628

 MauvilleCity_EventScript_1DF63A:: @ 81DF63A
 	msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_1DFB96
+	trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96
 	applymovement 6, MauvilleCity_Movement_2725A8
 	waitmovement 0
 	msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -76,7 +76,7 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7
 	end

 MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
-	trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B
+	trainerbattle_normal TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq MauvilleCity_Gym_EventScript_20DFDE
@@ -140,7 +140,7 @@ MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4
 	end

 MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE
-	trainerbattle 7, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD
+	trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD
 	msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE
 	end

@@ -215,27 +215,27 @@ MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4
 	end

 MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9
-	trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC
+	trainerbattle_normal TRAINER_KIRK, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC
 	msgbox MauvilleCity_Gym_Text_20E336, MSGBOX_AUTOCLOSE
 	end

 MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0
-	trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7
+	trainerbattle_normal TRAINER_SHAWN, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7
 	msgbox MauvilleCity_Gym_Text_20E3C1, MSGBOX_AUTOCLOSE
 	end

 MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7
-	trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469
+	trainerbattle_normal TRAINER_BEN, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469
 	msgbox MauvilleCity_Gym_Text_20E47E, MSGBOX_AUTOCLOSE
 	end

 MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE
-	trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4
+	trainerbattle_normal TRAINER_VIVIAN, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4
 	msgbox MauvilleCity_Gym_Text_20E50F, MSGBOX_AUTOCLOSE
 	end

 MauvilleCity_Gym_EventScript_20E115:: @ 820E115
-	trainerbattle 0, TRAINER_ANGELO, 0, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8
+	trainerbattle_normal TRAINER_ANGELO, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8
 	msgbox MauvilleCity_Gym_Text_20E5C2, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MeteorFalls_1F_2R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
@@ -2,7 +2,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD
 	.byte 0

 MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE
-	trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A
+	trainerbattle_normal TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq MeteorFalls_1F_2R_EventScript_22C529
@@ -19,12 +19,12 @@ MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A
 	end

 MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529
-	trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD
+	trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD
 	msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE
 	end

 MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540
-	trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570
+	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq MeteorFalls_1F_2R_EventScript_22C589
@@ -39,12 +39,12 @@ MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570
 	end

 MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589
-	trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27
+	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27
 	msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE
 	end

 MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4
-	trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4
+	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq MeteorFalls_1F_2R_EventScript_22C5ED
@@ -59,7 +59,7 @@ MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4
 	end

 MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED
-	trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB
+	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB
 	msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MeteorFalls_StevensCave/scripts.inc
+++ b/data/maps/MeteorFalls_StevensCave/scripts.inc
@@ -14,7 +14,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
 	applymovement 1, MeteorFalls_StevensCave_Movement_27259E
 	waitmovement 0
 	msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_STEVEN, 0, MeteorFalls_StevensCave_Text_23B32D
+	trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D
 	msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT
 	setflag FLAG_0x4F8
 	release
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -49,7 +49,7 @@ MossdeepCity_Gym_EventScript_220885:: @ 8220885
 	end

 MossdeepCity_Gym_EventScript_220898:: @ 8220898
-	trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1
+	trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq MossdeepCity_Gym_EventScript_22097E
@@ -109,7 +109,7 @@ MossdeepCity_Gym_EventScript_22095B:: @ 822095B
 	return

 MossdeepCity_Gym_EventScript_22097E:: @ 822097E
-	trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8
+	trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8
 	msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE
 	end

@@ -211,62 +211,62 @@ MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1
 	end

 MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD
-	trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC
+	trainerbattle_normal TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC
 	msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220B14:: @ 8220B14
-	trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A
+	trainerbattle_normal TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A
 	msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B
-	trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024
+	trainerbattle_normal TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024
 	msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220B42:: @ 8220B42
-	trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152
+	trainerbattle_normal TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152
 	msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220B59:: @ 8220B59
-	trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230
+	trainerbattle_normal TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230
 	msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220B70:: @ 8220B70
-	trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309
+	trainerbattle_normal TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309
 	msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220B87:: @ 8220B87
-	trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4
+	trainerbattle_normal TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4
 	msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E
-	trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7
+	trainerbattle_normal TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7
 	msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5
-	trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658
+	trainerbattle_normal TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658
 	msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC
-	trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8
+	trainerbattle_normal TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8
 	msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3
-	trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D
+	trainerbattle_normal TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D
 	msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA
-	trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B
+	trainerbattle_normal TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B
 	msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -219,17 +219,17 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF
 	end

 MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA
-	trainerbattle 0, TRAINER_GRUNT_32, 0, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999
+	trainerbattle_normal TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999
 	msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1
-	trainerbattle 0, TRAINER_GRUNT_16, 0, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21
+	trainerbattle_normal TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, MSGBOX_AUTOCLOSE
 	end

 MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208
-	trainerbattle 0, TRAINER_GRUNT_33, 0, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA
+	trainerbattle_normal TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, MSGBOX_AUTOCLOSE
 	end

@@ -239,7 +239,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
 	checkflag FLAG_0x0BF
 	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E
 	msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_GRUNT_23, 0, MossdeepCity_SpaceCenter_1F_Text_223BC2
+	trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2
 	setflag FLAG_0x0BF
 	moveobjectoffscreen 9
 	switch VAR_FACING
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -54,19 +54,19 @@ MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07

 MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
 	msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_GRUNT_34, 0, MossdeepCity_SpaceCenter_2F_Text_224461
+	trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461
 	applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85
 	waitmovement 0
 	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_GRUNT_35, 0, MossdeepCity_SpaceCenter_2F_Text_224499
+	trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499
 	applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81
 	waitmovement 0
 	applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_GRUNT_36, 0, MossdeepCity_SpaceCenter_2F_Text_2244F1
+	trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1
 	applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89
 	waitmovement 0
 	setvar VAR_0x409F, 2
@@ -343,11 +343,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152
 	return

 MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157
-	trainerbattle 10, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C
+	trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C
 	end

 MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166
-	trainerbattle 11, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD
+	trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD
 	end

 MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -45,7 +45,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
 	applymovement 2, MtChimney_Movement_27259A
 	waitmovement 0
 	msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF
+	trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF
 	msgbox MtChimney_Text_22F5F7, MSGBOX_DEFAULT
 	closemessage
 	delay 30
@@ -411,12 +411,12 @@ MtChimney_EventScript_22F065:: @ 822F065
 	end

 MtChimney_EventScript_22F06E:: @ 822F06E
-	trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C
+	trainerbattle_normal TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C
 	msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE
 	end

 MtChimney_EventScript_22F085:: @ 822F085
-	trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A
+	trainerbattle_normal TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A
 	msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE
 	end

@@ -487,7 +487,7 @@ MtChimney_EventScript_22F141:: @ 822F141
 	end

 MtChimney_EventScript_22F14A:: @ 822F14A
-	trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176
+	trainerbattle_normal TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq MtChimney_EventScript_22F195
@@ -504,32 +504,32 @@ MtChimney_EventScript_22F176:: @ 822F176
 	end

 MtChimney_EventScript_22F195:: @ 822F195
-	trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB
+	trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_230153, MtChimney_Text_2301BB
 	msgbox MtChimney_Text_2301E7, MSGBOX_AUTOCLOSE
 	end

 MtChimney_EventScript_22F1AC:: @ 822F1AC
-	trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D
+	trainerbattle_normal TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D
 	msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE
 	end

 MtChimney_EventScript_22F1C3:: @ 822F1C3
-	trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304
+	trainerbattle_normal TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304
 	msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE
 	end

 MtChimney_EventScript_22F1DA:: @ 822F1DA
-	trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436
+	trainerbattle_normal TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436
 	msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE
 	end

 MtChimney_EventScript_22F1F1:: @ 822F1F1
-	trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921
+	trainerbattle_normal TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921
 	msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE
 	end

 MtChimney_EventScript_22F208:: @ 822F208
-	trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234
+	trainerbattle_normal TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq MtChimney_EventScript_22F253
@@ -546,7 +546,7 @@ MtChimney_EventScript_22F234:: @ 822F234
 	end

 MtChimney_EventScript_22F253:: @ 822F253
-	trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3
+	trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_23059C, MtChimney_Text_2305E3
 	msgbox MtChimney_Text_230614, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MtPyre_2F/scripts.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -18,27 +18,27 @@ MtPyre_2F_EventScript_23111F:: @ 823111F
 	end

 MtPyre_2F_EventScript_231128:: @ 8231128
-	trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
+	trainerbattle_normal TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
 	msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE
 	end

 MtPyre_2F_EventScript_23113F:: @ 823113F
-	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
+	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
 	msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE
 	end

 MtPyre_2F_EventScript_23115A:: @ 823115A
-	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
+	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
 	msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE
 	end

 MtPyre_2F_EventScript_231175:: @ 8231175
-	trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
+	trainerbattle_normal TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
 	msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE
 	end

 MtPyre_2F_EventScript_23118C:: @ 823118C
-	trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
+	trainerbattle_normal TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
 	msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MtPyre_3F/scripts.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
@@ -2,17 +2,17 @@ MtPyre_3F_MapScripts:: @ 8231752
 	.byte 0

 MtPyre_3F_EventScript_231753:: @ 8231753
-	trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853
+	trainerbattle_normal TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853
 	msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE
 	end

 MtPyre_3F_EventScript_23176A:: @ 823176A
-	trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD
+	trainerbattle_normal TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD
 	msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE
 	end

 MtPyre_3F_EventScript_231781:: @ 8231781
-	trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD
+	trainerbattle_normal TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq MtPyre_3F_EventScript_2317CC
@@ -29,7 +29,7 @@ MtPyre_3F_EventScript_2317AD:: @ 82317AD
 	end

 MtPyre_3F_EventScript_2317CC:: @ 82317CC
-	trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6
+	trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6
 	msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MtPyre_4F/scripts.inc
+++ b/data/maps/MtPyre_4F/scripts.inc
@@ -2,7 +2,7 @@ MtPyre_4F_MapScripts:: @ 8231BC8
 	.byte 0

 MtPyre_5F_EventScript_231BC9:: @ 8231BC9
-	trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08
+	trainerbattle_normal TRAINER_ATSUSHI, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08
 	msgbox MtPyre_5F_Text_231C24, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MtPyre_5F/scripts.inc
+++ b/data/maps/MtPyre_5F/scripts.inc
@@ -2,7 +2,7 @@ MtPyre_5F_MapScripts:: @ 8231C6D
 	.byte 0

 MtPyre_4F_EventScript_231C6E:: @ 8231C6E
-	trainerbattle 0, TRAINER_TASHA, 0, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB
+	trainerbattle_normal TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB
 	msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MtPyre_6F/scripts.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
@@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 8231D3A
 	.byte 0

 MtPyre_6F_EventScript_231D3B:: @ 8231D3B
-	trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67
+	trainerbattle_normal TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq MtPyre_6F_EventScript_231D86
@@ -19,12 +19,12 @@ MtPyre_6F_EventScript_231D67:: @ 8231D67
 	end

 MtPyre_6F_EventScript_231D86:: @ 8231D86
-	trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB
+	trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB
 	msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE
 	end

 MtPyre_6F_EventScript_231D9D:: @ 8231D9D
-	trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A
+	trainerbattle_normal TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A
 	msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -425,22 +425,22 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8
 	step_end

 MtPyre_Summit_EventScript_2323FD:: @ 82323FD
-	trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0
+	trainerbattle_normal TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0
 	msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE
 	end

 MtPyre_Summit_EventScript_232414:: @ 8232414
-	trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0
+	trainerbattle_normal TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0
 	msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE
 	end

 MtPyre_Summit_EventScript_23242B:: @ 823242B
-	trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678
+	trainerbattle_normal TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678
 	msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE
 	end

 MtPyre_Summit_EventScript_232442:: @ 8232442
-	trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A
+	trainerbattle_normal TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A
 	msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -379,7 +379,7 @@ PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC
 	end

 PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3
-	trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A
+	trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A
 	msgbox PetalburgCity_Gym_Text_2075F7, MSGBOX_AUTOCLOSE
 	end

@@ -413,7 +413,7 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D

 PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
 	msgbox PetalburgCity_Gym_Text_205FE5, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107
+	trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107
 	message PetalburgCity_Gym_Text_206162
 	waitmessage
 	call PetalburgCity_Gym_EventScript_27207E
@@ -958,7 +958,7 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387
 	end

 PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA
-	trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE
+	trainerbattle_normal TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE
 	checkflag FLAG_0x4F4
 	goto_eq PetalburgCity_Gym_EventScript_2053ED
 	msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE
@@ -976,7 +976,7 @@ PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED
 	end

 PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6
-	trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A
+	trainerbattle_normal TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A
 	checkflag FLAG_0x4F4
 	goto_eq PetalburgCity_Gym_EventScript_205429
 	msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE
@@ -994,7 +994,7 @@ PetalburgCity_Gym_EventScript_205429:: @ 8205429
 	end

 PetalburgCity_Gym_EventScript_205432:: @ 8205432
-	trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456
+	trainerbattle_normal TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456
 	checkflag FLAG_0x4F4
 	goto_eq PetalburgCity_Gym_EventScript_205465
 	msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE
@@ -1012,7 +1012,7 @@ PetalburgCity_Gym_EventScript_205465:: @ 8205465
 	end

 PetalburgCity_Gym_EventScript_20546E:: @ 820546E
-	trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492
+	trainerbattle_normal TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492
 	checkflag FLAG_0x4F4
 	goto_eq PetalburgCity_Gym_EventScript_2054A1
 	msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE
@@ -1030,7 +1030,7 @@ PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1
 	end

 PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA
-	trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE
+	trainerbattle_normal TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE
 	checkflag FLAG_0x4F4
 	goto_eq PetalburgCity_Gym_EventScript_2054DD
 	msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE
@@ -1048,7 +1048,7 @@ PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD
 	end

 PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6
-	trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A
+	trainerbattle_normal TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A
 	checkflag FLAG_0x4F4
 	goto_eq PetalburgCity_Gym_EventScript_205519
 	msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE
@@ -1066,7 +1066,7 @@ PetalburgCity_Gym_EventScript_205519:: @ 8205519
 	end

 PetalburgCity_Gym_EventScript_205522:: @ 8205522
-	trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546
+	trainerbattle_normal TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546
 	checkflag FLAG_0x4F4
 	goto_eq PetalburgCity_Gym_EventScript_205555
 	msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE
--- a/data/maps/PetalburgWoods/scripts.inc
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -26,7 +26,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7
 	applymovement 3, PetalburgWoods_Movement_22E20E
 	waitmovement 0
 	msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542
+	trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542
 	applymovement 3, PetalburgWoods_Movement_22E1F9
 	waitmovement 0
 	call PetalburgWoods_EventScript_22E138
@@ -62,7 +62,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079
 	applymovement 255, PetalburgWoods_Movement_2725A6
 	waitmovement 0
 	msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542
+	trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542
 	applymovement 3, PetalburgWoods_Movement_22E1F9
 	waitmovement 0
 	call PetalburgWoods_EventScript_22E138
@@ -273,12 +273,12 @@ PetalburgWoods_EventScript_22E264:: @ 822E264
 	end

 PetalburgWoods_EventScript_22E26D:: @ 822E26D
-	trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1
+	trainerbattle_normal TRAINER_LYLE, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1
 	msgbox PetalburgWoods_Text_22E7EF, MSGBOX_AUTOCLOSE
 	end

 PetalburgWoods_EventScript_22E284:: @ 822E284
-	trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5
+	trainerbattle_normal TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq PetalburgWoods_EventScript_22E31B
@@ -318,7 +318,7 @@ PetalburgWoods_EventScript_22E302:: @ 822E302
 	end

 PetalburgWoods_EventScript_22E31B:: @ 822E31B
-	trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998
+	trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998
 	msgbox PetalburgWoods_Text_22E9B6, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route102/scripts.inc
+++ b/data/maps/Route102/scripts.inc
@@ -18,7 +18,7 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC
 	end

 Route102_EventScript_1EC105:: @ 81EC105
-	trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146
+	trainerbattle_normal TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route102_EventScript_1EC19C
@@ -58,22 +58,22 @@ Route102_EventScript_1EC183:: @ 81EC183
 	end

 Route102_EventScript_1EC19C:: @ 81EC19C
-	trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C
+	trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_2946AE, Route102_Text_29470C
 	msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE
 	end

 Route102_EventScript_1EC1B3:: @ 81EC1B3
-	trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847
+	trainerbattle_normal TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847
 	msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE
 	end

 Route102_EventScript_1EC1CA:: @ 81EC1CA
-	trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3
+	trainerbattle_normal TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3
 	msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE
 	end

 Route102_EventScript_1EC1E1:: @ 81EC1E1
-	trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA
+	trainerbattle_normal TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA
 	msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -62,32 +62,32 @@ Route103_EventScript_1EC434:: @ 81EC434
 	end

 Route103_EventScript_1EC48E:: @ 81EC48E
-	trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_1EC881
+	trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_1EC881
 	goto Route103_EventScript_1EC4EE
 	end

 Route103_EventScript_1EC49E:: @ 81EC49E
-	trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_1EC881
+	trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_1EC881
 	goto Route103_EventScript_1EC4EE
 	end

 Route103_EventScript_1EC4AE:: @ 81EC4AE
-	trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_1EC881
+	trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_1EC881
 	goto Route103_EventScript_1EC4EE
 	end

 Route103_EventScript_1EC4BE:: @ 81EC4BE
-	trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_1ECA59
+	trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_1ECA59
 	goto Route103_EventScript_1EC4FC
 	end

 Route103_EventScript_1EC4CE:: @ 81EC4CE
-	trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_1ECA59
+	trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_1ECA59
 	goto Route103_EventScript_1EC4FC
 	end

 Route103_EventScript_1EC4DE:: @ 81EC4DE
-	trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_1ECA59
+	trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_1ECA59
 	goto Route103_EventScript_1EC4FC
 	end

@@ -203,12 +203,12 @@ Route103_EventScript_1EC5EB:: @ 81EC5EB
 	end

 Route103_EventScript_1EC5F4:: @ 81EC5F4
-	trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F
+	trainerbattle_normal TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F
 	msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE
 	end

 Route103_EventScript_1EC60B:: @ 81EC60B
-	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route103_EventScript_1EC653
@@ -222,12 +222,12 @@ Route103_EventScript_1EC63A:: @ 81EC63A
 	end

 Route103_EventScript_1EC653:: @ 81EC653
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF
 	msgbox Route103_Text_294C93, MSGBOX_AUTOCLOSE
 	end

 Route103_EventScript_1EC66E:: @ 81EC66E
-	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route103_EventScript_1EC6B6
@@ -241,17 +241,17 @@ Route103_EventScript_1EC69D:: @ 81EC69D
 	end

 Route103_EventScript_1EC6B6:: @ 81EC6B6
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB
 	msgbox Route103_Text_294D89, MSGBOX_AUTOCLOSE
 	end

 Route103_EventScript_1EC6D1:: @ 81EC6D1
-	trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92
+	trainerbattle_normal TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92
 	msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE
 	end

 Route103_EventScript_1EC6E8:: @ 81EC6E8
-	trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
+	trainerbattle_normal TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route103_EventScript_1EC733
@@ -268,27 +268,27 @@ Route103_EventScript_1EC714:: @ 81EC714
 	end

 Route103_EventScript_1EC733:: @ 81EC733
-	trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006
+	trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_294FC3, Route103_Text_295006
 	msgbox Route103_Text_29501E, MSGBOX_AUTOCLOSE
 	end

 Route103_EventScript_1EC74A:: @ 81EC74A
-	trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B
+	trainerbattle_normal TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B
 	msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE
 	end

 Route103_EventScript_1EC761:: @ 81EC761
-	trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6
+	trainerbattle_normal TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6
 	msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE
 	end

 Route103_EventScript_1EC778:: @ 81EC778
-	trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093
+	trainerbattle_normal TRAINER_PETE, Route103_Text_295063, Route103_Text_295093
 	msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE
 	end

 Route103_EventScript_1EC78F:: @ 81EC78F
-	trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146
+	trainerbattle_normal TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146
 	msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -172,19 +172,19 @@ Route104_EventScript_1ECE31:: @ 81ECE31
 	return

 Route104_EventScript_1ECE36:: @ 81ECE36
-	trainerbattle 3, TRAINER_MAY_14, 0, Route104_Text_1EDE18
+	trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_1EDE18
 	setflag FLAG_0x07D
 	goto Route104_EventScript_1ECE1C
 	end

 Route104_EventScript_1ECE49:: @ 81ECE49
-	trainerbattle 3, TRAINER_MAY_15, 0, Route104_Text_1EDE18
+	trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_1EDE18
 	setflag FLAG_0x07D
 	goto Route104_EventScript_1ECE1C
 	end

 Route104_EventScript_1ECE5C:: @ 81ECE5C
-	trainerbattle 3, TRAINER_MAY_10, 0, Route104_Text_1EDE18
+	trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_1EDE18
 	setflag FLAG_0x07D
 	goto Route104_EventScript_1ECE1C
 	end
@@ -244,19 +244,19 @@ Route104_EventScript_1ECF38:: @ 81ECF38
 	end

 Route104_EventScript_1ECF4D:: @ 81ECF4D
-	trainerbattle 3, TRAINER_BRENDAN_10, 0, Route104_Text_1EE107
+	trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_1EE107
 	setflag FLAG_0x07D
 	goto Route104_EventScript_1ECF38
 	end

 Route104_EventScript_1ECF60:: @ 81ECF60
-	trainerbattle 3, TRAINER_BRENDAN_12, 0, Route104_Text_1EE107
+	trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_1EE107
 	setflag FLAG_0x07D
 	goto Route104_EventScript_1ECF38
 	end

 Route104_EventScript_1ECF73:: @ 81ECF73
-	trainerbattle 3, TRAINER_BRENDAN_11, 0, Route104_Text_1EE107
+	trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_1EE107
 	setflag FLAG_0x07D
 	goto Route104_EventScript_1ECF38
 	end
@@ -871,17 +871,17 @@ Route104_Movement_1ED35C: @ 81ED35C
 	step_end

 Route104_EventScript_1ED35F:: @ 81ED35F
-	trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509
+	trainerbattle_normal TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509
 	msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE
 	end

 Route104_EventScript_1ED376:: @ 81ED376
-	trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4
+	trainerbattle_normal TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4
 	msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE
 	end

 Route104_EventScript_1ED38D:: @ 81ED38D
-	trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE
+	trainerbattle_normal TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route104_EventScript_1ED424
@@ -921,12 +921,12 @@ Route104_EventScript_1ED40B:: @ 81ED40B
 	end

 Route104_EventScript_1ED424:: @ 81ED424
-	trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0
+	trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_2957D7, Route104_Text_2957F0
 	msgbox Route104_Text_29580C, MSGBOX_AUTOCLOSE
 	end

 Route104_EventScript_1ED43B:: @ 81ED43B
-	trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C
+	trainerbattle_normal TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route104_EventScript_1ED4D2
@@ -966,12 +966,12 @@ Route104_EventScript_1ED4B9:: @ 81ED4B9
 	end

 Route104_EventScript_1ED4D2:: @ 81ED4D2
-	trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC
+	trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_2959BC, Route104_Text_2959FC
 	msgbox Route104_Text_295A1E, MSGBOX_AUTOCLOSE
 	end

 Route104_EventScript_1ED4E9:: @ 81ED4E9
-	trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A
+	trainerbattle_normal TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route104_EventScript_1ED580
@@ -1011,26 +1011,26 @@ Route104_EventScript_1ED567:: @ 81ED567
 	end

 Route104_EventScript_1ED580:: @ 81ED580
-	trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA
+	trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_295BC8, Route104_Text_295BFA
 	msgbox Route104_Text_295C1F, MSGBOX_AUTOCLOSE
 	end

 Route104_EventScript_1ED597:: @ 81ED597
-	trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330
+	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330
 	special GetPlayerBigGuyGirlString
 	msgbox Route104_Text_2952FE, MSGBOX_DEFAULT
 	release
 	end

 Route104_EventScript_1ED5B6:: @ 81ED5B6
-	trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449
+	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449
 	special GetPlayerBigGuyGirlString
 	msgbox Route104_Text_29540D, MSGBOX_DEFAULT
 	release
 	end

 Route104_EventScript_1ED5D5:: @ 81ED5D5
-	trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9
+	trainerbattle_normal TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9
 	msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -32,37 +32,37 @@ Route105_MapScript2_1EE240: @ 81EE240
 	.2byte 0

 Route105_EventScript_1EE24A:: @ 81EE24A
-	trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62
+	trainerbattle_normal TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62
 	msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE
 	end

 Route105_EventScript_1EE261:: @ 81EE261
-	trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66
+	trainerbattle_normal TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66
 	msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE
 	end

 Route105_EventScript_1EE278:: @ 81EE278
-	trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA
+	trainerbattle_normal TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA
 	msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE
 	end

 Route105_EventScript_1EE28F:: @ 81EE28F
-	trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0
+	trainerbattle_normal TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0
 	msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE
 	end

 Route105_EventScript_1EE2A6:: @ 81EE2A6
-	trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059
+	trainerbattle_normal TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059
 	msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE
 	end

 Route105_EventScript_1EE2BD:: @ 81EE2BD
-	trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB
+	trainerbattle_normal TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB
 	msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE
 	end

 Route105_EventScript_1EE2D4:: @ 81EE2D4
-	trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
+	trainerbattle_normal TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route105_EventScript_1EE31F
@@ -79,7 +79,7 @@ Route105_EventScript_1EE300:: @ 81EE300
 	end

 Route105_EventScript_1EE31F:: @ 81EE31F
-	trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD
+	trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD
 	msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route106/scripts.inc
+++ b/data/maps/Route106/scripts.inc
@@ -6,17 +6,17 @@ Route106_EventScript_1EE48A:: @ 81EE48A
 	end

 Route106_EventScript_1EE493:: @ 81EE493
-	trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD
+	trainerbattle_normal TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD
 	msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE
 	end

 Route106_EventScript_1EE4AA:: @ 81EE4AA
-	trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674
+	trainerbattle_normal TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674
 	msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE
 	end

 Route106_EventScript_1EE4C1:: @ 81EE4C1
-	trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED
+	trainerbattle_normal TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route106_EventScript_1EE50C
@@ -33,12 +33,12 @@ Route106_EventScript_1EE4ED:: @ 81EE4ED
 	end

 Route106_EventScript_1EE50C:: @ 81EE50C
-	trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477
+	trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_29642E, Route106_Text_296477
 	msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE
 	end

 Route106_EventScript_1EE523:: @ 81EE523
-	trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553
+	trainerbattle_normal TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553
 	msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route107/scripts.inc
+++ b/data/maps/Route107/scripts.inc
@@ -2,12 +2,12 @@ Route107_MapScripts:: @ 81EE594
 	.byte 0

 Route107_EventScript_1EE595:: @ 81EE595
-	trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_2966E5, Route107_Text_29672F
+	trainerbattle_normal TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F
 	msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE
 	end

 Route107_EventScript_1EE5AC:: @ 81EE5AC
-	trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8
+	trainerbattle_normal TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route107_EventScript_1EE5F7
@@ -24,32 +24,32 @@ Route107_EventScript_1EE5D8:: @ 81EE5D8
 	end

 Route107_EventScript_1EE5F7:: @ 81EE5F7
-	trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_296897, Route107_Text_2968D5
+	trainerbattle_rematch TRAINER_TONY_1, Route107_Text_296897, Route107_Text_2968D5
 	msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE
 	end

 Route107_EventScript_1EE60E:: @ 81EE60E
-	trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_296974, Route107_Text_29699E
+	trainerbattle_normal TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E
 	msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE
 	end

 Route107_EventScript_1EE625:: @ 81EE625
-	trainerbattle 0, TRAINER_BETH, 0, Route107_Text_2969E4, Route107_Text_296A17
+	trainerbattle_normal TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17
 	msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE
 	end

 Route107_EventScript_1EE63C:: @ 81EE63C
-	trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E
+	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E
 	msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE
 	end

 Route107_EventScript_1EE657:: @ 81EE657
-	trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34
+	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34
 	msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE
 	end

 Route107_EventScript_1EE672:: @ 81EE672
-	trainerbattle 0, TRAINER_CAMRON, 0, Route107_Text_296C6F, Route107_Text_296CAD
+	trainerbattle_normal TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD
 	msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route108/scripts.inc
+++ b/data/maps/Route108/scripts.inc
@@ -2,32 +2,32 @@ Route108_MapScripts:: @ 81EE689
 	.byte 0

 Route108_EventScript_1EE68A:: @ 81EE68A
-	trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_296D10, Route108_Text_296D3C
+	trainerbattle_normal TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C
 	msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE
 	end

 Route108_EventScript_1EE6A1:: @ 81EE6A1
-	trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_296DAF, Route108_Text_296DEA
+	trainerbattle_normal TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA
 	msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE
 	end

 Route108_EventScript_1EE6B8:: @ 81EE6B8
-	trainerbattle 0, TRAINER_TARA, 0, Route108_Text_296E33, Route108_Text_296E71
+	trainerbattle_normal TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71
 	msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE
 	end

 Route108_EventScript_1EE6CF:: @ 81EE6CF
-	trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_296EC7, Route108_Text_296EFC
+	trainerbattle_normal TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC
 	msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE
 	end

 Route108_EventScript_1EE6E6:: @ 81EE6E6
-	trainerbattle 0, TRAINER_CAROLINA, 0, Route108_Text_297094, Route108_Text_2970D7
+	trainerbattle_normal TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7
 	msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE
 	end

 Route108_EventScript_1EE6FD:: @ 81EE6FD
-	trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
+	trainerbattle_normal TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route108_EventScript_1EE748
@@ -44,7 +44,7 @@ Route108_EventScript_1EE729:: @ 81EE729
 	end

 Route108_EventScript_1EE748:: @ 81EE748
-	trainerbattle 5, TRAINER_CORY_1, 0, Route108_Text_297011, Route108_Text_297036
+	trainerbattle_rematch TRAINER_CORY_1, Route108_Text_297011, Route108_Text_297036
 	msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -376,27 +376,27 @@ Route109_EventScript_1EEA34:: @ 81EEA34
 	end

 Route109_EventScript_1EEA3D:: @ 81EEA3D
-	trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D
+	trainerbattle_normal TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D
 	msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEA54:: @ 81EEA54
-	trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD
+	trainerbattle_normal TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD
 	msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEA6B:: @ 81EEA6B
-	trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B
+	trainerbattle_normal TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B
 	msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEA82:: @ 81EEA82
-	trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE
+	trainerbattle_normal TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE
 	msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEA99:: @ 81EEA99
-	trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
+	trainerbattle_normal TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route109_EventScript_1EEAE4
@@ -413,12 +413,12 @@ Route109_EventScript_1EEAC5:: @ 81EEAC5
 	end

 Route109_EventScript_1EEAE4:: @ 81EEAE4
-	trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437
+	trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_2973FF, Route109_Text_297437
 	msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEAFB:: @ 81EEAFB
-	trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
+	trainerbattle_normal TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route109_EventScript_1EEB46
@@ -435,47 +435,47 @@ Route109_EventScript_1EEB27:: @ 81EEB27
 	end

 Route109_EventScript_1EEB46:: @ 81EEB46
-	trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576
+	trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_297538, Route109_Text_297576
 	msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEB5D:: @ 81EEB5D
-	trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601
+	trainerbattle_normal TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601
 	msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEB74:: @ 81EEB74
-	trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691
+	trainerbattle_normal TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691
 	msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEB8B:: @ 81EEB8B
-	trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC
+	trainerbattle_normal TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC
 	msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEBA2:: @ 81EEBA2
-	trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D
+	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D
 	msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEBBD:: @ 81EEBBD
-	trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E
+	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E
 	msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEBD8:: @ 81EEBD8
-	trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE
+	trainerbattle_normal TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE
 	msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEBEF:: @ 81EEBEF
-	trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15
+	trainerbattle_normal TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15
 	msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE
 	end

 Route109_EventScript_1EEC06:: @ 81EEC06
-	trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7
+	trainerbattle_normal TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7
 	msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -86,17 +86,17 @@ Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5
 	end

 Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2
-	trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533
+	trainerbattle_normal TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533
 	msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE
 	end

 Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD
-	trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533
+	trainerbattle_normal TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533
 	msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE
 	end

 Route109_SeashoreHouse_EventScript_269518:: @ 8269518
-	trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533
+	trainerbattle_normal TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533
 	msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -165,17 +165,17 @@ Route110_EventScript_1EF3E8:: @ 81EF3E8
 	end

 Route110_EventScript_1EF3F2:: @ 81EF3F2
-	trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064
+	trainerbattle_normal TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064
 	msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF409:: @ 81EF409
-	trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5
+	trainerbattle_normal TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5
 	msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF420:: @ 81EF420
-	trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
+	trainerbattle_normal TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF46B
@@ -192,27 +192,27 @@ Route110_EventScript_1EF44C:: @ 81EF44C
 	end

 Route110_EventScript_1EF46B:: @ 81EF46B
-	trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288
+	trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_298232, Route110_Text_298288
 	msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF482:: @ 81EF482
-	trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5
+	trainerbattle_normal TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5
 	msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF499:: @ 81EF499
-	trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77
+	trainerbattle_normal TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77
 	msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF4B0:: @ 81EF4B0
-	trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F
+	trainerbattle_normal TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F
 	msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF4C7:: @ 81EF4C7
-	trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
+	trainerbattle_normal TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF512
@@ -229,17 +229,17 @@ Route110_EventScript_1EF4F3:: @ 81EF4F3
 	end

 Route110_EventScript_1EF512:: @ 81EF512
-	trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E
+	trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_297D4B, Route110_Text_297D8E
 	msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF529:: @ 81EF529
-	trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0
+	trainerbattle_normal TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0
 	msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF540:: @ 81EF540
-	trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
+	trainerbattle_normal TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF58B
@@ -256,12 +256,12 @@ Route110_EventScript_1EF56C:: @ 81EF56C
 	end

 Route110_EventScript_1EF58B:: @ 81EF58B
-	trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37
+	trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_297F09, Route110_Text_297F37
 	msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF5A2:: @ 81EF5A2
-	trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
+	trainerbattle_normal TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF5ED
@@ -278,12 +278,12 @@ Route110_EventScript_1EF5CE:: @ 81EF5CE
 	end

 Route110_EventScript_1EF5ED:: @ 81EF5ED
-	trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF
+	trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_298466, Route110_Text_2984AF
 	msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF604:: @ 81EF604
-	trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559
+	trainerbattle_normal TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559
 	msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE
 	end

@@ -291,17 +291,17 @@ Route110_EventScript_1EF61B:: @ 81EF61B
 	end

 Route110_EventScript_1EF61C:: @ 81EF61C
-	trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735
+	trainerbattle_normal TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735
 	msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF633:: @ 81EF633
-	trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686
+	trainerbattle_normal TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686
 	msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE
 	end

 Route110_EventScript_1EF64A:: @ 81EF64A
-	trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9
+	trainerbattle_normal TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9
 	msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE
 	end

@@ -421,17 +421,17 @@ Route110_EventScript_1EF7EB:: @ 81EF7EB
 	end

 Route110_EventScript_1EF81A:: @ 81EF81A
-	trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_1EFCCB
+	trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_1EFCCB
 	goto Route110_EventScript_1EF84A
 	end

 Route110_EventScript_1EF82A:: @ 81EF82A
-	trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_1EFCCB
+	trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_1EFCCB
 	goto Route110_EventScript_1EF84A
 	end

 Route110_EventScript_1EF83A:: @ 81EF83A
-	trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_1EFCCB
+	trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_1EFCCB
 	goto Route110_EventScript_1EF84A
 	end

@@ -451,17 +451,17 @@ Route110_EventScript_1EF865:: @ 81EF865
 	end

 Route110_EventScript_1EF894:: @ 81EF894
-	trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_1EFEB4
+	trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_1EFEB4
 	goto Route110_EventScript_1EF8C4
 	end

 Route110_EventScript_1EF8A4:: @ 81EF8A4
-	trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_1EFEB4
+	trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_1EFEB4
 	goto Route110_EventScript_1EF8C4
 	end

 Route110_EventScript_1EF8B4:: @ 81EF8B4
-	trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_1EFEB4
+	trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_1EFEB4
 	goto Route110_EventScript_1EF8C4
 	end

--- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
@@ -24,17 +24,17 @@ Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D
 	end

 Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948
-	trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F
+	trainerbattle_normal TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F
 	msgbox Route110_TrickHousePuzzle1_Text_26BA57, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F
-	trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0
+	trainerbattle_normal TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0
 	msgbox Route110_TrickHousePuzzle1_Text_26BAC3, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976
-	trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E
+	trainerbattle_normal TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E
 	msgbox Route110_TrickHousePuzzle1_Text_26BB52, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
@@ -90,17 +90,17 @@ Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62
 	return

 Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75
-	trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45
+	trainerbattle_normal TRAINER_TED, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45
 	msgbox Route110_TrickHousePuzzle2_Text_26BD70, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C
-	trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF
+	trainerbattle_normal TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF
 	msgbox Route110_TrickHousePuzzle2_Text_26BDEC, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3
-	trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77
+	trainerbattle_normal TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77
 	msgbox Route110_TrickHousePuzzle2_Text_26BE97, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
@@ -302,17 +302,17 @@ Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9
 	end

 Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4
-	trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D
+	trainerbattle_normal TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D
 	msgbox Route110_TrickHousePuzzle3_Text_26C6E6, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB
-	trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763
+	trainerbattle_normal TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763
 	msgbox Route110_TrickHousePuzzle3_Text_26C776, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2
-	trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC
+	trainerbattle_normal TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC
 	msgbox Route110_TrickHousePuzzle3_Text_26C80C, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
@@ -14,17 +14,17 @@ Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873
 	end

 Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E
-	trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E
+	trainerbattle_normal TRAINER_CORA, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E
 	msgbox Route110_TrickHousePuzzle4_Text_26C9A2, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895
-	trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20
+	trainerbattle_normal TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20
 	msgbox Route110_TrickHousePuzzle4_Text_26CA53, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC
-	trainerbattle 0, TRAINER_PAULA, 0, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB
+	trainerbattle_normal TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB
 	msgbox Route110_TrickHousePuzzle4_Text_26CAD1, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
@@ -28,17 +28,17 @@ Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6
 	end

 Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1
-	trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2
+	trainerbattle_normal TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2
 	msgbox Route110_TrickHousePuzzle6_Text_26DEF3, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8
-	trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D
+	trainerbattle_normal TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D
 	msgbox Route110_TrickHousePuzzle6_Text_26DFA0, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F
-	trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004
+	trainerbattle_normal TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004
 	msgbox Route110_TrickHousePuzzle6_Text_26E048, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -304,32 +304,32 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373
 	end

 Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389
-	trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1
+	trainerbattle_normal TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1
 	msgbox Route110_TrickHousePuzzle7_Text_26E4F4, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0
-	trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564
+	trainerbattle_normal TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564
 	msgbox Route110_TrickHousePuzzle7_Text_26E57F, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7
-	trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604
+	trainerbattle_normal TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604
 	msgbox Route110_TrickHousePuzzle7_Text_26E61E, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE
-	trainerbattle 0, TRAINER_MARIELA, 0, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C
+	trainerbattle_normal TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C
 	msgbox Route110_TrickHousePuzzle7_Text_26E6BC, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5
-	trainerbattle 0, TRAINER_ALVARO, 0, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700
+	trainerbattle_normal TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700
 	msgbox Route110_TrickHousePuzzle7_Text_26E722, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC
-	trainerbattle 0, TRAINER_EVERETT, 0, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB
+	trainerbattle_normal TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB
 	msgbox Route110_TrickHousePuzzle7_Text_26E7C4, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
@@ -14,17 +14,17 @@ Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814
 	end

 Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F
-	trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6
+	trainerbattle_normal TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6
 	msgbox Route110_TrickHousePuzzle8_Text_26E918, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836
-	trainerbattle 0, TRAINER_KEIRA, 0, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F
+	trainerbattle_normal TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F
 	msgbox Route110_TrickHousePuzzle8_Text_26E99F, MSGBOX_AUTOCLOSE
 	end

 Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D
-	trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14
+	trainerbattle_normal TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14
 	msgbox Route110_TrickHousePuzzle8_Text_26EA3F, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -288,7 +288,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5

 Route111_EventScript_1F0FE7:: @ 81F0FE7
 	msgbox Route111_Text_1F1523, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542
+	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542
 	applymovement 1, Route111_Movement_2725A6
 	waitmovement 0
 	call Route111_EventScript_1F113C
@@ -306,7 +306,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7
 	waitmovement 0
 	call Route111_EventScript_1F1143
 	msgbox Route111_Text_1F159D, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616
+	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616
 	applymovement 2, Route111_Movement_2725A6
 	waitmovement 0
 	call Route111_EventScript_1F113C
@@ -324,7 +324,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7
 	waitmovement 0
 	call Route111_EventScript_1F1143
 	msgbox Route111_Text_1F167E, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6
+	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6
 	applymovement 3, Route111_Movement_2725A6
 	waitmovement 0
 	call Route111_EventScript_1F113C
@@ -342,7 +342,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7
 	waitmovement 0
 	call Route111_EventScript_1F1143
 	msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756
+	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756
 	msgbox Route111_Text_1F1788, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Route111_Movement_2725A6
@@ -452,27 +452,27 @@ Route111_EventScript_1F11E4:: @ 81F11E4
 	end

 Route111_EventScript_1F1204:: @ 81F1204
-	trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A
+	trainerbattle_normal TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A
 	msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F121B:: @ 81F121B
-	trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908
+	trainerbattle_normal TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908
 	msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F1232:: @ 81F1232
-	trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6
+	trainerbattle_normal TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6
 	msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F1249:: @ 81F1249
-	trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF
+	trainerbattle_normal TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF
 	msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F1260:: @ 81F1260
-	trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C
+	trainerbattle_normal TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route111_EventScript_1F12AB
@@ -489,27 +489,27 @@ Route111_EventScript_1F128C:: @ 81F128C
 	end

 Route111_EventScript_1F12AB:: @ 81F12AB
-	trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2
+	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2
 	msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F12C2:: @ 81F12C2
-	trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8
+	trainerbattle_normal TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8
 	msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F12D9:: @ 81F12D9
-	trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E
+	trainerbattle_normal TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E
 	msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F12F0:: @ 81F12F0
-	trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14
+	trainerbattle_normal TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14
 	msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F1307:: @ 81F1307
-	trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333
+	trainerbattle_normal TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route111_EventScript_1F1352
@@ -526,12 +526,12 @@ Route111_EventScript_1F1333:: @ 81F1333
 	end

 Route111_EventScript_1F1352:: @ 81F1352
-	trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE
+	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE
 	msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F1369:: @ 81F1369
-	trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395
+	trainerbattle_normal TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route111_EventScript_1F13B4
@@ -548,42 +548,42 @@ Route111_EventScript_1F1395:: @ 81F1395
 	end

 Route111_EventScript_1F13B4:: @ 81F13B4
-	trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6
+	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6
 	msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F13CB:: @ 81F13CB
-	trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE
+	trainerbattle_normal TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE
 	msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F13E2:: @ 81F13E2
-	trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D
+	trainerbattle_normal TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D
 	msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F13F9:: @ 81F13F9
-	trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549
+	trainerbattle_normal TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549
 	msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F1410:: @ 81F1410
-	trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625
+	trainerbattle_normal TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625
 	msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F1427:: @ 81F1427
-	trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384
+	trainerbattle_normal TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384
 	msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F143E:: @ 81F143E
-	trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431
+	trainerbattle_normal TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431
 	msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE
 	end

 Route111_EventScript_1F1455:: @ 81F1455
-	trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5
+	trainerbattle_normal TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5
 	msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -61,12 +61,12 @@ Route112_EventScript_1F1E61:: @ 81F1E61
 	end

 Route112_EventScript_1F1E6A:: @ 81F1E6A
-	trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA
+	trainerbattle_normal TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA
 	msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE
 	end

 Route112_EventScript_1F1E81:: @ 81F1E81
-	trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
+	trainerbattle_normal TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route112_EventScript_1F1ECC
@@ -83,27 +83,27 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD
 	end

 Route112_EventScript_1F1ECC:: @ 81F1ECC
-	trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7
+	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7
 	msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE
 	end

 Route112_EventScript_1F1EE3:: @ 81F1EE3
-	trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC
+	trainerbattle_normal TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC
 	msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE
 	end

 Route112_EventScript_1F1EFA:: @ 81F1EFA
-	trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36
+	trainerbattle_normal TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36
 	msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE
 	end

 Route112_EventScript_1F1F11:: @ 81F1F11
-	trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF
+	trainerbattle_normal TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF
 	msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE
 	end

 Route112_EventScript_1F1F28:: @ 81F1F28
-	trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F
+	trainerbattle_normal TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F
 	msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -49,17 +49,17 @@ Route113_EventScript_1F21B7:: @ 81F21B7
 	end

 Route113_EventScript_1F21C0:: @ 81F21C0
-	trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68
+	trainerbattle_normal TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68
 	msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F21D7:: @ 81F21D7
-	trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C
+	trainerbattle_normal TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C
 	msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F21EE:: @ 81F21EE
-	trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
+	trainerbattle_normal TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route113_EventScript_1F2239
@@ -76,12 +76,12 @@ Route113_EventScript_1F221A:: @ 81F221A
 	end

 Route113_EventScript_1F2239:: @ 81F2239
-	trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9
+	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9
 	msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F2250:: @ 81F2250
-	trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
+	trainerbattle_normal TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route113_EventScript_1F229B
@@ -98,42 +98,42 @@ Route113_EventScript_1F227C:: @ 81F227C
 	end

 Route113_EventScript_1F229B:: @ 81F229B
-	trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F
+	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F
 	msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F22B2:: @ 81F22B2
-	trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6
+	trainerbattle_normal TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6
 	msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F22C9:: @ 81F22C9
-	trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
 	msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F22E4:: @ 81F22E4
-	trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
 	msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F22FF:: @ 81F22FF
-	trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508
+	trainerbattle_normal TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508
 	msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F2316:: @ 81F2316
-	trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480
+	trainerbattle_normal TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480
 	msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F232D:: @ 81F232D
-	trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0
+	trainerbattle_normal TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0
 	msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE
 	end

 Route113_EventScript_1F2344:: @ 81F2344
-	trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628
+	trainerbattle_normal TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628
 	msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route114/scripts.inc
+++ b/data/maps/Route114/scripts.inc
@@ -89,27 +89,27 @@ Route114_EventScript_1F2637:: @ 81F2637
 	end

 Route114_EventScript_1F2640:: @ 81F2640
-	trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_29A6B1, Route114_Text_29A707
+	trainerbattle_normal TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707
 	msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F2657:: @ 81F2657
-	trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_29A777, Route114_Text_29A7B5
+	trainerbattle_normal TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5
 	msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F266E:: @ 81F266E
-	trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_29A818, Route114_Text_29A88F
+	trainerbattle_normal TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F
 	msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F2685:: @ 81F2685
-	trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_29A8D9, Route114_Text_29A90E
+	trainerbattle_normal TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E
 	msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F269C:: @ 81F269C
-	trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8
+	trainerbattle_normal TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route114_EventScript_1F26E7
@@ -126,12 +126,12 @@ Route114_EventScript_1F26C8:: @ 81F26C8
 	end

 Route114_EventScript_1F26E7:: @ 81F26E7
-	trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_29AA3E, Route114_Text_29AA67
+	trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67
 	msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F26FE:: @ 81F26FE
-	trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A
+	trainerbattle_normal TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route114_EventScript_1F2749
@@ -148,42 +148,42 @@ Route114_EventScript_1F272A:: @ 81F272A
 	end

 Route114_EventScript_1F2749:: @ 81F2749
-	trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_29ABDC, Route114_Text_29AC10
+	trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10
 	msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F2760:: @ 81F2760
-	trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_29ACB3, Route114_Text_29AD0A
+	trainerbattle_normal TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A
 	msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F2777:: @ 81F2777
-	trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_29ADA1, Route114_Text_29AE05
+	trainerbattle_normal TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05
 	msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F278E:: @ 81F278E
-	trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D
 	msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F27A9:: @ 81F27A9
-	trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B
 	msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F27C4:: @ 81F27C4
-	trainerbattle 0, TRAINER_ANGELINA, 0, Route114_Text_29B16F, Route114_Text_29B19C
+	trainerbattle_normal TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C
 	msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F27DB:: @ 81F27DB
-	trainerbattle 0, TRAINER_CHARLOTTE, 0, Route114_Text_29B0DB, Route114_Text_29B0FB
+	trainerbattle_normal TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB
 	msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE
 	end

 Route114_EventScript_1F27F2:: @ 81F27F2
-	trainerbattle 0, TRAINER_KAI, 0, Route114_Text_29B05D, Route114_Text_29B089
+	trainerbattle_normal TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089
 	msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -37,7 +37,7 @@ Route115_EventScript_1F2985:: @ 81F2985
 	end

 Route115_EventScript_1F298E:: @ 81F298E
-	trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
+	trainerbattle_normal TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route115_EventScript_1F29D9
@@ -54,17 +54,17 @@ Route115_EventScript_1F29BA:: @ 81F29BA
 	end

 Route115_EventScript_1F29D9:: @ 81F29D9
-	trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372
+	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372
 	msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE
 	end

 Route115_EventScript_1F29F0:: @ 81F29F0
-	trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED
+	trainerbattle_normal TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED
 	msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE
 	end

 Route115_EventScript_1F2A07:: @ 81F2A07
-	trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
+	trainerbattle_normal TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route115_EventScript_1F2A52
@@ -81,12 +81,12 @@ Route115_EventScript_1F2A33:: @ 81F2A33
 	end

 Route115_EventScript_1F2A52:: @ 81F2A52
-	trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D
+	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D
 	msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE
 	end

 Route115_EventScript_1F2A69:: @ 81F2A69
-	trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
+	trainerbattle_normal TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route115_EventScript_1F2AB4
@@ -103,37 +103,37 @@ Route115_EventScript_1F2A95:: @ 81F2A95
 	end

 Route115_EventScript_1F2AB4:: @ 81F2AB4
-	trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A
+	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A
 	msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE
 	end

 Route115_EventScript_1F2ACB:: @ 81F2ACB
-	trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5
+	trainerbattle_normal TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5
 	msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE
 	end

 Route115_EventScript_1F2AE2:: @ 81F2AE2
-	trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D
+	trainerbattle_normal TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D
 	msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE
 	end

 Route115_EventScript_1F2AF9:: @ 81F2AF9
-	trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8
+	trainerbattle_normal TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8
 	msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE
 	end

 Route115_EventScript_1F2B10:: @ 81F2B10
-	trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6
+	trainerbattle_normal TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6
 	msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE
 	end

 Route115_EventScript_1F2B27:: @ 81F2B27
-	trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958
+	trainerbattle_normal TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958
 	msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE
 	end

 Route115_EventScript_1F2B3E:: @ 81F2B3E
-	trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67
+	trainerbattle_normal TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67
 	msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -248,17 +248,17 @@ Route116_Movement_1F2E7E: @ 81F2E7E
 	step_end

 Route116_EventScript_1F2E89:: @ 81F2E89
-	trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A
+	trainerbattle_normal TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A
 	msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE
 	end

 Route116_EventScript_1F2EA0:: @ 81F2EA0
-	trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25
+	trainerbattle_normal TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25
 	msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE
 	end

 Route116_EventScript_1F2EB7:: @ 81F2EB7
-	trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
+	trainerbattle_normal TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route116_EventScript_1F2F4E
@@ -298,22 +298,22 @@ Route116_EventScript_1F2F35:: @ 81F2F35
 	end

 Route116_EventScript_1F2F4E:: @ 81F2F4E
-	trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C
+	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C
 	msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE
 	end

 Route116_EventScript_1F2F65:: @ 81F2F65
-	trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F
+	trainerbattle_normal TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F
 	msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE
 	end

 Route116_EventScript_1F2F7C:: @ 81F2F7C
-	trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3
+	trainerbattle_normal TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3
 	msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE
 	end

 Route116_EventScript_1F2F93:: @ 81F2F93
-	trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
+	trainerbattle_normal TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route116_EventScript_1F302A
@@ -353,27 +353,27 @@ Route116_EventScript_1F3011:: @ 81F3011
 	end

 Route116_EventScript_1F302A:: @ 81F302A
-	trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F
+	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F
 	msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE
 	end

 Route116_EventScript_1F3041:: @ 81F3041
-	trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8
+	trainerbattle_normal TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8
 	msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE
 	end

 Route116_EventScript_1F3058:: @ 81F3058
-	trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2
+	trainerbattle_normal TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2
 	msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE
 	end

 Route116_EventScript_1F306F:: @ 81F306F
-	trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365
+	trainerbattle_normal TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365
 	msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE
 	end

 Route116_EventScript_1F3086:: @ 81F3086
-	trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7
+	trainerbattle_normal TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7
 	msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route117/scripts.inc
+++ b/data/maps/Route117/scripts.inc
@@ -39,7 +39,7 @@ Route117_EventScript_1F39C7:: @ 81F39C7
 	end

 Route117_EventScript_1F39D0:: @ 81F39D0
-	trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC
+	trainerbattle_normal TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3A1B
@@ -56,12 +56,12 @@ Route117_EventScript_1F39FC:: @ 81F39FC
 	end

 Route117_EventScript_1F3A1B:: @ 81F3A1B
-	trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B
+	trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_29C549, Route117_Text_29C58B
 	msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE
 	end

 Route117_EventScript_1F3A32:: @ 81F3A32
-	trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E
+	trainerbattle_normal TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3A7D
@@ -78,12 +78,12 @@ Route117_EventScript_1F3A5E:: @ 81F3A5E
 	end

 Route117_EventScript_1F3A7D:: @ 81F3A7D
-	trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E
+	trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_29C6FD, Route117_Text_29C73E
 	msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE
 	end

 Route117_EventScript_1F3A94:: @ 81F3A94
-	trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0
+	trainerbattle_normal TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3ADF
@@ -100,12 +100,12 @@ Route117_EventScript_1F3AC0:: @ 81F3AC0
 	end

 Route117_EventScript_1F3ADF:: @ 81F3ADF
-	trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3
+	trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_29C880, Route117_Text_29C8E3
 	msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE
 	end

 Route117_EventScript_1F3AF6:: @ 81F3AF6
-	trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22
+	trainerbattle_normal TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3B41
@@ -122,17 +122,17 @@ Route117_EventScript_1F3B22:: @ 81F3B22
 	end

 Route117_EventScript_1F3B41:: @ 81F3B41
-	trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC
+	trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_29CA7C, Route117_Text_29CACC
 	msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE
 	end

 Route117_EventScript_1F3B58:: @ 81F3B58
-	trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_29CB32, Route117_Text_29CB87
+	trainerbattle_normal TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87
 	msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE
 	end

 Route117_EventScript_1F3B6F:: @ 81F3B6F
-	trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3BB8
@@ -147,12 +147,12 @@ Route117_EventScript_1F3B9F:: @ 81F3B9F
 	end

 Route117_EventScript_1F3BB8:: @ 81F3BB8
-	trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E
 	msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE
 	end

 Route117_EventScript_1F3BD3:: @ 81F3BD3
-	trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route117_EventScript_1F3C1C
@@ -167,22 +167,22 @@ Route117_EventScript_1F3C03:: @ 81F3C03
 	end

 Route117_EventScript_1F3C1C:: @ 81F3C1C
-	trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053
 	msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE
 	end

 Route117_EventScript_1F3C37:: @ 81F3C37
-	trainerbattle 0, TRAINER_MELINA, 0, Route117_Text_29D0B7, Route117_Text_29D0F1
+	trainerbattle_normal TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1
 	msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE
 	end

 Route117_EventScript_1F3C4E:: @ 81F3C4E
-	trainerbattle 0, TRAINER_BRANDI, 0, Route117_Text_29D14B, Route117_Text_29D189
+	trainerbattle_normal TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189
 	msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE
 	end

 Route117_EventScript_1F3C65:: @ 81F3C65
-	trainerbattle 0, TRAINER_AISHA, 0, Route117_Text_29D1D1, Route117_Text_29D206
+	trainerbattle_normal TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206
 	msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -187,7 +187,7 @@ Route118_Movement_1F3F7E: @ 81F3F7E
 	step_end

 Route118_EventScript_1F3F87:: @ 81F3F87
-	trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
+	trainerbattle_normal TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route118_EventScript_1F3FD2
@@ -204,22 +204,22 @@ Route118_EventScript_1F3FB3:: @ 81F3FB3
 	end

 Route118_EventScript_1F3FD2:: @ 81F3FD2
-	trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA
+	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA
 	msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE
 	end

 Route118_EventScript_1F3FE9:: @ 81F3FE9
-	trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C
+	trainerbattle_normal TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C
 	msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE
 	end

 Route118_EventScript_1F4000:: @ 81F4000
-	trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C
+	trainerbattle_normal TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C
 	msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE
 	end

 Route118_EventScript_1F4017:: @ 81F4017
-	trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
+	trainerbattle_normal TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route118_EventScript_1F4062
@@ -236,22 +236,22 @@ Route118_EventScript_1F4043:: @ 81F4043
 	end

 Route118_EventScript_1F4062:: @ 81F4062
-	trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA
+	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA
 	msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE
 	end

 Route118_EventScript_1F4079:: @ 81F4079
-	trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B
+	trainerbattle_normal TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B
 	msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE
 	end

 Route118_EventScript_1F4090:: @ 81F4090
-	trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4
+	trainerbattle_normal TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4
 	msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE
 	end

 Route118_EventScript_1F40A7:: @ 81F40A7
-	trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C
+	trainerbattle_normal TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C
 	msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -87,17 +87,17 @@ Route119_EventScript_1F450B:: @ 81F450B
 	end

 Route119_EventScript_1F453A:: @ 81F453A
-	trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98
+	trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_1F4A98
 	goto Route119_EventScript_1F456A
 	end

 Route119_EventScript_1F454A:: @ 81F454A
-	trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98
+	trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_1F4A98
 	goto Route119_EventScript_1F456A
 	end

 Route119_EventScript_1F455A:: @ 81F455A
-	trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98
+	trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_1F4A98
 	goto Route119_EventScript_1F456A
 	end

@@ -117,17 +117,17 @@ Route119_EventScript_1F4585:: @ 81F4585
 	end

 Route119_EventScript_1F45B4:: @ 81F45B4
-	trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24
+	trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1F4D24
 	goto Route119_EventScript_1F45E4
 	end

 Route119_EventScript_1F45C4:: @ 81F45C4
-	trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24
+	trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1F4D24
 	goto Route119_EventScript_1F45E4
 	end

 Route119_EventScript_1F45D4:: @ 81F45D4
-	trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24
+	trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1F4D24
 	goto Route119_EventScript_1F45E4
 	end

@@ -337,37 +337,37 @@ Route119_EventScript_1F477D:: @ 81F477D
 	end

 Route119_EventScript_1F4786:: @ 81F4786
-	trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0
+	trainerbattle_normal TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0
 	msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F479D:: @ 81F479D
-	trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C
+	trainerbattle_normal TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C
 	msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F47B4:: @ 81F47B4
-	trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14
+	trainerbattle_normal TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14
 	msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F47CB:: @ 81F47CB
-	trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC
+	trainerbattle_normal TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC
 	msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F47E2:: @ 81F47E2
-	trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66
+	trainerbattle_normal TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66
 	msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F47F9:: @ 81F47F9
-	trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20
+	trainerbattle_normal TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20
 	msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F4810:: @ 81F4810
-	trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
+	trainerbattle_normal TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route119_EventScript_1F485B
@@ -384,12 +384,12 @@ Route119_EventScript_1F483C:: @ 81F483C
 	end

 Route119_EventScript_1F485B:: @ 81F485B
-	trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5
+	trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_29DD62, Route119_Text_29DDA5
 	msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F4872:: @ 81F4872
-	trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
+	trainerbattle_normal TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route119_EventScript_1F48BD
@@ -406,52 +406,52 @@ Route119_EventScript_1F489E:: @ 81F489E
 	end

 Route119_EventScript_1F48BD:: @ 81F48BD
-	trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92
+	trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_29DF6B, Route119_Text_29DF92
 	msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F48D4:: @ 81F48D4
-	trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063
+	trainerbattle_normal TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063
 	msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F48EB:: @ 81F48EB
-	trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1
+	trainerbattle_normal TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1
 	msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F4902:: @ 81F4902
-	trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D
+	trainerbattle_normal TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D
 	msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F4919:: @ 81F4919
-	trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B
+	trainerbattle_normal TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B
 	msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F4930:: @ 81F4930
-	trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288
+	trainerbattle_normal TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288
 	msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F4947:: @ 81F4947
-	trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372
+	trainerbattle_normal TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372
 	msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F495E:: @ 81F495E
-	trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F
+	trainerbattle_normal TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F
 	msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F4975:: @ 81F4975
-	trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513
+	trainerbattle_normal TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513
 	msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE
 	end

 Route119_EventScript_1F498C:: @ 81F498C
-	trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1
+	trainerbattle_normal TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1
 	msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
@@ -65,12 +65,12 @@ Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18
 	end

 Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29
-	trainerbattle 0, TRAINER_GRUNT_11, 0, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB
+	trainerbattle_normal TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB
 	msgbox Route119_WeatherInstitute_1F_Text_26FBD7, MSGBOX_AUTOCLOSE
 	end

 Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40
-	trainerbattle 0, TRAINER_GRUNT_20, 0, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52
+	trainerbattle_normal TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52
 	msgbox Route119_WeatherInstitute_1F_Text_26FC60, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -27,22 +27,22 @@ Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C
 	return

 Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68
-	trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F
+	trainerbattle_normal TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F
 	msgbox Route119_WeatherInstitute_2F_Text_2703C0, MSGBOX_AUTOCLOSE
 	end

 Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F
-	trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208
+	trainerbattle_normal TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208
 	msgbox Route119_WeatherInstitute_2F_Text_27022B, MSGBOX_AUTOCLOSE
 	end

 Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96
-	trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE
+	trainerbattle_normal TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE
 	msgbox Route119_WeatherInstitute_2F_Text_2702DA, MSGBOX_AUTOCLOSE
 	end

 Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD
-	trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8
+	trainerbattle_normal TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8
 	msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -291,12 +291,12 @@ Route120_EventScript_1F57CE:: @ 81F57CE
 	end

 Route120_EventScript_1F57D7:: @ 81F57D7
-	trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665
+	trainerbattle_normal TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665
 	msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F57EE:: @ 81F57EE
-	trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
+	trainerbattle_normal TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route120_EventScript_1F5839
@@ -313,22 +313,22 @@ Route120_EventScript_1F581A:: @ 81F581A
 	end

 Route120_EventScript_1F5839:: @ 81F5839
-	trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1
+	trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_29E7AA, Route120_Text_29E7E1
 	msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F5850:: @ 81F5850
-	trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884
+	trainerbattle_normal TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884
 	msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F5867:: @ 81F5867
-	trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980
+	trainerbattle_normal TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980
 	msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F587E:: @ 81F587E
-	trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
+	trainerbattle_normal TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route120_EventScript_1F58C9
@@ -345,47 +345,47 @@ Route120_EventScript_1F58AA:: @ 81F58AA
 	end

 Route120_EventScript_1F58C9:: @ 81F58C9
-	trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F
+	trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_29EA61, Route120_Text_29EA8F
 	msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F58E0:: @ 81F58E0
-	trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53
+	trainerbattle_normal TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53
 	msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F58F7:: @ 81F58F7
-	trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25
+	trainerbattle_normal TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25
 	msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F590E:: @ 81F590E
-	trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF
+	trainerbattle_normal TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF
 	msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F5925:: @ 81F5925
-	trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3
+	trainerbattle_normal TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3
 	msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F593C:: @ 81F593C
-	trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97
+	trainerbattle_normal TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97
 	msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F5953:: @ 81F5953
-	trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63
+	trainerbattle_normal TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63
 	msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F596A:: @ 81F596A
-	trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080
+	trainerbattle_normal TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080
 	msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE
 	end

 Route120_EventScript_1F5981:: @ 81F5981
-	trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1
+	trainerbattle_normal TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1
 	msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route121/scripts.inc
+++ b/data/maps/Route121/scripts.inc
@@ -66,12 +66,12 @@ Route121_Movement_1F5E6B: @ 81F5E6B
 	step_end

 Route121_EventScript_1F5E74:: @ 81F5E74
-	trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F
+	trainerbattle_normal TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F
 	msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5E8B:: @ 81F5E8B
-	trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7
+	trainerbattle_normal TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route121_EventScript_1F5ED6
@@ -88,27 +88,27 @@ Route121_EventScript_1F5EB7:: @ 81F5EB7
 	end

 Route121_EventScript_1F5ED6:: @ 81F5ED6
-	trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A
+	trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_29F2A6, Route121_Text_29F31A
 	msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5EED:: @ 81F5EED
-	trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9
+	trainerbattle_normal TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9
 	msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5F04:: @ 81F5F04
-	trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9
+	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9
 	msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5F1F:: @ 81F5F1F
-	trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE
+	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE
 	msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5F3A:: @ 81F5F3A
-	trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66
+	trainerbattle_normal TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route121_EventScript_1F5F85
@@ -125,32 +125,32 @@ Route121_EventScript_1F5F66:: @ 81F5F66
 	end

 Route121_EventScript_1F5F85:: @ 81F5F85
-	trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710
+	trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_29F6E4, Route121_Text_29F710
 	msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5F9C:: @ 81F5F9C
-	trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B
+	trainerbattle_normal TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B
 	msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5FB3:: @ 81F5FB3
-	trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64
+	trainerbattle_normal TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64
 	msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5FCA:: @ 81F5FCA
-	trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8
+	trainerbattle_normal TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8
 	msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5FE1:: @ 81F5FE1
-	trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C
+	trainerbattle_normal TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C
 	msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE
 	end

 Route121_EventScript_1F5FF8:: @ 81F5FF8
-	trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024
+	trainerbattle_normal TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route121_EventScript_1F6043
@@ -167,7 +167,7 @@ Route121_EventScript_1F6024:: @ 81F6024
 	end

 Route121_EventScript_1F6043:: @ 81F6043
-	trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8
+	trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_29F855, Route121_Text_29F8A8
 	msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route123/scripts.inc
+++ b/data/maps/Route123/scripts.inc
@@ -46,22 +46,22 @@ Route123_EventScript_1F61BC:: @ 81F61BC
 	end

 Route123_EventScript_1F61C5:: @ 81F61C5
-	trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_29FBEB, Route123_Text_29FC23
+	trainerbattle_normal TRAINER_WENDY, Route123_Text_29FBEB, Route123_Text_29FC23
 	msgbox Route123_Text_29FC42, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F61DC:: @ 81F61DC
-	trainerbattle 0, TRAINER_BRAXTON, 0, Route123_Text_29FC6F, Route123_Text_29FCD6
+	trainerbattle_normal TRAINER_BRAXTON, Route123_Text_29FC6F, Route123_Text_29FCD6
 	msgbox Route123_Text_29FCF4, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F61F3:: @ 81F61F3
-	trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_29FD1D, Route123_Text_29FD53
+	trainerbattle_normal TRAINER_VIOLET, Route123_Text_29FD1D, Route123_Text_29FD53
 	msgbox Route123_Text_29FD7B, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F620A:: @ 81F620A
-	trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236
+	trainerbattle_normal TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route123_EventScript_1F6255
@@ -78,12 +78,12 @@ Route123_EventScript_1F6236:: @ 81F6236
 	end

 Route123_EventScript_1F6255:: @ 81F6255
-	trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_29FED4, Route123_Text_29FF1B
+	trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_29FED4, Route123_Text_29FF1B
 	msgbox Route123_Text_29FF27, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F626C:: @ 81F626C
-	trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298
+	trainerbattle_normal TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route123_EventScript_1F62B7
@@ -100,62 +100,62 @@ Route123_EventScript_1F6298:: @ 81F6298
 	end

 Route123_EventScript_1F62B7:: @ 81F62B7
-	trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_2A005E, Route123_Text_2A008D
+	trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_2A005E, Route123_Text_2A008D
 	msgbox Route123_Text_2A0099, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F62CE:: @ 81F62CE
-	trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D
+	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D
 	msgbox Route123_Text_2A012E, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F62E9:: @ 81F62E9
-	trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224
+	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224
 	msgbox Route123_Text_2A01EE, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F6304:: @ 81F6304
-	trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_2A025F, Route123_Text_2A02A6
+	trainerbattle_normal TRAINER_KINDRA, Route123_Text_2A025F, Route123_Text_2A02A6
 	msgbox Route123_Text_2A02C1, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F631B:: @ 81F631B
-	trainerbattle 0, TRAINER_FREDRICK, 0, Route123_Text_2A060A, Route123_Text_2A0631
+	trainerbattle_normal TRAINER_FREDRICK, Route123_Text_2A060A, Route123_Text_2A0631
 	msgbox Route123_Text_2A0672, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F6332:: @ 81F6332
-	trainerbattle 0, TRAINER_ALBERTO, 0, Route123_Text_2A06AF, Route123_Text_2A0704
+	trainerbattle_normal TRAINER_ALBERTO, Route123_Text_2A06AF, Route123_Text_2A0704
 	msgbox Route123_Text_2A072B, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F6349:: @ 81F6349
-	trainerbattle 0, TRAINER_ED, 0, Route123_Text_2A079B, Route123_Text_2A07F0
+	trainerbattle_normal TRAINER_ED, Route123_Text_2A079B, Route123_Text_2A07F0
 	msgbox Route123_Text_2A080D, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F6360:: @ 81F6360
-	trainerbattle 0, TRAINER_KAYLEY, 0, Route123_Text_2A0902, Route123_Text_2A0943
+	trainerbattle_normal TRAINER_KAYLEY, Route123_Text_2A0902, Route123_Text_2A0943
 	msgbox Route123_Text_2A096E, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F6377:: @ 81F6377
-	trainerbattle 0, TRAINER_JONAS, 0, Route123_Text_2A0854, Route123_Text_2A088A
+	trainerbattle_normal TRAINER_JONAS, Route123_Text_2A0854, Route123_Text_2A088A
 	msgbox Route123_Text_2A08CA, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F638E:: @ 81F638E
-	trainerbattle 0, TRAINER_JAZMYN, 0, Route123_Text_2A054E, Route123_Text_2A0592
+	trainerbattle_normal TRAINER_JAZMYN, Route123_Text_2A054E, Route123_Text_2A0592
 	msgbox Route123_Text_2A05AC, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F63A5:: @ 81F63A5
-	trainerbattle 0, TRAINER_DAVIS, 0, Route123_Text_2A04C0, Route123_Text_2A04FE
+	trainerbattle_normal TRAINER_DAVIS, Route123_Text_2A04C0, Route123_Text_2A04FE
 	msgbox Route123_Text_2A0512, MSGBOX_AUTOCLOSE
 	end

 Route123_EventScript_1F63BC:: @ 81F63BC
-	trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8
+	trainerbattle_normal TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route123_EventScript_1F6407
@@ -172,7 +172,7 @@ Route123_EventScript_1F63E8:: @ 81F63E8
 	end

 Route123_EventScript_1F6407:: @ 81F6407
-	trainerbattle 5, TRAINER_FERNANDO_1, 0, Route123_Text_2A03FB, Route123_Text_2A045A
+	trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_2A03FB, Route123_Text_2A045A
 	msgbox Route123_Text_2A0487, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -12,17 +12,17 @@ Route124_EventScript_1F657C:: @ 81F657C
 	end

 Route124_EventScript_1F6585:: @ 81F6585
-	trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02
+	trainerbattle_normal TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02
 	msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE
 	end

 Route124_EventScript_1F659C:: @ 81F659C
-	trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC
+	trainerbattle_normal TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC
 	msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE
 	end

 Route124_EventScript_1F65B3:: @ 81F65B3
-	trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
+	trainerbattle_normal TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route124_EventScript_1F65FE
@@ -39,22 +39,22 @@ Route124_EventScript_1F65DF:: @ 81F65DF
 	end

 Route124_EventScript_1F65FE:: @ 81F65FE
-	trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0
+	trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0
 	msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE
 	end

 Route124_EventScript_1F6615:: @ 81F6615
-	trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D
+	trainerbattle_normal TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D
 	msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE
 	end

 Route124_EventScript_1F662C:: @ 81F662C
-	trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF
+	trainerbattle_normal TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF
 	msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE
 	end

 Route124_EventScript_1F6643:: @ 81F6643
-	trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
+	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route124_EventScript_1F668C
@@ -69,12 +69,12 @@ Route124_EventScript_1F6673:: @ 81F6673
 	end

 Route124_EventScript_1F668C:: @ 81F668C
-	trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255
+	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255
 	msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE
 	end

 Route124_EventScript_1F66A7:: @ 81F66A7
-	trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
+	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route124_EventScript_1F66F0
@@ -89,17 +89,17 @@ Route124_EventScript_1F66D7:: @ 81F66D7
 	end

 Route124_EventScript_1F66F0:: @ 81F66F0
-	trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384
+	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384
 	msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE
 	end

 Route124_EventScript_1F670B:: @ 81F670B
-	trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C
+	trainerbattle_normal TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C
 	msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE
 	end

 Route124_EventScript_1F6722:: @ 81F6722
-	trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC
+	trainerbattle_normal TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC
 	msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -27,27 +27,27 @@ Route125_MapScript2_1F679A: @ 81F679A
 	.2byte 0

 Route125_EventScript_1F67A4:: @ 81F67A4
-	trainerbattle 0, TRAINER_NOLEN, 0, Route125_Text_2A1527, Route125_Text_2A155A
+	trainerbattle_normal TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A
 	msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE
 	end

 Route125_EventScript_1F67BB:: @ 81F67BB
-	trainerbattle 0, TRAINER_STAN, 0, Route125_Text_2A159F, Route125_Text_2A15C7
+	trainerbattle_normal TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7
 	msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE
 	end

 Route125_EventScript_1F67D2:: @ 81F67D2
-	trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_2A1615, Route125_Text_2A164D
+	trainerbattle_normal TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D
 	msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE
 	end

 Route125_EventScript_1F67E9:: @ 81F67E9
-	trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_2A1686, Route125_Text_2A16C5
+	trainerbattle_normal TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5
 	msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE
 	end

 Route125_EventScript_1F6800:: @ 81F6800
-	trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C
+	trainerbattle_normal TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route125_EventScript_1F684B
@@ -64,27 +64,27 @@ Route125_EventScript_1F682C:: @ 81F682C
 	end

 Route125_EventScript_1F684B:: @ 81F684B
-	trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_2A180E, Route125_Text_2A1851
+	trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_2A180E, Route125_Text_2A1851
 	msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE
 	end

 Route125_EventScript_1F6862:: @ 81F6862
-	trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8
+	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8
 	msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE
 	end

 Route125_EventScript_1F687D:: @ 81F687D
-	trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9
+	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9
 	msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE
 	end

 Route125_EventScript_1F6898:: @ 81F6898
-	trainerbattle 0, TRAINER_PRESLEY, 0, Route125_Text_2A1B1A, Route125_Text_2A1B4E
+	trainerbattle_normal TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E
 	msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE
 	end

 Route125_EventScript_1F68AF:: @ 81F68AF
-	trainerbattle 0, TRAINER_AURON, 0, Route125_Text_2A1BCE, Route125_Text_2A1BFD
+	trainerbattle_normal TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD
 	msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -8,42 +8,42 @@ Route126_MapScript1_1F68CC: @ 81F68CC
 	end

 Route126_EventScript_1F68D6:: @ 81F68D6
-	trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8
+	trainerbattle_normal TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8
 	msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE
 	end

 Route126_EventScript_1F68ED:: @ 81F68ED
-	trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63
+	trainerbattle_normal TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63
 	msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE
 	end

 Route126_EventScript_1F6904:: @ 81F6904
-	trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8
+	trainerbattle_normal TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8
 	msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE
 	end

 Route126_EventScript_1F691B:: @ 81F691B
-	trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63
+	trainerbattle_normal TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63
 	msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE
 	end

 Route126_EventScript_1F6932:: @ 81F6932
-	trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6
+	trainerbattle_normal TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6
 	msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE
 	end

 Route126_EventScript_1F6949:: @ 81F6949
-	trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3
+	trainerbattle_normal TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3
 	msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE
 	end

 Route126_EventScript_1F6960:: @ 81F6960
-	trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216
+	trainerbattle_normal TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216
 	msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE
 	end

 Route126_EventScript_1F6977:: @ 81F6977
-	trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3
+	trainerbattle_normal TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route126_EventScript_1F69C2
@@ -60,7 +60,7 @@ Route126_EventScript_1F69A3:: @ 81F69A3
 	end

 Route126_EventScript_1F69C2:: @ 81F69C2
-	trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8
+	trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8
 	msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -27,42 +27,42 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B
 	.2byte 0

 Route127_EventScript_1F6A35:: @ 81F6A35
-	trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294
+	trainerbattle_normal TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294
 	msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE
 	end

 Route127_EventScript_1F6A4C:: @ 81F6A4C
-	trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315
+	trainerbattle_normal TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315
 	msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE
 	end

 Route127_EventScript_1F6A63:: @ 81F6A63
-	trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1
+	trainerbattle_normal TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1
 	msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE
 	end

 Route127_EventScript_1F6A7A:: @ 81F6A7A
-	trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483
+	trainerbattle_normal TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483
 	msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE
 	end

 Route127_EventScript_1F6A91:: @ 81F6A91
-	trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B
+	trainerbattle_normal TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B
 	msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE
 	end

 Route127_EventScript_1F6AA8:: @ 81F6AA8
-	trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1
+	trainerbattle_normal TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1
 	msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE
 	end

 Route127_EventScript_1F6ABF:: @ 81F6ABF
-	trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC
+	trainerbattle_normal TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC
 	msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE
 	end

 Route127_EventScript_1F6AD6:: @ 81F6AD6
-	trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
+	trainerbattle_normal TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route127_EventScript_1F6B21
@@ -79,7 +79,7 @@ Route127_EventScript_1F6B02:: @ 81F6B02
 	end

 Route127_EventScript_1F6B21:: @ 81F6B21
-	trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B
+	trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B
 	msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -176,7 +176,7 @@ Route128_Movement_1F6CBB: @ 81F6CBB
 	step_end

 Route128_EventScript_1F6CBE:: @ 81F6CBE
-	trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA
+	trainerbattle_normal TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route128_EventScript_1F6D09
@@ -193,12 +193,12 @@ Route128_EventScript_1F6CEA:: @ 81F6CEA
 	end

 Route128_EventScript_1F6D09:: @ 81F6D09
-	trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8
+	trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_2A2975, Route128_Text_2A29B8
 	msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE
 	end

 Route128_EventScript_1F6D20:: @ 81F6D20
-	trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C
+	trainerbattle_normal TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq Route128_EventScript_1F6D6B
@@ -215,32 +215,32 @@ Route128_EventScript_1F6D4C:: @ 81F6D4C
 	end

 Route128_EventScript_1F6D6B:: @ 81F6D6B
-	trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB
+	trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_2A2B41, Route128_Text_2A2BAB
 	msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE
 	end

 Route128_EventScript_1F6D82:: @ 81F6D82
-	trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79
+	trainerbattle_normal TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79
 	msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE
 	end

 Route128_EventScript_1F6D99:: @ 81F6D99
-	trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE
+	trainerbattle_normal TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE
 	msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE
 	end

 Route128_EventScript_1F6DB0:: @ 81F6DB0
-	trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9
+	trainerbattle_normal TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9
 	msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE
 	end

 Route128_EventScript_1F6DC7:: @ 81F6DC7
-	trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44
+	trainerbattle_normal TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44
 	msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE
 	end

 Route128_EventScript_1F6DDE:: @ 81F6DDE
-	trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA
+	trainerbattle_normal TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA
 	msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -32,27 +32,27 @@ Route129_MapScript2_1F72E2: @ 81F72E2
 	.2byte 0

 Route129_EventScript_1F72EC:: @ 81F72EC
-	trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D
+	trainerbattle_normal TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D
 	msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE
 	end

 Route129_EventScript_1F7303:: @ 81F7303
-	trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034
+	trainerbattle_normal TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034
 	msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE
 	end

 Route129_EventScript_1F731A:: @ 81F731A
-	trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1
+	trainerbattle_normal TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1
 	msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE
 	end

 Route129_EventScript_1F7331:: @ 81F7331
-	trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D
+	trainerbattle_normal TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D
 	msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE
 	end

 Route129_EventScript_1F7348:: @ 81F7348
-	trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239
+	trainerbattle_normal TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239
 	msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -36,17 +36,17 @@ Route130_EventScript_1F73B5:: @ 81F73B5
 	return

 Route130_EventScript_1F73BF:: @ 81F73BF
-	trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6
+	trainerbattle_normal TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6
 	msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE
 	end

 Route130_EventScript_1F73D6:: @ 81F73D6
-	trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC
+	trainerbattle_normal TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC
 	msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE
 	end

 Route130_EventScript_1F73ED:: @ 81F73ED
-	trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D
+	trainerbattle_normal TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D
 	msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -18,42 +18,42 @@ Route131_EventScript_1F741F:: @ 81F741F
 	return

 Route131_EventScript_1F7429:: @ 81F7429
-	trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_2A34C8, Route131_Text_2A350D
+	trainerbattle_normal TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D
 	msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE
 	end

 Route131_EventScript_1F7440:: @ 81F7440
-	trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_2A35C6, Route131_Text_2A3626
+	trainerbattle_normal TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626
 	msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE
 	end

 Route131_EventScript_1F7457:: @ 81F7457
-	trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_2A367B, Route131_Text_2A36AB
+	trainerbattle_normal TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB
 	msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE
 	end

 Route131_EventScript_1F746E:: @ 81F746E
-	trainerbattle 0, TRAINER_KARA, 0, Route131_Text_2A3751, Route131_Text_2A378A
+	trainerbattle_normal TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A
 	msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE
 	end

 Route131_EventScript_1F7485:: @ 81F7485
-	trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7
+	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7
 	msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE
 	end

 Route131_EventScript_1F74A0:: @ 81F74A0
-	trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD
+	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD
 	msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE
 	end

 Route131_EventScript_1F74BB:: @ 81F74BB
-	trainerbattle 0, TRAINER_TALIA, 0, Route131_Text_2A39FE, Route131_Text_2A3A38
+	trainerbattle_normal TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38
 	msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE
 	end

 Route131_EventScript_1F74D2:: @ 81F74D2
-	trainerbattle 0, TRAINER_KEVIN, 0, Route131_Text_2A3AA0, Route131_Text_2A3AFC
+	trainerbattle_normal TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC
 	msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route132/scripts.inc
+++ b/data/maps/Route132/scripts.inc
@@ -2,42 +2,42 @@ Route132_MapScripts:: @ 81F74E9
 	.byte 0

 Route132_EventScript_1F74EA:: @ 81F74EA
-	trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC
+	trainerbattle_normal TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC
 	msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE
 	end

 Route132_EventScript_1F7501:: @ 81F7501
-	trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39
+	trainerbattle_normal TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39
 	msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE
 	end

 Route132_EventScript_1F7518:: @ 81F7518
-	trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD
+	trainerbattle_normal TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD
 	msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE
 	end

 Route132_EventScript_1F752F:: @ 81F752F
-	trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C
+	trainerbattle_normal TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C
 	msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE
 	end

 Route132_EventScript_1F7546:: @ 81F7546
-	trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8
+	trainerbattle_normal TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8
 	msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE
 	end

 Route132_EventScript_1F755D:: @ 81F755D
-	trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E
+	trainerbattle_normal TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E
 	msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE
 	end

 Route132_EventScript_1F7574:: @ 81F7574
-	trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD
+	trainerbattle_normal TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD
 	msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE
 	end

 Route132_EventScript_1F758B:: @ 81F758B
-	trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C
+	trainerbattle_normal TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C
 	msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route133/scripts.inc
+++ b/data/maps/Route133/scripts.inc
@@ -2,37 +2,37 @@ Route133_MapScripts:: @ 81F75A2
 	.byte 0

 Route133_EventScript_1F75A3:: @ 81F75A3
-	trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F
+	trainerbattle_normal TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F
 	msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE
 	end

 Route133_EventScript_1F75BA:: @ 81F75BA
-	trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200
+	trainerbattle_normal TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200
 	msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE
 	end

 Route133_EventScript_1F75D1:: @ 81F75D1
-	trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258
+	trainerbattle_normal TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258
 	msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE
 	end

 Route133_EventScript_1F75E8:: @ 81F75E8
-	trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0
+	trainerbattle_normal TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0
 	msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE
 	end

 Route133_EventScript_1F75FF:: @ 81F75FF
-	trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C
+	trainerbattle_normal TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C
 	msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE
 	end

 Route133_EventScript_1F7616:: @ 81F7616
-	trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A
+	trainerbattle_normal TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A
 	msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE
 	end

 Route133_EventScript_1F762D:: @ 81F762D
-	trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505
+	trainerbattle_normal TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505
 	msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/Route134/scripts.inc
+++ b/data/maps/Route134/scripts.inc
@@ -7,47 +7,47 @@ Route134_MapScript1_1F764A: @ 81F764A
 	end

 Route134_EventScript_1F7653:: @ 81F7653
-	trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB
+	trainerbattle_normal TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB
 	msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE
 	end

 Route134_EventScript_1F766A:: @ 81F766A
-	trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643
+	trainerbattle_normal TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643
 	msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE
 	end

 Route134_EventScript_1F7681:: @ 81F7681
-	trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE
+	trainerbattle_normal TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE
 	msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE
 	end

 Route134_EventScript_1F7698:: @ 81F7698
-	trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1
+	trainerbattle_normal TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1
 	msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE
 	end

 Route134_EventScript_1F76AF:: @ 81F76AF
-	trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745
+	trainerbattle_normal TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745
 	msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE
 	end

 Route134_EventScript_1F76C6:: @ 81F76C6
-	trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1
+	trainerbattle_normal TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1
 	msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE
 	end

 Route134_EventScript_1F76DD:: @ 81F76DD
-	trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10
+	trainerbattle_normal TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10
 	msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE
 	end

 Route134_EventScript_1F76F4:: @ 81F76F4
-	trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B
+	trainerbattle_normal TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B
 	msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE
 	end

 Route134_EventScript_1F770B:: @ 81F770B
-	trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B
+	trainerbattle_normal TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B
 	msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -888,19 +888,19 @@ RustboroCity_EventScript_1E10D6:: @ 81E10D6
 	return

 RustboroCity_EventScript_1E10DB:: @ 81E10DB
-	trainerbattle 3, TRAINER_MAY_14, 0, RustboroCity_Text_1E1CC1
+	trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_1E1CC1
 	setflag FLAG_0x0D3
 	goto RustboroCity_EventScript_1E10C1
 	end

 RustboroCity_EventScript_1E10EE:: @ 81E10EE
-	trainerbattle 3, TRAINER_MAY_15, 0, RustboroCity_Text_1E1CC1
+	trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_1E1CC1
 	setflag FLAG_0x0D3
 	goto RustboroCity_EventScript_1E10C1
 	end

 RustboroCity_EventScript_1E1101:: @ 81E1101
-	trainerbattle 3, TRAINER_MAY_10, 0, RustboroCity_Text_1E1CC1
+	trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_1E1CC1
 	setflag FLAG_0x0D3
 	goto RustboroCity_EventScript_1E10C1
 	end
@@ -954,19 +954,19 @@ RustboroCity_EventScript_1E11C0:: @ 81E11C0
 	end

 RustboroCity_EventScript_1E11D5:: @ 81E11D5
-	trainerbattle 3, TRAINER_BRENDAN_10, 0, RustboroCity_Text_1E1FE9
+	trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_1E1FE9
 	setflag FLAG_0x0D3
 	goto RustboroCity_EventScript_1E11C0
 	end

 RustboroCity_EventScript_1E11E8:: @ 81E11E8
-	trainerbattle 3, TRAINER_BRENDAN_12, 0, RustboroCity_Text_1E1FE9
+	trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_1E1FE9
 	setflag FLAG_0x0D3
 	goto RustboroCity_EventScript_1E11C0
 	end

 RustboroCity_EventScript_1E11FB:: @ 81E11FB
-	trainerbattle 3, TRAINER_BRENDAN_11, 0, RustboroCity_Text_1E1FE9
+	trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_1E1FE9
 	setflag FLAG_0x0D3
 	goto RustboroCity_EventScript_1E11C0
 	end
--- a/data/maps/RustboroCity_Gym/scripts.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
@@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 8212F30
 	.byte 0

 RustboroCity_Gym_EventScript_212F31:: @ 8212F31
-	trainerbattle 1, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66
+	trainerbattle_normal TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq RustboroCity_Gym_EventScript_212FC8
@@ -38,22 +38,22 @@ RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4
 	end

 RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8
-	trainerbattle 7, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93
+	trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93
 	msgbox RustboroCity_Gym_Text_213D12, MSGBOX_AUTOCLOSE
 	end

 RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3
-	trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D
+	trainerbattle_normal TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D
 	msgbox RustboroCity_Gym_Text_213447, MSGBOX_AUTOCLOSE
 	end

 RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA
-	trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6
+	trainerbattle_normal TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6
 	msgbox RustboroCity_Gym_Text_2134E6, MSGBOX_AUTOCLOSE
 	end

 RustboroCity_Gym_EventScript_213011:: @ 8213011
-	trainerbattle 0, TRAINER_MARC, 0, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589
+	trainerbattle_normal TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589
 	msgbox RustboroCity_Gym_Text_2135C0, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -313,7 +313,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
 	faceplayer
 	playbgm MUS_AQA_0, 0
 	msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0
+	trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0
 	msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT
 	giveitem_std ITEM_DEVON_GOODS
 	closemessage
@@ -426,7 +426,7 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7
 	step_end

 RusturfTunnel_EventScript_22D1B1:: @ 822D1B1
-	trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB
+	trainerbattle_normal TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB
 	msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/SSTidalLowerDeck/scripts.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
@@ -2,12 +2,12 @@ SSTidalLowerDeck_MapScripts:: @ 823C818
 	.byte 0

 SSTidalLowerDeck_EventScript_23C819:: @ 823C819
-	trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0
+	trainerbattle_normal TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0
 	msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE
 	end

 SSTidalLowerDeck_EventScript_23C830:: @ 823C830
-	trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D
+	trainerbattle_normal TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D
 	msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/SSTidalRooms/scripts.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
@@ -30,37 +30,37 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33
 	end

 SSTidalRooms_EventScript_23CA49:: @ 823CA49
-	trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58
+	trainerbattle_normal TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58
 	msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE
 	end

 SSTidalRooms_EventScript_23CA60:: @ 823CA60
-	trainerbattle 0, TRAINER_MICAH, 0, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04
+	trainerbattle_normal TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04
 	msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE
 	end

 SSTidalRooms_EventScript_23CA77:: @ 823CA77
-	trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A
+	trainerbattle_normal TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A
 	msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE
 	end

 SSTidalRooms_EventScript_23CA8E:: @ 823CA8E
-	trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6
 	msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE
 	end

 SSTidalRooms_EventScript_23CAA9:: @ 823CAA9
-	trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0
 	msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE
 	end

 SSTidalRooms_EventScript_23CAC4:: @ 823CAC4
-	trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36
+	trainerbattle_normal TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36
 	msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE
 	end

 SSTidalRooms_EventScript_23CADB:: @ 823CADB
-	trainerbattle 0, TRAINER_NAOMI, 0, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4
+	trainerbattle_normal TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4
 	msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/SeafloorCavern_Room1/scripts.inc
+++ b/data/maps/SeafloorCavern_Room1/scripts.inc
@@ -2,12 +2,12 @@ SeafloorCavern_Room1_MapScripts:: @ 82347EB
 	.byte 0

 SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC
-	trainerbattle 0, TRAINER_GRUNT_5, 0, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A
+	trainerbattle_normal TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A
 	msgbox SeafloorCavern_Room1_Text_23485D, MSGBOX_AUTOCLOSE
 	end

 SeafloorCavern_Room1_EventScript_234803:: @ 8234803
-	trainerbattle 0, TRAINER_GRUNT_6, 0, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD
+	trainerbattle_normal TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD
 	msgbox SeafloorCavern_Room1_Text_2348E3, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/SeafloorCavern_Room3/scripts.inc
+++ b/data/maps/SeafloorCavern_Room3/scripts.inc
@@ -2,12 +2,12 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937
 	.byte 0

 SeafloorCavern_Room3_EventScript_234938:: @ 8234938
-	trainerbattle 0, TRAINER_SHELLY_2, 0, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79
+	trainerbattle_normal TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79
 	msgbox SeafloorCavern_Room3_Text_234A8A, MSGBOX_AUTOCLOSE
 	end

 SeafloorCavern_Room3_EventScript_23494F:: @ 823494F
-	trainerbattle 0, TRAINER_GRUNT_27, 0, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE
+	trainerbattle_normal TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE
 	msgbox SeafloorCavern_Room3_Text_234C04, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/SeafloorCavern_Room4/scripts.inc
+++ b/data/maps/SeafloorCavern_Room4/scripts.inc
@@ -2,12 +2,12 @@ SeafloorCavern_Room4_MapScripts:: @ 8234C9B
 	.byte 0

 SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C
-	trainerbattle 0, TRAINER_GRUNT_7, 0, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3
+	trainerbattle_normal TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3
 	msgbox SeafloorCavern_Room4_Text_234CFC, MSGBOX_AUTOCLOSE
 	end

 SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3
-	trainerbattle 0, TRAINER_GRUNT_9, 0, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68
+	trainerbattle_normal TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68
 	msgbox SeafloorCavern_Room4_Text_234D79, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -26,7 +26,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E
 	waitmovement 0
 	msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_ARCHIE, 0, SeafloorCavern_Room9_Text_2351BC
+	trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC
 	msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT
 	setweather 0
 	doweather
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -32,7 +32,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8
 	compare VAR_FACING, 3
 	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3
-	trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2
+	trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2
 	msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
@@ -40,7 +40,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66
+	trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
 	waitmovement 0
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA
--- a/data/maps/SootopolisCity_Gym_1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42
 	step_end

 SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44
-	trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82
+	trainerbattle_normal TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq SootopolisCity_Gym_1F_EventScript_225025
@@ -147,7 +147,7 @@ SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B
 	end

 SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025
-	trainerbattle 7, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48
+	trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48
 	msgbox SootopolisCity_Gym_1F_Text_225A67, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
@@ -2,52 +2,52 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A
 	.byte 0

 SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B
-	trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6
+	trainerbattle_normal TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6
 	msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE
 	end

 SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2
-	trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60
+	trainerbattle_normal TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60
 	msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE
 	end

 SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9
-	trainerbattle 0, TRAINER_BRIANNA, 0, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495
+	trainerbattle_normal TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495
 	msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE
 	end

 SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0
-	trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB
+	trainerbattle_normal TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB
 	msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE
 	end

 SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7
-	trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6
+	trainerbattle_normal TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6
 	msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE
 	end

 SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE
-	trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7
+	trainerbattle_normal TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7
 	msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE
 	end

 SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15
-	trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274
+	trainerbattle_normal TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274
 	msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE
 	end

 SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C
-	trainerbattle 0, TRAINER_BETHANY, 0, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B
+	trainerbattle_normal TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B
 	msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE
 	end

 SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43
-	trainerbattle 0, TRAINER_ANNIKA, 0, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD
+	trainerbattle_normal TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD
 	msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE
 	end

 SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A
-	trainerbattle 0, TRAINER_DAPHNE, 0, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35
+	trainerbattle_normal TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35
 	msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -41,7 +41,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
 	applymovement 255, VictoryRoad_1F_Movement_2725AA
 	waitmovement 0
 	msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT
-	trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC
+	trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC
 	msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT
 	clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
 	moveobjectoffscreen 4
@@ -82,7 +82,7 @@ VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C
 	end

 VictoryRoad_1F_EventScript_235E35:: @ 8235E35
-	trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
+	trainerbattle_normal TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq VictoryRoad_1F_EventScript_235E5C
@@ -90,32 +90,32 @@ VictoryRoad_1F_EventScript_235E35:: @ 8235E35
 	end

 VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C
-	trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
+	trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
 	msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_1F_EventScript_235E73:: @ 8235E73
-	trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB
+	trainerbattle_normal TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB
 	msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A
-	trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290
+	trainerbattle_normal TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290
 	msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1
-	trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336
+	trainerbattle_normal TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336
 	msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8
-	trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4
+	trainerbattle_normal TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4
 	msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF
-	trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7
+	trainerbattle_normal TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7
 	msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE
 	end

@@ -217,4 +217,3 @@ VictoryRoad_1F_Text_2364A7: @ 82364A7
 VictoryRoad_1F_Text_2364BB: @ 82364BB
 	.string "Humph, go right on ahead.\n"
 	.string "See if I care.$"
-
--- a/data/maps/VictoryRoad_B1F/scripts.inc
+++ b/data/maps/VictoryRoad_B1F/scripts.inc
@@ -2,27 +2,27 @@ VictoryRoad_B1F_MapScripts:: @ 82364E4
 	.byte 0

 VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5
-	trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD
+	trainerbattle_normal TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD
 	msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC
-	trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D
+	trainerbattle_normal TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D
 	msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_B1F_EventScript_236513:: @ 8236513
-	trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B
+	trainerbattle_normal TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B
 	msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_B1F_EventScript_23652A:: @ 823652A
-	trainerbattle 0, TRAINER_MITCHELL, 0, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780
+	trainerbattle_normal TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780
 	msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_B1F_EventScript_236541:: @ 8236541
-	trainerbattle 0, TRAINER_HALLE, 0, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B
+	trainerbattle_normal TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B
 	msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE
 	end

--- a/data/maps/VictoryRoad_B2F/scripts.inc
+++ b/data/maps/VictoryRoad_B2F/scripts.inc
@@ -2,32 +2,32 @@ VictoryRoad_B2F_MapScripts:: @ 82368D4
 	.byte 0

 VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5
-	trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3
+	trainerbattle_normal TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3
 	msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC
-	trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92
+	trainerbattle_normal TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92
 	msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_B2F_EventScript_236903:: @ 8236903
-	trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14
+	trainerbattle_normal TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14
 	msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_B2F_EventScript_23691A:: @ 823691A
-	trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A
+	trainerbattle_normal TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A
 	msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_B2F_EventScript_236931:: @ 8236931
-	trainerbattle 0, TRAINER_FELIX, 0, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB
+	trainerbattle_normal TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB
 	msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE
 	end

 VictoryRoad_B2F_EventScript_236948:: @ 8236948
-	trainerbattle 0, TRAINER_DIANNE, 0, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E
+	trainerbattle_normal TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E
 	msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE
 	end

--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -136,61 +136,61 @@ Route111_EventScript_28CDD2:: @ 828CDD2
 	return

 Route111_EventScript_28CDD6:: @ 828CDD6
-	trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56
 	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
 	release
 	end

 Route111_EventScript_28CDF6:: @ 828CDF6
-	trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56
 	msgbox Route111_Text_28B805, MSGBOX_DEFAULT
 	release
 	end

 Route118_EventScript_28CE16:: @ 828CE16
-	trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
 	msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT
 	release
 	end

 Route118_EventScript_28CE36:: @ 828CE36
-	trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
 	msgbox Route118_Text_28B805, MSGBOX_DEFAULT
 	release
 	end

 Route120_EventScript_28CE56:: @ 828CE56
-	trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3
 	msgbox Route120_Text_28B5C0, MSGBOX_DEFAULT
 	release
 	end

 Route120_EventScript_28CE76:: @ 828CE76
-	trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3
 	msgbox Route120_Text_28B805, MSGBOX_DEFAULT
 	release
 	end

 Route111_EventScript_28CE96:: @ 828CE96
-	trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
 	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
 	release
 	end

 Route111_EventScript_28CEB6:: @ 828CEB6
-	trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
 	msgbox Route111_Text_28B805, MSGBOX_DEFAULT
 	release
 	end

 Route118_EventScript_28CED6:: @ 828CED6
-	trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
 	msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT
 	release
 	end

 Route118_EventScript_28CEF6:: @ 828CEF6
-	trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
 	msgbox Route118_Text_28B805, MSGBOX_DEFAULT
 	release
 	end
@@ -198,7 +198,7 @@ Route118_EventScript_28CEF6:: @ 828CEF6
 Route111_EventScript_28CF16:: @ 828CF16
 Route118_EventScript_28CF16:: @ 828CF16
 Route120_EventScript_28CF16:: @ 828CF16
-	trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
 	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
 	release
 	end
@@ -206,7 +206,7 @@ Route120_EventScript_28CF16:: @ 828CF16
 Route111_EventScript_28CF36:: @ 828CF36
 Route118_EventScript_28CF36:: @ 828CF36
 Route120_EventScript_28CF36:: @ 828CF36
-	trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
 	msgbox Route111_Text_28B805, MSGBOX_DEFAULT
 	release
 	end
--- a/Show More
+++ b/Show More