Rename rival trainer constants

8 files changed, 39 insertions, 39 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 390e5f278..68ef6ef51 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1574,12 +1574,12 @@ EventScript_1A6551:: @ 81A6551
 	clearflag FLAG_DEFEATED_AGATHA
 	clearflag FLAG_DEFEATED_LANCE
 	clearflag FLAG_DEFEATED_CHAMP
-	cleartrainerflag TRAINER_CHAMPION_TERRY
-	cleartrainerflag TRAINER_CHAMPION_TERRY_2
-	cleartrainerflag TRAINER_CHAMPION_TERRY_3
-	cleartrainerflag TRAINER_CHAMPION_TERRY_4
-	cleartrainerflag TRAINER_CHAMPION_TERRY_5
-	cleartrainerflag TRAINER_CHAMPION_TERRY_6
+	cleartrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE
+	cleartrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR
+	cleartrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER
+	cleartrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE
+	cleartrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR
+	cleartrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER
 	setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 0
 	return
 
diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc
index 370f73917..588df6ccd 100644
--- a/data/maps/CeruleanCity/scripts.inc
+++ b/data/maps/CeruleanCity/scripts.inc
@@ -73,15 +73,15 @@ EventScript_1664CC:: @ 81664CC
 	end
 
 EventScript_166582:: @ 8166582
-	trainerbattle 3, TRAINER_RIVAL_TERRY_7, 0, Text_17EB71
+	trainerbattle 3, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71
 	return
 
 EventScript_16658D:: @ 816658D
-	trainerbattle 3, TRAINER_RIVAL_TERRY_8, 0, Text_17EB71
+	trainerbattle 3, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71
 	return
 
 EventScript_166598:: @ 8166598
-	trainerbattle 3, TRAINER_RIVAL_TERRY_9, 0, Text_17EB71
+	trainerbattle 3, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71
 	return
 
 EventScript_1665A3:: @ 81665A3
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 27c51175a..1cdb53ca1 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -347,7 +347,7 @@ EventScript_16939C:: @ 816939C
 	end
 
 EventScript_1693AC:: @ 81693AC
-	trainerbattle 9, TRAINER_RIVAL_TERRY, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
 	goto EventScript_1694C2
 	end
 
@@ -403,7 +403,7 @@ EventScript_169414:: @ 8169414
 	end
 
 EventScript_169424:: @ 8169424
-	trainerbattle 9, TRAINER_RIVAL_TERRY_3, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
 	goto EventScript_1694C2
 	end
 
@@ -462,7 +462,7 @@ EventScript_16948F:: @ 816948F
 	end
 
 EventScript_16949F:: @ 816949F
-	trainerbattle 9, TRAINER_RIVAL_TERRY_2, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
 	goto EventScript_1694C2
 	end
 
diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
index 4238ac8a9..f4f2427b4 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
@@ -16,23 +16,23 @@ PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2
 	end
 
 EventScript_162B1E:: @ 8162B1E
-	checktrainerflag TRAINER_CHAMPION_TERRY
+	checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE
 	goto_if eq, EventScript_162B57
-	checktrainerflag TRAINER_CHAMPION_TERRY_4
+	checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE
 	goto_if eq, EventScript_162B57
 	return
 
 EventScript_162B31:: @ 8162B31
-	checktrainerflag TRAINER_CHAMPION_TERRY_2
+	checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR
 	goto_if eq, EventScript_162B57
-	checktrainerflag TRAINER_CHAMPION_TERRY_5
+	checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR
 	goto_if eq, EventScript_162B57
 	return
 
 EventScript_162B44:: @ 8162B44
-	checktrainerflag TRAINER_CHAMPION_TERRY_3
+	checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER
 	goto_if eq, EventScript_162B57
-	checktrainerflag TRAINER_CHAMPION_TERRY_6
+	checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER
 	goto_if eq, EventScript_162B57
 	return
 
@@ -142,27 +142,27 @@ EventScript_162CBC:: @ 8162CBC
 	return
 
 EventScript_162CC5:: @ 8162CC5
-	trainerbattle 3, TRAINER_CHAMPION_TERRY, 0, Text_178E3F
+	trainerbattle 3, TRAINER_CHAMPION_FIRST_SQUIRTLE, 0, Text_178E3F
 	return
 
 EventScript_162CD0:: @ 8162CD0
-	trainerbattle 3, TRAINER_CHAMPION_TERRY_2, 0, Text_178E3F
+	trainerbattle 3, TRAINER_CHAMPION_FIRST_BULBASAUR, 0, Text_178E3F
 	return
 
 EventScript_162CDB:: @ 8162CDB
-	trainerbattle 3, TRAINER_CHAMPION_TERRY_3, 0, Text_178E3F
+	trainerbattle 3, TRAINER_CHAMPION_FIRST_CHARMANDER, 0, Text_178E3F
 	return
 
 EventScript_162CE6:: @ 8162CE6
-	trainerbattle 3, TRAINER_CHAMPION_TERRY_4, 0, Text_178E3F
+	trainerbattle 3, TRAINER_CHAMPION_REMATCH_SQUIRTLE, 0, Text_178E3F
 	return
 
 EventScript_162CF1:: @ 8162CF1
-	trainerbattle 3, TRAINER_CHAMPION_TERRY_5, 0, Text_178E3F
+	trainerbattle 3, TRAINER_CHAMPION_REMATCH_BULBASAUR, 0, Text_178E3F
 	return
 
 EventScript_162CFC:: @ 8162CFC
-	trainerbattle 3, TRAINER_CHAMPION_TERRY_6, 0, Text_178E3F
+	trainerbattle 3, TRAINER_CHAMPION_REMATCH_CHARMANDER, 0, Text_178E3F
 	return
 
 Movement_162D07:: @ 8162D07
diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc
index bed73386b..4a7eb0efb 100644
--- a/data/maps/PokemonTower_2F/scripts.inc
+++ b/data/maps/PokemonTower_2F/scripts.inc
@@ -64,15 +64,15 @@ EventScript_16334B:: @ 816334B
 	return
 
 EventScript_16335D:: @ 816335D
-	trainerbattle 3, TRAINER_RIVAL_TERRY_13, 0, Text_179D73
+	trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73
 	return
 
 EventScript_163368:: @ 8163368
-	trainerbattle 3, TRAINER_RIVAL_TERRY_14, 0, Text_179D73
+	trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73
 	return
 
 EventScript_163373:: @ 8163373
-	trainerbattle 3, TRAINER_RIVAL_TERRY_15, 0, Text_179D73
+	trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73
 	return
 
 EventScript_16337E:: @ 816337E
diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc
index 37a9f5393..0996b20a0 100644
--- a/data/maps/Route22/scripts.inc
+++ b/data/maps/Route22/scripts.inc
@@ -73,15 +73,15 @@ EventScript_16835B:: @ 816835B
 	return
 
 EventScript_16836D:: @ 816836D
-	trainerbattle 9, TRAINER_RIVAL_TERRY_4, 0, Text_188959, Text_18DE1A
+	trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
 	return
 
 EventScript_16837C:: @ 816837C
-	trainerbattle 9, TRAINER_RIVAL_TERRY_5, 0, Text_188959, Text_18DE1A
+	trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
 	return
 
 EventScript_16838B:: @ 816838B
-	trainerbattle 9, TRAINER_RIVAL_TERRY_6, 0, Text_188959, Text_18DE1A
+	trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
 	return
 
 EventScript_16839A:: @ 816839A
@@ -235,15 +235,15 @@ EventScript_1684A7:: @ 81684A7
 	return
 
 EventScript_1684B9:: @ 81684B9
-	trainerbattle 3, TRAINER_RIVAL_TERRY_19, 0, Text_188B08
+	trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, 0, Text_188B08
 	return
 
 EventScript_1684C4:: @ 81684C4
-	trainerbattle 3, TRAINER_RIVAL_TERRY_20, 0, Text_188B08
+	trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, 0, Text_188B08
 	return
 
 EventScript_1684CF:: @ 81684CF
-	trainerbattle 3, TRAINER_RIVAL_TERRY_21, 0, Text_188B08
+	trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, 0, Text_188B08
 	return
 
 Movement_1684DA:: @ 81684DA
diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc
index c5ce60d07..22916f1be 100644
--- a/data/maps/SSAnne_2F_Corridor/scripts.inc
+++ b/data/maps/SSAnne_2F_Corridor/scripts.inc
@@ -83,15 +83,15 @@ EventScript_1609CA:: @ 81609CA
 	return
 
 EventScript_1609DC:: @ 81609DC
-	trainerbattle 3, TRAINER_RIVAL_TERRY_10, 0, Text_173110
+	trainerbattle 3, TRAINER_RIVAL_SS_ANNE_SQUIRTLE, 0, Text_173110
 	return
 
 EventScript_1609E7:: @ 81609E7
-	trainerbattle 3, TRAINER_RIVAL_TERRY_11, 0, Text_173110
+	trainerbattle 3, TRAINER_RIVAL_SS_ANNE_BULBASAUR, 0, Text_173110
 	return
 
 EventScript_1609F2:: @ 81609F2
-	trainerbattle 3, TRAINER_RIVAL_TERRY_12, 0, Text_173110
+	trainerbattle 3, TRAINER_RIVAL_SS_ANNE_CHARMANDER, 0, Text_173110
 	return
 
 EventScript_1609FD:: @ 81609FD
diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc
index c4f6bafab..c76aac197 100644
--- a/data/maps/SilphCo_7F/scripts.inc
+++ b/data/maps/SilphCo_7F/scripts.inc
@@ -83,15 +83,15 @@ EventScript_161A7F:: @ 8161A7F
 	return
 
 EventScript_161A80:: @ 8161A80
-	trainerbattle 3, TRAINER_RIVAL_TERRY_16, 0, Text_1767D0
+	trainerbattle 3, TRAINER_RIVAL_SILPH_SQUIRTLE, 0, Text_1767D0
 	return
 
 EventScript_161A8B:: @ 8161A8B
-	trainerbattle 3, TRAINER_RIVAL_TERRY_17, 0, Text_1767D0
+	trainerbattle 3, TRAINER_RIVAL_SILPH_BULBASAUR, 0, Text_1767D0
 	return
 
 EventScript_161A96:: @ 8161A96
-	trainerbattle 3, TRAINER_RIVAL_TERRY_18, 0, Text_1767D0
+	trainerbattle 3, TRAINER_RIVAL_SILPH_CHARMANDER, 0, Text_1767D0
 	return
 
 EventScript_161AA1:: @ 8161AA1