From 4f5b250efa0baa0045ea1dc88688ac73543c4671 Mon Sep 17 00:00:00 2001 From: Robin Xyifer Date: Sun, 23 Mar 2025 23:14:52 -0500 Subject: [PATCH] PetalburgCity internal maps names parity update. --- .../maps/RustboroCity_CuttersHouse/text.inc | 6 +- .../maps/RustboroCity_DevonCorp_1F/text.inc | 16 +-- .../maps/RustboroCity_DevonCorp_2F/text.inc | 28 ++--- .../maps/RustboroCity_DevonCorp_3F/text.inc | 28 ++--- data-de/maps/RustboroCity_Flat1_1F/text.inc | 4 +- data-de/maps/RustboroCity_Flat1_2F/text.inc | 2 +- data-de/maps/RustboroCity_Flat2_1F/text.inc | 4 +- data-de/maps/RustboroCity_Flat2_2F/text.inc | 6 +- data-de/maps/RustboroCity_Flat2_3F/text.inc | 4 +- data-de/maps/RustboroCity_Gym/text.inc | 32 +++--- data-de/maps/RustboroCity_House1/text.inc | 12 +- data-de/maps/RustboroCity_House2/text.inc | 4 +- data-de/maps/RustboroCity_House3/text.inc | 6 +- data-de/maps/RustboroCity_Mart/text.inc | 6 +- .../RustboroCity_PokemonCenter_1F/text.inc | 6 +- .../maps/RustboroCity_PokemonSchool/text.inc | 30 ++--- data/maps/RustboroCity_CuttersHouse/map.json | 4 +- .../RustboroCity_CuttersHouse/scripts.inc | 16 +-- data/maps/RustboroCity_CuttersHouse/text.inc | 6 +- data/maps/RustboroCity_DevonCorp_1F/map.json | 6 +- .../RustboroCity_DevonCorp_1F/scripts.inc | 60 +++++----- data/maps/RustboroCity_DevonCorp_1F/text.inc | 16 +-- data/maps/RustboroCity_DevonCorp_2F/map.json | 10 +- .../RustboroCity_DevonCorp_2F/scripts.inc | 106 +++++++++--------- data/maps/RustboroCity_DevonCorp_2F/text.inc | 28 ++--- data/maps/RustboroCity_DevonCorp_3F/map.json | 10 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 94 ++++++++-------- data/maps/RustboroCity_DevonCorp_3F/text.inc | 28 ++--- data/maps/RustboroCity_Flat1_1F/map.json | 4 +- data/maps/RustboroCity_Flat1_1F/scripts.inc | 8 +- data/maps/RustboroCity_Flat1_1F/text.inc | 4 +- data/maps/RustboroCity_Flat1_2F/map.json | 2 +- data/maps/RustboroCity_Flat1_2F/scripts.inc | 4 +- data/maps/RustboroCity_Flat1_2F/text.inc | 2 +- data/maps/RustboroCity_Flat2_1F/map.json | 4 +- data/maps/RustboroCity_Flat2_1F/scripts.inc | 8 +- data/maps/RustboroCity_Flat2_1F/text.inc | 4 +- data/maps/RustboroCity_Flat2_2F/map.json | 4 +- data/maps/RustboroCity_Flat2_2F/scripts.inc | 14 +-- data/maps/RustboroCity_Flat2_2F/text.inc | 6 +- data/maps/RustboroCity_Flat2_3F/map.json | 4 +- data/maps/RustboroCity_Flat2_3F/scripts.inc | 8 +- data/maps/RustboroCity_Flat2_3F/text.inc | 4 +- data/maps/RustboroCity_Gym/map.json | 12 +- data/maps/RustboroCity_Gym/scripts.inc | 64 +++++------ data/maps/RustboroCity_Gym/text.inc | 32 +++--- data/maps/RustboroCity_House1/map.json | 4 +- data/maps/RustboroCity_House1/scripts.inc | 30 ++--- data/maps/RustboroCity_House1/text.inc | 12 +- data/maps/RustboroCity_House2/map.json | 4 +- data/maps/RustboroCity_House2/scripts.inc | 8 +- data/maps/RustboroCity_House2/text.inc | 4 +- data/maps/RustboroCity_House3/map.json | 6 +- data/maps/RustboroCity_House3/scripts.inc | 12 +- data/maps/RustboroCity_House3/text.inc | 6 +- data/maps/RustboroCity_Mart/map.json | 8 +- data/maps/RustboroCity_Mart/scripts.inc | 30 ++--- data/maps/RustboroCity_Mart/text.inc | 6 +- .../RustboroCity_PokemonCenter_1F/map.json | 8 +- .../RustboroCity_PokemonCenter_1F/scripts.inc | 18 +-- .../RustboroCity_PokemonCenter_1F/text.inc | 6 +- data/maps/RustboroCity_PokemonSchool/map.json | 22 ++-- .../RustboroCity_PokemonSchool/scripts.inc | 106 +++++++++--------- data/maps/RustboroCity_PokemonSchool/text.inc | 30 ++--- include/constants/flags.h | 2 +- 65 files changed, 544 insertions(+), 544 deletions(-) diff --git a/data-de/maps/RustboroCity_CuttersHouse/text.inc b/data-de/maps/RustboroCity_CuttersHouse/text.inc index 7e8448070..8227096df 100644 --- a/data-de/maps/RustboroCity_CuttersHouse/text.inc +++ b/data-de/maps/RustboroCity_CuttersHouse/text.inc @@ -1,4 +1,4 @@ -RustboroCity_CuttersHouse_Text_18509C:: @ 818509C +RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse:: @ 818509C .string "Diese Entschlossenheit...\n" .string "Deine Beweglichkeit...\l" .string "Deine Hingabe für POKéMON...\p" @@ -11,7 +11,7 @@ RustboroCity_CuttersHouse_Text_18509C:: @ 818509C .string "Kein Grund, so schüchtern zu sein.\n" .string "Hier, nimm sie!$" -RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 +RustboroCity_CuttersHouse_Text_ExplainCut:: @ 81851C9 .string "Diese VM, sie enthält ZERSCHNEIDER.\p" .string "Eine VM ist eine Attacke, die auch\n" .string "außerhalb des Kampfes von einem\l" @@ -23,7 +23,7 @@ RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 .string "Und, im Gegensatz zur TM, kann eine VM\n" .string "mehrfach gelehrt werden.$" -RustboroCity_CuttersHouse_Text_1852B3:: @ 81852B3 +RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees:: @ 81852B3 .string "Als sie die Stadt METAROST CITY\n" .string "vergrößert haben, hat mein Vater ihnen\l" .string "geholfen.\p" diff --git a/data-de/maps/RustboroCity_DevonCorp_1F/text.inc b/data-de/maps/RustboroCity_DevonCorp_1F/text.inc index c7b4b4028..7555c5e32 100644 --- a/data-de/maps/RustboroCity_DevonCorp_1F/text.inc +++ b/data-de/maps/RustboroCity_DevonCorp_1F/text.inc @@ -1,23 +1,23 @@ -RustboroCity_DevonCorp_1F_Text_1828EE:: @ 81828EE +RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp:: @ 81828EE .string "Hallo und Willkommen in der\n" .string "DEVON CORPORATION.\p" .string "Wir sind die stolzen Entwickler von\n" .string "Medizin und Items, die das Leben\l" .string "bereichern.$" -RustboroCity_DevonCorp_1F_Text_18295E:: @ 818295E +RustboroCity_DevonCorp_1F_Text_StaffGotRobbed:: @ 818295E .string "Einem Mitglied unseres Forschungsteams\n" .string "ist blöderweise ein wichtiges Paket\l" .string "gestohlen worden.$" -RustboroCity_DevonCorp_1F_Text_1829A4:: @ 81829A4 +RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct:: @ 81829A4 .string "Hey, diese TURBOTRETER!\n" .string "Die haben wir auch entwickelt!\p" .string "Ich freue mich immer, wenn ich jemanden\n" .string "treffe, der eines unserer Produkte\l" .string "benutzt.$" -RustboroCity_DevonCorp_1F_Text_182A19:: @ 8182A19 +RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright:: @ 8182A19 .string "Das gestohlene Paket...\p" .string "Nun, es ist natürlich sehr wichtig, aber\n" .string "mit dem Inhalt kann niemand etwas\l" @@ -25,18 +25,18 @@ RustboroCity_DevonCorp_1F_Text_182A19:: @ 8182A19 .string "Meiner Einschätzung nach ist der Dieb\n" .string "wirklich nicht sehr schlau gewesen...$" -RustboroCity_DevonCorp_1F_Text_182AB3:: @ 8182AB3 +RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered:: @ 8182AB3 .string "Klingt, als hätten wir die gestohlenen\n" .string "DEVON-WAREN zurückerhalten.$" -RustboroCity_DevonCorp_1F_Text_182AF0:: @ 8182AF0 +RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter:: @ 8182AF0 .string "Tut mir Leid, aber nur autorisierte\n" .string "Personen haben hier Zutritt.$" -RustboroCity_DevonCorp_1F_Text_182B2D:: @ 8182B2D +RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed:: @ 8182B2D .string "Das ist mehr als blöd.\n" .string "Wie konnten wir nur ausgeraubt werden?$" -RustboroCity_DevonCorp_1F_Text_182B5A:: @ 8182B5A +RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere:: @ 8182B5A .string "Hi, du da!\n" .string "Du bist hier jederzeit willkommen!$" diff --git a/data-de/maps/RustboroCity_DevonCorp_2F/text.inc b/data-de/maps/RustboroCity_DevonCorp_2F/text.inc index 3e672ab46..3e29edcb7 100644 --- a/data-de/maps/RustboroCity_DevonCorp_2F/text.inc +++ b/data-de/maps/RustboroCity_DevonCorp_2F/text.inc @@ -1,16 +1,16 @@ -RustboroCity_DevonCorp_2F_Text_182B81:: @ 8182B81 +RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon:: @ 8182B81 .string "Wir wollen ein Gerät entwickeln, mit dem\n" .string "wir mit POKéMON reden können.\p" .string "Aber bisher waren wir nicht sehr\n" .string "erfolgreich...$" -RustboroCity_DevonCorp_2F_Text_182BD8:: @ 8182BD8 +RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls:: @ 8182BD8 .string "Ich entwickle neue Arten von\n" .string "POKéBÄLLEN...\p" .string "Aber noch bin ich nicht sonderlich weit\n" .string "mit der Entwicklung gekommen...$" -RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 +RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls:: @ 8182C25 .string "Wir haben endlich neue POKéBÄLLE\n" .string "entwickelt!\p" .string "Mit dem WIEDERBALL lassen sich\n" @@ -23,13 +23,13 @@ RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 .string "DEVON CORPORATION präsentiert.\p" .string "Probiere sie bitte unbedingt aus!$" -RustboroCity_DevonCorp_2F_Text_182D2A:: @ 8182D2A +RustboroCity_DevonCorp_2F_Text_IMadePokenav:: @ 8182D2A .string "Ich habe den POKéNAV entwickelt!\p" .string "Als Ingenieur erfüllt es mich mit Stolz,\n" .string "so etwas Großartiges entwickelt zu\l" .string "haben.$" -RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E +RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav:: @ 8182D7E .string "Oh, wow!\n" .string "Das ist ein POKéNAV!\p" .string "Er ist das Resultat der Wissbegierde\n" @@ -40,19 +40,19 @@ RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E .string "Ach was, du findest sie schon ganz\n" .string "alleine heraus.$" -RustboroCity_DevonCorp_2F_Text_182E6B:: @ 8182E6B +RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams:: @ 8182E6B .string "Ich arbeite an einer Vorrichtung, die\n" .string "die Träume der POKéMON visualisieren\l" .string "kann...\p" .string "Aber so richtig geht es nicht voran.$" -RustboroCity_DevonCorp_2F_Text_182ED5:: @ 8182ED5 +RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils:: @ 8182ED5 .string "Ich arbeite an einer Vorrichtung, die\n" .string "POKéMON aus Fossilien wieder zum Leben\l" .string "erweckt.\p" .string "Und... Es klappt!!!$" -RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 +RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife:: @ 8182F35 .string "Warte! Das Teil dort...\n" .string "Ist das ein POKéMON-Fossil?\p" .string "Möchtest du das POKéMON wieder zum\n" @@ -61,19 +61,19 @@ RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 .string "wicklung, dem FOSSIL-REGENERATOR,\l" .string "dabei helfen.$" -RustboroCity_DevonCorp_2F_Text_182FD7:: @ 8182FD7 +RustboroCity_DevonCorp_2F_Text_OhIsThatSo:: @ 8182FD7 .string "Ehrlich?\p" .string "DEVON besitzt einen hervorragenden\n" .string "Ruf in Sachen Technik. \l" .string "Das versichere ich dir!$" -RustboroCity_DevonCorp_2F_Text_183023:: @ 8183023 +RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher:: @ 8183023 .string "Exzellent!\n" .string "Dann lass uns sofort zur Tat schreiten.\p" .string "{PLAYER} gibt dem FORSCHER von DEVON\n" .string "{STR_VAR_1}.$" -RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 +RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime:: @ 8183072 .string "Der FOSSIL-REGENERATOR, den ich ent-\n" .string "wickelt habe, ist einfach unglaublich.\p" .string "Aber einen Nachteil gibt es: Es dauert\n" @@ -82,17 +82,17 @@ RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 .string "Also, äh... Warum schaust du dich in der\n" .string "Zeit nicht ein wenig um?$" -RustboroCity_DevonCorp_2F_Text_183124:: @ 8183124 +RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife:: @ 8183124 .string "Danke für deine Geduld!\p" .string "Dein fossiles POKéMON wurde zu neuem\n" .string "Leben erweckt!\p" .string "Das Fossil war ein altertümliches\n" .string "POKéMON. Ein {STR_VAR_2}!$" -RustboroCity_DevonCorp_2F_Text_18319E:: @ 818319E +RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher:: @ 818319E .string "{PLAYER} erhält das {STR_VAR_2} vom\n" .string "FORSCHER von DEVON.$" -RustboroCity_DevonCorp_2F_Text_1831C8:: @ 81831C8 +RustboroCity_DevonCorp_2F_Text_TooManyPokemon:: @ 81831C8 .string "Oh oh, du hast zu viele POKéMON bei dir.\n" .string "Du hast keinen Platz für dieses hier.$" diff --git a/data-de/maps/RustboroCity_DevonCorp_3F/text.inc b/data-de/maps/RustboroCity_DevonCorp_3F/text.inc index 01bca10d4..22a68c360 100644 --- a/data-de/maps/RustboroCity_DevonCorp_3F/text.inc +++ b/data-de/maps/RustboroCity_DevonCorp_3F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B +RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor:: @ 818320B .string "Ich bin MR. TRUMM, der PRÄSIDENT der\n" .string "DEVON CORPORATION.\p" .string "Ich muss etwas mit dir besprechen!\p" @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B .string "Und TROY in FAUSTAUHAVEN einen BRIEF\n" .string "von mir überbringen?$" -RustboroCity_DevonCorp_3F_Text_18337E:: @ 818337E +RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis:: @ 818337E .string "MR. TRUMM: Nun, du sollst wissen, dass\n" .string "ich ein einflussreicher PRÄSIDENT bin.\p" .string "Und daher würde ich dich nie um einen\n" @@ -23,10 +23,10 @@ RustboroCity_DevonCorp_3F_Text_18337E:: @ 818337E .string "Gegenleistung zu erbringen!\p" .string "Deshalb möchte ich dir dies hier geben.$" -RustboroCity_DevonCorp_3F_Text_183422:: @ 8183422 +RustboroCity_DevonCorp_3F_Text_ReceivedPokenav:: @ 8183422 .string "{PLAYER} erhält den POKéNAV.$" -RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 +RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenav:: @ 8183439 .string "MR. TRUMM: Dieses Gerät...\p" .string "Es ist ein POKéMON NAVIGATOR - oder\n" .string "kurz ein POKéNAV.\p" @@ -37,16 +37,16 @@ RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 .string "wo die Orte FAUSTAUHAVEN und\l" .string "GRAPHITPORT CITY liegen.$" -RustboroCity_DevonCorp_3F_Text_18351E:: @ 818351E +RustboroCity_DevonCorp_3F_Text_CountingOnYou:: @ 818351E .string "MR. TRUMM: Ich verlasse mich auf dich!$" -RustboroCity_DevonCorp_3F_Text_18353E:: @ 818353E +RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter:: @ 818353E .string "MR. TRUMM: Du hast meinen BRIEF\n" .string "überbracht? Herzlichen Dank!\p" .string "Dies ist ein Dankeschön von mir.\n" .string "Es wird dir als TRAINER sicher helfen.$" -RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 +RustboroCity_DevonCorp_3F_Text_ExplainExpShare:: @ 81835B3 .string "MR. TRUMM: Trägt ein POKéMON den EP-\n" .string "TEILER, so erhält es in jedem Kampf\l" .string "Erfahrungspunkte.\p" @@ -56,7 +56,7 @@ RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 .string "nützlich, um schwache POKéMON aufzu-\l" .string "ziehen.$" -RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D +RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends:: @ 818368D .string "MR. TRUMM: Schon in meiner Jugend habe\n" .string "ich mich voll auf die Arbeit\l" .string "konzentriert.\p" @@ -65,7 +65,7 @@ RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D .string "Wollen alle jungen Leute TRAINER in der\n" .string "POKéMON LIGA werden?$" -RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C +RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere:: @ 818374C .string "Dies ist die zweite Etage der DEVON\n" .string "CORPORATION.\p" .string "Hier befindet sich das BÜRO des\n" @@ -83,24 +83,24 @@ RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C .string "Ach, da fällt mir ein... Würdest du mich\n" .string "einen Moment entschuldigen?$" -RustboroCity_DevonCorp_3F_Text_183903:: @ 8183903 +RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe:: @ 8183903 .string "Unser PRÄSIDENT würde gerne kurz mit\n" .string "dir sprechen.\p" .string "Komm bitte mit mir.$" -RustboroCity_DevonCorp_3F_Text_18394A:: @ 818394A +RustboroCity_DevonCorp_3F_Text_PleaseGoAhead:: @ 818394A .string "Bitte, hier entlang.$" -RustboroCity_DevonCorp_3F_Text_18395C:: @ 818395C +RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard:: @ 818395C .string "Wenn du die WERFT in GRAPHITPORT CITY\n" .string "besuchst, solltest du mit KAPT. BRIGG\l" .string "sprechen.$" -RustboroCity_DevonCorp_3F_Text_1839A3:: @ 81839A3 +RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular:: @ 81839A3 .string "DEVONS neue Produkte, der WIEDERBALL\n" .string "und der TIMERBALL, sind mittlerweile\l" .string "sehr populär unter den TRAINERN.$" -RustboroCity_DevonCorp_3F_Text_183A04:: @ 8183A04 +RustboroCity_DevonCorp_3F_Text_RareRocksDisplay:: @ 8183A04 .string "Eine Kollektion seltener Steine und\n" .string "Mineralien - gesammelt vom PRÄSIDENTEN.$" diff --git a/data-de/maps/RustboroCity_Flat1_1F/text.inc b/data-de/maps/RustboroCity_Flat1_1F/text.inc index 44a6d8800..38881a2e8 100644 --- a/data-de/maps/RustboroCity_Flat1_1F/text.inc +++ b/data-de/maps/RustboroCity_Flat1_1F/text.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat1_1F_Text_184DB4:: @ 8184DB4 +RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility:: @ 8184DB4 .string "Jedes POKéMON besitzt eine spezielle\n" .string "Begabung, die es einsetzen kann.$" -RustboroCity_Flat1_1F_Text_184DE9:: @ 8184DE9 +RustboroCity_Flat1_1F_Text_PokemonStrange:: @ 8184DE9 .string "POKéMON sind sehr seltsame Geschöpfe.$" diff --git a/data-de/maps/RustboroCity_Flat1_2F/text.inc b/data-de/maps/RustboroCity_Flat1_2F/text.inc index d744b8484..cbec502fc 100644 --- a/data-de/maps/RustboroCity_Flat1_2F/text.inc +++ b/data-de/maps/RustboroCity_Flat1_2F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_Flat1_2F_Text_184E0D:: @ 8184E0D +RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard:: @ 8184E0D .string "Oh, jeden Tag wird es schwerer...\p" .string "Was so schwer ist?\n" .string "Das fragst du noch?\p" diff --git a/data-de/maps/RustboroCity_Flat2_1F/text.inc b/data-de/maps/RustboroCity_Flat2_1F/text.inc index d6cb53734..d112b0c70 100644 --- a/data-de/maps/RustboroCity_Flat2_1F/text.inc +++ b/data-de/maps/RustboroCity_Flat2_1F/text.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat2_1F_Text_1853DD:: @ 81853DD +RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere:: @ 81853DD .string "Die Angestellten der DEVON CORPORATION\n" .string "leben in diesem Haus.$" -RustboroCity_Flat2_1F_Text_185410:: @ 8185410 +RustboroCity_Flat2_1F_Text_Skitty:: @ 8185410 .string "ENECO: Gyaaaah!$" diff --git a/data-de/maps/RustboroCity_Flat2_2F/text.inc b/data-de/maps/RustboroCity_Flat2_2F/text.inc index 13d9b9f93..1974599ee 100644 --- a/data-de/maps/RustboroCity_Flat2_2F/text.inc +++ b/data-de/maps/RustboroCity_Flat2_2F/text.inc @@ -1,14 +1,14 @@ -RustboroCity_Flat2_2F_Text_185421:: @ 8185421 +RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays:: @ 8185421 .string "Vor langer, langer Zeit war DEVON eine\n" .string "kleine, überschaubare Firma.$" -RustboroCity_Flat2_2F_Text_185461:: @ 8185461 +RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt:: @ 8185461 .string "Mein Papa arbeitet für die CORPORATION.\p" .string "Mein Papa hat dies gemacht! Ich kann\n" .string "damit aber nichts anfangen, daher\l" .string "schenke ich es dir.$" -RustboroCity_Flat2_2F_Text_1854C4:: @ 81854C4 +RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo:: @ 81854C4 .string "Mein Papa arbeitet für die CORPORATION.\p" .string "Wenn ich groß bin, werde ich auch für\n" .string "DEVON arbeiten.$" diff --git a/data-de/maps/RustboroCity_Flat2_3F/text.inc b/data-de/maps/RustboroCity_Flat2_3F/text.inc index 3bb2affc0..bffc01907 100644 --- a/data-de/maps/RustboroCity_Flat2_3F/text.inc +++ b/data-de/maps/RustboroCity_Flat2_3F/text.inc @@ -1,7 +1,7 @@ -RustboroCity_Flat2_3F_Text_18551D:: @ 818551D +RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones:: @ 818551D .string "Der PRÄSIDENT von DEVON sammelt\n" .string "leidenschaftlich gerne seltene Steine.$" -RustboroCity_Flat2_3F_Text_18554D:: @ 818554D +RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones:: @ 818554D .string "Ich glaube, der Sohn des PRÄSIDENTEN\n" .string "sammelt auch seltene Steine.$" diff --git a/data-de/maps/RustboroCity_Gym/text.inc b/data-de/maps/RustboroCity_Gym/text.inc index d5c514fd8..885db4867 100644 --- a/data-de/maps/RustboroCity_Gym/text.inc +++ b/data-de/maps/RustboroCity_Gym/text.inc @@ -1,4 +1,4 @@ -RustboroCity_Gym_Text_183A4B:: @ 8183A4B +RustboroCity_Gym_Text_GymGuideAdvice:: @ 8183A4B .string "Hi, wie geht's?\p" .string "Hör zu, mein Freund!\n" .string "Würdest du gerne CHAMP werden?\p" @@ -23,7 +23,7 @@ RustboroCity_Gym_Text_183A4B:: @ 8183A4B .string "LEITERIN besiegt hast.\p" .string "Nun zeig, was du drauf hast!$" -RustboroCity_Gym_Text_183C90:: @ 8183C90 +RustboroCity_Gym_Text_GymGuidePostVictory:: @ 8183C90 .string "Hui! Was für ein atemberaubender Sieg!\n" .string "Meine Zurufe müssen gewirkt haben!\p" .string "Großartig!\n" @@ -35,31 +35,31 @@ RustboroCity_Gym_Text_183C90:: @ 8183C90 .string "hinter dir!\p" .string "Ein großartiges Gefühl!$" -RustboroCity_Gym_Text_183D99:: @ 8183D99 +RustboroCity_Gym_Text_JoshIntro:: @ 8183D99 .string "Unterschätze die TRAINER einer ARENA\n" .string "nicht! Ich zeige dir, warum wir die\l" .string "Besten sind!$" -RustboroCity_Gym_Text_183DDD:: @ 8183DDD +RustboroCity_Gym_Text_JoshDefeat:: @ 8183DDD .string "Du warst viel zu gut für mich...$" -RustboroCity_Gym_Text_183DF9:: @ 8183DF9 +RustboroCity_Gym_Text_JoshPostBattle:: @ 8183DF9 .string "Du hast noch gar nicht gesehen, was\n" .string "GESTEINS-POKéMON alles können.$" -RustboroCity_Gym_Text_183E38:: @ 8183E38 +RustboroCity_Gym_Text_TommyIntro:: @ 8183E38 .string "Wenn du mich nicht besiegen kannst,\n" .string "hast du keine Chance gegen FELIZIA.$" -RustboroCity_Gym_Text_183E78:: @ 8183E78 +RustboroCity_Gym_Text_TommyDefeat:: @ 8183E78 .string "Wow! Du hast wirklich Talent!$" -RustboroCity_Gym_Text_183E98:: @ 8183E98 +RustboroCity_Gym_Text_TommyPostBattle:: @ 8183E98 .string "FELIZIA ist um ein Vielfaches stärker\n" .string "als ich.\p" .string "Du solltest dich besser wappnen!$" -RustboroCity_Gym_Text_183EE5:: @ 8183EE5 +RustboroCity_Gym_Text_RoxanneIntro:: @ 8183EE5 .string "Hallo, ich bin FELIZIA, die LEITERIN der\n" .string "ARENA von METAROST CITY.\p" .string "Ich wurde ARENALEITERIN, um mein\n" @@ -68,7 +68,7 @@ RustboroCity_Gym_Text_183EE5:: @ 8183EE5 .string "Würdest du mir bitte zeigen, wie du\n" .string "kämpfst und mit welchen POKéMON?$" -RustboroCity_Gym_Text_183FC4:: @ 8183FC4 +RustboroCity_Gym_Text_RoxanneDefeat:: @ 8183FC4 .string "So...\n" .string "Ich habe verloren...\p" .string "Es scheint, ich muss noch eine ganze\n" @@ -80,11 +80,11 @@ RustboroCity_Gym_Text_183FC4:: @ 8183FC4 .string "Bitte nimm den offiziellen POKéMON LIGA\n" .string "STEINORDEN an!$" -RustboroCity_Gym_Text_1840AB:: @ 81840AB +RustboroCity_Gym_Text_ReceivedStoneBadge:: @ 81840AB .string "{PLAYER} hat den STEINORDEN von\n" .string "FELIZIA erhalten.$" -RustboroCity_Gym_Text_1840D5:: @ 81840D5 +RustboroCity_Gym_Text_StoneBadgeInfoTakeThis:: @ 81840D5 .string "Der STEINORDEN erhöht die Kraft der\n" .string "ATTACKEN deiner POKéMON.\p" .string "Außerdem sind sie nun in der Lage, die\n" @@ -92,7 +92,7 @@ RustboroCity_Gym_Text_1840D5:: @ 81840D5 .string "Kampfes einzusetzen.\p" .string "Dies möchte ich dir auch noch geben.$" -RustboroCity_Gym_Text_184170:: @ 8184170 +RustboroCity_Gym_Text_ExplainRockTomb:: @ 8184170 .string "Diese TM39 enthält FELSGRAB.\p" .string "Sie richtet nicht nur durch das Fallen\n" .string "von Steinen Schaden an, sondern\l" @@ -103,16 +103,16 @@ RustboroCity_Gym_Text_184170:: @ 8184170 .string "einmal beigebracht werden kann. Ihr\l" .string "Einsatz will also überlegt sein.$" -RustboroCity_Gym_Text_184252:: @ 8184252 +RustboroCity_Gym_Text_RoxannePostBattle:: @ 8184252 .string "Da du so stark bist, solltest du auch die\n" .string "anderen ARENALEITER herausfordern.\p" .string "Du lernst wertvolle Dinge dazu, wenn du\n" .string "gegen viele TRAINER antrittst.$" -RustboroCity_Gym_Text_1842CC:: @ 81842CC +RustboroCity_Gym_Text_GymStatue:: @ 81842CC .string "POKéMON ARENA von METAROST CITY$" -RustboroCity_Gym_Text_1842E6:: @ 81842E6 +RustboroCity_Gym_Text_GymStatueCertified:: @ 81842E6 .string "POKéMON ARENA von METAROST CITY\p" .string "FELIZIAS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/RustboroCity_House1/text.inc b/data-de/maps/RustboroCity_House1/text.inc index e47e4a727..c8f00b0c7 100644 --- a/data-de/maps/RustboroCity_House1/text.inc +++ b/data-de/maps/RustboroCity_House1/text.inc @@ -1,4 +1,4 @@ -RustboroCity_House1_Text_184EBA:: @ 8184EBA +RustboroCity_House1_Text_IllTradeIfYouWant:: @ 8184EBA .string "Gibst du deinen POKéMON Kosenamen?\n" .string "Ich habe meinem einen coolen Namen\l" .string "gegeben.\p" @@ -7,21 +7,21 @@ RustboroCity_House1_Text_184EBA:: @ 8184EBA .string "Hast du Lust, dein {STR_VAR_1} gegen\n" .string "mein {STR_VAR_2} zu tauschen?$" -RustboroCity_House1_Text_184F6B:: @ 8184F6B +RustboroCity_House1_Text_PleaseBeGoodToMyPokemon:: @ 8184F6B .string "Hihihihihi, oooh, ist das aufregend!$" -RustboroCity_House1_Text_184F8F:: @ 8184F8F +RustboroCity_House1_Text_ThatIsNoMon:: @ 8184F8F .string "Aber das ist kein {STR_VAR_1}.\n" .string "Tse, wie enttäuschend.$" -RustboroCity_House1_Text_184FC1:: @ 8184FC1 +RustboroCity_House1_Text_AwwItsAGoodMon:: @ 8184FC1 .string "Ooh, das ist ein gutes POKéMON...$" -RustboroCity_House1_Text_184FDD:: @ 8184FDD +RustboroCity_House1_Text_WontYouGetCurious:: @ 8184FDD .string "Willst du nicht wissen, wie andere\n" .string "Leute ihre POKéMON nennen?$" -RustboroCity_House1_Text_185020:: @ 8185020 +RustboroCity_House1_Text_AllSortsOfPlaces:: @ 8185020 .string "An allen Orten gibt es alle Sorten von\n" .string "POKéMON und Menschen.\p" .string "Ich finde das faszinierend, daher\n" diff --git a/data-de/maps/RustboroCity_House2/text.inc b/data-de/maps/RustboroCity_House2/text.inc index 2d9e4ab4d..42fca9903 100644 --- a/data-de/maps/RustboroCity_House2/text.inc +++ b/data-de/maps/RustboroCity_House2/text.inc @@ -1,9 +1,9 @@ -RustboroCity_House2_Text_18532D:: @ 818532D +RustboroCity_House2_Text_TrainerSchoolExcellent:: @ 818532D .string "Die TRAINERSCHULE ist hervorragend.\p" .string "Wenn du dort lernst, kannst du später\n" .string "sogar ARENALEITER werden.$" -RustboroCity_House2_Text_185388:: @ 8185388 +RustboroCity_House2_Text_RoxanneKnowsALot:: @ 8185388 .string "FELIZIA, die ARENALEITERIN, weiß\n" .string "wirklich eine Menge über POKéMON.\p" .string "Und sie ist sehr stark!$" diff --git a/data-de/maps/RustboroCity_House3/text.inc b/data-de/maps/RustboroCity_House3/text.inc index 1da0876d9..2221a4986 100644 --- a/data-de/maps/RustboroCity_House3/text.inc +++ b/data-de/maps/RustboroCity_House3/text.inc @@ -1,10 +1,10 @@ -RustboroCity_House3_Text_185584:: @ 8185584 +RustboroCity_House3_Text_IGivePerfectlySuitedNicknames:: @ 8185584 .string "Meinen eigenen POKéMON habe ich\n" .string "perfekt passende Kosenamen gegeben!\p" .string "Das ist mein Ausdruck von... äh...\n" .string "Originalität. Genau! Originalität!$" -RustboroCity_House3_Text_1855FA:: @ 81855FA +RustboroCity_House3_Text_NamingPikachuPekachu:: @ 81855FA .string "Aber ein PIKACHU einfach PEKACHU zu\n" .string "nennen? Das haut einen nicht gerade\l" .string "vom Hocker.\p" @@ -12,5 +12,5 @@ RustboroCity_House3_Text_1855FA:: @ 81855FA .string "leicht verständlichen Kosenamen wählen,\l" .string "aber irgendwie...$" -RustboroCity_House3_Text_18567D:: @ 818567D +RustboroCity_House3_Text_Pekachu:: @ 818567D .string "PEKACHU: Peka!$" diff --git a/data-de/maps/RustboroCity_Mart/text.inc b/data-de/maps/RustboroCity_Mart/text.inc index 5288402dc..b07c910d1 100644 --- a/data-de/maps/RustboroCity_Mart/text.inc +++ b/data-de/maps/RustboroCity_Mart/text.inc @@ -1,17 +1,17 @@ -RustboroCity_Mart_Text_184C76:: @ 8184C76 +RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish:: @ 8184C76 .string "Ich habe einige PARA-HEILER und\n" .string "etwas GEGENGIFT gekauft.\p" .string "Nur für den Fall, dass mir ein\n" .string "KNILZ im BLÜTENBURGWALD\l" .string "über den Weg läuft.$" -RustboroCity_Mart_Text_184CD8:: @ 8184CD8 +RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead:: @ 8184CD8 .string "Mein POKéMON hat sich entwickelt.\n" .string "Es hat jetzt sehr viele KP.\p" .string "Ich sollte nun einige SUPERTRÄNKE\n" .string "anstelle der normalen TRÄNKE kaufen.$" -RustboroCity_Mart_Text_184D43:: @ 8184D43 +RustboroCity_Mart_Text_GettingEscapeRopeJustInCase:: @ 8184D43 .string "Ich habe ein FLUCHTSEIL besorgt, falls\n" .string "ich mich mal in einer Höhle verlaufe.\p" .string "Damit kann ich zurück zum Eingang der\n" diff --git a/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc b/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc index 8c73d883e..f4b424237 100644 --- a/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37 +RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities:: @ 8184B37 .string "Mein POKéMON hat ein NAIVES\n" .string "Wesen und das meines Freundes ein\l" .string "FRÖHLICHES.\p" @@ -6,12 +6,12 @@ RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37 .string "unterschiedliche Persönlichkeiten\l" .string "haben.$" -RustboroCity_PokemonCenter_1F_Text_184BAB:: @ 8184BAB +RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon:: @ 8184BAB .string "Es gibt männliche und weibliche POKéMON.\p" .string "Aber niemand kann sagen, worin der\n" .string "eigentliche Unterschied liegt.$" -RustboroCity_PokemonCenter_1F_Text_184C19:: @ 8184C19 +RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor:: @ 8184C19 .string "Der Mann nebenan hat mir eine VM\n" .string "gegeben!\p" .string "Ich habe meinem POKéMON beigebracht,\n" diff --git a/data-de/maps/RustboroCity_PokemonSchool/text.inc b/data-de/maps/RustboroCity_PokemonSchool/text.inc index 9e477deaa..209a82c24 100644 --- a/data-de/maps/RustboroCity_PokemonSchool/text.inc +++ b/data-de/maps/RustboroCity_PokemonSchool/text.inc @@ -1,11 +1,11 @@ -RustboroCity_PokemonSchool_Text_184321:: @ 8184321 +RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges:: @ 8184321 .string "Auf der Tafel sind die Statusverände-\n" .string "rungen von POKéMON aufgelistet.$" -RustboroCity_PokemonSchool_Text_184368:: @ 8184368 +RustboroCity_PokemonSchool_Text_ReadWhichTopic:: @ 8184368 .string "Welches Thema möchtest du lesen?$" -RustboroCity_PokemonSchool_Text_184389:: @ 8184389 +RustboroCity_PokemonSchool_Text_ExplainPoison:: @ 8184389 .string "Wenn ein POKéMON vergiftet wurde, wird\n" .string "es ständig KP verlieren.\p" .string "Die Auswirkungen des Giftes halten\n" @@ -15,7 +15,7 @@ RustboroCity_PokemonSchool_Text_184389:: @ 8184389 .string "Mit einem GEGENGIFT kann das POKéMON\n" .string "geheilt werden.$" -RustboroCity_PokemonSchool_Text_184447:: @ 8184447 +RustboroCity_PokemonSchool_Text_ExplainParalysis:: @ 8184447 .string "Wurde ein POKéMON paralysiert, sinkt\n" .string "seine INITIATIVE.\p" .string "Es kann passieren, dass es während des\n" @@ -23,7 +23,7 @@ RustboroCity_PokemonSchool_Text_184447:: @ 8184447 .string "Die Paralyse hält auch nach dem Kampf\n" .string "an. Heile das POKéMON mit PARA-HEILER.$" -RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC +RustboroCity_PokemonSchool_Text_ExplainSleep:: @ 81844EC .string "Wenn ein POKéMON einschläft, kann es\n" .string "nicht mehr angreifen.\p" .string "Das POKéMON wird vielleicht von selber\n" @@ -31,25 +31,25 @@ RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC .string "und es noch schläft, schläft es weiter.\p" .string "Wecke es mit AUFWECKER auf.$" -RustboroCity_PokemonSchool_Text_1845A5:: @ 81845A5 +RustboroCity_PokemonSchool_Text_ExplainBurn:: @ 81845A5 .string "Eine Verbrennung senkt die Kraft des\n" .string "ANGRIFFS. Die KP nehmen ständig ab.\p" .string "Eine Verbrennung hält auch nach dem\n" .string "Kampf an. Setze FEUERHEILER ein!$" -RustboroCity_PokemonSchool_Text_184627:: @ 8184627 +RustboroCity_PokemonSchool_Text_ExplainFreeze:: @ 8184627 .string "Wurde ein POKéMON eingefroren, so ist\n" .string "es völlig hilflos.\p" .string "Auch nach dem Kampf hält der Zustand\n" .string "an. Setze dann EISHEILER ein.$" -RustboroCity_PokemonSchool_Text_1846A2:: @ 81846A2 +RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw:: @ 81846A2 .string "Schüler, die nicht aufpassen, bekommen\n" .string "meine FLINKKLAUE zu spüren.\p" .string "Wie du dieses Item einsetzt, zeigt,\n" .string "ob du ein guter Schüler bist oder nicht.$" -RustboroCity_PokemonSchool_Text_184737:: @ 8184737 +RustboroCity_PokemonSchool_Text_ExplainQuickClaw:: @ 8184737 .string "Ein POKéMON, das die FLINKKLAUE trägt,\n" .string "steigert seine Schnelligkeit und greift\l" .string "eventuell schneller an als sein Gegner.\p" @@ -57,21 +57,21 @@ RustboroCity_PokemonSchool_Text_184737:: @ 8184737 .string "einem POKéMON getragen werden können.\p" .string "Du kannst also noch viel lernen.$" -RustboroCity_PokemonSchool_Text_18480E:: @ 818480E +RustboroCity_PokemonSchool_Text_TradingRightNow:: @ 818480E .string "Ich tausche gerade mit meinem Freund\n" .string "POKéMON.$" -RustboroCity_PokemonSchool_Text_18483C:: @ 818483C +RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot:: @ 818483C .string "Ich wollte schon immer ein SAMURZEL\n" .string "haben - und endlich habe ich eines!$" -RustboroCity_PokemonSchool_Text_184873:: @ 8184873 +RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems:: @ 8184873 .string "POKéMON können Items tragen, aber sie\n" .string "wissen nicht, was sie mit Items von\l" .string "Menschen wie TRANK oder GEGENGIFT\l" .string "machen sollen.$" -RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 +RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself:: @ 81848D8 .string "Weißt du, wie man mit einigen POKéMON-\n" .string "Attacken ein POKéMON verwirren kann?\p" .string "Ein verwirrtes POKéMON wird manchmal\n" @@ -79,7 +79,7 @@ RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 .string "Aber sobald es aus dem Kampf genommen\n" .string "wird, ist es wieder normal.$" -RustboroCity_PokemonSchool_Text_184988:: @ 8184988 +RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry:: @ 8184988 .string "Ein POKéMON, das eine BEERE trägt, wird\n" .string "sich selber heilen...\p" .string "Es gibt viele Items, die ein POKéMON\n" @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_Text_184988:: @ 8184988 .string "Junge, Junge, ist das alles schwer\n" .string "zu merken...$" -RustboroCity_PokemonSchool_Text_184A17:: @ 8184A17 +RustboroCity_PokemonSchool_Text_StudentsNotes:: @ 8184A17 .string "Das ist das Heft eines Schülers...\p" .string "POKéMON werden mit POKéBÄLLEN\n" .string "gefangen.\p" diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index d36aa2fff..6c6ddb3da 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_CuttersHouse_EventScript_157D27", + "script": "RustboroCity_CuttersHouse_EventScript_Cutter", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_CuttersHouse_EventScript_157D5D", + "script": "RustboroCity_CuttersHouse_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index 21f797dab..7e8539333 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -1,22 +1,22 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 .byte 0 -RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 +RustboroCity_CuttersHouse_EventScript_Cutter:: @ 8157D27 lock faceplayer - goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53 - msgbox RustboroCity_CuttersHouse_Text_18509C, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_ExplainCut + msgbox RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse, MSGBOX_DEFAULT giveitem ITEM_HM01_CUT setflag FLAG_RECEIVED_HM01 - msgbox RustboroCity_CuttersHouse_Text_1851C9, MSGBOX_DEFAULT + msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT release end -RustboroCity_CuttersHouse_EventScript_157D53:: @ 8157D53 - msgbox RustboroCity_CuttersHouse_Text_1851C9, MSGBOX_DEFAULT +RustboroCity_CuttersHouse_EventScript_ExplainCut:: @ 8157D53 + msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT release end -RustboroCity_CuttersHouse_EventScript_157D5D:: @ 8157D5D - msgbox RustboroCity_CuttersHouse_Text_1852B3, MSGBOX_NPC +RustboroCity_CuttersHouse_EventScript_Lass:: @ 8157D5D + msgbox RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_CuttersHouse/text.inc b/data/maps/RustboroCity_CuttersHouse/text.inc index 83841e60f..ee673aef3 100644 --- a/data/maps/RustboroCity_CuttersHouse/text.inc +++ b/data/maps/RustboroCity_CuttersHouse/text.inc @@ -1,4 +1,4 @@ -RustboroCity_CuttersHouse_Text_18509C:: @ 818509C +RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse:: @ 818509C .string "That determined expression...\n" .string "That limber way you move...\l" .string "And your well-trained POKéMON...\p" @@ -10,7 +10,7 @@ RustboroCity_CuttersHouse_Text_18509C:: @ 818509C .string "No need to be modest or shy.\n" .string "Go on, take it!$" -RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 +RustboroCity_CuttersHouse_Text_ExplainCut:: @ 81851C9 .string "That HM, it's CUT.\p" .string "An HM move is one that can be used\n" .string "by POKéMON out of a battle.\p" @@ -20,7 +20,7 @@ RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 .string "And, unlike a TM, an HM doesn't break\n" .string "after one use.$" -RustboroCity_CuttersHouse_Text_1852B3:: @ 81852B3 +RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees:: @ 81852B3 .string "When they were expanding the city of\n" .string "RUSTBORO, my dad helped out.\p" .string "He made his POKéMON use CUT to clear\n" diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index bd5fa23d1..e98ca0f0f 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_1F_EventScript_157422", + "script": "RustboroCity_DevonCorp_1F_EventScript_Employee", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_1F_EventScript_157454", + "script": "RustboroCity_DevonCorp_1F_EventScript_StairGuard", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_1F_EventScript_15748F", + "script": "RustboroCity_DevonCorp_1F_EventScript_Greeter", "flag": "0" } ], diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 36712d5f7..346bb04d9 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -1,71 +1,71 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_15740C + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_OnTransition .byte 0 -RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C - call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157416 +RustboroCity_DevonCorp_1F_OnTransition:: @ 815740C + call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_BlockStairs end -RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 +RustboroCity_DevonCorp_1F_EventScript_BlockStairs:: @ 8157416 setobjectxyperm 2, 14, 2 setobjectmovementtype 2, 8 return -RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 +RustboroCity_DevonCorp_1F_EventScript_Employee:: @ 8157422 lock faceplayer - goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15744A - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157440 - msgbox RustboroCity_DevonCorp_1F_Text_1829A4, MSGBOX_DEFAULT + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright + msgbox RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_157440:: @ 8157440 - msgbox RustboroCity_DevonCorp_1F_Text_182A19, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright:: @ 8157440 + msgbox RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A - msgbox RustboroCity_DevonCorp_1F_Text_182AB3, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered:: @ 815744A + msgbox RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 +RustboroCity_DevonCorp_1F_EventScript_StairGuard:: @ 8157454 lock faceplayer - goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15747B - goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157485 - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157485 - msgbox RustboroCity_DevonCorp_1F_Text_182AF0, MSGBOX_DEFAULT + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GotRobbed + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_GotRobbed + msgbox RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_15747B:: @ 815747B - msgbox RustboroCity_DevonCorp_1F_Text_182B5A, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome:: @ 815747B + msgbox RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 - msgbox RustboroCity_DevonCorp_1F_Text_182B2D, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_GotRobbed:: @ 8157485 + msgbox RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F +RustboroCity_DevonCorp_1F_EventScript_Greeter:: @ 815748F lock faceplayer - goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574B6 - goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574C0 - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_1574C0 - msgbox RustboroCity_DevonCorp_1F_Text_1828EE, MSGBOX_DEFAULT + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed + msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_1574B6:: @ 81574B6 - msgbox RustboroCity_DevonCorp_1F_Text_1828EE, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp:: @ 81574B6 + msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_1574C0:: @ 81574C0 - msgbox RustboroCity_DevonCorp_1F_Text_18295E, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed:: @ 81574C0 + msgbox RustboroCity_DevonCorp_1F_Text_StaffGotRobbed, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_1F/text.inc b/data/maps/RustboroCity_DevonCorp_1F/text.inc index 006024633..6e175847a 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/text.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/text.inc @@ -1,38 +1,38 @@ -RustboroCity_DevonCorp_1F_Text_1828EE:: @ 81828EE +RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp:: @ 81828EE .string "Hello and welcome to the DEVON\n" .string "CORPORATION.\p" .string "We're proud producers of items and\n" .string "medicine that enhance your life.$" -RustboroCity_DevonCorp_1F_Text_18295E:: @ 818295E +RustboroCity_DevonCorp_1F_Text_StaffGotRobbed:: @ 818295E .string "One of our research staff stupidly\n" .string "got robbed of an important parcel.$" -RustboroCity_DevonCorp_1F_Text_1829A4:: @ 81829A4 +RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct:: @ 81829A4 .string "Hey, those RUNNING SHOES!\n" .string "They're one of our products!\p" .string "It makes me happy when I see someone\n" .string "using something we made.$" -RustboroCity_DevonCorp_1F_Text_182A19:: @ 8182A19 +RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright:: @ 8182A19 .string "That stolen parcel...\p" .string "Well, sure it's important, but it's not\n" .string "anything that anyone can use.\p" .string "In my estimation, that robber must not\n" .string "have been very bright.$" -RustboroCity_DevonCorp_1F_Text_182AB3:: @ 8182AB3 +RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered:: @ 8182AB3 .string "It sounds like they've recovered\n" .string "the ripped-off DEVON GOODS.$" -RustboroCity_DevonCorp_1F_Text_182AF0:: @ 8182AF0 +RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter:: @ 8182AF0 .string "I'm sorry, only authorized people\n" .string "are allowed to enter here.$" -RustboroCity_DevonCorp_1F_Text_182B2D:: @ 8182B2D +RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed:: @ 8182B2D .string "It's beyond stupid.\n" .string "How could we get robbed?$" -RustboroCity_DevonCorp_1F_Text_182B5A:: @ 8182B5A +RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere:: @ 8182B5A .string "Hi, there!\n" .string "You're always welcome here!$" diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index d31a1181c..028db3565 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_1574E2", + "script": "RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_1574F9", + "script": "RustboroCity_DevonCorp_2F_EventScript_BallScientist", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_157523", + "script": "RustboroCity_DevonCorp_2F_EventScript_PokenavScientist", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 10, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_15754D", + "script": "RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_157564", + "script": "RustboroCity_DevonCorp_2F_EventScript_FossilScientist", "flag": "0" } ], diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 9467b5015..be2154e04 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -1,145 +1,145 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_1574D0 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_OnTransition .byte 0 -RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 +RustboroCity_DevonCorp_2F_OnTransition:: @ 81574D0 compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady end -RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC +RustboroCity_DevonCorp_2F_EventScript_SetFossilReady:: @ 81574DC setvar VAR_FOSSIL_RESURRECTION_STATE, 2 return -RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 +RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist:: @ 81574E2 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC - msgbox RustboroCity_DevonCorp_2F_Text_182B81, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + msgbox RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 +RustboroCity_DevonCorp_2F_EventScript_BallScientist:: @ 81574F9 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC - goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519 - msgbox RustboroCity_DevonCorp_2F_Text_182BD8, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls + msgbox RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 - msgbox RustboroCity_DevonCorp_2F_Text_182C25, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls:: @ 8157519 + msgbox RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 +RustboroCity_DevonCorp_2F_EventScript_PokenavScientist:: @ 8157523 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC - goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543 - msgbox RustboroCity_DevonCorp_2F_Text_182D2A, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_HasPokenav + msgbox RustboroCity_DevonCorp_2F_Text_IMadePokenav, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 - msgbox RustboroCity_DevonCorp_2F_Text_182D7E, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_HasPokenav:: @ 8157543 + msgbox RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D +RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist:: @ 815754D lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC - msgbox RustboroCity_DevonCorp_2F_Text_182E6B, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + msgbox RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 +RustboroCity_DevonCorp_2F_EventScript_FossilScientist:: @ 8157564 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 2 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FossilMonReady compare VAR_FOSSIL_RESURRECTION_STATE, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 - msgbox RustboroCity_DevonCorp_2F_Text_182ED5, MSGBOX_DEFAULT + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_StillRegenerating + msgbox RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil release end -RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 +RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: @ 81575A6 closemessage playse SE_PIN applymovement 5, Common_Movement_ExclamationMark waitmovement 0 applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil bufferitemname 0, ITEM_ROOT_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_183023, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT removeitem ITEM_ROOT_FOSSIL setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 1 release end -RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE +RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil:: @ 81575EE closemessage playse SE_PIN applymovement 5, Common_Movement_ExclamationMark waitmovement 0 applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil bufferitemname 0, ITEM_CLAW_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_183023, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT removeitem ITEM_CLAW_FOSSIL setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 2 release end -RustboroCity_DevonCorp_2F_EventScript_157636:: @ 8157636 - msgbox RustboroCity_DevonCorp_2F_Text_182FD7, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil:: @ 8157636 + msgbox RustboroCity_DevonCorp_2F_Text_OhIsThatSo, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 - msgbox RustboroCity_DevonCorp_2F_Text_183072, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_StillRegenerating:: @ 8157640 + msgbox RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A +RustboroCity_DevonCorp_2F_EventScript_FossilMonReady:: @ 815764A compare VAR_WHICH_FOSSIL_REVIVED, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_LileepReady compare VAR_WHICH_FOSSIL_REVIVED, 2 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_AnorithReady end -RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 +RustboroCity_DevonCorp_2F_EventScript_LileepReady:: @ 8157661 bufferspeciesname 1, SPECIES_LILEEP - msgbox RustboroCity_DevonCorp_2F_Text_183124, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT getpartysize compare VAR_RESULT, 6 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TooManyPokemon copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare MUS_OBTAIN_ITEM - message RustboroCity_DevonCorp_2F_Text_18319E + message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitfanfare waitmessage givemon SPECIES_LILEEP, 20, ITEM_NONE @@ -149,17 +149,17 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 release end -RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 +RustboroCity_DevonCorp_2F_EventScript_AnorithReady:: @ 81576B4 bufferspeciesname 1, SPECIES_ANORITH - msgbox RustboroCity_DevonCorp_2F_Text_183124, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT getpartysize compare VAR_RESULT, 6 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TooManyPokemon copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare MUS_OBTAIN_ITEM - message RustboroCity_DevonCorp_2F_Text_18319E + message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitfanfare waitmessage givemon SPECIES_ANORITH, 20, ITEM_NONE @@ -169,7 +169,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 release end -RustboroCity_DevonCorp_2F_EventScript_157707:: @ 8157707 - msgbox RustboroCity_DevonCorp_2F_Text_1831C8, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_TooManyPokemon:: @ 8157707 + msgbox RustboroCity_DevonCorp_2F_Text_TooManyPokemon, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_2F/text.inc b/data/maps/RustboroCity_DevonCorp_2F/text.inc index 9275589ea..ef462eeab 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/text.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/text.inc @@ -1,14 +1,14 @@ -RustboroCity_DevonCorp_2F_Text_182B81:: @ 8182B81 +RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon:: @ 8182B81 .string "We're developing a device for talking\n" .string "with POKéMON.\p" .string "But we haven't had much success...$" -RustboroCity_DevonCorp_2F_Text_182BD8:: @ 8182BD8 +RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls:: @ 8182BD8 .string "I'm developing new kinds of\n" .string "POKé BALLS...\p" .string "But I haven't made much headway...$" -RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 +RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls:: @ 8182C25 .string "We finally made new kinds of POKé BALLS!\p" .string "The REPEAT BALL makes it easier to\n" .string "catch POKéMON you'd caught before.\p" @@ -18,12 +18,12 @@ RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 .string "DEVON CORPORATION.\p" .string "Please give them a try!$" -RustboroCity_DevonCorp_2F_Text_182D2A:: @ 8182D2A +RustboroCity_DevonCorp_2F_Text_IMadePokenav:: @ 8182D2A .string "I made the POKéNAV!\p" .string "As an engineer, I feel blessed to have\n" .string "made something so great!$" -RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E +RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav:: @ 8182D7E .string "Oh, wow!\n" .string "That's a POKéNAV!\p" .string "It came about as a result of our\n" @@ -34,18 +34,18 @@ RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E .string "No, no. I think you'll find out just by\n" .string "trying the POKéNAV out.$" -RustboroCity_DevonCorp_2F_Text_182E6B:: @ 8182E6B +RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams:: @ 8182E6B .string "I'm trying to develop a device that\n" .string "visually reproduces the dreams of\l" .string "POKéMON...\p" .string "But it's not going well.$" -RustboroCity_DevonCorp_2F_Text_182ED5:: @ 8182ED5 +RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils:: @ 8182ED5 .string "I've been trying to develop a device\n" .string "that resurrects POKéMON from fossils...\p" .string "And, it's working!$" -RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 +RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife:: @ 8182F35 .string "Wait! That thing you have there...\n" .string "Is that a POKéMON fossil?\p" .string "Would you like to bring that POKéMON\n" @@ -53,18 +53,18 @@ RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 .string "I can with my newly developed\n" .string "FOSSIL REGENERATOR.$" -RustboroCity_DevonCorp_2F_Text_182FD7:: @ 8182FD7 +RustboroCity_DevonCorp_2F_Text_OhIsThatSo:: @ 8182FD7 .string "Oh, is that so?\p" .string "DEVON's technological expertise\n" .string "is outstanding, I tell you.$" -RustboroCity_DevonCorp_2F_Text_183023:: @ 8183023 +RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher:: @ 8183023 .string "Excellent!\n" .string "Let's do this right away.\p" .string "{PLAYER} handed the {STR_VAR_1} to\n" .string "the DEVON RESEARCHER.$" -RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 +RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime:: @ 8183072 .string "The FOSSIL REGENERATOR, which I made,\n" .string "is incredible.\p" .string "But it has one drawback - it takes\n" @@ -72,17 +72,17 @@ RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 .string "So, uh... How about you go for a stroll\n" .string "and look around for a while?$" -RustboroCity_DevonCorp_2F_Text_183124:: @ 8183124 +RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife:: @ 8183124 .string "Thanks for waiting!\p" .string "Your fossilized POKéMON has been\n" .string "brought back to life!\p" .string "The fossil was an ancient POKéMON.\n" .string "{STR_VAR_2}, it was!$" -RustboroCity_DevonCorp_2F_Text_18319E:: @ 818319E +RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher:: @ 818319E .string "{PLAYER} received {STR_VAR_2} from\n" .string "the DEVON RESEARCHER.$" -RustboroCity_DevonCorp_2F_Text_1831C8:: @ 81831C8 +RustboroCity_DevonCorp_2F_Text_TooManyPokemon:: @ 81831C8 .string "Uh-oh, you've got too many POKéMON.\n" .string "You have no room for this one.$" diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 0c6770b93..aa1d0704a 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_3F_EventScript_15783B", + "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_3F_EventScript_1578B0", + "script": "RustboroCity_DevonCorp_3F_EventScript_Employee", "flag": "FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_3F_EventScript_15783B", + "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone", "flag": "0" } ], @@ -68,7 +68,7 @@ "y": 5, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_DevonCorp_3F_EventScript_1578CF" + "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay" }, { "type": "sign", @@ -76,7 +76,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_DevonCorp_3F_EventScript_1578CF" + "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay" } ] } diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index ce25c82ac..f36550b52 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,62 +1,62 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_157721 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157739 - map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157748 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_OnFrame .byte 0 -RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 +RustboroCity_DevonCorp_3F_OnTransition:: @ 8157721 compare VAR_DEVON_CORP_3F_STATE, 0 - call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D + call_if_eq RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos end -RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D +RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos:: @ 815772D setobjectxyperm 2, 3, 2 setobjectmovementtype 2, 9 return -RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 - map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743 +RustboroCity_DevonCorp_3F_OnWarp:: @ 8157739 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast .2byte 0 -RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 +RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast:: @ 8157743 turnobject OBJ_EVENT_ID_PLAYER, 4 end -RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 - map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752 +RustboroCity_DevonCorp_3F_OnFrame:: @ 8157748 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_MeetPresident .2byte 0 -RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 +RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 8157752 lockall - msgbox RustboroCity_DevonCorp_3F_Text_18374C, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere, MSGBOX_DEFAULT closemessage - applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen waitmovement 0 delay 80 - applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E + applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_183903, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT closemessage playbgm MUS_FOLLOW_ME, FALSE - applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 - applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157827 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_18394A, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_PleaseGoAhead, MSGBOX_DEFAULT closemessage fadedefaultbgm - applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812 - applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157835 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_18320B, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT giveitem ITEM_LETTER - msgbox RustboroCity_DevonCorp_3F_Text_18337E, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_ITEM - message RustboroCity_DevonCorp_3F_Text_183422 + message RustboroCity_DevonCorp_3F_Text_ReceivedPokenav waitfanfare waitmessage setflag FLAG_SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV - msgbox RustboroCity_DevonCorp_3F_Text_183439, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenav, MSGBOX_DEFAULT setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL @@ -75,7 +75,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 walk_in_place_fastest_left step_end -RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 +RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident:: @ 8157803 walk_right walk_right walk_right @@ -92,12 +92,12 @@ RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 walk_in_place_fastest_left step_end -RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812 +RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk:: @ 8157812 delay_16 walk_in_place_fastest_down step_end -RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 +RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen:: @ 8157815 walk_right walk_right walk_right @@ -108,7 +108,7 @@ RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 walk_right step_end -RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E +RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer:: @ 815781E walk_left walk_left walk_left @@ -119,7 +119,7 @@ RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E walk_left step_end -RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 +RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident:: @ 8157827 walk_right walk_right walk_right @@ -135,7 +135,7 @@ RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 walk_right step_end -RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 +RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk:: @ 8157835 delay_16 delay_16 walk_down @@ -143,52 +143,52 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 walk_in_place_fastest_right step_end -RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B +RustboroCity_DevonCorp_3F_EventScript_MrStone:: @ 815783B lock faceplayer - goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B - goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864 - msgbox RustboroCity_DevonCorp_3F_Text_18351E, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_GiveExpShare + msgbox RustboroCity_DevonCorp_3F_Text_CountingOnYou, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 - msgbox RustboroCity_DevonCorp_3F_Text_18353E, MSGBOX_DEFAULT +RustboroCity_DevonCorp_3F_EventScript_GiveExpShare:: @ 8157864 + msgbox RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter, MSGBOX_DEFAULT giveitem ITEM_EXP_SHARE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE - msgbox RustboroCity_DevonCorp_3F_Text_1835B3, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_ExplainExpShare, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B - msgbox RustboroCity_DevonCorp_3F_Text_18368D, MSGBOX_DEFAULT +RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor:: @ 815789B + msgbox RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 +RustboroCity_DevonCorp_3F_EventScript_Employee:: @ 81578B0 lock faceplayer - goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5 - msgbox RustboroCity_DevonCorp_3F_Text_18395C, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls + msgbox RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5 - msgbox RustboroCity_DevonCorp_3F_Text_1839A3, MSGBOX_DEFAULT +RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls:: @ 81578C5 + msgbox RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF - msgbox RustboroCity_DevonCorp_3F_Text_183A04, MSGBOX_SIGN +RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay:: @ 81578CF + msgbox RustboroCity_DevonCorp_3F_Text_RareRocksDisplay, MSGBOX_SIGN end diff --git a/data/maps/RustboroCity_DevonCorp_3F/text.inc b/data/maps/RustboroCity_DevonCorp_3F/text.inc index 62ff47e8f..f10b8bf47 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/text.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B +RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor:: @ 818320B .string "I'm MR. STONE, the PRESIDENT of\n" .string "the DEVON CORPORATION.\p" .string "I'd just got word about you!\p" @@ -13,17 +13,17 @@ RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B .string "I was hoping that you'd deliver a LETTER\n" .string "to STEVEN in DEWFORD.$" -RustboroCity_DevonCorp_3F_Text_18337E:: @ 818337E +RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis:: @ 818337E .string "MR. STONE: Now, you should know that\n" .string "I am a great PRESIDENT.\p" .string "So, I'd never be so cheap as to ask\n" .string "a favor for nothing in return.\p" .string "That's why I want you to have this!$" -RustboroCity_DevonCorp_3F_Text_183422:: @ 8183422 +RustboroCity_DevonCorp_3F_Text_ReceivedPokenav:: @ 8183422 .string "{PLAYER} received a POKéNAV.$" -RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 +RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenav:: @ 8183439 .string "MR. STONE: That device...\p" .string "It's a POKéMON NAVIGATOR, or POKéNAV\n" .string "for short.\p" @@ -33,16 +33,16 @@ RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 .string "You can check the locations of\n" .string "DEWFORD and SLATEPORT easily!$" -RustboroCity_DevonCorp_3F_Text_18351E:: @ 818351E +RustboroCity_DevonCorp_3F_Text_CountingOnYou:: @ 818351E .string "MR. STONE: I'm counting on you!$" -RustboroCity_DevonCorp_3F_Text_18353E:: @ 818353E +RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter:: @ 818353E .string "MR. STONE: You delivered my LETTER?\n" .string "Thank you kindly!\p" .string "This is my way of thanking you.\n" .string "It should help you, a TRAINER.$" -RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 +RustboroCity_DevonCorp_3F_Text_ExplainExpShare:: @ 81835B3 .string "MR. STONE: A POKéMON holding that\n" .string "EXP. SHARE will be given some of the\l" .string "EXP Points from battle.\p" @@ -51,7 +51,7 @@ RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 .string "I would say EXP. SHARE is quite useful\n" .string "for raising weak POKéMON.$" -RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D +RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends:: @ 818368D .string "MR. STONE: Since my youth, I've immersed\n" .string "myself in work.\p" .string "Consequently, I'm not familiar with\n" @@ -59,7 +59,7 @@ RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D .string "But do young people all want to be\n" .string "TRAINERS in the POKéMON LEAGUE?$" -RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C +RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere:: @ 818374C .string "This is the DEVON CORPORATION's\n" .string "third floor.\p" .string "Our PRESIDENT's OFFICE is on this floor.\p" @@ -76,23 +76,23 @@ RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C .string "Oh, that's right.\n" .string "Could you wait here a second?$" -RustboroCity_DevonCorp_3F_Text_183903:: @ 8183903 +RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe:: @ 8183903 .string "Our PRESIDENT would like to have\n" .string "a word with you.\p" .string "Please come with me.$" -RustboroCity_DevonCorp_3F_Text_18394A:: @ 818394A +RustboroCity_DevonCorp_3F_Text_PleaseGoAhead:: @ 818394A .string "Please, go ahead.$" -RustboroCity_DevonCorp_3F_Text_18395C:: @ 818395C +RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard:: @ 818395C .string "If you visit the SHIPYARD in SLATEPORT,\n" .string "you should go see CAPT. STERN.$" -RustboroCity_DevonCorp_3F_Text_1839A3:: @ 81839A3 +RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular:: @ 81839A3 .string "DEVON's new products, the REPEAT BALL\n" .string "and TIMER BALL, have become hugely\l" .string "popular among TRAINERS.$" -RustboroCity_DevonCorp_3F_Text_183A04:: @ 8183A04 +RustboroCity_DevonCorp_3F_Text_RareRocksDisplay:: @ 8183A04 .string "It's a collection of rare rocks and\n" .string "stones assembled by the PRESIDENT.$" diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index d1d353ee6..710a37624 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_1F_EventScript_157C60", + "script": "RustboroCity_Flat1_1F_EventScript_Man", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_1F_EventScript_157C69", + "script": "RustboroCity_Flat1_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc index b8d4118d4..0d342678c 100644 --- a/data/maps/RustboroCity_Flat1_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc @@ -1,10 +1,10 @@ RustboroCity_Flat1_1F_MapScripts:: @ 8157C5F .byte 0 -RustboroCity_Flat1_1F_EventScript_157C60:: @ 8157C60 - msgbox RustboroCity_Flat1_1F_Text_184DB4, MSGBOX_NPC +RustboroCity_Flat1_1F_EventScript_Man:: @ 8157C60 + msgbox RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility, MSGBOX_NPC end -RustboroCity_Flat1_1F_EventScript_157C69:: @ 8157C69 - msgbox RustboroCity_Flat1_1F_Text_184DE9, MSGBOX_NPC +RustboroCity_Flat1_1F_EventScript_Woman:: @ 8157C69 + msgbox RustboroCity_Flat1_1F_Text_PokemonStrange, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_Flat1_1F/text.inc b/data/maps/RustboroCity_Flat1_1F/text.inc index 4721931e4..750e148a0 100644 --- a/data/maps/RustboroCity_Flat1_1F/text.inc +++ b/data/maps/RustboroCity_Flat1_1F/text.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat1_1F_Text_184DB4:: @ 8184DB4 +RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility:: @ 8184DB4 .string "Every POKéMON has a special ability\n" .string "that it can use.$" -RustboroCity_Flat1_1F_Text_184DE9:: @ 8184DE9 +RustboroCity_Flat1_1F_Text_PokemonStrange:: @ 8184DE9 .string "POKéMON are such strange creatures.$" diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 35cf1e601..2e5590474 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_157C73", + "script": "RustboroCity_Flat1_2F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index ddd48ddf7..5efc1d582 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_2F_MapScripts:: @ 8157C72 .byte 0 -RustboroCity_Flat1_2F_EventScript_157C73:: @ 8157C73 - msgbox RustboroCity_Flat1_2F_Text_184E0D, MSGBOX_NPC +RustboroCity_Flat1_2F_EventScript_Woman:: @ 8157C73 + msgbox RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_Flat1_2F/text.inc b/data/maps/RustboroCity_Flat1_2F/text.inc index c5e25e295..c1874acec 100644 --- a/data/maps/RustboroCity_Flat1_2F/text.inc +++ b/data/maps/RustboroCity_Flat1_2F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_Flat1_2F_Text_184E0D:: @ 8184E0D +RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard:: @ 8184E0D .string "Oh, it's so hard every day...\p" .string "What's hard?\n" .string "You need to ask?\p" diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 629cf109d..315d7c617 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_1F_EventScript_157D83", + "script": "RustboroCity_Flat2_1F_EventScript_Skitty", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_1F_EventScript_157D7A", + "script": "RustboroCity_Flat2_1F_EventScript_OldWoman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc index 521d4d803..f05c4819f 100644 --- a/data/maps/RustboroCity_Flat2_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -1,16 +1,16 @@ RustboroCity_Flat2_1F_MapScripts:: @ 8157D79 .byte 0 -RustboroCity_Flat2_1F_EventScript_157D7A:: @ 8157D7A - msgbox RustboroCity_Flat2_1F_Text_1853DD, MSGBOX_NPC +RustboroCity_Flat2_1F_EventScript_OldWoman:: @ 8157D7A + msgbox RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere, MSGBOX_NPC end -RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 +RustboroCity_Flat2_1F_EventScript_Skitty:: @ 8157D83 lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox RustboroCity_Flat2_1F_Text_185410, MSGBOX_DEFAULT + msgbox RustboroCity_Flat2_1F_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/RustboroCity_Flat2_1F/text.inc b/data/maps/RustboroCity_Flat2_1F/text.inc index 55d550274..6480ae815 100644 --- a/data/maps/RustboroCity_Flat2_1F/text.inc +++ b/data/maps/RustboroCity_Flat2_1F/text.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat2_1F_Text_1853DD:: @ 81853DD +RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere:: @ 81853DD .string "DEVON CORPORATION's workers live in\n" .string "this building.$" -RustboroCity_Flat2_1F_Text_185410:: @ 8185410 +RustboroCity_Flat2_1F_Text_Skitty:: @ 8185410 .string "SKITTY: Gyaaaah!$" diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index e45d94263..5f4a3a751 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_2F_EventScript_157D97", + "script": "RustboroCity_Flat2_2F_EventScript_OldMan", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_2F_EventScript_157DA0", + "script": "RustboroCity_Flat2_2F_EventScript_NinjaBoy", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index 223438560..4c9e3c10e 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -1,15 +1,15 @@ RustboroCity_Flat2_2F_MapScripts:: @ 8157D96 .byte 0 -RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97 - msgbox RustboroCity_Flat2_2F_Text_185421, MSGBOX_NPC +RustboroCity_Flat2_2F_EventScript_OldMan:: @ 8157D97 + msgbox RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays, MSGBOX_NPC end -RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 +RustboroCity_Flat2_2F_EventScript_NinjaBoy:: @ 8157DA0 lock faceplayer - goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF - msgbox RustboroCity_Flat2_2F_Text_185461, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_GavePremierBall + msgbox RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt, MSGBOX_DEFAULT giveitem ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -17,7 +17,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 release end -RustboroCity_Flat2_2F_EventScript_157DCF:: @ 8157DCF - msgbox RustboroCity_Flat2_2F_Text_1854C4, MSGBOX_DEFAULT +RustboroCity_Flat2_2F_EventScript_GavePremierBall:: @ 8157DCF + msgbox RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_Flat2_2F/text.inc b/data/maps/RustboroCity_Flat2_2F/text.inc index 204709e2d..7f3f9004f 100644 --- a/data/maps/RustboroCity_Flat2_2F/text.inc +++ b/data/maps/RustboroCity_Flat2_2F/text.inc @@ -1,13 +1,13 @@ -RustboroCity_Flat2_2F_Text_185421:: @ 8185421 +RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays:: @ 8185421 .string "Way back in the old days, DEVON was just\n" .string "a teeny, tiny company.$" -RustboroCity_Flat2_2F_Text_185461:: @ 8185461 +RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt:: @ 8185461 .string "My daddy's working at the CORPORATION.\p" .string "My daddy made this!\n" .string "But I can't use it, so you can have it.$" -RustboroCity_Flat2_2F_Text_1854C4:: @ 81854C4 +RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo:: @ 81854C4 .string "My daddy's working at the CORPORATION.\p" .string "When I grow up, I'm going to work for\n" .string "DEVON, too.$" diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 11c07f7b0..5686ece38 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_3F_EventScript_157DDA", + "script": "RustboroCity_Flat2_3F_EventScript_DevonEmployee", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_3F_EventScript_157DE3", + "script": "RustboroCity_Flat2_3F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc index fe3949181..6ebcbcbc4 100644 --- a/data/maps/RustboroCity_Flat2_3F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -1,10 +1,10 @@ RustboroCity_Flat2_3F_MapScripts:: @ 8157DD9 .byte 0 -RustboroCity_Flat2_3F_EventScript_157DDA:: @ 8157DDA - msgbox RustboroCity_Flat2_3F_Text_18551D, MSGBOX_NPC +RustboroCity_Flat2_3F_EventScript_DevonEmployee:: @ 8157DDA + msgbox RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones, MSGBOX_NPC end -RustboroCity_Flat2_3F_EventScript_157DE3:: @ 8157DE3 - msgbox RustboroCity_Flat2_3F_Text_18554D, MSGBOX_NPC +RustboroCity_Flat2_3F_EventScript_Woman:: @ 8157DE3 + msgbox RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_Flat2_3F/text.inc b/data/maps/RustboroCity_Flat2_3F/text.inc index 51af78c77..2e357049d 100644 --- a/data/maps/RustboroCity_Flat2_3F/text.inc +++ b/data/maps/RustboroCity_Flat2_3F/text.inc @@ -1,7 +1,7 @@ -RustboroCity_Flat2_3F_Text_18551D:: @ 818551D +RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones:: @ 818551D .string "DEVON's PRESIDENT likes to collect\n" .string "rare stones.$" -RustboroCity_Flat2_3F_Text_18554D:: @ 818554D +RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones:: @ 818554D .string "I think the PRESIDENT's son also\n" .string "collects rare stones.$" diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 17d8503f4..8bc359ba3 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Gym_EventScript_1578D9", + "script": "RustboroCity_Gym_EventScript_Roxanne", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "RustboroCity_Gym_EventScript_157960", + "script": "RustboroCity_Gym_EventScript_Josh", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "RustboroCity_Gym_EventScript_157977", + "script": "RustboroCity_Gym_EventScript_Tommy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Gym_EventScript_15798E", + "script": "RustboroCity_Gym_EventScript_GymGuide", "flag": "0" } ], @@ -88,7 +88,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_Gym_EventScript_1579AD" + "script": "RustboroCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -96,7 +96,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_Gym_EventScript_1579BD" + "script": "RustboroCity_Gym_EventScript_RightGymStatue" } ] } diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 831613f71..47535e2aa 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -1,18 +1,18 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 .byte 0 -RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 - trainerbattle_single TRAINER_ROXANNE, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE, NO_MUSIC - goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C - msgbox RustboroCity_Gym_Text_184252, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_Roxanne:: @ 81578D9 + trainerbattle_single TRAINER_ROXANNE, RustboroCity_Gym_Text_RoxanneIntro, RustboroCity_Gym_Text_RoxanneDefeat, RustboroCity_Gym_EventScript_RoxanneDefeated, NO_MUSIC + goto_if_unset FLAG_RECEIVED_TM_ROCK_TOMB, RustboroCity_Gym_EventScript_GiveRockTomb + msgbox RustboroCity_Gym_Text_RoxannePostBattle, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_1578FE:: @ 81578FE - message RustboroCity_Gym_Text_1840AB +RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 81578FE + message RustboroCity_Gym_Text_ReceivedStoneBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox RustboroCity_Gym_Text_1840D5, MSGBOX_DEFAULT + msgbox RustboroCity_Gym_Text_StoneBadgeInfoTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET setvar VAR_RUSTBORO_STATE, 1 @@ -21,59 +21,59 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE call Common_EventScript_SetGymTrainers compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq Common_EventScript_ReadyPetalburgGymForBattle - goto RustboroCity_Gym_EventScript_15793C + goto RustboroCity_Gym_EventScript_GiveRockTomb end -RustboroCity_Gym_EventScript_15793C:: @ 815793C +RustboroCity_Gym_EventScript_GiveRockTomb:: @ 815793C giveitem ITEM_TM39_ROCK_TOMB compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - setflag FLAG_RECEIVED_TM39 - msgbox RustboroCity_Gym_Text_184170, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_ROCK_TOMB + msgbox RustboroCity_Gym_Text_ExplainRockTomb, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_157960:: @ 8157960 - trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD - msgbox RustboroCity_Gym_Text_183DF9, MSGBOX_AUTOCLOSE +RustboroCity_Gym_EventScript_Josh:: @ 8157960 + trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_JoshIntro, RustboroCity_Gym_Text_JoshDefeat + msgbox RustboroCity_Gym_Text_JoshPostBattle, MSGBOX_AUTOCLOSE end -RustboroCity_Gym_EventScript_157977:: @ 8157977 - trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 - msgbox RustboroCity_Gym_Text_183E98, MSGBOX_AUTOCLOSE +RustboroCity_Gym_EventScript_Tommy:: @ 8157977 + trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_TommyIntro, RustboroCity_Gym_Text_TommyDefeat + msgbox RustboroCity_Gym_Text_TommyPostBattle, MSGBOX_AUTOCLOSE end -RustboroCity_Gym_EventScript_15798E:: @ 815798E +RustboroCity_Gym_EventScript_GymGuide:: @ 815798E lock faceplayer - goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_1579A3 - msgbox RustboroCity_Gym_Text_183A4B, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_GymGuidePostVictory + msgbox RustboroCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 - msgbox RustboroCity_Gym_Text_183C90, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_GymGuidePostVictory:: @ 81579A3 + msgbox RustboroCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_1579AD:: @ 81579AD +RustboroCity_Gym_EventScript_LeftGymStatue:: @ 81579AD lockall - goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD - goto RustboroCity_Gym_EventScript_1579D7 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified + goto RustboroCity_Gym_EventScript_GymStatue end -RustboroCity_Gym_EventScript_1579BD:: @ 81579BD +RustboroCity_Gym_EventScript_RightGymStatue:: @ 81579BD lockall - goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD - goto RustboroCity_Gym_EventScript_1579D7 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified + goto RustboroCity_Gym_EventScript_GymStatue end -RustboroCity_Gym_EventScript_1579CD:: @ 81579CD - msgbox RustboroCity_Gym_Text_1842E6, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_GymStatueCertified:: @ 81579CD + msgbox RustboroCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -RustboroCity_Gym_EventScript_1579D7:: @ 81579D7 - msgbox RustboroCity_Gym_Text_1842CC, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_GymStatue:: @ 81579D7 + msgbox RustboroCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/RustboroCity_Gym/text.inc b/data/maps/RustboroCity_Gym/text.inc index c52b79e2b..66c6256a5 100644 --- a/data/maps/RustboroCity_Gym/text.inc +++ b/data/maps/RustboroCity_Gym/text.inc @@ -1,4 +1,4 @@ -RustboroCity_Gym_Text_183A4B:: @ 8183A4B +RustboroCity_Gym_Text_GymGuideAdvice:: @ 8183A4B .string "Yo, how's it going?\p" .string "Listen, my friend!\n" .string "Would you like to become the CHAMPION?\p" @@ -20,7 +20,7 @@ RustboroCity_Gym_Text_183A4B:: @ 8183A4B .string "the GYM LEADER.\p" .string "Well, go for it!$" -RustboroCity_Gym_Text_183C90:: @ 8183C90 +RustboroCity_Gym_Text_GymGuidePostVictory:: @ 8183C90 .string "Whoa! What a breathtaking victory!\n" .string "My cheering must've worked!\p" .string "Great!\n" @@ -32,30 +32,30 @@ RustboroCity_Gym_Text_183C90:: @ 8183C90 .string "the stairs to the CHAMPIONSHIP!\p" .string "That's got to feel awesome!$" -RustboroCity_Gym_Text_183D99:: @ 8183D99 +RustboroCity_Gym_Text_JoshIntro:: @ 8183D99 .string "Don't take us GYM TRAINERS lightly!\n" .string "I'll show you why we're better!$" -RustboroCity_Gym_Text_183DDD:: @ 8183DDD +RustboroCity_Gym_Text_JoshDefeat:: @ 8183DDD .string "You were too good for me...$" -RustboroCity_Gym_Text_183DF9:: @ 8183DF9 +RustboroCity_Gym_Text_JoshPostBattle:: @ 8183DF9 .string "You haven't seen anything of the ROCK\n" .string "type's terrifying power!$" -RustboroCity_Gym_Text_183E38:: @ 8183E38 +RustboroCity_Gym_Text_TommyIntro:: @ 8183E38 .string "If you can't beat me, you won't stand\n" .string "a chance against ROXANNE!$" -RustboroCity_Gym_Text_183E78:: @ 8183E78 +RustboroCity_Gym_Text_TommyDefeat:: @ 8183E78 .string "Wow! You've got some potential!$" -RustboroCity_Gym_Text_183E98:: @ 8183E98 +RustboroCity_Gym_Text_TommyPostBattle:: @ 8183E98 .string "ROXANNE is stronger than me by\n" .string "several times.\p" .string "You'd better be on your guard!$" -RustboroCity_Gym_Text_183EE5:: @ 8183EE5 +RustboroCity_Gym_Text_RoxanneIntro:: @ 8183EE5 .string "Hello, I am ROXANNE, the RUSTBORO\n" .string "POKéMON GYM LEADER.\p" .string "I became a GYM LEADER so that I may\n" @@ -64,7 +64,7 @@ RustboroCity_Gym_Text_183EE5:: @ 8183EE5 .string "Would you kindly demonstrate how you\n" .string "battle, and with which POKéMON?$" -RustboroCity_Gym_Text_183FC4:: @ 8183FC4 +RustboroCity_Gym_Text_RoxanneDefeat:: @ 8183FC4 .string "So...\n" .string "I lost...\p" .string "It seems that I still have much more\n" @@ -76,18 +76,18 @@ RustboroCity_Gym_Text_183FC4:: @ 8183FC4 .string "Please accept the official POKéMON\n" .string "LEAGUE STONE BADGE.$" -RustboroCity_Gym_Text_1840AB:: @ 81840AB +RustboroCity_Gym_Text_ReceivedStoneBadge:: @ 81840AB .string "{PLAYER} received the STONE BADGE\n" .string "from ROXANNE.$" -RustboroCity_Gym_Text_1840D5:: @ 81840D5 +RustboroCity_Gym_Text_StoneBadgeInfoTakeThis:: @ 81840D5 .string "The STONE BADGE heightens the ATTACK\n" .string "power of your POKéMON.\p" .string "It also enables them to use the HM move\n" .string "CUT outside of battle.\p" .string "Please take this with you, too.$" -RustboroCity_Gym_Text_184170:: @ 8184170 +RustboroCity_Gym_Text_ExplainRockTomb:: @ 8184170 .string "That TM39 contains ROCK TOMB.\p" .string "It not only inflicts damage by dropping\n" .string "rocks, it also lowers SPEED.\p" @@ -96,16 +96,16 @@ RustboroCity_Gym_Text_184170:: @ 8184170 .string "Remember, a TM can be used only once,\n" .string "so think before you use it.$" -RustboroCity_Gym_Text_184252:: @ 8184252 +RustboroCity_Gym_Text_RoxannePostBattle:: @ 8184252 .string "Since you are so strong, you should\n" .string "challenge other GYM LEADERS.\p" .string "By battling many TRAINERS, you should\n" .string "learn many things.$" -RustboroCity_Gym_Text_1842CC:: @ 81842CC +RustboroCity_Gym_Text_GymStatue:: @ 81842CC .string "RUSTBORO CITY POKéMON GYM$" -RustboroCity_Gym_Text_1842E6:: @ 81842E6 +RustboroCity_Gym_Text_GymStatueCertified:: @ 81842E6 .string "RUSTBORO CITY POKéMON GYM\p" .string "ROXANNE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 842e4d181..7ddf0d934 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House1_EventScript_157C7D", + "script": "RustboroCity_House1_EventScript_Trader", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House1_EventScript_157D1D", + "script": "RustboroCity_House1_EventScript_Hiker", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index ee7399bcb..86724922b 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -1,53 +1,53 @@ RustboroCity_House1_MapScripts:: @ 8157C7C .byte 0 -RustboroCity_House1_EventScript_157C7D:: @ 8157C7D +RustboroCity_House1_EventScript_Trader:: @ 8157C7D lock faceplayer - goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_157D13 + goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_TradeCompleted setvar VAR_0x8008, 0 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox RustboroCity_House1_Text_184EBA, MSGBOX_YESNO + msgbox RustboroCity_House1_Text_IllTradeIfYouWant, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_House1_EventScript_157CFB + goto_if_eq RustboroCity_House1_EventScript_DeclineTrade special SelectMonForNPCTrade waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq RustboroCity_House1_EventScript_157CFB + goto_if_eq RustboroCity_House1_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne RustboroCity_House1_EventScript_157D05 + goto_if_ne RustboroCity_House1_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate - msgbox RustboroCity_House1_Text_184F6B, MSGBOX_DEFAULT + msgbox RustboroCity_House1_Text_PleaseBeGoodToMyPokemon, MSGBOX_DEFAULT setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED release end -RustboroCity_House1_EventScript_157CFB:: @ 8157CFB - msgbox RustboroCity_House1_Text_184FC1, MSGBOX_DEFAULT +RustboroCity_House1_EventScript_DeclineTrade:: @ 8157CFB + msgbox RustboroCity_House1_Text_AwwItsAGoodMon, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_157D05:: @ 8157D05 +RustboroCity_House1_EventScript_NotRequestedMon:: @ 8157D05 bufferspeciesname 0, VAR_0x8009 - msgbox RustboroCity_House1_Text_184F8F, MSGBOX_DEFAULT + msgbox RustboroCity_House1_Text_ThatIsNoMon, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_157D13:: @ 8157D13 - msgbox RustboroCity_House1_Text_184FDD, MSGBOX_DEFAULT +RustboroCity_House1_EventScript_TradeCompleted:: @ 8157D13 + msgbox RustboroCity_House1_Text_WontYouGetCurious, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_157D1D:: @ 8157D1D - msgbox RustboroCity_House1_Text_185020, MSGBOX_NPC +RustboroCity_House1_EventScript_Hiker:: @ 8157D1D + msgbox RustboroCity_House1_Text_AllSortsOfPlaces, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_House1/text.inc b/data/maps/RustboroCity_House1/text.inc index 4af3c1f97..28ba7c825 100644 --- a/data/maps/RustboroCity_House1/text.inc +++ b/data/maps/RustboroCity_House1/text.inc @@ -1,4 +1,4 @@ -RustboroCity_House1_Text_184EBA:: @ 8184EBA +RustboroCity_House1_Text_IllTradeIfYouWant:: @ 8184EBA .string "Do you nickname your POKéMON?\n" .string "I gave a cool name to mine.\p" .string "But when I call my POKéMON by that\n" @@ -6,21 +6,21 @@ RustboroCity_House1_Text_184EBA:: @ 8184EBA .string "If it's okay with you, want to trade\n" .string "your {STR_VAR_1} for my {STR_VAR_2}?$" -RustboroCity_House1_Text_184F6B:: @ 8184F6B +RustboroCity_House1_Text_PleaseBeGoodToMyPokemon:: @ 8184F6B .string "Eheheheh, ooh, this is so exciting!$" -RustboroCity_House1_Text_184F8F:: @ 8184F8F +RustboroCity_House1_Text_ThatIsNoMon:: @ 8184F8F .string "But that's no {STR_VAR_1}.\n" .string "Tch, that's so disappointing...$" -RustboroCity_House1_Text_184FC1:: @ 8184FC1 +RustboroCity_House1_Text_AwwItsAGoodMon:: @ 8184FC1 .string "Aww, it's a good POKéMON...$" -RustboroCity_House1_Text_184FDD:: @ 8184FDD +RustboroCity_House1_Text_WontYouGetCurious:: @ 8184FDD .string "Don't you get curious about what other\n" .string "people named their POKéMON?$" -RustboroCity_House1_Text_185020:: @ 8185020 +RustboroCity_House1_Text_AllSortsOfPlaces:: @ 8185020 .string "In all sorts of places, there are all\n" .string "sorts of POKéMON and people.\p" .string "I find that fascinating, so I go to all\n" diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 68ca73c41..f88846f3a 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House2_EventScript_157D67", + "script": "RustboroCity_House2_EventScript_PokefanF", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House2_EventScript_157D70", + "script": "RustboroCity_House2_EventScript_LittleGirl", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc index 08cb32333..69d35b7d3 100644 --- a/data/maps/RustboroCity_House2/scripts.inc +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -1,10 +1,10 @@ RustboroCity_House2_MapScripts:: @ 8157D66 .byte 0 -RustboroCity_House2_EventScript_157D67:: @ 8157D67 - msgbox RustboroCity_House2_Text_18532D, MSGBOX_NPC +RustboroCity_House2_EventScript_PokefanF:: @ 8157D67 + msgbox RustboroCity_House2_Text_TrainerSchoolExcellent, MSGBOX_NPC end -RustboroCity_House2_EventScript_157D70:: @ 8157D70 - msgbox RustboroCity_House2_Text_185388, MSGBOX_NPC +RustboroCity_House2_EventScript_LittleGirl:: @ 8157D70 + msgbox RustboroCity_House2_Text_RoxanneKnowsALot, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_House2/text.inc b/data/maps/RustboroCity_House2/text.inc index e3438cc57..db5baffcf 100644 --- a/data/maps/RustboroCity_House2/text.inc +++ b/data/maps/RustboroCity_House2/text.inc @@ -1,9 +1,9 @@ -RustboroCity_House2_Text_18532D:: @ 818532D +RustboroCity_House2_Text_TrainerSchoolExcellent:: @ 818532D .string "The TRAINER'S SCHOOL is excellent.\p" .string "If you study there, you could even\n" .string "become a GYM LEADER.$" -RustboroCity_House2_Text_185388:: @ 8185388 +RustboroCity_House2_Text_RoxanneKnowsALot:: @ 8185388 .string "ROXANNE, the GYM LEADER, really knows\n" .string "a lot about POKéMON.\p" .string "She's really strong, too!$" diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 5912ec64b..223ec1f81 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_157DED", + "script": "RustboroCity_House3_EventScript_OldMan", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_157DF6", + "script": "RustboroCity_House3_EventScript_OldWoman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_157DFF", + "script": "RustboroCity_House3_EventScript_Pekachu", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc index e29414f1d..2801d8788 100644 --- a/data/maps/RustboroCity_House3/scripts.inc +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -1,20 +1,20 @@ RustboroCity_House3_MapScripts:: @ 8157DEC .byte 0 -RustboroCity_House3_EventScript_157DED:: @ 8157DED - msgbox RustboroCity_House3_Text_185584, MSGBOX_NPC +RustboroCity_House3_EventScript_OldMan:: @ 8157DED + msgbox RustboroCity_House3_Text_IGivePerfectlySuitedNicknames, MSGBOX_NPC end -RustboroCity_House3_EventScript_157DF6:: @ 8157DF6 - msgbox RustboroCity_House3_Text_1855FA, MSGBOX_NPC +RustboroCity_House3_EventScript_OldWoman:: @ 8157DF6 + msgbox RustboroCity_House3_Text_NamingPikachuPekachu, MSGBOX_NPC end -RustboroCity_House3_EventScript_157DFF:: @ 8157DFF +RustboroCity_House3_EventScript_Pekachu:: @ 8157DFF lock faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox RustboroCity_House3_Text_18567D, MSGBOX_DEFAULT + msgbox RustboroCity_House3_Text_Pekachu, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/RustboroCity_House3/text.inc b/data/maps/RustboroCity_House3/text.inc index 5fdc12a06..82280e03e 100644 --- a/data/maps/RustboroCity_House3/text.inc +++ b/data/maps/RustboroCity_House3/text.inc @@ -1,14 +1,14 @@ -RustboroCity_House3_Text_185584:: @ 8185584 +RustboroCity_House3_Text_IGivePerfectlySuitedNicknames:: @ 8185584 .string "For my own POKéMON, I give them\n" .string "perfectly suited nicknames!\p" .string "It's my expression of, uh...\n" .string "originality, yes, that's it!$" -RustboroCity_House3_Text_1855FA:: @ 81855FA +RustboroCity_House3_Text_NamingPikachuPekachu:: @ 81855FA .string "But giving the name PEKACHU to a\n" .string "PIKACHU? It seems pointless.\p" .string "I suppose it is good to use a name\n" .string "that's easy to understand, but...$" -RustboroCity_House3_Text_18567D:: @ 818567D +RustboroCity_House3_Text_Pekachu:: @ 818567D .string "PEKACHU: Peka!$" diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 5dda4a123..ed3587e80 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_157BD4", + "script": "RustboroCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_157C4D", + "script": "RustboroCity_Mart_EventScript_Boy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_157C44", + "script": "RustboroCity_Mart_EventScript_PokefanF", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_157C56", + "script": "RustboroCity_Mart_EventScript_BugCatcher", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index c47b1ee3f..fc640a2ac 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -1,23 +1,23 @@ RustboroCity_Mart_MapScripts:: @ 8157BD3 .byte 0 -RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 +RustboroCity_Mart_EventScript_Clerk:: @ 8157BD4 lock faceplayer message Text_HowMayIServeYou waitmessage - goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157BEF - goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157C18 + goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartBasic + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartExpanded end -RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF - pokemart RustboroCity_Mart_Items1 +RustboroCity_Mart_EventScript_PokemartBasic:: @ 8157BEF + pokemart RustboroCity_Mart_Pokemart_Basic msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -RustboroCity_Mart_Items1:: @ 8157C00 +RustboroCity_Mart_Pokemart_Basic:: @ 8157C00 .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_SUPER_POTION @@ -32,14 +32,14 @@ RustboroCity_Mart_Items1:: @ 8157C00 release end -RustboroCity_Mart_EventScript_157C18:: @ 8157C18 - pokemart RustboroCity_Mart_Items2 +RustboroCity_Mart_EventScript_PokemartExpanded:: @ 8157C18 + pokemart RustboroCity_Mart_Pokemart_Expanded msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -RustboroCity_Mart_Items2:: @ 8157C28 +RustboroCity_Mart_Pokemart_Expanded:: @ 8157C28 .2byte ITEM_POKE_BALL .2byte ITEM_TIMER_BALL .2byte ITEM_REPEAT_BALL @@ -56,14 +56,14 @@ RustboroCity_Mart_Items2:: @ 8157C28 release end -RustboroCity_Mart_EventScript_157C44:: @ 8157C44 - msgbox RustboroCity_Mart_Text_184C76, MSGBOX_NPC +RustboroCity_Mart_EventScript_PokefanF:: @ 8157C44 + msgbox RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish, MSGBOX_NPC end -RustboroCity_Mart_EventScript_157C4D:: @ 8157C4D - msgbox RustboroCity_Mart_Text_184CD8, MSGBOX_NPC +RustboroCity_Mart_EventScript_Boy:: @ 8157C4D + msgbox RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead, MSGBOX_NPC end -RustboroCity_Mart_EventScript_157C56:: @ 8157C56 - msgbox RustboroCity_Mart_Text_184D43, MSGBOX_NPC +RustboroCity_Mart_EventScript_BugCatcher:: @ 8157C56 + msgbox RustboroCity_Mart_Text_GettingEscapeRopeJustInCase, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_Mart/text.inc b/data/maps/RustboroCity_Mart/text.inc index 60b08f34e..75e5ba0f9 100644 --- a/data/maps/RustboroCity_Mart/text.inc +++ b/data/maps/RustboroCity_Mart/text.inc @@ -1,16 +1,16 @@ -RustboroCity_Mart_Text_184C76:: @ 8184C76 +RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish:: @ 8184C76 .string "I'm buying some PARLYZ HEALS and\n" .string "ANTIDOTES.\p" .string "Just in case I run into SHROOMISH\n" .string "in PETALBURG WOODS.$" -RustboroCity_Mart_Text_184CD8:: @ 8184CD8 +RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead:: @ 8184CD8 .string "My POKéMON evolved.\n" .string "It has a lot of HP now.\p" .string "I should buy SUPER POTIONS for it\n" .string "instead of ordinary POTIONS.$" -RustboroCity_Mart_Text_184D43:: @ 8184D43 +RustboroCity_Mart_Text_GettingEscapeRopeJustInCase:: @ 8184D43 .string "I'm getting an ESCAPE ROPE just in\n" .string "case I get lost in a cave.\p" .string "I just need to use it to get back to the\n" diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index 7b83c797a..be2833053 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_157B88", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_157B96", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_157B9F", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_157BA8", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 83766d86e..75f1e6395 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,13 +1,13 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_157B7F + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition .byte 0 -RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F +RustboroCity_PokemonCenter_1F_OnTransition:: @ 8157B7F setrespawn HEAL_LOCATION_RUSTBORO_CITY call Common_EventScript_UpdateBrineyLocation end -RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 +RustboroCity_PokemonCenter_1F_EventScript_Nurse:: @ 8157B88 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,14 +15,14 @@ RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 release end -RustboroCity_PokemonCenter_1F_EventScript_157B96:: @ 8157B96 - msgbox RustboroCity_PokemonCenter_1F_Text_184B37, MSGBOX_NPC +RustboroCity_PokemonCenter_1F_EventScript_Man:: @ 8157B96 + msgbox RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities, MSGBOX_NPC end -RustboroCity_PokemonCenter_1F_EventScript_157B9F:: @ 8157B9F - msgbox RustboroCity_PokemonCenter_1F_Text_184BAB, MSGBOX_NPC +RustboroCity_PokemonCenter_1F_EventScript_Boy:: @ 8157B9F + msgbox RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon, MSGBOX_NPC end -RustboroCity_PokemonCenter_1F_EventScript_157BA8:: @ 8157BA8 - msgbox RustboroCity_PokemonCenter_1F_Text_184C19, MSGBOX_NPC +RustboroCity_PokemonCenter_1F_EventScript_Girl:: @ 8157BA8 + msgbox RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_PokemonCenter_1F/text.inc b/data/maps/RustboroCity_PokemonCenter_1F/text.inc index 658b4b183..436113508 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/text.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/text.inc @@ -1,16 +1,16 @@ -RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37 +RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities:: @ 8184B37 .string "My POKéMON has a NAIVE nature, and my\n" .string "friend's has a JOLLY nature.\p" .string "It's fascinating how POKéMON have\n" .string "personalities!$" -RustboroCity_PokemonCenter_1F_Text_184BAB:: @ 8184BAB +RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon:: @ 8184BAB .string "Just like people, there are male and\n" .string "female POKéMON.\p" .string "But no one seems to have any idea how\n" .string "they're different.$" -RustboroCity_PokemonCenter_1F_Text_184C19:: @ 8184C19 +RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor:: @ 8184C19 .string "The man next door gave me an HM!\p" .string "I used it to teach my POKéMON how to\n" .string "CUT down skinny trees.$" diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index bbc72beb1..3e7491ad6 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157A98", + "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid1", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157AA1", + "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid2", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157AAA", + "script": "RustboroCity_PokemonSchool_EventScript_RichBoy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157AB3", + "script": "RustboroCity_PokemonSchool_EventScript_Lass", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157ABC", + "script": "RustboroCity_PokemonSchool_EventScript_SchoolKidM", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157ACE", + "script": "RustboroCity_PokemonSchool_EventScript_Teacher", "flag": "0" } ], @@ -114,7 +114,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_1579E2" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -122,7 +122,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_1579E2" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -130,7 +130,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_1579E2" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -138,7 +138,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_1579E2" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -146,7 +146,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_157AC5" + "script": "RustboroCity_PokemonSchool_EventScript_StudentNotebook" } ] } diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index dd266e21f..45757af1a 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -1,88 +1,88 @@ RustboroCity_PokemonSchool_MapScripts:: @ 81579E1 .byte 0 -RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2 +RustboroCity_PokemonSchool_EventScript_Blackboard:: @ 81579E2 lockall - msgbox RustboroCity_PokemonSchool_Text_184321, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 + msgbox RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 - message RustboroCity_PokemonSchool_Text_184368 +RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic:: @ 81579F1 + message RustboroCity_PokemonSchool_Text_ReadWhichTopic waitmessage multichoicegrid 8, 1, 13, 3, 0 switch VAR_RESULT - case 0, RustboroCity_PokemonSchool_EventScript_157A50 - case 1, RustboroCity_PokemonSchool_EventScript_157A5E - case 2, RustboroCity_PokemonSchool_EventScript_157A6C - case 3, RustboroCity_PokemonSchool_EventScript_157A7A - case 4, RustboroCity_PokemonSchool_EventScript_157A88 - case 5, RustboroCity_PokemonSchool_EventScript_157A96 - case 127, RustboroCity_PokemonSchool_EventScript_157A96 + case 0, RustboroCity_PokemonSchool_EventScript_Poison + case 1, RustboroCity_PokemonSchool_EventScript_Paralysis + case 2, RustboroCity_PokemonSchool_EventScript_Sleep + case 3, RustboroCity_PokemonSchool_EventScript_Burn + case 4, RustboroCity_PokemonSchool_EventScript_Freeze + case 5, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect + case 127, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect end -RustboroCity_PokemonSchool_EventScript_157A50:: @ 8157A50 - msgbox RustboroCity_PokemonSchool_Text_184389, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Poison:: @ 8157A50 + msgbox RustboroCity_PokemonSchool_Text_ExplainPoison, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A5E:: @ 8157A5E - msgbox RustboroCity_PokemonSchool_Text_184447, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Paralysis:: @ 8157A5E + msgbox RustboroCity_PokemonSchool_Text_ExplainParalysis, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A6C:: @ 8157A6C - msgbox RustboroCity_PokemonSchool_Text_1844EC, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Sleep:: @ 8157A6C + msgbox RustboroCity_PokemonSchool_Text_ExplainSleep, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A7A:: @ 8157A7A - msgbox RustboroCity_PokemonSchool_Text_1845A5, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Burn:: @ 8157A7A + msgbox RustboroCity_PokemonSchool_Text_ExplainBurn, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A88:: @ 8157A88 - msgbox RustboroCity_PokemonSchool_Text_184627, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Freeze:: @ 8157A88 + msgbox RustboroCity_PokemonSchool_Text_ExplainFreeze, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A96:: @ 8157A96 +RustboroCity_PokemonSchool_EventScript_ExitTopicSelect:: @ 8157A96 releaseall end -RustboroCity_PokemonSchool_EventScript_157A98:: @ 8157A98 - msgbox RustboroCity_PokemonSchool_Text_18480E, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_GameboyKid1:: @ 8157A98 + msgbox RustboroCity_PokemonSchool_Text_TradingRightNow, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157AA1:: @ 8157AA1 - msgbox RustboroCity_PokemonSchool_Text_18483C, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_GameboyKid2:: @ 8157AA1 + msgbox RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157AAA:: @ 8157AAA - msgbox RustboroCity_PokemonSchool_Text_184873, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_RichBoy:: @ 8157AAA + msgbox RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157AB3:: @ 8157AB3 - msgbox RustboroCity_PokemonSchool_Text_1848D8, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_Lass:: @ 8157AB3 + msgbox RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157ABC:: @ 8157ABC - msgbox RustboroCity_PokemonSchool_Text_184988, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_SchoolKidM:: @ 8157ABC + msgbox RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 - msgbox RustboroCity_PokemonSchool_Text_184A17, MSGBOX_SIGN +RustboroCity_PokemonSchool_EventScript_StudentNotebook:: @ 8157AC5 + msgbox RustboroCity_PokemonSchool_Text_StudentsNotes, MSGBOX_SIGN end -RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE +RustboroCity_PokemonSchool_EventScript_Teacher:: @ 8157ACE lock faceplayer - goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34 + goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_GaveQuickClaw compare VAR_FACING, 4 - call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E + call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast compare VAR_FACING, 3 - call_if_eq RustboroCity_PokemonSchool_EventScript_157B29 - msgbox RustboroCity_PokemonSchool_Text_1846A2, MSGBOX_DEFAULT + call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest + msgbox RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw, MSGBOX_DEFAULT giveitem ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -93,25 +93,25 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE release end -RustboroCity_PokemonSchool_EventScript_157B1E:: @ 8157B1E - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60 +RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast:: @ 8157B1E + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast waitmovement 0 return -RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49 +RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest:: @ 8157B29 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest waitmovement 0 return -RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 - msgbox RustboroCity_PokemonSchool_Text_184737, MSGBOX_DEFAULT +RustboroCity_PokemonSchool_EventScript_GaveQuickClaw:: @ 8157B34 + msgbox RustboroCity_PokemonSchool_Text_ExplainQuickClaw, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 release end -RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49 +RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest:: @ 8157B49 walk_left walk_down walk_down @@ -136,7 +136,7 @@ RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49 walk_right step_end -RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 +RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast:: @ 8157B60 walk_right walk_right walk_down diff --git a/data/maps/RustboroCity_PokemonSchool/text.inc b/data/maps/RustboroCity_PokemonSchool/text.inc index 28620fae2..d804a1bd9 100644 --- a/data/maps/RustboroCity_PokemonSchool/text.inc +++ b/data/maps/RustboroCity_PokemonSchool/text.inc @@ -1,11 +1,11 @@ -RustboroCity_PokemonSchool_Text_184321:: @ 8184321 +RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges:: @ 8184321 .string "The blackboard lists status changes\n" .string "that may affect POKéMON in battle.$" -RustboroCity_PokemonSchool_Text_184368:: @ 8184368 +RustboroCity_PokemonSchool_Text_ReadWhichTopic:: @ 8184368 .string "Which topic do you want to read?$" -RustboroCity_PokemonSchool_Text_184389:: @ 8184389 +RustboroCity_PokemonSchool_Text_ExplainPoison:: @ 8184389 .string "If a POKéMON is poisoned, it will\n" .string "steadily lose HP.\p" .string "The effects of poison remain after\n" @@ -14,7 +14,7 @@ RustboroCity_PokemonSchool_Text_184389:: @ 8184389 .string "while it is traveling.\p" .string "Heal a poisoning using an ANTIDOTE.$" -RustboroCity_PokemonSchool_Text_184447:: @ 8184447 +RustboroCity_PokemonSchool_Text_ExplainParalysis:: @ 8184447 .string "If a POKéMON becomes paralyzed,\n" .string "its SPEED drops.\p" .string "It may also not be able to move while\n" @@ -22,7 +22,7 @@ RustboroCity_PokemonSchool_Text_184447:: @ 8184447 .string "Paralysis remains after battle.\n" .string "Cure it using a PARLYZ HEAL.$" -RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC +RustboroCity_PokemonSchool_Text_ExplainSleep:: @ 81844EC .string "If a POKéMON falls asleep, it will be\n" .string "unable to attack.\p" .string "A POKéMON may wake up on its own,\n" @@ -30,26 +30,26 @@ RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC .string "it will stay asleep.\p" .string "Wake it up using an AWAKENING.$" -RustboroCity_PokemonSchool_Text_1845A5:: @ 81845A5 +RustboroCity_PokemonSchool_Text_ExplainBurn:: @ 81845A5 .string "A burn reduces ATTACK power, and it\n" .string "steadily reduces the victim's HP.\p" .string "A burn lingers after battle.\n" .string "Cure a burn using a BURN HEAL.$" -RustboroCity_PokemonSchool_Text_184627:: @ 8184627 +RustboroCity_PokemonSchool_Text_ExplainFreeze:: @ 8184627 .string "If a POKéMON is frozen, it becomes\n" .string "completely helpless.\p" .string "It will remain frozen after battle.\n" .string "Thaw it out using an ICE HEAL.$" -RustboroCity_PokemonSchool_Text_1846A2:: @ 81846A2 +RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw:: @ 81846A2 .string "Students who don't study get a little\n" .string "taste of my QUICK CLAW.\p" .string "Whether or not you are a good student \n" .string "will be evident from the way you use\l" .string "this item.$" -RustboroCity_PokemonSchool_Text_184737:: @ 8184737 +RustboroCity_PokemonSchool_Text_ExplainQuickClaw:: @ 8184737 .string "A POKéMON holding the QUICK CLAW will\n" .string "occasionally speed up and get to move\l" .string "before its opponent.\p" @@ -58,20 +58,20 @@ RustboroCity_PokemonSchool_Text_184737:: @ 8184737 .string "Just those alone will give you many\n" .string "topics to study!$" -RustboroCity_PokemonSchool_Text_18480E:: @ 818480E +RustboroCity_PokemonSchool_Text_TradingRightNow:: @ 818480E .string "I'm trading POKéMON with my friend\n" .string "right now.$" -RustboroCity_PokemonSchool_Text_18483C:: @ 818483C +RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot:: @ 818483C .string "I always wanted a SEEDOT, and\n" .string "I'm finally getting one!$" -RustboroCity_PokemonSchool_Text_184873:: @ 8184873 +RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems:: @ 8184873 .string "POKéMON can hold items, but they\n" .string "don't know what to do with man-made\l" .string "items like POTION and ANTIDOTE.$" -RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 +RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself:: @ 81848D8 .string "You know how some POKéMON moves can\n" .string "confuse a POKéMON?\p" .string "A confused POKéMON will sometimes\n" @@ -79,7 +79,7 @@ RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 .string "But once it leaves battle, it will\n" .string "return to normal.$" -RustboroCity_PokemonSchool_Text_184988:: @ 8184988 +RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry:: @ 8184988 .string "A POKéMON holding a BERRY will heal\n" .string "itself...\p" .string "There are many kinds of items that\n" @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_Text_184988:: @ 8184988 .string "Boy, it sure is hard taking notes\n" .string "down...$" -RustboroCity_PokemonSchool_Text_184A17:: @ 8184A17 +RustboroCity_PokemonSchool_Text_StudentsNotes:: @ 8184A17 .string "It's this student's notebook...\p" .string "POKéMON are to be caught using\n" .string "POKé BALLS.\p" diff --git a/include/constants/flags.h b/include/constants/flags.h index 6919bb0ad..bd42871fb 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -117,7 +117,7 @@ #define FLAG_CUTE_PAINTING_MADE 0xA2 #define FLAG_SMART_PAINTING_MADE 0xA3 #define FLAG_TOUGH_PAINTING_MADE 0xA4 -#define FLAG_RECEIVED_TM39 0xA5 +#define FLAG_RECEIVED_TM_ROCK_TOMB 0xA5 #define FLAG_RECEIVED_TM_BULK_UP 0xA6 #define FLAG_RECEIVED_TM_SHOCK_WAVE 0xA7 #define FLAG_RECEIVED_TM_OVERHEAT 0xA8