stuff... I don't remember

5 files changed, 142 insertions, 142 deletions

diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 29b715e7f..22ea4aaed 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -621,58 +621,58 @@
 
 	@ If the Trainer flag for Trainer index is not set, this command does absolutely nothing.
 	.macro trainerbattle type, trainer, word, pointer1, pointer2, pointer3, pointer4
-	.byte 0x5c
-	.byte \type
-	.2byte \trainer
-	.2byte \word
-	.if \type == 0
-		.4byte \pointer1 @ text
-		.4byte \pointer2 @ text
-	.elseif \type == 1
-		.4byte \pointer1 @ text
-		.4byte \pointer2 @ text
-		.4byte \pointer3 @ event script
-	.elseif \type == 2
-		.4byte \pointer1 @ text
-		.4byte \pointer2 @ text
-		.4byte \pointer3 @ event script
-	.elseif \type == 3
-		.4byte \pointer1 @ text
-	.elseif \type == 4
-		.4byte \pointer1 @ text
-		.4byte \pointer2 @ text
-		.4byte \pointer3 @ text
-	.elseif \type == 5
-		.4byte \pointer1 @ text
-		.4byte \pointer2 @ text
-	.elseif \type == 6
-		.4byte \pointer1 @ text
-		.4byte \pointer2 @ text
-		.4byte \pointer3 @ text
-		.4byte \pointer4 @ event script
-	.elseif \type == 7
-		.4byte \pointer1 @ text
-		.4byte \pointer2 @ text
-		.4byte \pointer3 @ text
-	.elseif \type == 8
-		.4byte \pointer1 @ text
-		.4byte \pointer2 @ text
-		.4byte \pointer3 @ text
-		.4byte \pointer4 @ event script
-	.endif
+		.byte 0x5c
+		.byte \type
+		.2byte \trainer
+		.2byte \word
+		.if \type == 0
+			.4byte \pointer1 @ text
+			.4byte \pointer2 @ text
+		.elseif \type == 1
+			.4byte \pointer1 @ text
+			.4byte \pointer2 @ text
+			.4byte \pointer3 @ event script
+		.elseif \type == 2
+			.4byte \pointer1 @ text
+			.4byte \pointer2 @ text
+			.4byte \pointer3 @ event script
+		.elseif \type == 3
+			.4byte \pointer1 @ text
+		.elseif \type == 4
+			.4byte \pointer1 @ text
+			.4byte \pointer2 @ text
+			.4byte \pointer3 @ text
+		.elseif \type == 5
+			.4byte \pointer1 @ text
+			.4byte \pointer2 @ text
+		.elseif \type == 6
+			.4byte \pointer1 @ text
+			.4byte \pointer2 @ text
+			.4byte \pointer3 @ text
+			.4byte \pointer4 @ event script
+		.elseif \type == 7
+			.4byte \pointer1 @ text
+			.4byte \pointer2 @ text
+			.4byte \pointer3 @ text
+		.elseif \type == 8
+			.4byte \pointer1 @ text
+			.4byte \pointer2 @ text
+			.4byte \pointer3 @ text
+			.4byte \pointer4 @ event script
+		.endif
 	.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 reptrainerbattle
+	.macro battlebegin
 	.byte 0x5d
 	.endm
 
-	.macro endtrainerbattle
+	.macro ontrainerbattleend
 	.byte 0x5e
 	.endm
 
-	.macro endtrainerbattle2
+	.macro ontrainerbattleendgoto
 	.byte 0x5f
 	.endm
 
@@ -683,13 +683,13 @@
 	.endm
 
 	@ Sets Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
-	.macro cleartrainerflag trainer
+	.macro settrainerflag trainer
 	.byte 0x61
 	.2byte \trainer
 	.endm
 
 	@ Clears Flag (trainer + 0x500). (I didn't make a mistake. The command names actually are backwards.)
-	.macro settrainerflag trainer
+	.macro cleartrainerflag trainer
 	.byte 0x62
 	.2byte \trainer
 	.endm
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 1ec043aa0..465fc1536 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -949,7 +949,7 @@ gUnknown_0819F818:: @ 819F818
 	goto EventScript_19F8F2
 
 EventScript_19F83F:
-	endtrainerbattle
+	ontrainerbattleend
 
 gUnknown_0819F840:: @ 819F840
 	lock
@@ -973,14 +973,14 @@ EventScript_19F870:
 	end
 
 EventScript_19F877:
-	endtrainerbattle
+	ontrainerbattleend
 
 gUnknown_0819F878:: @ 819F878
 	applymovement LAST_TALKED, Movement_19F8F0
 	waitmovement 0
 	special PlayTrainerEncounterMusic
-	reptrainerbattle
-	endtrainerbattle
+	battlebegin
+	ontrainerbattleend
 
 gUnknown_0819F887:: @ 819F887
 	call EventScript_19F8E5
@@ -998,7 +998,7 @@ gUnknown_0819F887:: @ 819F887
 	end
 
 EventScript_19F8AD:
-	endtrainerbattle
+	ontrainerbattleend
 
 gUnknown_0819F8AE:: @ 819F8AE
 	specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag
@@ -1018,7 +1018,7 @@ gUnknown_0819F8AE:: @ 819F8AE
 	end
 
 EventScript_19F8DD:
-	endtrainerbattle
+	ontrainerbattleend
 
 EventScript_19F8DE:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
@@ -1040,7 +1040,7 @@ EventScript_19F8F2:
 	special ScrSpecial_ShowTrainerIntroSpeech
 	waittext
 	waitbutton
-	reptrainerbattle
+	battlebegin
 	specialvar RESULT, ScrSpecial_GetTrainerBattleMode
 	compare RESULT, 0
 	goto_if_eq EventScript_19F934
@@ -1058,7 +1058,7 @@ EventScript_19F934:
 	end
 
 EventScript_19F936:
-	endtrainerbattle2
+	ontrainerbattleendgoto
 
 Std_6::
 	message 0x0
@@ -1945,66 +1945,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0
 	end
 
 DewfordTown_Gym_EventScript_1A021E:: @ 81A021E
-	cleartrainerflag OPPONENT_JOSH
-	cleartrainerflag OPPONENT_TOMMY
+	settrainerflag OPPONENT_JOSH
+	settrainerflag OPPONENT_TOMMY
 	return
 
 DewfordTown_Gym_EventScript_1A0225:: @ 81A0225
-	cleartrainerflag OPPONENT_HIDEKI
-	cleartrainerflag OPPONENT_TESSA
-	cleartrainerflag OPPONENT_LAURA
+	settrainerflag OPPONENT_HIDEKI
+	settrainerflag OPPONENT_TESSA
+	settrainerflag OPPONENT_LAURA
 	return
 
 DewfordTown_Gym_EventScript_1A022F:: @ 81A022F
-	cleartrainerflag OPPONENT_KIRK
-	cleartrainerflag OPPONENT_SHAWN
-	cleartrainerflag OPPONENT_BEN
-	cleartrainerflag OPPONENT_VIVIAN
+	settrainerflag OPPONENT_KIRK
+	settrainerflag OPPONENT_SHAWN
+	settrainerflag OPPONENT_BEN
+	settrainerflag OPPONENT_VIVIAN
 	return
 
 DewfordTown_Gym_EventScript_1A023C:: @ 81A023C
-	cleartrainerflag OPPONENT_COLE
-	cleartrainerflag OPPONENT_AXLE
-	cleartrainerflag OPPONENT_ANDY
-	cleartrainerflag OPPONENT_ZANE
-	cleartrainerflag OPPONENT_SADIE
+	settrainerflag OPPONENT_COLE
+	settrainerflag OPPONENT_AXLE
+	settrainerflag OPPONENT_ANDY
+	settrainerflag OPPONENT_ZANE
+	settrainerflag OPPONENT_SADIE
 	return
 
 DewfordTown_Gym_EventScript_1A024C:: @ 81A024C
-	cleartrainerflag OPPONENT_RANDALL
-	cleartrainerflag OPPONENT_PARKER
-	cleartrainerflag OPPONENT_GEORGE
-	cleartrainerflag OPPONENT_BERKE
-	cleartrainerflag OPPONENT_MARY
-	cleartrainerflag OPPONENT_LORI
-	cleartrainerflag OPPONENT_JODY
+	settrainerflag OPPONENT_RANDALL
+	settrainerflag OPPONENT_PARKER
+	settrainerflag OPPONENT_GEORGE
+	settrainerflag OPPONENT_BERKE
+	settrainerflag OPPONENT_MARY
+	settrainerflag OPPONENT_LORI
+	settrainerflag OPPONENT_JODY
 	return
 
 DewfordTown_Gym_EventScript_1A0262:: @ 81A0262
-	cleartrainerflag OPPONENT_JARED
-	cleartrainerflag OPPONENT_TERRELL
-	cleartrainerflag OPPONENT_KYLEE
-	cleartrainerflag OPPONENT_WILL
+	settrainerflag OPPONENT_JARED
+	settrainerflag OPPONENT_TERRELL
+	settrainerflag OPPONENT_KYLEE
+	settrainerflag OPPONENT_WILL
 	return
 
 DewfordTown_Gym_EventScript_1A026F:: @ 81A026F
-	cleartrainerflag OPPONENT_PRESTON
-	cleartrainerflag OPPONENT_VIRGIL
-	cleartrainerflag OPPONENT_FRITZ
-	cleartrainerflag OPPONENT_HANNAH
-	cleartrainerflag OPPONENT_SAMANTHA
-	cleartrainerflag OPPONENT_MAURA
+	settrainerflag OPPONENT_PRESTON
+	settrainerflag OPPONENT_VIRGIL
+	settrainerflag OPPONENT_FRITZ
+	settrainerflag OPPONENT_HANNAH
+	settrainerflag OPPONENT_SAMANTHA
+	settrainerflag OPPONENT_MAURA
 	return
 
 DewfordTown_Gym_EventScript_1A0282:: @ 81A0282
-	cleartrainerflag OPPONENT_ANDREA
-	cleartrainerflag OPPONENT_CRISSY
-	cleartrainerflag OPPONENT_BRIANNA_2
-	cleartrainerflag OPPONENT_CONNIE
-	cleartrainerflag OPPONENT_BRIDGET
-	cleartrainerflag OPPONENT_OLIVIA
-	cleartrainerflag OPPONENT_TIFFANY
-	cleartrainerflag OPPONENT_MARISSA
+	settrainerflag OPPONENT_ANDREA
+	settrainerflag OPPONENT_CRISSY
+	settrainerflag OPPONENT_BRIANNA_2
+	settrainerflag OPPONENT_CONNIE
+	settrainerflag OPPONENT_BRIDGET
+	settrainerflag OPPONENT_OLIVIA
+	settrainerflag OPPONENT_TIFFANY
+	settrainerflag OPPONENT_MARISSA
 	return
 
 DewfordTown_Gym_EventScript_1A029B:: @ 81A029B
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 32cb8d233..1359199d3 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -943,7 +943,7 @@ gUnknown_0819F818:: @ 819F818
 	goto EventScript_19F8F2
 
 EventScript_19F83F:
-	endtrainerbattle
+	ontrainerbattleend
 
 gUnknown_0819F840:: @ 819F840
 	lock
@@ -967,14 +967,14 @@ EventScript_19F870:
 	end
 
 EventScript_19F877:
-	endtrainerbattle
+	ontrainerbattleend
 
 gUnknown_0819F878:: @ 819F878
 	applymovement LAST_TALKED, Movement_19F8F0
 	waitmovement 0
 	special PlayTrainerEncounterMusic
-	reptrainerbattle
-	endtrainerbattle
+	battlebegin
+	ontrainerbattleend
 
 gUnknown_0819F887:: @ 819F887
 	call EventScript_19F8E5
@@ -992,7 +992,7 @@ gUnknown_0819F887:: @ 819F887
 	end
 
 EventScript_19F8AD:
-	endtrainerbattle
+	ontrainerbattleend
 
 gUnknown_0819F8AE:: @ 819F8AE
 	specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag
@@ -1012,7 +1012,7 @@ gUnknown_0819F8AE:: @ 819F8AE
 	end
 
 EventScript_19F8DD:
-	endtrainerbattle
+	ontrainerbattleend
 
 EventScript_19F8DE:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
@@ -1034,7 +1034,7 @@ EventScript_19F8F2:
 	special ScrSpecial_ShowTrainerIntroSpeech
 	waittext
 	waitbutton
-	reptrainerbattle
+	battlebegin
 	specialvar RESULT, ScrSpecial_GetTrainerBattleMode
 	compare RESULT, 0
 	goto_if_eq EventScript_19F934
@@ -1052,7 +1052,7 @@ EventScript_19F934:
 	end
 
 EventScript_19F936:
-	endtrainerbattle2
+	ontrainerbattleendgoto
 
 Std_6::
 	message 0x0
@@ -1939,66 +1939,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0
 	end
 
 DewfordTown_Gym_EventScript_1A021E:: @ 81A021E
-	cleartrainerflag OPPONENT_JOSH
-	cleartrainerflag OPPONENT_TOMMY
+	settrainerflag OPPONENT_JOSH
+	settrainerflag OPPONENT_TOMMY
 	return
 
 DewfordTown_Gym_EventScript_1A0225:: @ 81A0225
-	cleartrainerflag OPPONENT_HIDEKI
-	cleartrainerflag OPPONENT_TESSA
-	cleartrainerflag OPPONENT_LAURA
+	settrainerflag OPPONENT_HIDEKI
+	settrainerflag OPPONENT_TESSA
+	settrainerflag OPPONENT_LAURA
 	return
 
 DewfordTown_Gym_EventScript_1A022F:: @ 81A022F
-	cleartrainerflag OPPONENT_KIRK
-	cleartrainerflag OPPONENT_SHAWN
-	cleartrainerflag OPPONENT_BEN
-	cleartrainerflag OPPONENT_VIVIAN
+	settrainerflag OPPONENT_KIRK
+	settrainerflag OPPONENT_SHAWN
+	settrainerflag OPPONENT_BEN
+	settrainerflag OPPONENT_VIVIAN
 	return
 
 DewfordTown_Gym_EventScript_1A023C:: @ 81A023C
-	cleartrainerflag OPPONENT_COLE
-	cleartrainerflag OPPONENT_AXLE
-	cleartrainerflag OPPONENT_ANDY
-	cleartrainerflag OPPONENT_ZANE
-	cleartrainerflag OPPONENT_SADIE
+	settrainerflag OPPONENT_COLE
+	settrainerflag OPPONENT_AXLE
+	settrainerflag OPPONENT_ANDY
+	settrainerflag OPPONENT_ZANE
+	settrainerflag OPPONENT_SADIE
 	return
 
 DewfordTown_Gym_EventScript_1A024C:: @ 81A024C
-	cleartrainerflag OPPONENT_RANDALL
-	cleartrainerflag OPPONENT_PARKER
-	cleartrainerflag OPPONENT_GEORGE
-	cleartrainerflag OPPONENT_BERKE
-	cleartrainerflag OPPONENT_MARY
-	cleartrainerflag OPPONENT_LORI
-	cleartrainerflag OPPONENT_JODY
+	settrainerflag OPPONENT_RANDALL
+	settrainerflag OPPONENT_PARKER
+	settrainerflag OPPONENT_GEORGE
+	settrainerflag OPPONENT_BERKE
+	settrainerflag OPPONENT_MARY
+	settrainerflag OPPONENT_LORI
+	settrainerflag OPPONENT_JODY
 	return
 
 DewfordTown_Gym_EventScript_1A0262:: @ 81A0262
-	cleartrainerflag OPPONENT_JARED
-	cleartrainerflag OPPONENT_TERRELL
-	cleartrainerflag OPPONENT_KYLEE
-	cleartrainerflag OPPONENT_WILL
+	settrainerflag OPPONENT_JARED
+	settrainerflag OPPONENT_TERRELL
+	settrainerflag OPPONENT_KYLEE
+	settrainerflag OPPONENT_WILL
 	return
 
 DewfordTown_Gym_EventScript_1A026F:: @ 81A026F
-	cleartrainerflag OPPONENT_PRESTON
-	cleartrainerflag OPPONENT_VIRGIL
-	cleartrainerflag OPPONENT_FRITZ
-	cleartrainerflag OPPONENT_HANNAH
-	cleartrainerflag OPPONENT_SAMANTHA
-	cleartrainerflag OPPONENT_MAURA
+	settrainerflag OPPONENT_PRESTON
+	settrainerflag OPPONENT_VIRGIL
+	settrainerflag OPPONENT_FRITZ
+	settrainerflag OPPONENT_HANNAH
+	settrainerflag OPPONENT_SAMANTHA
+	settrainerflag OPPONENT_MAURA
 	return
 
 DewfordTown_Gym_EventScript_1A0282:: @ 81A0282
-	cleartrainerflag OPPONENT_ANDREA
-	cleartrainerflag OPPONENT_CRISSY
-	cleartrainerflag OPPONENT_BRIANNA_2
-	cleartrainerflag OPPONENT_CONNIE
-	cleartrainerflag OPPONENT_BRIDGET
-	cleartrainerflag OPPONENT_OLIVIA
-	cleartrainerflag OPPONENT_TIFFANY
-	cleartrainerflag OPPONENT_MARISSA
+	settrainerflag OPPONENT_ANDREA
+	settrainerflag OPPONENT_CRISSY
+	settrainerflag OPPONENT_BRIANNA_2
+	settrainerflag OPPONENT_CONNIE
+	settrainerflag OPPONENT_BRIDGET
+	settrainerflag OPPONENT_OLIVIA
+	settrainerflag OPPONENT_TIFFANY
+	settrainerflag OPPONENT_MARISSA
 	return
 
 DewfordTown_Gym_EventScript_1A029B:: @ 81A029B
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index cad2c6a48..214c61142 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -1,7 +1,7 @@
 Route111_EventScript_1AE313:: @ 81AE313
 Route118_EventScript_1AE313:: @ 81AE313
 Route120_EventScript_1AE313:: @ 81AE313
-	settrainerflag OPPONENT_GABBY_AND_TY_6
+	cleartrainerflag OPPONENT_GABBY_AND_TY_6
 	specialvar RESULT, GabbyAndTyGetBattleNum
 	switch RESULT
 	case 0, Route111_EventScript_1AE384
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index 879735ece..de37c68fc 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -44,9 +44,9 @@ Route111_EventScript_15000D:: @ 815000D
 	setflag 769
 	setflag 770
 	setflag 771
-	settrainerflag OPPONENT_VICTOR
-	settrainerflag OPPONENT_VICTORIA
-	settrainerflag OPPONENT_VIVI
+	cleartrainerflag OPPONENT_VICTOR
+	cleartrainerflag OPPONENT_VICTORIA
+	cleartrainerflag OPPONENT_VIVI
 	end
 
 Route111_EventScript_150023:: @ 8150023