From cfdeb74236f271c61469df046bf099e643bbfa53 Mon Sep 17 00:00:00 2001 From: Robin Xyifer Date: Thu, 13 Mar 2025 18:42:40 -0500 Subject: [PATCH] LittlerootTown internal maps name parity update. --- data-de/event_scripts.s | 10 +- .../LittlerootTown_BrendansHouse_1F/text.inc | 52 +++--- .../LittlerootTown_BrendansHouse_2F/text.inc | 10 +- .../maps/LittlerootTown_MaysHouse_1F/text.inc | 12 +- .../maps/LittlerootTown_MaysHouse_2F/text.inc | 16 +- .../text.inc | 50 +++--- data/event_scripts.s | 8 +- .../LittlerootTown_BrendansHouse_1F/map.json | 4 +- .../scripts.inc | 76 ++++----- .../LittlerootTown_BrendansHouse_1F/text.inc | 48 +++--- .../LittlerootTown_BrendansHouse_2F/map.json | 6 +- .../scripts.inc | 40 +++-- .../LittlerootTown_BrendansHouse_2F/text.inc | 10 +- .../maps/LittlerootTown_MaysHouse_1F/map.json | 4 +- .../LittlerootTown_MaysHouse_1F/scripts.inc | 99 ++++++----- .../maps/LittlerootTown_MaysHouse_1F/text.inc | 11 +- .../maps/LittlerootTown_MaysHouse_2F/map.json | 6 +- .../LittlerootTown_MaysHouse_2F/scripts.inc | 74 ++++----- .../maps/LittlerootTown_MaysHouse_2F/text.inc | 16 +- .../map.json | 34 ++-- .../scripts.inc | 156 +++++++++--------- .../text.inc | 50 +++--- data/scripts/players_house.inc | 77 +++++---- data/scripts/tv.inc | 2 +- 24 files changed, 429 insertions(+), 442 deletions(-) diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index a26477303..12a3f6171 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -882,7 +882,7 @@ Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA EventScript_RegionMap:: @ 81A02D6 lockall - msgbox Text_LookCloserAtMap, MSGBOX_DEFAULT + msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK special FieldShowRegionMap waitstate @@ -1061,8 +1061,8 @@ Text_NoRegisteredItem: @ 81A0FCC .string "Ein Basis-Item aus dem BEUTEL kann auf\n" .string "SELECT gelegt werden. Sehr praktisch!$" -LittlerootTown_BrendansHouse_2F_Text_1A100C:: @ 81A100C -LittlerootTown_MaysHouse_2F_Text_1A100C:: @ 81A100C +gText_PokemonTrainerSchoolEmail:: @ 81A100C +gText_PokemonTrainerSchoolEmail:: @ 81A100C .string "Da ist eine E-Mail von der POKéMON\n" .string "TRAINERSCHULE.\p" .string "... ... ... ... ... ...\p" @@ -1073,8 +1073,8 @@ LittlerootTown_MaysHouse_2F_Text_1A100C:: @ 81A100C .string "POKéMON beibringt, erprobt.\p" .string "... ... ... ... ... ...$" -LittlerootTown_BrendansHouse_2F_Text_1A10D6:: @ 81A10D6 -LittlerootTown_MaysHouse_2F_Text_1A10D6:: @ 81A10D6 +gText_PlayerHouseBootPC:: @ 81A10D6 +gText_PlayerHouseBootPC:: @ 81A10D6 .string "{PLAYER} schaltet den PC ein.$" FallarborTown_ContestLobby_Text_1A10EB:: @ 81A10EB diff --git a/data-de/maps/LittlerootTown_BrendansHouse_1F/text.inc b/data-de/maps/LittlerootTown_BrendansHouse_1F/text.inc index 9952028d1..abc94d2a3 100644 --- a/data-de/maps/LittlerootTown_BrendansHouse_1F/text.inc +++ b/data-de/maps/LittlerootTown_BrendansHouse_1F/text.inc @@ -1,8 +1,8 @@ -LittlerootTown_BrendansHouse_1F_Text_172429:: @ 8172429 +PlayersHouse_1F_Text_IsntItNiceInHere:: @ 8172429 .string "MUTTER: Siehst du, {PLAYER}?\n" .string "Hier ist es doch auch schön, oder nicht?$" -LittlerootTown_BrendansHouse_1F_Text_172453:: @ 8172453 +PlayersHouse_1F_Text_MoversPokemonGoSetClock:: @ 8172453 .string "Die POKéMON machen für uns den Umzug,\n" .string "räumen alles ein und machen sauber.\l" .string "Das ist doch so etwas von praktisch!\p" @@ -12,77 +12,77 @@ LittlerootTown_BrendansHouse_1F_Text_172453:: @ 8172453 .string "Begrüßung geschenkt.\l" .string "Vergiss nicht, sie einzustellen!$" -LittlerootTown_BrendansHouse_1F_Text_172531:: @ 8172531 +PlayersHouse_1F_Text_ArentYouInterestedInRoom:: @ 8172531 .string "MUTTER: Nun, {PLAYER}?\p" .string "Bist du nicht neugierig, dein neues\n" .string "Zimmer zu sehen?$" -LittlerootTown_BrendansHouse_1F_Text_172574:: @ 8172574 -LittlerootTown_MaysHouse_1F_Text_172574:: @ 8172574 +PlayersHouse_1F_Text_GoSetTheClock:: @ 8172574 +PlayersHouse_1F_Text_GoSetTheClock:: @ 8172574 .string "MUTTER: {PLAYER}, Schatz!\p" .string "Stell bitte die Uhr in deinem Zimmer ein.$" -LittlerootTown_BrendansHouse_1F_Text_1725A3:: @ 81725A3 +PlayersHouse_1F_Text_OhComeQuickly:: @ 81725A3 .string "MUTTER: Oh! {PLAYER}! {PLAYER}!\n" .string "Schnell! Komm schnell her!$" -LittlerootTown_BrendansHouse_1F_Text_1725C9:: @ 81725C9 -LittlerootTown_MaysHouse_1F_Text_1725C9:: @ 81725C9 +PlayersHouse_1F_Text_MaybeDadWillBeOn:: @ 81725C9 +PlayersHouse_1F_Text_MaybeDadWillBeOn:: @ 81725C9 .string "MUTTER: Da! Da ist die ARENA von BLÜTEN-\n" .string "BURG CITY! Ich glaube, VATI ist im\l" .string "Fernsehen!$" -LittlerootTown_BrendansHouse_1F_Text_1725FE:: @ 81725FE -LittlerootTown_MaysHouse_1F_Text_1725FE:: @ 81725FE +PlayersHouse_1F_Text_ItsOverWeMissedHim:: @ 81725FE +PlayersHouse_1F_Text_ItsOverWeMissedHim:: @ 81725FE .string "MUTTER: Oh... Schon vorbei.\p" .string "Ich glaube, VATI war im Fernsehen und\n" .string "wir haben ihn verpasst. Schade!$" -LittlerootTown_BrendansHouse_1F_Text_172644:: @ 8172644 -LittlerootTown_MaysHouse_1F_Text_172644:: @ 8172644 +PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor:: @ 8172644 +PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor:: @ 8172644 .string "Ach ja.\n" .string "Einer von VATIS Freunden lebt hier.\p" .string "PROF. BIRK ist sein Name.\p" .string "Er lebt gleich nebenan, daher solltest\n" .string "du hinübergehen und dich vorstellen.$" -LittlerootTown_BrendansHouse_1F_Text_1726D2:: @ 81726D2 +PlayersHouse_1F_Text_SeeYouHoney:: @ 81726D2 .string "MUTTER: Bis später, Spatz!$" -LittlerootTown_BrendansHouse_1F_Text_1726E7:: @ 81726E7 +PlayersHouse_1F_Text_DidYouMeetProfBirch:: @ 81726E7 .string "MUTTER: Hast du dich bei PROF. BIRK\n" .string "vorgestellt?$" -LittlerootTown_BrendansHouse_1F_Text_172717:: @ 8172717 +PlayersHouse_1F_Text_YouShouldRestABit:: @ 8172717 .string "MUTTER: Wie geht es dir, {PLAYER}?\n" .string "Du siehst müde aus.\p" .string "Ich denke, du solltest dich etwas\n" .string "ausruhen.$" -LittlerootTown_BrendansHouse_1F_Text_17276B:: @ 817276B +PlayersHouse_1F_Text_TakeCareHoney:: @ 817276B .string "MUTTER: Pass auf dich auf, Schatz!$" -LittlerootTown_BrendansHouse_1F_Text_172782:: @ 8172782 +PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom:: @ 8172782 .string "MUTTER: Oh! Hat VATI dir den ORDEN\n" .string "gegeben?\p" .string "Dann ist das hier von deiner MUTTI!$" -LittlerootTown_BrendansHouse_1F_Text_1727CD:: @ 81727CD +PlayersHouse_1F_Text_DontPushYourselfTooHard:: @ 81727CD .string "Überanstreng dich nicht, Liebes.\n" .string "Du kannst jederzeit nach Hause kommen.\p" .string "Und jetzt nichts wie los, Schatz!$" -LittlerootTown_BrendansHouse_1F_Text_17281D:: @ 817281D +PlayersHouse_1F_Text_Machoke1:: @ 817281D .string "Gyao, gyao gyaoh...$" -LittlerootTown_BrendansHouse_1F_Text_172831:: @ 8172831 +PlayersHouse_1F_Text_Machoke2:: @ 8172831 .string "Gwagwah gwah...$" -LittlerootTown_BrendansHouse_1F_Text_172841:: @ 8172841 +PlayersHouse_1F_Text_ReportFromPetalburgGym:: @ 8172841 .string "INTERVIEWER: Das war unsere Reportage\n" .string "über die ARENA in BLÜTENBURG CITY.$" -UnknownString_817288C: @ 817288C +PlayersHouse_1F_Text_TheresAMovieOnTV: @ 817288C .string "Da läuft gerade ein Film.\p" .string "Zwei Männer tanzen auf riesengroßen\n" .string "Klaviertasten.\p" @@ -97,7 +97,7 @@ UnknownString_81728E3: @ 81728E3 .string "Binde dir die TURBOTRETER zu und wirble\n" .string "den Staub der Straße auf!”$" -LittlerootTown_BrendansHouse_1F_Text_17298B:: @ 817298B +PlayersHouse_1F_Text_TicketFromBrineyCameForYou:: @ 817298B .string "VATER: Hm?\p" .string "Hey, das ist ja {PLAYER}!\p" .string "Du hast uns ja schon lange nicht mehr\n" @@ -109,7 +109,7 @@ LittlerootTown_BrendansHouse_1F_Text_17298B:: @ 817298B .string "Das soll ich dir von einem MR. BRACK\l" .string "geben.$" -LittlerootTown_BrendansHouse_1F_Text_172A7D:: @ 8172A7D +PlayersHouse_1F_Text_PortsInSlateportLilycove:: @ 8172A7D .string "VATER: Hm, ein TICKET für eine Fähre?\p" .string "Ich weiß, dass es in GRAPHITPORT CITY\n" .string "und SEEGRASULB CITY Anlegestellen für\l" @@ -119,14 +119,14 @@ LittlerootTown_BrendansHouse_1F_Text_172A7D:: @ 8172A7D .string "Dort wirst du lernen, dass der Weg eines\n" .string "TRAINERS niemals ein Ende findet.$" -LittlerootTown_BrendansHouse_1F_Text_172B5E:: @ 8172B5E +PlayersHouse_1F_Text_BetterGetBackToGym:: @ 8172B5E .string "Ich muss jetzt wieder in die ARENA von\n" .string "BLÜTENBURG CITY.\p" .string "Ich danke dir, dass du dich während\n" .string "meiner Abwesenheit um das Haus\l" .string "kümmerst.$" -LittlerootTown_BrendansHouse_1F_Text_172BBC:: @ 8172BBC +PlayersHouse_1F_Text_DadShouldStayLonger:: @ 8172BBC .string "MUTTER: Das ist wieder typisch dein\n" .string "VATER...\p" .string "Da kommt er das erste Mal nach ewigen\n" diff --git a/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc b/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc index 61fe3a85a..df9f08f05 100644 --- a/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc +++ b/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc @@ -1,8 +1,8 @@ -LittlerootTown_BrendansHouse_2F_Text_172E18:: @ 8172E18 +PlayersHouse_2F_Text_ClockIsStopped:: @ 8172E18 .string "Die Uhr ist stehen geblieben...\p" .string "Stelle sie besser ein und ziehe sie auf.$" -LittlerootTown_BrendansHouse_2F_Text_172E4C:: @ 8172E4C +PlayersHouse_2F_Text_HowDoYouLikeYourRoom:: @ 8172E4C .string "MUTTER: {PLAYER}, wie gefällt dir dein\n" .string "neues Zimmer?\p" .string "Gut! Alles ist wunderbar aufgeräumt!\p" @@ -21,7 +21,7 @@ UnknownString_8172F31: @ 8172F31 UnknownString_8172F85: @ 8172F85 .string "{PLAYER} schaltet den PC ein.$" -LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A +PlayersHouse_2F_Text_Notebook:: @ 8172F9A .string "{PLAYER} schlägt das Notizbuch auf.\p" .string "REGEL NR. 1 FÜR ABENTEURER\n" .string "Öffne das MENÜ mit START.\p" @@ -29,11 +29,11 @@ LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A .string "Speichere den Fortschritt mit SICHERN.\p" .string "Die übrigen Seiten sind leer.$" -Text_LookCloserAtMap: @ 817303D +Common_Text_LookCloserAtMap: @ 817303D .string "{PLAYER} schaut sich die Karte der\n" .string "HOENN-Region genauer an.$" -LittlerootTown_BrendansHouse_2F_Text_17306C:: @ 817306C +PlayersHouse_2F_Text_ItsAGameCube:: @ 817306C .string "Das ist ein Nintendo GameCube.\p" .string "Ein Game Boy Advance ist angeschlossen\n" .string "und dient als Controller.$" diff --git a/data-de/maps/LittlerootTown_MaysHouse_1F/text.inc b/data-de/maps/LittlerootTown_MaysHouse_1F/text.inc index a4fab5261..54ff79127 100644 --- a/data-de/maps/LittlerootTown_MaysHouse_1F/text.inc +++ b/data-de/maps/LittlerootTown_MaysHouse_1F/text.inc @@ -1,5 +1,5 @@ -LittlerootTown_BrendansHouse_1F_Text_1730C2:: @ 81730C2 -LittlerootTown_MaysHouse_1F_Text_1730C2:: @ 81730C2 +RivalsHouse_1F_Text_OhYoureTheNewNeighbor:: @ 81730C2 +RivalsHouse_1F_Text_OhYoureTheNewNeighbor:: @ 81730C2 .string "Oh, hallo. Wer bist du?\p" .string "... ... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ... ...\p" @@ -11,22 +11,22 @@ LittlerootTown_MaysHouse_1F_Text_1730C2:: @ 81730C2 .string "schließen.\p" .string "Lauf doch mal die Treppe hoch...$" -LittlerootTown_BrendansHouse_1F_Text_1731C6:: @ 81731C6 +RivalsHouse_1F_Text_RivalIsUpstairsIThink:: @ 81731C6 .string "Mein/e {STR_VAR_1} ist oben.$" -LittlerootTown_BrendansHouse_1F_Text_1731E3:: @ 81731E3 +RivalsHouse_1F_Text_WhereHasHusbandGone:: @ 81731E3 .string "Wo ist denn nur mein Mann? Und gerade\n" .string "jetzt, wo {PLAYER}{KUN} uns besucht...\p" .string "Dieser Mann kann einfach nicht\n" .string "entspannen... Er ist wohl im LABOR.$" -LittlerootTown_BrendansHouse_1F_Text_173262:: @ 8173262 +RivalsHouse_1F_Text_WentOutSomewhere:: @ 8173262 .string "Oh, {RIVAL} ist irgendwohin gegangen.\p" .string "Wie der Vater, so das Kind.\n" .string "{RIVAL} kann einfach nicht stillsitzen\l" .string "oder zu Hause bleiben.$" -LittlerootTown_BrendansHouse_1F_Text_1732B9:: @ 81732B9 +RivalsHouse_1F_Text_ShouldGoHomeEverySoOften:: @ 81732B9 .string "Ich glaube, es ist wunderbar für Leute,\n" .string "mit ihren POKéMON zu reisen.\p" .string "Aber du solltest öfter nach Hause\n" diff --git a/data-de/maps/LittlerootTown_MaysHouse_2F/text.inc b/data-de/maps/LittlerootTown_MaysHouse_2F/text.inc index df7f564ba..4e0940088 100644 --- a/data-de/maps/LittlerootTown_MaysHouse_2F/text.inc +++ b/data-de/maps/LittlerootTown_MaysHouse_2F/text.inc @@ -1,8 +1,8 @@ -LittlerootTown_BrendansHouse_2F_Text_17337E:: @ 817337E +RivalsHouse_2F_Text_MayGettingReady:: @ 817337E .string "POKéMON: Bei guter Gesundheit!\n" .string "Items: Verstaut. Fehlt noch... Was?$" -LittlerootTown_BrendansHouse_2F_Text_1733AF:: @ 81733AF +RivalsHouse_2F_Text_MayWhoAreYou:: @ 81733AF .string "Was?\n" .string "Wer... Wer bist du denn?\p" .string "... ... ... ... ... ... ... ...\n" @@ -28,11 +28,11 @@ LittlerootTown_BrendansHouse_2F_Text_1733AF:: @ 81733AF .string "wilde POKéMON zu fangen!\p" .string "{PLAYER}{KUN}, wir treffen uns später!$" -LittlerootTown_BrendansHouse_2F_Text_1735C9:: @ 81735C9 +RivalsHouse_2F_Text_BrendanGettingReady:: @ 81735C9 .string "POKéMON: Bei guter Gesundheit!\n" .string "Items: Verstaut. Fehlt noch... Was?$" -LittlerootTown_BrendansHouse_2F_Text_1735FC:: @ 81735FC +RivalsHouse_2F_Text_BrendanWhoAreYou:: @ 81735FC .string "Hey!\n" .string "Du...\p" .string "Wer bist du denn?\p" @@ -54,7 +54,7 @@ LittlerootTown_BrendansHouse_2F_Text_1735FC:: @ 81735FC .string "wilde POKéMON zu fangen.\p" .string "Ein anderes Mal, okay?$" -LittlerootTown_BrendansHouse_2F_Text_1737AE:: @ 81737AE +RivalsHouse_2F_Text_MayJustCheckingMyPokedex:: @ 81737AE .string "MAIKE: {PLAYER}{KUN}!\p" .string "Ich prüfe gerade meinen POKéDEX.\p" .string "Es gibt eine Menge POKéMON, die ich\n" @@ -64,13 +64,13 @@ LittlerootTown_BrendansHouse_2F_Text_1737AE:: @ 81737AE .string "Jetzt überlege ich, wo ich hingehen soll,\n" .string "um weitere POKéMON zu fangen.$" -LittlerootTown_BrendansHouse_2F_Text_173883:: @ 8173883 +RivalsHouse_2F_Text_MayWhereShouldIGoNext:: @ 8173883 .string "MAIKE: Ich überlege, wo ich hingehen\n" .string "soll, um weitere POKéMON zu fangen.\p" .string "Wäre es nicht lustig, wenn wir uns dabei\n" .string "über den Weg laufen würden?$" -LittlerootTown_BrendansHouse_2F_Text_1738F2:: @ 81738F2 +RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex:: @ 81738F2 .string "BRIX: Hey, {PLAYER}!\p" .string "Ich prüfe gerade meinen POKéDEX.\p" .string "Es gibt noch viele POKéMON, die ich\n" @@ -79,7 +79,7 @@ LittlerootTown_BrendansHouse_2F_Text_1738F2:: @ 81738F2 .string "Immer wenn ich den POKéDEX betrachte,\n" .string "bekomme ich Lust zum Reisen.$" -LittlerootTown_BrendansHouse_2F_Text_1739CC:: @ 81739CC +RivalsHouse_2F_Text_BrendanWhereShouldIGoNext:: @ 81739CC .string "BRIX: Ich habe lange überlegt, wo ich\n" .string "hingehen soll, um weitere POKéMON\l" .string "zu fangen.\p" diff --git a/data-de/maps/LittlerootTown_ProfessorBirchsLab/text.inc b/data-de/maps/LittlerootTown_ProfessorBirchsLab/text.inc index a142a3b2f..3e57ac72f 100644 --- a/data-de/maps/LittlerootTown_ProfessorBirchsLab/text.inc +++ b/data-de/maps/LittlerootTown_ProfessorBirchsLab/text.inc @@ -5,7 +5,7 @@ UnknownString_8173A9D: @ 8173A9D .string "Es biegt sich unter der Last der Bücher,\n" .string "die PROF. BIRK geschrieben hat.$" -LittlerootTown_ProfessorBirchsLab_Text_173B29:: @ 8173B29 +LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork:: @ 8173B29 .string "Wie? PROF. BIRK?\p" .string "Der PROF arbeitet an einer Feld-Studie.\n" .string "Also ist er nicht hier.\p" @@ -19,19 +19,19 @@ LittlerootTown_ProfessorBirchsLab_Text_173B29:: @ 8173B29 .string "draußen in der freien Natur die Dinge\l" .string "beobachten und studieren.$" -LittlerootTown_ProfessorBirchsLab_Text_173C88:: @ 8173C88 +LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork:: @ 8173C88 .string "Der PROF ist kein Typ, der am Schreib-\n" .string "tisch arbeiten kann. Er muss einfach\l" .string "draußen in der freien Natur die Dinge\l" .string "beobachten und studieren.$" -LittlerootTown_ProfessorBirchsLab_Text_173D15:: @ 8173D15 +LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo:: @ 8173D15 .string "PROF. BIRK studiert den Lebensraum\n" .string "und die Verbreitung von POKéMON.\p" .string "Der PROF freut sich über die Mitarbeit\n" .string "von {RIVAL}. Da spürt man Zuneigung!$" -LittlerootTown_ProfessorBirchsLab_Text_173D94:: @ 8173D94 +LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon:: @ 8173D94 .string "PROF. BIRK: Du bist also {PLAYER}{KUN}!\p" .string "Dein Vater hat mir schon viel von dir\n" .string "erzählt.\p" @@ -46,11 +46,11 @@ LittlerootTown_ProfessorBirchsLab_Text_173D94:: @ 8173D94 .string "schenken, das du dabei benutzt hast.\p" .string "{PLAYER} erhält {STR_VAR_1}!$" -LittlerootTown_ProfessorBirchsLab_Text_173EF8:: @ 8173EF8 +LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon:: @ 8173EF8 .string "PROF. BIRK: Willst du dem\n" .string "{STR_VAR_1} einen Kosenamen geben?$" -LittlerootTown_ProfessorBirchsLab_Text_173F3D:: @ 8173F3D +LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival:: @ 8173F3D .string "PROF. BIRK: Wenn du dich erst einmal\n" .string "mit POKéMON beschäftigst und Er-\l" .string "fahrungen sammelst, wirst du bestimmt\l" @@ -60,24 +60,24 @@ LittlerootTown_ProfessorBirchsLab_Text_173F3D:: @ 8173F3D .string "Hast du nicht Lust, {RIVAL} dort\n" .string "zu suchen?$" -LittlerootTown_ProfessorBirchsLab_Text_174015:: @ 8174015 +LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou:: @ 8174015 .string "PROF. BIRK: Großartig!\n" .string "{RIVAL} wird sich auch sehr freuen.\p" .string "{RIVAL} soll dir beibringen, was es\n" .string "bedeutet, ein TRAINER zu sein.$" -LittlerootTown_ProfessorBirchsLab_Text_174075:: @ 8174075 +LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay:: @ 8174075 .string "PROF. BIRK: Ach, sei doch nicht so!\n" .string "Du solltest dich wirklich mit meinem\l" .string "Sprössling treffen!$" -LittlerootTown_ProfessorBirchsLab_Text_1740B4:: @ 81740B4 +LittlerootTown_ProfessorBirchsLab_Text_BirchRivalRoute103:: @ 81740B4 .string "PROF. BIRK: {RIVAL} muss irgendwo\n" .string "auf der ROUTE 103 zu finden sein.\p" .string "Falls du müde bist - oder deine\n" .string "POKéMON - ruh dich zu Hause aus.$" -LittlerootTown_ProfessorBirchsLab_Text_17411F:: @ 817411F +LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex:: @ 817411F .string "PROF. BIRK: Oh, hallo, {PLAYER}{KUN}!\p" .string "Ich habe gehört, du hast {RIVAL} \n" .string "besiegt! Super! Das war dein erster\l" @@ -90,10 +90,10 @@ LittlerootTown_ProfessorBirchsLab_Text_17411F:: @ 817411F .string "schungen. Aber ich denke, du kannst\l" .string "den POKéDEX auch gebrauchen.$" -LittlerootTown_ProfessorBirchsLab_Text_17422F:: @ 817422F +LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex:: @ 817422F .string "{PLAYER} erhält den POKéDEX!$" -LittlerootTown_ProfessorBirchsLab_Text_174248:: @ 8174248 +LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex:: @ 8174248 .string "PROF. BIRK: Der POKéDEX ist ein hoch\n" .string "entwickeltes, technisches Gerät, das\l" .string "automatisch jedes POKéMON, das du\l" @@ -104,19 +104,19 @@ LittlerootTown_ProfessorBirchsLab_Text_174248:: @ 8174248 .string "zeigt mir den Eintrag im POKéDEX,\l" .string "während ich draußen forsche.$" -LittlerootTown_ProfessorBirchsLab_Text_17436C:: @ 817436C +LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait:: @ 817436C .string "PROF. BIRK: Unzählige POKéMON erwarten\n" .string "dich bereits.\p" .string "Hach, ich muss jetzt auch dringend\n" .string "wieder meinen Forschungen nachgehen.$" -LittlerootTown_ProfessorBirchsLab_Text_1743D4:: @ 81743D4 +LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese:: @ 81743D4 .string "MAIKE: Oh, wow, {PLAYER}{KUN}!\n" .string "Jetzt hast du auch einen POKéDEX!\p" .string "Das ist ja toll! Genau wie ich!\n" .string "Ich habe hier etwas für dich!$" -LittlerootTown_ProfessorBirchsLab_Text_17443D:: @ 817443D +LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls:: @ 817443D .string "MAIKE: Es macht unheimlich viel Spaß, all\n" .string "die verschiedenen POKéMON zu fangen!\p" .string "Ich schaue mich wirklich überall um, denn\n" @@ -125,20 +125,20 @@ LittlerootTown_ProfessorBirchsLab_Text_17443D:: @ 817443D .string "Sobald ich niedliche POKéMON entdecke,\n" .string "fange ich sie mit POKéBÄLLEN.$" -LittlerootTown_ProfessorBirchsLab_Text_1744F0:: @ 81744F0 +LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull:: @ 81744F0 .string "Oh! Dein BEUTEL ist voll.$" -LittlerootTown_ProfessorBirchsLab_Text_174505:: @ 8174505 +LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext:: @ 8174505 .string "MAIKE: Ich frage mich, wo ich jetzt nach\n" .string "weiteren POKéMON suchen soll.$" -LittlerootTown_ProfessorBirchsLab_Text_17453C:: @ 817453C +LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese:: @ 817453C .string "BRIX: Ach...\n" .string "Du hast auch einen POKéDEX.\p" .string "Na, dann.\n" .string "Ich gebe dir dies.$" -LittlerootTown_ProfessorBirchsLab_Text_17458C:: @ 817458C +LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls:: @ 817458C .string "BRIX: Weißt du, je mehr POKéMON du\n" .string "besitzt, desto mehr Spaß macht es.\p" .string "Ich reise viel umher, um die unter-\n" @@ -146,24 +146,24 @@ LittlerootTown_ProfessorBirchsLab_Text_17458C:: @ 817458C .string "Und wenn ich ein cooles POKéMON sehe,\n" .string "versuche ich natürlich, es zu fangen.$" -LittlerootTown_ProfessorBirchsLab_Text_17465B:: @ 817465B +LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull:: @ 817465B .string "Hey, dein BEUTEL ist voll.$" -LittlerootTown_ProfessorBirchsLab_Text_174671:: @ 8174671 +LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext:: @ 8174671 .string "BRIX: Und wo soll ich jetzt mal nach\n" .string "POKéMON suchen?$" -LittlerootTown_ProfessorBirchsLab_Text_1746A2:: @ 81746A2 +LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine:: @ 81746A2 .string "Das ist eine kompliziert aussehende\n" .string "Maschine. Der PROF wird sie für seine\l" .string "Forschungen brauchen...$" -LittlerootTown_ProfessorBirchsLab_Text_1746E7:: @ 81746E7 +LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch:: @ 81746E7 .string "Ein PC, der in der Forschung eingesetzt\n" .string "wird. Besser nicht damit spielen!$" -LittlerootTown_ProfessorBirchsLab_Text_174724:: @ 8174724 +LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon:: @ 8174724 .string "Es ist voll mit Büchern über POKéMON.$" -LittlerootTown_ProfessorBirchsLab_Text_174748:: @ 8174748 +LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead:: @ 8174748 .string "Dieses Buch ist viel zu kompliziert...$" diff --git a/data/event_scripts.s b/data/event_scripts.s index ccaa7db6a..354fbf4c6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -881,7 +881,7 @@ Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA EventScript_RegionMap:: @ 81A02D6 lockall - msgbox Text_LookCloserAtMap, MSGBOX_DEFAULT + msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK special FieldShowRegionMap waitstate @@ -1059,8 +1059,7 @@ Text_NoRegisteredItem: @ 81A0FCC .string "An item in the BAG can be registered\n" .string "on SELECT for convenience.$" -LittlerootTown_BrendansHouse_2F_Text_1A100C:: @ 81A100C -LittlerootTown_MaysHouse_2F_Text_1A100C:: @ 81A100C +gText_PokemonTrainerSchoolEmail:: @ 81A100C .string "There's an e-mail from POKéMON TRAINER\n" .string "SCHOOL.\p" .string "... ... ... ... ... ...\p" @@ -1069,8 +1068,7 @@ LittlerootTown_MaysHouse_2F_Text_1A100C:: @ 81A100C .string "move sets chosen for POKéMON.\p" .string "... ... ... ... ... ...$" -LittlerootTown_BrendansHouse_2F_Text_1A10D6:: @ 81A10D6 -LittlerootTown_MaysHouse_2F_Text_1A10D6:: @ 81A10D6 +gText_PlayerHouseBootPC:: @ 81A10D6 .string "{PLAYER} booted up the PC.$" FallarborTown_ContestLobby_Text_1A10EB:: @ 81A10EB diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 840de56f3..44d7c6014 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1529EB", + "script": "RivalsHouse_1F_EventScript_RivalMom", "flag": "FLAG_HIDE_BRENDAN_MOM" }, { @@ -108,7 +108,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_152789" + "script": "LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom" } ], "bg_events": [] diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index e3073b374..284448c4e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -1,93 +1,93 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B - map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_15264B - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_15268A - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0 + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_OnFrame .byte 0 -LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B +LittlerootTown_BrendansHouse_1F_OnLoad:: @ 815264B compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_152660 - call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_152673 + call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual end -LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 +LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes:: @ 8152660 setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1 setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1 return -LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 +LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual:: @ 8152673 checkplayergender compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual return -LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 +LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual:: @ 8152680 setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, 1 return -LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A +LittlerootTown_BrendansHouse_1F_OnTransition:: @ 815268A compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526C4 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526AC + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526B8 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV end -LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC +LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs:: @ 81526AC setobjectxyperm 1, 8, 4 setobjectmovementtype 1, 7 return -LittlerootTown_BrendansHouse_1F_EventScript_1526B8:: @ 81526B8 +LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV:: @ 81526B8 setobjectxyperm 1, 4, 5 setobjectmovementtype 1, 7 return -LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4 +LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor:: @ 81526C4 setobjectxyperm 1, 9, 8 setobjectmovementtype 1, 7 return -LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733 - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744 - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE +LittlerootTown_BrendansHouse_1F_OnFrame:: @ 81526D0 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 -LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA +LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81526FA lockall - msgbox LittlerootTown_BrendansHouse_1F_Text_172574, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT closemessage - applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_152720 - applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs + applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs waitmovement 0 warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 waitstate releaseall end -LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 +LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs:: @ 8152720 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 +LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn:: @ 8152722 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 + goto PlayersHouse_1F_EventScript_EnterHouseMovingIn end -LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 +LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport:: @ 8152733 lockall setvar VAR_0x8004, 0 setvar VAR_0x8005, 1 - goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF + goto PlayersHouse_1F_EventScript_PetalburgGymReportMale end -LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 +LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 8152744 lockall playse SE_PIN applymovement 4, Common_Movement_ExclamationMark @@ -95,16 +95,16 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 applymovement 4, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782 + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall end -LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 +LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach:: @ 8152782 walk_down walk_right walk_right @@ -113,11 +113,11 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 walk_right step_end -LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 +LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom:: @ 8152789 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 + goto PlayersHouse_1F_EventScript_MomGoSeeRoom end diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/text.inc b/data/maps/LittlerootTown_BrendansHouse_1F/text.inc index 3362819b8..c4f6451bd 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/text.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/text.inc @@ -1,8 +1,8 @@ -LittlerootTown_BrendansHouse_1F_Text_172429:: @ 8172429 +PlayersHouse_1F_Text_IsntItNiceInHere:: @ 8172429 .string "MOM: See, {PLAYER}?\n" .string "Isn't it nice in here, too?$" -LittlerootTown_BrendansHouse_1F_Text_172453:: @ 8172453 +PlayersHouse_1F_Text_MoversPokemonGoSetClock:: @ 8172453 .string "The mover's POKéMON do all the work\n" .string "of moving us in and cleaning up after.\l" .string "This is so convenient!\p" @@ -12,74 +12,70 @@ LittlerootTown_BrendansHouse_1F_Text_172453:: @ 8172453 .string "our move here.\l" .string "Don't forget to set it!$" -LittlerootTown_BrendansHouse_1F_Text_172531:: @ 8172531 +PlayersHouse_1F_Text_ArentYouInterestedInRoom:: @ 8172531 .string "MOM: Well, {PLAYER}?\p" .string "Aren't you interested in seeing your\n" .string "very own room?$" -LittlerootTown_BrendansHouse_1F_Text_172574:: @ 8172574 -LittlerootTown_MaysHouse_1F_Text_172574:: @ 8172574 +PlayersHouse_1F_Text_GoSetTheClock:: @ 8172574 .string "MOM: {PLAYER}.\p" .string "Go set the clock in your room, honey.$" -LittlerootTown_BrendansHouse_1F_Text_1725A3:: @ 81725A3 +PlayersHouse_1F_Text_OhComeQuickly:: @ 81725A3 .string "MOM: Oh! {PLAYER}, {PLAYER}!\n" .string "Quick! Come quickly!$" -LittlerootTown_BrendansHouse_1F_Text_1725C9:: @ 81725C9 -LittlerootTown_MaysHouse_1F_Text_1725C9:: @ 81725C9 +PlayersHouse_1F_Text_MaybeDadWillBeOn:: @ 81725C9 .string "MOM: Look! It's PETALBURG GYM!\n" .string "Maybe DAD will be on!$" -LittlerootTown_BrendansHouse_1F_Text_1725FE:: @ 81725FE -LittlerootTown_MaysHouse_1F_Text_1725FE:: @ 81725FE +PlayersHouse_1F_Text_ItsOverWeMissedHim:: @ 81725FE .string "MOM: Oh... It's over.\p" .string "I think DAD was on, but we missed him.\n" .string "Too bad.$" -LittlerootTown_BrendansHouse_1F_Text_172644:: @ 8172644 -LittlerootTown_MaysHouse_1F_Text_172644:: @ 8172644 +PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor:: @ 8172644 .string "Oh, yes.\n" .string "One of DAD's friends lives in town.\p" .string "PROF. BIRCH is his name.\p" .string "He lives right next door, so you should\n" .string "go over and introduce yourself.$" -LittlerootTown_BrendansHouse_1F_Text_1726D2:: @ 81726D2 +PlayersHouse_1F_Text_SeeYouHoney:: @ 81726D2 .string "MOM: See you, honey!$" -LittlerootTown_BrendansHouse_1F_Text_1726E7:: @ 81726E7 +PlayersHouse_1F_Text_DidYouMeetProfBirch:: @ 81726E7 .string "MOM: Did you introduce yourself to\n" .string "PROF. BIRCH?$" -LittlerootTown_BrendansHouse_1F_Text_172717:: @ 8172717 +PlayersHouse_1F_Text_YouShouldRestABit:: @ 8172717 .string "MOM: How are you doing, {PLAYER}?\n" .string "You look a little tired.\p" .string "I think you should rest a bit.$" -LittlerootTown_BrendansHouse_1F_Text_17276B:: @ 817276B +PlayersHouse_1F_Text_TakeCareHoney:: @ 817276B .string "MOM: Take care, honey!$" -LittlerootTown_BrendansHouse_1F_Text_172782:: @ 8172782 +PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom:: @ 8172782 .string "MOM: Oh? Did DAD give you that BADGE?\p" .string "Then here's something from your MOM!$" -LittlerootTown_BrendansHouse_1F_Text_1727CD:: @ 81727CD +PlayersHouse_1F_Text_DontPushYourselfTooHard:: @ 81727CD .string "Don't push yourself too hard, dear.\n" .string "You can always come home.\p" .string "Go for it, honey!$" -LittlerootTown_BrendansHouse_1F_Text_17281D:: @ 817281D +PlayersHouse_1F_Text_Machoke1:: @ 817281D .string "Gyao, gyao gyaoh...$" -LittlerootTown_BrendansHouse_1F_Text_172831:: @ 8172831 +PlayersHouse_1F_Text_Machoke2:: @ 8172831 .string "Gwagwah gwah...$" -LittlerootTown_BrendansHouse_1F_Text_172841:: @ 8172841 +PlayersHouse_1F_Text_ReportFromPetalburgGym:: @ 8172841 .string "INTERVIEWER: ...We brought you this\n" .string "report from in front of PETALBURG GYM.$" -UnknownString_817288C: @ 817288C +PlayersHouse_1F_Text_TheresAMovieOnTV: @ 817288C .string "There is a movie on TV.\p" .string "Two men are dancing on a big piano\n" .string "keyboard.\p" @@ -93,7 +89,7 @@ UnknownString_81728E3: @ 81728E3 .string "“Lace up your RUNNING SHOES and hit\n" .string "the road running!”$" -LittlerootTown_BrendansHouse_1F_Text_17298B:: @ 817298B +PlayersHouse_1F_Text_TicketFromBrineyCameForYou:: @ 817298B .string "DAD: Hm?\p" .string "Hey, it's {PLAYER}!\p" .string "It's been a while since I saw you,\n" @@ -104,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_Text_17298B:: @ 817298B .string "This came to you from someone named\l" .string "MR. BRINEY.$" -LittlerootTown_BrendansHouse_1F_Text_172A7D:: @ 8172A7D +PlayersHouse_1F_Text_PortsInSlateportLilycove:: @ 8172A7D .string "DAD: Hm, a TICKET for a ferry?\p" .string "If I recall, there are ferry ports in\n" .string "SLATEPORT and LILYCOVE.\p" @@ -113,12 +109,12 @@ LittlerootTown_BrendansHouse_1F_Text_172A7D:: @ 8172A7D .string "It should teach you that there is\n" .string "no end to a TRAINER's chosen path.$" -LittlerootTown_BrendansHouse_1F_Text_172B5E:: @ 8172B5E +PlayersHouse_1F_Text_BetterGetBackToGym:: @ 8172B5E .string "I'd better get back to PETALBURG GYM.\p" .string "MOM, thanks for looking after the house\n" .string "while I'm away.$" -LittlerootTown_BrendansHouse_1F_Text_172BBC:: @ 8172BBC +PlayersHouse_1F_Text_DadShouldStayLonger:: @ 8172BBC .string "MOM: That DAD of yours...\p" .string "He comes home for the first time in a\n" .string "while, but all he talks about is POKéMON.\p" diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 53ab5668d..9787a57b6 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -211,7 +211,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_15281E" + "script": "LittlerootTown_BrendansHouse_2F_EventScript_PC" }, { "type": "sign", @@ -219,7 +219,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_152867" + "script": "PlayersHouse_2F_EventScript_Notebook" }, { "type": "sign", @@ -235,7 +235,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_152870" + "script": "PlayersHouse_2F_EventScript_GameCube" } ] } diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index bac89c25e..f12feef91 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -1,26 +1,26 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1527AF - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1527DA + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_OnWarp .byte 0 -LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF - call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_1527CE +LittlerootTown_BrendansHouse_2F_OnTransition:: @ 81527AF + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_RivalCheckingNotebook compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call SecretBase_EventScript_SetDecorationFlags setvar VAR_SECRET_BASE_INITIALIZED, 0 end -LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE +LittlerootTown_BrendansHouse_2F_EventScript_RivalCheckingNotebook:: @ 81527CE setobjectxyperm 1, 1, 2 setobjectmovementtype 1, 7 return -LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA - map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 +LittlerootTown_BrendansHouse_2F_OnWarp:: @ 81527DA + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor .2byte 0 -LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 +LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor:: @ 81527E4 checkplayergender compare VAR_RESULT, 0 goto_if_eq SecretBase_EventScript_InitDecorations @@ -47,20 +47,20 @@ LittlerootTown_BrendansHouse_2F_EventScript_152814:: @ 8152814 gUnknown_0815281E:: @ 815281E -LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E +LittlerootTown_BrendansHouse_2F_EventScript_PC:: @ 815281E lockall checkplayergender compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC end -LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 +LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC:: @ 8152837 setvar VAR_0x8004, 1 special DoPCTurnOnEffect playse SE_PC_ON - msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, MSGBOX_DEFAULT + msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT special BedroomPC waitstate releaseall @@ -73,17 +73,15 @@ gBrendanHouse_TurnPCOff:: @ 8152850 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_15285D:: @ 815285D - msgbox LittlerootTown_BrendansHouse_2F_Text_1A100C, MSGBOX_DEFAULT +LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC:: @ 815285D + msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_152867:: @ 8152867 -LittlerootTown_MaysHouse_2F_EventScript_152867:: @ 8152867 - msgbox LittlerootTown_BrendansHouse_2F_Text_172F9A, MSGBOX_SIGN +PlayersHouse_2F_EventScript_Notebook:: @ 8152867 + msgbox PlayersHouse_2F_Text_Notebook, MSGBOX_SIGN end -LittlerootTown_BrendansHouse_2F_EventScript_152870:: @ 8152870 -LittlerootTown_MaysHouse_2F_EventScript_152870:: @ 8152870 - msgbox LittlerootTown_BrendansHouse_2F_Text_17306C, MSGBOX_SIGN +PlayersHouse_2F_EventScript_GameCube:: @ 8152870 + msgbox PlayersHouse_2F_Text_ItsAGameCube, MSGBOX_SIGN end diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/text.inc b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc index 8ef358560..5d0451f68 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/text.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc @@ -1,8 +1,8 @@ -LittlerootTown_BrendansHouse_2F_Text_172E18:: @ 8172E18 +PlayersHouse_2F_Text_ClockIsStopped:: @ 8172E18 .string "The clock is stopped...\p" .string "Better set it and start it!$" -LittlerootTown_BrendansHouse_2F_Text_172E4C:: @ 8172E4C +PlayersHouse_2F_Text_HowDoYouLikeYourRoom:: @ 8172E4C .string "MOM: {PLAYER}, how do you like your\n" .string "new room?\p" .string "Good! Everything's put away neatly!\p" @@ -20,7 +20,7 @@ UnknownString_8172F31: @ 8172F31 UnknownString_8172F85: @ 8172F85 .string "{PLAYER} booted up the PC.$" -LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A +PlayersHouse_2F_Text_Notebook:: @ 8172F9A .string "{PLAYER} flipped open the notebook.\p" .string "ADVENTURE RULE NO. 1\n" .string "Open the MENU with START.\p" @@ -28,11 +28,11 @@ LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A .string "Record your progress with SAVE.\p" .string "The remaining pages are blank...$" -Text_LookCloserAtMap: @ 817303D +Common_Text_LookCloserAtMap: @ 817303D .string "{PLAYER} took a closer look at the\n" .string "HOENN region map.$" -LittlerootTown_BrendansHouse_2F_Text_17306C:: @ 817306C +PlayersHouse_2F_Text_ItsAGameCube:: @ 817306C .string "It's a Nintendo GameCube.\p" .string "A Game Boy Advance is connected to\n" .string "serve as the Controller.$" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 454ee4a85..fc6c45868 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1529EB", + "script": "RivalsHouse_1F_EventScript_RivalMom", "flag": "FLAG_HIDE_MAY_MOM" }, { @@ -108,7 +108,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", - "script": "LittlerootTown_MaysHouse_1F_EventScript_152A35" + "script": "LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom" } ], "bg_events": [] diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 59add7384..7569eb5bf 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -1,93 +1,93 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 - map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_152889 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1528C8 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_15290E + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_OnFrame .byte 0 -LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 +LittlerootTown_MaysHouse_1F_OnLoad:: @ 8152889 compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_lt LittlerootTown_MaysHouse_1F_EventScript_15289E - call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1528B1 + call_if_lt LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual end -LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E +LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes:: @ 815289E setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1 setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1 return -LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 +LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual:: @ 81528B1 checkplayergender compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE + goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual return -LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE +LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual:: @ 81528BE setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1 return -LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 +LittlerootTown_MaysHouse_1F_OnTransition:: @ 81528C8 compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_152902 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528EA + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528F6 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV end -LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA +LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs:: @ 81528EA setobjectxyperm 1, 2, 4 setobjectmovementtype 1, 7 return -LittlerootTown_MaysHouse_1F_EventScript_1528F6:: @ 81528F6 +LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV:: @ 81528F6 setobjectxyperm 1, 6, 5 setobjectmovementtype 1, 7 return -LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902 +LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor:: @ 8152902 setobjectxyperm 1, 1, 8 setobjectmovementtype 1, 7 return -LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_152960 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_152938 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_152971 - map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_152982 - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE +LittlerootTown_MaysHouse_1F_OnFrame:: @ 815290E + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 -LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 +LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 8152938 lockall - msgbox LittlerootTown_MaysHouse_1F_Text_172574, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT closemessage - applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_15295E - applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs + applymovement 1, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs waitmovement 0 warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end -LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E +LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs:: @ 815295E walk_up step_end -LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 +LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn:: @ 8152960 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 + goto PlayersHouse_1F_EventScript_EnterHouseMovingIn end -LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 +LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport:: @ 8152971 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end -LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 +LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 8152982 lockall playse SE_PIN applymovement 4, Common_Movement_ExclamationMark @@ -95,16 +95,16 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 applymovement 4, Common_Movement_Delay48 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1529C0 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 releaseall end -LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 +LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach:: @ 81529C0 walk_down walk_left walk_left @@ -127,42 +127,41 @@ LittlerootTown_MaysHouse_1F_EventScript_1529E1:: @ 81529E1 return LittlerootTown_MaysHouse_1F_EventScript_1529E2:: @ 81529E2 - msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB -LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB +RivalsHouse_1F_EventScript_RivalMom:: @ 81529EB lock faceplayer - goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A21 - goto_if_set FLAG_RIVAL_LEFT_FOR_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A17 + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, RivalsHouse_1F_EventScript_GoHomeEverySoOften + goto_if_set FLAG_RIVAL_LEFT_FOR_ROUTE103, RivalsHouse_1F_EventScript_RivalIsOutSomewhere compare VAR_LITTLEROOT_RIVAL_STATE, 3 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_WhereHasHusbandGone special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_RivalIsUpstairsIThink, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_152A17:: @ 8152A17 - msgbox LittlerootTown_BrendansHouse_1F_Text_173262, MSGBOX_DEFAULT +RivalsHouse_1F_EventScript_RivalIsOutSomewhere:: @ 8152A17 + msgbox RivalsHouse_1F_Text_WentOutSomewhere, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_152A21:: @ 8152A21 - msgbox LittlerootTown_BrendansHouse_1F_Text_1732B9, MSGBOX_DEFAULT +RivalsHouse_1F_EventScript_GoHomeEverySoOften:: @ 8152A21 + msgbox RivalsHouse_1F_Text_ShouldGoHomeEverySoOften, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B - msgbox LittlerootTown_BrendansHouse_1F_Text_1731E3, MSGBOX_DEFAULT +LittlerootTown_BrendansHouse_1F_EventScript_WhereHasHusbandGone:: @ 8152A2B + msgbox RivalsHouse_1F_Text_WhereHasHusbandGone, MSGBOX_DEFAULT release end -LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 +LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: @ 8152A35 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 + goto PlayersHouse_1F_EventScript_MomGoSeeRoom end diff --git a/data/maps/LittlerootTown_MaysHouse_1F/text.inc b/data/maps/LittlerootTown_MaysHouse_1F/text.inc index 5daf354f2..69185359f 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/text.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/text.inc @@ -1,5 +1,4 @@ -LittlerootTown_BrendansHouse_1F_Text_1730C2:: @ 81730C2 -LittlerootTown_MaysHouse_1F_Text_1730C2:: @ 81730C2 +RivalsHouse_1F_Text_OhYoureTheNewNeighbor:: @ 81730C2 .string "Oh, hello. And you are?\p" .string "... ... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ... ...\p" @@ -11,21 +10,21 @@ LittlerootTown_MaysHouse_1F_Text_1730C2:: @ 81730C2 .string "a new friend.\p" .string "Our {STR_VAR_1} is upstairs, I think.$" -LittlerootTown_BrendansHouse_1F_Text_1731C6:: @ 81731C6 +RivalsHouse_1F_Text_RivalIsUpstairsIThink:: @ 81731C6 .string "Our {STR_VAR_1} is upstairs, I think.$" -LittlerootTown_BrendansHouse_1F_Text_1731E3:: @ 81731E3 +RivalsHouse_1F_Text_WhereHasHusbandGone:: @ 81731E3 .string "Where has my husband gone?\n" .string "Just when {PLAYER}{KUN} is visiting, too...\p" .string "That man can never sit still for long...\n" .string "He might be at his LAB.$" -LittlerootTown_BrendansHouse_1F_Text_173262:: @ 8173262 +RivalsHouse_1F_Text_WentOutSomewhere:: @ 8173262 .string "Oh, {RIVAL} has gone out somewhere.\p" .string "Like father, like child.\n" .string "{RIVAL} can't stay quietly at home.$" -LittlerootTown_BrendansHouse_1F_Text_1732B9:: @ 81732B9 +RivalsHouse_1F_Text_ShouldGoHomeEverySoOften:: @ 81732B9 .string "I think it's wonderful for people to\n" .string "travel with POKéMON.\p" .string "But you should go home every so often\n" diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 349357f2e..990ece1c8 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -224,7 +224,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_MaysHouse_2F_EventScript_152870" + "script": "PlayersHouse_2F_EventScript_GameCube" }, { "type": "sign", @@ -232,7 +232,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_MaysHouse_2F_EventScript_152867" + "script": "PlayersHouse_2F_EventScript_Notebook" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_MaysHouse_2F_EventScript_152C39" + "script": "LittlerootTown_MaysHouse_2F_EventScript_PC" } ] } diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index c97ac979e..79bdc3d92 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -1,26 +1,26 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_152A5B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_152A86 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_OnWarp .byte 0 -LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B - call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A +LittlerootTown_MaysHouse_2F_OnTransition:: @ 8152A5B + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_RivalCheckingNotebook compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950 call SecretBase_EventScript_SetDecorationFlags setvar VAR_SECRET_BASE_INITIALIZED, 0 end -LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A +LittlerootTown_MaysHouse_2F_EventScript_RivalCheckingNotebook:: @ 8152A7A setobjectxyperm 1, 7, 2 setobjectmovementtype 1, 7 return -LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 - map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 +LittlerootTown_MaysHouse_2F_OnWarp:: @ 8152A86 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor .2byte 0 -LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 +LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor:: @ 8152A90 checkplayergender compare VAR_RESULT, 1 goto_if_eq SecretBase_EventScript_InitDecorations @@ -29,12 +29,12 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall - goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5 + goto_if_set FLAG_MET_RIVAL_LILYCOVE, RivalsHouse_2F_EventScript_RivalPostLilycove checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4 + call_if_eq RivalsHouse_2F_EventScript_May compare VAR_RESULT, 1 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A + call_if_eq RivalsHouse_2F_EventScript_Brendan playse SE_EXIT removeobject VAR_LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 @@ -44,8 +44,8 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 - msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_May:: @ 8152AD4 + msgbox RivalsHouse_2F_Text_MayGettingReady, MSGBOX_DEFAULT playbgm MUS_ENCOUNTER_MAY, TRUE applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 @@ -53,7 +53,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage compare VAR_FACING, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29 @@ -78,8 +78,8 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A - msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_Brendan:: @ 8152B4A + msgbox RivalsHouse_2F_Text_BrendanGettingReady, MSGBOX_DEFAULT playbgm MUS_ENCOUNTER_BRENDAN, TRUE applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 @@ -87,7 +87,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage compare VAR_FACING, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F @@ -107,34 +107,34 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 +RivalsHouse_2F_EventScript_RivalPostLilycove:: @ 8152BB5 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB + call_if_eq RivalsHouse_2F_EventScript_MayPostLilycove compare VAR_RESULT, 1 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED + call_if_eq RivalsHouse_2F_EventScript_BrendanPostLilycove setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB - goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF - msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_MayPostLilycove:: @ 8152BDB + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_MayWhereShouldIGoNext + msgbox RivalsHouse_2F_Text_MayJustCheckingMyPokedex, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED - goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08 - msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_BrendanPostLilycove:: @ 8152BED + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext + msgbox RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_2F_EventScript_152BFF:: @ 8152BFF - msgbox LittlerootTown_BrendansHouse_2F_Text_173883, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_MayWhereShouldIGoNext:: @ 8152BFF + msgbox RivalsHouse_2F_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08 - msgbox LittlerootTown_BrendansHouse_2F_Text_1739CC, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext:: @ 8152C08 + msgbox RivalsHouse_2F_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11 @@ -187,25 +187,25 @@ LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30 gUnknown_08152C39:: @ 8152C39 -LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 +LittlerootTown_MaysHouse_2F_EventScript_PC:: @ 8152C39 lockall checkplayergender compare VAR_RESULT, 0 - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC end -LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 - msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, MSGBOX_DEFAULT +LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC:: @ 8152C52 + msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT releaseall end -LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C +LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC:: @ 8152C5C setvar VAR_0x8004, 2 special DoPCTurnOnEffect playse SE_PC_ON - msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, MSGBOX_DEFAULT + msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT special BedroomPC waitstate releaseall diff --git a/data/maps/LittlerootTown_MaysHouse_2F/text.inc b/data/maps/LittlerootTown_MaysHouse_2F/text.inc index be7e7fea3..7aa2cc033 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/text.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/text.inc @@ -1,8 +1,8 @@ -LittlerootTown_BrendansHouse_2F_Text_17337E:: @ 817337E +RivalsHouse_2F_Text_MayGettingReady:: @ 817337E .string "POKéMON fully restored!\n" .string "Items ready, and... Huh?$" -LittlerootTown_BrendansHouse_2F_Text_1733AF:: @ 81733AF +RivalsHouse_2F_Text_MayWhoAreYou:: @ 81733AF .string "Huh?\n" .string "Who... Who are you?\p" .string "... ... ... ... ... ... ... ...\n" @@ -26,11 +26,11 @@ LittlerootTown_BrendansHouse_2F_Text_1733AF:: @ 81733AF .string "some wild POKéMON!\p" .string "{PLAYER}{KUN}, I'll catch you later!$" -LittlerootTown_BrendansHouse_2F_Text_1735C9:: @ 81735C9 +RivalsHouse_2F_Text_BrendanGettingReady:: @ 81735C9 .string "POKéMON fully restored...\n" .string "Items all packed, and...$" -LittlerootTown_BrendansHouse_2F_Text_1735FC:: @ 81735FC +RivalsHouse_2F_Text_BrendanWhoAreYou:: @ 81735FC .string "Hey!\n" .string "You...\p" .string "Who are you?\p" @@ -50,7 +50,7 @@ LittlerootTown_BrendansHouse_2F_Text_1735FC:: @ 81735FC .string "some wild POKéMON.\p" .string "Some other time, okay?$" -LittlerootTown_BrendansHouse_2F_Text_1737AE:: @ 81737AE +RivalsHouse_2F_Text_MayJustCheckingMyPokedex:: @ 81737AE .string "MAY: {PLAYER}{KUN}!\p" .string "I was just checking my POKéDEX.\p" .string "There's still a lot of POKéMON that\n" @@ -60,13 +60,13 @@ LittlerootTown_BrendansHouse_2F_Text_1737AE:: @ 81737AE .string "I wonder where I should go catch\n" .string "some POKéMON next?$" -LittlerootTown_BrendansHouse_2F_Text_173883:: @ 8173883 +RivalsHouse_2F_Text_MayWhereShouldIGoNext:: @ 8173883 .string "MAY: I wonder where I should go catch\n" .string "some POKéMON next?\p" .string "Wouldn't it be funny if we ran into each\n" .string "other, {PLAYER}{KUN}?$" -LittlerootTown_BrendansHouse_2F_Text_1738F2:: @ 81738F2 +RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex:: @ 81738F2 .string "BRENDAN: Hey, it's {PLAYER}.\p" .string "I was just checking out my POKéDEX.\p" .string "There are still many POKéMON that\n" @@ -75,7 +75,7 @@ LittlerootTown_BrendansHouse_2F_Text_1738F2:: @ 81738F2 .string "Checking this POKéDEX out gives me\n" .string "the urge to hit the road again.$" -LittlerootTown_BrendansHouse_2F_Text_1739CC:: @ 81739CC +RivalsHouse_2F_Text_BrendanWhereShouldIGoNext:: @ 81739CC .string "BRENDAN: I'm having a hard time deciding\n" .string "where I should catch POKéMON next.\p" .string "Hey, {PLAYER}, if I see you while I'm out\n" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 0e49ab79b..5296e7c26 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152D63", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Aide", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152EA3", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Rival", "flag": "FLAG_HIDE_RIVAL_BIRCH_LAB" } ], @@ -75,7 +75,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152E9A" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine" }, { "type": "sign", @@ -83,7 +83,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152E9A" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine" }, { "type": "sign", @@ -91,7 +91,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152EE2" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book" }, { "type": "sign", @@ -99,7 +99,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152EE2" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book" }, { "type": "sign", @@ -107,7 +107,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED9" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -115,7 +115,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED9" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -123,7 +123,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED9" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -131,7 +131,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED9" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -139,7 +139,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED9" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf" }, { "type": "sign", @@ -147,7 +147,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED0" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -155,7 +155,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED0" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -163,7 +163,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED0" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -171,7 +171,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED0" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -179,7 +179,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED0" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" }, { "type": "sign", @@ -187,7 +187,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED0" + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" } ] } diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index f72178096..7ab414beb 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -1,15 +1,15 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_OnFrame .byte 0 -LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92 +LittlerootTown_ProfessorBirchsLab_OnTransition:: @ 8152C92 call Common_EventScript_SetupRivalGfxId call ProfBirch_EventScript_UpdateLocation end -LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D +LittlerootTown_ProfessorBirchsLab_OnWarp:: @ 8152C9D map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7 .2byte 0 @@ -17,62 +17,62 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 turnobject OBJ_EVENT_ID_PLAYER, 2 end -LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC - map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE - map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A +LittlerootTown_ProfessorBirchsLab_OnFrame:: @ 8152CAC + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent .2byte 0 -LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE +LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent:: @ 8152CBE lockall bufferleadmonspeciesname 0 - message LittlerootTown_ProfessorBirchsLab_Text_173D94 + message LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon waitmessage playfanfare MUS_OBTAIN_ITEM waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO + msgbox LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival end -LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA +LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter:: @ 8152CEA setvar VAR_0x8004, 0 call Common_EventScript_NameReceivedPartyMon - goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA + goto LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival end -LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA - msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO +LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival:: @ 8152CFA + msgbox LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival end -LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 - msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival:: @ 8152D19 + msgbox LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou, MSGBOX_DEFAULT clearflag FLAG_HIDE_BOY_ROUTE101 setvar VAR_BIRCH_LAB_STATE, 3 releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B - msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO +LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: @ 8152D2B + msgbox LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival compare VAR_RESULT, NO - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival end -LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A +LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent:: @ 8152D4A lockall - applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_152D5B + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex waitmovement 0 - goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA + goto LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex end -LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B +LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex:: @ 8152D5B walk_up walk_up walk_up @@ -82,24 +82,24 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B walk_up step_end -LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 +LittlerootTown_ProfessorBirchsLab_EventScript_Aide:: @ 8152D63 lock faceplayer compare VAR_BIRCH_LAB_STATE, 3 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90 - goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86 - msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, MSGBOX_DEFAULT + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter + goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork, MSGBOX_DEFAULT setflag FLAG_BIRCH_AIDE_MET release end -LittlerootTown_ProfessorBirchsLab_EventScript_152D86:: @ 8152D86 - msgbox LittlerootTown_ProfessorBirchsLab_Text_173C88, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet:: @ 8152D86 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90 - msgbox LittlerootTown_ProfessorBirchsLab_Text_173D15, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter:: @ 8152D90 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo, MSGBOX_DEFAULT release end @@ -108,24 +108,24 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A faceplayer goto_if_unset FLAG_UNKNOWN_BIRCH_380, ProfBirch_EventScript_AskRatePokedex compare VAR_BIRCH_LAB_STATE, 5 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B - msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, MSGBOX_DEFAULT + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait + msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchRivalRoute103, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA - msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, MSGBOX_DEFAULT - call LittlerootTown_ProfessorBirchsLab_EventScript_152E6D - msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, MSGBOX_DEFAULT - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97 +LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 8152DBA + msgbox LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex, MSGBOX_DEFAULT + call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex + msgbox LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex, MSGBOX_DEFAULT + applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls compare VAR_RESULT, 1 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED setvar VAR_ROUTE102_ACCESSIBLE, 1 @@ -134,81 +134,81 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA releaseall end -LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 8152E13 + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese, MSGBOX_DEFAULT giveitem ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85 - msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, MSGBOX_DEFAULT + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls + msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return -LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 - msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 8152E40 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese, MSGBOX_DEFAULT giveitem ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E - msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, MSGBOX_DEFAULT + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls + msgbox LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return -LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D +LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 8152E6D playfanfare MUS_OBTAIN_ITEM - message LittlerootTown_ProfessorBirchsLab_Text_17422F + message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex waitfanfare waitmessage setflag FLAG_SYS_POKEDEX_GET return -LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B - msgbox LittlerootTown_ProfessorBirchsLab_Text_17436C, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait:: @ 8152E7B + msgbox LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_152E85:: @ 8152E85 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1744F0, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls:: @ 8152E85 + msgbox LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E - msgbox LittlerootTown_ProfessorBirchsLab_Text_17465B, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls:: @ 8152E8E + msgbox LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97 +LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer:: @ 8152E97 walk_down walk_in_place_fastest_left step_end -LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A - msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_Machine:: @ 8152E9A + msgbox LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 +LittlerootTown_ProfessorBirchsLab_EventScript_Rival:: @ 8152EA3 lock faceplayer checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext compare VAR_RESULT, 1 - call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext release end -LittlerootTown_ProfessorBirchsLab_EventScript_152EBE:: @ 8152EBE - msgbox LittlerootTown_ProfessorBirchsLab_Text_174505, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext:: @ 8152EBE + msgbox LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_152EC7:: @ 8152EC7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_174671, MSGBOX_DEFAULT +LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext:: @ 8152EC7 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_152ED0:: @ 8152ED0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1746E7, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_PC:: @ 8152ED0 + msgbox LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_152ED9:: @ 8152ED9 - msgbox LittlerootTown_ProfessorBirchsLab_Text_174724, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf:: @ 8152ED9 + msgbox LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon, MSGBOX_SIGN end -LittlerootTown_ProfessorBirchsLab_EventScript_152EE2:: @ 8152EE2 - msgbox LittlerootTown_ProfessorBirchsLab_Text_174748, MSGBOX_SIGN +LittlerootTown_ProfessorBirchsLab_EventScript_Book:: @ 8152EE2 + msgbox LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead, MSGBOX_SIGN end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc index 2faae7527..0166ba2d2 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc @@ -5,7 +5,7 @@ UnknownString_8173A9D: @ 8173A9D .string "It's brimming with books written by\n" .string "PROF. BIRCH.$" -LittlerootTown_ProfessorBirchsLab_Text_173B29:: @ 8173B29 +LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork:: @ 8173B29 .string "Hunh? PROF. BIRCH?\p" .string "The PROF's away on fieldwork.\n" .string "Ergo, he isn't here.\p" @@ -18,19 +18,19 @@ LittlerootTown_ProfessorBirchsLab_Text_173B29:: @ 8173B29 .string "rather go outside and experience\l" .string "things than read about them here.$" -LittlerootTown_ProfessorBirchsLab_Text_173C88:: @ 8173C88 +LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork:: @ 8173C88 .string "The PROF isn't one for doing desk work.\n" .string "He's the type of person who would\l" .string "rather go outside and experience\l" .string "things than read about them here.$" -LittlerootTown_ProfessorBirchsLab_Text_173D15:: @ 8173D15 +LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo:: @ 8173D15 .string "PROF. BIRCH is studying the habitats\n" .string "and distribution of POKéMON.\p" .string "The PROF enjoys {RIVAL}'s help, too.\n" .string "There's a lot of love there.$" -LittlerootTown_ProfessorBirchsLab_Text_173D94:: @ 8173D94 +LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon:: @ 8173D94 .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" .string "I've heard so much about you from\n" .string "your father.\p" @@ -45,11 +45,11 @@ LittlerootTown_ProfessorBirchsLab_Text_173D94:: @ 8173D94 .string "used earlier.\p" .string "{PLAYER} received the {STR_VAR_1}!$" -LittlerootTown_ProfessorBirchsLab_Text_173EF8:: @ 8173EF8 +LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon:: @ 8173EF8 .string "PROF. BIRCH: While you're at it, why not\n" .string "give a nickname to that {STR_VAR_1}?$" -LittlerootTown_ProfessorBirchsLab_Text_173F3D:: @ 8173F3D +LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival:: @ 8173F3D .string "PROF. BIRCH: If you work at POKéMON\n" .string "and gain experience, I think you'll make\l" .string "a darn good TRAINER.\p" @@ -58,23 +58,23 @@ LittlerootTown_ProfessorBirchsLab_Text_173F3D:: @ 8173F3D .string "It might not be a bad idea for you to\n" .string "go see {RIVAL}. What do you think?$" -LittlerootTown_ProfessorBirchsLab_Text_174015:: @ 8174015 +LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou:: @ 8174015 .string "PROF. BIRCH: Great!\n" .string "{RIVAL} should be happy, too.\p" .string "Get {RIVAL} to teach you what it\n" .string "means to be a TRAINER.$" -LittlerootTown_ProfessorBirchsLab_Text_174075:: @ 8174075 +LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay:: @ 8174075 .string "PROF. BIRCH: Oh, don't be that way.\n" .string "You should go meet my kid.$" -LittlerootTown_ProfessorBirchsLab_Text_1740B4:: @ 81740B4 +LittlerootTown_ProfessorBirchsLab_Text_BirchRivalRoute103:: @ 81740B4 .string "PROF. BIRCH: {RIVAL} should be on\n" .string "ROUTE 103 somewhere.\p" .string "If you or your POKéMON get tired,\n" .string "get some rest at home.$" -LittlerootTown_ProfessorBirchsLab_Text_17411F:: @ 817411F +LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex:: @ 817411F .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" .string "I heard you beat {RIVAL} on\n" .string "your first try. That's excellent!\p" @@ -86,10 +86,10 @@ LittlerootTown_ProfessorBirchsLab_Text_17411F:: @ 817411F .string "research, but I think you should have\l" .string "this POKéDEX.$" -LittlerootTown_ProfessorBirchsLab_Text_17422F:: @ 817422F +LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex:: @ 817422F .string "{PLAYER} received the POKéDEX!$" -LittlerootTown_ProfessorBirchsLab_Text_174248:: @ 8174248 +LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex:: @ 8174248 .string "PROF. BIRCH: The POKéDEX is a high-tech\n" .string "tool that automatically makes a record\l" .string "of any POKéMON you meet or catch.\p" @@ -100,19 +100,19 @@ LittlerootTown_ProfessorBirchsLab_Text_174248:: @ 8174248 .string "why, {RIVAL} looks for me while I'm out\l" .string "doing fieldwork, and shows me.$" -LittlerootTown_ProfessorBirchsLab_Text_17436C:: @ 817436C +LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait:: @ 817436C .string "PROF. BIRCH: Countless POKéMON await\n" .string "you!\p" .string "Argh, I'm getting the itch to get out\n" .string "and do fieldwork again!$" -LittlerootTown_ProfessorBirchsLab_Text_1743D4:: @ 81743D4 +LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese:: @ 81743D4 .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" .string "You got a POKéDEX, too!\p" .string "That's great! Just like me!\n" .string "I've got something for you, too!$" -LittlerootTown_ProfessorBirchsLab_Text_17443D:: @ 817443D +LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls:: @ 817443D .string "MAY: It's fun if you can get a lot of\n" .string "POKéMON!\p" .string "I'm going to look all over the place\n" @@ -120,20 +120,20 @@ LittlerootTown_ProfessorBirchsLab_Text_17443D:: @ 817443D .string "If I find any cute POKéMON, I'll catch\n" .string "them with POKé BALLS!$" -LittlerootTown_ProfessorBirchsLab_Text_1744F0:: @ 81744F0 +LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull:: @ 81744F0 .string "Oh? Your BAG's full.$" -LittlerootTown_ProfessorBirchsLab_Text_174505:: @ 8174505 +LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext:: @ 8174505 .string "MAY: I wonder where I should go look\n" .string "for POKéMON next?$" -LittlerootTown_ProfessorBirchsLab_Text_17453C:: @ 817453C +LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese:: @ 817453C .string "BRENDAN: Huh...\n" .string "So you got a POKéDEX, too.\p" .string "Well then, here.\n" .string "I'll give you this.$" -LittlerootTown_ProfessorBirchsLab_Text_17458C:: @ 817458C +LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls:: @ 817458C .string "BRENDAN: You know it's more fun to\n" .string "have a whole bunch of POKéMON.\p" .string "I'm going to explore all over the place\n" @@ -141,23 +141,23 @@ LittlerootTown_ProfessorBirchsLab_Text_17458C:: @ 817458C .string "If I find any cool POKéMON, you bet\n" .string "I'll try to get them with POKé BALLS.$" -LittlerootTown_ProfessorBirchsLab_Text_17465B:: @ 817465B +LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull:: @ 817465B .string "Hey, your BAG's full.$" -LittlerootTown_ProfessorBirchsLab_Text_174671:: @ 8174671 +LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext:: @ 8174671 .string "BRENDAN: Where should I look for\n" .string "POKéMON next...$" -LittlerootTown_ProfessorBirchsLab_Text_1746A2:: @ 81746A2 +LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine:: @ 81746A2 .string "It's a serious-looking machine.\n" .string "The PROF must use this for research.$" -LittlerootTown_ProfessorBirchsLab_Text_1746E7:: @ 81746E7 +LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch:: @ 81746E7 .string "It's a PC used for research.\n" .string "Better not mess around with it.$" -LittlerootTown_ProfessorBirchsLab_Text_174724:: @ 8174724 +LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon:: @ 8174724 .string "It's crammed with books on POKéMON.$" -LittlerootTown_ProfessorBirchsLab_Text_174748:: @ 8174748 +LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead:: @ 8174748 .string "It's a book that's too hard to read.$" diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 68aef1b37..be7f652f5 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -3,41 +3,39 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 setvar VAR_LITTLEROOT_INTRO_STATE, 5 return -LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 -LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 - msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 81B6956 + msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8005, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F + call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale compare VAR_0x8005, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B69AA - msgbox LittlerootTown_BrendansHouse_1F_Text_172453, MSGBOX_DEFAULT + call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale + msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 - applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_1B699F:: @ 81B699F +PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 81B699F applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA +PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 81B69AA applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5 +PlayersHouse_1F_Movement_PlayerWalkIn:: @ 81B69B5 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 -LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 - msgbox LittlerootTown_BrendansHouse_1F_Text_172531, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 81B69B7 + msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC @@ -60,7 +58,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 - msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, MSGBOX_DEFAULT + msgbox PlayersHouse_2F_Text_ClockIsStopped, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B delay 30 setvar VAR_LITTLEROOT_INTRO_STATE, 6 @@ -84,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT + msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 waitmovement 0 @@ -97,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT + msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 waitmovement 0 @@ -153,14 +151,14 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF +PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 81B6ABF applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC waitmovement 0 playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE - msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB waitmovement 0 @@ -169,8 +167,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, MSGBOX_DEFAULT - msgbox LittlerootTown_BrendansHouse_1F_Text_172644, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 @@ -185,7 +183,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 waitmovement 0 playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE - msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE waitmovement 0 @@ -194,8 +192,8 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, MSGBOX_DEFAULT - msgbox LittlerootTown_MaysHouse_1F_Text_172644, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 @@ -210,7 +208,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D waitmovement 0 applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_OhComeQuickly, MSGBOX_DEFAULT closemessage return @@ -218,7 +216,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT fadedefaultbgm special TurnOffTVScreen setflag FLAG_SYS_TV_HOME @@ -261,33 +259,33 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 compare VAR_LITTLEROOT_INTRO_STATE, 7 goto_if_ge LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C - msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33 - msgbox LittlerootTown_BrendansHouse_1F_Text_172BBC, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_DadShouldStayLonger, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 - msgbox LittlerootTown_BrendansHouse_1F_Text_172782, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT giveitem ITEM_AMULET_COIN compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT setflag FLAG_RECEIVED_AMULET_COIN release end LittlerootTown_BrendansHouse_1F_EventScript_1B6C72:: @ 81B6C72 - msgbox LittlerootTown_BrendansHouse_1F_Text_172717, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_YouShouldRestABit, MSGBOX_DEFAULT goto LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A end LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80 - msgbox LittlerootTown_BrendansHouse_1F_Text_1726D2, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_SeeYouHoney, MSGBOX_DEFAULT release end @@ -295,12 +293,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A:: @ 81B6C8A closemessage call Common_EventScript_OutOfCenterPartyHeal incrementgamestat GAME_STAT_RESTED_AT_HOME - msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_TakeCareHoney, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C:: @ 81B6C9C - msgbox LittlerootTown_BrendansHouse_1F_Text_1726E7, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_DidYouMeetProfBirch, MSGBOX_DEFAULT release end @@ -310,7 +308,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6 faceplayer waitse playmoncry SPECIES_MACHOKE, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_Machoke1, MSGBOX_DEFAULT waitmoncry release end @@ -321,7 +319,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 faceplayer waitse playmoncry SPECIES_MACHOKE, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_172831, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_Machoke2, MSGBOX_DEFAULT waitmoncry release end @@ -354,8 +352,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE -LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE +PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 81B6CDE lockall checkplayergender compare VAR_RESULT, 0 @@ -378,15 +375,15 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 - msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT giveitem ITEM_SS_TICKET - msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE - msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_BetterGetBackToGym, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 9c22f6595..5d7c2edf7 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -36,7 +36,7 @@ EventScript_1A6EF1: end EventScript_1A6F01: - msgbox UnknownString_817288C, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_TheresAMovieOnTV, MSGBOX_DEFAULT releaseall end