summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/Route104/scripts.inc4
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/map.json6
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/scripts.inc70
-rw-r--r--data/maps/Route105/map.json14
-rw-r--r--data/maps/Route105/scripts.inc72
-rw-r--r--data/maps/Route106/map.json10
-rw-r--r--data/maps/Route106/scripts.inc44
-rw-r--r--data/maps/Route107/map.json14
-rw-r--r--data/maps/Route107/scripts.inc56
-rw-r--r--data/maps/Route108/map.json12
-rw-r--r--data/maps/Route108/scripts.inc50
11 files changed, 176 insertions, 176 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index c7a0f9784..0fcf361de 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -379,11 +379,11 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF
applymovement 7, Route104_Movement_1ED1C8
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED1C8
waitmovement 0
- pokenavcall Route104_Text_1EE336
+ pokenavcall Route104_Text_DadPokenavCall
waitmessage
delay 30
playfanfare MUS_ME_TORE_EYE
- msgbox Route104_Text_1EE463, MSGBOX_DEFAULT
+ msgbox Route104_Text_RegisteredDadInPokenav, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json
index 9d3d30794..dcda9afeb 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/map.json
+++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373",
+ "script": "Route104_PrettyPetalFlowerShop_EventScript_ShopOwner",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C",
+ "script": "Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 2,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442",
+ "script": "Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl",
"flag": "0"
}
],
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index 0b8d2217f..dc5bd2ce9 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
@@ -4,48 +4,48 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C
Route104_PrettyPetalFlowerShop_OnTransition: @ 822A352
setflag FLAG_LANDMARK_FLOWER_SHOP
- goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A36B
- goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B
+ goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner
+ goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner
setflag FLAG_TEMP_1
end
-Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B
+Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner:: @ 822A36B
setobjectxyperm 1, 4, 6
end
-Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373
+Route104_PrettyPetalFlowerShop_EventScript_ShopOwner:: @ 822A373
lock
faceplayer
- goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_22A3E4
- msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT
- goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A3B2
+ goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_SellDecorations
+ msgbox Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop, MSGBOX_DEFAULT
+ goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet
setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
- msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO
- compare VAR_RESULT, 1
- call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2
- compare VAR_RESULT, 0
- call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB
+ msgbox Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries, MSGBOX_YESNO
+ compare VAR_RESULT, TRUE
+ call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries
+ compare VAR_RESULT, FALSE
+ call_if_eq Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries
release
end
-Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2
- msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO
- compare VAR_RESULT, 1
- call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2
- compare VAR_RESULT, 0
- call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB
+Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet:: @ 822A3B2
+ msgbox Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries, MSGBOX_YESNO
+ compare VAR_RESULT, TRUE
+ call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries
+ compare VAR_RESULT, FALSE
+ call_if_eq Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries
release
end
-Route104_PrettyPetalFlowerShop_EventScript_22A3D2:: @ 822A3D2
- msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, MSGBOX_DEFAULT
+Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries:: @ 822A3D2
+ msgbox Route104_PrettyPetalFlowerShop_Text_BerriesExplanation, MSGBOX_DEFAULT
return
-Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB
- msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, MSGBOX_DEFAULT
+Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries:: @ 822A3DB
+ msgbox Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness, MSGBOX_DEFAULT
return
-Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4
+Route104_PrettyPetalFlowerShop_EventScript_SellDecorations:: @ 822A3E4
message gText_PlayerWhatCanIDoForYou
waitmessage
pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants
@@ -65,39 +65,39 @@ Route104_PrettyPetalFlowerShop_Pokemart_Plants: @ 822A3FC
release
end
-Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C
+Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl:: @ 822A40C
lock
faceplayer
- goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_22A421
- msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT
+ goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail
+ msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT
release
end
-Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421
- msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, MSGBOX_DEFAULT
+Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail:: @ 822A421
+ msgbox Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis, MSGBOX_DEFAULT
giveitem_std ITEM_WAILMER_PAIL
- msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT
+ msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_WAILMER_PAIL
release
end
-Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442
+Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl:: @ 822A442
lock
faceplayer
dotimebasedevents
- goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482
- msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT
+ goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry
+ msgbox Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers, MSGBOX_DEFAULT
random 8
addvar VAR_RESULT, FIRST_BERRY_INDEX
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY
- msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT
+ msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT
release
end
-Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482
- msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT
+Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry:: @ 822A482
+ msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT
release
end
diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json
index 4d447d4f8..bb6aadd54 100644
--- a/data/maps/Route105/map.json
+++ b/data/maps/Route105/map.json
@@ -40,7 +40,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "6",
- "script": "Route105_EventScript_1EE261",
+ "script": "Route105_EventScript_Luis",
"flag": "0"
},
{
@@ -53,7 +53,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route105_EventScript_1EE278",
+ "script": "Route105_EventScript_Dominik",
"flag": "0"
},
{
@@ -66,7 +66,7 @@
"movement_range_y": 7,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route105_EventScript_1EE28F",
+ "script": "Route105_EventScript_Beverly",
"flag": "0"
},
{
@@ -79,7 +79,7 @@
"movement_range_y": 5,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route105_EventScript_1EE2A6",
+ "script": "Route105_EventScript_Imani",
"flag": "0"
},
{
@@ -105,7 +105,7 @@
"movement_range_y": 7,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route105_EventScript_1EE24A",
+ "script": "Route105_EventScript_Foster",
"flag": "0"
},
{
@@ -118,7 +118,7 @@
"movement_range_y": 2,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route105_EventScript_1EE2BD",
+ "script": "Route105_EventScript_Josue",
"flag": "0"
},
{
@@ -131,7 +131,7 @@
"movement_range_y": 2,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route105_EventScript_1EE2D4",
+ "script": "Route105_EventScript_Andres",
"flag": "0"
}
],
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index ff4b3dbe1..1b892642e 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -1,18 +1,18 @@
Route105_MapScripts:: @ 81EE1DB
- map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB
+ map_script MAP_SCRIPT_ON_LOAD, Route105_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, Route105_OnTransition
- map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_OnFrame
.byte 0
-Route105_MapScript1_1EE1EB: @ 81EE1EB
- call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B
+Route105_OnLoad: @ 81EE1EB
+ call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South
end
-Route105_EventScript_1EE20B:: @ 81EE20B
+Route105_CloseRegiEntrance:: @ 81EE20B
setmetatile 9, 19, METATILE_General_RockWall_RockBase, 1
setmetatile 9, 20, METATILE_General_RockWall_SandBase, 1
return
@@ -26,63 +26,63 @@ Route105_OnTransition: @ 81EE21E
call_if_eq UnusualWeather_StartKyogreWeather
end
-Route105_MapScript2_1EE240: @ 81EE240
+Route105_OnFrame: @ 81EE240
map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
-Route105_EventScript_1EE24A:: @ 81EE24A
- trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62
- msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE
+Route105_EventScript_Foster:: @ 81EE24A
+ trainerbattle_single TRAINER_FOSTER, Route105_Text_FosterIntro, Route105_Text_FosterDefeated
+ msgbox Route105_Text_FosterPostBattle, MSGBOX_AUTOCLOSE
end
-Route105_EventScript_1EE261:: @ 81EE261
- trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66
- msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE
+Route105_EventScript_Luis:: @ 81EE261
+ trainerbattle_single TRAINER_LUIS, Route105_Text_LuisIntro, Route105_Text_LuisDefeated
+ msgbox Route105_Text_LuisPostBattle, MSGBOX_AUTOCLOSE
end
-Route105_EventScript_1EE278:: @ 81EE278
- trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA
- msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE
+Route105_EventScript_Dominik:: @ 81EE278
+ trainerbattle_single TRAINER_DOMINIK, Route105_Text_DominikIntro, Route105_Text_DominikDefeated
+ msgbox Route105_Text_DominikPostBattle, MSGBOX_AUTOCLOSE
end
-Route105_EventScript_1EE28F:: @ 81EE28F
- trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0
- msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE
+Route105_EventScript_Beverly:: @ 81EE28F
+ trainerbattle_single TRAINER_BEVERLY, Route105_Text_BeverlyIntro, Route105_Text_BeverlyDefeated
+ msgbox Route105_Text_PostBattle, MSGBOX_AUTOCLOSE
end
-Route105_EventScript_1EE2A6:: @ 81EE2A6
- trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059
- msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE
+Route105_EventScript_Imani:: @ 81EE2A6
+ trainerbattle_single TRAINER_IMANI, Route105_Text_ImaniIntro, Route105_Text_ImaniDefeated
+ msgbox Route105_Text_ImaniPostBattle, MSGBOX_AUTOCLOSE
end
-Route105_EventScript_1EE2BD:: @ 81EE2BD
- trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB
- msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE
+Route105_EventScript_Josue:: @ 81EE2BD
+ trainerbattle_single TRAINER_JOSUE, Route105_Text_JosueIntro, Route105_Text_JosueDefeated
+ msgbox Route105_Text_JosuePostBattle, MSGBOX_AUTOCLOSE
end
-Route105_EventScript_1EE2D4:: @ 81EE2D4
- trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
+Route105_EventScript_Andres:: @ 81EE2D4
+ trainerbattle_single TRAINER_ANDRES_1, Route105_Text_AndresIntro, Route105_Text_AndresDefeated, Route105_EventScript_AndresRegisterMatchCallAfterBattle
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route105_EventScript_1EE31F
- msgbox Route105_Text_2960FA, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route105_EventScript_AndresRematch
+ msgbox Route105_Text_AndresPostBattle, MSGBOX_DEFAULT
release
end
-Route105_EventScript_1EE300:: @ 81EE300
+Route105_EventScript_AndresRegisterMatchCallAfterBattle:: @ 81EE300
special sub_80B4808
waitmovement 0
- msgbox Route105_Text_296159, MSGBOX_DEFAULT
+ msgbox Route105_Text_AndresRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_ANDRES_1
release
end
-Route105_EventScript_1EE31F:: @ 81EE31F
- trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD
- msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE
+Route105_EventScript_AndresRematch:: @ 81EE31F
+ trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_AndresRematchIntro, Route105_Text_AndresRematchDefeated
+ msgbox Route105_Text_AndresRematchPostBattle, MSGBOX_AUTOCLOSE
end
-Route104_Text_1EE336: @ 81EE336
+Route104_Text_DadPokenavCall: @ 81EE336
.string "… … … … … …\n"
.string "… … … … … Beep!\p"
.string "DAD: Oh, {PLAYER}?\p"
@@ -98,6 +98,6 @@ Route104_Text_1EE336: @ 81EE336
.string "… … … … … …\n"
.string "… … … … … Click!$"
-Route104_Text_1EE463: @ 81EE463
+Route104_Text_RegisteredDadInPokenav: @ 81EE463
.string "Registered DAD NORMAN\n"
.string "in the POKéNAV.$"
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..eb545cab8 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
+Route106_EventScript_ElliotRegisterMatchCallAfterBattle:: @ 81EE4ED
special sub_80B4808
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.$"
diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json
index 3813f4795..b0bb63a14 100644
--- a/data/maps/Route107/map.json
+++ b/data/maps/Route107/map.json
@@ -35,7 +35,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route107_EventScript_1EE595",
+ "script": "Route107_EventScript_Darrin",
"flag": "0"
},
{
@@ -48,7 +48,7 @@
"movement_range_y": 2,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route107_EventScript_1EE5AC",
+ "script": "Route107_EventScript_Tony",
"flag": "0"
},
{
@@ -61,7 +61,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route107_EventScript_1EE60E",
+ "script": "Route107_EventScript_Denise",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route107_EventScript_1EE625",
+ "script": "Route107_EventScript_Beth",
"flag": "0"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route107_EventScript_1EE63C",
+ "script": "Route107_EventScript_Lisa",
"flag": "0"
},
{
@@ -100,7 +100,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route107_EventScript_1EE657",
+ "script": "Route107_EventScript_Ray",
"flag": "0"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route107_EventScript_1EE672",
+ "script": "Route107_EventScript_Camron",
"flag": "0"
}
],
diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc
index 90f67a639..936634d8d 100644
--- a/data/maps/Route107/scripts.inc
+++ b/data/maps/Route107/scripts.inc
@@ -1,55 +1,55 @@
Route107_MapScripts:: @ 81EE594
.byte 0
-Route107_EventScript_1EE595:: @ 81EE595
- trainerbattle_single TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F
- msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE
+Route107_EventScript_Darrin:: @ 81EE595
+ trainerbattle_single TRAINER_DARRIN, Route107_Text_DarrinIntro, Route107_Text_DarrinDefeated
+ msgbox Route107_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE
end
-Route107_EventScript_1EE5AC:: @ 81EE5AC
- trainerbattle_single TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8
+Route107_EventScript_Tony:: @ 81EE5AC
+ trainerbattle_single TRAINER_TONY_1, Route107_Text_TonyIntro, Route107_Text_TonyDefeated, Route107_EventScript_TonyRegisterMatchCallAfterBattle
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route107_EventScript_1EE5F7
- msgbox Route107_Text_2967FF, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route107_EventScript_TonyRematch
+ msgbox Route107_Text_TonyPostBattle, MSGBOX_DEFAULT
release
end
-Route107_EventScript_1EE5D8:: @ 81EE5D8
+Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8
special sub_80B4808
waitmovement 0
- msgbox Route107_Text_29685A, MSGBOX_DEFAULT
+ msgbox Route107_Text_TonyRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_TONY_1
release
end
-Route107_EventScript_1EE5F7:: @ 81EE5F7
- trainerbattle_rematch TRAINER_TONY_1, Route107_Text_296897, Route107_Text_2968D5
- msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE
+Route107_EventScript_TonyRematch:: @ 81EE5F7
+ trainerbattle_rematch TRAINER_TONY_1, Route107_Text_TonyRematchIntro, Route107_Text_TonyRematchDefeated
+ msgbox Route107_Text_TonyRematchPostBattle, MSGBOX_AUTOCLOSE
end
-Route107_EventScript_1EE60E:: @ 81EE60E
- trainerbattle_single TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E
- msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE
+Route107_EventScript_Denise:: @ 81EE60E
+ trainerbattle_single TRAINER_DENISE, Route107_Text_DeniseIntro, Route107_Text_DeniseDefeated
+ msgbox Route107_Text_DenisePostBattle, MSGBOX_AUTOCLOSE
end
-Route107_EventScript_1EE625:: @ 81EE625
- trainerbattle_single TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17
- msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE
+Route107_EventScript_Beth:: @ 81EE625
+ trainerbattle_single TRAINER_BETH, Route107_Text_BethIntro, Route107_Text_BethDefeated
+ msgbox Route107_Text_BethPostBattle, MSGBOX_AUTOCLOSE
end
-Route107_EventScript_1EE63C:: @ 81EE63C
- trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E
- msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE
+Route107_EventScript_Lisa:: @ 81EE63C
+ trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_LisaIntro, Route107_Text_LisaDefeated, Route107_Text_LisaNotEnoughPokemon
+ msgbox Route107_Text_LisaPostBattle, MSGBOX_AUTOCLOSE
end
-Route107_EventScript_1EE657:: @ 81EE657
- trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34
- msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE
+Route107_EventScript_Ray:: @ 81EE657
+ trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_RayIntro, Route107_Text_RayDefeated, Route107_Text_RayNotEnoughPokemon
+ msgbox Route107_Text_RayPostBattle, MSGBOX_AUTOCLOSE
end
-Route107_EventScript_1EE672:: @ 81EE672
- trainerbattle_single TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD
- msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE
+Route107_EventScript_Camron:: @ 81EE672
+ trainerbattle_single TRAINER_CAMRON, Route107_Text_CamronIntro, Route107_Text_CamronDefeated
+ msgbox Route107_Text_CamronPostBattle, MSGBOX_AUTOCLOSE
end
diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json
index b8b188637..ecdb81f6f 100644
--- a/data/maps/Route108/map.json
+++ b/data/maps/Route108/map.json
@@ -35,7 +35,7 @@
"movement_range_y": 3,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route108_EventScript_1EE68A",
+ "script": "Route108_EventScript_Jerome",
"flag": "0"
},
{
@@ -48,7 +48,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route108_EventScript_1EE6B8",
+ "script": "Route108_EventScript_Tara",
"flag": "0"
},
{
@@ -61,7 +61,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route108_EventScript_1EE6A1",
+ "script": "Route108_EventScript_Matthew",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route108_EventScript_1EE6CF",
+ "script": "Route108_EventScript_Missy",
"flag": "0"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route108_EventScript_1EE6E6",
+ "script": "Route108_EventScript_Carolina",
"flag": "0"
},
{
@@ -100,7 +100,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route108_EventScript_1EE6FD",
+ "script": "Route108_EventScript_Cory",
"flag": "0"
},
{
diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc
index 15a657a20..4f049f71d 100644
--- a/data/maps/Route108/scripts.inc
+++ b/data/maps/Route108/scripts.inc
@@ -1,50 +1,50 @@
Route108_MapScripts:: @ 81EE689
.byte 0
-Route108_EventScript_1EE68A:: @ 81EE68A
- trainerbattle_single TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C
- msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE
+Route108_EventScript_Jerome:: @ 81EE68A
+ trainerbattle_single TRAINER_JEROME, Route108_Text_JeromeIntro, Route108_Text_JeromeDefeated
+ msgbox Route108_Text_JeromePostBattle, MSGBOX_AUTOCLOSE
end
-Route108_EventScript_1EE6A1:: @ 81EE6A1
- trainerbattle_single TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA
- msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE
+Route108_EventScript_Matthew:: @ 81EE6A1
+ trainerbattle_single TRAINER_MATTHEW, Route108_Text_MatthewIntro, Route108_Text_MatthewDefeated
+ msgbox Route108_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE
end
-Route108_EventScript_1EE6B8:: @ 81EE6B8
- trainerbattle_single TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71
- msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE
+Route108_EventScript_Tara:: @ 81EE6B8
+ trainerbattle_single TRAINER_TARA, Route108_Text_TaraIntro, Route108_Text_TaraDefeated
+ msgbox Route108_Text_TaraPostBattle, MSGBOX_AUTOCLOSE
end
-Route108_EventScript_1EE6CF:: @ 81EE6CF
- trainerbattle_single TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC
- msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE
+Route108_EventScript_Missy:: @ 81EE6CF
+ trainerbattle_single TRAINER_MISSY, Route108_Text_MissyIntro, Route108_Text_MissyDefeated
+ msgbox Route108_Text_MissyPostBattle, MSGBOX_AUTOCLOSE
end
-Route108_EventScript_1EE6E6:: @ 81EE6E6
- trainerbattle_single TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7
- msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE
+Route108_EventScript_Carolina:: @ 81EE6E6
+ trainerbattle_single TRAINER_CAROLINA, Route108_Text_CarolinaIntro, Route108_Text_CarolinaDefeated
+ msgbox Route108_Text_CarolinaPostBattle, MSGBOX_AUTOCLOSE
end
-Route108_EventScript_1EE6FD:: @ 81EE6FD
- trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
+Route108_EventScript_Cory:: @ 81EE6FD
+ trainerbattle_single TRAINER_CORY_1, Route108_Text_CoryIntro, Route108_Text_CoryDefeated, Route108_EventScript_CoryRegisterMatchCallAfterBattle
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route108_EventScript_1EE748
- msgbox Route108_Text_296FB0, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route108_EventScript_CoryRematch
+ msgbox Route108_Text_CoryPostBattle, MSGBOX_DEFAULT
release
end
-Route108_EventScript_1EE729:: @ 81EE729
+Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729
special sub_80B4808
waitmovement 0
- msgbox Route108_Text_296FD8, MSGBOX_DEFAULT
+ msgbox Route108_Text_CoryRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_CORY_1
release
end
-Route108_EventScript_1EE748:: @ 81EE748
- trainerbattle_rematch TRAINER_CORY_1, Route108_Text_297011, Route108_Text_297036
- msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE
+Route108_EventScript_CoryRematch:: @ 81EE748
+ trainerbattle_rematch TRAINER_CORY_1, Route108_Text_CoryRematchIntro, Route108_Text_CoryRematchDefeated
+ msgbox Route108_Text_CoryRematchPostBattle, MSGBOX_AUTOCLOSE
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 17:10:11 +0000