summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/event_scripts.s20
-rw-r--r--data/maps/DewfordTown/scripts.inc15
-rw-r--r--data/maps/Route104/scripts.inc12
-rw-r--r--data/maps/Route104_MrBrineysHouse/scripts.inc2
-rw-r--r--data/maps/Route109/map.json48
-rw-r--r--data/maps/Route109/scripts.inc280
-rw-r--r--data/scripts/new_game.inc2
-rw-r--r--data/text/trainers.inc104
-rw-r--r--include/constants/flags.h2
9 files changed, 241 insertions, 244 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 2e059113a..6d80d4eae 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -712,13 +712,13 @@ EventScript_ResetMrBriney:: @ 8271862
compare VAR_BRINEY_LOCATION, 2
goto_if_eq EventScript_MoveMrBrineyToDewford
compare VAR_BRINEY_LOCATION, 3
- goto_if_eq EventScript_MoveMrBrineyToRoute108
+ goto_if_eq EventScript_MoveMrBrineyToRoute109
end
EventScript_MoveMrBrineyToHouse:: @ 8271884
setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
- setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+ setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
@@ -726,7 +726,7 @@ EventScript_MoveMrBrineyToHouse:: @ 8271884
end
EventScript_MoveMrBrineyToDewford:: @ 827189A
- setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+ setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
@@ -736,14 +736,14 @@ EventScript_MoveMrBrineyToDewford:: @ 827189A
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
end
-EventScript_MoveMrBrineyToRoute108:: @ 82718B3
+EventScript_MoveMrBrineyToRoute109:: @ 82718B3
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
- clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+ clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY
clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
end
@@ -760,7 +760,7 @@ Common_EventScript_UpdateBrineyLocation:: @ 82718DE
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn
goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, EventScript_SetBrineyLocation_House
goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, EventScript_SetBrineyLocation_Dewford
- goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, EventScript_SetBrineyLocation_Route108
+ goto_if_unset FLAG_HIDE_ROUTE_109_MR_BRINEY, EventScript_SetBrineyLocation_Route109
return
EventScript_SetBrineyLocation_House:: @ 827190C
@@ -771,7 +771,7 @@ EventScript_SetBrineyLocation_Dewford:: @ 8271912
setvar VAR_BRINEY_LOCATION, 2
return
-EventScript_SetBrineyLocation_Route108:: @ 8271918
+EventScript_SetBrineyLocation_Route109:: @ 8271918
setvar VAR_BRINEY_LOCATION, 3
return
@@ -807,9 +807,7 @@ DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B
special BufferTrendyPhraseString
return
-DewfordTown_EventScript_271E95:: @ 8271E95
-Route104_MrBrineysHouse_EventScript_271E95:: @ 8271E95
-Route109_EventScript_271E95:: @ 8271E95
+EventScript_BackupMrBrineyLocation:: @ 8271E95
copyvar VAR_0x8008, VAR_BRINEY_LOCATION
setvar VAR_BRINEY_LOCATION, 0
return
@@ -894,7 +892,7 @@ Movement_FerryDepart: @ 82721F0
EventScript_HideMrBriney:: @ 82721F8
setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
- setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+ setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index ac0155df9..862d91bf3 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -115,7 +115,7 @@ DewfordTown_EventScript_1E9656:: @ 81E9656
end
DewfordTown_EventScript_1E9660:: @ 81E9660
- call DewfordTown_EventScript_271E95
+ call EventScript_BackupMrBrineyLocation
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0
applymovement 2, DewfordTown_Movement_1E991D
@@ -147,7 +147,7 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
end
DewfordTown_EventScript_1E96E7:: @ 81E96E7
- call DewfordTown_EventScript_271E95
+ call EventScript_BackupMrBrineyLocation
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1
applymovement 2, DewfordTown_Movement_1E991D
@@ -169,7 +169,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
setobjectpriority 2, MAP_ROUTE109, 0
applymovement 2, DewfordTown_Movement_1E991F
waitmovement 0
- clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+ clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY
addobject 1
clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
@@ -185,11 +185,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
end
DewfordTown_EventScript_1E9790:: @ 81E9790
- msgbox DewfordTown_Text_1EEC1D, MSGBOX_DEFAULT
+ msgbox DewfordTown_Text_BrineyLandedInSlateportDeliverGoods, MSGBOX_DEFAULT
return
DewfordTown_EventScript_1E9799:: @ 81E9799
- msgbox DewfordTown_Text_1EEDA7, MSGBOX_DEFAULT
+ msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT
return
DewfordTown_Movement_1E97A2: @ 81E97A2
@@ -654,7 +654,7 @@ DewfordTown_Text_1E9A7F: @ 81E9A7F
.string "DEWFORD HALL\n"
.string "“Everyone's information exchange!”$"
-Route104_Text_1E9AAF: @ 81E9AAF
+Route104_Text_LandedInDewfordDeliverLetter: @ 81E9AAF
.string "MR. BRINEY: Ahoy!\n"
.string "We've hit land in DEWFORD.\p"
.string "I suppose you're off to deliver that\n"
@@ -675,8 +675,7 @@ DewfordTown_Text_1E9BD9: @ 81E9BD9
.string "MR. BRINEY: Then you go on and deliver\n"
.string "the LETTER. I'll be waiting.$"
-Route104_Text_1E9C1D: @ 81E9C1D
-Route109_Text_1E9C1D: @ 81E9C1D
+DewfordTown_Text_BrineyLandedInDewford: @ 81E9C1D
.string "MR. BRINEY: Ahoy!\n"
.string "We've hit land in DEWFORD!\p"
.string "You just go on and tell me whenever\n"
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index 0fcf361de..9c31aadb5 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -418,17 +418,17 @@ Route104_EventScript_1ED139:: @ 81ED139
resetobjectpriority 2, MAP_DEWFORD_TOWN
copyobjectxytoperm 2
setvar VAR_BOARD_BRINEY_BOAT_STATE, 0
- goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4
- goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE
+ goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_DeliverLetterReminder
+ goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_LandedInDewford
end
-Route104_EventScript_1ED1B4:: @ 81ED1B4
- msgbox Route104_Text_1E9AAF, MSGBOX_DEFAULT
+Route104_EventScript_DeliverLetterReminder:: @ 81ED1B4
+ msgbox Route104_Text_LandedInDewfordDeliverLetter, MSGBOX_DEFAULT
releaseall
end
-Route104_EventScript_1ED1BE:: @ 81ED1BE
- msgbox Route104_Text_1E9C1D, MSGBOX_DEFAULT
+Route104_EventScript_LandedInDewford:: @ 81ED1BE
+ msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT
releaseall
end
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index b2baff82b..68fe98ffd 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -74,7 +74,7 @@ Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D
Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT
- call Route104_MrBrineysHouse_EventScript_271E95
+ call EventScript_BackupMrBrineyLocation
setvar VAR_BOARD_BRINEY_BOAT_STATE, 1
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json
index 361467266..4ba9baf9f 100644
--- a/data/maps/Route109/map.json
+++ b/data/maps/Route109/map.json
@@ -48,8 +48,8 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_EventScript_1EE910",
- "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY"
+ "script": "Route109_EventScript_MrBriney",
+ "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY"
},
{
"graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
@@ -61,7 +61,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route109_EventScript_1EEA3D",
+ "script": "Route109_EventScript_David",
"flag": "0"
},
{
@@ -74,7 +74,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "5",
- "script": "Route109_EventScript_1EEA54",
+ "script": "Route109_EventScript_Alice",
"flag": "0"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route109_EventScript_1EEA6B",
+ "script": "Route109_EventScript_Huey",
"flag": "0"
},
{
@@ -100,7 +100,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "6",
- "script": "Route109_EventScript_1EEA82",
+ "script": "Route109_EventScript_Edmond",
"flag": "0"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route109_EventScript_1EEA99",
+ "script": "Route109_EventScript_Ricky",
"flag": "0"
},
{
@@ -126,7 +126,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route109_EventScript_1EEAFB",
+ "script": "Route109_EventScript_Lola",
"flag": "0"
},
{
@@ -139,7 +139,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_EventScript_1EE995",
+ "script": "Route109_EventScript_SeashoreHouseGirl",
"flag": "0"
},
{
@@ -165,7 +165,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route109_EventScript_1EEB74",
+ "script": "Route109_EventScript_Gwen",
"flag": "0"
},
{
@@ -178,7 +178,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route109_EventScript_1EEB5D",
+ "script": "Route109_EventScript_Austina",
"flag": "0"
},
{
@@ -191,7 +191,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route109_EventScript_1EEB8B",
+ "script": "Route109_EventScript_Carter",
"flag": "0"
},
{
@@ -204,7 +204,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_EventScript_1EE99E",
+ "script": "Route109_EventScript_SandCastleBoy",
"flag": "0"
},
{
@@ -217,7 +217,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_EventScript_1EE9B5",
+ "script": "Route109_EventScript_SoftSandGirl",
"flag": "0"
},
{
@@ -230,7 +230,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_EventScript_1EEA06",
+ "script": "Route109_EventScript_Woman",
"flag": "0"
},
{
@@ -243,7 +243,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route109_EventScript_1EEBBD",
+ "script": "Route109_EventScript_Mel",
"flag": "0"
},
{
@@ -256,7 +256,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "1",
- "script": "Route109_EventScript_1EEBA2",
+ "script": "Route109_EventScript_Paul",
"flag": "0"
},
{
@@ -269,7 +269,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_EventScript_1EEA0F",
+ "script": "Route109_EventScript_OldMan",
"flag": "0"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_EventScript_1EEA18",
+ "script": "Route109_EventScript_Zigzagoon",
"flag": "0"
},
{
@@ -295,7 +295,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "6",
- "script": "Route109_EventScript_1EEBEF",
+ "script": "Route109_EventScript_Hailey",
"flag": "0"
},
{
@@ -308,7 +308,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "4",
- "script": "Route109_EventScript_1EEBD8",
+ "script": "Route109_EventScript_Chandler",
"flag": "0"
},
{
@@ -334,7 +334,7 @@
"movement_range_y": 1,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "3",
- "script": "Route109_EventScript_1EEC06",
+ "script": "Route109_EventScript_Elijah",
"flag": "0"
}
],
@@ -355,7 +355,7 @@
"y": 5,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "Route109_EventScript_1EEA2B"
+ "script": "Route109_EventScript_SeashoreHouseSign"
},
{
"type": "sign",
@@ -363,7 +363,7 @@
"y": 10,
"elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "Route109_EventScript_1EEA34"
+ "script": "Route109_EventScript_TrainerTipsSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index a4ac60a9c..adaab110b 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -1,59 +1,59 @@
Route109_MapScripts:: @ 81EE75F
.byte 0
-Route109_EventScript_1EE760:: @ 81EE760
- call Route109_EventScript_271E95
+Route109_EventScript_StartDepartForDewford:: @ 81EE760
+ call EventScript_BackupMrBrineyLocation
setobjectpriority 2, MAP_ROUTE109, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0
- applymovement 2, Route109_Movement_1EE90B
+ applymovement 2, Route109_Movement_BrineyEnterBoat
waitmovement 0
removeobject 2
switch VAR_FACING
- case DIR_SOUTH, Route109_EventScript_1EE7A5
- case DIR_WEST, Route109_EventScript_1EE7C5
- case DIR_EAST, Route109_EventScript_1EE7B5
+ case DIR_SOUTH, Route109_EventScript_EnterBoatSouth
+ case DIR_WEST, Route109_EventScript_EnterBoatWest
+ case DIR_EAST, Route109_EventScript_EnterBoatEast
end
-Route109_EventScript_1EE7A5:: @ 81EE7A5
- applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE8FD
+Route109_EventScript_EnterBoatSouth:: @ 81EE7A5
+ applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth
waitmovement 0
- goto Route109_EventScript_1EE7D5
+ goto Route109_EventScript_DoSailToDewford
end
-Route109_EventScript_1EE7B5:: @ 81EE7B5
- applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE905
+Route109_EventScript_EnterBoatEast:: @ 81EE7B5
+ applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast
waitmovement 0
- goto Route109_EventScript_1EE7D5
+ goto Route109_EventScript_DoSailToDewford
end
-Route109_EventScript_1EE7C5:: @ 81EE7C5
- applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE908
+Route109_EventScript_EnterBoatWest:: @ 81EE7C5
+ applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest
waitmovement 0
- goto Route109_EventScript_1EE7D5
+ goto Route109_EventScript_DoSailToDewford
end
-Route109_EventScript_1EE7D5:: @ 81EE7D5
+Route109_EventScript_DoSailToDewford:: @ 81EE7D5
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
call Common_EventScript_PlayBrineysBoatMusic
- applymovement 1, Route109_Movement_1EE84F
- applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F
+ applymovement 1, Route109_Movement_SailToDewford
+ applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_SailToDewford
waitmovement 0
delay 50
call Common_EventScript_StopBrineysBoatMusic
showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
- applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900
+ applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerExitBoat
waitmovement 0
addobject 4
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setobjectxyperm 2, 12, 8
addobject 2
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
- applymovement 2, Route109_Movement_1EE90D
+ applymovement 2, Route109_Movement_BrineyExitBoat
waitmovement 0
clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
hideobjectat 1, MAP_ROUTE109
- msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT
+ msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT
closemessage
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
@@ -62,7 +62,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5
release
end
-Route109_Movement_1EE84F: @ 81EE84F
+Route109_Movement_SailToDewford: @ 81EE84F
walk_in_place_fastest_down
walk_down
walk_down
@@ -238,98 +238,98 @@ Route109_Movement_1EE84F: @ 81EE84F
walk_in_place_fastest_down
step_end
-Route109_Movement_1EE8FD: @ 81EE8FD
+Route109_Movement_PlayerEnterBoatSouth: @ 81EE8FD
walk_down
walk_down
step_end
-Route109_Movement_1EE900: @ 81EE900
+Route109_Movement_PlayerExitBoat: @ 81EE900
walk_down
walk_down
walk_left
walk_in_place_fastest_right
step_end
-Route109_Movement_1EE905: @ 81EE905
+Route109_Movement_PlayerEnterBoatEast: @ 81EE905
walk_right
walk_down
step_end
-Route109_Movement_1EE908: @ 81EE908
+Route109_Movement_PlayerEnterBoatWest: @ 81EE908
walk_left
walk_down
step_end
-Route109_Movement_1EE90B: @ 81EE90B
+Route109_Movement_BrineyEnterBoat: @ 81EE90B
walk_down
step_end
-Route109_Movement_1EE90D: @ 81EE90D
+Route109_Movement_BrineyExitBoat: @ 81EE90D
walk_down
walk_in_place_fastest_left
step_end
-Route109_EventScript_1EE910:: @ 81EE910
+Route109_EventScript_MrBriney:: @ 81EE910
lock
faceplayer
- goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_1EE921
- goto Route109_EventScript_1EE93F
+ goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_HaveNotDeliveredDevonGood
+ goto Route109_EventScript_DeliveredDevonGoods
end
-Route109_EventScript_1EE921:: @ 81EE921
- message Route109_Text_1EEC96
- msgbox Route109_Text_1EEC96, MSGBOX_YESNO
- compare VAR_RESULT, 0
- goto_if_eq Route109_EventScript_1EE981
- goto Route109_EventScript_1EE972
+Route109_EventScript_HaveNotDeliveredDevonGood:: @ 81EE921
+ message Route109_Text_BrineySailToDewfordQuestion
+ msgbox Route109_Text_BrineySailToDewfordQuestion, MSGBOX_YESNO
+ compare VAR_RESULT, FALSE
+ goto_if_eq Route109_EventScript_StayHere
+ goto Route109_EventScript_SailToDewford
end
-Route109_EventScript_1EE93F:: @ 81EE93F
- message Route109_Text_1EEE17
+Route109_EventScript_DeliveredDevonGoods:: @ 81EE93F
+ message Route109_Text_BrineyWhereAreWeBound
waitmessage
multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0
switch VAR_RESULT
- case 0, Route109_EventScript_1EE972
- case 1, Route109_EventScript_1EE98B
- case MULTI_B_PRESSED, Route109_EventScript_1EE98B
+ case 0, Route109_EventScript_SailToDewford
+ case 1, Route109_EventScript_ChoseNotToSail
+ case MULTI_B_PRESSED, Route109_EventScript_ChoseNotToSail
end
-Route109_EventScript_1EE972:: @ 81EE972
- msgbox Route109_Text_1EED06, MSGBOX_DEFAULT
+Route109_EventScript_SailToDewford:: @ 81EE972
+ msgbox Route109_Text_BrineyDewfordItIs, MSGBOX_DEFAULT
closemessage
- goto Route109_EventScript_1EE760
+ goto Route109_EventScript_StartDepartForDewford
end
-Route109_EventScript_1EE981:: @ 81EE981
- msgbox Route109_Text_1EED5E, MSGBOX_DEFAULT
+Route109_EventScript_StayHere:: @ 81EE981
+ msgbox Route109_Text_BrineyDeliverDevonGoods, MSGBOX_DEFAULT
release
end
-Route109_EventScript_1EE98B:: @ 81EE98B
- msgbox Route109_Text_1EEE72, MSGBOX_DEFAULT
+Route109_EventScript_ChoseNotToSail:: @ 81EE98B
+ msgbox Route109_Text_BrineyTellMeWhenYouNeedToSail, MSGBOX_DEFAULT
release
end
-Route109_EventScript_1EE995:: @ 81EE995
- msgbox Route109_Text_1EEEB4, MSGBOX_NPC
+Route109_EventScript_SeashoreHouseGirl:: @ 81EE995
+ msgbox Route109_Text_ChillAtMyPapasSpot, MSGBOX_NPC
end
-Route109_EventScript_1EE99E:: @ 81EE99E
+Route109_EventScript_SandCastleBoy:: @ 81EE99E
lock
faceplayer
- msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT
+ msgbox Route109_Text_SandCastleTakingLongTime, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-Route109_EventScript_1EE9B5:: @ 81EE9B5
+Route109_EventScript_SoftSandGirl:: @ 81EE9B5
lock
faceplayer
special GetPlayerBigGuyGirlString
- goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_1EE9F2
- msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT
+ goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_AlreadyReceivedSoftSand
+ msgbox Route109_Text_YouCanHaveThis, MSGBOX_DEFAULT
giveitem_std ITEM_SOFT_SAND
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
@@ -340,207 +340,207 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5
release
end
-Route109_EventScript_1EE9F2:: @ 81EE9F2
- msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT
+Route109_EventScript_AlreadyReceivedSoftSand:: @ 81EE9F2
+ msgbox Route109_Text_WereGoingToMakeBigCastle, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-Route109_EventScript_1EEA06:: @ 81EEA06
- msgbox Route109_Text_1EEF08, MSGBOX_NPC
+Route109_EventScript_Woman:: @ 81EEA06
+ msgbox Route109_Text_LittleKidsDartAround, MSGBOX_NPC
end
-Route109_EventScript_1EEA0F:: @ 81EEA0F
- msgbox Route109_Text_1EF080, MSGBOX_NPC
+Route109_EventScript_OldMan:: @ 81EEA0F
+ msgbox Route109_Text_ZigzagoonPicksUpLitter, MSGBOX_NPC
end
-Route109_EventScript_1EEA18:: @ 81EEA18
+Route109_EventScript_Zigzagoon:: @ 81EEA18
lock
faceplayer
waitse
playmoncry SPECIES_ZIGZAGOON, 0
- msgbox Route109_Text_1EF173, MSGBOX_DEFAULT
+ msgbox Route109_Text_ZigzagoonCry, MSGBOX_DEFAULT
waitmoncry
release
end
-Route109_EventScript_1EEA2B:: @ 81EEA2B
- msgbox Route109_Text_1EF185, MSGBOX_SIGN
+Route109_EventScript_SeashoreHouseSign:: @ 81EEA2B
+ msgbox Route109_Text_SeashoreHouseSign, MSGBOX_SIGN
end
-Route109_EventScript_1EEA34:: @ 81EEA34
- msgbox Route109_Text_1EF1D5, MSGBOX_SIGN
+Route109_EventScript_TrainerTipsSign:: @ 81EEA34
+ msgbox Route109_Text_TrainerTipsSign, MSGBOX_SIGN
end
-Route109_EventScript_1EEA3D:: @ 81EEA3D
- trainerbattle_single TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D
- msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE
+Route109_EventScript_David:: @ 81EEA3D
+ trainerbattle_single TRAINER_DAVID, Route109_Text_DavidIntro, Route109_Text_DavidDefeated
+ msgbox Route109_Text_DavidPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEA54:: @ 81EEA54
- trainerbattle_single TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD
- msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE
+Route109_EventScript_Alice:: @ 81EEA54
+ trainerbattle_single TRAINER_ALICE, Route109_Text_AliceIntro, Route109_Text_AliceDefeated
+ msgbox Route109_Text_AlicePostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEA6B:: @ 81EEA6B
- trainerbattle_single TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B
- msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE
+Route109_EventScript_Huey:: @ 81EEA6B
+ trainerbattle_single TRAINER_HUEY, Route109_Text_HueyIntro, Route109_Text_HueyDefeated
+ msgbox Route109_Text_HueyPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEA82:: @ 81EEA82
- trainerbattle_single TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE
- msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE
+Route109_EventScript_Edmond:: @ 81EEA82
+ trainerbattle_single TRAINER_EDMOND, Route109_Text_EdmondIntro, Route109_Text_EdmondDefeated
+ msgbox Route109_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEA99:: @ 81EEA99
- trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5
+Route109_EventScript_Ricky:: @ 81EEA99
+ trainerbattle_single TRAINER_RICKY_1, Route109_Text_RickyIntro, Route109_Text_RickyDefeated, Route109_EventScript_RickyRegisterMatchCallAfterBattle
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route109_EventScript_1EEAE4
- msgbox Route109_Text_297380, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route109_EventScript_RickyRematch
+ msgbox Route109_Text_RickyPostBattle, MSGBOX_DEFAULT
release
end
-Route109_EventScript_1EEAC5:: @ 81EEAC5
+Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5
special sub_80B4808
waitmovement 0
- msgbox Route109_Text_2973C1, MSGBOX_DEFAULT
+ msgbox Route109_Text_RickyRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_RICKY_1
release
end
-Route109_EventScript_1EEAE4:: @ 81EEAE4
- trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_2973FF, Route109_Text_297437
- msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE
+Route109_EventScript_RickyRematch:: @ 81EEAE4
+ trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_RickyRematchIntro, Route109_Text_RickyRematchDefeated
+ msgbox Route109_Text_RickyRematchPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEAFB:: @ 81EEAFB
- trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27
+Route109_EventScript_Lola:: @ 81EEAFB
+ trainerbattle_single TRAINER_LOLA_1, Route109_Text_LolaIntro, Route109_Text_LolaDefeated, Route109_EventScript_LolaRegisterMatchCallAfterBattle
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, 1
- goto_if_eq Route109_EventScript_1EEB46
- msgbox Route109_Text_2974D6, MSGBOX_DEFAULT
+ compare VAR_RESULT, TRUE
+ goto_if_eq Route109_EventScript_LolaRematch
+ msgbox Route109_Text_LolaPostBattle, MSGBOX_DEFAULT
release
end
-Route109_EventScript_1EEB27:: @ 81EEB27
+Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27
special sub_80B4808
waitmovement 0
- msgbox Route109_Text_297520, MSGBOX_DEFAULT
+ msgbox Route109_Text_LolaRegister, MSGBOX_DEFAULT
register_matchcall TRAINER_LOLA_1
release
end
-Route109_EventScript_1EEB46:: @ 81EEB46
- trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_297538, Route109_Text_297576
- msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE
+Route109_EventScript_LolaRematch:: @ 81EEB46
+ trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_LolaRematchIntro, Route109_Text_LolaRematchDefeated
+ msgbox Route109_Text_LolaRematchPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEB5D:: @ 81EEB5D
- trainerbattle_single TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601
- msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE
+Route109_EventScript_Austina:: @ 81EEB5D
+ trainerbattle_single TRAINER_AUSTINA, Route109_Text_AustinaIntro, Route109_Text_AustinaDefeated
+ msgbox Route109_Text_AustinaPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEB74:: @ 81EEB74
- trainerbattle_single TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691
- msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE
+Route109_EventScript_Gwen:: @ 81EEB74
+ trainerbattle_single TRAINER_GWEN, Route109_Text_GwenIntro, Route109_Text_GwenDefeated
+ msgbox Route109_Text_GwenPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEB8B:: @ 81EEB8B
- trainerbattle_single TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC
- msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE
+Route109_EventScript_Carter:: @ 81EEB8B
+ trainerbattle_single TRAINER_CARTER, Route109_Text_CarterIntro, Route109_Text_CarterDefeated
+ msgbox Route109_Text_CarterPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEBA2:: @ 81EEBA2
- trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D
- msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE
+Route109_EventScript_Paul:: @ 81EEBA2
+ trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_PaulIntro, Route109_Text_PaulDefeated, Route109_Text_PaulNotEnoughPokemon
+ msgbox Route109_Text_PaulPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEBBD:: @ 81EEBBD
- trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E
- msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE
+Route109_EventScript_Mel:: @ 81EEBBD
+ trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_MelIntro, Route109_Text_MelDefeated, Route109_Text_MelNotEnoughPokemon
+ msgbox Route109_Text_MelPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEBD8:: @ 81EEBD8
- trainerbattle_single TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE
- msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE
+Route109_EventScript_Chandler:: @ 81EEBD8
+ trainerbattle_single TRAINER_CHANDLER, Route109_Text_ChandlerIntro, Route109_Text_ChandlerDefeated
+ msgbox Route109_Text_ChandlerPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEBEF:: @ 81EEBEF
- trainerbattle_single TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15
- msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE
+Route109_EventScript_Hailey:: @ 81EEBEF
+ trainerbattle_single TRAINER_HAILEY, Route109_Text_HaileyIntro, Route109_Text_HaileyDefeated
+ msgbox Route109_Text_HaileyPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_EventScript_1EEC06:: @ 81EEC06
- trainerbattle_single TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7
- msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE
+Route109_EventScript_Elijah:: @ 81EEC06
+ trainerbattle_single TRAINER_ELIJAH, Route109_Text_ElijahIntro, Route109_Text_ElijahDefeated
+ msgbox Route109_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE
end
-DewfordTown_Text_1EEC1D: @ 81EEC1D
+DewfordTown_Text_BrineyLandedInSlateportDeliverGoods: @ 81EEC1D
.string "MR. BRINEY: Ahoy!\n"
.string "We've made land in SLATEPORT!\p"
.string "I suppose you're going to visit CAPT.\n"
.string "STERN and deliver the DEVON GOODS?$"
-Route109_Text_1EEC96: @ 81EEC96
+Route109_Text_BrineySailToDewfordQuestion: @ 81EEC96
.string "MR. BRINEY: I thought you're supposed\n"
.string "to deliver the DEVON GOODS.\p"
.string "Would you like to sail back to\n"
.string "DEWFORD, then?$"
-Route109_Text_1EED06: @ 81EED06
+Route109_Text_BrineyDewfordItIs: @ 81EED06
.string "MR. BRINEY: DEWFORD it is, then!\p"
.string "Anchors aweigh!\n"
.string "PEEKO, we're setting sail, my darling!$"
-Route109_Text_1EED5E: @ 81EED5E
+Route109_Text_BrineyDeliverDevonGoods: @ 81EED5E
.string "MR. BRINEY: Then you go on and deliver\n"
.string "the DEVON GOODS. I'll be waiting.$"
-DewfordTown_Text_1EEDA7: @ 81EEDA7
+DewfordTown_Text_BrineyLandedInSlateport: @ 81EEDA7
.string "MR. BRINEY: Ahoy! We've made land in\n"
.string "SLATEPORT!\p"
.string "You just go on and tell me whenever\n"
.string "you want to set sail again!$"
-Route109_Text_1EEE17: @ 81EEE17
+Route109_Text_BrineyWhereAreWeBound: @ 81EEE17
.string "MR. BRINEY: Ahoy!\n"
.string "For you, I'll go out to sea anytime!\p"
.string "Now, my friend, where are we bound?$"
-Route109_Text_1EEE72: @ 81EEE72
+Route109_Text_BrineyTellMeWhenYouNeedToSail: @ 81EEE72
.string "MR. BRINEY: You just tell me whenever\n"
.string "you need to set sail again!$"
-Route109_Text_1EEEB4: @ 81EEEB4
+Route109_Text_ChillAtMyPapasSpot: @ 81EEEB4
.string "Yo, TRAINERS!\n"
.string "Whether you're hot to trot,\l"
.string "or cool cat not,\l"
.string "chill at my papa's spot!$"
-Route109_Text_1EEF08: @ 81EEF08
+Route109_Text_LittleKidsDartAround: @ 81EEF08
.string "Little kids can dart around so quickly…\p"
.string "You don't dare take your eyes off them\n"
.string "for an instant. It's very taxing.\p"
.string "Mine are with my POKéMON, so they\n"
.string "should be okay, but…$"
-Route109_Text_1EEFB0: @ 81EEFB0
+Route109_Text_SandCastleTakingLongTime: @ 81EEFB0
.string "Our sand castle's taking a long time\n"
.string "to make.$"
-Route109_Text_1EEFDE: @ 81EEFDE
+Route109_Text_YouCanHaveThis: @ 81EEFDE
.string "You can have this!$"
-Route109_Text_1EEFF1: @ 81EEFF1
+Route109_Text_WereGoingToMakeBigCastle: @ 81EEFF1
.string "We're going to get all the sand from\n"
.string "the beach and make a big castle!\p"
.string "And then we're going to be a king and\n"
.string "queen.\p"
.string "We'll let you be a servant.$"
-Route109_Text_1EF080: @ 81EF080
+Route109_Text_ZigzagoonPicksUpLitter: @ 81EF080
.string "The water around these parts is clean.\p"
.string "But, I get my ZIGZAGOON to pick up\n"
.string "litter from the shoreline at times.\p"
@@ -549,15 +549,15 @@ Route109_Text_1EF080: @ 81EF080
.string "If we pollute the sea, it all comes\n"
.string "back to haunt us eventually.$"
-Route109_Text_1EF173: @ 81EF173
+Route109_Text_ZigzagoonCry: @ 81EF173
.string "ZIGZAGOON: Guguu?$"
-Route109_Text_1EF185: @ 81EF185
+Route109_Text_SeashoreHouseSign: @ 81EF185
.string "SEASHORE HOUSE\p"
.string "“May hot battles rage on hot sands!\n"
.string "The place for hot TRAINERS!”$"
-Route109_Text_1EF1D5: @ 81EF1D5
+Route109_Text_TrainerTipsSign: @ 81EF1D5
.string "TRAINER TIPS\p"
.string "POKéMON at the same level may not\n"
.string "always have identical stats.\p"
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index e8cfc34a0..ea1b21ac7 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -102,7 +102,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
- setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+ setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
diff --git a/data/text/trainers.inc b/data/text/trainers.inc
index b9cabdfe7..53e6c07b1 100644
--- a/data/text/trainers.inc
+++ b/data/text/trainers.inc
@@ -799,206 +799,206 @@ Route108_Text_CarolinaPostBattle: @ 82970F0
.string "Since I'm at sea like this, I wouldn't\n"
.string "mind putting on a pink, frilly swimsuit…$"
-Route109_Text_297140: @ 8297140
+Route109_Text_DavidIntro: @ 8297140
.string "Hiyah! Look at my chiseled abs!\n"
.string "This is what you call “cut”!$"
-Route109_Text_29717D: @ 829717D
+Route109_Text_DavidDefeated: @ 829717D
.string "Aiyah!\n"
.string "Flubbed out!$"
-Route109_Text_297191: @ 8297191
+Route109_Text_DavidPostBattle: @ 8297191
.string "Hiyah!\p"
.string "My sculpted abs have nothing to do\n"
.string "with POKéMON battles!$"
-Route109_Text_2971D1: @ 82971D1
+Route109_Text_AliceIntro: @ 82971D1
.string "Are you properly protected against\n"
.string "the sun?$"
-Route109_Text_2971FD: @ 82971FD
+Route109_Text_AliceDefeated: @ 82971FD
.string "Ouch, ouch, ouch!$"
-Route109_Text_29720F: @ 829720F
+Route109_Text_AlicePostBattle: @ 829720F
.string "Cheeks are the most prone to burning!$"
-Route109_Text_297235: @ 8297235
+Route109_Text_HueyIntro: @ 8297235
.string "I've laid anchor in ports around\n"
.string "the world, but SLATEPORT's the best.$"
-Route109_Text_29727B: @ 829727B
+Route109_Text_HueyDefeated: @ 829727B
.string "You're the best!$"
-Route109_Text_29728C: @ 829728C
+Route109_Text_HueyPostBattle: @ 829728C
.string "In the best port was the best\n"
.string "TRAINER…$"
-Route109_Text_2972B3: @ 82972B3
+Route109_Text_EdmondIntro: @ 82972B3
.string "Urrrrppp…\n"
.string "Battle? With me?$"
-Route109_Text_2972CE: @ 82972CE
+Route109_Text_EdmondDefeated: @ 82972CE
.string "Urp… Ooooooohhhhhh…\n"
.string "Urrrrpppp…$"
-Route109_Text_2972ED: @ 82972ED
+Route109_Text_EdmondPostBattle: @ 82972ED
.string "I'm usually stronger than this!\n"
.string "I'm just seasick as a dog!\p"
.string "I'm a SAILOR, but…$"
-Route109_Text_29733B: @ 829733B
+Route109_Text_RickyIntro: @ 829733B
.string "I'm thirsty… I could go for a SODA POP\n"
.string "at the SEASHORE HOUSE…$"
-Route109_Text_297379: @ 8297379
+Route109_Text_RickyDefeated: @ 8297379
.string "Groan…$"
-Route109_Text_297380: @ 8297380
+Route109_Text_RickyPostBattle: @ 8297380
.string "I'm getting famished… My inner tube\n"
.string "looks like a giant doughnut…$"
-Route109_Text_2973C1: @ 82973C1
+Route109_Text_RickyRegister: @ 82973C1
.string "Will you have another match with me\n"
.string "when I'm not all thirsty?$"
-Route109_Text_2973FF: @ 82973FF
+Route109_Text_RickyRematchIntro: @ 82973FF
.string "I'm hungry, but I've got enough pep in\n"
.string "me for a battle!$"
-Route109_Text_297437: @ 8297437
+Route109_Text_RickyRematchDefeated: @ 8297437
.string "I lost…\n"
.string "It's because I'm hungry…$"
-Route109_Text_297458: @ 8297458
+Route109_Text_RickyRematchPostBattle: @ 8297458
.string "When you eat on a beach, everything\n"
.string "seems to taste a little better.$"
-Route109_Text_29749C: @ 829749C
+Route109_Text_LolaIntro: @ 829749C
.string "Doesn't a beach umbrella look like\n"
.string "a giant flower?$"
-Route109_Text_2974CF: @ 82974CF
+Route109_Text_LolaDefeated: @ 82974CF
.string "Mommy!$"
-Route109_Text_2974D6: @ 82974D6
+Route109_Text_LolaPostBattle: @ 82974D6
.string "If you look at the beach from the sky,\n"
.string "it looks like a big flower garden!$"
-Route109_Text_297520: @ 8297520
+Route109_Text_LolaRegister: @ 8297520
.string "Me?\n"
.string "I'm here every day!$"
-Route109_Text_297538: @ 8297538
+Route109_Text_LolaRematchIntro: @ 8297538
.string "I'm not losing to you again!\n"
.string "That's why I have my inner tube!$"
-Route109_Text_297576: @ 8297576
+Route109_Text_LolaRematchDefeated: @ 8297576
.string "Mommy!$"
-Route109_Text_29757D: @ 829757D
+Route109_Text_LolaRematchPostBattle: @ 829757D
.string "If I have an inner tube, me and my\n"
.string "POKéMON's cuteness goes way up!$"
-Route109_Text_2975C0: @ 82975C0
+Route109_Text_AustinaIntro: @ 82975C0
.string "I can't swim without my inner tube,\n"
.string "but I won't lose at POKéMON!$"
-Route109_Text_297601: @ 8297601
+Route109_Text_AustinaDefeated: @ 8297601
.string "Did I lose because I have an inner\n"
.string "tube?$"
-Route109_Text_29762A: @ 829762A
+Route109_Text_AustinaPostBattle: @ 829762A
.string "My inner tube is a fashion item.\n"
.string "I can't be seen without it.$"
-Route109_Text_297667: @ 8297667
+Route109_Text_GwenIntro: @ 8297667
.string "Hi, big TRAINER.\n"
.string "Will you battle with me?$"
-Route109_Text_297691: @ 8297691
+Route109_Text_GwenDefeated: @ 8297691
.string "Oh, you're strong.$"
-Route109_Text_2976A4: @ 82976A4
+Route109_Text_GwenPostBattle: @ 82976A4
.string "How did you get to be so strong?$"
-Route109_Text_2976C5: @ 82976C5
+Route109_Text_CarterIntro: @ 82976C5
.string "Wahahah! This dude's going to catch\n"
.string "himself a big one!$"
-Route109_Text_2976FC: @ 82976FC
+Route109_Text_CarterDefeated: @ 82976FC
.string "This dude just lost one…$"
-Route109_Text_297715: @ 8297715
+Route109_Text_CarterPostBattle: @ 8297715
.string "This dude thinks you're a big one.\n"
.string "No, you're a big-one-to-be!$"
-Route109_Text_297754: @ 8297754
+Route109_Text_PaulIntro: @ 8297754
.string "PAUL: Well, this is a mood-breaker.\p"
.string "I wish you wouldn't disturb our\n"
.string "precious time together.$"
-Route109_Text_2977B0: @ 82977B0
+Route109_Text_PaulDefeated: @ 82977B0
.string "PAUL: Well, I give up.$"
-Route109_Text_2977C7: @ 82977C7
+Route109_Text_PaulPostBattle: @ 82977C7
.string "PAUL: Well, don't tell anyone that\n"
.string "we're here.\l"
.string "This is just our private world of two!$"
-Route109_Text_29781D: @ 829781D
+Route109_Text_PaulNotEnoughPokemon: @ 829781D
.string "PAUL: We're totally, deeply in love.\n"
.string "That's why we make our POKéMON battle\l"
.string "together.$"
-Route109_Text_297872: @ 8297872
+Route109_Text_MelIntro: @ 8297872
.string "MEL: We're, like, totally in love.\n"
.string "Our romance is heating up all of HOENN!$"
-Route109_Text_2978BD: @ 82978BD
+Route109_Text_MelDefeated: @ 82978BD
.string "MEL: We lost, and it's my fault!\n"
.string "PAUL will hate me!$"
-Route109_Text_2978F1: @ 82978F1
+Route109_Text_MelPostBattle: @ 82978F1
.string "MEL: Um, PAUL, are you angry with me?\n"
.string "Please don't be angry.$"
-Route109_Text_29792E: @ 829792E
+Route109_Text_MelNotEnoughPokemon: @ 829792E
.string "MEL: We're, like, deeply and truly in love.\n"
.string "That's why we make our POKéMON\l"
.string "battle together.$"
-Route109_Text_29798A: @ 829798A
+Route109_Text_ChandlerIntro: @ 829798A
.string "Tadaah! See?\n"
.string "My inner tube's round!$"
-Route109_Text_2979AE: @ 82979AE
+Route109_Text_ChandlerDefeated: @ 82979AE
.string "Oh, oh!\n"
.string "Too bad!$"
-Route109_Text_2979BF: @ 82979BF
+Route109_Text_ChandlerPostBattle: @ 82979BF
.string "After I showed you my round inner\n"
.string "tube, too…$"
-Route109_Text_2979EC: @ 82979EC
+Route109_Text_HaileyIntro: @ 82979EC
.string "I can't swim, so I'm pretending\n"
.string "to swim.$"
-Route109_Text_297A15: @ 8297A15
+Route109_Text_HaileyDefeated: @ 8297A15
.string "I thought so!\n"
.string "I didn't think we could win.$"
-Route109_Text_297A40: @ 8297A40
+Route109_Text_HaileyPostBattle: @ 8297A40
.string "When I learn how to swim, I think\n"
.string "my POKéMON will become tougher.$"
-Route109_Text_297A82: @ 8297A82
+Route109_Text_ElijahIntro: @ 8297A82
.string "For a guy as macho as me, this kind\n"
.string "of POKéMON is the perfect match!$"
-Route109_Text_297AC7: @ 8297AC7
+Route109_Text_ElijahDefeated: @ 8297AC7
.string "I'm cool even in defeat, hey?$"
-Route109_Text_297AE5: @ 8297AE5
+Route109_Text_ElijahPostBattle: @ 8297AE5
.string "For a guy as macho as me, a port\n"
.string "is the perfect setting!\p"
.string "I guess I'll head for SLATEPORT.$"
diff --git a/include/constants/flags.h b/include/constants/flags.h
index e9f9aa770..b61bf0b11 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -694,7 +694,7 @@
#define FLAG_HIDE_ROUTE_104_MR_BRINEY 0x2E2
#define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 0x2E3
#define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4
-#define FLAG_HIDE_ROUTE_108_MR_BRINEY 0x2E5
+#define FLAG_HIDE_ROUTE_109_MR_BRINEY 0x2E5
#define FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT 0x2E6
#define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN 0x2E7
#define FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT 0x2E8
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 17:28:54 +0000