Use opponent constants in scripts.

1 files changed, 21 insertions, 21 deletions

diff --git a/data/scripts/maps/Route111.s b/data/scripts/maps/Route111.s
index 17cf1cdc7..10b34cf5f 100644
--- a/data/scripts/maps/Route111.s
+++ b/data/scripts/maps/Route111.s
@@ -16,7 +16,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6
 Route111_MapScript1_14FFB9:: @ 814FFB9
 	call Route111_EventScript_14FFCD
 	call Route111_EventScript_1AE313
-	checktrainerflag 312
+	checktrainerflag OPPONENT_VICKY
 	jumpif 0, Route111_EventScript_15000D
 	end
 
@@ -44,9 +44,9 @@ Route111_EventScript_15000D:: @ 815000D
 	setflag 769
 	setflag 770
 	setflag 771
-	settrainerflag 292
-	settrainerflag 299
-	settrainerflag 606
+	settrainerflag OPPONENT_VICTOR
+	settrainerflag OPPONENT_VICTORIA
+	settrainerflag OPPONENT_VIVI
 	end
 
 Route111_EventScript_150023:: @ 8150023
@@ -246,7 +246,7 @@ Route111_EventScript_1501D1:: @ 81501D1
 
 Route111_EventScript_1501F3:: @ 81501F3
 	msgbox Route111_Text_16F7B3, 4
-	trainerbattle 3, 292, 0, Route111_Text_16F7D2
+	trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2
 	move 1, Route111_Movement_1A0841
 	waitmove 0
 	call Route111_EventScript_150348
@@ -264,7 +264,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	waitmove 0
 	call Route111_EventScript_15034F
 	msgbox Route111_Text_16F82D, 4
-	trainerbattle 3, 299, 0, Route111_Text_16F8A6
+	trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6
 	move 2, Route111_Movement_1A0841
 	waitmove 0
 	call Route111_EventScript_150348
@@ -282,7 +282,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	waitmove 0
 	call Route111_EventScript_15034F
 	msgbox Route111_Text_16F90E, 4
-	trainerbattle 3, 606, 0, Route111_Text_16F956
+	trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956
 	move 3, Route111_Movement_1A0841
 	waitmove 0
 	call Route111_EventScript_150348
@@ -300,7 +300,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	waitmove 0
 	call Route111_EventScript_15034F
 	msgbox Route111_Text_16F991, 4
-	trainerbattle 3, 312, 0, Route111_Text_16F9EC
+	trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC
 	msgbox Route111_Text_16FA22, 4
 	closebutton
 	move 4, Route111_Movement_1A0841
@@ -371,27 +371,27 @@ Route111_EventScript_15039E:: @ 815039E
 	end
 
 Route111_EventScript_1503A7:: @ 81503A7
-	trainerbattle 0, 211, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7
+	trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7
 	msgbox Route111_Text_1BAC10, 6
 	end
 
 Route111_EventScript_1503BE:: @ 81503BE
-	trainerbattle 0, 469, 0, Route111_Text_1BAC60, Route111_Text_1BACC5
+	trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5
 	msgbox Route111_Text_1BACD8, 6
 	end
 
 Route111_EventScript_1503D5:: @ 81503D5
-	trainerbattle 0, 212, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3
+	trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3
 	msgbox Route111_Text_1BADC2, 6
 	end
 
 Route111_EventScript_1503EC:: @ 81503EC
-	trainerbattle 0, 470, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E
+	trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E
 	msgbox Route111_Text_1BAE81, 6
 	end
 
 Route111_EventScript_150403:: @ 8150403
-	trainerbattle 0, 44, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14
+	trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14
 	specialval RESULT, 57
 	compare RESULT, 1
 	jumpeq Route111_EventScript_15042A
@@ -399,27 +399,27 @@ Route111_EventScript_150403:: @ 8150403
 	end
 
 Route111_EventScript_15042A:: @ 815042A
-	trainerbattle 5, 44, 0, Route111_Text_1BAFC1, Route111_Text_1BB034
+	trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034
 	msgbox Route111_Text_1BB070, 6
 	end
 
 Route111_EventScript_150441:: @ 8150441
-	trainerbattle 0, 218, 0, Route111_Text_1BB111, Route111_Text_1BB140
+	trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140
 	msgbox Route111_Text_1BB15B, 6
 	end
 
 Route111_EventScript_150458:: @ 8150458
-	trainerbattle 0, 476, 0, Route111_Text_1BB199, Route111_Text_1BB1D8
+	trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8
 	msgbox Route111_Text_1BB1F6, 6
 	end
 
 Route111_EventScript_15046F:: @ 815046F
-	trainerbattle 0, 189, 0, Route111_Text_1BB250, Route111_Text_1BB27E
+	trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E
 	msgbox Route111_Text_1BB290, 6
 	end
 
 Route111_EventScript_150486:: @ 8150486
-	trainerbattle 0, 78, 0, Route111_Text_1BB2E3, Route111_Text_1BB313
+	trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313
 	specialval RESULT, 57
 	compare RESULT, 1
 	jumpeq Route111_EventScript_1504AD
@@ -427,12 +427,12 @@ Route111_EventScript_150486:: @ 8150486
 	end
 
 Route111_EventScript_1504AD:: @ 81504AD
-	trainerbattle 5, 78, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA
+	trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA
 	msgbox Route111_Text_1BB40E, 6
 	end
 
 Route111_EventScript_1504C4:: @ 81504C4
-	trainerbattle 0, 94, 0, Route111_Text_1BB44F, Route111_Text_1BB49F
+	trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F
 	specialval RESULT, 57
 	compare RESULT, 1
 	jumpeq Route111_EventScript_1504EB
@@ -440,6 +440,6 @@ Route111_EventScript_1504C4:: @ 81504C4
 	end
 
 Route111_EventScript_1504EB:: @ 81504EB
-	trainerbattle 5, 94, 0, Route111_Text_1BB529, Route111_Text_1BB5A2
+	trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2
 	msgbox Route111_Text_1BB5C1, 6
 	end