Document gabby_and_ty.inc

data/maps/Route111/map.json

@@ -196,7 +196,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CDF6",
+      "script": "GabbyAndTy_EventScript_TyBattle1",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CDD6",
+      "script": "GabbyAndTy_EventScript_GabbyBattle1",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1"
     },
     {
@@ -300,7 +300,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CE96",
+      "script": "GabbyAndTy_EventScript_GabbyBattle4",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3"
     },
     {
@@ -313,7 +313,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CEB6",
+      "script": "GabbyAndTy_EventScript_TyBattle4",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3"
     },
     {
@@ -326,7 +326,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CF16",
+      "script": "GabbyAndTy_EventScript_GabbyBattle6",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2"
     },
     {
@@ -339,7 +339,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_28CF36",
+      "script": "GabbyAndTy_EventScript_TyBattle6",
       "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2"
     },
     {

data/maps/Route111/scripts.inc

@@ -46,7 +46,7 @@ Route111_OnTransition: @ 81F0D87
 	compare VAR_MIRAGE_TOWER_STATE, 2
 	call_if_eq Route111_EventScript_1F0E40
 	call Route111_EventScript_1F0DE6
-	call Route111_EventScript_28CCC7
+	call GabbyAndTy_EventScript_UpdateLocation
 	checktrainerflag TRAINER_VICKY
 	goto_if_lt Route111_EventScript_1F0E26
 	end

data/maps/Route118/map.json

@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CE16",
+      "script": "GabbyAndTy_EventScript_GabbyBattle2",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CE36",
+      "script": "GabbyAndTy_EventScript_TyBattle2",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CED6",
+      "script": "Route118_EventScript_GabbyBattle5",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CEF6",
+      "script": "Route118_EventScript_TyBattle5",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CF16",
+      "script": "GabbyAndTy_EventScript_GabbyBattle6",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_28CF36",
+      "script": "GabbyAndTy_EventScript_TyBattle6",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3"
     },
     {

data/maps/Route118/scripts.inc

@@ -5,7 +5,7 @@ Route118_MapScripts:: @ 81F3DBC
 	.byte 0
 
 Route118_OnTransition: @ 81F3DCC
-	call Route118_EventScript_28CCC7
+	call GabbyAndTy_EventScript_UpdateLocation
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST

data/maps/Route120/map.json

@@ -243,7 +243,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_28CE76",
+      "script": "GabbyAndTy_EventScript_TyBattle3",
       "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_28CE56",
+      "script": "GabbyAndTy_EventScript_GabbyBattle3",
       "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_28CF16",
+      "script": "GabbyAndTy_EventScript_GabbyBattle6",
       "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_28CF36",
+      "script": "GabbyAndTy_EventScript_TyBattle6",
       "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2"
     },
     {

data/maps/Route120/scripts.inc

@@ -61,7 +61,7 @@ Route120_EventScript_1F54C8:: @ 81F54C8
 	return
 
 Route120_OnTransition: @ 81F54CD
-	call Route120_EventScript_28CCC7
+	call GabbyAndTy_EventScript_UpdateLocation
 	call Route120_EventScript_1F54D8
 	end
 

data/scripts/gabby_and_ty.inc

@@ -1,337 +1,332 @@
+@ Unused
 EventScript_28CCAA:: @ 828CCAA
 	setvar VAR_0x8005, 8
 	special InterviewBefore
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_28CCC6
+	goto_if_eq EventScript_UnusedRet
 	setvar VAR_0x8005, 8
 	special InterviewAfter
 	return
 
-EventScript_28CCC6:: @ 828CCC6
+EventScript_UnusedRet:: @ 828CCC6
 	return
 
-Route111_EventScript_28CCC7:: @ 828CCC7
+@ Gabby and Ty always move to the same spots for the first 5 battles
-Route118_EventScript_28CCC7:: @ 828CCC7
+@ From the 6th battle onwards, they move randomly between locations 6-8
-Route120_EventScript_28CCC7:: @ 828CCC7
+GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7
 	cleartrainerflag TRAINER_GABBY_AND_TY_6
 	specialvar VAR_RESULT, GabbyAndTyGetBattleNum
 	switch VAR_RESULT
-	case 0, Route111_EventScript_28CD38
+	case 0, GabbyAndTy_EventScript_MoveForBattle1
-	case 1, Route111_EventScript_28CD3E
+	case 1, GabbyAndTy_EventScript_MoveForBattle2
-	case 2, Route111_EventScript_28CD49
+	case 2, GabbyAndTy_EventScript_MoveForBattle3
-	case 3, Route111_EventScript_28CD54
+	case 3, GabbyAndTy_EventScript_MoveForBattle4
-	case 4, Route111_EventScript_28CD5F
+	case 4, GabbyAndTy_EventScript_MoveForBattle5
-	case 5, Route111_EventScript_28CD6A
+	case 5, GabbyAndTy_EventScript_MoveForBattle6
-	case 6, Route111_EventScript_28CD75
+	case 6, GabbyAndTy_EventScript_MoveForBattle7
-	case 7, Route111_EventScript_28CD80
+	case 7, GabbyAndTy_EventScript_MoveForBattle8
-	case 8, Route111_EventScript_28CD8B
+	case 8, GabbyAndTy_EventScript_MoveForBattle9
 	end
 
-Route111_EventScript_28CD38:: @ 828CD38
+GabbyAndTy_EventScript_MoveForBattle1:: @ 828CD38
-	call Route111_EventScript_28CD9A
+	call GabbyAndTy_EventScript_ShowAtRoute111_1
 	return
 
-Route111_EventScript_28CD3E:: @ 828CD3E
+GabbyAndTy_EventScript_MoveForBattle2:: @ 828CD3E
-	call Route111_EventScript_28CDA2
+	call GabbyAndTy_EventScript_ShowAtRoute118_1
-	call Route111_EventScript_28CD96
+	call GabbyAndTy_EventScript_HideAtRoute111_1
 	return
 
-Route111_EventScript_28CD49:: @ 828CD49
+GabbyAndTy_EventScript_MoveForBattle3:: @ 828CD49
-	call Route111_EventScript_28CDAA
+	call GabbyAndTy_EventScript_ShowAtRoute120_1
-	call Route111_EventScript_28CD9E
+	call GabbyAndTy_EventScript_HideAtRoute118_1
 	return
 
-Route111_EventScript_28CD54:: @ 828CD54
+GabbyAndTy_EventScript_MoveForBattle4:: @ 828CD54
-	call Route111_EventScript_28CDB2
+	call GabbyAndTy_EventScript_ShowAtRoute111_3
-	call Route111_EventScript_28CDA6
+	call GabbyAndTy_EventScript_HideAtRoute120_1
 	return
 
-Route111_EventScript_28CD5F:: @ 828CD5F
+GabbyAndTy_EventScript_MoveForBattle5:: @ 828CD5F
-	call Route111_EventScript_28CDBA
+	call GabbyAndTy_EventScript_ShowAtRoute118_2
-	call Route111_EventScript_28CDAE
+	call GabbyAndTy_EventScript_HideAtRoute111_3
 	return
 
-Route111_EventScript_28CD6A:: @ 828CD6A
+GabbyAndTy_EventScript_MoveForBattle6:: @ 828CD6A
-	call Route111_EventScript_28CDC2
+	call GabbyAndTy_EventScript_ShowAtRoute120_2
-	call Route111_EventScript_28CDB6
+	call GabbyAndTy_EventScript_HideAtRoute118_2
 	return
 
-Route111_EventScript_28CD75:: @ 828CD75
+GabbyAndTy_EventScript_MoveForBattle7:: @ 828CD75
-	call Route111_EventScript_28CDCA
+	call GabbyAndTy_EventScript_ShowAtRoute111_2
-	call Route111_EventScript_28CDBE
+	call GabbyAndTy_EventScript_HideAtRoute120_2
 	return
 
-Route111_EventScript_28CD80:: @ 828CD80
+GabbyAndTy_EventScript_MoveForBattle8:: @ 828CD80
-	call Route111_EventScript_28CDD2
+	call GabbyAndTy_EventScript_ShowAtRoute118_3
-	call Route111_EventScript_28CDC6
+	call GabbyAndTy_EventScript_HideAtRoute111_2
 	return
 
-Route111_EventScript_28CD8B:: @ 828CD8B
+GabbyAndTy_EventScript_MoveForBattle9:: @ 828CD8B
-	call Route111_EventScript_28CDC2
+	call GabbyAndTy_EventScript_ShowAtRoute120_2
-	call Route111_EventScript_28CDCE
+	call GabbyAndTy_EventScript_HideAtRoute118_3
 	return
 
-Route111_EventScript_28CD96:: @ 828CD96
+GabbyAndTy_EventScript_HideAtRoute111_1:: @ 828CD96
 	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CD9A:: @ 828CD9A
+GabbyAndTy_EventScript_ShowAtRoute111_1:: @ 828CD9A
 	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CD9E:: @ 828CD9E
+GabbyAndTy_EventScript_HideAtRoute118_1:: @ 828CD9E
 	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CDA2:: @ 828CDA2
+GabbyAndTy_EventScript_ShowAtRoute118_1:: @ 828CDA2
 	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CDA6:: @ 828CDA6
+GabbyAndTy_EventScript_HideAtRoute120_1:: @ 828CDA6
 	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CDAA:: @ 828CDAA
+GabbyAndTy_EventScript_ShowAtRoute120_1:: @ 828CDAA
 	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CDAE:: @ 828CDAE
+GabbyAndTy_EventScript_HideAtRoute111_3:: @ 828CDAE
 	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
-Route111_EventScript_28CDB2:: @ 828CDB2
+GabbyAndTy_EventScript_ShowAtRoute111_3:: @ 828CDB2
 	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
-Route111_EventScript_28CDB6:: @ 828CDB6
+GabbyAndTy_EventScript_HideAtRoute118_2:: @ 828CDB6
 	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDBA:: @ 828CDBA
+GabbyAndTy_EventScript_ShowAtRoute118_2:: @ 828CDBA
 	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDBE:: @ 828CDBE
+GabbyAndTy_EventScript_HideAtRoute120_2:: @ 828CDBE
 	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDC2:: @ 828CDC2
+GabbyAndTy_EventScript_ShowAtRoute120_2:: @ 828CDC2
 	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDC6:: @ 828CDC6
+GabbyAndTy_EventScript_HideAtRoute111_2:: @ 828CDC6
 	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDCA:: @ 828CDCA
+GabbyAndTy_EventScript_ShowAtRoute111_2:: @ 828CDCA
 	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDCE:: @ 828CDCE
+GabbyAndTy_EventScript_HideAtRoute118_3:: @ 828CDCE
 	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
-Route111_EventScript_28CDD2:: @ 828CDD2
+GabbyAndTy_EventScript_ShowAtRoute118_3:: @ 828CDD2
 	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
-Route111_EventScript_28CDD6:: @ 828CDD6
+GabbyAndTy_EventScript_GabbyBattle1:: @ 828CDD6
-	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_GabbyPreFirstBattle, GabbyAndTy_Text_GabbyDefeatFirstTime, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview
-	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CDF6:: @ 828CDF6
+GabbyAndTy_EventScript_TyBattle1:: @ 828CDF6
-	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_TyPreFirstBattle, GabbyAndTy_Text_TyDefeatFirstTime, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview
-	msgbox Route111_Text_28B805, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_28CE16:: @ 828CE16
+GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16
-	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-	msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_28CE36:: @ 828CE36
+GabbyAndTy_EventScript_TyBattle2:: @ 828CE36
-	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-	msgbox Route118_Text_28B805, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_28CE56:: @ 828CE56
+GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56
-	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-	msgbox Route120_Text_28B5C0, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_28CE76:: @ 828CE76
+GabbyAndTy_EventScript_TyBattle3:: @ 828CE76
-	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-	msgbox Route120_Text_28B805, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CE96:: @ 828CE96
+GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96
-	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CEB6:: @ 828CEB6
+GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6
-	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-	msgbox Route111_Text_28B805, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_28CED6:: @ 828CED6
+Route118_EventScript_GabbyBattle5:: @ 828CED6
-	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-	msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_28CEF6:: @ 828CEF6
+Route118_EventScript_TyBattle5:: @ 828CEF6
-	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-	msgbox Route118_Text_28B805, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CF16:: @ 828CF16
+GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16
-Route118_EventScript_28CF16:: @ 828CF16
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-Route120_EventScript_28CF16:: @ 828CF16
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
-	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
-	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CF36:: @ 828CF36
+GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
-Route118_EventScript_28CF36:: @ 828CF36
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
-Route120_EventScript_28CF36:: @ 828CF36
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
-	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
-	msgbox Route111_Text_28B805, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CF56:: @ 828CF56
+GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
 	special GabbyAndTyBeforeInterview
 	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route111_EventScript_28CF94
+	call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route111_EventScript_28CF9F
+	call_if_eq GabbyAndTy_EventScript_FacePlayerSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route111_EventScript_28CFB1
+	call_if_eq GabbyAndTy_EventScript_FacePlayerEast
-	goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
+	goto_if_set FLAG_TEMP_1, GabbyAndTy_EventScript_KeepingAnEyeOutForYou
-	msgbox Route111_Text_28B042, MSGBOX_YESNO
+	msgbox GabbyAndTy_Text_WhoAreYouInterview, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28CF94:: @ 828CF94
+GabbyAndTy_EventScript_FacePlayerNorth:: @ 828CF94
-	applymovement VAR_0x8004, Route111_Movement_28D04D
+	applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
-Route111_EventScript_28CF9F:: @ 828CF9F
+GabbyAndTy_EventScript_FacePlayerSouth:: @ 828CF9F
-	applymovement VAR_0x8004, Route111_Movement_28D04F
+	applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceUp
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-Route111_EventScript_28CFB1:: @ 828CFB1
+GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1
-	applymovement VAR_0x8004, Route111_Movement_28D051
+	applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceLeft
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-Route111_EventScript_28CFC3:: @ 828CFC3
+GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
-Route118_EventScript_28CFC3:: @ 828CFC3
-Route120_EventScript_28CFC3:: @ 828CFC3
 	special GabbyAndTyBeforeInterview
 	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route111_EventScript_28CF94
+	call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route111_EventScript_28CF9F
+	call_if_eq GabbyAndTy_EventScript_FacePlayerSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route111_EventScript_28CFB1
+	call_if_eq GabbyAndTy_EventScript_FacePlayerEast
-	goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
+	goto_if_set FLAG_TEMP_1, GabbyAndTy_EventScript_KeepingAnEyeOutForYou
 	specialvar VAR_RESULT, GabbyAndTyGetLastQuote
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_28D053
+	goto_if_eq GabbyAndTy_EventScript_DidntInterviewLastTime
-	msgbox Route111_Text_28B137, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_QuoteFromLastInterview, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia
 	switch VAR_RESULT
-	case 0, Route111_EventScript_28D061
+	case 0, GabbyAndTy_EventScript_RequestInterviewNoTrivia
-	case 1, Route111_EventScript_28D06F
+	case 1, GabbyAndTy_EventScript_RequestInterviewShortBattle
-	case 2, Route111_EventScript_28D07D
+	case 2, GabbyAndTy_EventScript_RequestInterviewThrewBall
-	case 3, Route111_EventScript_28D08B
+	case 3, GabbyAndTy_EventScript_RequestInterviewUsedItems
-	case 4, Route111_EventScript_28D099
+	case 4, GabbyAndTy_EventScript_RequestInterviewLostAMon
 	end
 
-Route111_Movement_28D04D: @ 828D04D
+GabbyAndTy_Movement_WalkInPlaceDown: @ 828D04D
 	walk_in_place_down
 	step_end
 
-Route111_Movement_28D04F: @ 828D04F
+GabbyAndTy_Movement_WalkInPlaceUp: @ 828D04F
 	walk_in_place_up
 	step_end
 
-Route111_Movement_28D051: @ 828D051
+GabbyAndTy_Movement_WalkInPlaceLeft: @ 828D051
 	walk_in_place_left
 	step_end
 
-Route111_EventScript_28D053:: @ 828D053
+GabbyAndTy_EventScript_DidntInterviewLastTime:: @ 828D053
-	msgbox Route111_Text_28B62D, MSGBOX_YESNO
+	msgbox GabbyAndTy_Text_GiveUsAnInterviewThisTime, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D061:: @ 828D061
+GabbyAndTy_EventScript_RequestInterviewNoTrivia:: @ 828D061
-	msgbox Route111_Text_28B3F3, MSGBOX_YESNO
+	msgbox GabbyAndTy_Text_InterviewAgain, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D06F:: @ 828D06F
+GabbyAndTy_EventScript_RequestInterviewShortBattle:: @ 828D06F
-	msgbox Route111_Text_28B1B3, MSGBOX_YESNO
+	msgbox GabbyAndTy_Text_YouStompedUsInterviewAgain, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D07D:: @ 828D07D
+GabbyAndTy_EventScript_RequestInterviewThrewBall:: @ 828D07D
-	msgbox Route111_Text_28B23D, MSGBOX_YESNO
+	msgbox GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D08B:: @ 828D08B
+GabbyAndTy_EventScript_RequestInterviewUsedItems:: @ 828D08B
-	msgbox Route111_Text_28B2FA, MSGBOX_YESNO
+	msgbox GabbyAndTy_Text_CleverItemSkillsInterviewAgain, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D099:: @ 828D099
+GabbyAndTy_EventScript_RequestInterviewLostAMon:: @ 828D099
-	msgbox Route111_Text_28B379, MSGBOX_YESNO
+	msgbox GabbyAndTy_Text_WeLookedRespectableInterviewAgain, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D0A7:: @ 828D0A7
+GabbyAndTy_EventScript_Interview:: @ 828D0A7
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_28D0E1
+	goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut
-	msgbox Route111_Text_28B433, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_DescribeYourFeelings, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_28D0E1
+	goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut
-	msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_PerfectWellBeSeeingYou, MSGBOX_DEFAULT
 	special GabbyAndTyAfterInterview
 	setflag FLAG_TEMP_1
 	release
 	end
 
-Route111_EventScript_28D0E1:: @ 828D0E1
+GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut:: @ 828D0E1
-	msgbox Route111_Text_28B577, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_DontGiveUpKeepingEyeOut, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	release
 	end
 
-Route111_EventScript_28D0EE:: @ 828D0EE
+GabbyAndTy_EventScript_KeepingAnEyeOutForYou:: @ 828D0EE
-	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end

data/text/tv.inc

@@ -2694,25 +2694,23 @@ gTVPokemonBattleUpdateText07:: @ 0828AE26
 	.string "This concludes this episode of\n"
 	.string "“POKéMON BATTLE UPDATE!”$"
 
-Route111_Text_28AF05: @ 0828AF05
+GabbyAndTy_Text_GabbyPreFirstBattle: @ 0828AF05
 	.string "GABBY: Oh! We've just spotted a tough-\n"
 	.string "looking TRAINER here of all places!\p"
 	.string "Okay, roll camera!\n"
 	.string "Let's get this interview.$"
 
-Route111_Text_28AF7D: @ 0828AF7D
+GabbyAndTy_Text_GabbyPreBattle: @ 0828AF7D
-Route118_Text_28AF7D: @ 0828AF7D
-Route120_Text_28AF7D: @ 0828AF7D
 	.string "GABBY: Oh! You're {PLAYER}! Hi!\n"
 	.string "Do you remember us from last time?\p"
 	.string "Can you show us how much stronger\n"
 	.string "you've become? Okay, cue interview!$"
 
-Route111_Text_28B000: @ 0828B000
+GabbyAndTy_Text_GabbyDefeatFirstTime: @ 0828B000
 	.string "GABBY: My eyes didn't lie!\n"
 	.string "I did discover an astonishing TRAINER!$"
 
-Route111_Text_28B042: @ 0828B042
+GabbyAndTy_Text_WhoAreYouInterview: @ 0828B042
 	.string "GABBY: Awesome! Awesome!\n"
 	.string "Who are you?!\p"
 	.string "I knew we were onto something wild\n"
@@ -2723,19 +2721,19 @@ Route111_Text_28B042: @ 0828B042
 	.string "So, would you give us a bit of your time\n"
 	.string "for an interview?$"
 
-Route111_Text_28B137: @ 0828B137
+GabbyAndTy_Text_QuoteFromLastInterview: @ 0828B137
 	.string "GABBY: “{STR_VAR_1}!”\p"
 	.string "Remember? That's the quote you gave\n"
 	.string "us as the battle clincher last time.\p"
 	.string "I never, ever forget stuff like that!$"
 
-Route111_Text_28B1B3: @ 0828B1B3
+GabbyAndTy_Text_YouStompedUsInterviewAgain: @ 0828B1B3
 	.string "The last time we battled, you stomped\n"
 	.string "us before we could brace ourselves…\p"
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B23D: @ 0828B23D
+GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain: @ 0828B23D
 	.string "The last time we battled, didn't you\n"
 	.string "throw a POKé BALL at us?\p"
 	.string "We were shocked! So we told everyone,\n"
@@ -2743,30 +2741,30 @@ Route111_Text_28B23D: @ 0828B23D
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B2FA: @ 0828B2FA
+GabbyAndTy_Text_CleverItemSkillsInterviewAgain: @ 0828B2FA
 	.string "The last time we battled, your item\n"
 	.string "skills cleverly did us in.\p"
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B379: @ 0828B379
+GabbyAndTy_Text_WeLookedRespectableInterviewAgain: @ 0828B379
 	.string "The last time we battled, we managed\n"
 	.string "to look respectable.\p"
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B3F3: @ 0828B3F3
+GabbyAndTy_Text_InterviewAgain: @ 0828B3F3
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-Route111_Text_28B433: @ 0828B433
+GabbyAndTy_Text_DescribeYourFeelings: @ 0828B433
 	.string "You will?\n"
 	.string "Thank you!\p"
 	.string "Okay, I need you to describe your\n"
 	.string "feelings about our battle, but it\l"
 	.string "has to be short and sweet. Go!$"
 
-Route111_Text_28B4AB: @ 0828B4AB
+GabbyAndTy_Text_PerfectWellBeSeeingYou: @ 0828B4AB
 	.string "GABBY: Mmm, yeah!\n"
 	.string "That's the perfect clincher!\p"
 	.string "I get the feeling that this will make\n"
@@ -2776,24 +2774,20 @@ Route111_Text_28B4AB: @ 0828B4AB
 	.string "Okay!\n"
 	.string "We'll be seeing you!$"
 
-Route111_Text_28B577: @ 0828B577
+GabbyAndTy_Text_DontGiveUpKeepingEyeOut: @ 0828B577
 	.string "GABBY: Oh…\p"
 	.string "Okay, but don't give up!\n"
 	.string "We'll be keeping an eye out for you!$"
 
-Route111_Text_28B5C0: @ 0828B5C0
+GabbyAndTy_Text_KeepingAnEyeOutForYou: @ 0828B5C0
-Route118_Text_28B5C0: @ 0828B5C0
-Route120_Text_28B5C0: @ 0828B5C0
 	.string "GABBY: We'll be keeping an eye out\n"
 	.string "for you!$"
 
-Route111_Text_28B5EC: @ 0828B5EC
+GabbyAndTy_Text_GabbyNotEnoughMons: @ 0828B5EC
-Route118_Text_28B5EC: @ 0828B5EC
-Route120_Text_28B5EC: @ 0828B5EC
 	.string "GABBY: Is there a strong TRAINER\n"
 	.string "anywhere with a lot of POKéMON?$"
 
-Route111_Text_28B62D: @ 0828B62D
+GabbyAndTy_Text_GiveUsAnInterviewThisTime: @ 0828B62D
 	.string "GABBY: Wow, you are something!\p"
 	.string "You've gotten a lot stronger--a lot--\n"
 	.string "since we last battled.\p"
@@ -2803,46 +2797,36 @@ Route111_Text_28B62D: @ 0828B62D
 	.string "Are you willing to give us an interview\l"
 	.string "this time?$"
 
-Route111_Text_28B719: @ 0828B719
+GabbyAndTy_Text_GabbyDefeat: @ 0828B719
-Route118_Text_28B719: @ 0828B719
-Route120_Text_28B719: @ 0828B719
 	.string "GABBY: That was an intense battle!\n"
 	.string "Did you get all that on camera?$"
 
-Route111_Text_28B75C: @ 0828B75C
+GabbyAndTy_Text_TyPreFirstBattle: @ 0828B75C
 	.string "TY: Hey, lookie here! A tough-looking\n"
 	.string "TRAINER here, of all places!\l"
 	.string "Camera's rolling!$"
 
-Route111_Text_28B7B1: @ 0828B7B1
+GabbyAndTy_Text_TyPreBattle: @ 0828B7B1
-Route118_Text_28B7B1: @ 0828B7B1
-Route120_Text_28B7B1: @ 0828B7B1
 	.string "TY: Hey, lookie here!\n"
 	.string "I remember you!\p"
 	.string "I'll get this battle all on this\n"
 	.string "here camera!$"
 
-Route111_Text_28B805: @ 0828B805
+GabbyAndTy_Text_TyPostBattle: @ 0828B805
-Route118_Text_28B805: @ 0828B805
-Route120_Text_28B805: @ 0828B805
 	.string "TY: You're a natural!\n"
 	.string "Got me some prime footage right here!$"
 
-Route111_Text_28B841: @ 0828B841
+GabbyAndTy_Text_TyNotEnoughMons: @ 0828B841
-Route118_Text_28B841: @ 0828B841
-Route120_Text_28B841: @ 0828B841
 	.string "TY: Do you only have the one POKéMON\n"
 	.string "and that's it?\p"
 	.string "If you had more POKéMON, it'd make for\n"
 	.string "better footage, but…$"
 
-Route111_Text_28B8B1: @ 0828B8B1
+GabbyAndTy_Text_TyDefeatFirstTime: @ 0828B8B1
 	.string "TY: Yep, we sure spotted a hot TRAINER.\n"
 	.string "This is a huge scoop for us!$"
 
-Route111_Text_28B8F6: @ 0828B8F6
+GabbyAndTy_Text_TyDefeat: @ 0828B8F6
-Route118_Text_28B8F6: @ 0828B8F6
-Route120_Text_28B8F6: @ 0828B8F6
 	.string "TY: Yep, I got it all.\n"
 	.string "That whole battle's on camera.$"