summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/Route124/map.json20
-rw-r--r--data/maps/Route124/scripts.inc102
-rw-r--r--data/maps/Route125/map.json18
-rw-r--r--data/maps/Route125/scripts.inc76
-rw-r--r--data/maps/Route126/map.json16
-rw-r--r--data/maps/Route126/scripts.inc62
-rw-r--r--data/maps/Route127/map.json16
-rw-r--r--data/maps/Route127/scripts.inc70
-rw-r--r--data/maps/Route128/map.json14
-rw-r--r--data/maps/Route128/scripts.inc152
-rw-r--r--data/maps/Route129/map.json10
-rw-r--r--data/maps/Route129/scripts.inc42
-rw-r--r--data/maps/Route130/map.json6
-rw-r--r--data/maps/Route130/scripts.inc28
-rw-r--r--data/maps/Route131/map.json16
-rw-r--r--data/maps/Route131/scripts.inc56
-rw-r--r--data/maps/Route132/map.json16
-rw-r--r--data/maps/Route132/scripts.inc48
-rw-r--r--data/maps/Route133/map.json14
-rw-r--r--data/maps/Route133/scripts.inc42
-rw-r--r--data/maps/Route134/map.json18
-rw-r--r--data/maps/Route134/scripts.inc58
22 files changed, 451 insertions, 449 deletions
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index 913208954..01bc84377 100644
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route124_EventScript_1F6585",
+ "script": "Route124_EventScript_Spencer",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "7",
- "script": "Route124_EventScript_1F659C",
+ "script": "Route124_EventScript_Roland",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route124_EventScript_1F65B3",
+ "script": "Route124_EventScript_Jenny",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 8,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route124_EventScript_1F6615",
+ "script": "Route124_EventScript_Grace",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route124_EventScript_1F662C",
+ "script": "Route124_EventScript_Chad",
"flag": "0"
},
{
@@ -154,7 +154,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route124_EventScript_1F6643",
+ "script": "Route124_EventScript_Lila",
"flag": "0"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route124_EventScript_1F66A7",
+ "script": "Route124_EventScript_Roy",
"flag": "0"
},
{
@@ -180,7 +180,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route124_EventScript_1F670B",
+ "script": "Route124_EventScript_Declan",
"flag": "0"
},
{
@@ -193,7 +193,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "7",
- "script": "Route124_EventScript_1F6722",
+ "script": "Route124_EventScript_Isabella",
"flag": "0"
}
],
@@ -214,7 +214,7 @@
"y": 48,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "Route124_EventScript_1F657C"
+ "script": "Route124_EventScript_HuntersHouseSign"
}
]
} \ No newline at end of file
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
index 23dd174f6..8d0837320 100644
--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -6,102 +6,102 @@ Route124_OnTransition: @ 81F6572
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
end
-Route124_EventScript_1F657C:: @ 81F657C
- msgbox Route124_Text_1F6739, MSGBOX_SIGN
+Route124_EventScript_HuntersHouseSign:: @ 81F657C
+ msgbox Route124_Text_HuntersHouse, MSGBOX_SIGN
end
-Route124_EventScript_1F6585:: @ 81F6585
- trainerbattle_single TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02
- msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE
+Route124_EventScript_Spencer:: @ 81F6585
+ trainerbattle_single TRAINER_SPENCER, Route124_Text_SpencerIntro, Route124_Text_SpencerDefeat
+ msgbox Route124_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE
end
-Route124_EventScript_1F659C:: @ 81F659C
- trainerbattle_single TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC
- msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE
+Route124_EventScript_Roland:: @ 81F659C
+ trainerbattle_single TRAINER_ROLAND, Route124_Text_RolandIntro, Route124_Text_RolandDefeat
+ msgbox Route124_Text_RolandPostBattle, MSGBOX_AUTOCLOSE
end
-Route124_EventScript_1F65B3:: @ 81F65B3
- trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
+Route124_EventScript_Jenny:: @ 81F65B3
+ trainerbattle_single TRAINER_JENNY_1, Route124_Text_JennyIntro, Route124_Text_JennyDefeat, Route124_EventScript_RegisterJenny
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route124_EventScript_1F65FE
- msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route124_EventScript_RematchJenny
+ msgbox Route124_Text_JennyPostBattle, MSGBOX_DEFAULT
release
end
-Route124_EventScript_1F65DF:: @ 81F65DF
+Route124_EventScript_RegisterJenny:: @ 81F65DF
special PlayerFaceTrainerAfterBattle
waitmovement 0
- msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT
+ msgbox Route124_Text_JennyRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_JENNY_1
release
end
-Route124_EventScript_1F65FE:: @ 81F65FE
- trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0
- msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE
+Route124_EventScript_RematchJenny:: @ 81F65FE
+ trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_JennyRematchIntro, Route124_Text_JennyRematchDefeat
+ msgbox Route124_Text_JennyPostRematch, MSGBOX_AUTOCLOSE
end
-Route124_EventScript_1F6615:: @ 81F6615
- trainerbattle_single TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D
- msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE
+Route124_EventScript_Grace:: @ 81F6615
+ trainerbattle_single TRAINER_GRACE, Route124_Text_GraceIntro, Route124_Text_GraceDefeat
+ msgbox Route124_Text_GracePostBattle, MSGBOX_AUTOCLOSE
end
-Route124_EventScript_1F662C:: @ 81F662C
- trainerbattle_single TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF
- msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE
+Route124_EventScript_Chad:: @ 81F662C
+ trainerbattle_single TRAINER_CHAD, Route124_Text_ChadIntro, Route124_Text_ChadDefeat
+ msgbox Route124_Text_ChadPostBattle, MSGBOX_AUTOCLOSE
end
-Route124_EventScript_1F6643:: @ 81F6643
- trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
+Route124_EventScript_Lila:: @ 81F6643
+ trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaIntro, Route124_Text_LilaDefeat, Route124_Text_LilaNotEnoughMons, Route124_EventScript_RegisterLila
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route124_EventScript_1F668C
- msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route124_EventScript_RematchLila
+ msgbox Route124_Text_LilaPostBattle, MSGBOX_DEFAULT
release
end
-Route124_EventScript_1F6673:: @ 81F6673
- msgbox Route124_Text_2A109F, MSGBOX_DEFAULT
+Route124_EventScript_RegisterLila:: @ 81F6673
+ msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_LILA_AND_ROY_1
release
end
-Route124_EventScript_1F668C:: @ 81F668C
- trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255
- msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE
+Route124_EventScript_RematchLila:: @ 81F668C
+ trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaRematchIntro, Route124_Text_LilaRematchDefeat, Route124_Text_LilaRematchNotEnoughMons
+ msgbox Route124_Text_LilaPostRematch, MSGBOX_AUTOCLOSE
end
-Route124_EventScript_1F66A7:: @ 81F66A7
- trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
+Route124_EventScript_Roy:: @ 81F66A7
+ trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyIntro, Route124_Text_RoyDefeat, Route124_Text_RoyNotEnoughMons, Route124_EventScript_RegisterRoy
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route124_EventScript_1F66F0
- msgbox Route124_Text_2A103E, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route124_EventScript_RematchRoy
+ msgbox Route124_Text_RoyPostBattle, MSGBOX_DEFAULT
release
end
-Route124_EventScript_1F66D7:: @ 81F66D7
- msgbox Route124_Text_2A109F, MSGBOX_DEFAULT
+Route124_EventScript_RegisterRoy:: @ 81F66D7
+ msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_LILA_AND_ROY_1
release
end
-Route124_EventScript_1F66F0:: @ 81F66F0
- trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384
- msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE
+Route124_EventScript_RematchRoy:: @ 81F66F0
+ trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyRematchIntro, Route124_Text_RoyRematchDefeat, Route124_Text_RoyRematchNotEnoughMons
+ msgbox Route124_Text_RoyPostRematch, MSGBOX_AUTOCLOSE
end
-Route124_EventScript_1F670B:: @ 81F670B
- trainerbattle_single TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C
- msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE
+Route124_EventScript_Declan:: @ 81F670B
+ trainerbattle_single TRAINER_DECLAN, Route124_Text_DeclanIntro, Route124_Text_DeclanDefeat
+ msgbox Route124_Text_DeclanPostBattle, MSGBOX_AUTOCLOSE
end
-Route124_EventScript_1F6722:: @ 81F6722
- trainerbattle_single TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC
- msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE
+Route124_EventScript_Isabella:: @ 81F6722
+ trainerbattle_single TRAINER_ISABELLA, Route124_Text_IsabellaIntro, Route124_Text_IsabellaDefeat
+ msgbox Route124_Text_IsabellaPostBattle, MSGBOX_AUTOCLOSE
end
-Route124_Text_1F6739: @ 81F6739
+Route124_Text_HuntersHouse: @ 81F6739
.string "HUNTER'S HOUSE$"
diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json
index 27615a521..402c42932 100644
--- a/data/maps/Route125/map.json
+++ b/data/maps/Route125/map.json
@@ -40,7 +40,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route125_EventScript_1F67A4",
+ "script": "Route125_EventScript_Nolen",
"flag": "0"
},
{
@@ -53,7 +53,7 @@
"movement_range_y": 5,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route125_EventScript_1F67BB",
+ "script": "Route125_EventScript_Stan",
"flag": "0"
},
{
@@ -66,7 +66,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route125_EventScript_1F67D2",
+ "script": "Route125_EventScript_Tanya",
"flag": "0"
},
{
@@ -79,7 +79,7 @@
"movement_range_y": 9,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route125_EventScript_1F67E9",
+ "script": "Route125_EventScript_Sharon",
"flag": "0"
},
{
@@ -92,7 +92,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route125_EventScript_1F6800",
+ "script": "Route125_EventScript_Ernest",
"flag": "0"
},
{
@@ -105,7 +105,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route125_EventScript_1F6862",
+ "script": "Route125_EventScript_Kim",
"flag": "0"
},
{
@@ -118,7 +118,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route125_EventScript_1F687D",
+ "script": "Route125_EventScript_Iris",
"flag": "0"
},
{
@@ -131,7 +131,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route125_EventScript_1F6898",
+ "script": "Route125_EventScript_Presley",
"flag": "0"
},
{
@@ -144,7 +144,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route125_EventScript_1F68AF",
+ "script": "Route125_EventScript_Auron",
"flag": "0"
},
{
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
index bf845c152..5489c929e 100644
--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -1,7 +1,7 @@
Route125_MapScripts:: @ 81F6748
map_script MAP_SCRIPT_ON_TRANSITION, Route125_OnTransition
- map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783
- map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A
+ map_script MAP_SCRIPT_ON_LOAD, Route125_OnLoad
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_OnFrame
.byte 0
Route125_OnTransition: @ 81F6758
@@ -14,76 +14,76 @@ Route125_OnTransition: @ 81F6758
call_if_eq UnusualWeather_StartKyogreWeather
end
-Route125_MapScript1_1F6783: @ 81F6783
+Route125_OnLoad: @ 81F6783
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East
end
-Route125_MapScript2_1F679A: @ 81F679A
+Route125_OnFrame: @ 81F679A
map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
-Route125_EventScript_1F67A4:: @ 81F67A4
- trainerbattle_single TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A
- msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE
+Route125_EventScript_Nolen:: @ 81F67A4
+ trainerbattle_single TRAINER_NOLEN, Route125_Text_NolenIntro, Route125_Text_NolenDefeat
+ msgbox Route125_Text_NolenPostBattle, MSGBOX_AUTOCLOSE
end
-Route125_EventScript_1F67BB:: @ 81F67BB
- trainerbattle_single TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7
- msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE
+Route125_EventScript_Stan:: @ 81F67BB
+ trainerbattle_single TRAINER_STAN, Route125_Text_StanIntro, Route125_Text_StanDefeat
+ msgbox Route125_Text_StanPostBattle, MSGBOX_AUTOCLOSE
end
-Route125_EventScript_1F67D2:: @ 81F67D2
- trainerbattle_single TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D
- msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE
+Route125_EventScript_Tanya:: @ 81F67D2
+ trainerbattle_single TRAINER_TANYA, Route125_Text_TanyaIntro, Route125_Text_TanyaDefeat
+ msgbox Route125_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE
end
-Route125_EventScript_1F67E9:: @ 81F67E9
- trainerbattle_single TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5
- msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE
+Route125_EventScript_Sharon:: @ 81F67E9
+ trainerbattle_single TRAINER_SHARON, Route125_Text_SharonIntro, Route125_Text_SharonDefeat
+ msgbox Route125_Text_SharonPostBattle, MSGBOX_AUTOCLOSE
end
-Route125_EventScript_1F6800:: @ 81F6800
- trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C
+Route125_EventScript_Ernest:: @ 81F6800
+ trainerbattle_single TRAINER_ERNEST_1, Route125_Text_ErnestIntro, Route125_Text_ErnestDefeat, Route125_EventScript_RegisterErnest
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route125_EventScript_1F684B
- msgbox Route125_Text_2A1755, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route125_EventScript_RematchErnest
+ msgbox Route125_Text_ErnestPostBattle, MSGBOX_DEFAULT
release
end
-Route125_EventScript_1F682C:: @ 81F682C
+Route125_EventScript_RegisterErnest:: @ 81F682C
special PlayerFaceTrainerAfterBattle
waitmovement 0
- msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT
+ msgbox Route125_Text_ErnestRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_ERNEST_1
release
end
-Route125_EventScript_1F684B:: @ 81F684B
- trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_2A180E, Route125_Text_2A1851
- msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE
+Route125_EventScript_RematchErnest:: @ 81F684B
+ trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_ErnestRematchIntro, Route125_Text_ErnestRematchDefeat
+ msgbox Route125_Text_ErnestRematchPostBattle, MSGBOX_AUTOCLOSE
end
-Route125_EventScript_1F6862:: @ 81F6862
- trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8
- msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE
+Route125_EventScript_Kim:: @ 81F6862
+ trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_KimIntro, Route125_Text_KimDefeat, Route125_Text_KimNotEnoughMons
+ msgbox Route125_Text_KimPostBattle, MSGBOX_AUTOCLOSE
end
-Route125_EventScript_1F687D:: @ 81F687D
- trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9
- msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE
+Route125_EventScript_Iris:: @ 81F687D
+ trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_IrisIntro, Route125_Text_IrisDefeat, Route125_Text_IrisNotEnoughMons
+ msgbox Route125_Text_IrisPostBattle, MSGBOX_AUTOCLOSE
end
-Route125_EventScript_1F6898:: @ 81F6898
- trainerbattle_single TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E
- msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE
+Route125_EventScript_Presley:: @ 81F6898
+ trainerbattle_single TRAINER_PRESLEY, Route125_Text_PresleyIntro, Route125_Text_PresleyDefeat
+ msgbox Route125_Text_PresleyPostBattle, MSGBOX_AUTOCLOSE
end
-Route125_EventScript_1F68AF:: @ 81F68AF
- trainerbattle_single TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD
- msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE
+Route125_EventScript_Auron:: @ 81F68AF
+ trainerbattle_single TRAINER_AURON, Route125_Text_AuronIntro, Route125_Text_AuronDefeat
+ msgbox Route125_Text_AuronPostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json
index b8359bd84..db01091ac 100644
--- a/data/maps/Route126/map.json
+++ b/data/maps/Route126/map.json
@@ -40,7 +40,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route126_EventScript_1F68D6",
+ "script": "Route126_EventScript_Barry",
"flag": "0"
},
{
@@ -53,7 +53,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route126_EventScript_1F68ED",
+ "script": "Route126_EventScript_Dean",
"flag": "0"
},
{
@@ -66,7 +66,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route126_EventScript_1F6904",
+ "script": "Route126_EventScript_Nikki",
"flag": "0"
},
{
@@ -79,7 +79,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route126_EventScript_1F691B",
+ "script": "Route126_EventScript_Brenda",
"flag": "0"
},
{
@@ -105,7 +105,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "7",
- "script": "Route126_EventScript_1F6960",
+ "script": "Route126_EventScript_Sienna",
"flag": "0"
},
{
@@ -118,7 +118,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "7",
- "script": "Route126_EventScript_1F6977",
+ "script": "Route126_EventScript_Pablo",
"flag": "0"
},
{
@@ -131,7 +131,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "7",
- "script": "Route126_EventScript_1F6949",
+ "script": "Route126_EventScript_Isobel",
"flag": "0"
},
{
@@ -144,7 +144,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "7",
- "script": "Route126_EventScript_1F6932",
+ "script": "Route126_EventScript_Leonardo",
"flag": "0"
}
],
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index d1a2ff0f3..3624cc8a5 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -6,60 +6,60 @@ Route126_OnTransition: @ 81F68CC
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
end
-Route126_EventScript_1F68D6:: @ 81F68D6
- trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8
- msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE
+Route126_EventScript_Barry:: @ 81F68D6
+ trainerbattle_single TRAINER_BARRY, Route126_Text_BarryIntro, Route126_Text_BarryDefeat
+ msgbox Route126_Text_BarryPostBattle, MSGBOX_AUTOCLOSE
end
-Route126_EventScript_1F68ED:: @ 81F68ED
- trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63
- msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE
+Route126_EventScript_Dean:: @ 81F68ED
+ trainerbattle_single TRAINER_DEAN, Route126_Text_DeanIntro, Route126_Text_DeanDefeat
+ msgbox Route126_Text_DeanPostBattle, MSGBOX_AUTOCLOSE
end
-Route126_EventScript_1F6904:: @ 81F6904
- trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8
- msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE
+Route126_EventScript_Nikki:: @ 81F6904
+ trainerbattle_single TRAINER_NIKKI, Route126_Text_NikkiIntro, Route126_Text_NikkiDefeat
+ msgbox Route126_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE
end
-Route126_EventScript_1F691B:: @ 81F691B
- trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63
- msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE
+Route126_EventScript_Brenda:: @ 81F691B
+ trainerbattle_single TRAINER_BRENDA, Route126_Text_BrendaIntro, Route126_Text_BrendaDefeat
+ msgbox Route126_Text_BrendaPostBattle, MSGBOX_AUTOCLOSE
end
-Route126_EventScript_1F6932:: @ 81F6932
- trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6
- msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE
+Route126_EventScript_Leonardo:: @ 81F6932
+ trainerbattle_single TRAINER_LEONARDO, Route126_Text_LeonardoIntro, Route126_Text_LeonardoDefeat
+ msgbox Route126_Text_LeonardoPostBattle, MSGBOX_AUTOCLOSE
end
-Route126_EventScript_1F6949:: @ 81F6949
- trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3
- msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE
+Route126_EventScript_Isobel:: @ 81F6949
+ trainerbattle_single TRAINER_ISOBEL, Route126_Text_IsobelIntro, Route126_Text_IsobelDefeat
+ msgbox Route126_Text_IsobelPostBattle, MSGBOX_AUTOCLOSE
end
-Route126_EventScript_1F6960:: @ 81F6960
- trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216
- msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE
+Route126_EventScript_Sienna:: @ 81F6960
+ trainerbattle_single TRAINER_SIENNA, Route126_Text_SiennaIntro, Route126_Text_SiennaDefeat
+ msgbox Route126_Text_SiennaPostBattle, MSGBOX_AUTOCLOSE
end
-Route126_EventScript_1F6977:: @ 81F6977
- trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3
+Route126_EventScript_Pablo:: @ 81F6977
+ trainerbattle_single TRAINER_PABLO_1, Route126_Text_PabloIntro, Route126_Text_PabloDefeat, Route126_EventScript_RegisterPablo
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route126_EventScript_1F69C2
- msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route126_EventScript_RematchPablo
+ msgbox Route126_Text_PabloPostBattle, MSGBOX_DEFAULT
release
end
-Route126_EventScript_1F69A3:: @ 81F69A3
+Route126_EventScript_RegisterPablo:: @ 81F69A3
special PlayerFaceTrainerAfterBattle
waitmovement 0
- msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT
+ msgbox Route126_Text_PabloRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_PABLO_1
release
end
-Route126_EventScript_1F69C2:: @ 81F69C2
- trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8
- msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE
+Route126_EventScript_RematchPablo:: @ 81F69C2
+ trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_PabloRematchIntro, Route126_Text_PabloRematchDefeat
+ msgbox Route126_Text_PabloPostRematch, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json
index 08d39d971..626982ca2 100644
--- a/data/maps/Route127/map.json
+++ b/data/maps/Route127/map.json
@@ -45,7 +45,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route127_EventScript_1F6A35",
+ "script": "Route127_EventScript_Camden",
"flag": "0"
},
{
@@ -58,7 +58,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route127_EventScript_1F6A4C",
+ "script": "Route127_EventScript_Donny",
"flag": "0"
},
{
@@ -97,7 +97,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route127_EventScript_1F6A63",
+ "script": "Route127_EventScript_Jonah",
"flag": "0"
},
{
@@ -110,7 +110,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route127_EventScript_1F6A91",
+ "script": "Route127_EventScript_Roger",
"flag": "0"
},
{
@@ -123,7 +123,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route127_EventScript_1F6A7A",
+ "script": "Route127_EventScript_Henry",
"flag": "0"
},
{
@@ -136,7 +136,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route127_EventScript_1F6AA8",
+ "script": "Route127_EventScript_Aidan",
"flag": "0"
},
{
@@ -149,7 +149,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route127_EventScript_1F6AD6",
+ "script": "Route127_EventScript_Koji",
"flag": "0"
},
{
@@ -162,7 +162,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route127_EventScript_1F6ABF",
+ "script": "Route127_EventScript_Athena",
"flag": "0"
},
{
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index db0fd0644..09d37dd7c 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -1,7 +1,7 @@
Route127_MapScripts:: @ 81F69D9
map_script MAP_SCRIPT_ON_TRANSITION, Route127_OnTransition
- map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14
- map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B
+ map_script MAP_SCRIPT_ON_LOAD, Route127_OnLoad
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_OnFrame
.byte 0
Route127_OnTransition: @ 81F69E9
@@ -14,71 +14,71 @@ Route127_OnTransition: @ 81F69E9
call_if_eq UnusualWeather_StartKyogreWeather
end
-Route127_MapScript1_1F6A14: @ 81F6A14
+Route127_OnLoad: @ 81F6A14
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South
end
-Route127_MapScript2_1F6A2B: @ 81F6A2B
+Route127_OnFrame: @ 81F6A2B
map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
-Route127_EventScript_1F6A35:: @ 81F6A35
- trainerbattle_single TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294
- msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE
+Route127_EventScript_Camden:: @ 81F6A35
+ trainerbattle_single TRAINER_CAMDEN, Route127_Text_CamdenIntro, Route127_Text_CamdenDefeat
+ msgbox Route127_Text_CamdenPostBattle, MSGBOX_AUTOCLOSE
end
-Route127_EventScript_1F6A4C:: @ 81F6A4C
- trainerbattle_single TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315
- msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE
+Route127_EventScript_Donny:: @ 81F6A4C
+ trainerbattle_single TRAINER_DONNY, Route127_Text_DonnyIntro, Route127_Text_DonnyDefeat
+ msgbox Route127_Text_DonnyPostBattle, MSGBOX_AUTOCLOSE
end
-Route127_EventScript_1F6A63:: @ 81F6A63
- trainerbattle_single TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1
- msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE
+Route127_EventScript_Jonah:: @ 81F6A63
+ trainerbattle_single TRAINER_JONAH, Route127_Text_JonahIntro, Route127_Text_JonahDefeat
+ msgbox Route127_Text_JonahPostBattle, MSGBOX_AUTOCLOSE
end
-Route127_EventScript_1F6A7A:: @ 81F6A7A
- trainerbattle_single TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483
- msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE
+Route127_EventScript_Henry:: @ 81F6A7A
+ trainerbattle_single TRAINER_HENRY, Route127_Text_HenryIntro, Route127_Text_HenryDefeat
+ msgbox Route127_Text_HenryPostBattle, MSGBOX_AUTOCLOSE
end
-Route127_EventScript_1F6A91:: @ 81F6A91
- trainerbattle_single TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B
- msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE
+Route127_EventScript_Roger:: @ 81F6A91
+ trainerbattle_single TRAINER_ROGER, Route127_Text_RogerIntro, Route127_Text_RogerDefeat
+ msgbox Route127_Text_RogerPostBattle, MSGBOX_AUTOCLOSE
end
-Route127_EventScript_1F6AA8:: @ 81F6AA8
- trainerbattle_single TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1
- msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE
+Route127_EventScript_Aidan:: @ 81F6AA8
+ trainerbattle_single TRAINER_AIDAN, Route127_Text_AidanIntro, Route127_Text_AidanDefeat
+ msgbox Route127_Text_AidanPostBattle, MSGBOX_AUTOCLOSE
end
-Route127_EventScript_1F6ABF:: @ 81F6ABF
- trainerbattle_single TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC
- msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE
+Route127_EventScript_Athena:: @ 81F6ABF
+ trainerbattle_single TRAINER_ATHENA, Route127_Text_AthenaIntro, Route127_Text_AthenaDefeat
+ msgbox Route127_Text_AthenaPostBattle, MSGBOX_AUTOCLOSE
end
-Route127_EventScript_1F6AD6:: @ 81F6AD6
- trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
+Route127_EventScript_Koji:: @ 81F6AD6
+ trainerbattle_single TRAINER_KOJI_1, Route127_Text_KojiIntro, Route127_Text_KojiDefeat, Route127_EventScript_RegisterKoji
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route127_EventScript_1F6B21
- msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route127_EventScript_RematchKoji
+ msgbox Route127_Text_KojiPostBattle, MSGBOX_DEFAULT
release
end
-Route127_EventScript_1F6B02:: @ 81F6B02
+Route127_EventScript_RegisterKoji:: @ 81F6B02
special PlayerFaceTrainerAfterBattle
waitmovement 0
- msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT
+ msgbox Route127_Text_KojiRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_KOJI_1
release
end
-Route127_EventScript_1F6B21:: @ 81F6B21
- trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B
- msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE
+Route127_EventScript_RematchKoji:: @ 81F6B21
+ trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_KojiRematchIntro, Route127_Text_KojiRematchDefeat
+ msgbox Route127_Text_KojiPostRematch, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
index 58246c247..a7de8ed19 100644
--- a/data/maps/Route128/map.json
+++ b/data/maps/Route128/map.json
@@ -45,7 +45,7 @@
"movement_range_y": 5,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route128_EventScript_1F6CBE",
+ "script": "Route128_EventScript_Isaiah",
"flag": "0"
},
{
@@ -58,7 +58,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "7",
- "script": "Route128_EventScript_1F6D20",
+ "script": "Route128_EventScript_Katelyn",
"flag": "0"
},
{
@@ -110,7 +110,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route128_EventScript_1F6DB0",
+ "script": "Route128_EventScript_Wayne",
"flag": "0"
},
{
@@ -123,7 +123,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route128_EventScript_1F6D99",
+ "script": "Route128_EventScript_Ruben",
"flag": "0"
},
{
@@ -136,7 +136,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route128_EventScript_1F6D82",
+ "script": "Route128_EventScript_Alexa",
"flag": "0"
},
{
@@ -149,7 +149,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route128_EventScript_1F6DDE",
+ "script": "Route128_EventScript_Carlee",
"flag": "0"
},
{
@@ -162,7 +162,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route128_EventScript_1F6DC7",
+ "script": "Route128_EventScript_Harrison",
"flag": "0"
}
],
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index 10397be89..16b1294fc 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -1,48 +1,48 @@
Route128_MapScripts:: @ 81F6B38
map_script MAP_SCRIPT_ON_TRANSITION, Route128_OnTransition
- map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_OnFrame
.byte 0
Route128_OnTransition: @ 81F6B43
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
end
-Route128_MapScript2_1F6B4D: @ 81F6B4D
- map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57
+Route128_OnFrame: @ 81F6B4D
+ map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_KyogreAwakenedScene
.2byte 0
-Route128_EventScript_1F6B57:: @ 81F6B57
+Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57
lockall
delay 20
- applymovement 4, Route128_Movement_1F6C89
+ applymovement 4, Route128_Movement_ArchieLookAround
waitmovement 0
- msgbox Route128_Text_1F6DF5, MSGBOX_DEFAULT
+ msgbox Route128_Text_ArchieWhatHappened, MSGBOX_DEFAULT
closemessage
- applymovement 4, Route128_Movement_1F6C91
+ applymovement 4, Route128_Movement_ArchieBackUp
waitmovement 0
- msgbox Route128_Text_1F6E48, MSGBOX_DEFAULT
+ msgbox Route128_Text_ArchieIOnlyWanted, MSGBOX_DEFAULT
closemessage
- applymovement 5, Route128_Movement_1F6CAD
+ applymovement 5, Route128_Movement_MaxieApproachArchie
waitmovement 0
applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
- msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT
+ msgbox Route128_Text_MaxieDoYouUnderstandNow, MSGBOX_DEFAULT
closemessage
- applymovement 5, Route128_Movement_1F6CBB
+ applymovement 5, Route128_Movement_MaxieApproachPlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
- msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT
+ msgbox Route128_Text_MaxieResposibilityFallsToArchieAndMe, MSGBOX_DEFAULT
closemessage
- applymovement 4, Route128_Movement_1F6C96
+ applymovement 4, Route128_Movement_ArchieRunLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
- applymovement 5, Route128_Movement_1F6CA8
+ applymovement 5, Route128_Movement_MaxieWalkLeft
waitmovement 0
- msgbox Route128_Text_1F704F, MSGBOX_DEFAULT
+ msgbox Route128_Text_MaxieThisDefiesBelief, MSGBOX_DEFAULT
closemessage
delay 40
- applymovement 5, Route128_Movement_1F6CB0
- applymovement 4, Route128_Movement_1F6C9B
+ applymovement 5, Route128_Movement_MaxieExit
+ applymovement 4, Route128_Movement_ArchieExit
waitmovement 0
removeobject 5
removeobject 4
@@ -51,19 +51,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57
dofieldeffect FLDEFF_NPCFLY_OUT
waitfieldeffect FLDEFF_NPCFLY_OUT
addobject 3
- applymovement 3, Route128_Movement_1F6C87
+ applymovement 3, Route128_Movement_StevenApproachPlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT
+ msgbox Route128_Text_StevenWhatIsHappening, MSGBOX_DEFAULT
closemessage
- applymovement 3, Route128_Movement_1F6C85
+ applymovement 3, Route128_Movement_StevenWalkUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
- msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT
+ msgbox Route128_Text_StevenWholeWorldWillDrown, MSGBOX_DEFAULT
applymovement 3, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
- msgbox Route128_Text_1F721B, MSGBOX_DEFAULT
+ msgbox Route128_Text_StevenImGoingToSootopolis, MSGBOX_DEFAULT
closemessage
applymovement 3, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
@@ -78,10 +78,12 @@ Route128_EventScript_1F6B57:: @ 81F6B57
releaseall
end
+@ Unused
Route128_Movement_1F6C76: @ 81F6C76
walk_fast_left
step_end
+@ Unused
Route128_Movement_1F6C78: @ 81F6C78
walk_left
walk_left
@@ -97,15 +99,15 @@ Route128_Movement_1F6C78: @ 81F6C78
walk_up
step_end
-Route128_Movement_1F6C85: @ 81F6C85
+Route128_Movement_StevenWalkUp: @ 81F6C85
walk_up
step_end
-Route128_Movement_1F6C87: @ 81F6C87
+Route128_Movement_StevenApproachPlayer: @ 81F6C87
walk_fast_left
step_end
-Route128_Movement_1F6C89: @ 81F6C89
+Route128_Movement_ArchieLookAround: @ 81F6C89
walk_fast_down
walk_in_place_fastest_left
delay_16
@@ -115,21 +117,21 @@ Route128_Movement_1F6C89: @ 81F6C89
walk_in_place_fastest_down
step_end
-Route128_Movement_1F6C91: @ 81F6C91
+Route128_Movement_ArchieBackUp: @ 81F6C91
lock_facing_direction
walk_slow_up
delay_16
unlock_facing_direction
step_end
-Route128_Movement_1F6C96: @ 81F6C96
+Route128_Movement_ArchieRunLeft: @ 81F6C96
walk_fast_left
walk_fast_left
walk_fast_left
walk_in_place_fastest_right
step_end
-Route128_Movement_1F6C9B: @ 81F6C9B
+Route128_Movement_ArchieExit: @ 81F6C9B
delay_16
delay_16
walk_fast_up
@@ -144,19 +146,19 @@ Route128_Movement_1F6C9B: @ 81F6C9B
walk_fast_up
step_end
-Route128_Movement_1F6CA8: @ 81F6CA8
+Route128_Movement_MaxieWalkLeft: @ 81F6CA8
walk_left
walk_left
delay_8
delay_4
step_end
-Route128_Movement_1F6CAD: @ 81F6CAD
+Route128_Movement_MaxieApproachArchie: @ 81F6CAD
walk_left
walk_in_place_fastest_down
step_end
-Route128_Movement_1F6CB0: @ 81F6CB0
+Route128_Movement_MaxieExit: @ 81F6CB0
walk_fast_left
walk_fast_left
walk_fast_left
@@ -169,90 +171,90 @@ Route128_Movement_1F6CB0: @ 81F6CB0
walk_fast_up
step_end
-Route128_Movement_1F6CBB: @ 81F6CBB
+Route128_Movement_MaxieApproachPlayer: @ 81F6CBB
walk_right
walk_in_place_fastest_down
step_end
-Route128_EventScript_1F6CBE:: @ 81F6CBE
- trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA
+Route128_EventScript_Isaiah:: @ 81F6CBE
+ trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_IsaiahIntro, Route128_Text_IsaiahDefeat, Route128_EventScript_RegisterIsaiah
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route128_EventScript_1F6D09
- msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route128_EventScript_RematchIsaiah
+ msgbox Route128_Text_IsaiahPostBattle, MSGBOX_DEFAULT
release
end
-Route128_EventScript_1F6CEA:: @ 81F6CEA
+Route128_EventScript_RegisterIsaiah:: @ 81F6CEA
special PlayerFaceTrainerAfterBattle
waitmovement 0
- msgbox Route128_Text_2A2916, MSGBOX_DEFAULT
+ msgbox Route128_Text_IsaiahRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_ISAIAH_1
release
end
-Route128_EventScript_1F6D09:: @ 81F6D09
- trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_2A2975, Route128_Text_2A29B8
- msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE
+Route128_EventScript_RematchIsaiah:: @ 81F6D09
+ trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_IsaiahRematchIntro, Route128_Text_IsaiahRematchDefeat
+ msgbox Route128_Text_IsaiahPostRematch, MSGBOX_AUTOCLOSE
end
-Route128_EventScript_1F6D20:: @ 81F6D20
- trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C
+Route128_EventScript_Katelyn:: @ 81F6D20
+ trainerbattle_single TRAINER_KATELYN_1, Route128_Text_KatelynIntro, Route128_Text_KatelynDefeat, Route128_EventScript_RegisterKatelyn
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route128_EventScript_1F6D6B
- msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route128_EventScript_RematchKatelyn
+ msgbox Route128_Text_KatelynPostBattle, MSGBOX_DEFAULT
release
end
-Route128_EventScript_1F6D4C:: @ 81F6D4C
+Route128_EventScript_RegisterKatelyn:: @ 81F6D4C
special PlayerFaceTrainerAfterBattle
waitmovement 0
- msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT
+ msgbox Route128_Text_KatelynRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_KATELYN_1
release
end
-Route128_EventScript_1F6D6B:: @ 81F6D6B
- trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_2A2B41, Route128_Text_2A2BAB
- msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE
+Route128_EventScript_RematchKatelyn:: @ 81F6D6B
+ trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_KatelynRematchIntro, Route128_Text_KatelynRematchDefeat
+ msgbox Route128_Text_KatelynPostRematch, MSGBOX_AUTOCLOSE
end
-Route128_EventScript_1F6D82:: @ 81F6D82
- trainerbattle_single TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79
- msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE
+Route128_EventScript_Alexa:: @ 81F6D82
+ trainerbattle_single TRAINER_ALEXA, Route128_Text_AlexaIntro, Route128_Text_AlexaDefeat
+ msgbox Route128_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE
end
-Route128_EventScript_1F6D99:: @ 81F6D99
- trainerbattle_single TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE
- msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE
+Route128_EventScript_Ruben:: @ 81F6D99
+ trainerbattle_single TRAINER_RUBEN, Route128_Text_RubenIntro, Route128_Text_RubenDefeat
+ msgbox Route128_Text_RubenPostBattle, MSGBOX_AUTOCLOSE
end
-Route128_EventScript_1F6DB0:: @ 81F6DB0
- trainerbattle_single TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9
- msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE
+Route128_EventScript_Wayne:: @ 81F6DB0
+ trainerbattle_single TRAINER_WAYNE, Route128_Text_WayneIntro, Route128_Text_WayneDefeat
+ msgbox Route128_Text_WaynePostBattle, MSGBOX_AUTOCLOSE
end
-Route128_EventScript_1F6DC7:: @ 81F6DC7
- trainerbattle_single TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44
- msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE
+Route128_EventScript_Harrison:: @ 81F6DC7
+ trainerbattle_single TRAINER_HARRISON, Route128_Text_HarrisonIntro, Route128_Text_HarrisonDefeat
+ msgbox Route128_Text_HarrisonPostBattle, MSGBOX_AUTOCLOSE
end
-Route128_EventScript_1F6DDE:: @ 81F6DDE
- trainerbattle_single TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA
- msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE
+Route128_EventScript_Carlee:: @ 81F6DDE
+ trainerbattle_single TRAINER_CARLEE, Route128_Text_CarleeIntro, Route128_Text_CarleeDefeat
+ msgbox Route128_Text_CarleePostBattle, MSGBOX_AUTOCLOSE
end
-Route128_Text_1F6DF5: @ 81F6DF5
+Route128_Text_ArchieWhatHappened: @ 81F6DF5
.string "ARCHIE: What happened…\n"
.string "What is this wretched scene…\p"
.string "Did I…make a horrible mistake?$"
-Route128_Text_1F6E48: @ 81F6E48
+Route128_Text_ArchieIOnlyWanted: @ 81F6E48
.string "I…\n"
.string "I only wanted…$"
-Route128_Text_1F6E5A: @ 81F6E5A
+Route128_Text_MaxieDoYouUnderstandNow: @ 81F6E5A
.string "MAXIE: Do you understand now,\n"
.string "ARCHIE?\p"
.string "Do you finally see how disastrous\n"
@@ -261,7 +263,7 @@ Route128_Text_1F6E5A: @ 81F6E5A
.string "something before the situation goes\l"
.string "completely out of control!$"
-Route128_Text_1F6F1E: @ 81F6F1E
+Route128_Text_MaxieResposibilityFallsToArchieAndMe: @ 81F6F1E
.string "MAXIE: {PLAYER}, don't say anything.\p"
.string "I know that I have no right to be\n"
.string "critical of ARCHIE…\p"
@@ -273,17 +275,17 @@ Route128_Text_1F6F1E: @ 81F6F1E
.string "The responsibility for putting an end\n"
.string "to this falls to ARCHIE and me…$"
-Route128_Text_1F704F: @ 81F704F
+Route128_Text_MaxieThisDefiesBelief: @ 81F704F
.string "MAXIE: This defies belief…\p"
.string "Those super-ancient POKéMON…\p"
.string "Their power is unbelievable.\n"
.string "They've upset the balance of nature…$"
-Route128_Text_1F70C9: @ 81F70C9
+Route128_Text_StevenWhatIsHappening: @ 81F70C9
.string "STEVEN: {PLAYER}{KUN}!\n"
.string "What is happening?$"
-Route128_Text_1F70EA: @ 81F70EA
+Route128_Text_StevenWholeWorldWillDrown: @ 81F70EA
.string "This is terrible…\p"
.string "After the scorching heat wave ended,\n"
.string "this deluge began.\p"
@@ -295,7 +297,7 @@ Route128_Text_1F70EA: @ 81F70EA
.string "There's no point arguing here…\n"
.string "SOOTOPOLIS might provide answers…$"
-Route128_Text_1F721B: @ 81F721B
+Route128_Text_StevenImGoingToSootopolis: @ 81F721B
.string "{PLAYER}{KUN}…\n"
.string "I don't know what you intend to do,\l"
.string "but don't do anything reckless.\p"
diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json
index 3183f9821..6b19cc320 100644
--- a/data/maps/Route129/map.json
+++ b/data/maps/Route129/map.json
@@ -40,7 +40,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route129_EventScript_1F72EC",
+ "script": "Route129_EventScript_Chase",
"flag": "0"
},
{
@@ -53,7 +53,7 @@
"movement_range_y": 2,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route129_EventScript_1F7303",
+ "script": "Route129_EventScript_Allison",
"flag": "0"
},
{
@@ -66,7 +66,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route129_EventScript_1F7331",
+ "script": "Route129_EventScript_Tisha",
"flag": "0"
},
{
@@ -79,7 +79,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route129_EventScript_1F731A",
+ "script": "Route129_EventScript_Reed",
"flag": "0"
},
{
@@ -92,7 +92,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route129_EventScript_1F7348",
+ "script": "Route129_EventScript_Clarence",
"flag": "0"
}
],
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index 0245db703..ae6c67e87 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -1,10 +1,10 @@
Route129_MapScripts:: @ 81F7284
map_script MAP_SCRIPT_ON_TRANSITION, Route129_OnTransition
- map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294
- map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2
+ map_script MAP_SCRIPT_ON_LOAD, Route129_OnLoad
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_OnFrame
.byte 0
-Route129_MapScript1_1F7294: @ 81F7294
+Route129_OnLoad: @ 81F7294
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
@@ -15,43 +15,43 @@ Route129_OnTransition: @ 81F72AB
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup
compare VAR_SOOTOPOLIS_CITY_STATE, 4
- call_if_ge Route129_EventScript_1F72D8
+ call_if_ge Route129_EventScript_CheckSetAlternatingWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST
call_if_eq UnusualWeather_StartKyogreWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST
call_if_eq UnusualWeather_StartKyogreWeather
end
-Route129_EventScript_1F72D8:: @ 81F72D8
+Route129_EventScript_CheckSetAlternatingWeather:: @ 81F72D8
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
return
-Route129_MapScript2_1F72E2: @ 81F72E2
+Route129_OnFrame: @ 81F72E2
map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
-Route129_EventScript_1F72EC:: @ 81F72EC
- trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D
- msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE
+Route129_EventScript_Chase:: @ 81F72EC
+ trainerbattle_single TRAINER_CHASE, Route129_Text_ChaseIntro, Route129_Text_ChaseDefeat
+ msgbox Route129_Text_ChasePostBattle, MSGBOX_AUTOCLOSE
end
-Route129_EventScript_1F7303:: @ 81F7303
- trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034
- msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE
+Route129_EventScript_Allison:: @ 81F7303
+ trainerbattle_single TRAINER_ALLISON, Route129_Text_AllisonIntro, Route129_Text_AllisonDefeat
+ msgbox Route129_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE
end
-Route129_EventScript_1F731A:: @ 81F731A
- trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1
- msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE
+Route129_EventScript_Reed:: @ 81F731A
+ trainerbattle_single TRAINER_REED, Route129_Text_ReedIntro, Route129_Text_ReedDefeat
+ msgbox Route129_Text_ReedPostBattle, MSGBOX_AUTOCLOSE
end
-Route129_EventScript_1F7331:: @ 81F7331
- trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D
- msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE
+Route129_EventScript_Tisha:: @ 81F7331
+ trainerbattle_single TRAINER_TISHA, Route129_Text_TishaIntro, Route129_Text_TishaDefeat
+ msgbox Route129_Text_TishaPostBattle, MSGBOX_AUTOCLOSE
end
-Route129_EventScript_1F7348:: @ 81F7348
- trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239
- msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE
+Route129_EventScript_Clarence:: @ 81F7348
+ trainerbattle_single TRAINER_CLARENCE, Route129_Text_ClarenceIntro, Route129_Text_ClarenceDefeat
+ msgbox Route129_Text_ClarencePostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
index 18d168b17..c0b92a1a5 100644
--- a/data/maps/Route130/map.json
+++ b/data/maps/Route130/map.json
@@ -35,7 +35,7 @@
"movement_range_y": 6,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route130_EventScript_1F73BF",
+ "script": "Route130_EventScript_Rodney",
"flag": "0"
},
{
@@ -48,7 +48,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route130_EventScript_1F73D6",
+ "script": "Route130_EventScript_Katie",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route130_EventScript_1F73ED",
+ "script": "Route130_EventScript_Santiago",
"flag": "0"
}
],
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index 9362e1d5d..f5bd7e051 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -4,10 +4,10 @@ Route130_MapScripts:: @ 81F735F
Route130_OnTransition: @ 81F7365
compare VAR_SOOTOPOLIS_CITY_STATE, 4
- call_if_ge Route130_EventScript_1F73B5
+ call_if_ge Route130_EventScript_CheckSetAlternatingWeather
specialvar VAR_RESULT, IsMirageIslandPresent
- compare VAR_RESULT, 1
- goto_if_eq Route130_EventScript_1F73B1
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route130_EventScript_SetMirageIslandLayout
setflag FLAG_TEMP_11
setflag FLAG_TEMP_12
setflag FLAG_TEMP_13
@@ -26,26 +26,26 @@ Route130_OnTransition: @ 81F7365
setmaplayoutindex LAYOUT_ROUTE130
end
-Route130_EventScript_1F73B1:: @ 81F73B1
+Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1
setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
end
-Route130_EventScript_1F73B5:: @ 81F73B5
+Route130_EventScript_CheckSetAlternatingWeather:: @ 81F73B5
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
return
-Route130_EventScript_1F73BF:: @ 81F73BF
- trainerbattle_single TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6
- msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE
+Route130_EventScript_Rodney:: @ 81F73BF
+ trainerbattle_single TRAINER_RODNEY, Route130_Text_RodneyIntro, Route130_Text_RodneyDefeat
+ msgbox Route130_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE
end
-Route130_EventScript_1F73D6:: @ 81F73D6
- trainerbattle_single TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC
- msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE
+Route130_EventScript_Katie:: @ 81F73D6
+ trainerbattle_single TRAINER_KATIE, Route130_Text_KatieIntro, Route130_Text_KatieDefeat
+ msgbox Route130_Text_KatiePostBattle, MSGBOX_AUTOCLOSE
end
-Route130_EventScript_1F73ED:: @ 81F73ED
- trainerbattle_single TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D
- msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE
+Route130_EventScript_Santiago:: @ 81F73ED
+ trainerbattle_single TRAINER_SANTIAGO, Route130_Text_SantiagoIntro, Route130_Text_SantiagoDefeat
+ msgbox Route130_Text_SantiagoPostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json
index 379b15b3d..af73808b6 100644
--- a/data/maps/Route131/map.json
+++ b/data/maps/Route131/map.json
@@ -35,7 +35,7 @@
"movement_range_y": 7,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route131_EventScript_1F7429",
+ "script": "Route131_EventScript_Richard",
"flag": "0"
},
{
@@ -48,7 +48,7 @@
"movement_range_y": 7,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route131_EventScript_1F7440",
+ "script": "Route131_EventScript_Herman",
"flag": "0"
},
{
@@ -61,7 +61,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route131_EventScript_1F7457",
+ "script": "Route131_EventScript_Susie",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 5,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route131_EventScript_1F746E",
+ "script": "Route131_EventScript_Kara",
"flag": "0"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route131_EventScript_1F7485",
+ "script": "Route131_EventScript_Reli",
"flag": "0"
},
{
@@ -100,7 +100,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route131_EventScript_1F74A0",
+ "script": "Route131_EventScript_Ian",
"flag": "0"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route131_EventScript_1F74D2",
+ "script": "Route131_EventScript_Kevin",
"flag": "0"
},
{
@@ -126,7 +126,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route131_EventScript_1F74BB",
+ "script": "Route131_EventScript_Talia",
"flag": "0"
}
],
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index 1bb8cfdbc..d26100a10 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -4,55 +4,55 @@ Route131_MapScripts:: @ 81F7404
Route131_OnTransition: @ 81F740A
compare VAR_SOOTOPOLIS_CITY_STATE, 4
- call_if_ge Route131_EventScript_1F741F
- call Route131_EventScript_1F741B
+ call_if_ge Route131_EventScript_CheckSetAlternatingWeather
+ call Route131_EventScript_SetLayout
end
-Route131_EventScript_1F741B:: @ 81F741B
+Route131_EventScript_SetLayout:: @ 81F741B
setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR
return
-Route131_EventScript_1F741F:: @ 81F741F
+Route131_EventScript_CheckSetAlternatingWeather:: @ 81F741F
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
return
-Route131_EventScript_1F7429:: @ 81F7429
- trainerbattle_single TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D
- msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE
+Route131_EventScript_Richard:: @ 81F7429
+ trainerbattle_single TRAINER_RICHARD, Route131_Text_RichardIntro, Route131_Text_RichardDefeat
+ msgbox Route131_Text_RichardPostBattle, MSGBOX_AUTOCLOSE
end
-Route131_EventScript_1F7440:: @ 81F7440
- trainerbattle_single TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626
- msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE
+Route131_EventScript_Herman:: @ 81F7440
+ trainerbattle_single TRAINER_HERMAN, Route131_Text_HermanIntro, Route131_Text_HermanDefeat
+ msgbox Route131_Text_HermanPostBattle, MSGBOX_AUTOCLOSE
end
-Route131_EventScript_1F7457:: @ 81F7457
- trainerbattle_single TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB
- msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE
+Route131_EventScript_Susie:: @ 81F7457
+ trainerbattle_single TRAINER_SUSIE, Route131_Text_SusieIntro, Route131_Text_SusieDefeat
+ msgbox Route131_Text_SusiePostBattle, MSGBOX_AUTOCLOSE
end
-Route131_EventScript_1F746E:: @ 81F746E
- trainerbattle_single TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A
- msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE
+Route131_EventScript_Kara:: @ 81F746E
+ trainerbattle_single TRAINER_KARA, Route131_Text_KaraIntro, Route131_Text_KaraDefeat
+ msgbox Route131_Text_KaraPostBattle, MSGBOX_AUTOCLOSE
end
-Route131_EventScript_1F7485:: @ 81F7485
- trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7
- msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE
+Route131_EventScript_Reli:: @ 81F7485
+ trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_ReliIntro, Route131_Text_ReliDefeat, Route131_Text_ReliNotEnoughMons
+ msgbox Route131_Text_ReliPostBattle, MSGBOX_AUTOCLOSE
end
-Route131_EventScript_1F74A0:: @ 81F74A0
- trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD
- msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE
+Route131_EventScript_Ian:: @ 81F74A0
+ trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_IanIntro, Route131_Text_IanDefeat, Route131_Text_IanNotEnoughMons
+ msgbox Route131_Text_IanPostBattle, MSGBOX_AUTOCLOSE
end
-Route131_EventScript_1F74BB:: @ 81F74BB
- trainerbattle_single TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38
- msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE
+Route131_EventScript_Talia:: @ 81F74BB
+ trainerbattle_single TRAINER_TALIA, Route131_Text_TaliaIntro, Route131_Text_TaliaDefeat
+ msgbox Route131_Text_TaliaPostBattle, MSGBOX_AUTOCLOSE
end
-Route131_EventScript_1F74D2:: @ 81F74D2
- trainerbattle_single TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC
- msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE
+Route131_EventScript_Kevin:: @ 81F74D2
+ trainerbattle_single TRAINER_KEVIN, Route131_Text_KevinIntro, Route131_Text_KevinDefeat
+ msgbox Route131_Text_KevinPostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json
index 8a7597826..947f8d9cf 100644
--- a/data/maps/Route132/map.json
+++ b/data/maps/Route132/map.json
@@ -35,7 +35,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route132_EventScript_1F74EA",
+ "script": "Route132_EventScript_Gilbert",
"flag": "0"
},
{
@@ -48,7 +48,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route132_EventScript_1F7501",
+ "script": "Route132_EventScript_Dana",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F752F",
+ "script": "Route132_EventScript_Kiyo",
"flag": "0"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route132_EventScript_1F7518",
+ "script": "Route132_EventScript_Ronald",
"flag": "0"
},
{
@@ -100,7 +100,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F7546",
+ "script": "Route132_EventScript_Paxton",
"flag": "0"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F755D",
+ "script": "Route132_EventScript_Darcy",
"flag": "0"
},
{
@@ -126,7 +126,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F758B",
+ "script": "Route132_EventScript_Makayla",
"flag": "0"
},
{
@@ -139,7 +139,7 @@
"movement_range_y": 4,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route132_EventScript_1F7574",
+ "script": "Route132_EventScript_Jonathan",
"flag": "0"
},
{
diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc
index aed4d0673..6b82102be 100644
--- a/data/maps/Route132/scripts.inc
+++ b/data/maps/Route132/scripts.inc
@@ -1,43 +1,43 @@
Route132_MapScripts:: @ 81F74E9
.byte 0
-Route132_EventScript_1F74EA:: @ 81F74EA
- trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC
- msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE
+Route132_EventScript_Gilbert:: @ 81F74EA
+ trainerbattle_single TRAINER_GILBERT, Route132_Text_GilbertIntro, Route132_Text_GilbertDefeat
+ msgbox Route132_Text_GilbertPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F7501:: @ 81F7501
- trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39
- msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE
+Route132_EventScript_Dana:: @ 81F7501
+ trainerbattle_single TRAINER_DANA, Route132_Text_DanaIntro, Route132_Text_DanaDefeat
+ msgbox Route132_Text_DanaPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F7518:: @ 81F7518
- trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD
- msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE
+Route132_EventScript_Ronald:: @ 81F7518
+ trainerbattle_single TRAINER_RONALD, Route132_Text_RonaldIntro, Route132_Text_RonaldDefeat
+ msgbox Route132_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F752F:: @ 81F752F
- trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C
- msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE
+Route132_EventScript_Kiyo:: @ 81F752F
+ trainerbattle_single TRAINER_KIYO, Route132_Text_KiyoIntro, Route132_Text_KiyoDefeat
+ msgbox Route132_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F7546:: @ 81F7546
- trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8
- msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE
+Route132_EventScript_Paxton:: @ 81F7546
+ trainerbattle_single TRAINER_PAXTON, Route132_Text_PaxtonIntro, Route132_Text_PaxtonDefeat
+ msgbox Route132_Text_PaxtonPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F755D:: @ 81F755D
- trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E
- msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE
+Route132_EventScript_Darcy:: @ 81F755D
+ trainerbattle_single TRAINER_DARCY, Route132_Text_DarcyIntro, Route132_Text_DarcyDefeat
+ msgbox Route132_Text_DarcyPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F7574:: @ 81F7574
- trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD
- msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE
+Route132_EventScript_Jonathan:: @ 81F7574
+ trainerbattle_single TRAINER_JONATHAN, Route132_Text_JonathanIntro, Route132_Text_JonathanDefeat
+ msgbox Route132_Text_JonathanPostBattle, MSGBOX_AUTOCLOSE
end
-Route132_EventScript_1F758B:: @ 81F758B
- trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C
- msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE
+Route132_EventScript_Makayla:: @ 81F758B
+ trainerbattle_single TRAINER_MAKAYLA, Route132_Text_MakaylaIntro, Route132_Text_MakaylaDefeat
+ msgbox Route132_Text_MakaylaPostBattle, MSGBOX_AUTOCLOSE
end
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
diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json
index e45920576..fb4da1f92 100644
--- a/data/maps/Route134/map.json
+++ b/data/maps/Route134/map.json
@@ -35,7 +35,7 @@
"movement_range_y": 5,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route134_EventScript_1F7653",
+ "script": "Route134_EventScript_Jack",
"flag": "0"
},
{
@@ -48,7 +48,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route134_EventScript_1F766A",
+ "script": "Route134_EventScript_Laurel",
"flag": "0"
},
{
@@ -61,7 +61,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route134_EventScript_1F7698",
+ "script": "Route134_EventScript_Aaron",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "6",
- "script": "Route134_EventScript_1F7681",
+ "script": "Route134_EventScript_Alex",
"flag": "0"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route134_EventScript_1F76AF",
+ "script": "Route134_EventScript_Hitoshi",
"flag": "0"
},
{
@@ -100,7 +100,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route134_EventScript_1F76F4",
+ "script": "Route134_EventScript_Marley",
"flag": "0"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "6",
- "script": "Route134_EventScript_1F770B",
+ "script": "Route134_EventScript_Kelvin",
"flag": "0"
},
{
@@ -126,7 +126,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route134_EventScript_1F76DD",
+ "script": "Route134_EventScript_Reyna",
"flag": "0"
},
{
@@ -139,7 +139,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route134_EventScript_1F76C6",
+ "script": "Route134_EventScript_Hudson",
"flag": "0"
},
{
diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc
index a941e19b5..3da2781b9 100644
--- a/data/maps/Route134/scripts.inc
+++ b/data/maps/Route134/scripts.inc
@@ -1,53 +1,53 @@
Route134_MapScripts:: @ 81F7644
- map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A
+ map_script MAP_SCRIPT_ON_RESUME, Route134_OnResume
.byte 0
-Route134_MapScript1_1F764A: @ 81F764A
+Route134_OnResume: @ 81F764A
setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6
end
-Route134_EventScript_1F7653:: @ 81F7653
- trainerbattle_single TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB
- msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE
+Route134_EventScript_Jack:: @ 81F7653
+ trainerbattle_single TRAINER_JACK, Route134_Text_JackIntro, Route134_Text_JackDefeat
+ msgbox Route134_Text_JackPostBattle, MSGBOX_AUTOCLOSE
end
-Route134_EventScript_1F766A:: @ 81F766A
- trainerbattle_single TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643
- msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE
+Route134_EventScript_Laurel:: @ 81F766A
+ trainerbattle_single TRAINER_LAUREL, Route134_Text_LaurelIntro, Route134_Text_LaurelDefeat
+ msgbox Route134_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE
end
-Route134_EventScript_1F7681:: @ 81F7681
- trainerbattle_single TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE
- msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE
+Route134_EventScript_Alex:: @ 81F7681
+ trainerbattle_single TRAINER_ALEX, Route134_Text_AlexIntro, Route134_Text_AlexDefeat
+ msgbox Route134_Text_AlexPostBattle, MSGBOX_AUTOCLOSE
end
-Route134_EventScript_1F7698:: @ 81F7698
- trainerbattle_single TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1
- msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE
+Route134_EventScript_Aaron:: @ 81F7698
+ trainerbattle_single TRAINER_AARON, Route134_Text_AaronIntro, Route134_Text_AaronDefeat
+ msgbox Route134_Text_AaronPostBattle, MSGBOX_AUTOCLOSE
end
-Route134_EventScript_1F76AF:: @ 81F76AF
- trainerbattle_single TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745
- msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE
+Route134_EventScript_Hitoshi:: @ 81F76AF
+ trainerbattle_single TRAINER_HITOSHI, Route134_Text_HitoshiIntro, Route134_Text_HitoshiDefeat
+ msgbox Route134_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE
end
-Route134_EventScript_1F76C6:: @ 81F76C6
- trainerbattle_single TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1
- msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE
+Route134_EventScript_Hudson:: @ 81F76C6
+ trainerbattle_single TRAINER_HUDSON, Route134_Text_HudsonIntro, Route134_Text_HudsonDefeat
+ msgbox Route134_Text_HudsonPostBattle, MSGBOX_AUTOCLOSE
end
-Route134_EventScript_1F76DD:: @ 81F76DD
- trainerbattle_single TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10
- msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE
+Route134_EventScript_Reyna:: @ 81F76DD
+ trainerbattle_single TRAINER_REYNA, Route134_Text_ReynaIntro, Route134_Text_ReynaDefeat
+ msgbox Route134_Text_ReynaPostBattle, MSGBOX_AUTOCLOSE
end
-Route134_EventScript_1F76F4:: @ 81F76F4
- trainerbattle_single TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B
- msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE
+Route134_EventScript_Marley:: @ 81F76F4
+ trainerbattle_single TRAINER_MARLEY, Route134_Text_MarleyIntro, Route134_Text_MarleyDefeat
+ msgbox Route134_Text_MarleyPostBattle, MSGBOX_AUTOCLOSE
end
-Route134_EventScript_1F770B:: @ 81F770B
- trainerbattle_single TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B
- msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE
+Route134_EventScript_Kelvin:: @ 81F770B
+ trainerbattle_single TRAINER_KELVIN, Route134_Text_KelvinIntro, Route134_Text_KelvinDefeat
+ msgbox Route134_Text_KelvinPostBattle, MSGBOX_AUTOCLOSE
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 02:47:54 +0000