Merge branch 'master' into doc-oneisland

3 files changed, 38 insertions, 38 deletions

diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json
index 45617a334..b88cbe12c 100644
--- a/data/maps/Route16/map.json
+++ b/data/maps/Route16/map.json
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAEEB",
+      "script": "Route16_EventScript_Lao",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAFA5",
+      "script": "Route16_EventScript_Koji",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAFE3",
+      "script": "Route16_EventScript_Luke",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAF67",
+      "script": "Route16_EventScript_Ruben",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AAF29",
+      "script": "Route16_EventScript_Hideo",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AB021",
+      "script": "Route16_EventScript_Camron",
       "flag": "0"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AB0A5",
+      "script": "Route16_EventScript_Lea",
       "flag": "0"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "Route16_EventScript_1AB05F",
+      "script": "Route16_EventScript_Jed",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
index 1d7c6657c..27a5efccc 100644
--- a/data/maps/Route16/scripts.inc
+++ b/data/maps/Route16/scripts.inc
@@ -14,18 +14,18 @@ Route16_EventScript_RemoveSnorlax:: @ 81680FF
 
 Route16_OnTransition:: @ 8168103
 	compare VAR_MAP_SCENE_ROUTE16, 1
-	call_if_eq Route16_EventScript_EnterCyclingRoad
+	call_if_eq Route16_OnTransitionCyclingRoad
 	end
 
-Route16_EventScript_EnterCyclingRoad:: @ 816810F
+Route16_OnTransitionCyclingRoad:: @ 816810F
 	setflag FLAG_SYS_ON_CYCLING_ROAD
 	return
 
 Route16_OnWarp:: @ 8168113
-	map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_EventScript_WarpIntoCyclingRoad
+	map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_OnWarpCyclingRoad
 	.2byte 0
 
-Route16_EventScript_WarpIntoCyclingRoad:: @ 816811D
+Route16_OnWarpCyclingRoad:: @ 816811D
 	special Special_ForcePlayerOntoBike
 	end
 
diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc
index 5131934b1..ca3507cc7 100644
--- a/data/maps/Route16/text.inc
+++ b/data/maps/Route16/text.inc
@@ -1,66 +1,66 @@
-Text_186C4D:: @ 8186C4D
+Route16_Text_LaoIntro:: @ 8186C4D
     .string "What do you want?$"
 
-Text_186C5F:: @ 8186C5F
+Route16_Text_LaoDefeat:: @ 8186C5F
     .string "Don't you dare laugh!$"
 
-Text_186C75:: @ 8186C75
+Route16_Text_LaoPostBattle:: @ 8186C75
     .string "We like just hanging here.\n"
     .string "What's it to you?$"
 
-Text_186CA2:: @ 8186CA2
+Route16_Text_KojiIntro:: @ 8186CA2
     .string "Nice BIKE!\n"
     .string "Hand it over!$"
 
-Text_186CBB:: @ 8186CBB
+Route16_Text_KojiDefeat:: @ 8186CBB
     .string "Knockout!$"
 
-Text_186CC5:: @ 8186CC5
+Route16_Text_KojiPostBattle:: @ 8186CC5
     .string "Forget it, who needs your BIKE!$"
 
-Text_186CE5:: @ 8186CE5
+Route16_Text_LukeIntro:: @ 8186CE5
     .string "Come out and play, little mouse!$"
 
-Text_186D06:: @ 8186D06
+Route16_Text_LukeDefeat:: @ 8186D06
     .string "You little rat!$"
 
-Text_186D16:: @ 8186D16
+Route16_Text_LukePostBattle:: @ 8186D16
     .string "I hate losing!\n"
     .string "Get out of my face!$"
 
-Text_186D39:: @ 8186D39
+Route16_Text_HideoIntro:: @ 8186D39
     .string "Hey, you just bumped me!$"
 
-Text_186D52:: @ 8186D52
+Route16_Text_HideoDefeat:: @ 8186D52
     .string "Kaboom!$"
 
-Text_186D5A:: @ 8186D5A
+Route16_Text_HideoPostBattle:: @ 8186D5A
     .string "We'll always be hanging around here\n"
     .string "even if you don't like it.\p"
     .string "You can detour to VERMILION from\n"
     .string "FUCHSIA going along the coast.$"
 
-Text_186DD9:: @ 8186DD9
+Route16_Text_CamronIntro:: @ 8186DD9
     .string "I'm feeling hungry and mean!\n"
     .string "I need a punching bag!$"
 
-Text_186E0D:: @ 8186E0D
+Route16_Text_CamronDefeat:: @ 8186E0D
     .string "Bad, bad, bad!$"
 
-Text_186E1C:: @ 8186E1C
+Route16_Text_CamronPostBattle:: @ 8186E1C
     .string "If I'm going to have POKéMON, they\n"
     .string "may as well be ferocious.\p"
     .string "I'd use them to leave my enemies\n"
     .string "in tatters.$"
 
-Text_186E86:: @ 8186E86
+Route16_Text_RubenIntro:: @ 8186E86
     .string "Hey, there!\n"
     .string "Let's have ourselves a good time!$"
 
-Text_186EB4:: @ 8186EB4
+Route16_Text_RubenDefeat:: @ 8186EB4
     .string "Don't make me mad!$"
 
-Text_186EC7:: @ 8186EC7
+Route16_Text_RubenPostBattle:: @ 8186EC7
     .string "I get my kicks by harassing people\n"
     .string "with my stinking POKéMON.\p"
     .string "They're great for startling people.\n"
@@ -78,35 +78,35 @@ Route16_Text_RouteSign:: @ 8186F98
     .string "ROUTE 16\n"
     .string "CELADON CITY - FUCHSIA CITY$"
 
-Text_186FBD:: @ 8186FBD
+Route16_Text_JedIntro:: @ 8186FBD
     .string "JED: Our love knows no bounds.\n"
     .string "We're in love and we show it!$"
 
-Text_186FFA:: @ 8186FFA
+Route16_Text_JedDefeat:: @ 8186FFA
     .string "JED: Oh, no!\n"
     .string "My love has seen me as a loser!$"
 
-Text_187027:: @ 8187027
+Route16_Text_JedPostBattle:: @ 8187027
     .string "JED: Listen, LEA.\n"
     .string "You need to focus less on me.$"
 
-Text_187057:: @ 8187057
+Route16_Text_JedNotEnoughMons:: @ 8187057
     .string "JED: You have just one POKéMON?\n"
     .string "Is there no love in your heart?$"
 
-Text_187097:: @ 8187097
+Route16_Text_LeaIntro:: @ 8187097
     .string "LEA: Sometimes, the intensity of\n"
     .string "our love scares me.$"
 
-Text_1870CC:: @ 81870CC
+Route16_Text_LeaDefeat:: @ 81870CC
     .string "LEA: Ohh! But JED looks cool\n"
     .string "even in a loss!$"
 
-Text_1870F9:: @ 81870F9
+Route16_Text_LeaPostBattle:: @ 81870F9
     .string "LEA: Ehehe, I'm sorry.\n"
     .string "JED is so cool.$"
 
-Text_187120:: @ 8187120
+Route16_Text_LeaNotEnoughMons:: @ 8187120
     .string "LEA: Oh, you don't have two\n"
     .string "POKéMON with you?\p"
     .string "Doesn't it feel lonely for you or\n"