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

2 files changed, 28 insertions, 28 deletions

diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json
index 8622515f0..fe492458a 100644
--- a/data/maps/Route133/map.json
+++ b/data/maps/Route133/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F75A3",
+      "script": "Route133_EventScript_Franklin",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F75D1",
+      "script": "Route133_EventScript_Linda",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F75BA",
+      "script": "Route133_EventScript_Debra",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route133_EventScript_1F75FF",
+      "script": "Route133_EventScript_Beck",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route133_EventScript_1F75E8",
+      "script": "Route133_EventScript_Warren",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F7616",
+      "script": "Route133_EventScript_Mollie",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route133_EventScript_1F762D",
+      "script": "Route133_EventScript_Conor",
       "flag": "0"
     },
     {
diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc
index a91eeead3..ebe28f5db 100644
--- a/data/maps/Route133/scripts.inc
+++ b/data/maps/Route133/scripts.inc
@@ -1,38 +1,38 @@
 Route133_MapScripts:: @ 81F75A2
 	.byte 0
 
-Route133_EventScript_1F75A3:: @ 81F75A3
-	trainerbattle_single TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F
-	msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE
+Route133_EventScript_Franklin:: @ 81F75A3
+	trainerbattle_single TRAINER_FRANKLIN, Route133_Text_FranklinIntro, Route133_Text_FranklinDefeat
+	msgbox Route133_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75BA:: @ 81F75BA
-	trainerbattle_single TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200
-	msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE
+Route133_EventScript_Debra:: @ 81F75BA
+	trainerbattle_single TRAINER_DEBRA, Route133_Text_DebraIntro, Route133_Text_DebraDefeat
+	msgbox Route133_Text_DebraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75D1:: @ 81F75D1
-	trainerbattle_single TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258
-	msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE
+Route133_EventScript_Linda:: @ 81F75D1
+	trainerbattle_single TRAINER_LINDA, Route133_Text_LindaIntro, Route133_Text_LindaDefeat
+	msgbox Route133_Text_LindaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75E8:: @ 81F75E8
-	trainerbattle_single TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0
-	msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE
+Route133_EventScript_Warren:: @ 81F75E8
+	trainerbattle_single TRAINER_WARREN, Route133_Text_WarrenIntro, Route133_Text_WarrenDefeat
+	msgbox Route133_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F75FF:: @ 81F75FF
-	trainerbattle_single TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C
-	msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE
+Route133_EventScript_Beck:: @ 81F75FF
+	trainerbattle_single TRAINER_BECK, Route133_Text_BeckIntro, Route133_Text_BeckDefeat
+	msgbox Route133_Text_BeckPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F7616:: @ 81F7616
-	trainerbattle_single TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A
-	msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE
+Route133_EventScript_Mollie:: @ 81F7616
+	trainerbattle_single TRAINER_MOLLIE, Route133_Text_MollieIntro, Route133_Text_MollieDefeat
+	msgbox Route133_Text_MolliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_1F762D:: @ 81F762D
-	trainerbattle_single TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505
-	msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE
+Route133_EventScript_Conor:: @ 81F762D
+	trainerbattle_single TRAINER_CONOR, Route133_Text_ConorIntro, Route133_Text_ConorDefeat
+	msgbox Route133_Text_ConorPostBattle, MSGBOX_AUTOCLOSE
 	end