summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-26 13:58:26 -0500
committerGitHub <noreply@github.com>2020-02-26 13:58:26 -0500
commite3ffb019126c1174afbd0009d7fe687f527aafc4 (patch)
tree0db2873d83bc80e0fe7d7d45494f14b71d7ca32d /data/maps
parentad4f363a582651657a6c27e989ce9e48dc48ea9a (diff)
parent13f14218e139f4a552dd88dc1049e958005597d9 (diff)
Merge branch 'master' into doc-oneisland
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/Route15/map.json26
-rw-r--r--data/maps/Route15/scripts.inc4
-rw-r--r--data/maps/Route15/text.inc78
-rw-r--r--data/maps/Route15_WestEntrance_1F/map.json2
-rw-r--r--data/maps/Route15_WestEntrance_1F/scripts.inc4
-rw-r--r--data/maps/Route15_WestEntrance_1F/text.inc2
-rw-r--r--data/maps/Route15_WestEntrance_2F/map.json6
-rw-r--r--data/maps/Route15_WestEntrance_2F/scripts.inc36
-rw-r--r--data/maps/Route15_WestEntrance_2F/text.inc12
-rw-r--r--data/maps/Route16/map.json16
-rw-r--r--data/maps/Route16/scripts.inc8
-rw-r--r--data/maps/Route16/text.inc52
-rw-r--r--data/maps/Route16_House/map.json4
-rw-r--r--data/maps/Route16_House/scripts.inc24
-rw-r--r--data/maps/Route16_House/text.inc10
-rw-r--r--data/maps/Route16_NorthEntrance_1F/map.json26
-rw-r--r--data/maps/Route16_NorthEntrance_1F/scripts.inc74
-rw-r--r--data/maps/Route16_NorthEntrance_1F/text.inc8
-rw-r--r--data/maps/Route16_NorthEntrance_2F/map.json10
-rw-r--r--data/maps/Route16_NorthEntrance_2F/scripts.inc44
-rw-r--r--data/maps/Route16_NorthEntrance_2F/text.inc16
-rw-r--r--data/maps/Route17/map.json32
-rw-r--r--data/maps/Route17/scripts.inc24
-rw-r--r--data/maps/Route17/text.inc72
-rw-r--r--data/maps/Route18/map.json10
-rw-r--r--data/maps/Route18/scripts.inc16
-rw-r--r--data/maps/Route18/text.inc22
-rw-r--r--data/maps/Route18_EastEntrance_1F/map.json24
-rw-r--r--data/maps/Route18_EastEntrance_1F/scripts.inc70
-rw-r--r--data/maps/Route18_EastEntrance_1F/text.inc6
-rw-r--r--data/maps/Route18_EastEntrance_2F/map.json6
-rw-r--r--data/maps/Route18_EastEntrance_2F/scripts.inc24
-rw-r--r--data/maps/Route18_EastEntrance_2F/text.inc4
-rw-r--r--data/maps/Route19/map.json26
-rw-r--r--data/maps/Route19/scripts.inc4
-rw-r--r--data/maps/Route19/text.inc78
-rw-r--r--data/maps/Route20/map.json26
-rw-r--r--data/maps/Route20/scripts.inc12
-rw-r--r--data/maps/Route20/text.inc64
-rw-r--r--data/maps/Route21_North/map.json10
-rw-r--r--data/maps/Route21_North/text.inc31
-rw-r--r--data/maps/Route21_South/map.json10
-rw-r--r--data/maps/Route21_South/text.inc46
-rw-r--r--data/maps/Route24/map.json18
-rw-r--r--data/maps/Route24/scripts.inc80
-rw-r--r--data/maps/Route24/text.inc77
-rw-r--r--data/maps/Route25/map.json24
-rw-r--r--data/maps/Route25/scripts.inc8
-rw-r--r--data/maps/Route25/text.inc126
-rw-r--r--data/maps/Route25_SeaCottage/map.json6
-rw-r--r--data/maps/Route25_SeaCottage/scripts.inc227
-rw-r--r--data/maps/Route25_SeaCottage/text.inc30
52 files changed, 847 insertions, 828 deletions
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
index cd0581a20..ef6dee02a 100644
--- a/data/maps/Route15/map.json
+++ b/data/maps/Route15/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route15_EventScript_1AAD67",
+ "script": "Route15_EventScript_Yazmin",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route15_EventScript_1AACEB",
+ "script": "Route15_EventScript_Edwin",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route15_EventScript_1AAD29",
+ "script": "Route15_EventScript_Chester",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route15_EventScript_1AADA5",
+ "script": "Route15_EventScript_Kindra",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route15_EventScript_1AACAD",
+ "script": "Route15_EventScript_Olivia",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route15_EventScript_1AAC31",
+ "script": "Route15_EventScript_Alex",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route15_EventScript_1AABF3",
+ "script": "Route15_EventScript_Ernest",
"flag": "0"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 4,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route15_EventScript_1AADE3",
+ "script": "Route15_EventScript_Becky",
"flag": "0"
},
{
@@ -140,7 +140,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route15_EventScript_1AAC6F",
+ "script": "Route15_EventScript_Grace",
"flag": "0"
},
{
@@ -153,7 +153,7 @@
"movement_range_y": 4,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route15_EventScript_1AAE21",
+ "script": "Route15_EventScript_Celia",
"flag": "0"
},
{
@@ -179,7 +179,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route15_EventScript_1AAEA5",
+ "script": "Route15_EventScript_Ron",
"flag": "0"
},
{
@@ -192,7 +192,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route15_EventScript_1AAE5F",
+ "script": "Route15_EventScript_Mya",
"flag": "0"
},
{
@@ -233,7 +233,7 @@
"x": 41,
"y": 11,
"elevation": 0,
- "script": "Route15_EventScript_1680DC"
+ "script": "Route15_EventScript_RouteSign"
}
]
}
diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc
index 40890250c..85d24e49b 100644
--- a/data/maps/Route15/scripts.inc
+++ b/data/maps/Route15/scripts.inc
@@ -1,6 +1,6 @@
Route15_MapScripts:: @ 81680DB
.byte 0
-Route15_EventScript_1680DC:: @ 81680DC
- msgbox gUnknown_8186A77, MSGBOX_SIGN
+Route15_EventScript_RouteSign:: @ 81680DC
+ msgbox Route15_Text_RouteSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc
index 33c60e7dc..be3e38e6c 100644
--- a/data/maps/Route15/text.inc
+++ b/data/maps/Route15/text.inc
@@ -1,154 +1,154 @@
-Text_18650B:: @ 818650B
+Route15_Text_KindraIntro:: @ 818650B
.string "I just got some POKéMON in trades.\n"
.string "Can I try them out on you?$"
-Text_186549:: @ 8186549
+Route15_Text_KindraDefeat:: @ 8186549
.string "Not good enough!$"
-Text_18655A:: @ 818655A
+Route15_Text_KindraPostBattle:: @ 818655A
.string "You can't change the nickname of\n"
.string "any POKéMON you get in a trade.\p"
.string "Only the Original TRAINER can get\n"
.string "the nickname changed.$"
-Text_1865D3:: @ 81865D3
+Route15_Text_BeckyIntro:: @ 81865D3
.string "You look gentle, so I think I can\n"
.string "beat you.\p"
.string "I'll give it a go!$"
-Text_186612:: @ 8186612
+Route15_Text_BeckyDefeat:: @ 8186612
.string "No, wrong!$"
-Text_18661D:: @ 818661D
+Route15_Text_BeckyPostBattle:: @ 818661D
.string "I'm afraid of BIKERS. They look so\n"
.string "ugly and mean!$"
-Text_18664F:: @ 818664F
+Route15_Text_EdwinIntro:: @ 818664F
.string "When I whistle, I can summon bird\n"
.string "POKéMON.$"
-Text_18667A:: @ 818667A
+Route15_Text_EdwinDefeat:: @ 818667A
.string "Ow!\n"
.string "That's tragic!$"
-Text_18668D:: @ 818668D
+Route15_Text_EdwinPostBattle:: @ 818668D
.string "Maybe I'm not cut out for battles.\n"
.string "I'm not the right type, I guess.$"
-Text_1866D1:: @ 81866D1
+Route15_Text_ChesterIntro:: @ 81866D1
.string "Hmm? My birds are shivering!\n"
.string "You're good, aren't you?$"
-Text_186707:: @ 8186707
+Route15_Text_ChesterDefeat:: @ 8186707
.string "Just as I thought!$"
-Text_18671A:: @ 818671A
+Route15_Text_ChesterPostBattle:: @ 818671A
.string "This is so obvious, you should know\n"
.string "this, but…\p"
.string "Moves like EARTHQUAKE and FISSURE\n"
.string "have no effect on bird POKéMON.$"
-Text_18678B:: @ 818678B
+Route15_Text_GraceIntro:: @ 818678B
.string "Oh, you're a little cutie!\n"
.string "So like a darling POKéMON!$"
-Text_1867C1:: @ 81867C1
+Route15_Text_GraceDefeat:: @ 81867C1
.string "You looked so cute, too!$"
-Text_1867DA:: @ 81867DA
+Route15_Text_GracePostBattle:: @ 81867DA
.string "I forgive you.\n"
.string "I can take it.\l"
.string "I'm a big girl now.$"
-Text_18680C:: @ 818680C
+Route15_Text_OliviaIntro:: @ 818680C
.string "I raise POKéMON for protection\n"
.string "because I live alone.$"
-Text_186841:: @ 8186841
+Route15_Text_OliviaDefeat:: @ 8186841
.string "POKéMON isn't about winning or\n"
.string "losing for me.$"
-Text_18686F:: @ 818686F
+Route15_Text_OliviaPostBattle:: @ 818686F
.string "I love having my POKéMON greet me\n"
.string "when I get home.\p"
.string "It's so reassuring.$"
-Text_1868B6:: @ 81868B6
+Route15_Text_ErnestIntro:: @ 81868B6
.string "Hey, kid! C'mon!\n"
.string "I just got these off some loser!$"
-Text_1868E8:: @ 81868E8
+Route15_Text_ErnestDefeat:: @ 81868E8
.string "Why not?$"
-Text_1868F1:: @ 81868F1
+Route15_Text_ErnestPostBattle:: @ 81868F1
.string "Life's too short.\n"
.string "It's cool to live as an outlaw.\l"
.string "TEAM ROCKET RULES!$"
-Text_186936:: @ 8186936
+Route15_Text_AlexIntro:: @ 8186936
.string "Fork over all your cash when you\n"
.string "lose to me, kid!$"
-Text_186968:: @ 8186968
+Route15_Text_AlexDefeat:: @ 8186968
.string "That can't be true!$"
-Text_18697C:: @ 818697C
+Route15_Text_AlexPostBattle:: @ 818697C
.string "I was just joking about the money.\n"
.string "Don't take me all serious.$"
-Text_1869BA:: @ 81869BA
+Route15_Text_CeliaIntro:: @ 81869BA
.string "What's cool and happening?\n"
.string "Trading POKéMON!$"
-Text_1869E6:: @ 81869E6
+Route15_Text_CeliaDefeat:: @ 81869E6
.string "I said trade!$"
-Text_1869F4:: @ 81869F4
+Route15_Text_CeliaPostBattle:: @ 81869F4
.string "I trade POKéMON with my friends\n"
.string "all the time.$"
-Text_186A22:: @ 8186A22
+Route15_Text_YazminIntro:: @ 8186A22
.string "Want to play with my POKéMON?$"
-Text_186A40:: @ 8186A40
+Route15_Text_YazminDefeat:: @ 8186A40
.string "I was too impatient!$"
-Text_186A55:: @ 8186A55
+Route15_Text_YazminPostBattle:: @ 8186A55
.string "I'll go train with weaker people.$"
-gUnknown_8186A77:: @ 8186A77
+Route15_Text_RouteSign:: @ 8186A77
.string "ROUTE 15\n"
.string "West to FUCHSIA CITY$"
-Text_186A95:: @ 8186A95
+Route15_Text_MyaIntro:: @ 8186A95
.string "MYA: You're perfect.\n"
.string "Help me train my little brother?$"
-Text_186ACB:: @ 8186ACB
+Route15_Text_MyaDefeat:: @ 8186ACB
.string "MYA: RON, you have to focus!\n"
.string "Concentrate on what you're doing!$"
-Text_186B0A:: @ 8186B0A
+Route15_Text_MyaPostBattle:: @ 8186B0A
.string "MYA: Okay, we'll turn it up.\n"
.string "I'll add to our training menu!$"
-Text_186B46:: @ 8186B46
+Route15_Text_MyaNotEnoughMons:: @ 8186B46
.string "MYA: Do you want to challenge us?\n"
.string "You'll need two POKéMON, though.$"
-Text_186B89:: @ 8186B89
+Route15_Text_RonIntro:: @ 8186B89
.string "RON: My sister gets scary when we\n"
.string "lose.$"
-Text_186BB1:: @ 8186BB1
+Route15_Text_RonDefeat:: @ 8186BB1
.string "RON: Oh, no, no…\n"
.string "Sis, I'm sorry!$"
-Text_186BD2:: @ 8186BD2
+Route15_Text_RonPostBattle:: @ 8186BD2
.string "RON: Oh, bleah…\n"
.string "I wish I had a nice sister…$"
-Text_186BFE:: @ 8186BFE
+Route15_Text_RonNotEnoughMons:: @ 8186BFE
.string "RON: Did you want to battle with\n"
.string "my sister and me?\p"
.string "You need two POKéMON, then.$"
diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json
index 39bf0cb41..fb1f9cacd 100644
--- a/data/maps/Route15_WestEntrance_1F/map.json
+++ b/data/maps/Route15_WestEntrance_1F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route15_WestEntrance_1F_EventScript_170089",
+ "script": "Route15_WestEntrance_1F_EventScript_Guard",
"flag": "0"
}
],
diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc
index 9f753e6c9..222be2356 100644
--- a/data/maps/Route15_WestEntrance_1F/scripts.inc
+++ b/data/maps/Route15_WestEntrance_1F/scripts.inc
@@ -1,6 +1,6 @@
Route15_WestEntrance_1F_MapScripts:: @ 8170088
.byte 0
-Route15_WestEntrance_1F_EventScript_170089:: @ 8170089
- msgbox gUnknown_819F560, MSGBOX_NPC
+Route15_WestEntrance_1F_EventScript_Guard:: @ 8170089
+ msgbox Route15_WestEntrance_1F_Text_OaksAideCameByHere, MSGBOX_NPC
end
diff --git a/data/maps/Route15_WestEntrance_1F/text.inc b/data/maps/Route15_WestEntrance_1F/text.inc
index e843e10a8..6cdbe8a2a 100644
--- a/data/maps/Route15_WestEntrance_1F/text.inc
+++ b/data/maps/Route15_WestEntrance_1F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819F560:: @ 819F560
+Route15_WestEntrance_1F_Text_OaksAideCameByHere:: @ 819F560
.string "Are you the kid who's working on\n"
.string "a POKéDEX?\p"
.string "PROF. OAK's AIDE came by here.$"
diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json
index b11b7224a..8317b4d84 100644
--- a/data/maps/Route15_WestEntrance_2F/map.json
+++ b/data/maps/Route15_WestEntrance_2F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route15_WestEntrance_2F_EventScript_1700B9",
+ "script": "Route15_WestEntrance_2F_EventScript_Aide",
"flag": "0"
}
],
@@ -45,14 +45,14 @@
"x": 4,
"y": 1,
"elevation": 0,
- "script": "Route15_WestEntrance_2F_EventScript_170093"
+ "script": "Route15_WestEntrance_2F_EventScript_LeftBinoculars"
},
{
"type": "bg_event_type_0",
"x": 8,
"y": 1,
"elevation": 0,
- "script": "Route15_WestEntrance_2F_EventScript_1700B0"
+ "script": "Route15_WestEntrance_2F_EventScript_RightBinoculars"
}
]
}
diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc
index 088a65876..851ceb07f 100644
--- a/data/maps/Route15_WestEntrance_2F/scripts.inc
+++ b/data/maps/Route15_WestEntrance_2F/scripts.inc
@@ -1,9 +1,11 @@
+.equ REQUIRED_CAUGHT_MONS, 50
+
Route15_WestEntrance_2F_MapScripts:: @ 8170092
.byte 0
-Route15_WestEntrance_2F_EventScript_170093:: @ 8170093
+Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093
lockall
- msgbox gUnknown_819F79C
+ msgbox Route15_WestEntrance_2F_Text_LargeShiningBird
drawmonpic SPECIES_ARTICUNO, 10, 3
delay 20
waitbuttonpress
@@ -13,40 +15,40 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093
releaseall
end
-Route15_WestEntrance_2F_EventScript_1700B0:: @ 81700B0
- msgbox gUnknown_819F7F8, MSGBOX_SIGN
+Route15_WestEntrance_2F_EventScript_RightBinoculars:: @ 81700B0
+ msgbox Route15_WestEntrance_2F_Text_SmallIslandOnHorizon, MSGBOX_SIGN
end
-Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
+Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9
lock
faceplayer
- call EventScript_170145
- goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B
- msgbox gUnknown_819F5AB, MSGBOX_YESNO
+ call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
+ goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare
+ msgbox Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
- call EventScript_170145
- compare VAR_0x8006, 50
+ call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo
+ compare VAR_0x8006, REQUIRED_CAUGHT_MONS
goto_if_lt Aide_EventScript_HaventCaughtEnough
- msgbox gUnknown_819F6AA
+ msgbox Route15_WestEntrance_2F_Text_GreatHereYouGo
checkitemspace ITEM_EXP_SHARE, 1
compare VAR_RESULT, FALSE
goto_if_eq Aide_EventScript_NoRoomForItem
- giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE
+ giveitem_msg Route15_WestEntrance_2F_Text_ReceivedItemFromAide, ITEM_EXP_SHARE
setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
- msgbox gUnknown_819F71F
+ msgbox Route15_WestEntrance_2F_Text_ExplainExpShare
release
end
-EventScript_17013B:: @ 817013B
- msgbox gUnknown_819F71F
+Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare:: @ 817013B
+ msgbox Route15_WestEntrance_2F_Text_ExplainExpShare
release
end
-EventScript_170145:: @ 8170145
- getnumberstring 0, 50
+Route15_WestEntrance_2F_EventScript_GetAideRequestInfo:: @ 8170145
+ getnumberstring 0, REQUIRED_CAUGHT_MONS
getitemname 1, ITEM_EXP_SHARE
return
diff --git a/data/maps/Route15_WestEntrance_2F/text.inc b/data/maps/Route15_WestEntrance_2F/text.inc
index e5518b8e2..c3c9866eb 100644
--- a/data/maps/Route15_WestEntrance_2F/text.inc
+++ b/data/maps/Route15_WestEntrance_2F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819F5AB:: @ 819F5AB
+Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough:: @ 819F5AB
.string "Hi! Remember me?\n"
.string "I'm one of PROF. OAK's AIDES.\p"
.string "If your POKéDEX has complete data\n"
@@ -10,30 +10,30 @@ gUnknown_819F5AB:: @ 819F5AB
.string "Have you gathered data on at least\n"
.string "{STR_VAR_1} kinds of POKéMON?$"
-gUnknown_819F6AA:: @ 819F6AA
+Route15_WestEntrance_2F_Text_GreatHereYouGo:: @ 819F6AA
.string "Great! You have caught or owned\n"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "Congratulations!\n"
.string "Here you go!$"
-gUnknown_819F6FD:: @ 819F6FD
+Route15_WestEntrance_2F_Text_ReceivedItemFromAide:: @ 819F6FD
.string "{PLAYER} received the {STR_VAR_2}\n"
.string "from the AIDE.$"
-gUnknown_819F71F:: @ 819F71F
+Route15_WestEntrance_2F_Text_ExplainExpShare:: @ 819F71F
.string "EXP. SHARE is an item to be held\n"
.string "by a POKéMON.\p"
.string "The POKéMON will receive a share\n"
.string "of the EXP. Points without having\l"
.string "to battle.$"
-gUnknown_819F79C:: @ 819F79C
+Route15_WestEntrance_2F_Text_LargeShiningBird:: @ 819F79C
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "A large, shining bird is flying\n"
.string "toward the sea.$"
-gUnknown_819F7F8:: @ 819F7F8
+Route15_WestEntrance_2F_Text_SmallIslandOnHorizon:: @ 819F7F8
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "It looks like a small island on\n"
diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json
index 45617a334..b88cbe12c 100644
--- a/data/maps/Route16/map.json
+++ b/data/maps/Route16/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAEEB",
+ "script": "Route16_EventScript_Lao",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAFA5",
+ "script": "Route16_EventScript_Koji",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAFE3",
+ "script": "Route16_EventScript_Luke",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAF67",
+ "script": "Route16_EventScript_Ruben",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AAF29",
+ "script": "Route16_EventScript_Hideo",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AB021",
+ "script": "Route16_EventScript_Camron",
"flag": "0"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AB0A5",
+ "script": "Route16_EventScript_Lea",
"flag": "0"
},
{
@@ -140,7 +140,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route16_EventScript_1AB05F",
+ "script": "Route16_EventScript_Jed",
"flag": "0"
},
{
diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
index 1d7c6657c..27a5efccc 100644
--- a/data/maps/Route16/scripts.inc
+++ b/data/maps/Route16/scripts.inc
@@ -14,18 +14,18 @@ Route16_EventScript_RemoveSnorlax:: @ 81680FF
Route16_OnTransition:: @ 8168103
compare VAR_MAP_SCENE_ROUTE16, 1
- call_if_eq Route16_EventScript_EnterCyclingRoad
+ call_if_eq Route16_OnTransitionCyclingRoad
end
-Route16_EventScript_EnterCyclingRoad:: @ 816810F
+Route16_OnTransitionCyclingRoad:: @ 816810F
setflag FLAG_SYS_ON_CYCLING_ROAD
return
Route16_OnWarp:: @ 8168113
- map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_EventScript_WarpIntoCyclingRoad
+ map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_OnWarpCyclingRoad
.2byte 0
-Route16_EventScript_WarpIntoCyclingRoad:: @ 816811D
+Route16_OnWarpCyclingRoad:: @ 816811D
special Special_ForcePlayerOntoBike
end
diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc
index 5131934b1..ca3507cc7 100644
--- a/data/maps/Route16/text.inc
+++ b/data/maps/Route16/text.inc
@@ -1,66 +1,66 @@
-Text_186C4D:: @ 8186C4D
+Route16_Text_LaoIntro:: @ 8186C4D
.string "What do you want?$"
-Text_186C5F:: @ 8186C5F
+Route16_Text_LaoDefeat:: @ 8186C5F
.string "Don't you dare laugh!$"
-Text_186C75:: @ 8186C75
+Route16_Text_LaoPostBattle:: @ 8186C75
.string "We like just hanging here.\n"
.string "What's it to you?$"
-Text_186CA2:: @ 8186CA2
+Route16_Text_KojiIntro:: @ 8186CA2
.string "Nice BIKE!\n"
.string "Hand it over!$"
-Text_186CBB:: @ 8186CBB
+Route16_Text_KojiDefeat:: @ 8186CBB
.string "Knockout!$"
-Text_186CC5:: @ 8186CC5
+Route16_Text_KojiPostBattle:: @ 8186CC5
.string "Forget it, who needs your BIKE!$"
-Text_186CE5:: @ 8186CE5
+Route16_Text_LukeIntro:: @ 8186CE5
.string "Come out and play, little mouse!$"
-Text_186D06:: @ 8186D06
+Route16_Text_LukeDefeat:: @ 8186D06
.string "You little rat!$"
-Text_186D16:: @ 8186D16
+Route16_Text_LukePostBattle:: @ 8186D16
.string "I hate losing!\n"
.string "Get out of my face!$"
-Text_186D39:: @ 8186D39
+Route16_Text_HideoIntro:: @ 8186D39
.string "Hey, you just bumped me!$"
-Text_186D52:: @ 8186D52
+Route16_Text_HideoDefeat:: @ 8186D52
.string "Kaboom!$"
-Text_186D5A:: @ 8186D5A
+Route16_Text_HideoPostBattle:: @ 8186D5A
.string "We'll always be hanging around here\n"
.string "even if you don't like it.\p"
.string "You can detour to VERMILION from\n"
.string "FUCHSIA going along the coast.$"
-Text_186DD9:: @ 8186DD9
+Route16_Text_CamronIntro:: @ 8186DD9
.string "I'm feeling hungry and mean!\n"
.string "I need a punching bag!$"
-Text_186E0D:: @ 8186E0D
+Route16_Text_CamronDefeat:: @ 8186E0D
.string "Bad, bad, bad!$"
-Text_186E1C:: @ 8186E1C
+Route16_Text_CamronPostBattle:: @ 8186E1C
.string "If I'm going to have POKéMON, they\n"
.string "may as well be ferocious.\p"
.string "I'd use them to leave my enemies\n"
.string "in tatters.$"
-Text_186E86:: @ 8186E86
+Route16_Text_RubenIntro:: @ 8186E86
.string "Hey, there!\n"
.string "Let's have ourselves a good time!$"
-Text_186EB4:: @ 8186EB4
+Route16_Text_RubenDefeat:: @ 8186EB4
.string "Don't make me mad!$"
-Text_186EC7:: @ 8186EC7
+Route16_Text_RubenPostBattle:: @ 8186EC7
.string "I get my kicks by harassing people\n"
.string "with my stinking POKéMON.\p"
.string "They're great for startling people.\n"
@@ -78,35 +78,35 @@ Route16_Text_RouteSign:: @ 8186F98
.string "ROUTE 16\n"
.string "CELADON CITY - FUCHSIA CITY$"
-Text_186FBD:: @ 8186FBD
+Route16_Text_JedIntro:: @ 8186FBD
.string "JED: Our love knows no bounds.\n"
.string "We're in love and we show it!$"
-Text_186FFA:: @ 8186FFA
+Route16_Text_JedDefeat:: @ 8186FFA
.string "JED: Oh, no!\n"
.string "My love has seen me as a loser!$"
-Text_187027:: @ 8187027
+Route16_Text_JedPostBattle:: @ 8187027
.string "JED: Listen, LEA.\n"
.string "You need to focus less on me.$"
-Text_187057:: @ 8187057
+Route16_Text_JedNotEnoughMons:: @ 8187057
.string "JED: You have just one POKéMON?\n"
.string "Is there no love in your heart?$"
-Text_187097:: @ 8187097
+Route16_Text_LeaIntro:: @ 8187097
.string "LEA: Sometimes, the intensity of\n"
.string "our love scares me.$"
-Text_1870CC:: @ 81870CC
+Route16_Text_LeaDefeat:: @ 81870CC
.string "LEA: Ohh! But JED looks cool\n"
.string "even in a loss!$"
-Text_1870F9:: @ 81870F9
+Route16_Text_LeaPostBattle:: @ 81870F9
.string "LEA: Ehehe, I'm sorry.\n"
.string "JED is so cool.$"
-Text_187120:: @ 8187120
+Route16_Text_LeaNotEnoughMons:: @ 8187120
.string "LEA: Oh, you don't have two\n"
.string "POKéMON with you?\p"
.string "Doesn't it feel lonely for you or\n"
diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json
index ec7b219d3..3421f6eba 100644
--- a/data/maps/Route16_House/map.json
+++ b/data/maps/Route16_House/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route16_House_EventScript_17014F",
+ "script": "Route16_House_EventScript_Woman",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route16_House_EventScript_1701AF",
+ "script": "Route16_House_EventScript_Fearow",
"flag": "0"
}
],
diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc
index 94ed9b932..baf6fcc32 100644
--- a/data/maps/Route16_House/scripts.inc
+++ b/data/maps/Route16_House/scripts.inc
@@ -1,36 +1,36 @@
Route16_House_MapScripts:: @ 817014E
.byte 0
-Route16_House_EventScript_17014F:: @ 817014F
+Route16_House_EventScript_Woman:: @ 817014F
lock
faceplayer
- goto_if_set FLAG_GOT_HM02, EventScript_1701A5
- msgbox gUnknown_819F851
+ goto_if_set FLAG_GOT_HM02, Route16_House_EventScript_AlreadyGotHM02
+ msgbox Route16_House_Text_FoundMySecretRetreat
checkitemspace ITEM_HM02, 1
compare VAR_RESULT, FALSE
- goto_if_eq EventScript_17019B
- giveitem_msg gUnknown_819F8C0, ITEM_HM02
- msgbox gUnknown_819F8E0
+ goto_if_eq Route16_House_EventScript_NoRoomForHM02
+ giveitem_msg Route16_House_Text_ReceivedHM02FromGirl, ITEM_HM02
+ msgbox Route16_House_Text_ExplainHM02
setflag FLAG_GOT_HM02
release
end
-EventScript_17019B:: @ 817019B
- msgbox gUnknown_819F92D
+Route16_House_EventScript_NoRoomForHM02:: @ 817019B
+ msgbox Route16_House_Text_DontHaveAnyRoomForThis
release
end
-EventScript_1701A5:: @ 81701A5
- msgbox gUnknown_819F8E0
+Route16_House_EventScript_AlreadyGotHM02:: @ 81701A5
+ msgbox Route16_House_Text_ExplainHM02
release
end
-Route16_House_EventScript_1701AF:: @ 81701AF
+Route16_House_EventScript_Fearow:: @ 81701AF
lock
faceplayer
waitse
playmoncry SPECIES_FEAROW, 0
- msgbox gUnknown_819F94F
+ msgbox Route16_House_Text_Fearow
waitmoncry
release
end
diff --git a/data/maps/Route16_House/text.inc b/data/maps/Route16_House/text.inc
index 136cf9604..2cdfe38d9 100644
--- a/data/maps/Route16_House/text.inc
+++ b/data/maps/Route16_House/text.inc
@@ -1,21 +1,21 @@
-gUnknown_819F851:: @ 819F851
+Route16_House_Text_FoundMySecretRetreat:: @ 819F851
.string "Oh, dear.\n"
.string "You've found my secret retreat.\p"
.string "Please don't tell anyone I'm here.\n"
.string "I'll make it up to you with this!$"
-gUnknown_819F8C0:: @ 819F8C0
+Route16_House_Text_ReceivedHM02FromGirl:: @ 819F8C0
.string "{PLAYER} received HM02\n"
.string "from the girl.$"
-gUnknown_819F8E0:: @ 819F8E0
+Route16_House_Text_ExplainHM02:: @ 819F8E0
.string "HM02 is FLY.\n"
.string "It's a wonderfully convenient move.\p"
.string "Please, put it to good use.$"
-gUnknown_819F92D:: @ 819F92D
+Route16_House_Text_DontHaveAnyRoomForThis:: @ 819F92D
.string "You don't have any room for this.$"
-gUnknown_819F94F:: @ 819F94F
+Route16_House_Text_Fearow:: @ 819F94F
.string "FEAROW: Kyueen!$"
diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json
index 133fd5b09..515800a2c 100644
--- a/data/maps/Route16_NorthEntrance_1F/map.json
+++ b/data/maps/Route16_NorthEntrance_1F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_1701DB",
+ "script": "Route16_NorthEntrance_1F_EventScript_Guard",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_1702B5",
+ "script": "Route16_NorthEntrance_1F_EventScript_OldMan",
"flag": "0"
}
],
@@ -87,7 +87,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 1,
- "script": "Route16_NorthEntrance_1F_EventScript_1A77B6"
+ "script": "EventScript_SetExitingCyclingRoad"
},
{
"type": "trigger",
@@ -96,7 +96,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_1A77C1"
+ "script": "EventScript_SetEnteringCyclingRoad"
},
{
"type": "trigger",
@@ -105,7 +105,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_1701E4"
+ "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop"
},
{
"type": "trigger",
@@ -114,7 +114,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_1701F0"
+ "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop"
},
{
"type": "trigger",
@@ -123,7 +123,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_1A77C1"
+ "script": "EventScript_SetEnteringCyclingRoad"
},
{
"type": "trigger",
@@ -132,7 +132,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_1A77C1"
+ "script": "EventScript_SetEnteringCyclingRoad"
},
{
"type": "trigger",
@@ -141,7 +141,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 1,
- "script": "Route16_NorthEntrance_1F_EventScript_1A77B6"
+ "script": "EventScript_SetExitingCyclingRoad"
},
{
"type": "trigger",
@@ -150,7 +150,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 1,
- "script": "Route16_NorthEntrance_1F_EventScript_1A77B6"
+ "script": "EventScript_SetExitingCyclingRoad"
},
{
"type": "trigger",
@@ -159,7 +159,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_1701FC"
+ "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid"
},
{
"type": "trigger",
@@ -168,7 +168,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_170208"
+ "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom"
},
{
"type": "trigger",
@@ -177,7 +177,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route16_NorthEntrance_1F_EventScript_170214"
+ "script": "Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom"
}
],
"bg_events": []
diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc
index a99a1ec18..d00ba5805 100644
--- a/data/maps/Route16_NorthEntrance_1F/scripts.inc
+++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc
@@ -4,115 +4,115 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2
Route16_NorthEntrance_1F_OnTransition:: @ 81701C8
clearflag FLAG_SYS_ON_CYCLING_ROAD
- call_if_set FLAG_GOT_BICYCLE, EventScript_1701D5
+ call_if_set FLAG_GOT_BICYCLE, Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger
end
-EventScript_1701D5:: @ 81701D5
+Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 81701D5
setvar VAR_TEMP_1, 1
return
-Route16_NorthEntrance_1F_EventScript_1701DB:: @ 81701DB
- msgbox gUnknown_819F98B, MSGBOX_NPC
+Route16_NorthEntrance_1F_EventScript_Guard:: @ 81701DB
+ msgbox Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse, MSGBOX_NPC
end
-Route16_NorthEntrance_1F_EventScript_1701E4:: @ 81701E4
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 81701E4
lockall
setvar VAR_0x8008, 0
- goto EventScript_170220
+ goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
end
-Route16_NorthEntrance_1F_EventScript_1701F0:: @ 81701F0
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81701F0
lockall
setvar VAR_0x8008, 1
- goto EventScript_170220
+ goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
end
-Route16_NorthEntrance_1F_EventScript_1701FC:: @ 81701FC
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81701FC
lockall
setvar VAR_0x8008, 2
- goto EventScript_170220
+ goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
end
-Route16_NorthEntrance_1F_EventScript_170208:: @ 8170208
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 8170208
lockall
setvar VAR_0x8008, 3
- goto EventScript_170220
+ goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
end
-Route16_NorthEntrance_1F_EventScript_170214:: @ 8170214
+Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 8170214
lockall
setvar VAR_0x8008, 4
- goto EventScript_170220
+ goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger
end
-EventScript_170220:: @ 8170220
+Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: @ 8170220
textcolor 0
- msgbox gUnknown_819F9CC
+ msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
compare VAR_0x8008, 1
- call_if_eq EventScript_170279
+ call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop
compare VAR_0x8008, 2
- call_if_eq EventScript_170284
+ call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid
compare VAR_0x8008, 3
- call_if_eq EventScript_17028F
+ call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom
compare VAR_0x8008, 4
- call_if_eq EventScript_17029A
- msgbox gUnknown_819F95F
+ call_if_eq Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom
+ msgbox Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad
closemessage
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1702B3
+ applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkRight
waitmovement 0
releaseall
end
-EventScript_170279:: @ 8170279
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A5
+Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 8170279
+ applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp
waitmovement 0
return
-EventScript_170284:: @ 8170284
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1702A7
+Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 8170284
+ applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp2
waitmovement 0
return
-EventScript_17028F:: @ 817028F
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AA
+Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 817028F
+ applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp3
waitmovement 0
return
-EventScript_17029A:: @ 817029A
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1702AE
+Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 817029A
+ applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp4
waitmovement 0
return
-Movement_1702A5:: @ 81702A5
+Route16_NorthEntrance_1F_Movement_WalkUp:: @ 81702A5
walk_up
step_end
-Movement_1702A7:: @ 81702A7
+Route16_NorthEntrance_1F_Movement_WalkUp2:: @ 81702A7
walk_up
walk_up
step_end
-Movement_1702AA:: @ 81702AA
+Route16_NorthEntrance_1F_Movement_WalkUp3:: @ 81702AA
walk_up
walk_up
walk_up
step_end
-Movement_1702AE:: @ 81702AE
+Route16_NorthEntrance_1F_Movement_WalkUp4:: @ 81702AE
walk_up
walk_up
walk_up
walk_up
step_end
-Movement_1702B3:: @ 81702B3
+Route16_NorthEntrance_1F_Movement_WalkRight:: @ 81702B3
walk_right
step_end
-Route16_NorthEntrance_1F_EventScript_1702B5:: @ 81702B5
- msgbox gUnknown_819F9E8, MSGBOX_NPC
+Route16_NorthEntrance_1F_EventScript_OldMan:: @ 81702B5
+ msgbox Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort, MSGBOX_NPC
end
diff --git a/data/maps/Route16_NorthEntrance_1F/text.inc b/data/maps/Route16_NorthEntrance_1F/text.inc
index 8cc60117c..156e93bfa 100644
--- a/data/maps/Route16_NorthEntrance_1F/text.inc
+++ b/data/maps/Route16_NorthEntrance_1F/text.inc
@@ -1,16 +1,16 @@
-gUnknown_819F95F:: @ 819F95F
+Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad:: @ 819F95F
.string "No pedestrians are allowed on\n"
.string "CYCLING ROAD!$"
-gUnknown_819F98B:: @ 819F98B
+Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse:: @ 819F98B
.string "CYCLING ROAD is a downhill course\n"
.string "by the sea. It's a great ride.$"
-gUnknown_819F9CC:: @ 819F9CC
+Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp:: @ 819F9CC
.string "Excuse me!\n"
.string "Wait up, please!$"
-gUnknown_819F9E8:: @ 819F9E8
+Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort:: @ 819F9E8
.string "How'd you get in?\n"
.string "Good effort!$"
diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json
index 03d205867..103929172 100644
--- a/data/maps/Route16_NorthEntrance_2F/map.json
+++ b/data/maps/Route16_NorthEntrance_2F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route16_NorthEntrance_2F_EventScript_1702BF",
+ "script": "Route16_NorthEntrance_2F_EventScript_LittleBoy",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route16_NorthEntrance_2F_EventScript_1702C8",
+ "script": "Route16_NorthEntrance_2F_EventScript_LittleGirl",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route16_NorthEntrance_2F_EventScript_1702E3",
+ "script": "Route16_NorthEntrance_2F_EventScript_Aide",
"flag": "0"
}
],
@@ -71,14 +71,14 @@
"x": 4,
"y": 1,
"elevation": 0,
- "script": "Route16_NorthEntrance_2F_EventScript_1702D1"
+ "script": "Route16_NorthEntrance_2F_EventScript_LeftBinoculars"
},
{
"type": "bg_event_type_0",
"x": 8,
"y": 1,
"elevation": 0,
- "script": "Route16_NorthEntrance_2F_EventScript_1702DA"
+ "script": "Route16_NorthEntrance_2F_EventScript_RightBinoculars"
}
]
}
diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc
index 7ccba34c8..0843978f2 100644
--- a/data/maps/Route16_NorthEntrance_2F/scripts.inc
+++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc
@@ -1,52 +1,54 @@
+.equ REQUIRED_CAUGHT_MONS, 40
+
Route16_NorthEntrance_2F_MapScripts:: @ 81702BE
.byte 0
-Route16_NorthEntrance_2F_EventScript_1702BF:: @ 81702BF
- msgbox gUnknown_819FA07, MSGBOX_NPC
+Route16_NorthEntrance_2F_EventScript_LittleBoy:: @ 81702BF
+ msgbox Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend, MSGBOX_NPC
end
-Route16_NorthEntrance_2F_EventScript_1702C8:: @ 81702C8
- msgbox gUnknown_819FA41, MSGBOX_NPC
+Route16_NorthEntrance_2F_EventScript_LittleGirl:: @ 81702C8
+ msgbox Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes, MSGBOX_NPC
end
-Route16_NorthEntrance_2F_EventScript_1702D1:: @ 81702D1
- msgbox gUnknown_819FA6F, MSGBOX_SIGN
+Route16_NorthEntrance_2F_EventScript_LeftBinoculars:: @ 81702D1
+ msgbox Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore, MSGBOX_SIGN
end
-Route16_NorthEntrance_2F_EventScript_1702DA:: @ 81702DA
- msgbox gUnknown_819FAB9, MSGBOX_SIGN
+Route16_NorthEntrance_2F_EventScript_RightBinoculars:: @ 81702DA
+ msgbox Route16_NorthEntrance_2F_Text_LongPathOverWater, MSGBOX_SIGN
end
-Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
+Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3
lock
faceplayer
- call EventScript_17036F
- goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365
- msgbox gUnknown_819FB0E, MSGBOX_YESNO
+ call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo
+ goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin
+ msgbox Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Aide_EventScript_DeclineCheckMons
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
getnumberstring 2, VAR_0x8006
- call EventScript_17036F
- compare VAR_0x8006, 40
+ call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo
+ compare VAR_0x8006, REQUIRED_CAUGHT_MONS
goto_if_lt Aide_EventScript_HaventCaughtEnough
- msgbox gUnknown_819FC15
+ msgbox Route16_NorthEntrance_2F_Text_GreatHereYouGo
checkitemspace ITEM_AMULET_COIN, 1
compare VAR_RESULT, FALSE
goto_if_eq Aide_EventScript_NoRoomForItem
- giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN
+ giveitem_msg Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide, ITEM_AMULET_COIN
setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
- msgbox gUnknown_819FC93
+ msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin
release
end
-EventScript_170365:: @ 8170365
- msgbox gUnknown_819FC93
+Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin:: @ 8170365
+ msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin
release
end
-EventScript_17036F:: @ 817036F
- getnumberstring 0, 40
+Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo:: @ 817036F
+ getnumberstring 0, REQUIRED_CAUGHT_MONS
getitemname 1, ITEM_AMULET_COIN
return
diff --git a/data/maps/Route16_NorthEntrance_2F/text.inc b/data/maps/Route16_NorthEntrance_2F/text.inc
index 4839bfe8a..37c518fb4 100644
--- a/data/maps/Route16_NorthEntrance_2F/text.inc
+++ b/data/maps/Route16_NorthEntrance_2F/text.inc
@@ -1,23 +1,23 @@
-gUnknown_819FA07:: @ 819FA07
+Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend:: @ 819FA07
.string "I'm on a relaxing ride on my new\n"
.string "bike with my girlfriend.$"
-gUnknown_819FA41:: @ 819FA41
+Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes:: @ 819FA41
.string "We're going riding together on our\n"
.string "new bikes.$"
-gUnknown_819FA6F:: @ 819FA6F
+Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore:: @ 819FA6F
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "It's the CELADON DEPT. STORE!$"
-gUnknown_819FAB9:: @ 819FAB9
+Route16_NorthEntrance_2F_Text_LongPathOverWater:: @ 819FAB9
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "There's a long path over water far\n"
.string "away.$"
-gUnknown_819FB0E:: @ 819FB0E
+Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40:: @ 819FB0E
.string "Hi! Remember me?\n"
.string "I'm one of PROF. OAK's AIDES.\p"
.string "If your POKéDEX has complete data\n"
@@ -29,17 +29,17 @@ gUnknown_819FB0E:: @ 819FB0E
.string "Have you gathered data on at least\n"
.string "40 kinds of POKéMON?$"
-gUnknown_819FC15:: @ 819FC15
+Route16_NorthEntrance_2F_Text_GreatHereYouGo:: @ 819FC15
.string "Great! You have caught or owned\n"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "Congratulations!\n"
.string "Here you go!$"
-gUnknown_819FC68:: @ 819FC68
+Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide:: @ 819FC68
.string "{PLAYER} received the AMULET COIN\n"
.string "from the AIDE.$"
-gUnknown_819FC93:: @ 819FC93
+Route16_NorthEntrance_2F_Text_ExplainAmuletCoin:: @ 819FC93
.string "An AMULET COIN is an item to be\n"
.string "held by a POKéMON.\p"
.string "If the POKéMON appears in a winning\n"
diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json
index fd640db01..43ec14e88 100644
--- a/data/maps/Route17/map.json
+++ b/data/maps/Route17/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 6,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route17_EventScript_1AB319",
+ "script": "Route17_EventScript_Virgil",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 5,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route17_EventScript_1AB221",
+ "script": "Route17_EventScript_Isaiah",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 2,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route17_EventScript_1AB1E3",
+ "script": "Route17_EventScript_Raul",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 5,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route17_EventScript_1AB129",
+ "script": "Route17_EventScript_Nikolas",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route17_EventScript_1AB0EB",
+ "script": "Route17_EventScript_Billy",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route17_EventScript_1AB29D",
+ "script": "Route17_EventScript_Jamal",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route17_EventScript_1AB25F",
+ "script": "Route17_EventScript_Zeek",
"flag": "0"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 5,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route17_EventScript_1AB2DB",
+ "script": "Route17_EventScript_Corey",
"flag": "0"
},
{
@@ -140,7 +140,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route17_EventScript_1AB1A5",
+ "script": "Route17_EventScript_William",
"flag": "0"
},
{
@@ -153,7 +153,7 @@
"movement_range_y": 5,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route17_EventScript_1AB167",
+ "script": "Route17_EventScript_Jaxon",
"flag": "0"
}
],
@@ -165,42 +165,42 @@
"x": 12,
"y": 97,
"elevation": 0,
- "script": "Route17_EventScript_1681DB"
+ "script": "Route17_EventScript_RouteSign"
},
{
"type": "bg_event_type_0",
"x": 12,
"y": 83,
"elevation": 0,
- "script": "Route17_EventScript_1681D2"
+ "script": "Route17_EventScript_TrainerTips2"
},
{
"type": "bg_event_type_0",
"x": 12,
"y": 68,
"elevation": 0,
- "script": "Route17_EventScript_1681C9"
+ "script": "Route17_EventScript_TrainerTips1"
},
{
"type": "bg_event_type_0",
"x": 12,
"y": 53,
"elevation": 0,
- "script": "Route17_EventScript_1681C0"
+ "script": "Route17_EventScript_ItemsNotice"
},
{
"type": "bg_event_type_0",
"x": 12,
"y": 125,
"elevation": 3,
- "script": "Route17_EventScript_1681E4"
+ "script": "Route17_EventScript_BallsNotice"
},
{
"type": "bg_event_type_0",
"x": 11,
"y": 157,
"elevation": 0,
- "script": "Route17_EventScript_1681ED"
+ "script": "Route17_EventScript_CyclingRoadSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc
index 8633ab23e..787e68e04 100644
--- a/data/maps/Route17/scripts.inc
+++ b/data/maps/Route17/scripts.inc
@@ -1,26 +1,26 @@
Route17_MapScripts:: @ 81681BF
.byte 0
-Route17_EventScript_1681C0:: @ 81681C0
- msgbox gUnknown_81874E4, MSGBOX_SIGN
+Route17_EventScript_ItemsNotice:: @ 81681C0
+ msgbox Route17_Text_WatchOutForDiscardedItems, MSGBOX_SIGN
end
-Route17_EventScript_1681C9:: @ 81681C9
- msgbox gUnknown_8187512, MSGBOX_SIGN
+Route17_EventScript_TrainerTips1:: @ 81681C9
+ msgbox Route17_Text_SameSpeciesGrowDifferentRates, MSGBOX_SIGN
end
-Route17_EventScript_1681D2:: @ 81681D2
- msgbox gUnknown_818757B, MSGBOX_SIGN
+Route17_EventScript_TrainerTips2:: @ 81681D2
+ msgbox Route17_Text_PressBToStayInPlace, MSGBOX_SIGN
end
-Route17_EventScript_1681DB:: @ 81681DB
- msgbox gUnknown_81875BE, MSGBOX_SIGN
+Route17_EventScript_RouteSign:: @ 81681DB
+ msgbox Route17_Text_RouteSign, MSGBOX_SIGN
end
-Route17_EventScript_1681E4:: @ 81681E4
- msgbox gUnknown_81875E3, MSGBOX_SIGN
+Route17_EventScript_BallsNotice:: @ 81681E4
+ msgbox Route17_Text_DontThrowGameThrowBalls, MSGBOX_SIGN
end
-Route17_EventScript_1681ED:: @ 81681ED
- msgbox gUnknown_8187622, MSGBOX_SIGN
+Route17_EventScript_CyclingRoadSign:: @ 81681ED
+ msgbox Route17_Text_CyclingRoadSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc
index eff5f0726..21d7978a3 100644
--- a/data/maps/Route17/text.inc
+++ b/data/maps/Route17/text.inc
@@ -1,131 +1,131 @@
-Text_18717E:: @ 818717E
+Route17_Text_RaulIntro:: @ 818717E
.string "There's no getting rich quick in\n"
.string "battling kids.$"
-Text_1871AE:: @ 81871AE
+Route17_Text_RaulDefeat:: @ 81871AE
.string "Burned out!$"
-Text_1871BA:: @ 81871BA
+Route17_Text_RaulPostBattle:: @ 81871BA
.string "You can find good stuff lying\n"
.string "around on CYCLING ROAD.\p"
.string "There's good money in picking them\n"
.string "up and selling them.$"
-Text_187228:: @ 8187228
+Route17_Text_IsaiahIntro:: @ 8187228
.string "I'm mighty proud of my bod, kiddo.\n"
.string "Come on!$"
-Text_187254:: @ 8187254
+Route17_Text_IsaiahDefeat:: @ 8187254
.string "Whoo!$"
-Text_18725A:: @ 818725A
+Route17_Text_IsaiahPostBattle:: @ 818725A
.string "I could belly-bump you outta\n"
.string "here!$"
-Text_18727D:: @ 818727D
+Route17_Text_VirgilIntro:: @ 818727D
.string "You heading to FUCHSIA?$"
-Text_187295:: @ 8187295
+Route17_Text_VirgilDefeat:: @ 8187295
.string "Crash and burn!$"
-Text_1872A5:: @ 81872A5
+Route17_Text_VirgilPostBattle:: @ 81872A5
.string "I love racing downhill!$"
-Text_1872BD:: @ 81872BD
+Route17_Text_BillyIntro:: @ 81872BD
.string "We're BIKERS!\n"
.string "We rule the roads, man!$"
-Text_1872E3:: @ 81872E3
+Route17_Text_BillyDefeat:: @ 81872E3
.string "Smoked!$"
-Text_1872EB:: @ 81872EB
+Route17_Text_BillyPostBattle:: @ 81872EB
.string "Are you looking for adventure?$"
-Text_18730A:: @ 818730A
+Route17_Text_NikolasIntro:: @ 818730A
.string "Let VOLTORB electrify you!$"
-Text_187325:: @ 8187325
+Route17_Text_NikolasDefeat:: @ 8187325
.string "Grounded out!$"
-Text_187333:: @ 8187333
+Route17_Text_NikolasPostBattle:: @ 8187333
.string "I got my VOLTORB at the abandoned\n"
.string "POWER PLANT.$"
-Text_187362:: @ 8187362
+Route17_Text_ZeekIntro:: @ 8187362
.string "I leveled up my POKéMON, but it\n"
.string "won't evolve. Why?$"
-Text_187395:: @ 8187395
+Route17_Text_ZeekDefeat:: @ 8187395
.string "Why, you!$"
-Text_18739F:: @ 818739F
+Route17_Text_ZeekPostBattle:: @ 818739F
.string "Maybe some POKéMON need element\n"
.string "STONES to evolve.$"
-Text_1873D1:: @ 81873D1
+Route17_Text_JamalIntro:: @ 81873D1
.string "I need a little exercise!$"
-Text_1873EB:: @ 81873EB
+Route17_Text_JamalDefeat:: @ 81873EB
.string "Whew!\n"
.string "Good workout!$"
-Text_1873FF:: @ 81873FF
+Route17_Text_JamalPostBattle:: @ 81873FF
.string "I'm sure I lost weight there!$"
-Text_18741D:: @ 818741D
+Route17_Text_CoreyIntro:: @ 818741D
.string "Be a rebel!$"
-Text_187429:: @ 8187429
+Route17_Text_CoreyDefeat:: @ 8187429
.string "Aaaargh!$"
-Text_187432:: @ 8187432
+Route17_Text_CoreyPostBattle:: @ 8187432
.string "Be ready to fight for your beliefs!$"
-Text_187456:: @ 8187456
+Route17_Text_JaxonIntro:: @ 8187456
.string "Nice BIKE!\n"
.string "How's it handle?$"
-Text_187472:: @ 8187472
+Route17_Text_JaxonDefeat:: @ 8187472
.string "Shoot!$"
-Text_187479:: @ 8187479
+Route17_Text_JaxonPostBattle:: @ 8187479
.string "The slope makes it hard to steer.$"
-Text_18749B:: @ 818749B
+Route17_Text_WilliamIntro:: @ 818749B
.string "Get lost, kid!\n"
.string "I'm bushed!$"
-Text_1874B6:: @ 81874B6
+Route17_Text_WilliamDefeat:: @ 81874B6
.string "Are you satisfied?$"
-Text_1874C9:: @ 81874C9
+Route17_Text_WilliamPostBattle:: @ 81874C9
.string "I need to catch a few z's!$"
-gUnknown_81874E4:: @ 81874E4
+Route17_Text_WatchOutForDiscardedItems:: @ 81874E4
.string "It's a notice.\p"
.string "Watch out for discarded items.$"
-gUnknown_8187512:: @ 8187512
+Route17_Text_SameSpeciesGrowDifferentRates:: @ 8187512
.string "TRAINER TIPS\p"
.string "All POKéMON are unique.\p"
.string "Even POKéMON of the same species\n"
.string "and level grow at different rates.$"
-gUnknown_818757B:: @ 818757B
+Route17_Text_PressBToStayInPlace:: @ 818757B
.string "TRAINER TIPS\p"
.string "Press the B Button to stay in place\n"
.string "while on a slope.$"
-gUnknown_81875BE:: @ 81875BE
+Route17_Text_RouteSign:: @ 81875BE
.string "ROUTE 17\n"
.string "CELADON CITY - FUCHSIA CITY$"
-gUnknown_81875E3:: @ 81875E3
+Route17_Text_DontThrowGameThrowBalls:: @ 81875E3
.string "It's a notice!\p"
.string "Don't throw the game, throw POKé\n"
.string "BALLS instead!$"
-gUnknown_8187622:: @ 8187622
+Route17_Text_CyclingRoadSign:: @ 8187622
.string "CYCLING ROAD\n"
.string "Slope ends here!$"
diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json
index 86eb04352..6976a7570 100644
--- a/data/maps/Route18/map.json
+++ b/data/maps/Route18/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route18_EventScript_1AB3D3",
+ "script": "Route18_EventScript_Jacob",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route18_EventScript_1AB395",
+ "script": "Route18_EventScript_Ramiro",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "Route18_EventScript_1AB357",
+ "script": "Route18_EventScript_Wilton",
"flag": "0"
}
],
@@ -89,14 +89,14 @@
"x": 37,
"y": 7,
"elevation": 0,
- "script": "Route18_EventScript_168228"
+ "script": "Route18_EventScript_CyclingRoadSign"
},
{
"type": "bg_event_type_0",
"x": 52,
"y": 7,
"elevation": 0,
- "script": "Route18_EventScript_16821F"
+ "script": "Route18_EventScript_RouteSign"
}
]
}
diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc
index 25fda03c2..43d2b029e 100644
--- a/data/maps/Route18/scripts.inc
+++ b/data/maps/Route18/scripts.inc
@@ -5,25 +5,25 @@ Route18_MapScripts:: @ 81681F6
Route18_OnTransition:: @ 8168201
compare VAR_MAP_SCENE_ROUTE16, 1
- call_if_eq EventScript_16820D
+ call_if_eq Route18_OnTransitionCyclingRoad
end
-EventScript_16820D:: @ 816820D
+Route18_OnTransitionCyclingRoad:: @ 816820D
setflag FLAG_SYS_ON_CYCLING_ROAD
return
Route18_OnWarp:: @ 8168211
- map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B
+ map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route18_OnWarpCyclingRoad
.2byte 0
-EventScript_16821B:: @ 816821B
+Route18_OnWarpCyclingRoad:: @ 816821B
special Special_ForcePlayerOntoBike
end
-Route18_EventScript_16821F:: @ 816821F
- msgbox gUnknown_8187757, MSGBOX_SIGN
+Route18_EventScript_RouteSign:: @ 816821F
+ msgbox Route18_Text_RouteSign, MSGBOX_SIGN
end
-Route18_EventScript_168228:: @ 8168228
- msgbox gUnknown_818777C, MSGBOX_SIGN
+Route18_EventScript_CyclingRoadSign:: @ 8168228
+ msgbox Route18_Text_CyclingRoadSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route18/text.inc b/data/maps/Route18/text.inc
index c22a6360a..107804cfb 100644
--- a/data/maps/Route18/text.inc
+++ b/data/maps/Route18/text.inc
@@ -1,40 +1,40 @@
-Text_187640:: @ 8187640
+Route18_Text_WiltonIntro:: @ 8187640
.string "I always check every grassy area\n"
.string "for new POKéMON.$"
-Text_187672:: @ 8187672
+Route18_Text_WiltonDefeat:: @ 8187672
.string "Tch!$"
-Text_187677:: @ 8187677
+Route18_Text_WiltonPostBattle:: @ 8187677
.string "I wish I had a BIKE!$"
-Text_18768C:: @ 818768C
+Route18_Text_RamiroIntro:: @ 818768C
.string "Kurukkoo!\n"
.string "How do you like my birdcall?$"
-Text_1876B3:: @ 81876B3
+Route18_Text_RamiroDefeat:: @ 81876B3
.string "I had to bug you!$"
-Text_1876C5:: @ 81876C5
+Route18_Text_RamiroPostBattle:: @ 81876C5
.string "I collect sea POKéMON on weekends\n"
.string "because the sea is so close.$"
-Text_187704:: @ 8187704
+Route18_Text_JacobIntro:: @ 8187704
.string "This is my turf!\n"
.string "Get out of here!$"
-Text_187726:: @ 8187726
+Route18_Text_JacobDefeat:: @ 8187726
.string "Darn!$"
-Text_18772C:: @ 818772C
+Route18_Text_JacobPostBattle:: @ 818772C
.string "This is my fave area for catching\n"
.string "POKéMON.$"
-gUnknown_8187757:: @ 8187757
+Route18_Text_RouteSign:: @ 8187757
.string "ROUTE 18\n"
.string "CELADON CITY - FUCHSIA CITY$"
-gUnknown_818777C:: @ 818777C
+Route18_Text_CyclingRoadSign:: @ 818777C
.string "CYCLING ROAD\n"
.string "No pedestrians permitted!$"
diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json
index 9b1250ac4..c7c04b124 100644
--- a/data/maps/Route18_EastEntrance_1F/map.json
+++ b/data/maps/Route18_EastEntrance_1F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route18_EastEntrance_1F_EventScript_170391",
+ "script": "Route18_EastEntrance_1F_EventScript_Guard",
"flag": "0"
}
],
@@ -60,7 +60,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 0,
- "script": "Route18_EastEntrance_1F_EventScript_1A77C1"
+ "script": "EventScript_SetEnteringCyclingRoad"
},
{
"type": "trigger",
@@ -69,7 +69,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route18_EastEntrance_1F_EventScript_17039A"
+ "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop"
},
{
"type": "trigger",
@@ -78,7 +78,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route18_EastEntrance_1F_EventScript_1703A6"
+ "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop"
},
{
"type": "trigger",
@@ -87,7 +87,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route18_EastEntrance_1F_EventScript_1703B2"
+ "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid"
},
{
"type": "trigger",
@@ -96,7 +96,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route18_EastEntrance_1F_EventScript_1703BE"
+ "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom"
},
{
"type": "trigger",
@@ -105,7 +105,7 @@
"elevation": 3,
"var": "VAR_TEMP_1",
"var_value": 0,
- "script": "Route18_EastEntrance_1F_EventScript_1703CA"
+ "script": "Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom"
},
{
"type": "trigger",
@@ -114,7 +114,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 1,
- "script": "Route18_EastEntrance_1F_EventScript_1A77B6"
+ "script": "EventScript_SetExitingCyclingRoad"
},
{
"type": "trigger",
@@ -123,7 +123,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 1,
- "script": "Route18_EastEntrance_1F_EventScript_1A77B6"
+ "script": "EventScript_SetExitingCyclingRoad"
},
{
"type": "trigger",
@@ -132,7 +132,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 1,
- "script": "Route18_EastEntrance_1F_EventScript_1A77B6"
+ "script": "EventScript_SetExitingCyclingRoad"
},
{
"type": "trigger",
@@ -141,7 +141,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 0,
- "script": "Route18_EastEntrance_1F_EventScript_1A77C1"
+ "script": "EventScript_SetEnteringCyclingRoad"
},
{
"type": "trigger",
@@ -150,7 +150,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE16",
"var_value": 0,
- "script": "Route18_EastEntrance_1F_EventScript_1A77C1"
+ "script": "EventScript_SetEnteringCyclingRoad"
}
],
"bg_events": []
diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc
index e49eb285f..0a6b3b56f 100644
--- a/data/maps/Route18_EastEntrance_1F/scripts.inc
+++ b/data/maps/Route18_EastEntrance_1F/scripts.inc
@@ -4,111 +4,111 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378
Route18_EastEntrance_1F_OnTransition:: @ 817037E
clearflag FLAG_SYS_ON_CYCLING_ROAD
- call_if_set FLAG_GOT_BICYCLE, EventScript_17038B
+ call_if_set FLAG_GOT_BICYCLE, Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger
end
-EventScript_17038B:: @ 817038B
+Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 817038B
setvar VAR_TEMP_1, 1
return
-Route18_EastEntrance_1F_EventScript_170391:: @ 8170391
- msgbox gUnknown_819FD3A, MSGBOX_NPC
+Route18_EastEntrance_1F_EventScript_Guard:: @ 8170391
+ msgbox Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere, MSGBOX_NPC
end
-Route18_EastEntrance_1F_EventScript_17039A:: @ 817039A
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 817039A
lockall
setvar VAR_0x8008, 0
- goto EventScript_1703D6
+ goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
end
-Route18_EastEntrance_1F_EventScript_1703A6:: @ 81703A6
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81703A6
lockall
setvar VAR_0x8008, 1
- goto EventScript_1703D6
+ goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
end
-Route18_EastEntrance_1F_EventScript_1703B2:: @ 81703B2
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81703B2
lockall
setvar VAR_0x8008, 2
- goto EventScript_1703D6
+ goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
end
-Route18_EastEntrance_1F_EventScript_1703BE:: @ 81703BE
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 81703BE
lockall
setvar VAR_0x8008, 3
- goto EventScript_1703D6
+ goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
end
-Route18_EastEntrance_1F_EventScript_1703CA:: @ 81703CA
+Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 81703CA
lockall
setvar VAR_0x8008, 4
- goto EventScript_1703D6
+ goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger
end
-EventScript_1703D6:: @ 81703D6
+Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: @ 81703D6
textcolor 0
- msgbox gUnknown_819FD60
+ msgbox Route18_EastEntrance_1F_Text_ExcuseMe
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
delay 20
compare VAR_0x8008, 1
- call_if_eq EventScript_17042F
+ call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop
compare VAR_0x8008, 2
- call_if_eq EventScript_17043A
+ call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid
compare VAR_0x8008, 3
- call_if_eq EventScript_170445
+ call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom
compare VAR_0x8008, 4
- call_if_eq EventScript_170450
- msgbox gUnknown_819FD0C
+ call_if_eq Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom
+ msgbox Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad
closemessage
- applymovement OBJ_EVENT_ID_PLAYER, Movement_170469
+ applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkRight
waitmovement 0
releaseall
end
-EventScript_17042F:: @ 817042F
- applymovement OBJ_EVENT_ID_PLAYER, Movement_17045B
+Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 817042F
+ applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp
waitmovement 0
return
-EventScript_17043A:: @ 817043A
- applymovement OBJ_EVENT_ID_PLAYER, Movement_17045D
+Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 817043A
+ applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp2
waitmovement 0
return
-EventScript_170445:: @ 8170445
- applymovement OBJ_EVENT_ID_PLAYER, Movement_170460
+Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 8170445
+ applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp3
waitmovement 0
return
-EventScript_170450:: @ 8170450
- applymovement OBJ_EVENT_ID_PLAYER, Movement_170464
+Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 8170450
+ applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp4
waitmovement 0
return
-Movement_17045B:: @ 817045B
+Route18_EastEntrance_1F_Movement_WalkUp:: @ 817045B
walk_up
step_end
-Movement_17045D:: @ 817045D
+Route18_EastEntrance_1F_Movement_WalkUp2:: @ 817045D
walk_up
walk_up
step_end
-Movement_170460:: @ 8170460
+Route18_EastEntrance_1F_Movement_WalkUp3:: @ 8170460
walk_up
walk_up
walk_up
step_end
-Movement_170464:: @ 8170464
+Route18_EastEntrance_1F_Movement_WalkUp4:: @ 8170464
walk_up
walk_up
walk_up
walk_up
step_end
-Movement_170469:: @ 8170469
+Route18_EastEntrance_1F_Movement_WalkRight:: @ 8170469
walk_right
step_end
diff --git a/data/maps/Route18_EastEntrance_1F/text.inc b/data/maps/Route18_EastEntrance_1F/text.inc
index 5de293cba..9551d993f 100644
--- a/data/maps/Route18_EastEntrance_1F/text.inc
+++ b/data/maps/Route18_EastEntrance_1F/text.inc
@@ -1,11 +1,11 @@
-gUnknown_819FD0C:: @ 819FD0C
+Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad:: @ 819FD0C
.string "You need a BICYCLE to go out on\n"
.string "CYCLING ROAD!$"
-gUnknown_819FD3A:: @ 819FD3A
+Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere:: @ 819FD3A
.string "CYCLING ROAD is all uphill from\n"
.string "here.$"
-gUnknown_819FD60:: @ 819FD60
+Route18_EastEntrance_1F_Text_ExcuseMe:: @ 819FD60
.string "Excuse me!$"
diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json
index b542ae540..c5c7b0853 100644
--- a/data/maps/Route18_EastEntrance_2F/map.json
+++ b/data/maps/Route18_EastEntrance_2F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route18_EastEntrance_2F_EventScript_17047E",
+ "script": "Route18_EastEntrance_2F_EventScript_Haden",
"flag": "0"
}
],
@@ -45,14 +45,14 @@
"x": 4,
"y": 1,
"elevation": 0,
- "script": "Route18_EastEntrance_2F_EventScript_17046C"
+ "script": "Route18_EastEntrance_2F_EventScript_LeftBinoculars"
},
{
"type": "bg_event_type_0",
"x": 8,
"y": 1,
"elevation": 0,
- "script": "Route18_EastEntrance_2F_EventScript_170475"
+ "script": "Route18_EastEntrance_2F_EventScript_RightBinoculars"
}
]
}
diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc
index ed29859ab..910f238e4 100644
--- a/data/maps/Route18_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route18_EastEntrance_2F/scripts.inc
@@ -1,47 +1,47 @@
Route18_EastEntrance_2F_MapScripts:: @ 817046B
.byte 0
-Route18_EastEntrance_2F_EventScript_17046C:: @ 817046C
- msgbox gUnknown_819FD6B, MSGBOX_SIGN
+Route18_EastEntrance_2F_EventScript_LeftBinoculars:: @ 817046C
+ msgbox Route18_EastEntrance_2F_Text_PalletTownInWest, MSGBOX_SIGN
end
-Route18_EastEntrance_2F_EventScript_170475:: @ 8170475
- msgbox gUnknown_819FDB3, MSGBOX_SIGN
+Route18_EastEntrance_2F_EventScript_RightBinoculars:: @ 8170475
+ msgbox Route18_EastEntrance_2F_Text_PeopleSwimming, MSGBOX_SIGN
end
-Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
+Route18_EastEntrance_2F_EventScript_Haden:: @ 817047E
lock
faceplayer
setvar VAR_0x8008, INGAME_TRADE_LICKITUNG
call EventScript_GetInGameTradeSpeciesInfo
- goto_if_set FLAG_DID_MARC_TRADE, EventScript_1704F0
+ goto_if_set FLAG_DID_MARC_TRADE, Route18_EastEntrance_2F_EventScript_AlreadyTraded
msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq EventScript_1704D8
+ goto_if_eq Route18_EastEntrance_2F_EventScript_DeclineTrade
call EventScript_ChooseMonForInGameTrade
compare VAR_0x8004, PARTY_SIZE
- goto_if_ge EventScript_1704D8
+ goto_if_ge Route18_EastEntrance_2F_EventScript_DeclineTrade
call EventScript_GetInGameTradeSpecies
compare VAR_RESULT, VAR_0x8009
- goto_if_ne EventScript_1704E2
+ goto_if_ne Route18_EastEntrance_2F_EventScript_NotRequestedMon
call EventScript_DoInGameTrade
msgbox Trade_Text_HeyThanks
setflag FLAG_DID_MARC_TRADE
release
end
-EventScript_1704D8:: @ 81704D8
+Route18_EastEntrance_2F_EventScript_DeclineTrade:: @ 81704D8
msgbox Trade_Text_AwwOhWell
release
end
-EventScript_1704E2:: @ 81704E2
+Route18_EastEntrance_2F_EventScript_NotRequestedMon:: @ 81704E2
getspeciesname 0, VAR_0x8009
msgbox Trade_Text_WhatThatsNoMon
release
end
-EventScript_1704F0:: @ 81704F0
+Route18_EastEntrance_2F_EventScript_AlreadyTraded:: @ 81704F0
msgbox Trade_Text_IsntMyOldMonGreat
release
end
diff --git a/data/maps/Route18_EastEntrance_2F/text.inc b/data/maps/Route18_EastEntrance_2F/text.inc
index 8a479371c..aac533f71 100644
--- a/data/maps/Route18_EastEntrance_2F/text.inc
+++ b/data/maps/Route18_EastEntrance_2F/text.inc
@@ -1,9 +1,9 @@
-gUnknown_819FD6B:: @ 819FD6B
+Route18_EastEntrance_2F_Text_PalletTownInWest:: @ 819FD6B
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "PALLET TOWN is in the west.$"
-gUnknown_819FDB3:: @ 819FDB3
+Route18_EastEntrance_2F_Text_PeopleSwimming:: @ 819FDB3
.string "Let's see what the binoculars have\n"
.string "to show…\p"
.string "There are people swimming.$"
diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json
index b25ce0fec..d8f35ad21 100644
--- a/data/maps/Route19/map.json
+++ b/data/maps/Route19/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 3,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route19_EventScript_1AB44F",
+ "script": "Route19_EventScript_Reece",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route19_EventScript_1AB411",
+ "script": "Route19_EventScript_Richard",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route19_EventScript_1AB547",
+ "script": "Route19_EventScript_Tony",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 3,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route19_EventScript_1AB48D",
+ "script": "Route19_EventScript_Matthew",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 2,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route19_EventScript_1AB4CB",
+ "script": "Route19_EventScript_Douglas",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 6,
- "script": "Route19_EventScript_1AB509",
+ "script": "Route19_EventScript_David",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route19_EventScript_1AB585",
+ "script": "Route19_EventScript_Axle",
"flag": "0"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route19_EventScript_1AB601",
+ "script": "Route19_EventScript_Alice",
"flag": "0"
},
{
@@ -140,7 +140,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route19_EventScript_1AB63F",
+ "script": "Route19_EventScript_Connie",
"flag": "0"
},
{
@@ -153,7 +153,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route19_EventScript_1AB5C3",
+ "script": "Route19_EventScript_Anya",
"flag": "0"
},
{
@@ -166,7 +166,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route19_EventScript_1AB67D",
+ "script": "Route19_EventScript_Lia",
"flag": "0"
},
{
@@ -179,7 +179,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route19_EventScript_1AB6C3",
+ "script": "Route19_EventScript_Luc",
"flag": "0"
}
],
@@ -191,7 +191,7 @@
"x": 13,
"y": 12,
"elevation": 0,
- "script": "Route19_EventScript_168232"
+ "script": "Route19_EventScript_RouteSign"
}
]
}
diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc
index 16d6e4669..10b361e83 100644
--- a/data/maps/Route19/scripts.inc
+++ b/data/maps/Route19/scripts.inc
@@ -1,6 +1,6 @@
Route19_MapScripts:: @ 8168231
.byte 0
-Route19_EventScript_168232:: @ 8168232
- msgbox gUnknown_8187C06, MSGBOX_SIGN
+Route19_EventScript_RouteSign:: @ 8168232
+ msgbox Route19_Text_RouteSign, MSGBOX_SIGN
end
diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc
index 7d399f364..a414146b4 100644
--- a/data/maps/Route19/text.inc
+++ b/data/maps/Route19/text.inc
@@ -1,154 +1,154 @@
-Text_1877A3:: @ 81877A3
+Route19_Text_RichardIntro:: @ 81877A3
.string "I have to exercise and warm up\n"
.string "before going out for a swim.$"
-Text_1877DF:: @ 81877DF
+Route19_Text_RichardDefeat:: @ 81877DF
.string "All warmed up!$"
-Text_1877EE:: @ 81877EE
+Route19_Text_RichardPostBattle:: @ 81877EE
.string "Thanks, kid!\n"
.string "I'm ready for a swim.$"
-Text_187811:: @ 8187811
+Route19_Text_ReeceIntro:: @ 8187811
.string "Wait! Slow down!\n"
.string "You'll have a heart attack!$"
-Text_18783E:: @ 818783E
+Route19_Text_ReeceDefeat:: @ 818783E
.string "Ooh!\n"
.string "That's chilly!$"
-Text_187852:: @ 8187852
+Route19_Text_ReecePostBattle:: @ 8187852
.string "Watch out for TENTACOOL.\n"
.string "They sting so painfully.$"
-Text_187884:: @ 8187884
+Route19_Text_MatthewIntro:: @ 8187884
.string "I love swimming!\n"
.string "What about you?$"
-Text_1878A5:: @ 81878A5
+Route19_Text_MatthewDefeat:: @ 81878A5
.string "Belly flop!$"
-Text_1878B1:: @ 81878B1
+Route19_Text_MatthewPostBattle:: @ 81878B1
.string "I can beat even marine POKéMON\n"
.string "at swimming.$"
-Text_1878DD:: @ 81878DD
+Route19_Text_DouglasIntro:: @ 81878DD
.string "What's beyond the horizon?$"
-Text_1878F8:: @ 81878F8
+Route19_Text_DouglasDefeat:: @ 81878F8
.string "Glub!$"
-Text_1878FE:: @ 81878FE
+Route19_Text_DouglasPostBattle:: @ 81878FE
.string "I see a couple of islands over\n"
.string "yonder!$"
-Text_187925:: @ 8187925
+Route19_Text_DavidIntro:: @ 8187925
.string "I tried diving for POKéMON, but it\n"
.string "was a no-go.$"
-Text_187955:: @ 8187955
+Route19_Text_DavidDefeat:: @ 8187955
.string "Help!$"
-Text_18795B:: @ 818795B
+Route19_Text_DavidPostBattle:: @ 818795B
.string "I guess you have to fish for sea\n"
.string "POKéMON.$"
-Text_187985:: @ 8187985
+Route19_Text_TonyIntro:: @ 8187985
.string "I look at the sea to forget all\n"
.string "the bad things that happened.$"
-Text_1879C3:: @ 81879C3
+Route19_Text_TonyDefeat:: @ 81879C3
.string "Ooh!\n"
.string "Traumatic!$"
-Text_1879D3:: @ 81879D3
+Route19_Text_TonyPostBattle:: @ 81879D3
.string "I'm looking at the sea to forget\n"
.string "the bad thing that happened!$"
-Text_187A11:: @ 8187A11
+Route19_Text_AnyaIntro:: @ 8187A11
.string "Oh, I just love your ride!\n"
.string "Can I have it if I win?$"
-Text_187A44:: @ 8187A44
+Route19_Text_AnyaDefeat:: @ 8187A44
.string "Oh! I lost!$"
-Text_187A50:: @ 8187A50
+Route19_Text_AnyaPostBattle:: @ 8187A50
.string "It's still a long way to go to\n"
.string "SEAFOAM ISLANDS…\p"
.string "I want to go back to FUCHSIA…$"
-Text_187A9E:: @ 8187A9E
+Route19_Text_AliceIntro:: @ 8187A9E
.string "Swimming's great!\n"
.string "Sunburns aren't!$"
-Text_187AC1:: @ 8187AC1
+Route19_Text_AliceDefeat:: @ 8187AC1
.string "Shocker!$"
-Text_187ACA:: @ 8187ACA
+Route19_Text_AlicePostBattle:: @ 8187ACA
.string "My boyfriend wanted to swim to\n"
.string "SEAFOAM ISLANDS.$"
-Text_187AFA:: @ 8187AFA
+Route19_Text_AxleIntro:: @ 8187AFA
.string "Ahoy, there!\n"
.string "These waters are treacherous!$"
-Text_187B25:: @ 8187B25
+Route19_Text_AxleDefeat:: @ 8187B25
.string "Ooh!\n"
.string "Dangerous!$"
-Text_187B35:: @ 8187B35
+Route19_Text_AxlePostBattle:: @ 8187B35
.string "M-my legs! They cramped up!\n"
.string "Glub, glub…$"
-Text_187B5D:: @ 8187B5D
+Route19_Text_ConnieIntro:: @ 8187B5D
.string "I swam here with my friends…\n"
.string "I'm tired…$"
-Text_187B85:: @ 8187B85
+Route19_Text_ConnieDefeat:: @ 8187B85
.string "I'm exhausted…$"
-Text_187B94:: @ 8187B94
+Route19_Text_ConniePostBattle:: @ 8187B94
.string "If I were to ride a POKéMON on\n"
.string "the sea, I'd like a LAPRAS.\p"
.string "LAPRAS is so big, I bet it\n"
.string "would keep me dry on water.$"
-gUnknown_8187C06:: @ 8187C06
+Route19_Text_RouteSign:: @ 8187C06
.string "SEA ROUTE 19\n"
.string "FUCHSIA CITY - SEAFOAM ISLANDS$"
-Text_187C32:: @ 8187C32
+Route19_Text_LiaIntro:: @ 8187C32
.string "LIA: I'm looking after my brother.\n"
.string "He just became a TRAINER.$"
-Text_187C6F:: @ 8187C6F
+Route19_Text_LiaDefeat:: @ 8187C6F
.string "LIA: That's no way to treat my\n"
.string "little brother!$"
-Text_187C9E:: @ 8187C9E
+Route19_Text_LiaPostBattle:: @ 8187C9E
.string "LIA: Do you have a younger\n"
.string "brother?\p"
.string "I hope you're teaching him all\n"
.string "sorts of things.$"
-Text_187CF2:: @ 8187CF2
+Route19_Text_LiaNotEnoughMons:: @ 8187CF2
.string "LIA: I want to battle together\n"
.string "with my little brother.\p"
.string "Don't you have two POKéMON?$"
-Text_187D45:: @ 8187D45
+Route19_Text_LucIntro:: @ 8187D45
.string "LUC: My big sis taught me how\n"
.string "to swim and train POKéMON.$"
-Text_187D7E:: @ 8187D7E
+Route19_Text_LucDefeat:: @ 8187D7E
.string "LUC: Oh, wow!\n"
.string "Someone tougher than my big sis!$"
-Text_187DAD:: @ 8187DAD
+Route19_Text_LucPostBattle:: @ 8187DAD
.string "LUC: My big sis is strong and nice.\n"
.string "I think she's awesome!$"
-Text_187DE8:: @ 8187DE8
+Route19_Text_LucNotEnoughMons:: @ 8187DE8
.string "LUC: I don't want to if I can't\n"
.string "battle you with my big sis.\p"
.string "Don't you have two POKéMON?$"
diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json
index 7a4de5f4f..04f110847 100644
--- a/data/maps/Route20/map.json
+++ b/data/maps/Route20/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route20_EventScript_1AB83F",
+ "script": "Route20_EventScript_Melissa",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route20_EventScript_1AB8F9",
+ "script": "Route20_EventScript_Missy",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route20_EventScript_1AB801",
+ "script": "Route20_EventScript_Nora",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route20_EventScript_1AB8BB",
+ "script": "Route20_EventScript_Roger",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 4,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route20_EventScript_1AB747",
+ "script": "Route20_EventScript_Dean",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route20_EventScript_1AB937",
+ "script": "Route20_EventScript_Irene",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 3,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route20_EventScript_1AB709",
+ "script": "Route20_EventScript_Barry",
"flag": "0"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 3,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route20_EventScript_1AB785",
+ "script": "Route20_EventScript_Darrin",
"flag": "0"
},
{
@@ -140,7 +140,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route20_EventScript_1AB87D",
+ "script": "Route20_EventScript_Shirley",
"flag": "0"
},
{
@@ -153,7 +153,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route20_EventScript_1AB7C3",
+ "script": "Route20_EventScript_Tiffany",
"flag": "0"
},
{
@@ -166,7 +166,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route20_EventScript_1ACE36",
+ "script": "Route20_EventScript_Camper",
"flag": "0"
}
],
@@ -193,14 +193,14 @@
"x": 68,
"y": 14,
"elevation": 0,
- "script": "Route20_EventScript_168280"
+ "script": "Route20_EventScript_SeafoamIslandsSign"
},
{
"type": "bg_event_type_0",
"x": 64,
"y": 8,
"elevation": 0,
- "script": "Route20_EventScript_168280"
+ "script": "Route20_EventScript_SeafoamIslandsSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc
index a034c3610..7ef352f82 100644
--- a/data/maps/Route20/scripts.inc
+++ b/data/maps/Route20/scripts.inc
@@ -3,11 +3,11 @@ Route20_MapScripts:: @ 816823B
.byte 0
Route20_OnTransition:: @ 8168241
- call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, EventScript_168254
- call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, EventScript_16826D
+ call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB3F
+ call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB4F
end
-EventScript_168254:: @ 8168254
+Route20_EventScript_ResetSeafoamBouldersForB3F:: @ 8168254
clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_1
clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_2
setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_1
@@ -18,7 +18,7 @@ EventScript_168254:: @ 8168254
setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2
return
-EventScript_16826D:: @ 816826D
+Route20_EventScript_ResetSeafoamBouldersForB4F:: @ 816826D
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_3
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_4
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_5
@@ -27,6 +27,6 @@ EventScript_16826D:: @ 816826D
setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
return
-Route20_EventScript_168280:: @ 8168280
- msgbox gUnknown_81882D1, MSGBOX_SIGN
+Route20_EventScript_SeafoamIslandsSign:: @ 8168280
+ msgbox Route20_Text_SeafoamIslands, MSGBOX_SIGN
end
diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc
index 3abceaeba..5ca372ef6 100644
--- a/data/maps/Route20/text.inc
+++ b/data/maps/Route20/text.inc
@@ -1,119 +1,119 @@
-Text_187E40:: @ 8187E40
+Route20_Text_BarryIntro:: @ 8187E40
.string "The water is shallow here.\n"
.string "There are many people swimming.$"
-Text_187E7B:: @ 8187E7B
+Route20_Text_BarryDefeat:: @ 8187E7B
.string "Splash!$"
-Text_187E83:: @ 8187E83
+Route20_Text_BarryPostBattle:: @ 8187E83
.string "I wish I could ride my POKéMON.\n"
.string "I bet you're not tired.$"
-Text_187EBB:: @ 8187EBB
+Route20_Text_ShirleyIntro:: @ 8187EBB
.string "SEAFOAM is a quiet getaway.\n"
.string "I'm vacationing here.$"
-Text_187EED:: @ 8187EED
+Route20_Text_ShirleyDefeat:: @ 8187EED
.string "Quit it!$"
-Text_187EF6:: @ 8187EF6
+Route20_Text_ShirleyPostBattle:: @ 8187EF6
.string "There's a huge cavern underneath\n"
.string "this island.$"
-Text_187F24:: @ 8187F24
+Route20_Text_TiffanyIntro:: @ 8187F24
.string "I love floating with the fishes\n"
.string "here among the waves.$"
-Text_187F5A:: @ 8187F5A
+Route20_Text_TiffanyDefeat:: @ 8187F5A
.string "Yowch!$"
-Text_187F61:: @ 8187F61
+Route20_Text_TiffanyPostBattle:: @ 8187F61
.string "Want to float with me?$"
-Text_187F78:: @ 8187F78
+Route20_Text_IreneIntro:: @ 8187F78
.string "Are you on vacation, too?$"
-Text_187F92:: @ 8187F92
+Route20_Text_IreneDefeat:: @ 8187F92
.string "No mercy at all!$"
-Text_187FA3:: @ 8187FA3
+Route20_Text_IrenePostBattle:: @ 8187FA3
.string "SEAFOAM used to be a single island\n"
.string "in the distant past.$"
-Text_187FDB:: @ 8187FDB
+Route20_Text_DeanIntro:: @ 8187FDB
.string "Check out my buff physique!$"
-Text_187FF7:: @ 8187FF7
+Route20_Text_DeanDefeat:: @ 8187FF7
.string "Wimpy!$"
-Text_187FFE:: @ 8187FFE
+Route20_Text_DeanPostBattle:: @ 8187FFE
.string "I should've been buffing up my\n"
.string "POKéMON, not me!$"
-Text_18802E:: @ 818802E
+Route20_Text_DarrinIntro:: @ 818802E
.string "Why are you riding a POKéMON?\n"
.string "Can't you swim?$"
-Text_18805C:: @ 818805C
+Route20_Text_DarrinDefeat:: @ 818805C
.string "Ouch!\n"
.string "Torpedoed!$"
-Text_18806D:: @ 818806D
+Route20_Text_DarrinPostBattle:: @ 818806D
.string "Riding a POKéMON sure looks fun!$"
-Text_18808E:: @ 818808E
+Route20_Text_RogerIntro:: @ 818808E
.string "I rode my bird POKéMON here.$"
-Text_1880AB:: @ 81880AB
+Route20_Text_RogerDefeat:: @ 81880AB
.string "Oh, no!\n"
.string "Now what am I to do?$"
-Text_1880C8:: @ 81880C8
+Route20_Text_RogerPostBattle:: @ 81880C8
.string "My birds are exhausted.\n"
.string "They can't FLY me back!$"
-Text_1880F8:: @ 81880F8
+Route20_Text_NoraIntro:: @ 81880F8
.string "My boyfriend gave me big pearls.$"
-Text_188119:: @ 8188119
+Route20_Text_NoraDefeat:: @ 8188119
.string "Oh, no!\n"
.string "My pearls were in them!$"
-Text_188139:: @ 8188139
+Route20_Text_NoraPostBattle:: @ 8188139
.string "Will my pearls grow bigger inside\n"
.string "CLOYSTER?$"
-Text_188165:: @ 8188165
+Route20_Text_MissyIntro:: @ 8188165
.string "I swam here from CINNABAR ISLAND.\n"
.string "It wasn't easy, I tell you.$"
-Text_1881A3:: @ 81881A3
+Route20_Text_MissyDefeat:: @ 81881A3
.string "I'm so disappointed!$"
-Text_1881B8:: @ 81881B8
+Route20_Text_MissyPostBattle:: @ 81881B8
.string "POKéMON have taken over an\n"
.string "abandoned mansion on CINNABAR.\p"
.string "They call it the POKéMON MANSION\n"
.string "now.$"
-Text_188218:: @ 8188218
+Route20_Text_MelissaIntro:: @ 8188218
.string "CINNABAR, in the west, has a LAB\n"
.string "for POKéMON.\p"
.string "My daddy works there.$"
-Text_18825C:: @ 818825C
+Route20_Text_MelissaDefeat:: @ 818825C
.string "Wait!\n"
.string "You're supposed to wait!$"
-Text_18827B:: @ 818827B
+Route20_Text_MelissaPostBattle:: @ 818827B
.string "CINNABAR is a volcanic island.\p"
.string "I heard it rose out of the sea\n"
.string "when a volcano erupted.$"
-gUnknown_81882D1:: @ 81882D1
+Route20_Text_SeafoamIslands:: @ 81882D1
.string "SEAFOAM ISLANDS$"
-Text_1882E1:: @ 81882E1
+Route20_Text_MistyTrainsHere:: @ 81882E1
.string "Strong TRAINERS and WATER POKéMON\n"
.string "are common sights in these parts.\p"
.string "They say that MISTY of the\n"
diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json
index 556dd9746..05b91c5d3 100644
--- a/data/maps/Route21_North/map.json
+++ b/data/maps/Route21_North/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route21_North_EventScript_1AB975",
+ "script": "Route21_North_EventScript_Ronald",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route21_North_EventScript_1AB9F1",
+ "script": "Route21_North_EventScript_Wade",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 2,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route21_North_EventScript_1ABA6D",
+ "script": "Route21_North_EventScript_Spencer",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route21_North_EventScript_1ABB65",
+ "script": "Route21_North_EventScript_Lil",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "Route21_North_EventScript_1ABBAB",
+ "script": "Route21_North_EventScript_Ian",
"flag": "0"
},
{
diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc
index ad1ec12d3..67b93c175 100644
--- a/data/maps/Route21_North/text.inc
+++ b/data/maps/Route21_North/text.inc
@@ -1,42 +1,49 @@
-Text_18835A:: @ 818835A
+Route21_North_Text_RonaldIntro:: @ 818835A
.string "You want to know if the fish are\n"
.string "biting?$"
-Text_188383:: @ 8188383
+Route21_North_Text_RonaldDefeat:: @ 8188383
.string "Dang!$"
-Text_188389:: @ 8188389
+Route21_North_Text_RonaldPostBattle:: @ 8188389
.string "I can't catch anything good.\n"
.string "Not one good POKéMON to be had!$"
-Text_1883C6:: @ 81883C6
+Route21_North_Text_WadeIntro:: @ 81883C6
.string "I got a big haul!\n"
.string "Wanna go for it?$"
-Text_1883E9:: @ 81883E9
+Route21_North_Text_WadeDefeat:: @ 81883E9
.string "Heheh, MAGIKARP just don't make\n"
.string "the grade, do they?$"
-Text_18841D:: @ 818841D
+Route21_North_Text_WadePostBattle:: @ 818841D
.string "I seem to only catch MAGIKARP!$"
-Text_18843C:: @ 818843C
+Route21_North_Text_SpencerIntro:: @ 818843C
.string "The sea cleanses my body and soul!$"
-Text_18845F:: @ 818845F
+Route21_North_Text_SpencerDefeat:: @ 818845F
.string "Ayah!$"
-Text_188465:: @ 8188465
+Route21_North_Text_SpencerPostBattle:: @ 8188465
.string "The sea is great and all, but I\n"
.string "like the mountains, too.$"
-Text_18849E:: @ 818849E
+@ Below is the battle text for the Cue Ball that was on Route 21 in Gen 1.
+@ This trainer wasnt used in Gen 3 so their text goes unused/untranslated
+@ English translations from RB are listed
+
+@ "What's wrong with me swimming?"
+Route21_North_Text_CueBallIntro:: @ 818849E
.string "おれだって たまには\n"
.string "およぎに くるぜ!$"
-Text_1884B3:: @ 81884B3
+@ "Cheap shot!"
+Route21_North_Text_CueBallDefeat:: @ 81884B3
.string "ぐわわ!$"
-Text_1884B8:: @ 81884B8
+@ "I look like what? A studded inner tube? Get lost!"
+Route21_North_Text_CueBallPostBattle:: @ 81884B8
.string "うきやすそう だと?\n"
.string "うるせー おおきな おせわだッ!$"
diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json
index ef43a429b..8e9398b68 100644
--- a/data/maps/Route21_South/map.json
+++ b/data/maps/Route21_South/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route21_South_EventScript_1AB9B3",
+ "script": "Route21_South_EventScript_Claude",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route21_South_EventScript_1ABA2F",
+ "script": "Route21_South_EventScript_Nolan",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route21_South_EventScript_1ABAAB",
+ "script": "Route21_South_EventScript_Jack",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route21_South_EventScript_1ABAE9",
+ "script": "Route21_South_EventScript_Jerome",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 2,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route21_South_EventScript_1ABB27",
+ "script": "Route21_South_EventScript_Roland",
"flag": "0"
}
],
diff --git a/data/maps/Route21_South/text.inc b/data/maps/Route21_South/text.inc
index 8700006ef..255c1eaed 100644
--- a/data/maps/Route21_South/text.inc
+++ b/data/maps/Route21_South/text.inc
@@ -1,87 +1,87 @@
-Text_1884D4:: @ 81884D4
+Route21_South_Text_JackIntro:: @ 81884D4
.string "I caught my POKéMON at sea.$"
-Text_1884F0:: @ 81884F0
+Route21_South_Text_JackDefeat:: @ 81884F0
.string "Diver!!\n"
.string "Down!!$"
-Text_1884FF:: @ 81884FF
+Route21_South_Text_JackPostBattle:: @ 81884FF
.string "Where'd you catch your POKéMON?$"
-Text_18851F:: @ 818851F
+Route21_South_Text_JeromeIntro:: @ 818851F
.string "Right now, I'm in a triathlon meet.$"
-Text_188543:: @ 8188543
+Route21_South_Text_JeromeDefeat:: @ 8188543
.string "Pant…\n"
.string "Pant… Pant…$"
-Text_188555:: @ 8188555
+Route21_South_Text_JeromePostBattle:: @ 8188555
.string "I'm beat! But, I still have the\n"
.string "bike race and marathon left!$"
-Text_188592:: @ 8188592
+Route21_South_Text_RolandIntro:: @ 8188592
.string "Ahh!\n"
.string "Feel the sun and the wind!$"
-Text_1885B2:: @ 81885B2
+Route21_South_Text_RolandDefeat:: @ 81885B2
.string "Yow!\n"
.string "I lost!$"
-Text_1885BF:: @ 81885BF
+Route21_South_Text_RolandPostBattle:: @ 81885BF
.string "I'm sunburnt to a crisp!$"
-Text_1885D8:: @ 81885D8
+Route21_South_Text_ClaudeIntro:: @ 81885D8
.string "Hey, don't scare away the fish!$"
-Text_1885F8:: @ 81885F8
+Route21_South_Text_ClaudeDefeat:: @ 81885F8
.string "Sorry! I'm just so frustrated from\n"
.string "not catching anything.$"
-Text_188632:: @ 8188632
+Route21_South_Text_ClaudePostBattle:: @ 8188632
.string "Sheesh, I haven't caught a thing.\n"
.string "Could this place actually be a\l"
.string "giant pool or something?$"
-Text_18868C:: @ 818868C
+Route21_South_Text_NolanIntro:: @ 818868C
.string "Keep me company till I get a hit.$"
-Text_1886AE:: @ 81886AE
+Route21_South_Text_NolanDefeat:: @ 81886AE
.string "That burned some time.$"
-Text_1886C5:: @ 81886C5
+Route21_South_Text_NolanPostBattle:: @ 81886C5
.string "Oh wait!\n"
.string "I got a bite! Yeah!$"
-Text_1886E2:: @ 81886E2
+Route21_North_Text_LilIntro:: @ 81886E2
.string "LIL: Huh? A battle?\n"
.string "IAN, can't you do it alone?$"
-Text_188712:: @ 8188712
+Route21_North_Text_LilDefeat:: @ 8188712
.string "LIL: Oh, see?\n"
.string "We lost. Happy now?$"
-Text_188734:: @ 8188734
+Route21_North_Text_LilPostBattle:: @ 8188734
.string "LIL: I'm tired.\n"
.string "Can't we go home already?$"
-Text_18875E:: @ 818875E
+Route21_North_Text_LilNotEnoughMons:: @ 818875E
.string "LIL: Huh? A battle?\n"
.string "I can't be bothered to do it alone.\l"
.string "Bring two POKéMON, won't you?$"
-Text_1887B4:: @ 81887B4
+Route21_North_Text_IanIntro:: @ 81887B4
.string "IAN: My sis doesn't get enough\n"
.string "exercise, so I made her come.$"
-Text_1887F1:: @ 81887F1
+Route21_North_Text_IanDefeat:: @ 81887F1
.string "IAN: Awww, Sis!\n"
.string "Get it together!$"
-Text_188812:: @ 8188812
+Route21_North_Text_IanPostBattle:: @ 8188812
.string "IAN: Come on, Sis!\p"
.string "You're not going to lose weight\n"
.string "like this!$"
-Text_188850:: @ 8188850
+Route21_North_Text_IanNotEnoughMons:: @ 8188850
.string "IAN: We want a two-on-two battle.\n"
.string "So can you bring two POKéMON?$"
diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json
index 29b394c67..a12005d3f 100644
--- a/data/maps/Route24/map.json
+++ b/data/maps/Route24/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route24_EventScript_168620",
+ "script": "Route24_EventScript_Rocket",
"flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A972D",
+ "script": "Route24_EventScript_Ethan",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A9673",
+ "script": "Route24_EventScript_Reli",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A95F7",
+ "script": "Route24_EventScript_Timmy",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A96B1",
+ "script": "Route24_EventScript_Ali",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route24_EventScript_1A9635",
+ "script": "Route24_EventScript_Cale",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
- "script": "Route24_EventScript_1A96EF",
+ "script": "Route24_EventScript_Shane",
"flag": "0"
},
{
@@ -140,7 +140,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE24",
"var_value": 0,
- "script": "Route24_EventScript_168660"
+ "script": "Route24_EventScript_RocketTriggerLeft"
},
{
"type": "trigger",
@@ -149,7 +149,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE24",
"var_value": 0,
- "script": "Route24_EventScript_16866C"
+ "script": "Route24_EventScript_RocketTriggerRight"
}
],
"bg_events": [
diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc
index e30913e52..7a22f64e8 100644
--- a/data/maps/Route24/scripts.inc
+++ b/data/maps/Route24/scripts.inc
@@ -1,103 +1,105 @@
+.equ LOCALID_ROCKET, 1
+
Route24_MapScripts:: @ 816861F
.byte 0
-Route24_EventScript_168620:: @ 8168620
+Route24_EventScript_Rocket:: @ 8168620
lock
faceplayer
compare VAR_MAP_SCENE_ROUTE24, 1
- goto_if_eq EventScript_168656
- msgbox gUnknown_8188C3C
+ goto_if_eq Route24_EventScript_RocketPostBattle
+ msgbox Route24_Text_JustEarnedFabulousPrize
checkitemspace ITEM_NUGGET, 1
compare VAR_RESULT, FALSE
- goto_if_eq EventScript_16864C
- call EventScript_1686B9
+ goto_if_eq Route24_EventScript_NoRoomForNugget
+ call Route24_EventScript_BattleRocket
release
end
-EventScript_16864C:: @ 816864C
- msgbox gUnknown_8188CC2
+Route24_EventScript_NoRoomForNugget:: @ 816864C
+ msgbox Route24_Text_YouDontHaveAnyRoom
release
end
-EventScript_168656:: @ 8168656
- msgbox gUnknown_8188DF1
+Route24_EventScript_RocketPostBattle:: @ 8168656
+ msgbox Route24_Text_YoudBecomeTopRocketLeader
release
end
-Route24_EventScript_168660:: @ 8168660
+Route24_EventScript_RocketTriggerLeft:: @ 8168660
lockall
setvar VAR_TEMP_1, 0
- goto EventScript_168678
+ goto Route24_EventScript_RocketTrigger
end
-Route24_EventScript_16866C:: @ 816866C
+Route24_EventScript_RocketTriggerRight:: @ 816866C
lockall
setvar VAR_TEMP_1, 1
- goto EventScript_168678
+ goto Route24_EventScript_RocketTrigger
end
-EventScript_168678:: @ 8168678
+Route24_EventScript_RocketTrigger:: @ 8168678
textcolor 0
compare VAR_TEMP_1, 0
- call_if_eq EventScript_1686FD
+ call_if_eq Route24_EventScript_RocketApproachPlayer
compare VAR_TEMP_1, 1
- call_if_eq EventScript_168708
+ call_if_eq Route24_EventScript_RocketMotionToPlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox gUnknown_8188C3C
+ msgbox Route24_Text_JustEarnedFabulousPrize
checkitemspace ITEM_NUGGET, 1
- compare VAR_RESULT, 0
- goto_if_eq EventScript_168713
- call EventScript_1686B9
+ compare VAR_RESULT, FALSE
+ goto_if_eq Route24_EventScript_NoRoomForNuggetTrigger
+ call Route24_EventScript_BattleRocket
releaseall
end
-EventScript_1686B9:: @ 81686B9
- giveitem_msg gUnknown_8188C93, ITEM_NUGGET
- message Text_188CDB
+Route24_EventScript_BattleRocket:: @ 81686B9
+ giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET
+ message Route24_Text_JoinTeamRocket
waitmessage
playbgm MUS_ROCKET, 0
waitbuttonpress
- setvar VAR_LAST_TALKED, 1
- trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Text_188DDC
- msgbox gUnknown_8188DF1
+ setvar VAR_LAST_TALKED, LOCALID_ROCKET
+ trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat
+ msgbox Route24_Text_YoudBecomeTopRocketLeader
setvar VAR_MAP_SCENE_ROUTE24, 1
return
-EventScript_1686FD:: @ 81686FD
- applymovement 1, Movement_16873E
+Route24_EventScript_RocketApproachPlayer:: @ 81686FD
+ applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer
waitmovement 0
return
-EventScript_168708:: @ 8168708
- applymovement 1, Movement_WalkInPlaceFastestLeft
+Route24_EventScript_RocketMotionToPlayer:: @ 8168708
+ applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
-EventScript_168713:: @ 8168713
- msgbox gUnknown_8188CC2
+Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713
+ msgbox Route24_Text_YouDontHaveAnyRoom
closemessage
- applymovement OBJ_EVENT_ID_PLAYER, Movement_168743
+ applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown
waitmovement 0
compare VAR_TEMP_1, 0
- call_if_eq EventScript_168733
+ call_if_eq Route24_EventScript_RocketWalkBackToPos
release
end
-EventScript_168733:: @ 8168733
- applymovement 1, Movement_168740
+Route24_EventScript_RocketWalkBackToPos:: @ 8168733
+ applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos
waitmovement 0
return
-Movement_16873E:: @ 816873E
+Route24_Movement_RocketApproachPlayer:: @ 816873E
walk_left
step_end
-Movement_168740:: @ 8168740
+Route24_Movement_RocketWalkBackToPos:: @ 8168740
walk_right
walk_in_place_fastest_left
step_end
-Movement_168743:: @ 8168743
+Route24_Movement_WalkDown:: @ 8168743
walk_down
step_end
diff --git a/data/maps/Route24/text.inc b/data/maps/Route24/text.inc
index 04ef64ea5..7b9d09e6f 100644
--- a/data/maps/Route24/text.inc
+++ b/data/maps/Route24/text.inc
@@ -1,16 +1,16 @@
-gUnknown_8188C3C:: @ 8188C3C
+Route24_Text_JustEarnedFabulousPrize:: @ 8188C3C
.string "Congratulations! You beat our\n"
.string "five contest TRAINERS!\p"
.string "You just earned a fabulous prize!$"
-gUnknown_8188C93:: @ 8188C93
+Route24_Text_ReceivedNuggetFromMysteryTrainer:: @ 8188C93
.string "{PLAYER} received a NUGGET\n"
.string "from the mystery TRAINER!$"
-gUnknown_8188CC2:: @ 8188CC2
+Route24_Text_YouDontHaveAnyRoom:: @ 8188CC2
.string "You don't have any room!$"
-Text_188CDB:: @ 8188CDB
+Route24_Text_JoinTeamRocket:: @ 8188CDB
.string "By the way, how would you like to\n"
.string "join TEAM ROCKET?\p"
.string "We're a group of professional\n"
@@ -23,13 +23,78 @@ Text_188CDB:: @ 8188CDB
.string "I'll make you an offer you can't\n"
.string "refuse!$"
-Text_188DDC:: @ 8188DDC
+Route24_Text_RocketDefeat:: @ 8188DDC
.string "Arrgh!\n"
.string "You are good!$"
-gUnknown_8188DF1:: @ 8188DF1
+Route24_Text_YoudBecomeTopRocketLeader:: @ 8188DF1
.string "With your ability, you'd become\n"
.string "a top leader in TEAM ROCKET.\p"
.string "Come on, think of the opportunity!\n"
.string "Don't let this chance go to waste.$"
+Route24_Text_ShaneIntro:: @ 8188E74
+ .string "I saw your feat from the grass!$"
+
+Route24_Text_ShaneDefeat:: @ 8188E94
+ .string "I thought not!$"
+
+Route24_Text_ShanePostBattle:: @ 8188EA3
+ .string "I hid because the people on the\n"
+ .string "bridge frightened me.$"
+
+Route24_Text_EthanIntro:: @ 8188ED9
+ .string "Okay! I'm No. 5!\n"
+ .string "I'll stomp you!$"
+
+Route24_Text_EthanDefeat:: @ 8188EFA
+ .string "Whoa!\n"
+ .string "Too much!$"
+
+Route24_Text_EthanPostBattle:: @ 8188F0A
+ .string "I did my best. I have no regrets!$"
+
+Route24_Text_ReliIntro:: @ 8188F2C
+ .string "I'm No. 4!\n"
+ .string "Getting tired?$"
+
+Route24_Text_ReliDefeat:: @ 8188F46
+ .string "I lost, too!$"
+
+Route24_Text_ReliPostBattle:: @ 8188F53
+ .string "I did my best, so I've no regrets!$"
+
+Route24_Text_TimmyIntro:: @ 8188F76
+ .string "Here's No. 3!\n"
+ .string "I won't be easy!$"
+
+Route24_Text_TimmyDefeat:: @ 8188F95
+ .string "Ow!\n"
+ .string "Stomped flat!$"
+
+Route24_Text_TimmyPostBattle:: @ 8188FA7
+ .string "I did my best. I have no regrets!$"
+
+Route24_Text_AliIntro:: @ 8188FC9
+ .string "I'm second!\n"
+ .string "Now it's serious!$"
+
+Route24_Text_AliDefeat:: @ 8188FE7
+ .string "How could I lose?$"
+
+Route24_Text_AliPostBattle:: @ 8188FF9
+ .string "I did my best. I have no regrets!$"
+
+Route24_Text_CaleIntro:: @ 818901B
+ .string "People call this the NUGGET\n"
+ .string "BRIDGE!\p"
+ .string "Beat us five TRAINERS and win\n"
+ .string "a fabulous prize!\p"
+ .string "Think you got what it takes?$"
+
+Route24_Text_CaleDefeat:: @ 818908C
+ .string "Whoo!\n"
+ .string "Good stuff!$"
+
+Route24_Text_CalePostBattle:: @ 818909E
+ .string "I did my best. I have no regrets!$"
diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json
index b36fe20cf..eee743a54 100644
--- a/data/maps/Route25/map.json
+++ b/data/maps/Route25/map.json
@@ -31,7 +31,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 4,
- "script": "Route25_EventScript_1A98A1",
+ "script": "Route25_EventScript_Franklin",
"flag": "0"
},
{
@@ -44,7 +44,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A976B",
+ "script": "Route25_EventScript_Joey",
"flag": "0"
},
{
@@ -57,7 +57,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A991D",
+ "script": "Route25_EventScript_Wayne",
"flag": "0"
},
{
@@ -70,7 +70,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A97A9",
+ "script": "Route25_EventScript_Dan",
"flag": "0"
},
{
@@ -83,7 +83,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A9825",
+ "script": "Route25_EventScript_Kelsey",
"flag": "0"
},
{
@@ -96,7 +96,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route25_EventScript_1A98DF",
+ "script": "Route25_EventScript_Nob",
"flag": "0"
},
{
@@ -109,7 +109,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route25_EventScript_1A995B",
+ "script": "Route25_EventScript_Flint",
"flag": "0"
},
{
@@ -122,7 +122,7 @@
"movement_range_y": 3,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
- "script": "Route25_EventScript_1A97E7",
+ "script": "Route25_EventScript_Chad",
"flag": "0"
},
{
@@ -135,7 +135,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
- "script": "Route25_EventScript_1A9863",
+ "script": "Route25_EventScript_Haley",
"flag": "0"
},
{
@@ -174,7 +174,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route25_EventScript_1ACE4F",
+ "script": "Route25_EventScript_Beauty",
"flag": "0"
},
{
@@ -187,7 +187,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route25_EventScript_16874F",
+ "script": "Route25_EventScript_Man",
"flag": "0"
}
],
@@ -207,7 +207,7 @@
"x": 48,
"y": 4,
"elevation": 0,
- "script": "Route25_EventScript_168746"
+ "script": "Route25_EventScript_SeaCottageSign"
},
{
"type": "hidden_item",
diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc
index d214cdbf6..4dc03b3e9 100644
--- a/data/maps/Route25/scripts.inc
+++ b/data/maps/Route25/scripts.inc
@@ -1,10 +1,10 @@
Route25_MapScripts:: @ 8168745
.byte 0
-Route25_EventScript_168746:: @ 8168746
- msgbox gUnknown_818954C, MSGBOX_SIGN
+Route25_EventScript_SeaCottageSign:: @ 8168746
+ msgbox Route25_Text_SeaCottageSign, MSGBOX_SIGN
end
-Route25_EventScript_16874F:: @ 816874F
- msgbox gUnknown_81895C2, MSGBOX_NPC
+Route25_EventScript_Man:: @ 816874F
+ msgbox Route25_Text_AreYouHereAlone, MSGBOX_NPC
end
diff --git a/data/maps/Route25/text.inc b/data/maps/Route25/text.inc
index cdc124108..56bf3df94 100644
--- a/data/maps/Route25/text.inc
+++ b/data/maps/Route25/text.inc
@@ -1,184 +1,118 @@
-Text_188E74:: @ 8188E74
- .string "I saw your feat from the grass!$"
-
-Text_188E94:: @ 8188E94
- .string "I thought not!$"
-
-Text_188EA3:: @ 8188EA3
- .string "I hid because the people on the\n"
- .string "bridge frightened me.$"
-
-Text_188ED9:: @ 8188ED9
- .string "Okay! I'm No. 5!\n"
- .string "I'll stomp you!$"
-
-Text_188EFA:: @ 8188EFA
- .string "Whoa!\n"
- .string "Too much!$"
-
-Text_188F0A:: @ 8188F0A
- .string "I did my best. I have no regrets!$"
-
-Text_188F2C:: @ 8188F2C
- .string "I'm No. 4!\n"
- .string "Getting tired?$"
-
-Text_188F46:: @ 8188F46
- .string "I lost, too!$"
-
-Text_188F53:: @ 8188F53
- .string "I did my best, so I've no regrets!$"
-
-Text_188F76:: @ 8188F76
- .string "Here's No. 3!\n"
- .string "I won't be easy!$"
-
-Text_188F95:: @ 8188F95
- .string "Ow!\n"
- .string "Stomped flat!$"
-
-Text_188FA7:: @ 8188FA7
- .string "I did my best. I have no regrets!$"
-
-Text_188FC9:: @ 8188FC9
- .string "I'm second!\n"
- .string "Now it's serious!$"
-
-Text_188FE7:: @ 8188FE7
- .string "How could I lose?$"
-
-Text_188FF9:: @ 8188FF9
- .string "I did my best. I have no regrets!$"
-
-Text_18901B:: @ 818901B
- .string "People call this the NUGGET\n"
- .string "BRIDGE!\p"
- .string "Beat us five TRAINERS and win\n"
- .string "a fabulous prize!\p"
- .string "Think you got what it takes?$"
-
-Text_18908C:: @ 818908C
- .string "Whoo!\n"
- .string "Good stuff!$"
-
-Text_18909E:: @ 818909E
- .string "I did my best. I have no regrets!$"
-
-Text_1890C0:: @ 81890C0
+Route25_Text_JoeyIntro:: @ 81890C0
.string "Local TRAINERS come here to\n"
.string "practice.$"
-Text_1890E6:: @ 81890E6
+Route25_Text_JoeyDefeat:: @ 81890E6
.string "You're decent.$"
-Text_1890F5:: @ 81890F5
+Route25_Text_JoeyPostBattle:: @ 81890F5
.string "All POKéMON have weaknesses.\n"
.string "Even the strongest ones.\p"
.string "That's why it's best to raise\n"
.string "POKéMON of different types.$"
-Text_189165:: @ 8189165
+Route25_Text_DanIntro:: @ 8189165
.string "Dad took me to a great party on\n"
.string "the S.S. ANNE at VERMILION CITY.$"
-Text_1891A6:: @ 81891A6
+Route25_Text_DanDefeat:: @ 81891A6
.string "I'm not mad!$"
-Text_1891B3:: @ 81891B3
+Route25_Text_DanPostBattle:: @ 81891B3
.string "On the S.S. ANNE, I saw TRAINERS\n"
.string "from around the world.$"
-Text_1891EB:: @ 81891EB
+Route25_Text_FlintIntro:: @ 81891EB
.string "I'm a cool guy.\n"
.string "I've got a girlfriend!$"
-Text_189212:: @ 8189212
+Route25_Text_FlintDefeat:: @ 8189212
.string "Aww, darn…$"
-Text_18921D:: @ 818921D
+Route25_Text_FlintPostBattle:: @ 818921D
.string "Oh, well.\n"
.string "My girlfriend will cheer me up.$"
-Text_189247:: @ 8189247
+Route25_Text_KelseyIntro:: @ 8189247
.string "Hi!\n"
.string "My boyfriend is cool!$"
-Text_189261:: @ 8189261
+Route25_Text_KelseyDefeat:: @ 8189261
.string "My conditioning isn't the best…$"
-Text_189281:: @ 8189281
+Route25_Text_KelseyPostBattle:: @ 8189281
.string "I wish my boyfriend was as good\n"
.string "as you.$"
-Text_1892A9:: @ 81892A9
+Route25_Text_ChadIntro:: @ 81892A9
.string "I had this feeling…\n"
.string "I knew I had to battle you!$"
-Text_1892D9:: @ 81892D9
+Route25_Text_ChadDefeat:: @ 81892D9
.string "I knew I'd lose, too!$"
-Text_1892EF:: @ 81892EF
+Route25_Text_ChadPostBattle:: @ 81892EF
.string "If your POKéMON gets confused,\n"
.string "switch it out.\p"
.string "That's a good tactic.$"
-Text_189333:: @ 8189333
+Route25_Text_HaleyIntro:: @ 8189333
.string "My friend has many cute POKéMON.\n"
.string "I'm so jealous!$"
-Text_189364:: @ 8189364
+Route25_Text_HaleyDefeat:: @ 8189364
.string "I'm not so jealous!$"
-Text_189378:: @ 8189378
+Route25_Text_HaleyPostBattle:: @ 8189378
.string "You came from MT. MOON?\n"
.string "May I have a CLEFAIRY?$"
-Text_1893A7:: @ 81893A7
+Route25_Text_FranklinIntro:: @ 81893A7
.string "I just got down from MT. MOON,\n"
.string "but I've still got gas in the tank!$"
-Text_1893EA:: @ 81893EA
+Route25_Text_FranklinDefeat:: @ 81893EA
.string "You worked hard!$"
-Text_1893FB:: @ 81893FB
+Route25_Text_FranklinPostBattle:: @ 81893FB
.string "Drat!\n"
.string "A ZUBAT bit me back in that cave.$"
-Text_189423:: @ 8189423
+Route25_Text_NobIntro:: @ 8189423
.string "I'm off to see a POKéMANIAC's\n"
.string "collection at the cape.$"
-Text_189459:: @ 8189459
+Route25_Text_NobDefeat:: @ 8189459
.string "You done got me, and real good,\n"
.string "too!$"
-Text_18947E:: @ 818947E
+Route25_Text_NobPostBattle:: @ 818947E
.string "The POKéMANIAC sure lives up to\n"
.string "his name.\p"
.string "His collection includes many rare\n"
.string "species of POKéMON.$"
-Text_1894DE:: @ 81894DE
+Route25_Text_WayneIntro:: @ 81894DE
.string "You're going to see BILL?\n"
.string "First, we battle!$"
-Text_18950A:: @ 818950A
+Route25_Text_WayneDefeat:: @ 818950A
.string "You're something.$"
-Text_18951C:: @ 818951C
+Route25_Text_WaynePostBattle:: @ 818951C
.string "The trail below is a shortcut to\n"
.string "CERULEAN CITY.$"
-gUnknown_818954C:: @ 818954C
+Route25_Text_SeaCottageSign:: @ 818954C
.string "SEA COTTAGE\n"
.string "BILL lives here!$"
-Text_189569:: @ 8189569
+Route25_Text_MistyHighHopesAboutThisPlace:: @ 8189569
.string "This cape is a famous date spot.\p"
.string "MISTY, the GYM LEADER, has high\n"
.string "hopes about this place.$"
-gUnknown_81895C2:: @ 81895C2
+Route25_Text_AreYouHereAlone:: @ 81895C2
.string "Hello, are you here alone?\p"
.string "If you're out at CERULEAN's cape…\n"
.string "Well, it should be as a couple.$"
diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json
index 94327ef65..e8ac1df8d 100644
--- a/data/maps/Route25_SeaCottage/map.json
+++ b/data/maps/Route25_SeaCottage/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route25_SeaCottage_EventScript_17054B",
+ "script": "Route25_SeaCottage_EventScript_Bill",
"flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "Route25_SeaCottage_EventScript_17054B",
+ "script": "Route25_SeaCottage_EventScript_Bill",
"flag": "FLAG_HIDE_BILL_CLEFAIRY"
}
],
@@ -72,7 +72,7 @@
"x": 4,
"y": 5,
"elevation": 0,
- "script": "Route25_SeaCottage_EventScript_1706DD"
+ "script": "Route25_SeaCottage_EventScript_Computer"
}
]
}
diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc
index ed5aca2c8..57c724c29 100644
--- a/data/maps/Route25_SeaCottage/scripts.inc
+++ b/data/maps/Route25_SeaCottage/scripts.inc
@@ -1,143 +1,150 @@
+.equ LOCALID_BILL_HUMAN, 1
+.equ LOCALID_BILL_CLEFAIRY, 2
+
+.equ BILL_IN_TELEPORTER, FLAG_TEMP_2
+.equ RETURN_AFTER_SS_TICKET, FLAG_TEMP_3
+
Route25_SeaCottage_MapScripts:: @ 8170523
map_script MAP_SCRIPT_ON_TRANSITION, Route25_SeaCottage_OnTransition
.byte 0
Route25_SeaCottage_OnTransition:: @ 8170529
- call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17053C
- call_if_set FLAG_GOT_SS_TICKET, EventScript_170547
+ call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_HideClefairyBill
+ call_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket
end
-EventScript_17053C:: @ 817053C
+Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C
clearflag FLAG_HIDE_BILL_CLEFAIRY
- setobjectxyperm 1, 3, 3
+ setobjectxyperm LOCALID_BILL_HUMAN, 3, 3
return
-EventScript_170547:: @ 8170547
- setflag FLAG_TEMP_3
+Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket:: @ 8170547
+ setflag RETURN_AFTER_SS_TICKET
return
-Route25_SeaCottage_EventScript_17054B:: @ 817054B
+Route25_SeaCottage_EventScript_Bill:: @ 817054B
lock
faceplayer
- goto_if_set FLAG_TEMP_3, EventScript_1706C8
- goto_if_set FLAG_GOT_SS_TICKET, EventScript_170640
- goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, EventScript_17064A
+ goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_BillGoLookAtPC
+ goto_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_BillGoToSSAnne
+ goto_if_set FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_BillGiveSSTicket
checkplayergender
compare VAR_RESULT, MALE
- goto_if_eq EventScript_170580
+ goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpMale
compare VAR_RESULT, FEMALE
- goto_if_eq EventScript_17058E
+ goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpFemale
end
-EventScript_170580:: @ 8170580
- msgbox gUnknown_819FDFA, MSGBOX_YESNO
- goto EventScript_17059C
+Route25_SeaCottage_EventScript_BillAskForHelpMale:: @ 8170580
+ msgbox Route25_SeaCottage_Text_ImBillHelpMeOutPal, MSGBOX_YESNO
+ goto Route25_SeaCottage_EventScript_BillAskForHelp
end
-EventScript_17058E:: @ 817058E
- msgbox gUnknown_819FEE6, MSGBOX_YESNO
- goto EventScript_17059C
+Route25_SeaCottage_EventScript_BillAskForHelpFemale:: @ 817058E
+ msgbox Route25_SeaCottage_Text_ImBillHelpMeOutLady, MSGBOX_YESNO
+ goto Route25_SeaCottage_EventScript_BillAskForHelp
end
-EventScript_17059C:: @ 817059C
+Route25_SeaCottage_EventScript_BillAskForHelp:: @ 817059C
compare VAR_RESULT, NO
- call_if_eq EventScript_170600
- msgbox gUnknown_819FFD3
+ call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBill
+ msgbox Route25_SeaCottage_Text_RunCellSeparationOnPC
closemessage
delay 10
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_17062A
+ call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_170635
+ call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_170635
+ call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_170635
+ call_if_eq Route25_SeaCottage_EventScript_BillWalkToTeleporter
opendoor 10, 3
waitdooranim
- applymovement 2, Movement_1706DB
+ applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillEnterTeleporter
waitmovement 0
- removeobject 2
+ removeobject LOCALID_BILL_CLEFAIRY
playse SE_C_MAKU_D
closedoor 10, 3
waitdooranim
- setflag FLAG_TEMP_2
+ setflag BILL_IN_TELEPORTER
release
end
-EventScript_170600:: @ 8170600
+@ Just returns after message, execution continues as if player had said yes
+Route25_SeaCottage_EventScript_DeclineHelpBill:: @ 8170600
checkplayergender
compare VAR_RESULT, MALE
- call_if_eq EventScript_170618
+ call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillMale
compare VAR_RESULT, FEMALE
- call_if_eq EventScript_170621
+ call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillFemale
return
-EventScript_170618:: @ 8170618
- msgbox gUnknown_81A0035
+Route25_SeaCottage_EventScript_DeclineHelpBillMale:: @ 8170618
+ msgbox Route25_SeaCottage_Text_NoPleaseChief
return
-EventScript_170621:: @ 8170621
- msgbox gUnknown_81A00B6
+Route25_SeaCottage_EventScript_DeclineHelpBillFemale:: @ 8170621
+ msgbox Route25_SeaCottage_Text_NoPleaseBeautiful
return
-EventScript_17062A:: @ 817062A
- applymovement 2, Movement_1706D5
+Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth:: @ 817062A
+ applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporterSouth
waitmovement 0
return
-EventScript_170635:: @ 8170635
- applymovement 2, Movement_1706D2
+Route25_SeaCottage_EventScript_BillWalkToTeleporter:: @ 8170635
+ applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporter
waitmovement 0
return
-EventScript_170640:: @ 8170640
- msgbox gUnknown_81A02CF
+Route25_SeaCottage_EventScript_BillGoToSSAnne:: @ 8170640
+ msgbox Route25_SeaCottage_Text_SSAnnePartyYouGoInstead
release
end
-EventScript_17064A:: @ 817064A
+Route25_SeaCottage_EventScript_BillGiveSSTicket:: @ 817064A
famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkplayergender
compare VAR_RESULT, MALE
- call_if_eq EventScript_1706AC
+ call_if_eq Route25_SeaCottage_EventScript_BillThanksMale
compare VAR_RESULT, FEMALE
- call_if_eq EventScript_1706B5
+ call_if_eq Route25_SeaCottage_EventScript_BillThanksFemale
checkitemspace ITEM_SS_TICKET, 1
compare VAR_RESULT, FALSE
- goto_if_eq EventScript_1706BE
- giveitem_msg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5
+ goto_if_eq Route25_SeaCottage_EventScript_NoRoomForSSTicket
+ giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_FAN5
setflag FLAG_GOT_SS_TICKET_DUP
setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET
setflag FLAG_GOT_SS_TICKET
setflag FLAG_SYS_NOT_SOMEONES_PC
- goto EventScript_170640
+ goto Route25_SeaCottage_EventScript_BillGoToSSAnne
end
-EventScript_1706AC:: @ 81706AC
- msgbox gUnknown_81A013B
+Route25_SeaCottage_EventScript_BillThanksMale:: @ 81706AC
+ msgbox Route25_SeaCottage_Text_ThanksBudTakeThis
return
-EventScript_1706B5:: @ 81706B5
- msgbox gUnknown_81A01E4
+Route25_SeaCottage_EventScript_BillThanksFemale:: @ 81706B5
+ msgbox Route25_SeaCottage_Text_ThanksLadyTakeThis
return
-EventScript_1706BE:: @ 81706BE
- msgbox gUnknown_81A02B4
+Route25_SeaCottage_EventScript_NoRoomForSSTicket:: @ 81706BE
+ msgbox Route25_SeaCottage_Text_YouveGotTooMuchStuff
release
end
-EventScript_1706C8:: @ 81706C8
- msgbox gUnknown_81A03AB
+Route25_SeaCottage_EventScript_BillGoLookAtPC:: @ 81706C8
+ msgbox Route25_SeaCottage_Text_CheckOutRareMonsOnPC
release
end
-Movement_1706D2:: @ 81706D2
+Route25_SeaCottage_Movement_BillWalkToTeleporter:: @ 81706D2
walk_up
walk_up
step_end
-Movement_1706D5:: @ 81706D5
+Route25_SeaCottage_Movement_BillWalkToTeleporterSouth:: @ 81706D5
walk_right
walk_up
walk_up
@@ -145,85 +152,85 @@ Movement_1706D5:: @ 81706D5
walk_in_place_fastest_up
step_end
-Movement_1706DB:: @ 81706DB
+Route25_SeaCottage_Movement_BillEnterTeleporter:: @ 81706DB
walk_up
step_end
-Route25_SeaCottage_EventScript_1706DD:: @ 81706DD
+Route25_SeaCottage_EventScript_Computer:: @ 81706DD
lockall
- goto_if_set FLAG_TEMP_3, EventScript_1707CA
- goto_if_set FLAG_TEMP_2, EventScript_1706FA
- msgbox gUnknown_81A0402
+ goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_OpenBillsMonList
+ goto_if_set BILL_IN_TELEPORTER, Route25_SeaCottage_EventScript_RunCellSeparator
+ msgbox Route25_SeaCottage_Text_TeleporterIsDisplayed
releaseall
end
-EventScript_1706FA:: @ 81706FA
+Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA
fadeoutbgm 0
- msgbox gUnknown_81A042D
+ msgbox Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator
closemessage
- clearflag FLAG_TEMP_2
+ clearflag BILL_IN_TELEPORTER
setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE
special SpawnCameraObject
- applymovement OBJ_EVENT_ID_CAMERA, Movement_1707BE
+ applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanToTeleporters
waitmovement 0
delay 35
playse SE_PIN
waitse
setvar VAR_0x8004, 0
- special sub_809C4A8
+ special AnimateTeleporterHousing
delay 10
- call EventScript_1707B6
- call EventScript_1707B6
- call EventScript_1707B6
- call EventScript_1707B6
- call EventScript_1707B6
- call EventScript_1707B6
- call EventScript_1707B6
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
setvar VAR_0x8004, 1
- special sub_809C4A8
+ special AnimateTeleporterHousing
playse SE_TK_WARPIN
- special sub_809C5FC
+ special AnimateTeleporterCable
waitse
- call EventScript_1707B6
- call EventScript_1707B6
- call EventScript_1707B6
- call EventScript_1707B6
- call EventScript_1707B6
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
+ call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE
opendoor 3, 3
waitdooranim
fadeinbgm 0
- addobject 1
+ addobject LOCALID_BILL_HUMAN
clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE
delay 50
playfanfare MUS_FANFA1
- applymovement 1, Movement_170888
+ applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillExitTeleporter
waitmovement 0
waitfanfare
- applymovement OBJ_EVENT_ID_CAMERA, Movement_1707C3
+ applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters
waitmovement 0
playse SE_C_MAKU_D
closedoor 3, 3
waitdooranim
- applymovement 1, Movement_170881
+ applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom
waitmovement 0
special RemoveCameraObject
releaseall
end
-EventScript_1707B6:: @ 81707B6
+Route25_SeaCottage_EventScript_PlayTeleporterBeepSE:: @ 81707B6
playse SE_BOWA
waitse
delay 20
return
-Movement_1707BE:: @ 81707BE
+Route25_SeaCottage_Movement_CameraPanToTeleporters:: @ 81707BE
walk_up
walk_up
walk_right
walk_right
step_end
-Movement_1707C3:: @ 81707C3
+Route25_SeaCottage_Movement_CameraPanBackFromTeleporters:: @ 81707C3
delay_16
delay_16
walk_down
@@ -232,65 +239,65 @@ Movement_1707C3:: @ 81707C3
walk_left
step_end
-EventScript_1707CA:: @ 81707CA
- msgbox gUnknown_81A045B
- goto EventScript_1707D8
+Route25_SeaCottage_EventScript_OpenBillsMonList:: @ 81707CA
+ msgbox Route25_SeaCottage_Text_BillsFavoriteMonList
+ goto Route25_SeaCottage_EventScript_BillsMonList
end
-EventScript_1707D8:: @ 81707D8
- message Text_1A0479
+Route25_SeaCottage_EventScript_BillsMonList:: @ 81707D8
+ message Route25_SeaCottage_Text_SeeWhichMon
waitmessage
multichoice 0, 0, MULTICHOICE_EEVEELUTIONS, FALSE
switch VAR_RESULT
- case 0, EventScript_17082B
- case 1, EventScript_170840
- case 2, EventScript_170855
- case 3, EventScript_17086A
- case 4, EventScript_17087F
- case 127, EventScript_17087F
+ case 0, Route25_SeaCottage_EventScript_ViewEevee
+ case 1, Route25_SeaCottage_EventScript_ViewFlareon
+ case 2, Route25_SeaCottage_EventScript_ViewJolteon
+ case 3, Route25_SeaCottage_EventScript_ViewVaporeon
+ case 4, Route25_SeaCottage_EventScript_ExitBillsMonList
+ case 127, Route25_SeaCottage_EventScript_ExitBillsMonList
end
-EventScript_17082B:: @ 817082B
+Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B
drawmonpic SPECIES_EEVEE, 10, 3
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_EEVEE
special Special_SetSeenMon
- goto EventScript_1707D8
+ goto Route25_SeaCottage_EventScript_BillsMonList
end
-EventScript_170840:: @ 8170840
+Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840
drawmonpic SPECIES_FLAREON, 10, 3
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_FLAREON
special Special_SetSeenMon
- goto EventScript_1707D8
+ goto Route25_SeaCottage_EventScript_BillsMonList
end
-EventScript_170855:: @ 8170855
+Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855
drawmonpic SPECIES_JOLTEON, 10, 3
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_JOLTEON
special Special_SetSeenMon
- goto EventScript_1707D8
+ goto Route25_SeaCottage_EventScript_BillsMonList
end
-EventScript_17086A:: @ 817086A
+Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A
drawmonpic SPECIES_VAPOREON, 10, 3
waitbuttonpress
erasemonpic
setvar VAR_0x8004, SPECIES_VAPOREON
special Special_SetSeenMon
- goto EventScript_1707D8
+ goto Route25_SeaCottage_EventScript_BillsMonList
end
-EventScript_17087F:: @ 817087F
+Route25_SeaCottage_EventScript_ExitBillsMonList:: @ 817087F
releaseall
end
-Movement_170881:: @ 8170881
+Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom:: @ 8170881
walk_right
walk_right
walk_right
@@ -299,6 +306,6 @@ Movement_170881:: @ 8170881
walk_down
step_end
-Movement_170888:: @ 8170888
+Route25_SeaCottage_Movement_BillExitTeleporter:: @ 8170888
walk_down
step_end
diff --git a/data/maps/Route25_SeaCottage/text.inc b/data/maps/Route25_SeaCottage/text.inc
index 6ecacdd89..9fd189426 100644
--- a/data/maps/Route25_SeaCottage/text.inc
+++ b/data/maps/Route25_SeaCottage/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819FDFA:: @ 819FDFA
+Route25_SeaCottage_Text_ImBillHelpMeOutPal:: @ 819FDFA
.string "Hiya! I'm a POKéMON…\n"
.string "…No I'm not!\p"
.string "Call me BILL!\n"
@@ -11,7 +11,7 @@ gUnknown_819FDFA:: @ 819FDFA
.string "So, how about it?\n"
.string "Help me out here!$"
-gUnknown_819FEE6:: @ 819FEE6
+Route25_SeaCottage_Text_ImBillHelpMeOutLady:: @ 819FEE6
.string "Hiya! I'm a POKéMON…\n"
.string "…No I'm not!\p"
.string "Call me BILL!\n"
@@ -24,13 +24,13 @@ gUnknown_819FEE6:: @ 819FEE6
.string "So, how about it?\n"
.string "Help me out here!$"
-gUnknown_819FFD3:: @ 819FFD3
+Route25_SeaCottage_Text_RunCellSeparationOnPC:: @ 819FFD3
.string "Wait till I get inside the\n"
.string "TELEPORTER.\p"
.string "When I do, go to my PC and run\n"
.string "the Cell Separation System.$"
-gUnknown_81A0035:: @ 81A0035
+Route25_SeaCottage_Text_NoPleaseChief:: @ 81A0035
.string "No!?\n"
.string "Now don't be so cold!\p"
.string "Come on, you gotta help a guy in\n"
@@ -40,7 +40,7 @@ gUnknown_81A0035:: @ 81A0035
.string "Okay?\l"
.string "All right!$"
-gUnknown_81A00B6:: @ 81A00B6
+Route25_SeaCottage_Text_NoPleaseBeautiful:: @ 81A00B6
.string "No!?\n"
.string "Now don't be so cold!\p"
.string "Come on, you gotta help a guy in\n"
@@ -50,7 +50,7 @@ gUnknown_81A00B6:: @ 81A00B6
.string "Okay?\l"
.string "All right!$"
-gUnknown_81A013B:: @ 81A013B
+Route25_SeaCottage_Text_ThanksBudTakeThis:: @ 81A013B
.string "BILL: Yeehah!\n"
.string "Thanks, bud! I owe you one!\p"
.string "So, did you come to see my\n"
@@ -60,7 +60,7 @@ gUnknown_81A013B:: @ 81A013B
.string "I've got to thank you…\n"
.string "Oh, here, maybe this'll do.$"
-gUnknown_81A01E4:: @ 81A01E4
+Route25_SeaCottage_Text_ThanksLadyTakeThis:: @ 81A01E4
.string "BILL: Yeehah!\n"
.string "Thanks, lady! I owe you one!\p"
.string "So, did you come to see my\n"
@@ -70,14 +70,14 @@ gUnknown_81A01E4:: @ 81A01E4
.string "I've got to thank you…\n"
.string "Oh, here, maybe this'll do.$"
-gUnknown_81A028E:: @ 81A028E
+Route25_SeaCottage_Text_ReceivedSSTicketFromBill:: @ 81A028E
.string "{PLAYER} received an S.S. TICKET\n"
.string "from BILL.$"
-gUnknown_81A02B4:: @ 81A02B4
+Route25_SeaCottage_Text_YouveGotTooMuchStuff:: @ 81A02B4
.string "You've got too much stuff!$"
-gUnknown_81A02CF:: @ 81A02CF
+Route25_SeaCottage_Text_SSAnnePartyYouGoInstead:: @ 81A02CF
.string "That cruise ship S.S. ANNE is in\n"
.string "VERMILION CITY.\p"
.string "I hear there are lots of TRAINERS\n"
@@ -87,22 +87,22 @@ gUnknown_81A02CF:: @ 81A02CF
.string "Why don't you go instead of me?\n"
.string "Go on and have a good time.$"
-gUnknown_81A03AB:: @ 81A03AB
+Route25_SeaCottage_Text_CheckOutRareMonsOnPC:: @ 81A03AB
.string "BILL: Feel like checking out some\n"
.string "of my rare POKéMON on my PC?\p"
.string "Go on, check out my PC.$"
-gUnknown_81A0402:: @ 81A0402
+Route25_SeaCottage_Text_TeleporterIsDisplayed:: @ 81A0402
.string "TELEPORTER is displayed on the PC\n"
.string "monitor.$"
-gUnknown_81A042D:: @ 81A042D
+Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator:: @ 81A042D
.string "{PLAYER} initiated the TELEPORTER's\n"
.string "Cell Separator.$"
-gUnknown_81A045B:: @ 81A045B
+Route25_SeaCottage_Text_BillsFavoriteMonList:: @ 81A045B
.string "BILL's favorite POKéMON list!$"
-Text_1A0479:: @ 81A0479
+Route25_SeaCottage_Text_SeeWhichMon:: @ 81A0479
.string "Which POKéMON do you want to see?$"