Use opponent constants in scripts.

1 files changed, 12 insertions, 12 deletions

diff --git a/data/scripts/maps/Route114.s b/data/scripts/maps/Route114.s
index 4f43cf3ad..33e89be70 100644
--- a/data/scripts/maps/Route114.s
+++ b/data/scripts/maps/Route114.s
@@ -66,27 +66,27 @@ Route114_EventScript_1507E8:: @ 81507E8
 	end
 
 Route114_EventScript_1507F1:: @ 81507F1
-	trainerbattle 0, 628, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5
+	trainerbattle 0, OPPONENT_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5
 	msgbox Route114_Text_1BC0C3, 6
 	end
 
 Route114_EventScript_150808:: @ 8150808
-	trainerbattle 0, 629, 0, Route114_Text_1BC125, Route114_Text_1BC163
+	trainerbattle 0, OPPONENT_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163
 	msgbox Route114_Text_1BC184, 6
 	end
 
 Route114_EventScript_15081F:: @ 815081F
-	trainerbattle 0, 214, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F
+	trainerbattle 0, OPPONENT_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F
 	msgbox Route114_Text_1BC24F, 6
 	end
 
 Route114_EventScript_150836:: @ 8150836
-	trainerbattle 0, 472, 0, Route114_Text_1BC289, Route114_Text_1BC2BE
+	trainerbattle 0, OPPONENT_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE
 	msgbox Route114_Text_1BC2C6, 6
 	end
 
 Route114_EventScript_15084D:: @ 815084D
-	trainerbattle 0, 143, 0, Route114_Text_1BC2F5, Route114_Text_1BC327
+	trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327
 	specialval RESULT, 57
 	compare RESULT, 1
 	jumpeq Route114_EventScript_150874
@@ -94,12 +94,12 @@ Route114_EventScript_15084D:: @ 815084D
 	end
 
 Route114_EventScript_150874:: @ 8150874
-	trainerbattle 5, 143, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0
+	trainerbattle 5, OPPONENT_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0
 	msgbox Route114_Text_1BC40F, 6
 	end
 
 Route114_EventScript_15088B:: @ 815088B
-	trainerbattle 0, 206, 0, Route114_Text_1BC45A, Route114_Text_1BC499
+	trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499
 	specialval RESULT, 57
 	compare RESULT, 1
 	jumpeq Route114_EventScript_1508B2
@@ -107,26 +107,26 @@ Route114_EventScript_15088B:: @ 815088B
 	end
 
 Route114_EventScript_1508B2:: @ 81508B2
-	trainerbattle 5, 206, 0, Route114_Text_1BC525, Route114_Text_1BC559
+	trainerbattle 5, OPPONENT_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559
 	msgbox Route114_Text_1BC58C, 6
 	end
 
 Route114_EventScript_1508C9:: @ 81508C9
-	trainerbattle 0, 338, 0, Route114_Text_1BC5FC, Route114_Text_1BC653
+	trainerbattle 0, OPPONENT_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653
 	msgbox Route114_Text_1BC679, 6
 	end
 
 Route114_EventScript_1508E0:: @ 81508E0
-	trainerbattle 0, 342, 0, Route114_Text_1BC6EC, Route114_Text_1BC750
+	trainerbattle 0, OPPONENT_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750
 	msgbox Route114_Text_1BC78A, 6
 	end
 
 Route114_EventScript_1508F7:: @ 81508F7
-	trainerbattle 4, 679, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A
+	trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A
 	msgbox Route114_Text_1BC858, 6
 	end
 
 Route114_EventScript_150912:: @ 8150912
-	trainerbattle 4, 679, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A
+	trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A
 	msgbox Route114_Text_1BC91E, 6
 	end