summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-25 01:19:17 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-02-25 01:19:28 -0500
commit52da723afb01a8d175604ea317c054cf44f44a70 (patch)
treeb9d44cc2ba5d5d49a8378ae6b4f32e06007de20b /data/maps
parent3b558edc7906b2a75b7d65aa396c611ce1802e62 (diff)
Document Routes 20-21, 24-25 scripts
Diffstat (limited to 'data/maps')
-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.inc54
-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.inc217
-rw-r--r--data/maps/Route25_SeaCottage/text.inc30
16 files changed, 386 insertions, 373 deletions
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..e21bf114c 100644
--- a/data/maps/Route24/scripts.inc
+++ b/data/maps/Route24/scripts.inc
@@ -1,42 +1,42 @@
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_ReceiveNugget
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
@@ -44,28 +44,28 @@ EventScript_168678:: @ 8168678
call_if_eq EventScript_168708
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
- msgbox gUnknown_8188C3C
+ msgbox Route24_Text_JustEarnedFabulousPrize
checkitemspace ITEM_NUGGET, 1
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq EventScript_168713
- call EventScript_1686B9
+ call Route24_EventScript_ReceiveNugget
releaseall
end
-EventScript_1686B9:: @ 81686B9
- giveitem_msg gUnknown_8188C93, ITEM_NUGGET
- message Text_188CDB
+Route24_EventScript_ReceiveNugget:: @ 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
+ 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
+ applymovement 1, Route24_Movement_WalkLeft
waitmovement 0
return
@@ -75,9 +75,9 @@ EventScript_168708:: @ 8168708
return
EventScript_168713:: @ 8168713
- msgbox gUnknown_8188CC2
+ 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
@@ -89,7 +89,7 @@ EventScript_168733:: @ 8168733
waitmovement 0
return
-Movement_16873E:: @ 816873E
+Route24_Movement_WalkLeft:: @ 816873E
walk_left
step_end
@@ -98,6 +98,6 @@ Movement_168740:: @ 8168740
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..8bfa00a21 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_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_HideClefairyBill
call_if_set FLAG_GOT_SS_TICKET, EventScript_170547
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
+ 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,26 +152,26 @@ 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
@@ -172,58 +179,58 @@ EventScript_1706FA:: @ 81706FA
setvar VAR_0x8004, 0
special sub_809C4A8
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
playse SE_TK_WARPIN
special sub_809C5FC
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?$"