Merge remote-tracking branch 'upstream' into tustin2121-patch-5

2 files changed, 28 insertions, 28 deletions

diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json
index 70558d26e..273f59aa5 100644
--- a/data/maps/Route106/map.json
+++ b/data/maps/Route106/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route106_EventScript_1EE493",
+      "script": "Route106_EventScript_Douglas",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route106_EventScript_1EE4AA",
+      "script": "Route106_EventScript_Kyla",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route106_EventScript_1EE4C1",
+      "script": "Route106_EventScript_Elliot",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route106_EventScript_1EE523",
+      "script": "Route106_EventScript_Ned",
       "flag": "0"
     },
     {
@@ -132,7 +132,7 @@
       "y": 13,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route106_EventScript_1EE48A"
+      "script": "Route106_EventScript_TrainerTipsSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc
index f27ce9647..f9d3fb3b9 100644
--- a/data/maps/Route106/scripts.inc
+++ b/data/maps/Route106/scripts.inc
@@ -1,48 +1,48 @@
 Route106_MapScripts:: @ 81EE489
 	.byte 0
 
-Route106_EventScript_1EE48A:: @ 81EE48A
-	msgbox Route106_Text_1EE53A, MSGBOX_SIGN
+Route106_EventScript_TrainerTipsSign:: @ 81EE48A
+	msgbox Route106_Text_TrainerTips, MSGBOX_SIGN
 	end
 
-Route106_EventScript_1EE493:: @ 81EE493
-	trainerbattle_single TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD
-	msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE
+Route106_EventScript_Douglas:: @ 81EE493
+	trainerbattle_single TRAINER_DOUGLAS, Route106_Text_DouglasIntro, Route106_Text_DouglasDefeated
+	msgbox Route106_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_EventScript_1EE4AA:: @ 81EE4AA
-	trainerbattle_single TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674
-	msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE
+Route106_EventScript_Kyla:: @ 81EE4AA
+	trainerbattle_single TRAINER_KYLA, Route106_Text_KylaIntro, Route106_Text_KylaDefeated
+	msgbox Route106_Text_KylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_EventScript_1EE4C1:: @ 81EE4C1
-	trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED
+Route106_EventScript_Elliot:: @ 81EE4C1
+	trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_ElliotIntro, Route106_Text_ElliotDefeated, Route106_EventScript_ElliotRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq Route106_EventScript_1EE50C
-	msgbox Route106_Text_29638C, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route106_EventScript_ElliotRematch
+	msgbox Route106_Text_ElliotPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route106_EventScript_1EE4ED:: @ 81EE4ED
-	special sub_80B4808
+Route106_EventScript_ElliotRegisterMatchCallAfterBattle:: @ 81EE4ED
+	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route106_Text_2963E3, MSGBOX_DEFAULT
+	msgbox Route106_Text_ElliotRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ELLIOT_1
 	release
 	end
 
-Route106_EventScript_1EE50C:: @ 81EE50C
-	trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_29642E, Route106_Text_296477
-	msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE
+Route106_EventScript_ElliotRematch:: @ 81EE50C
+	trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_ElliotRematchIntro, Route106_Text_ElliotRematchDefeated
+	msgbox Route106_Text_ElliotRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_EventScript_1EE523:: @ 81EE523
-	trainerbattle_single TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553
-	msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE
+Route106_EventScript_Ned:: @ 81EE523
+	trainerbattle_single TRAINER_NED, Route106_Text_NedIntro, Route106_Text_NedDefeated
+	msgbox Route106_Text_NedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_Text_1EE53A: @ 81EE53A
+Route106_Text_TrainerTips: @ 81EE53A
 	.string "TRAINER TIPS\p"
 	.string "Advice on catching POKéMON with a ROD:\n"
 	.string "Press the A Button if you get a bite.$"