1 files changed, 69 insertions, 81 deletions
diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc
index 8036883f3..dbc10e129 100644
--- a/data/maps/Route22/scripts.inc
+++ b/data/maps/Route22/scripts.inc
@@ -1,100 +1,94 @@
 Route22_MapScripts:: @ 816828B
 	.byte 0
 
-Route22_EventScript_16828C:: @ 816828C
+Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_1682BE
-
-EventScript_168297:: @ 8168297
+	goto Route22_EventScript_EarlyRival
 	end
 
-Route22_EventScript_168298:: @ 8168298
+Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298
 	lockall
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 25, 5
-	goto EventScript_1682BE
-
-EventScript_1682AA:: @ 81682AA
+	goto Route22_EventScript_EarlyRival
 	end
 
-Route22_EventScript_1682AB:: @ 81682AB
+Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB
 	lockall
 	setvar VAR_TEMP_1, 2
 	setobjectxyperm 1, 25, 5
-	goto EventScript_1682BE
-
-EventScript_1682BD:: @ 81682BD
+	goto Route22_EventScript_EarlyRival
 	end
 
-EventScript_1682BE:: @ 81682BE
+Route22_EventScript_EarlyRival:: @ 81682BE
 	textcolor 0
 	playbgm MUS_RIVAL1, 0
 	addobject 1
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_168350
+	call_if_eq Route22_EventScript_EarlyRivalApproach
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_168350
+	call_if_eq Route22_EventScript_EarlyRivalApproach
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16835B
+	call_if_eq Route22_EventScript_EarlyRivalApproachBottom
 	delay 6
-	msgbox gUnknown_8188890
+	msgbox Route22_Text_EarlyRivalIntro
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_16836D
+	call_if_eq Route22_EventScript_EarlyRivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_16837C
+	call_if_eq Route22_EventScript_EarlyRivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_16838B
-	msgbox gUnknown_8188974
+	call_if_eq Route22_EventScript_EarlyRivalCharmander
+	msgbox Route22_Text_EarlyRivalPostBattle
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL2, 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16839A
+	call_if_eq Route22_EventScript_EarlyRivalExit
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16839A
+	call_if_eq Route22_EventScript_EarlyRivalExit
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1683A5
+	call_if_eq Route22_EventScript_EarlyRivalExitBottom
 	fadedefaultbgm
 	removeobject 1
 	setvar VAR_MAP_SCENE_ROUTE22, 2
 	releaseall
 	end
 
-EventScript_168350:: @ 8168350
-	applymovement 1, Movement_1683D1
+Route22_EventScript_EarlyRivalApproach:: @ 8168350
+	applymovement 1, Route22_Movement_RivalApproach
 	waitmovement 0
 	return
 
-EventScript_16835B:: @ 816835B
-	applymovement 1, Movement_1683D9
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
+Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B
+	applymovement 1, Route22_Movement_RivalApproachBottom
+	applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
 	waitmovement 0
 	return
 
-EventScript_16836D:: @ 816836D
-	trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
+Route22_EventScript_EarlyRivalSquirtle:: @ 816836D
+	trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
 	return
 
-EventScript_16837C:: @ 816837C
-	trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
+Route22_EventScript_EarlyRivalBulbasaur:: @ 816837C
+	trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
 	return
 
-EventScript_16838B:: @ 816838B
-	trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
+Route22_EventScript_EarlyRivalCharmander:: @ 816838B
+	trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
 	return
 
-EventScript_16839A:: @ 816839A
-	applymovement 1, Movement_1683B8
+Route22_EventScript_EarlyRivalExit:: @ 816839A
+	applymovement 1, Route22_Movement_EarlyRivalExit
 	waitmovement 0
 	return
 
-EventScript_1683A5:: @ 81683A5
-	applymovement 1, Movement_1683C5
+Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5
+	applymovement 1, Route22_Movement_EarlyRivalExitBottom
 	waitmovement 0
 	return
 
-Movement_1683B0:: @ 8
+Route22_Movement_UnusedRivalExit:: @ 8
 	walk_right
 	walk_right
 	walk_right
@@ -104,7 +98,7 @@ Movement_1683B0:: @ 8
 	walk_right
 	step_end
 
-Movement_1683B8:: @ 81683B8
+Route22_Movement_EarlyRivalExit:: @ 81683B8
 	walk_down
 	walk_right
 	walk_right
@@ -119,7 +113,7 @@ Movement_1683B8:: @ 81683B8
 	walk_down
 	step_end
 
-Movement_1683C5:: @ 81683C5
+Route22_Movement_EarlyRivalExitBottom:: @ 81683C5
 	walk_right
 	walk_right
 	walk_right
@@ -133,7 +127,7 @@ Movement_1683C5:: @ 81683C5
 	walk_down
 	step_end
 
-Movement_1683D1:: @ 81683D1
+Route22_Movement_RivalApproach:: @ 81683D1
 	walk_right
 	walk_right
 	walk_right
@@ -143,7 +137,7 @@ Movement_1683D1:: @ 81683D1
 	walk_right
 	step_end
 
-Movement_1683D9:: @ 81683D9
+Route22_Movement_RivalApproachBottom:: @ 81683D9
 	walk_right
 	walk_right
 	walk_right
@@ -155,7 +149,7 @@ Movement_1683D9:: @ 81683D9
 	walk_in_place_fastest_down
 	step_end
 
-Movement_1683E3:: @ 81683E3
+Route22_Movement_PlayerFaceRival:: @ 81683E3
 	delay_16
 	delay_16
 	delay_16
@@ -167,55 +161,49 @@ Movement_1683E3:: @ 81683E3
 	walk_in_place_fastest_up
 	step_end
 
-Route22_EventScript_1683ED:: @ 81683ED
+Route22_EventScript_LateRivalTriggerTop:: @ 81683ED
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16841F
-
-EventScript_1683F8:: @ 81683F8
+	goto Route22_EventScript_LateRival
 	end
 
-Route22_EventScript_1683F9:: @ 81683F9
+Route22_EventScript_LateRivalTriggerMid:: @ 81683F9
 	lockall
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 25, 5
-	goto EventScript_16841F
-
-EventScript_16840B:: @ 816840B
+	goto Route22_EventScript_LateRival
 	end
 
-Route22_EventScript_16840C:: @ 816840C
+Route22_EventScript_LateRivalTriggerBottom:: @ 816840C
 	lockall
 	setvar VAR_TEMP_1, 2
 	setobjectxyperm 1, 25, 5
-	goto EventScript_16841F
-
-EventScript_16841E:: @ 816841E
+	goto Route22_EventScript_LateRival
 	end
 
-EventScript_16841F:: @ 816841F
+Route22_EventScript_LateRival:: @ 816841F
 	textcolor 0
 	playbgm MUS_RIVAL1, 0
 	addobject 1
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16849C
+	call_if_eq Route22_EventScript_LateRivalApproach
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16849C
+	call_if_eq Route22_EventScript_LateRivalApproach
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1684A7
-	msgbox gUnknown_8188A3C
+	call_if_eq Route22_EventScript_LateRivalApproachBottom
+	msgbox Route22_Text_LateRivalIntro
 	setvar VAR_LAST_TALKED, 1
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_1684B9
+	call_if_eq Route22_EventScript_LateRivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_1684C4
+	call_if_eq Route22_EventScript_LateRivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_1684CF
-	msgbox gUnknown_8188B29
+	call_if_eq Route22_EventScript_LateRivalCharmander
+	msgbox Route22_Text_LateRivalPostBattle
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL2, 0
-	applymovement 1, Movement_1684DA
+	applymovement 1, Route22_Movement_LateRivalExit
 	waitmovement 0
 	fadedefaultbgm
 	removeobject 1
@@ -223,30 +211,30 @@ EventScript_16841F:: @ 816841F
 	releaseall
 	end
 
-EventScript_16849C:: @ 816849C
-	applymovement 1, Movement_1683D1
+Route22_EventScript_LateRivalApproach:: @ 816849C
+	applymovement 1, Route22_Movement_RivalApproach
 	waitmovement 0
 	return
 
-EventScript_1684A7:: @ 81684A7
-	applymovement 1, Movement_1683D9
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
+Route22_EventScript_LateRivalApproachBottom:: @ 81684A7
+	applymovement 1, Route22_Movement_RivalApproachBottom
+	applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
 	waitmovement 0
 	return
 
-EventScript_1684B9:: @ 81684B9
-	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08
+Route22_EventScript_LateRivalSquirtle:: @ 81684B9
+	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Route22_Text_LateRivalDefeat
 	return
 
-EventScript_1684C4:: @ 81684C4
-	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08
+Route22_EventScript_LateRivalBulbasaur:: @ 81684C4
+	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Route22_Text_LateRivalDefeat
 	return
 
-EventScript_1684CF:: @ 81684CF
-	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08
+Route22_EventScript_LateRivalCharmander:: @ 81684CF
+	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Route22_Text_LateRivalDefeat
 	return
 
-Movement_1684DA:: @ 81684DA
+Route22_Movement_LateRivalExit:: @ 81684DA
 	walk_left
 	walk_left
 	walk_left
@@ -256,6 +244,6 @@ Movement_1684DA:: @ 81684DA
 	walk_left
 	step_end
 
-Route22_EventScript_1684E2:: @ 81684E2
-	msgbox gUnknown_8188BFF, MSGBOX_SIGN
+Route22_EventScript_LeagueGateSign:: @ 81684E2
+	msgbox Route22_Text_LeagueGateSign, MSGBOX_SIGN
 	end