diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 54dbbe586..ae108f142 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -681,17 +681,17 @@ gStdScripts_End:: .include "data/maps/Route109_SeashoreHouse/text.inc" .include "data/maps/Route110_TrickHouseEntrance/text.inc" -Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8 +Route110_TrickHousePuzzle1_Text_FoundAScroll:: @ 819C1B8 .string "{PLAYER} findet eine Schriftrolle.$" -Route110_TrickHousePuzzle1_Text_19C1CB:: @ 819C1CB +Route110_TrickHousePuzzle1_Text_MemorizedTheCode:: @ 819C1CB .string "{PLAYER} lernt den geheimen Code, der\n" .string "auf der Schriftrolle steht, auswendig.$" -Route110_TrickHousePuzzle1_Text_19C1FF:: @ 819C1FF +Route110_TrickHousePuzzle1_Text_SecretCodeOnIt:: @ 819C1FF .string "Dort steht ein geheimer Code.$" -UnknownString_819C21F: @ 819C21F +Route110_TrickHousePuzzle_Text_DoorLockedWriteSecretCodeHere: @ 819C21F .string "Die Tür ist verschlossen.\p" .string "Bei näherer Betrachtung findet sich\n" .string "ein Hinweis. “Schreibe hier den\l" @@ -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 @@ -1036,7 +1036,7 @@ UnknownString_81A0E68: @ 81A0E68 UnknownString_81A0ED6: @ 81A0ED6 .string "Womit soll ich mir die Zeit vertreiben?$" -LilycoveCity_DepartmentStoreElevator_Text_1A0EF6:: @ 81A0EF6 +LilycoveCity_DepartmentStoreElevator_Text_WhichFloorWouldYouLike:: @ 81A0EF6 .string "Willkommen im SEEGRASULB CITY\n" .string "EINKAUFSZENTRUM.\p" .string "In welches Stockwerk möchtest du?$" @@ -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,15 +1073,15 @@ 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 .string "Die Verbindung wurde abgebrochen.$" -MossdeepCity_StevensHouse_Text_1A1102:: @ 81A1102 -RustboroCity_DevonCorp_2F_Text_1A1102:: @ 81A1102 +gText_NicknameReceivedPokemon:: @ 81A1102 +gText_NicknameReceivedPokemon:: @ 81A1102 .string "Möchtest du {STR_VAR_2} einen\n" .string "Kosenamen geben?$" @@ -1094,7 +1094,7 @@ UnknownString_81A1141: @ 81A1141 .string "mehr!\p" .string "{PLAYER} wird ohnmächtig!$" -SlateportCity_Text_1A116E:: @ 81A116E +gText_ComeBackWithSecretPower:: @ 81A116E .string "Kennst du die TM GEHEIMPOWER?\p" .string "In unserer Gruppe mögen alle die TM\n" .string "GEHEIMPOWER.\p" @@ -1369,9 +1369,9 @@ SlateportCity_PokemonFanClub_EventScript_1AE0AC:: @ 81AE0AC release end -FallarborTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 +FallarborTown_ContestLobby_EventScript_Reporter:: @ 81AE0B6 LilycoveCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 -SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 +SlateportCity_ContestLobby_EventScript_Reporter:: @ 81AE0B6 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 lock faceplayer @@ -1606,7 +1606,7 @@ Text_RepelWoreOff: @ 81C33EF MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 0 getpricereduction 2 compare VAR_RESULT, 0 @@ -1618,7 +1618,7 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 1 getpricereduction 2 compare VAR_RESULT, 0 diff --git a/data-de/maps/AbandonedShip_CaptainsOffice/text.inc b/data-de/maps/AbandonedShip_CaptainsOffice/text.inc index 8d5c30655..ebdacec30 100644 --- a/data-de/maps/AbandonedShip_CaptainsOffice/text.inc +++ b/data-de/maps/AbandonedShip_CaptainsOffice/text.inc @@ -1,18 +1,18 @@ -AbandonedShip_CaptainsOffice_Text_198C85:: @ 8198C85 +AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner:: @ 8198C85 .string "Ich untersuche das Schiff im Auftrag\n" .string "von KAPT. BRIGG.\p" .string "Er hat mich auch beauftragt, einen\n" .string "SCANNER zu finden, aber ich habe \l" .string "ihn noch nicht gefunden.$" -AbandonedShip_CaptainsOffice_Text_198D00:: @ 8198D00 +AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner:: @ 8198D00 .string "Oh! Das ist der SCANNER!\p" .string "Würdest du den bitte für mich zu\n" .string "KAPT. BRIGG bringen? Das wäre nett.\p" .string "Ich möchte das Schiff noch weiter\n" .string "untersuchen.$" -AbandonedShip_CaptainsOffice_Text_198D7B:: @ 8198D7B +AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus:: @ 8198D7B .string "Dieses Schiff heißt MS CACTUS. Es\n" .string "scheint aus einer früheren Epoche zu\l" .string "stammen.$" diff --git a/data-de/maps/AbandonedShip_Corridors_1F/text.inc b/data-de/maps/AbandonedShip_Corridors_1F/text.inc index 90091e04f..4ee7cc292 100644 --- a/data-de/maps/AbandonedShip_Corridors_1F/text.inc +++ b/data-de/maps/AbandonedShip_Corridors_1F/text.inc @@ -1,15 +1,15 @@ -AbandonedShip_Corridors_1F_Text_19843D:: @ 819843D +AbandonedShip_Corridors_1F_Text_CharlieIntro:: @ 819843D .string "Was ist so lustig daran, dass ich meinen\n" .string "Schwimmreifen mit an Bord habe?$" -AbandonedShip_Corridors_1F_Text_198479:: @ 8198479 +AbandonedShip_Corridors_1F_Text_CharlieDefeat:: @ 8198479 .string "Hui, du hast mir die Luft rausgelassen!$" -AbandonedShip_Corridors_1F_Text_198493:: @ 8198493 +AbandonedShip_Corridors_1F_Text_CharliePostBattle:: @ 8198493 .string "Es ist gar nicht so einfach, POKéBÄLLE\n" .string "zu werfen, wenn man einen Schwimmreifen\l" .string "trägt!$" -AbandonedShip_Corridors_1F_Text_1984D8:: @ 81984D8 +AbandonedShip_Corridors_1F_Text_IsntItFunHere:: @ 81984D8 .string "Hier ist es doch wirklich lustig, nicht\n" .string "wahr? Ich bin total aufgeregt.$" diff --git a/data-de/maps/AbandonedShip_Rooms2_1F/text.inc b/data-de/maps/AbandonedShip_Rooms2_1F/text.inc index 39c1dd614..9bbb28d06 100644 --- a/data-de/maps/AbandonedShip_Rooms2_1F/text.inc +++ b/data-de/maps/AbandonedShip_Rooms2_1F/text.inc @@ -1,70 +1,70 @@ -AbandonedShip_Rooms2_1F_Text_1987C1:: @ 81987C1 +AbandonedShip_Rooms2_1F_Text_HalIntro:: @ 81987C1 .string "PIT: Wir haben nach Schätzen gesucht\n" .string "- und einen TRAINER gefunden!$" -AbandonedShip_Rooms2_1F_Text_1987FE:: @ 81987FE +AbandonedShip_Rooms2_1F_Text_HalDefeat:: @ 81987FE .string "PIT: Wir konnten nicht gewinnen, obwohl\n" .string "wir zusammengearbeitet haben...$" -AbandonedShip_Rooms2_1F_Text_198835:: @ 8198835 +AbandonedShip_Rooms2_1F_Text_HalPostBattle:: @ 8198835 .string "PIT: Wir konnten keine Schätze finden.\n" .string "Ob uns jemand zuvorgekommen ist?$" -AbandonedShip_Rooms2_1F_Text_19887F:: @ 819887F +AbandonedShip_Rooms2_1F_Text_HalNeedTwoPokemon:: @ 819887F .string "PIT: Du hast keine zwei POKéMON.\n" .string "So kannst du nicht gegen uns antreten.$" -AbandonedShip_Rooms2_1F_Text_1988CC:: @ 81988CC +AbandonedShip_Rooms2_1F_Text_LoisIntro:: @ 81988CC .string "GESA: Oh? Wir haben nach Schätzen\n" .string "gesucht und einen TRAINER gefunden.$" -AbandonedShip_Rooms2_1F_Text_198916:: @ 8198916 +AbandonedShip_Rooms2_1F_Text_LoisDefeat:: @ 8198916 .string "GESA: Oh, wow, bist du stark!$" -AbandonedShip_Rooms2_1F_Text_198934:: @ 8198934 +AbandonedShip_Rooms2_1F_Text_LoisPostBattle:: @ 8198934 .string "GESA: Ich frage mich, wo die Schätze\n" .string "versteckt sind...\p" .string "Ich weiß, was ich mir alles kaufen\n" .string "würde, wenn ich reich wäre...$" -AbandonedShip_Rooms2_1F_Text_19899A:: @ 819899A +AbandonedShip_Rooms2_1F_Text_LoisNeedTwoPokemon:: @ 819899A .string "GESA: Hast du keine zwei POKéMON?\n" .string "Dann können wir jetzt nicht kämpfen.$" -AbandonedShip_Rooms2_1F_Text_1989DF:: @ 81989DF +AbandonedShip_Rooms2_1F_Text_HalRematchIntro:: @ 81989DF .string "PIT: Wir haben die ganze Zeit nur nach\n" .string "Schätzen gesucht.\p" .string "Aber unsere POKéMON sind auch stärker\n" .string "geworden. Dürfen wir dir das zeigen?$" -AbandonedShip_Rooms2_1F_Text_198A53:: @ 8198A53 +AbandonedShip_Rooms2_1F_Text_HalRematchDefeat:: @ 8198A53 .string "PIT: Du bist stark wie immer.$" -AbandonedShip_Rooms2_1F_Text_198A70:: @ 8198A70 +AbandonedShip_Rooms2_1F_Text_HalRematchPostBattle:: @ 8198A70 .string "PIT: Wir haben keine Schätze gefunden,\n" .string "sondern gegen POKéMON verloren...\p" .string "Ich will nach Hause... Aber wenn ich das\n" .string "laut sage, wird sie sauer auf mich.$" -AbandonedShip_Rooms2_1F_Text_198AEE:: @ 8198AEE +AbandonedShip_Rooms2_1F_Text_HalRematchNeedTwoPokemon:: @ 8198AEE .string "PIT: Du hast keine zwei POKéMON.\n" .string "So können wir nicht kämpfen.$" -AbandonedShip_Rooms2_1F_Text_198B3B:: @ 8198B3B +AbandonedShip_Rooms2_1F_Text_LoisRematchIntro:: @ 8198B3B .string "GESA: Oh, da bist du ja wieder!\p" .string "Genau wie wir, hast du die Suche nach\n" .string "Schätzen auch nicht aufgegeben, was?\p" .string "Wie wäre es mit einem Kampf? Und der\n" .string "Verlierer gibt die Suche auf?$" -AbandonedShip_Rooms2_1F_Text_198BCF:: @ 8198BCF +AbandonedShip_Rooms2_1F_Text_LoisRematchDefeat:: @ 8198BCF .string "GESA: Ach, wir haben wieder verloren...$" -AbandonedShip_Rooms2_1F_Text_198BEA:: @ 8198BEA +AbandonedShip_Rooms2_1F_Text_LoisRematchPostBattle:: @ 8198BEA .string "GESA: Wir müssen unsere POKéMON mehr\n" .string "trainieren.\p" .string "Wir gehen nicht ohne Schatz nach Hause!$" -AbandonedShip_Rooms2_1F_Text_198C40:: @ 8198C40 +AbandonedShip_Rooms2_1F_Text_LoisRematchNeedTwoPokemon:: @ 8198C40 .string "GESA: Hast du keine zwei POKéMON?\n" .string "Dann müssen wir später kämpfen.$" diff --git a/data-de/maps/AbandonedShip_Rooms2_B1F/text.inc b/data-de/maps/AbandonedShip_Rooms2_B1F/text.inc index 1eeb3c110..bdc1f18cd 100644 --- a/data-de/maps/AbandonedShip_Rooms2_B1F/text.inc +++ b/data-de/maps/AbandonedShip_Rooms2_B1F/text.inc @@ -1,4 +1,4 @@ -AbandonedShip_Rooms2_B1F_Text_198759:: @ 8198759 +AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring:: @ 8198759 .string "Ein perfekter Ort, auf Erkundungstour\n" .string "zu gehen. Es ist aufregend hier!\p" .string "Ich wette, hier sind wertvolle Schätze\n" diff --git a/data-de/maps/AbandonedShip_Rooms_1F/text.inc b/data-de/maps/AbandonedShip_Rooms_1F/text.inc index 8e5c0f910..8bd486c60 100644 --- a/data-de/maps/AbandonedShip_Rooms_1F/text.inc +++ b/data-de/maps/AbandonedShip_Rooms_1F/text.inc @@ -1,4 +1,4 @@ -AbandonedShip_Rooms_1F_Text_19850A:: @ 819850A +AbandonedShip_Rooms_1F_Text_TakingALookAround:: @ 819850A .string "Schiffe dieser Art sind sehr selten,\n" .string "daher schaue ich mich hier gut um.\p" .string "Hmhm...\n" diff --git a/data-de/maps/AbandonedShip_Rooms_B1F/text.inc b/data-de/maps/AbandonedShip_Rooms_B1F/text.inc index 6bf155e54..a52f58a33 100644 --- a/data-de/maps/AbandonedShip_Rooms_B1F/text.inc +++ b/data-de/maps/AbandonedShip_Rooms_B1F/text.inc @@ -1,4 +1,4 @@ -AbandonedShip_Rooms_B1F_Text_1986FE:: @ 81986FE +AbandonedShip_Rooms_B1F_Text_GettingQueasy:: @ 81986FE .string "Bööörps...\p" .string "Mir wird schon übel, sobald ich ein\n" .string "Schiff nur betrete...\p" diff --git a/data-de/maps/DewfordTown/text.inc b/data-de/maps/DewfordTown/text.inc index a714d2672..3b164e4b7 100644 --- a/data-de/maps/DewfordTown/text.inc +++ b/data-de/maps/DewfordTown/text.inc @@ -1,81 +1,81 @@ -DewfordTown_Text_16B23B:: @ 816B23B +DewfordTown_Text_TinyIslandCommunity:: @ 816B23B .string "FAUSTAUHAVEN ist eine kleine\n" .string "Inselgemeinschaft. Wenn hier etwas in\l" .string "Mode kommt, will jeder es haben.$" -DewfordTown_Text_16B2A7:: @ 816B2A7 +DewfordTown_Text_TownSign:: @ 816B2A7 .string "FAUSTAUHAVEN\n" .string "“Eine kleine Insel im blauen Meer.”$" -DewfordTown_Text_16B2D5:: @ 816B2D5 +DewfordTown_Text_GymSign:: @ 816B2D5 .string "POKéMON ARENA von FAUSTAUHAVEN\n" .string "LEITER: KAMILLO\l" .string "“Eine große Welle des Kampfes!”$" -DewfordTown_Text_16B317:: @ 816B317 +DewfordTown_Text_HallSign:: @ 816B317 .string "FAUSTAUHAVEN HALLE\n" .string "“Die Informationsbörse für jedermann!”$" -Route104_Text_16B347:: @ 816B347 +Route104_Text_LandedInDewfordDeliverLetter:: @ 816B347 .string "MR. BRACK: Ahoi! Wir haben in\n" .string "FAUSTAUHAVEN Anker geworfen.\p" .string "Ich vermute, du wirst diesen BRIEF\n" .string "jetzt diesem... TROY bringen!?!$" -DewfordTown_Text_16B3BC:: @ 816B3BC +DewfordTown_Text_SetSailBackToPetalburg:: @ 816B3BC .string "MR. BRACK: Hast du den BRIEF\n" .string "überbracht?\p" .string "Oder meinst du, wir müssen zurück\n" .string "nach BLÜTENBURG CITY segeln?$" -DewfordTown_Text_16B417:: @ 816B417 +DewfordTown_Text_PetalburgWereSettingSail2:: @ 816B417 .string "MR. BRACK: BLÜTENBURG CITY...\n" .string "In Ordnung.\p" .string "Anker gelichtet!\n" .string "PECKO, mein Schatz, wir setzen Segel!$" -DewfordTown_Text_16B471:: @ 816B471 +DewfordTown_Text_GoDeliverIllBeWaiting:: @ 816B471 .string "MR. BRACK: Dann bring den BRIEF zu\n" .string "seinem Empfänger. Ich warte hier.$" -Route104_Text_16B4B5:: @ 816B4B5 -Route109_Text_16B4B5:: @ 816B4B5 +Route104_Text_BrineyLandedInDewford:: @ 816B4B5 +Route109_Text_BrineyLandedInDewford:: @ 816B4B5 .string "MR. BRACK: Ahoi! Wir haben in\n" .string "FAUSTAUHAVEN Anker geworfen!\p" .string "Komm, wenn wir wieder Segel\n" .string "setzen sollen.$" -DewfordTown_Text_16B522:: @ 816B522 +DewfordTown_Text_WhereAreWeBound:: @ 816B522 .string "MR. BRACK: Ahoi! Für dich segle ich zu\n" .string "jeder Zeit überall hin.\p" .string "Nun, mein Freund, wohin soll es gehen?$" -DewfordTown_Text_16B57D:: @ 816B57D +DewfordTown_Text_PetalburgWereSettingSail:: @ 816B57D .string "MR. BRACK: BLÜTENBURG CITY soll es sein?\p" .string "Anker gelichtet!\n" .string "PECKO, mein Schatz, wir setzen Segel!$" -DewfordTown_Text_16B5D2:: @ 816B5D2 +DewfordTown_Text_SlateportWereSettingSail:: @ 816B5D2 .string "MR. BRACK: GRAPHITPORT CITY soll\n" .string "es sein?\p" .string "Anker gelichtet!\n" .string "PECKO, mein Schatz, wir setzen Segel!$" -DewfordTown_Text_16B627:: @ 816B627 +DewfordTown_Text_JustTellMeWhenYouNeedToSetSail:: @ 816B627 .string "MR. BRACK: Sag mir, wenn wir wieder\n" .string "Segel setzen sollen.$" -DewfordTown_Text_16B665:: @ 816B665 +DewfordTown_Text_GettingItchToFish:: @ 816B665 .string "Dies ist ein berühmter Angelplatz.\n" .string "Hast du Lust zu angeln?$" -DewfordTown_Text_16B6A8:: @ 816B6A8 +DewfordTown_Text_GiveYouOneOfMyRods:: @ 816B6A8 .string "Ich habe dir genau zugehört und mir\n" .string "gefällt, was du gesagt hast!\p" .string "Ich werde dir eine meiner ANGELN\n" .string "geben.$" -DewfordTown_Text_16B6F9:: @ 816B6F9 +DewfordTown_Text_ThrowInFishingAdvice:: @ 816B6F9 .string "Und, als kleine Zugabe, gebe ich dir noch\n" .string "einige Tipps zum Angeln!\p" .string "Schau dir zuerst das Wasser an und dann\n" @@ -87,19 +87,19 @@ DewfordTown_Text_16B6F9:: @ 816B6F9 .string "immer wieder kurz die ANGEL anheben,\l" .string "um etwas an Land zu ziehen.$" -DewfordTown_Text_16B828:: @ 816B828 +DewfordTown_Text_ThatsTooBadThen:: @ 816B828 .string "Oh, wirklich?\n" .string "Das ist aber schade.$" -DewfordTown_Text_16B84E:: @ 816B84E +DewfordTown_Text_HowsYourFishing:: @ 816B84E .string "Yeah!\n" .string "Wie steht's mit deinen Angelkünsten?$" -DewfordTown_Text_16B866:: @ 816B866 +DewfordTown_Text_GreatHaulInSomeBigOnes:: @ 816B866 .string "Also, wenn das stimmt... Das wäre\n" .string "großartig! Petri heil!$" -DewfordTown_Text_16B89A:: @ 816B89A +DewfordTown_Text_FishingAdvice:: @ 816B89A .string "Hey, lass den Kopf nicht hängen! Ich\n" .string "gebe dir einige Tipps zum Angeln!\p" .string "Schau dir zuerst das Wasser an\n" @@ -111,7 +111,7 @@ DewfordTown_Text_16B89A:: @ 816B89A .string "immer wieder kurz die ANGEL anheben,\l" .string "um etwas an Land zu ziehen.$" -DewfordTown_Text_16B9CE:: @ 816B9CE +DewfordTown_Text_XIsTheBiggestHappeningThingRight:: @ 816B9CE .string "Ich mag, was hip, aufregend und modern\n" .string "ist. So etwas probiere ich immer aus.\p" .string "Hast du schon einmal was von\n" @@ -125,13 +125,13 @@ DewfordTown_Text_16B9CE:: @ 816B9CE .string "“{STR_VAR_1}”\l" .string "ist das Aufregendste überhaupt!$" -DewfordTown_Text_16BADC:: @ 816BADC +DewfordTown_Text_TellMeWhatsNewAndIn:: @ 816BADC .string "Wie bitte?\n" .string "Es ist nicht hip und aufregend?\p" .string "Nun, hey, dann verrate mir aber, was\n" .string "wirklich cool und “in” ist?$" -DewfordTown_Text_16BB44:: @ 816BB44 +DewfordTown_Text_OfCourseIKnowAboutThat:: @ 816BB44 .string "Was?\n" .string "“{STR_VAR_2}”?\p" .string "... ...\p" @@ -149,22 +149,22 @@ DewfordTown_Text_16BB44:: @ 816BB44 .string "“{STR_VAR_2}” ist das,\n" .string "was vital und zeitgemäß ist!$" -DewfordTown_Text_16BCA2:: @ 816BCA2 +DewfordTown_Text_XHuhIThinkYIsCool:: @ 816BCA2 .string "Hmm...\n" .string "“{STR_VAR_2}”, oder?\p" .string "Aber ich persönlich finde,\n" .string "“{STR_VAR_1}”\l" .string "ist das Coolste überhaupt!$" -DewfordTown_Text_16BCE9:: @ 816BCE9 +DewfordTown_Text_HearOfAnyTrendsComeShareWithMe:: @ 816BCE9 .string "Wenn du irgendetwas über neue, auf-\n" .string "regende Sachen hörst, erzähl mir davon!$" -DewfordTown_Text_16BD37:: @ 816BD37 +DewfordTown_Text_YeahDefinitionOfInRightNow:: @ 816BD37 .string "Yeah, absolut richtig!\p" .string "“{STR_VAR_1}” ist die\n" .string "Definition von “in”.$" -DewfordTown_Text_16BD79: @ 816BD79 +DewfordTown_Text_PinnacleOfCool: @ 816BD79 .string "“{STR_VAR_2}” ist\n" .string "die Spitze der Coolness im Moment.$" diff --git a/data-de/maps/DewfordTown_Gym/text.inc b/data-de/maps/DewfordTown_Gym/text.inc index 3cc2fb9f4..12eeedcc8 100644 --- a/data-de/maps/DewfordTown_Gym/text.inc +++ b/data-de/maps/DewfordTown_Gym/text.inc @@ -1,4 +1,4 @@ -DewfordTown_Gym_Text_174D98:: @ 8174D98 +DewfordTown_Gym_Text_GymGuideAdvice:: @ 8174D98 .string "Na, wie sieht es aus, auf dem Weg zum\n" .string "CHAMP, {PLAYER}?\p" .string "FAUSTAUHAVENS ARENALEITER KAMILLO\n" @@ -14,31 +14,31 @@ DewfordTown_Gym_Text_174D98:: @ 8174D98 .string "heller!\p" .string "Also, dann leg mal los!$" -DewfordTown_Gym_Text_174F1E:: @ 8174F1E +DewfordTown_Gym_Text_GymGuidePostVictory:: @ 8174F1E .string "Huuh! Das ist mir hier aber schon zu hell!\p" .string "Deine Zukunft wird strahlend hell sein!$" -DewfordTown_Gym_Text_174F61:: @ 8174F61 +DewfordTown_Gym_Text_HidekiIntro:: @ 8174F61 .string "Die Macht bestimmt alles!\n" .string "Komm schon!$" -DewfordTown_Gym_Text_174F7A:: @ 8174F7A +DewfordTown_Gym_Text_HidekiDefeat:: @ 8174F7A .string "Nicht genug Macht...$" -DewfordTown_Gym_Text_174F8E:: @ 8174F8E +DewfordTown_Gym_Text_HidekiPostBattle:: @ 8174F8E .string "Gegen dein Talent ist meine Macht\n" .string "machtlos. Deine Technik ist super!$" -DewfordTown_Gym_Text_174FCE:: @ 8174FCE +DewfordTown_Gym_Text_TessaIntro:: @ 8174FCE .string "Man muss doch KAMILLO nicht mit so\n" .string "etwas Nichtigem belästigen!\p" .string "Ich mache dich fertig!$" -DewfordTown_Gym_Text_175009:: @ 8175009 +DewfordTown_Gym_Text_TessaDefeat:: @ 8175009 .string "Aber... Wie...?\n" .string "Wie konnte ich nur so schnell verlieren?$" -DewfordTown_Gym_Text_175031:: @ 8175031 +DewfordTown_Gym_Text_TessaPostBattle:: @ 8175031 .string "Ich werde diese Niederlage nicht ab-\n" .string "haken. Sie wird mich beim Training\l" .string "motivieren!\p" @@ -47,21 +47,21 @@ DewfordTown_Gym_Text_175031:: @ 8175031 .string "Nein! Ich werde der CHAMP der\n" .string "POKéMON LIGA!$" -DewfordTown_Gym_Text_1750C9:: @ 81750C9 +DewfordTown_Gym_Text_LauraIntro:: @ 81750C9 .string "Du forderst mich heraus? Dann wundere\n" .string "dich nicht, wenn du weinst wie ein Baby!$" -DewfordTown_Gym_Text_175104:: @ 8175104 +DewfordTown_Gym_Text_LauraDefeat:: @ 8175104 .string "Waaaaahaaaaaa!\n" .string "Schluchz! Schnief! Ich habe verloooren!$" -DewfordTown_Gym_Text_175117:: @ 8175117 +DewfordTown_Gym_Text_LauraPostBattle:: @ 8175117 .string "Ich kämpfe im Dunkeln, das macht mich\n" .string "mutiger und trainiert mein Herz.\p" .string "Weil es hier so dunkel ist, habe ich noch\n" .string "nie das Gesicht von KAMILLO gesehen.$" -DewfordTown_Gym_Text_175182:: @ 8175182 +DewfordTown_Gym_Text_BrawlyIntro:: @ 8175182 .string "Ich bin KAMILLO!\n" .string "Der ARENALEITER von FAUSTAUHAVEN!\p" .string "Ich habe die wilden Strudel dieser\n" @@ -70,18 +70,18 @@ DewfordTown_Gym_Text_175182:: @ 8175182 .string "Du willst mich wirklich herausfordern?\n" .string "Dann zeig mir, woraus du gemacht bist!$" -DewfordTown_Gym_Text_175246:: @ 8175246 +DewfordTown_Gym_Text_BrawlyDefeat:: @ 8175246 .string "Huihuihui! Du hast eine größere Welle\n" .string "produziert, als ich dir zugetraut hätte.\p" .string "Du hast mich absaufen lassen!\p" .string "Okay, du hast mich erwischt!\n" .string "Nimm den ORDEN dieser ARENA!$" -DewfordTown_Gym_Text_1752BB:: @ 81752BB +DewfordTown_Gym_Text_ReceivedKnuckleBadge:: @ 81752BB .string "{PLAYER} erhält den KNÖCHELORDEN von\n" .string "KAMILLO.$" -DewfordTown_Gym_Text_1752E6:: @ 81752E6 +DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis:: @ 81752E6 .string "Dank des KNÖCHELORDENS werden dir alle\n" .string "POKéMON bis Level 30 gehorchen, auch\l" .string "die, die du durch Tausch erhalten hast.\p" @@ -90,21 +90,21 @@ DewfordTown_Gym_Text_1752E6:: @ 81752E6 .string "Und wenn du magst, kannst du auch diese\n" .string "TECHNISCHE MASCHINE anwenden.$" -DewfordTown_Gym_Text_1753BF:: @ 81753BF +DewfordTown_Gym_Text_ExplainBulkUp:: @ 81753BF .string "Die TM08 enthält PROTZER.\p" .string "Diese Attacke hebt den Status des\n" .string "ANGRIFFS und der VERTEIDIGUNG.$" -DewfordTown_Gym_Text_175412:: @ 8175412 +DewfordTown_Gym_Text_BrawlyPostBattle:: @ 8175412 .string "Ich sehe in dir ein Talent, das eines\n" .string "Tages zu einer riesigen Welle wird und\l" .string "einen Sturm des Erstaunens bei anderen\l" .string "TRAINERN entfachen wird!$" -DewfordTown_Gym_Text_175477:: @ 8175477 +DewfordTown_Gym_Text_GymStatue:: @ 8175477 .string "POKéMON ARENA von FAUSTAUHAVEN$" -DewfordTown_Gym_Text_175490:: @ 8175490 +DewfordTown_Gym_Text_GymStatueCertified:: @ 8175490 .string "POKéMON ARENA von FAUSTAUHAVEN\p" .string "KAMILLOS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/DewfordTown_Hall/text.inc b/data-de/maps/DewfordTown_Hall/text.inc index 4921793d7..c3f01e95b 100644 --- a/data-de/maps/DewfordTown_Hall/text.inc +++ b/data-de/maps/DewfordTown_Hall/text.inc @@ -1,53 +1,53 @@ -DewfordTown_Hall_Text_1754C9:: @ 81754C9 +DewfordTown_Hall_Text_CantImagineLifeWithoutTrend:: @ 81754C9 .string "Was in ist? Nun, mit Sicherheit\n" .string "“{STR_VAR_1}”!\p" .string "Ich kann mir ein Leben ohne\n" .string "“{STR_VAR_1}” nicht\l" .string "vorstellen!$" -DewfordTown_Hall_Text_175528:: @ 8175528 +DewfordTown_Hall_Text_GettingBoredOfTrend:: @ 8175528 .string "Was in ist? Nun, mit Sicherheit\n" .string "“{STR_VAR_1}”!\p" .string "Aber so langsam langweilt es mich.\p" .string "Ich sollte mich nach neuen Sachen\n" .string "umsehen.$" -DewfordTown_Hall_Text_17559E:: @ 817559E +DewfordTown_Hall_Text_TeachingMonAboutTrend:: @ 817559E .string "Ich bringe meinen POKéMON etwas über\n" .string "“{STR_VAR_1}” bei,\l" .string "aber es klappt nicht so recht.\p" .string "Scheinbar sind sie damit überfordert.$" -DewfordTown_Hall_Text_1755F9:: @ 81755F9 +DewfordTown_Hall_Text_DeepLinkBetweenXAndY:: @ 81755F9 .string "Ich vertiefe mich gerade in ein hippes\n" .string "“{STR_VAR_1}”.\p" .string "Gibt es eine enge Verbindung\n" .string "zwischen “{STR_VAR_1}”\l" .string "und “{STR_VAR_2}”?$" -DewfordTown_Hall_Text_175664:: @ 8175664 +DewfordTown_Hall_Text_MyHunchWasRight:: @ 8175664 .string "Oh!\n" .string "Da lag ich ja absolut richtig!\p" .string "Ich bin einen Schritt weiter in meinen\n" .string "Bemühungen, hip und aufregend zu sein!$" -DewfordTown_Hall_Text_1756B7:: @ 81756B7 +DewfordTown_Hall_Text_NotEasyToKeepUp:: @ 81756B7 .string "Was?!?\n" .string "Wirklich?!?\p" .string "Für einen alten Menschen ist es gar\n" .string "nicht so leicht, mit der Mode zu gehen!$" -DewfordTown_Hall_Text_17570D:: @ 817570D +DewfordTown_Hall_Text_TVShowAboutTrend:: @ 817570D .string "Diese ganze Sache mit\n" .string "“{STR_VAR_1}”...\l" .string "Gibt es da nicht eine Sendung drüber?$" -DewfordTown_Hall_Text_17574C:: @ 817574C +DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea:: @ 817574C .string "Jenseits des Meeres...\p" .string "Ist dort “{STR_VAR_1}”\n" .string "noch beliebter?$" -DewfordTown_Hall_Text_175779:: @ 8175779 +DewfordTown_Hall_Text_CollectTrendMerchandise:: @ 8175779 .string "Ich sammle lizenzierte\n" .string "“{STR_VAR_1}”-\l" .string "Artikel.\p" @@ -62,7 +62,7 @@ DewfordTown_Hall_Text_175779:: @ 8175779 .string "Hähähä, das besitze ich alles!\n" .string "Und ich gebe dir nichts ab! Ätsch!$" -DewfordTown_Hall_Text_175842:: @ 8175842 +DewfordTown_Hall_Text_BooksAboutTrend:: @ 8175842 .string "GUTE “{STR_VAR_1}” &\n" .string "SCHLECHTE\l" .string "“{STR_VAR_1}”...\p" @@ -74,32 +74,32 @@ DewfordTown_Hall_Text_175842:: @ 8175842 .string "Es ist total vollgestopft mit Büchern\n" .string "über “{STR_VAR_1}”.$" -DewfordTown_Hall_Text_1758C4:: @ 81758C4 +DewfordTown_Hall_Text_TrendsScream:: @ 81758C4 .string "“DER RUF VON\n" .string "{STR_VAR_1}”\l" .string "ist der Titel.$" -DewfordTown_Hall_Text_1758E0:: @ 81758E0 +DewfordTown_Hall_Text_TrendsSmile:: @ 81758E0 .string "“DAS LÄCHELN VON\n" .string "{STR_VAR_1}”\l" .string "ist der Titel.$" -DewfordTown_Hall_Text_1758FB:: @ 81758FB +DewfordTown_Hall_Text_LastTrend:: @ 81758FB .string "Es heißt “DAS LETZTE\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_175916:: @ 8175916 +DewfordTown_Hall_Text_BirthOfTrend:: @ 8175916 .string "Es heißt “DIE GEBURT EINES\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_175935:: @ 8175935 +DewfordTown_Hall_Text_SawTrendCoolestThing:: @ 8175935 .string "Ich habe “{STR_VAR_1}”\n" .string "gesehen! Cool, was?\p" .string "Das Coolste überhaupt, würde ich sagen!\p" .string "Es war unglaublich!\n" .string "Das war das absolut Wahre, oh yeah!$" -DewfordTown_Hall_Text_1759A1:: @ 81759A1 +DewfordTown_Hall_Text_AllegedTrendNotAuthentic:: @ 81759A1 .string "Oh, nein, nein, nein.\p" .string "Das vermeintliche\n" .string "“{STR_VAR_1}”,\l" @@ -109,7 +109,7 @@ DewfordTown_Hall_Text_1759A1:: @ 81759A1 .string "Ist spitzer und wohlgeformter!\p" .string "Aber egal. Es ist erstaunlich!$" -DewfordTown_Hall_Text_175A5C:: @ 8175A5C +DewfordTown_Hall_Text_ComposedTrendThemeSong:: @ 8175A5C .string "Hey, hör zu! Ich habe ein Leitmotiv\n" .string "für “{STR_VAR_1}”\l" .string "komponiert.\p" @@ -122,20 +122,20 @@ DewfordTown_Hall_Text_175A5C:: @ 8175A5C .string "Wundervolles\n" .string "{STR_VAR_1}!$" -DewfordTown_Hall_Text_175AD9:: @ 8175AD9 +DewfordTown_Hall_Text_WorkOnYourSinging:: @ 8175AD9 .string "... ...\p" .string "Ich würde sagen, du solltest erst einmal\n" .string "Gesangsunterricht nehmen, bevor du es\l" .string "mit “{STR_VAR_1}”\l" .string "aufnimmst.$" -DewfordTown_Hall_Text_175B46:: @ 8175B46 +DewfordTown_Hall_Text_OrganizeTrendParty:: @ 8175B46 .string "Wie ich vorhin schon sagte, sollten wir\n" .string "uns zusammentun und eine\l" .string "“{STR_VAR_1}”-Party\l" .string "auf der Insel veranstalten.$" -DewfordTown_Hall_Text_175BA7:: @ 8175BA7 +DewfordTown_Hall_Text_BrilliantIndeed:: @ 8175BA7 .string "Oh, was für eine gute Idee!\p" .string "Nun stellen wir ein für alle Mal fest, wer\n" .string "der Beste in\l" @@ -144,14 +144,14 @@ DewfordTown_Hall_Text_175BA7:: @ 8175BA7 .string "Von heute an dreht sich unser Leben\n" .string "um “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_175C41:: @ 8175C41 +DewfordTown_Hall_Text_TrendHasBecomePartOfLife:: @ 8175C41 .string "Ich habe nachgedacht...\p" .string "Stimmst du mir zu, dass\n" .string "“{STR_VAR_1}” von\l" .string "etwas Modernem zu einem Teil unseres\l" .string "Lebens geworden ist?$" -DewfordTown_Hall_Text_175CC2:: @ 8175CC2 +DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind:: @ 8175CC2 .string "Bitte?\n" .string "So dominant?\p" .string "Nun ja, natürlich bestimmt\n" @@ -162,19 +162,19 @@ DewfordTown_Hall_Text_175CC2:: @ 8175CC2 .string "“{STR_VAR_1}”-\l" .string "PROFESSOR!$" -DewfordTown_Hall_Text_175D6B:: @ 8175D6B +DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible:: @ 8175D6B .string "Wenn du und ich ein Team bilden,\n" .string "sind wir unverwundbar gegen\l" .string "“{STR_VAR_1}”!$" -DewfordTown_Hall_Text_175DC3:: @ 8175DC3 +DewfordTown_Hall_Text_WellBeTrendDuo:: @ 8175DC3 .string "Licht an, mein Freund!\p" .string "Wir sind das\n" .string "“{STR_VAR_1}”-DUO!\p" .string "Ist das nicht eine irre Vorstellung?\n" .string "Hahahaha!$" -DewfordTown_Hall_Text_175E13:: @ 8175E13 +DewfordTown_Hall_Text_GiveYouSludgeBomb:: @ 8175E13 .string "Für mich ist MATSCHBOMBE das absolut\n" .string "Größte!\p" .string "Wie? Du willst mir doch nicht weismachen,\n" @@ -182,7 +182,7 @@ DewfordTown_Hall_Text_175E13:: @ 8175E13 .string "Das ist aber jammerschade.\n" .string "Ich werde dir eine geben.$" -DewfordTown_Hall_Text_175EBE:: @ 8175EBE +DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo:: @ 8175EBE .string "Ich liebe MATSCHBOMBE.\p" .string "Aber POKéMON, die die Attacke\n" .string "“{STR_VAR_1}” kennen,\l" diff --git a/data-de/maps/DewfordTown_House1/text.inc b/data-de/maps/DewfordTown_House1/text.inc index fa93711e4..739f11513 100644 --- a/data-de/maps/DewfordTown_House1/text.inc +++ b/data-de/maps/DewfordTown_House1/text.inc @@ -1,9 +1,9 @@ -DewfordTown_House1_Text_174BA5:: @ 8174BA5 +DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland:: @ 8174BA5 .string "Über das harmonische Leben mit den\n" .string "POKéMON und der Familie auf diesem\l" .string "kleinen Eiland ließe sich viel erzählen.$" -DewfordTown_House1_Text_174C0D:: @ 8174C0D +DewfordTown_House1_Text_LifeGoesSlowlyOnIsland:: @ 8174C0D .string "Bevor ich meinen Mann geheiratet habe,\n" .string "lebte ich in der großen Hafenstadt\l" .string "GRAPHITPORT CITY.\p" @@ -11,5 +11,5 @@ DewfordTown_House1_Text_174C0D:: @ 8174C0D .string "geruhsamer. Vom wunderbaren Meer um-\l" .string "geben - das ist die pure Glückseligkeit!$" -DewfordTown_House1_Text_174CC8:: @ 8174CC8 +DewfordTown_House1_Text_Zigzagoon:: @ 8174CC8 .string "ZIGZACHS: Guguuh!$" diff --git a/data-de/maps/DewfordTown_House2/text.inc b/data-de/maps/DewfordTown_House2/text.inc index 8f3c5218a..7cee39f4d 100644 --- a/data-de/maps/DewfordTown_House2/text.inc +++ b/data-de/maps/DewfordTown_House2/text.inc @@ -1,4 +1,4 @@ -DewfordTown_House2_Text_175EFE:: @ 8175EFE +DewfordTown_House2_Text_WantYouToHaveSilkScarf:: @ 8175EFE .string "Wirf dein Auge mal hierauf!\p" .string "Das ist ein SEIDENSCHAL. Das ist\n" .string "der letzte Schrei in der Mode. Yeah!\p" @@ -7,19 +7,19 @@ DewfordTown_House2_Text_175EFE:: @ 8175EFE .string "Hihi, du machst mir eine Freude!\n" .string "Hier, das möchte ich dir schenken!$" -DewfordTown_House2_Text_175FDA:: @ 8175FDA +DewfordTown_House2_Text_NoRoom:: @ 8175FDA .string "Och, du hast ja gar keinen Platz mehr.\p" .string "Nun, hör gut zu... Diesen SCHAL musst\n" .string "du einfach haben! Ich würde alle meine\l" .string "Items verkaufen, um ihn zu bekommen!$" -DewfordTown_House2_Text_176055:: @ 8176055 +DewfordTown_House2_Text_ExplainSilkScarf:: @ 8176055 .string "Dieser SEIDENSCHAL steigert die Stärke\n" .string "der NORMALEN Attacken.\p" .string "Dieser wunderbare SCHAL passt einfach\n" .string "zu fast allen POKéMON!$" -DewfordTown_House2_Text_1760C8:: @ 81760C8 +DewfordTown_House2_Text_BrawlySoCool:: @ 81760C8 .string "Wow, du hast die beschwerliche Reise\n" .string "über das Meer auf dich genommen, um\l" .string "nach FAUSTAUHAVEN zu gelangen?\p" diff --git a/data-de/maps/DewfordTown_PokemonCenter_1F/text.inc b/data-de/maps/DewfordTown_PokemonCenter_1F/text.inc index 5d7b555f0..f76410dd3 100644 --- a/data-de/maps/DewfordTown_PokemonCenter_1F/text.inc +++ b/data-de/maps/DewfordTown_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -DewfordTown_PokemonCenter_1F_Text_174CDB:: @ 8174CDB +DewfordTown_PokemonCenter_1F_Text_StoneCavern:: @ 8174CDB .string "Am Rande des Ortes befindet sich eine\n" .string "steinerne Höhle.\p" .string "Dort soll man seltene Steine finden\n" .string "können.$" -DewfordTown_PokemonCenter_1F_Text_174D32:: @ 8174D32 +DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM:: @ 8174D32 .string "Auch wenn in deinem Team ein kampf-\n" .string "unfähiges POKéMON ist, kann es außer-\p" .string "halb des Kampfes eine Versteckte\n" diff --git a/data-de/maps/EverGrandeCity/text.inc b/data-de/maps/EverGrandeCity/text.inc index 6d1a09d16..601af4d90 100644 --- a/data-de/maps/EverGrandeCity/text.inc +++ b/data-de/maps/EverGrandeCity/text.inc @@ -1,11 +1,11 @@ -EverGrandeCity_Text_16A74D:: @ 816A74D +EverGrandeCity_Text_EnteringVictoryRoad:: @ 816A74D .string "SIE BETRETEN DIE SIEGESSTRASSE$" -EverGrandeCity_Text_16A763:: @ 816A763 +EverGrandeCity_Text_EnteringPokemonLeague:: @ 816A763 .string "SIE ERREICHEN DEN EINGANG ZUR\n" .string "POKéMON LIGA$" -EverGrandeCity_Text_16A787:: @ 816A787 +EverGrandeCity_Text_CitySign:: @ 816A787 .string "PRACHTPOLIS CITY\p" .string "“Das Paradies der Blumen, des Meeres\n" .string "und der POKéMON.”$" diff --git a/data-de/maps/EverGrandeCity_ChampionsRoom/text.inc b/data-de/maps/EverGrandeCity_ChampionsRoom/text.inc index d8787a895..0e8cfab1d 100644 --- a/data-de/maps/EverGrandeCity_ChampionsRoom/text.inc +++ b/data-de/maps/EverGrandeCity_ChampionsRoom/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_ChampionsRoom_Text_190F9C:: @ 8190F9C +EverGrandeCity_ChampionsRoom_Text_IntroSpeech:: @ 8190F9C .string "TROY: Willkommen, {PLAYER}{KUN}!\p" .string "Ich habe schon darauf gewartet, dich\n" .string "eines Tages hier zu sehen.\p" @@ -10,13 +10,13 @@ EverGrandeCity_ChampionsRoom_Text_190F9C:: @ 8190F9C .string "du all das im Kampf gegen mich einsetzt!\p" .string "Nun, zeig es mir!$" -EverGrandeCity_ChampionsRoom_Text_1910A0:: @ 81910A0 +EverGrandeCity_ChampionsRoom_Text_Defeat:: @ 81910A0 .string "Ich, der CHAMP, habe verloren...\p" .string "Dir gebührt alle Ehre, {PLAYER}{KUN}!\p" .string "Du bist wahrhaft ein edler POKéMON-\n" .string "TRAINER!$" -EverGrandeCity_ChampionsRoom_Text_1910FE:: @ 81910FE +EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech:: @ 81910FE .string "TROY: Herzlichen Glückwunsch!\p" .string "Die Gefühle, die du deinen POKéMON\n" .string "entgegenbringst...\p" @@ -27,28 +27,28 @@ EverGrandeCity_ChampionsRoom_Text_1910FE:: @ 81910FE .string "Und so gehört der Sieg heute dir!\p" .string "Du bist mit Recht HOENNS neuer...$" -EverGrandeCity_ChampionsRoom_Text_191225:: @ 8191225 +EverGrandeCity_ChampionsRoom_Text_MayAdvice:: @ 8191225 .string "MAIKE: {PLAYER}{KUN}!\p" .string "Ich muss dir unbedingt einen Rat geben,\n" .string "bevor du gegen den CHAMP antrittst!$" -EverGrandeCity_ChampionsRoom_Text_191268:: @ 8191268 +EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver:: @ 8191268 .string "MAIKE: Wie? Waswaswas?\p" .string "{PLAYER}{KUN}...\n" .string "Das kann nicht sein...\l" .string "Es ist schon vorbei?$" -EverGrandeCity_ChampionsRoom_Text_1912B3:: @ 81912B3 +EverGrandeCity_ChampionsRoom_Text_BrendanAdvice:: @ 81912B3 .string "BRIX: {PLAYER}!\p" .string "Möchtest du nicht ein paar Tipps, bevor\n" .string "du den CHAMP herausforderst?$" -EverGrandeCity_ChampionsRoom_Text_191305:: @ 8191305 +EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon:: @ 8191305 .string "BRIX: {PLAYER}!\p" .string "Willst du mir etwa sagen...\n" .string "Du hast den CHAMP besiegt?!?!?!$" -EverGrandeCity_ChampionsRoom_Text_19134D:: @ 819134D +EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex:: @ 819134D .string "PROF. BIRK: Siehst du?\n" .string "Was habe ich dir gesagt, {RIVAL}?\p" .string "Ich wusste, du brauchst dir keine\n" @@ -65,24 +65,24 @@ EverGrandeCity_ChampionsRoom_Text_19134D:: @ 819134D .string "Was ist aus deinem POKéDEX geworden?\n" .string "Lass mich mal sehen...$" -EverGrandeCity_ChampionsRoom_Text_1914C6:: @ 81914C6 +EverGrandeCity_ChampionsRoom_Text_BirchCongratulations:: @ 81914C6 .string "PROF. BIRK: Also, dann sage ich:\n" .string "Herzlichen Glückwunsch!\p" .string "Nun kannst du mit Stolz den letzten\n" .string "Raum betreten!$" -EverGrandeCity_ChampionsRoom_Text_191512:: @ 8191512 +EverGrandeCity_ChampionsRoom_Text_StevenComeWithMe:: @ 8191512 .string "TROY: {PLAYER}{KUN}...\p" .string "Nein! Neuer CHAMP!\p" .string "Komm mit mir.$" -EverGrandeCity_ChampionsRoom_Text_191546:: @ 8191546 +EverGrandeCity_ChampionsRoom_Text_StevenWaitOutside:: @ 8191546 .string "TROY: Tut mir Leid, aber...\p" .string "Diesen Raum dürfen nur TRAINER\n" .string "betreten, die CHAMPS geworden sind.\p" .string "Warte bitte draußen mit dem PROFESSOR.$" -EverGrandeCity_ChampionsRoom_Text_1915D7:: @ 81915D7 +EverGrandeCity_ChampionsRoom_Text_MayCongratulations:: @ 81915D7 .string "MAIKE: Grummel...\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" @@ -91,7 +91,7 @@ EverGrandeCity_ChampionsRoom_Text_1915D7:: @ 81915D7 .string "{PLAYER}{KUN}!\n" .string "Ehrlich. Herzlichen Glückwunsch!$" -EverGrandeCity_ChampionsRoom_Text_191675:: @ 8191675 +EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations:: @ 8191675 .string "BRIX: ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" .string "Na, wenn es die Regeln so bestimmen...\p" diff --git a/data-de/maps/EverGrandeCity_DrakesRoom/text.inc b/data-de/maps/EverGrandeCity_DrakesRoom/text.inc index 484aefc14..4de1f4f97 100644 --- a/data-de/maps/EverGrandeCity_DrakesRoom/text.inc +++ b/data-de/maps/EverGrandeCity_DrakesRoom/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_DrakesRoom_Text_190CEB:: @ 8190CEB +EverGrandeCity_DrakesRoom_Text_IntroSpeech:: @ 8190CEB .string "Ich bin der letzte der TOP VIER in der\n" .string "POKéMON LIGA, DRAGAN der\l" .string "DRACHEN-Meister!\p" @@ -13,10 +13,10 @@ EverGrandeCity_DrakesRoom_Text_190CEB:: @ 8190CEB .string "Wenn du das nicht weißt, wirst du\n" .string "hier an dieser Stelle scheitern!$" -EverGrandeCity_DrakesRoom_Text_190E42:: @ 8190E42 +EverGrandeCity_DrakesRoom_Text_Defeat:: @ 8190E42 .string "Hervorragend! Das muss man sagen.$" -EverGrandeCity_DrakesRoom_Text_190E5D:: @ 8190E5D +EverGrandeCity_DrakesRoom_Text_PostBattleSpeech:: @ 8190E5D .string "Dir gebührt wahre Ehre, da du als\n" .string "TRAINER der POKéMON so weit\l" .string "gekommen bist.\p" diff --git a/data-de/maps/EverGrandeCity_GlaciasRoom/text.inc b/data-de/maps/EverGrandeCity_GlaciasRoom/text.inc index 8bb9b3427..0f2aacf55 100644 --- a/data-de/maps/EverGrandeCity_GlaciasRoom/text.inc +++ b/data-de/maps/EverGrandeCity_GlaciasRoom/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_GlaciasRoom_Text_190AF9:: @ 8190AF9 +EverGrandeCity_GlaciasRoom_Text_IntroSpeech:: @ 8190AF9 .string "Willkommen. Mein Name ist FROSINA\n" .string "von den TOP VIER.\p" .string "Ich bin von weit her nach HOENN gereist,\n" @@ -10,14 +10,14 @@ EverGrandeCity_GlaciasRoom_Text_190AF9:: @ 8190AF9 .string "Es würde mich überaus freuen, wenn du\n" .string "mich zwingst, alles zu geben!$" -EverGrandeCity_GlaciasRoom_Text_190C01:: @ 8190C01 +EverGrandeCity_GlaciasRoom_Text_Defeat:: @ 8190C01 .string "Du und deine POKéMON...\n" .string "Euer Zusammenhalt verbrennt alles!\p" .string "Diese Hitze besiegt jeden.\p" .string "Kein Wunder, dass mein eisiges Talent\n" .string "dahinschmolz und dir nicht schadete.$" -EverGrandeCity_GlaciasRoom_Text_190C8F:: @ 8190C8F +EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech:: @ 8190C8F .string "Geh weiter in den nächsten Raum.\p" .string "Und dort wirst du die schrecklichste\n" .string "Seite der POKéMON LIGA kennen lernen.$" diff --git a/data-de/maps/EverGrandeCity_HallOfFame/text.inc b/data-de/maps/EverGrandeCity_HallOfFame/text.inc index 4806915c9..5c4ad84b4 100644 --- a/data-de/maps/EverGrandeCity_HallOfFame/text.inc +++ b/data-de/maps/EverGrandeCity_HallOfFame/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_HallOfFame_Text_191841:: @ 8191841 +EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions:: @ 8191841 .string "TROY: Dieser Raum...\p" .string "Hier verzeichnen wir die POKéMON, die\n" .string "siegreich aus harten Kämpfen hervorge-\l" @@ -6,7 +6,7 @@ EverGrandeCity_HallOfFame_Text_191841:: @ 8191841 .string "Hier werden die CHAMPS der POKéMON\n" .string "LIGA geehrt.$" -EverGrandeCity_HallOfFame_Text_1918D7:: @ 81918D7 +EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames:: @ 81918D7 .string "TROY: Komm, schreiben wir deinen\n" .string "Namen nieder, als ein TRAINER, der über\l" .string "die POKéMON LIGA triumphiert hat - und\l" diff --git a/data-de/maps/EverGrandeCity_PhoebesRoom/text.inc b/data-de/maps/EverGrandeCity_PhoebesRoom/text.inc index e844262c2..5b103740d 100644 --- a/data-de/maps/EverGrandeCity_PhoebesRoom/text.inc +++ b/data-de/maps/EverGrandeCity_PhoebesRoom/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_PhoebesRoom_Text_1908F5:: @ 81908F5 +EverGrandeCity_PhoebesRoom_Text_IntroSpeech:: @ 81908F5 .string "Ahahahahaha!\p" .string "Ich bin ANTONIA von den TOP VIER.\n" .string "Ich habe am PYROBERG trainiert.\p" @@ -10,11 +10,11 @@ EverGrandeCity_PhoebesRoom_Text_1908F5:: @ 81908F5 .string "Komm und schau, ob du irgendetwas\n" .string "gegen meine POKéMON ausrichten kannst.$" -EverGrandeCity_PhoebesRoom_Text_190A0C:: @ 8190A0C +EverGrandeCity_PhoebesRoom_Text_Defeat:: @ 8190A0C .string "Oh, verdammt.\n" .string "Aus und vorbei. Verloren.$" -EverGrandeCity_PhoebesRoom_Text_190A2A:: @ 8190A2A +EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech:: @ 8190A2A .string "Das Band zwischen dir und deinen\n" .string "POKéMON ist ebenfalls sehr stark.\p" .string "Das habe ich gar nicht bemerkt, daher\n" diff --git a/data-de/maps/EverGrandeCity_PokemonCenter_1F/text.inc b/data-de/maps/EverGrandeCity_PokemonCenter_1F/text.inc index 6bf6c9803..cac5a2a34 100644 --- a/data-de/maps/EverGrandeCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/EverGrandeCity_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonCenter_1F_Text_191967:: @ 8191967 +EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad:: @ 8191967 .string "Die POKéMON LIGA triffst du kurz hinter\n" .string "der SIEGESSTRASSE.\p" .string "Wenn du schon so weit gekommen bist,\n" .string "musst du einfach weitergehen.$" -EverGrandeCity_PokemonCenter_1F_Text_1919EF:: @ 81919EF +EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon:: @ 81919EF .string "Die lange und qualvolle SIEGESSTRASSE...\p" .string "Es ist fast so, als würde man sein\n" .string "ganzes Leben noch einmal leben...\p" diff --git a/data-de/maps/EverGrandeCity_PokemonLeague/text.inc b/data-de/maps/EverGrandeCity_PokemonLeague/text.inc index b2e8a76f1..201b178c4 100644 --- a/data-de/maps/EverGrandeCity_PokemonLeague/text.inc +++ b/data-de/maps/EverGrandeCity_PokemonLeague/text.inc @@ -1,15 +1,15 @@ -EverGrandeCity_PokemonLeague_Text_1916FD:: @ 81916FD +EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges:: @ 81916FD .string "Ab hier haben nur die TRAINER, die alle\n" .string "ORDEN der ARENEN erhalten haben,\l" .string "Zutritt.\p" .string "TRAINER, lass uns sicherstellen, dass\n" .string "du auch alle ORDEN hast.$" -EverGrandeCity_PokemonLeague_Text_19179C:: @ 819179C +EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges:: @ 819179C .string "Du hast noch nicht alle ORDEN erhalten.\p" .string "Wenn du zur POKéMON LIGA willst,\n" .string "musst du alle ORDEN vorweisen können.$" -EverGrandeCity_PokemonLeague_Text_191804:: @ 8191804 +EverGrandeCity_PokemonLeague_1F_Text_GoForth:: @ 8191804 .string "TRAINER! Glaube an dich und deine\n" .string "POKéMON und gehe weiter!$" diff --git a/data-de/maps/EverGrandeCity_SidneysRoom/text.inc b/data-de/maps/EverGrandeCity_SidneysRoom/text.inc index 76871909d..ebea1bba3 100644 --- a/data-de/maps/EverGrandeCity_SidneysRoom/text.inc +++ b/data-de/maps/EverGrandeCity_SidneysRoom/text.inc @@ -8,11 +8,11 @@ EverGrandeCity_SidneysRoom_Text_190728:: @ 8190728 .string "erleben, wie man ihn nur hier in der\l" .string "POKéMON LIGA erleben kann!$" -EverGrandeCity_SidneysRoom_Text_190823:: @ 8190823 +EverGrandeCity_SidneysRoom_Text_Defeat:: @ 8190823 .string "Ich habe verloren! Ich, ULRICH von den\n" .string "TOP VIER. Macht nichts, es war lustig.$" -EverGrandeCity_SidneysRoom_Text_19086D:: @ 819086D +EverGrandeCity_SidneysRoom_Text_PostBattleSpeech:: @ 819086D .string "Nun, hör dir an, was dieser Verlierer\n" .string "zu sagen hat.\p" .string "Du bist bestens ausgerüstet.\n" diff --git a/data-de/maps/FallarborTown/text.inc b/data-de/maps/FallarborTown/text.inc index a695f5d83..d6e870350 100644 --- a/data-de/maps/FallarborTown/text.inc +++ b/data-de/maps/FallarborTown/text.inc @@ -1,25 +1,25 @@ -FallarborTown_Text_16C7FF:: @ 816C7FF +FallarborTown_Text_ShadyFellowAtLab:: @ 816C7FF .string "Was ist los? Was ist los?\p" .string "Ich habe eine zwielichtige Gestalt aus\n" .string "dem LABOR von PROF. KOSMO flitzen\l" .string "sehen.$" -FallarborTown_Text_16C855:: @ 816C855 +FallarborTown_Text_RegionKnownForMeteors:: @ 816C855 .string "Diese Region ist schon seit Urzeiten\n" .string "für ihre Meteoritenschauer bekannt.\p" .string "Man sagt, METEORFÄLLE sei durch\n" .string "den Aufprall eines METEORITEN\l" .string "entstanden.$" -FallarborTown_Text_16C8D6:: @ 816C8D6 +FallarborTown_Text_MyPreciousAzurill:: @ 816C8D6 .string "Schau mal! Guck doch mal!\n" .string "Das ist mein süßes AZURILL!\p" .string "Es ist glatt, weich und plüschig!$" -FallarborTown_Text_16C92C:: @ 816C92C +FallarborTown_Text_Azurill:: @ 816C92C .string "AZURILL: Rooreelooo.$" -FallarborTown_Text_16C941:: @ 816C941 +FallarborTown_Text_HaveYouChallengedFlannery:: @ 816C941 .string "Hast du schon FLAVIA, die LEITERIN\n" .string "der ARENA von BAD LAVASTADT,\l" .string "herausgefordert?\p" @@ -30,17 +30,17 @@ FallarborTown_Text_16C941:: @ 816C941 .string "FLAVIA ebenfalls ein großer TRAINER\l" .string "wird.$" -FallarborTown_Text_16CA39:: @ 816CA39 +FallarborTown_Text_ContestHallSign:: @ 816CA39 .string "POKéMON WETTBEWERBE\n" .string "SUPER-KLASSE REGISTRIERUNGEN\p" .string "“Brecht in die POKéMON-Szene\n" .string "ein!”$" -FallarborTown_Text_16CA83:: @ 816CA83 +FallarborTown_Text_TownSign:: @ 816CA83 .string "LAUBWECHSELFELD\n" .string "“Eine Gemeinschaft von Farmern mit\l" .string "kleinen Gärten.”$" -FallarborTown_Text_16CAB9:: @ 816CAB9 +FallarborTown_Text_MoveTutorSign:: @ 816CAB9 .string "HAUS des ATTACKEN-HELFERS\n" .string "“Neue Attacken für deine POKéMON.”$" diff --git a/data-de/maps/FallarborTown_ContestHall/text.inc b/data-de/maps/FallarborTown_ContestHall/text.inc index 43c34e295..a523ad3ab 100644 --- a/data-de/maps/FallarborTown_ContestHall/text.inc +++ b/data-de/maps/FallarborTown_ContestHall/text.inc @@ -1,21 +1,21 @@ -FallarborTown_ContestHall_Text_177335:: @ 8177335 +FallarborTown_ContestHall_Text_DoAllRightInPreliminary:: @ 8177335 .string "Im 1. Durchlauf schneiden wir immer\n" .string "gut ab, aber im 2. Durchlauf...\p" .string "Vielleicht sollte ich beobachten, was\n" .string "die anderen Teilnehmer machen...$" -FallarborTown_ContestHall_Text_1773C6:: @ 81773C6 +FallarborTown_ContestHall_Text_MonAllTheseRibbons:: @ 81773C6 .string "Schau mal! Mein POKéMON hat all\n" .string "diese BÄNDER gewonnen!\p" .string "Besitzen deine POKéMON auch BÄNDER?\n" .string "Du kannst das im POKéNAV überprüfen.$" -FallarborTown_ContestHall_Text_177437:: @ 8177437 +FallarborTown_ContestHall_Text_CantWinEverywhere:: @ 8177437 .string "Ich kann ARENALEITER nicht besiegen...\p" .string "Ich kann keine WETTBEWERBE gewinnen...\p" .string "Ich war schon hier und dort und überall,\n" .string "aber immer vergebens.$" -FallarborTown_ContestHall_Text_1774B1:: @ 81774B1 +FallarborTown_ContestHall_Text_SuperRankStage:: @ 81774B1 .string "POKéMON-WETTBEWERBE\n" .string "BÜHNE für die SUPER-KLASSE!$" diff --git a/data-de/maps/FallarborTown_ContestLobby/text.inc b/data-de/maps/FallarborTown_ContestLobby/text.inc index 085d43e7d..2588dc12f 100644 --- a/data-de/maps/FallarborTown_ContestLobby/text.inc +++ b/data-de/maps/FallarborTown_ContestLobby/text.inc @@ -1,4 +1,4 @@ -FallarborTown_ContestLobby_Text_177141:: @ 8177141 +FallarborTown_ContestLobby_Text_UsedToHaveSketch:: @ 8177141 .string "Dort hing mal eine Zeichnung von meinem\n" .string "POKéMON, aber nun hängt dort die\l" .string "Zeichnung eines anderen POKéMON.\p" @@ -6,12 +6,12 @@ FallarborTown_ContestLobby_Text_177141:: @ 8177141 .string "teilnehmen lassen, dann gibt es eine\l" .string "neue Zeichnung von ihm!$" -FallarborTown_ContestLobby_Text_1771F2:: @ 81771F2 +FallarborTown_ContestLobby_Text_AreYouMakingPokeblock:: @ 81771F2 .string "Hallo, willst du {POKEBLOCK} herstellen?\p" .string "Dann komm doch mal wieder vorbei und\n" .string "bring genug BEEREN mit.$" -FallarborTown_ContestLobby_Text_177246:: @ 8177246 +FallarborTown_ContestLobby_Text_ICreateSketches:: @ 8177246 .string "Siehst du, wie sie hier die Zeichnungen\n" .string "des Sieger-POKéMON aushängen?\p" .string "Ich bin der Zeichner dieser Werke!\p" @@ -19,7 +19,7 @@ FallarborTown_ContestLobby_Text_177246:: @ 8177246 .string "WETTBEWERB gewinnt, werde ich es mit\l" .string "Vergnügen zeichnen!$" -FallarborTown_ContestLobby_Text_1772D8:: @ 81772D8 +FallarborTown_ContestLobby_Text_YourSketchIsUp:: @ 81772D8 .string "Hallo und herzlichen Glückwunsch!\p" .string "Ich habe eine Zeichnung deines POKéMON\n" .string "hier aufgehängt, damit jeder es sieht.$" diff --git a/data-de/maps/FallarborTown_House1/text.inc b/data-de/maps/FallarborTown_House1/text.inc index c19ee545d..c89ae3bee 100644 --- a/data-de/maps/FallarborTown_House1/text.inc +++ b/data-de/maps/FallarborTown_House1/text.inc @@ -1,4 +1,4 @@ -FallarborTown_House1_Text_177755:: @ 8177755 +FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow:: @ 8177755 .string "PROF. KOSMO: Oh...\n" .string "Ich hätte mich nie dazu verleiten\l" .string "lassen dürfen, TEAM {EVIL_TEAM} zu verraten,\l" @@ -6,7 +6,7 @@ FallarborTown_House1_Text_177755:: @ 8177755 .string "Der METEORIT von METEORFÄLLE...\n" .string "Nun wird er niemals mir gehören...$" -FallarborTown_House1_Text_17780E:: @ 817780E +FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt:: @ 817780E .string "Oh!\n" .string "Oooh?\p" .string "Dieses Item...\p" @@ -17,36 +17,36 @@ FallarborTown_House1_Text_17780E:: @ 817780E .string "Du bekommst auch etwas dafür.\n" .string "Was hältst du von dieser TM?$" -FallarborTown_House1_Text_1778C4:: @ 81778C4 +FallarborTown_CozmosHouse_Text_PleaseUseThisTM:: @ 81778C4 .string "PROF. KOSMO: Mit dieser TM möchte ich\n" .string "dir meine Dankbarkeit ausdrücken.\l" .string "Bitte, nimm sie an!$" -FallarborTown_House1_Text_177910:: @ 8177910 +FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch:: @ 8177910 .string "PROF. KOSMO: Oh, ich kann es einfach\n" .string "nicht glauben! Das ist nett! So nett!!!\p" .string "Das wird mir bei meinen Forschungen\n" .string "enorm weiterhelfen!$" -FallarborTown_House1_Text_17797D:: @ 817797D +FallarborTown_CozmosHouse_Text_CrushedWithDisappointment:: @ 817797D .string "PROF. KOSMO: Oh, aber...\n" .string "Das enttäuscht mich jetzt maßlos...$" -FallarborTown_House1_Text_1779B8:: @ 81779B8 +FallarborTown_CozmosHouse_Text_MayIHaveMeteorite:: @ 81779B8 .string "PROF. KOSMO: Bitte, darf ich den\n" .string "METEORITEN haben?\p" .string "Ich möchte ihn nicht umsonst haben! Wie\n" .string "wäre es mit dieser TM im Tausch dafür?$" -FallarborTown_House1_Text_177A2B:: @ 8177A2B +FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls:: @ 8177A2B .string "PROF. KOSMO ist unterwegs zu\n" .string "METEORFÄLLE an der ROUTE 114. Einige\l" .string "Leute von TEAM {EVIL_TEAM} begleiten ihn.$" -FallarborTown_House1_Text_177A7C:: @ 8177A7C +FallarborTown_CozmosHouse_Text_FeelSorryForCozmo:: @ 8177A7C .string "Armer PROF. KOSMO...\n" .string "Er ist so deprimiert... Er tut mir Leid.$" -FallarborTown_House1_Text_177ABB:: @ 8177ABB +FallarborTown_CozmosHouse_Text_CozmoIsSoHappy:: @ 8177ABB .string "Schau dir nur PROF. KOSMO an...\n" .string "Er ist so glücklich! Richtig niedlich.$" diff --git a/data-de/maps/FallarborTown_House2/text.inc b/data-de/maps/FallarborTown_House2/text.inc index b0450c136..eaaba3988 100644 --- a/data-de/maps/FallarborTown_House2/text.inc +++ b/data-de/maps/FallarborTown_House2/text.inc @@ -1,4 +1,4 @@ -FallarborTown_House2_Text_177AF4:: @ 8177AF4 +FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor:: @ 8177AF4 .string "Ich bin der ATTACKEN-HELFER.\p" .string "Ich kenne alle Attacken, die ein\n" .string "POKéMON lernen kann - und ich kann sie\l" @@ -8,31 +8,31 @@ FallarborTown_House2_Text_177AF4:: @ 8177AF4 .string "Als Gegenleistung hätte ich gerne eine\n" .string "HERZSCHUPPE. Die sammle ich nämlich.$" -FallarborTown_House2_Text_177BDB:: @ 8177BDB +FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove:: @ 8177BDB .string "Oh! Das ist es! Das ist ehrlich und\n" .string "wahrhaftig eine HERZSCHUPPE!\p" .string "Lass mich raten... Ich soll einem POKéMON\n" .string "eine neue Attacke beibringen?!?$" -FallarborTown_House2_Text_177C3F:: @ 8177C3F +FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon:: @ 8177C3F .string "Welches POKéMON soll sie lernen?$" -FallarborTown_House2_Text_177C5D:: @ 8177C5D +FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove:: @ 8177C5D .string "Welche Attacke soll ich es lehren?$" -FallarborTown_House2_Text_177C78:: @ 8177C78 +FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon:: @ 8177C78 .string "Tut mir Leid...\p" .string "Scheinbar gibt es keine Attacke, die ich\n" .string "diesem POKéMON beibringen kann.$" -FallarborTown_House2_Text_177CC3:: @ 8177CC3 +FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale:: @ 8177CC3 .string "{PLAYER} tauscht eine HERZSCHUPPE ein.$" -FallarborTown_House2_Text_177CEF:: @ 8177CEF +FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale:: @ 8177CEF .string "Falls deine POKéMON neue Attacken\n" .string "lernen sollen, komm mit einer\l" .string "HERZSCHUPPE wieder.$" -FallarborTown_House2_Text_177D33:: @ 8177D33 +FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg:: @ 8177D33 .string "Bitte? Ich kann einem EI nicht eine\n" .string "einzige Attacke beibringen!$" diff --git a/data-de/maps/FallarborTown_Mart/text.inc b/data-de/maps/FallarborTown_Mart/text.inc index 6f6ebef5c..8872fde25 100644 --- a/data-de/maps/FallarborTown_Mart/text.inc +++ b/data-de/maps/FallarborTown_Mart/text.inc @@ -1,4 +1,4 @@ -FallarborTown_Mart_Text_176FF0:: @ 8176FF0 +FallarborTown_Mart_Text_DecidingSkittyEvolve:: @ 8176FF0 .string "Ich habe lange überlegt, ob sich mein\n" .string "ENECO entwickeln soll oder nicht.\p" .string "Ich müsste nur diesen MONDSTEIN ein-\n" @@ -8,10 +8,10 @@ FallarborTown_Mart_Text_176FF0:: @ 8176FF0 .string "stärker.\p" .string "Aber es würde auch anders aussehen.$" -FallarborTown_Mart_Text_1770D3:: @ 81770D3 +FallarborTown_Mart_Text_Skitty:: @ 81770D3 .string "ENECO: Miyao?$" -FallarborTown_Mart_Text_1770E2:: @ 81770E2 +FallarborTown_Mart_Text_SellNuggetIFound:: @ 81770E2 .string "Ich habe hier ein NUGGET gefunden...\n" .string "Das werde ich wohl verkaufen. Was soll\l" .string "ich sonst damit machen?$" diff --git a/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc b/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc index 66a21c458..76ab2edf0 100644 --- a/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc +++ b/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 +FallarborTown_PokemonCenter_1F_Text_LanetteGreeting:: @ 81774D4 .string "Oh, hallo.\n" .string "Wer bist du?\p" .string "Du heißt {PLAYER}{KUN}?\n" @@ -18,13 +18,13 @@ FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 .string "Wenn du magst, besuche mich doch mal.\n" .string "Ich wohne an der ROUTE 114.$" -FallarborTown_PokemonCenter_1F_Text_17768C:: @ 817768C +FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown:: @ 817768C .string "Ich frage mich, wie die POKéMON wohl\n" .string "vor langer, langer Zeit aussahen.\p" .string "Vielleicht kann mir der FOSSILMANIAC\n" .string "am Ortsrand etwas dazu sagen.$" -FallarborTown_PokemonCenter_1F_Text_1776F5:: @ 81776F5 +FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees:: @ 81776F5 .string "Auf den Feldern von LAUBWECHSELFELD\n" .string "haben wir widerstandsfähige Bäume\p" .string "gepflanzt, die auch in der Vulkanasche\n" diff --git a/data-de/maps/FortreeCity/text.inc b/data-de/maps/FortreeCity/text.inc index 9f12b016e..81be04674 100644 --- a/data-de/maps/FortreeCity/text.inc +++ b/data-de/maps/FortreeCity/text.inc @@ -1,25 +1,25 @@ -FortreeCity_Text_167577:: @ 8167577 +FortreeCity_Text_YouSmellSinged:: @ 8167577 .string "Schnüffel...\n" .string "Äh... Du, uh... riechst angesengt.\p" .string "Warst du auf einem Vulkan oder so?$" -FortreeCity_Text_1675C2:: @ 81675C2 +FortreeCity_Text_SomethingBlockingGym:: @ 81675C2 .string "Ich wollte zur POKéMON ARENA, aber\n" .string "irgendetwas blockiert den Weg.\p" .string "Und das, nachdem ich auf der ROUTE 120\n" .string "so fleißig trainiert habe...$" -FortreeCity_Text_167642:: @ 8167642 +FortreeCity_Text_ThisTimeIllBeatWinona:: @ 8167642 .string "Dieses POKéMON ist mein ganzer Stolz!\n" .string "Diesmal werde ich WIBKE besiegen!$" -FortreeCity_Text_16768A:: @ 816768A +FortreeCity_Text_TreesGrowByDrinkingRainwater:: @ 816768A .string "Der Boden nimmt das Regenwasser auf,\n" .string "die Bäume trinken es und wachsen...\p" .string "Unser BAUMHAUSEN CITY existiert, weil\n" .string "es genügend Wasser und Boden gibt.$" -FortreeCity_Text_16770E:: @ 816770E +FortreeCity_Text_EveryoneHealthyAndLively:: @ 816770E .string "Die STADT besteht aus Häusern, die auf\n" .string "Bäumen gebaut sind.\p" .string "Aufgrund dieser Lebensweise ist jeder\n" @@ -27,35 +27,35 @@ FortreeCity_Text_16770E:: @ 816770E .string "Und auch ich fühle mich, als sei ich\n" .string "30 Jahre jünger geworden.$" -FortreeCity_Text_1677BD:: @ 81677BD +FortreeCity_Text_BugPokemonComeThroughWindow:: @ 81677BD .string "Auf Bäumen zu leben ist klasse.\p" .string "Aber manchmal kommen KÄFER-POKéMON\n" .string "durch die Fenster herein.\l" .string "Das kann einen ganz schön erschrecken.$" -FortreeCity_Text_16782C:: @ 816782C +FortreeCity_Text_PokemonThatEvolveWhenTraded:: @ 816782C .string "Manche POKéMON entwickeln sich, wenn\n" .string "sie durch ein Verbindungskabel laufen.$" -FortreeCity_Text_167868:: @ 8167868 +FortreeCity_Text_SomethingUnseeable:: @ 8167868 .string "Etwas Unsichtbares blockiert den Weg.$" -FortreeCity_Text_16788B:: @ 816788B +FortreeCity_Text_UnseeableUseDevonScope:: @ 816788B .string "Etwas Unsichtbares blockiert den Weg.\p" .string "Willst du das DEVON-SCOPE einsetzen?$" -FortreeCity_Text_1678CB:: @ 81678CB +FortreeCity_Text_UsedDevonScopePokemonFled:: @ 81678CB .string "{PLAYER} setzt das DEVON-SCOPE ein.\p" .string "Ein unsichtbares POKéMON ist sichtbar\n" .string "geworden!\p" .string "Das erschrockene POKéMON flieht!$" -FortreeCity_Text_16792F:: @ 816792F +FortreeCity_Text_CitySign:: @ 816792F .string "BAUMHAUSEN CITY\n" .string "“Die Stadt in den Baumkronen,\l" .string "verbrüdert mit der Natur.”$" -FortreeCity_Text_167969:: @ 8167969 +FortreeCity_Text_GymSign:: @ 8167969 .string "POKéMON ARENA von BAUMHAUSEN CITY\n" .string "LEITERIN: WIBKE\p" .string "“Die Vogel-Liebhaberin hebt ab zum\n" diff --git a/data-de/maps/FortreeCity_DecorationShop/text.inc b/data-de/maps/FortreeCity_DecorationShop/text.inc index 07c3b3379..b202d0e13 100644 --- a/data-de/maps/FortreeCity_DecorationShop/text.inc +++ b/data-de/maps/FortreeCity_DecorationShop/text.inc @@ -1,11 +1,11 @@ -FortreeCity_DecorationShop_Text_186A61:: @ 8186A61 +FortreeCity_DecorationShop_Text_MerchandiseSentToPC:: @ 8186A61 .string "Die Artikel, die du hier kaufst, werden\n" .string "sofort auf deinen PC gesendet.\p" .string "Das ist großartig! Ich wünschte, ich\n" .string "könnte mich so auch nach Hause\l" .string "senden lassen.$" -FortreeCity_DecorationShop_Text_186AD6:: @ 8186AD6 +FortreeCity_DecorationShop_Text_BuyingDeskForDolls:: @ 8186AD6 .string "Ich kaufe mir einen schönen Tisch, auf\n" .string "den ich meine PUPPEN setze.\p" .string "Wenn ich das nicht tue, werden meine\n" diff --git a/data-de/maps/FortreeCity_Gym/text.inc b/data-de/maps/FortreeCity_Gym/text.inc index 5c1696822..598d45c56 100644 --- a/data-de/maps/FortreeCity_Gym/text.inc +++ b/data-de/maps/FortreeCity_Gym/text.inc @@ -1,4 +1,4 @@ -FortreeCity_Gym_Text_18589C:: @ 818589C +FortreeCity_Gym_Text_GymGuideAdvice:: @ 818589C .string "Na, wie sieht es aus, auf dem Weg zum\n" .string "CHAMP, {PLAYER}?\p" .string "Die LEITERIN der ARENA von BAUMHAUSEN\n" @@ -10,68 +10,68 @@ FortreeCity_Gym_Text_18589C:: @ 818589C .string "denen sie die Flügel stutzen kann!\p" .string "Okay, dann viel Glück!$" -FortreeCity_Gym_Text_185994:: @ 8185994 +FortreeCity_Gym_Text_GymGuidePostVictory:: @ 8185994 .string "Du hast es geschafft!\n" .string "Du hast Startfreigabe!$" -FortreeCity_Gym_Text_1859B9:: @ 81859B9 +FortreeCity_Gym_Text_JaredIntro:: @ 81859B9 .string "Bewundere den eleganten Kampfstil der\n" .string "VOGEL-POKéMON!$" -FortreeCity_Gym_Text_1859EA:: @ 81859EA +FortreeCity_Gym_Text_JaredDefeat:: @ 81859EA .string "Du...\n" .string "Du bist stark...$" -FortreeCity_Gym_Text_185A02:: @ 8185A02 +FortreeCity_Gym_Text_JaredPostBattle:: @ 8185A02 .string "Ein TRAINER muss clever genug sein, mit\n" .string "den Wendungen im Kampf fertig zu\l" .string "werden.\p" .string "Mal sehen, ob du clever genug bist, bis\n" .string "zu unserer LEITERIN vorzudringen.$" -FortreeCity_Gym_Text_185A7F:: @ 8185A7F +FortreeCity_Gym_Text_WillIntro:: @ 8185A7F .string "Liebhaber von VOGEL-POKéMON streben\n" .string "danach, dieser ARENA beizutreten.\p" .string "Als Mitglied der ARENA von BAUMHAUSEN\n" .string "CITY darf ich nicht verlieren!$" -FortreeCity_Gym_Text_185AEC:: @ 8185AEC +FortreeCity_Gym_Text_WillDefeat:: @ 8185AEC .string "Das war doch etwas zu schwer für mich\n" .string "zu tragen...$" -FortreeCity_Gym_Text_185B18:: @ 8185B18 +FortreeCity_Gym_Text_WillPostBattle:: @ 8185B18 .string "Die Welt ist groß und es gibt zahlreiche\n" .string "starke TRAINER.\p" .string "Ich werde weiter trainieren und so\n" .string "immer stärker werden!$" -FortreeCity_Gym_Text_185B8D:: @ 8185B8D +FortreeCity_Gym_Text_TerrellIntro:: @ 8185B8D .string "Es gibt keinen Grund, dass WIBKE,\n" .string "unsere ARENALEITERIN, sich mit dir\l" .string "abgibt!\p" .string "Ich bin schon stark genug für dich!$" -FortreeCity_Gym_Text_185BEB:: @ 8185BEB +FortreeCity_Gym_Text_TerrellDefeat:: @ 8185BEB .string "WIBKE... Ich...\n" .string "Ich habe verlooooren!$" -FortreeCity_Gym_Text_185C00:: @ 8185C00 +FortreeCity_Gym_Text_TerrellPostBattle:: @ 8185C00 .string "WIBKE ist süß, aber auch stark.\n" .string "Sie ist die ultimative LEITERIN!\p" .string "Hups... Wie peinlich. Ich werde nicht rot!$" -FortreeCity_Gym_Text_185C45:: @ 8185C45 +FortreeCity_Gym_Text_KyleeIntro:: @ 8185C45 .string "WIBKE hat mich persönlich geschult!\n" .string "Du wirst kein leichtes Spiel haben!$" -FortreeCity_Gym_Text_185C7C:: @ 8185C7C +FortreeCity_Gym_Text_KyleeDefeat:: @ 8185C7C .string "Ich wurde geschlagen...$" -FortreeCity_Gym_Text_185C8C:: @ 8185C8C +FortreeCity_Gym_Text_KyleePostBattle:: @ 8185C8C .string "Dank WIBKE leben die Einwohner von\n" .string "BAUMHAUSEN CITY ohne Furcht.$" -FortreeCity_Gym_Text_185CCB:: @ 8185CCB +FortreeCity_Gym_Text_WinonaIntro:: @ 8185CCB .string "Ich bin WIBKE, die LEITERIN der ARENA\n" .string "von BAUMHAUSEN CITY.\p" .string "Ich wurde das mit Hilfe meiner VOGEL-\n" @@ -81,18 +81,18 @@ FortreeCity_Gym_Text_185CCB:: @ 8185CCB .string "Werde Zeuge der eleganten Choreo-\n" .string "graphie meiner VOGEL-POKéMON!$" -FortreeCity_Gym_Text_185DBA:: @ 8185DBA +FortreeCity_Gym_Text_WinonaDefeat:: @ 8185DBA .string "Ich habe noch nie einen TRAINER ge-\n" .string "sehen, der seine POKéMON mit mehr\l" .string "Grazie trainiert als ich...\p" .string "In Anbetracht deiner Fähigkeiten\n" .string "überreiche ich dir diesen ARENAORDEN.$" -FortreeCity_Gym_Text_185E48:: @ 8185E48 +FortreeCity_Gym_Text_ReceivedFeatherBadge:: @ 8185E48 .string "{PLAYER} erhält den FEDERORDEN von\n" .string "WIBKE.$" -FortreeCity_Gym_Text_185E73:: @ 8185E73 +FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis:: @ 8185E73 .string "Mit dem FEDERORDEN gehorchen dir alle\n" .string "POKéMON bis Lv. 70, auch die, die du\l" .string "durch Tausch bekommen hast.\p" @@ -101,19 +101,19 @@ FortreeCity_Gym_Text_185E73:: @ 8185E73 .string "Und dies...\n" .string "Dies ist ein Geschenk von mir.$" -FortreeCity_Gym_Text_185F4A:: @ 8185F4A +FortreeCity_Gym_Text_ExplainAerialAce:: @ 8185F4A .string "TM40 enthält AERO-ASS.\p" .string "Diese Geschwindigkeit...\n" .string "Kein POKéMON kann ihr entgehen.$" -FortreeCity_Gym_Text_185F98:: @ 8185F98 +FortreeCity_Gym_Text_WinonaPostBattle:: @ 8185F98 .string "Auch wenn ich gegen dich verloren habe,\n" .string "gehört meine Liebe den VOGEL-POKéMON.$" -FortreeCity_Gym_Text_185FD5:: @ 8185FD5 +FortreeCity_Gym_Text_GymStatue:: @ 8185FD5 .string "POKéMON ARENA von BAUMHAUSEN CITY$" -FortreeCity_Gym_Text_185FEE:: @ 8185FEE +FortreeCity_Gym_Text_GymStatueCertified:: @ 8185FEE .string "POKéMON ARENA von BAUMHAUSEN CITY\p" .string "WIBKES ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/FortreeCity_House1/text.inc b/data-de/maps/FortreeCity_House1/text.inc index 06160fb4a..7a5e8141f 100644 --- a/data-de/maps/FortreeCity_House1/text.inc +++ b/data-de/maps/FortreeCity_House1/text.inc @@ -1,4 +1,4 @@ -FortreeCity_House1_Text_18568C:: @ 818568C +FortreeCity_House1_Text_WouldYouTradeIt:: @ 818568C .string "Hi! Da gibt es dieses POKéMON, nach\n" .string "dem ich suche.\p" .string "Ich möchte ein {STR_VAR_1} haben.\n" @@ -6,32 +6,32 @@ FortreeCity_House1_Text_18568C:: @ 818568C .string "Würdest du es gegen mein {STR_VAR_2}\n" .string "tauschen?$" -FortreeCity_House1_Text_1856F7:: @ 81856F7 +FortreeCity_House1_Text_PleaseBeNiceToMon:: @ 81856F7 .string "Danke schön!\p" .string "Ich werde gut zu deinem {STR_VAR_1}\n" .string "sein, also sei auch gut zu meinem\l" .string "{STR_VAR_2}!$" -FortreeCity_House1_Text_185737:: @ 8185737 +FortreeCity_House1_Text_ThatMonIsntAMon:: @ 8185737 .string "Warte!\n" .string "Das ist kein {STR_VAR_1}.\p" .string "Ich glaube, du willst gar nicht mit mir\n" .string "tauschen.$" -FortreeCity_House1_Text_18577F:: @ 818577F +FortreeCity_House1_Text_ChangeYourMindSeeMe:: @ 818577F .string "Oh, okay. Wenn du es dir anders über-\n" .string "legst, komm wieder vorbei.\p" .string "Ich werde hier warten!$" -FortreeCity_House1_Text_1857C7:: @ 81857C7 +FortreeCity_House1_Text_PromiseToTakeGoodCareOfMon:: @ 81857C7 .string "Danke, dass du mit mir getauscht hast!\p" .string "Dieses POKéMON habe ich mir schon lange\n" .string "gewünscht. Bei mir wird's ihm gut gehen!$" -FortreeCity_House1_Text_18582A:: @ 818582A +FortreeCity_House1_Text_TradingMemoriesWithOthers:: @ 818582A .string "Mit anderen sein POKéMON tauschen...\p" .string "Das ist, als ob du die Erinnerungen mit\n" .string "anderen Menschen teilst.$" -FortreeCity_House1_Text_185888:: @ 8185888 +FortreeCity_House1_Text_Zigzagoon:: @ 8185888 .string "ZIGZACHS: Gumomoh?$" diff --git a/data-de/maps/FortreeCity_House2/text.inc b/data-de/maps/FortreeCity_House2/text.inc index c257d6c5b..93eebae1b 100644 --- a/data-de/maps/FortreeCity_House2/text.inc +++ b/data-de/maps/FortreeCity_House2/text.inc @@ -1,38 +1,38 @@ -FortreeCity_House2_Text_186306:: @ 8186306 +FortreeCity_House2_Text_HiddenPowersArousedByNature:: @ 8186306 .string "Menschen... POKéMON...\p" .string "Ihre versteckten Kräfte werden durch\n" .string "das Leben in der Natur geweckt.$" -FortreeCity_House2_Text_186360:: @ 8186360 +FortreeCity_House2_Text_CoinInWhichHand:: @ 8186360 .string "Lass diese alte Frau mal sehen, ob deine\n" .string "versteckten Kräfte erwacht sind...\p" .string "Ich halte eine Münze in meiner Hand.\p" .string "Nun? In welcher Hand halte ich sie?\n" .string "In der linken oder rechten Hand?$" -FortreeCity_House2_Text_1863F6:: @ 81863F6 +FortreeCity_House2_Text_CorrectTryAgainWhichHand:: @ 81863F6 .string "Oh! Das stimmt!\p" .string "Versuchen wir es noch einmal.\p" .string "In welcher Hand halte ich die Münze?\n" .string "Rechts oder links?$" -FortreeCity_House2_Text_186455:: @ 8186455 +FortreeCity_House2_Text_CorrectTryAgainWhichHand2:: @ 8186455 .string "Oh! Schon wieder richtig!\p" .string "Probieren wir es noch einmal.\p" .string "In welcher Hand ist die Münze nun?\n" .string "In der linken oder der rechten Hand?$" -FortreeCity_House2_Text_1864C6:: @ 81864C6 +FortreeCity_House2_Text_YourHiddenPowerHasAwoken:: @ 81864C6 .string "Oh! Hervorragend!\n" .string "Deine versteckten Kräfte sind erwacht!\p" .string "Hier, das ist für dich. Wecke damit die\n" .string "versteckten Kräfte deiner POKéMON.$" -FortreeCity_House2_Text_18652F:: @ 818652F +FortreeCity_House2_Text_ExplainHiddenPower:: @ 818652F .string "KRAFTRESERVE ist eine Attacke, die je\n" .string "nach POKéMON anders aussieht.$" -FortreeCity_House2_Text_186565:: @ 8186565 +FortreeCity_House2_Text_YouGuessedWrong:: @ 8186565 .string "Och, zu schade!\n" .string "Du hast falsch geraten.$" diff --git a/data-de/maps/FortreeCity_House3/text.inc b/data-de/maps/FortreeCity_House3/text.inc index 8370d6692..63853c0e5 100644 --- a/data-de/maps/FortreeCity_House3/text.inc +++ b/data-de/maps/FortreeCity_House3/text.inc @@ -1,4 +1,4 @@ -FortreeCity_House3_Text_186624:: @ 8186624 +FortreeCity_House3_Text_MetStevenHadAmazingPokemon:: @ 8186624 .string "Da wir gerade vom POKéDEX reden... Ich\n" .string "erinnere mich...\p" .string "Ich habe diesen TRAINER, TROY,\n" @@ -11,7 +11,7 @@ FortreeCity_House3_Text_186624:: @ 8186624 .string "Er ist bestimmt stärker als die ARENA-\n" .string "LEITERIN in diesem Ort...$" -FortreeCity_House3_Text_186745:: @ 8186745 +FortreeCity_House3_Text_OhYouHavePokedex:: @ 8186745 .string "Was ist das da? Was hast du da?\p" .string "... ... ... ... ... ...\p" .string "Oh, das ist also ein POKéDEX?\n" diff --git a/data-de/maps/FortreeCity_House4/text.inc b/data-de/maps/FortreeCity_House4/text.inc index c1491ae96..8a1a658c2 100644 --- a/data-de/maps/FortreeCity_House4/text.inc +++ b/data-de/maps/FortreeCity_House4/text.inc @@ -1,18 +1,18 @@ -FortreeCity_House4_Text_1867AF:: @ 81867AF +FortreeCity_House4_Text_BringsWorldCloserTogether:: @ 81867AF .string "Wenn sie mit POKéMON zusammen sind,\n" .string "finden die Menschen schnell Freunde.\p" .string "Und so rücken die Menschen weltweit\n" .string "näher zusammen. Wunderbar, nicht wahr?$" -FortreeCity_House4_Text_186835:: @ 8186835 +FortreeCity_House4_Text_GoBirdPokemon:: @ 8186835 .string "Fertig!\n" .string "Los, VOGEL-POKéMON!$" -FortreeCity_House4_Text_18684E:: @ 818684E +FortreeCity_House4_Text_AskedWingullToRunErrand:: @ 818684E .string "Hähähä, mein WINGULL macht\n" .string "Besorgungen für mich.$" -FortreeCity_House4_Text_186881:: @ 8186881 +FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb:: @ 8186881 .string "Gut!\n" .string "Komm zurück, WINGULL!\p" .string "Huch! Was ist das?\n" @@ -22,9 +22,9 @@ FortreeCity_House4_Text_186881:: @ 8186881 .string "Aber, ich bin kein TRAINER, daher kannst\n" .string "du es haben.$" -FortreeCity_House4_Text_186924:: @ 8186924 +FortreeCity_House4_Text_FriendsFarAwayThanksToWingull:: @ 8186924 .string "Dank meines WINGULL habe ich Freunde,\n" .string "die sehr weit weg von hier wohnen.$" -FortreeCity_House4_Text_18695C:: @ 818695C +FortreeCity_House4_Text_Wingull:: @ 818695C .string "WINGULL: Pihyoh!$" diff --git a/data-de/maps/FortreeCity_House5/text.inc b/data-de/maps/FortreeCity_House5/text.inc index 26c5b21ad..7a655e858 100644 --- a/data-de/maps/FortreeCity_House5/text.inc +++ b/data-de/maps/FortreeCity_House5/text.inc @@ -1,14 +1,14 @@ -FortreeCity_House5_Text_18696D:: @ 818696D +FortreeCity_House5_Text_TreeHousesAreGreat:: @ 818696D .string "Die Baumhäuser von BAUMHAUSEN\n" .string "CITY sind fantastisch!\p" .string "Ich glaube, es ist der beste Platz, um\n" .string "mit seinen POKéMON zusammenzuleben.$" -FortreeCity_House5_Text_1869D6:: @ 81869D6 +FortreeCity_House5_Text_AdaptedToNature:: @ 81869D6 .string "POKéMON und Menschen sind auf die\n" .string "Natur angewiesen, um zu überleben.\p" .string "Es gibt überhaupt keinen Grund, die\n" .string "Natur nach unserem Willen zu formen.$" -FortreeCity_House5_Text_186A4F:: @ 8186A4F +FortreeCity_House5_Text_Zigzagoon:: @ 8186A4F .string "ZIGZACHS: Bufuu!$" diff --git a/data-de/maps/FortreeCity_Mart/text.inc b/data-de/maps/FortreeCity_Mart/text.inc index da371d141..2ed526bfc 100644 --- a/data-de/maps/FortreeCity_Mart/text.inc +++ b/data-de/maps/FortreeCity_Mart/text.inc @@ -1,15 +1,15 @@ -FortreeCity_Mart_Text_1861EF:: @ 81861EF +FortreeCity_Mart_Text_SuperRepelBetter:: @ 81861EF .string "SUPERSCHUTZ hält lange an, und ist auch\n" .string "äußerst nützlich.\p" .string "Es ist viel besser als normaler SCHUTZ.$" -FortreeCity_Mart_Text_186251:: @ 8186251 +FortreeCity_Mart_Text_StockUpOnItems:: @ 8186251 .string "Ich horte immer mehr Items, als ich\n" .string "eigentlich benötige.\p" .string "Man weiß ja nie, was einem passieren\n" .string "kann. Vorsicht ist die Mutter der\l" .string "Porzellankiste!$" -FortreeCity_Mart_Text_1862CA:: @ 81862CA +FortreeCity_Mart_Text_RareCandyMakesMonGrow:: @ 81862CA .string "Ein SONDERBONBON erhöht den Level\n" .string "eines POKéMON sofort um 1.$" diff --git a/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc b/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc index f38a010bc..54a349ba1 100644 --- a/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc @@ -1,11 +1,11 @@ -FortreeCity_PokemonCenter_1F_Text_186027:: @ 8186027 +FortreeCity_PokemonCenter_1F_Text_GoToSafariZone:: @ 8186027 .string "Na, Kindchen, arbeitest du an einem\n" .string "POKéDEX?\p" .string "Hmm... Ich an deiner Stelle würde mal\n" .string "die SAFARI-ZONE auf der ROUTE 121\l" .string "besuchen.$" -FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 +FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat:: @ 8186086 .string "Hast du schon mal eine\n" .string "STATISTIK GETAUSCHT?\p" .string "Sehr nützliche Einrichtung! Die Erfolge\n" @@ -14,7 +14,7 @@ FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 .string "Ich weiß zwar nicht, wie das passiert,\n" .string "aber es ist einfach irre. Und aufregend!$" -FortreeCity_PokemonCenter_1F_Text_186138:: @ 8186138 +FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav:: @ 8186138 .string "Hey, du hast einen POKéNAV!\n" .string "Ich habe auch so einen.\p" .string "Schau dir mal die TRAINER an.\p" diff --git a/data-de/maps/LavaridgeTown/text.inc b/data-de/maps/LavaridgeTown/text.inc index 3fa8668e5..872a90bac 100644 --- a/data-de/maps/LavaridgeTown/text.inc +++ b/data-de/maps/LavaridgeTown/text.inc @@ -1,4 +1,4 @@ -LavaridgeTown_Text_16BDA4:: @ 816BDA4 +LavaridgeTown_Text_MayNiceBadgesTakeThis:: @ 816BDA4 .string "MAIKE: {PLAYER}{KUN}! Wir haben uns lange\n" .string "nicht gesehen!\p" .string "Oh? Als ich die Heißen Quellen aufge-\n" @@ -10,7 +10,7 @@ LavaridgeTown_Text_16BDA4:: @ 816BDA4 .string "Ich denke, das hier wirst du gut\n" .string "gebrauchen können.$" -LavaridgeTown_Text_16BE7D:: @ 816BE7D +LavaridgeTown_Text_MayExplainGoGogglesChallengeDad:: @ 816BE7D .string "MAIKE: Mit diesem WÜSTENGLAS wirst du\n" .string "keine Probleme haben, durch die Wüste in\l" .string "der Nähe von ROUTE 111 zu gehen.\p" @@ -23,14 +23,14 @@ LavaridgeTown_Text_16BE7D:: @ 816BE7D .string "CITY herausfordern.\p" .string "{PLAYER}{KUN}, man sieht sich!$" -LavaridgeTown_Text_16BF92:: @ 816BF92 +LavaridgeTown_Text_BrendanNiceBadgesTakeThis:: @ 816BF92 .string "BRIX: {PLAYER}, wie geht es dir?\p" .string "Hmm... Das ist eine beachtliche\n" .string "Sammlung von ORDEN.\p" .string "Also gut.\n" .string "Hier, dies schenke ich dir.$" -LavaridgeTown_Text_16C020:: @ 816C020 +LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad:: @ 816C020 .string "BRIX: Nimm das mit, wenn du in die\n" .string "Wüste in der Nähe von ROUTE 111 willst.\p" .string "Da sollten sich einige POKéMON fangen\n" @@ -43,7 +43,7 @@ LavaridgeTown_Text_16C020:: @ 816C020 .string "einen sehr starken Eindruck.\p" .string "Man sieht sich!$" -LavaridgeTown_Text_16C174:: @ 816C174 +LavaridgeTown_Text_HaveEggWillYouTakeIt:: @ 816C174 .string "Ich habe hier ein EI.\p" .string "Ich dachte, ich könnte es ausbrüten,\n" .string "indem ich es in den heißen Sand bei den\p" @@ -57,28 +57,28 @@ LavaridgeTown_Text_16C174:: @ 816C174 .string "So, was meinst du? Wirst du das EI mit-\n" .string "nehmen und zum Ausschlüpfen bringen?$" -LavaridgeTown_Text_16C2B6:: @ 816C2B6 +LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg:: @ 816C2B6 .string "Gut! Ich hoffe, du hast mehr Glück\n" .string "mit diesem EI!$" -LavaridgeTown_Text_16C2EA:: @ 816C2EA +LavaridgeTown_Text_ReceivedTheEgg:: @ 816C2EA .string "{PLAYER} erhält ein EI.$" -LavaridgeTown_Text_16C2FF:: @ 816C2FF +LavaridgeTown_Text_NoRoomForThisEgg:: @ 816C2FF .string "Oh! Du hast zu viele POKéMON dabei.\n" .string "Du hast keinen Platz für das EI...$" -LavaridgeTown_Text_16C33C:: @ 816C33C +LavaridgeTown_Text_AsYouWishThen:: @ 816C33C .string "Ganz, wie du willst...\p" .string "Wenn dein Herz sich anders entscheidet\n" .string "und das EI haben möchte, ich bin hier.$" -LavaridgeTown_Text_16C398:: @ 816C398 +LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare:: @ 816C398 .string "Von Zeit zu Zeit findet man in der\n" .string "PENSION ein EI.\p" .string "So zumindest erzählt man es sich.$" -LavaridgeTown_Text_16C3FD:: @ 816C3FD +LavaridgeTown_Text_HotSpringsNeverRunDry:: @ 816C3FD .string "Wir nehmen uns so viel heißes Wasser,\n" .string "wie wir brauchen, und trotzdem trocknen\l" .string "die Heißen Quellen nicht aus.\p" @@ -89,7 +89,7 @@ LavaridgeTown_Text_16C3FD:: @ 816C3FD .string "erhitzt und kommen als heiße Quellen\l" .string "an die Erdoberfläche.$" -LavaridgeTown_Text_16C4DB:: @ 816C4DB +LavaridgeTown_Text_PokemonNippedBackside:: @ 816C4DB .string "Hier im heißen Sand vergraben zu sein,\n" .string "ist... Seufz...\p" .string "So warm und einfach himmlisch... Seufz...\p" @@ -97,18 +97,18 @@ LavaridgeTown_Text_16C4DB:: @ 816C4DB .string "Ein POKéMON hat meinen Rücken ange-\n" .string "knabbert!$" -LavaridgeTown_Text_16C54E:: @ 816C54E +LavaridgeTown_Text_OhYouLikeHotSprings:: @ 816C54E .string "Ach, du magst auch heiße Quellen?\p" .string "Das ist überraschend bei einem so\n" .string "jungen Menschen wie dir.$" -LavaridgeTown_Text_16C59B:: @ 816C59B +LavaridgeTown_Text_BatheInHotSpringsEveryDay:: @ 816C59B .string "Ich bade jeden Tag in den\n" .string "Heißen Quellen.\p" .string "Ich will ein wunderschöner und starker\n" .string "ARENALEITER wie FLAVIA werden.$" -LavaridgeTown_Text_16C603:: @ 816C603 +LavaridgeTown_Text_IfPokemonInHotSprings:: @ 816C603 .string "Wenn Leute ihre POKéMON in die Heißen\n" .string "Quellen setzen, ist das schon\l" .string "merkwürdig.\p" @@ -116,23 +116,23 @@ LavaridgeTown_Text_16C603:: @ 816C603 .string "Elektrizität, ein Schaumbad oder sogar\l" .string "ein Bad in Lava sein...$" -LavaridgeTown_Text_16C694:: @ 816C694 +LavaridgeTown_Text_HotSpringsClaims:: @ 816C694 .string "Man sagt, diese Heißen Quellen seien gut\n" .string "gegen nervöse Anspannungen, gegen\l" .string "Muskelkrämpfe, sie sollen bei roman-\l" .string "tischen Problemen helfen und auch bei\l" .string "Geldsorgen...$" -LavaridgeTown_Text_16C72F:: @ 816C72F +LavaridgeTown_Text_TownSign:: @ 816C72F .string "BAD LAVASTADT\p" .string "“POKéMON-CENTER - HEISSE QUELLEN\n" .string "Der ideale Ort zum Entspannen!”$" -LavaridgeTown_Text_16C77C:: @ 816C77C +LavaridgeTown_Text_GymSign:: @ 816C77C .string "POKéMON ARENA von BAD LAVASTADT\n" .string "LEITERIN: FLAVIA\l" .string "“Die mit der brennenden Leidenschaft!”$" -LavaridgeTown_Text_16C7CF:: @ 816C7CF +LavaridgeTown_Text_HerbShopSign:: @ 816C7CF .string "POKéMON KRÄUTERLADEN\n" .string "“Bitterer Geschmack - Bessere Kur!”$" diff --git a/data-de/maps/LavaridgeTown_Gym_1F/text.inc b/data-de/maps/LavaridgeTown_Gym_1F/text.inc index 85d9fef46..155c0e964 100644 --- a/data-de/maps/LavaridgeTown_Gym_1F/text.inc +++ b/data-de/maps/LavaridgeTown_Gym_1F/text.inc @@ -1,4 +1,4 @@ -LavaridgeTown_Gym_1F_Text_176312:: @ 8176312 +LavaridgeTown_Gym_1F_Text_GymGuideAdvice:: @ 8176312 .string "Na, wie sieht es aus, auf dem Weg zum\n" .string "CHAMP, {PLAYER}?\p" .string "Die ARENALEITERIN von BAD LAVA-\n" @@ -10,35 +10,35 @@ LavaridgeTown_Gym_1F_Text_176312:: @ 8176312 .string "dich! Lösche die Glut mit Wasser und\l" .string "dann besiege sie!$" -LavaridgeTown_Gym_1F_Text_17640C:: @ 817640C +LavaridgeTown_Gym_1F_Text_GymGuidePostVictory:: @ 817640C .string "Hui! Das war ein glühend heißer Kampf!$" -LavaridgeTown_Gym_1F_Text_176432:: @ 8176432 +LavaridgeTown_Gym_1F_Text_ColeIntro:: @ 8176432 .string "Auauauauau!\n" .string "Hach, ist das heiß!$" -LavaridgeTown_Gym_1F_Text_17644F:: @ 817644F +LavaridgeTown_Gym_1F_Text_ColeDefeat:: @ 817644F .string "Der Schweiß lief mir in die Augen...$" -LavaridgeTown_Gym_1F_Text_176472:: @ 8176472 +LavaridgeTown_Gym_1F_Text_ColePostBattle:: @ 8176472 .string "Ein Bad im heißen Sand regt den\n" .string "Kreislauf an.\p" .string "Auch Gelenkschmerzen lassen sich damit\n" .string "kurieren.$" -LavaridgeTown_Gym_1F_Text_1764D1:: @ 81764D1 +LavaridgeTown_Gym_1F_Text_AxleIntro:: @ 81764D1 .string "Ich versuche, Stress abzubauen.\n" .string "Komm her. Ich will mich abreagieren.$" -LavaridgeTown_Gym_1F_Text_176516:: @ 8176516 +LavaridgeTown_Gym_1F_Text_AxleDefeat:: @ 8176516 .string "Ich hoffe, FLAVIA wird dich rösten!$" -LavaridgeTown_Gym_1F_Text_176537:: @ 8176537 +LavaridgeTown_Gym_1F_Text_AxlePostBattle:: @ 8176537 .string "Haaah... Huuuuh...\p" .string "Bleibt man zu lange im heißen Sand,\n" .string "macht einen das ganz schön fertig.$" -LavaridgeTown_Gym_1F_Text_17658D:: @ 817658D +LavaridgeTown_Gym_B1F_Text_AndyIntro:: @ 817658D .string "Du musst ganz schön müde sein.\n" .string "Willst du dich nicht hier im heißen\l" .string "Sand ausruhen?\p" @@ -46,39 +46,39 @@ LavaridgeTown_Gym_1F_Text_17658D:: @ 817658D .string "Willenskraft ganz wichtig für einen\l" .string "TRAINER ist.$" -LavaridgeTown_Gym_1F_Text_17663F:: @ 817663F +LavaridgeTown_Gym_B1F_Text_AndyDefeat:: @ 817663F .string "Spiele mit Feuer und du verbrennst dich.$" -LavaridgeTown_Gym_1F_Text_176660:: @ 8176660 +LavaridgeTown_Gym_B1F_Text_AndyPostBattle:: @ 8176660 .string "Dein Können ist gut... Aber unsere\n" .string "LEITERIN FLAVIA ist stark.\p" .string "Wenn du nicht aufpasst, verbrennst\n" .string "du dich ernsthaft.$" -LavaridgeTown_Gym_1F_Text_1766D2:: @ 81766D2 +LavaridgeTown_Gym_1F_Text_ZaneIntro:: @ 81766D2 .string "Kann dein POKéMON 200 Grad aushalten?$" -LavaridgeTown_Gym_1F_Text_1766FE:: @ 81766FE +LavaridgeTown_Gym_1F_Text_ZaneDefeat:: @ 81766FE .string "Die Hitze war nicht stark genug...$" -LavaridgeTown_Gym_1F_Text_17671D:: @ 817671D +LavaridgeTown_Gym_1F_Text_ZanePostBattle:: @ 817671D .string "Die Temperatur von Magma beträgt\n" .string "über 200 Grad.\p" .string "Deine POKéMON haben mich besiegt, sie\n" .string "sollten auch in Magma überleben können.$" -LavaridgeTown_Gym_1F_Text_176784:: @ 8176784 +LavaridgeTown_Gym_1F_Text_SadieIntro:: @ 8176784 .string "Ähm...\n" .string "Okay, ich kämpfe mit dir.$" -LavaridgeTown_Gym_1F_Text_1767A6:: @ 81767A6 +LavaridgeTown_Gym_1F_Text_SadieDefeat:: @ 81767A6 .string "Oh, du bist zu stark.$" -LavaridgeTown_Gym_1F_Text_1767C1:: @ 81767C1 +LavaridgeTown_Gym_1F_Text_SadiePostBattle:: @ 81767C1 .string "Ich will einmal so eine starke TRAINERIN\n" .string "werden wie FLAVIA.$" -LavaridgeTown_Gym_1F_Text_176801:: @ 8176801 +LavaridgeTown_Gym_1F_Text_FlanneryIntro:: @ 8176801 .string "Willkommen... Halt, warte!\p" .string "Hallo, du Winzling von TRAINER, wie\n" .string "schön, dich hier zu sehen!\p" @@ -94,7 +94,7 @@ LavaridgeTown_Gym_1F_Text_176801:: @ 8176801 .string "heißen Attacken zeigen, die wir hier\l" .string "entwickelt haben!$" -LavaridgeTown_Gym_1F_Text_176960:: @ 8176960 +LavaridgeTown_Gym_1F_Text_FlanneryDefeat:: @ 8176960 .string "Äh...\n" .string "Ich glaube, ich habe es übertrieben...\p" .string "Ich... Ich bin ja auch noch nicht lange\n" @@ -107,11 +107,11 @@ LavaridgeTown_Gym_1F_Text_176960:: @ 8176960 .string "Danke, dass du mich das gelehrt hast!\n" .string "Du hast dir das hier wohl verdient!$" -LavaridgeTown_Gym_1F_Text_176A62:: @ 8176A62 +LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge:: @ 8176A62 .string "{PLAYER} erhält den HITZEORDEN\n" .string "von FLAVIA.$" -LavaridgeTown_Gym_1F_Text_176A8C:: @ 8176A8C +LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis:: @ 8176A8C .string "Mit dem HITZEORDEN gehorchen dir alle\n" .string "POKéMON bis Level 50, auch die, die du\l" .string "durch Tausch erhalten hast.\p" @@ -120,7 +120,7 @@ LavaridgeTown_Gym_1F_Text_176A8C:: @ 8176A8C .string "Dies ist das Zeichen meiner\n" .string "Anerkennung. Nimm es ruhig an!$" -LavaridgeTown_Gym_1F_Text_176B8F:: @ 8176B8F +LavaridgeTown_Gym_1F_Text_ExplainOverheat:: @ 8176B8F .string "Die TM50 enthält HITZEKOLLER.\p" .string "Diese Attacke richtet beim Gegner\n" .string "großen Schaden an.\p" @@ -129,16 +129,16 @@ LavaridgeTown_Gym_1F_Text_176B8F:: @ 8176B8F .string "anwendet, herabgesetzt. Für längere\n" .string "Kämpfe ist sie daher nicht geeignet.$" -LavaridgeTown_Gym_1F_Text_176C4A:: @ 8176C4A +LavaridgeTown_Gym_1F_Text_FlanneryPostBattle:: @ 8176C4A .string "Deine Stärke erinnert mich an\n" .string "jemanden...\p" .string "Jetzt weiß ich's! Du kämpfst wie NORMAN,\n" .string "der ARENALEITER von BLÜTENBURG CITY.$" -LavaridgeTown_Gym_1F_Text_176CAF:: @ 8176CAF +LavaridgeTown_Gym_1F_Text_GymStatue:: @ 8176CAF .string "POKéMON ARENA von BAD LAVASTADT$" -LavaridgeTown_Gym_1F_Text_176CCA:: @ 8176CCA +LavaridgeTown_Gym_1F_Text_GymStatueCertified:: @ 8176CCA .string "POKéMON ARENA von BAD LAVASTADT\p" .string "FLAVIAS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/LavaridgeTown_HerbShop/text.inc b/data-de/maps/LavaridgeTown_HerbShop/text.inc index 612d4e9a4..ec2f1a7c9 100644 --- a/data-de/maps/LavaridgeTown_HerbShop/text.inc +++ b/data-de/maps/LavaridgeTown_HerbShop/text.inc @@ -1,21 +1,21 @@ -LavaridgeTown_HerbShop_Text_17615C:: @ 817615C +LavaridgeTown_HerbShop_Text_WelcomeToHerbShop:: @ 817615C .string "Willkommen im KRÄUTERLADEN! Dem Heim\n" .string "wirkungsvoller und preiswerter Medizin!$" -LavaridgeTown_HerbShop_Text_1761A2:: @ 81761A2 +LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine:: @ 81761A2 .string "Du kommst nach BAD LAVASTADT, um\n" .string "Kräutermedizin zu kaufen?\p" .string "Das ist lobenswert!\p" .string "Ich finde dich nett! Hier, für dich!$" -LavaridgeTown_HerbShop_Text_176209:: @ 8176209 +LavaridgeTown_HerbShop_Text_ExplainCharcoal:: @ 8176209 .string "Mit dieser HOLZKOHLE wird die Kräuter-\n" .string "medizin hergestellt.\p" .string "Sie wirkt auch Wunder, wenn sie von\n" .string "einem POKéMON getragen wird.\p" .string "Sie verstärkt FEUER-Attacken.$" -LavaridgeTown_HerbShop_Text_1762A3:: @ 81762A3 +LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike:: @ 81762A3 .string "Kräutermedizin ist erstaunlich\n" .string "wirkungsvoll. Aber deine POKéMON mögen\l" .string "sie nicht. Sie schmeckt bitter...$" diff --git a/data-de/maps/LavaridgeTown_House/text.inc b/data-de/maps/LavaridgeTown_House/text.inc index 6a6a3663c..0439efcab 100644 --- a/data-de/maps/LavaridgeTown_House/text.inc +++ b/data-de/maps/LavaridgeTown_House/text.inc @@ -1,9 +1,9 @@ -LavaridgeTown_House_Text_176D07:: @ 8176D07 +LavaridgeTown_House_Text_WifeWarmingEggInHotSprings:: @ 8176D07 .string "Meine Frau wärmt ein EI in den Heißen\n" .string "Quellen. So hat sie es mir jedenfalls\l" .string "gesagt.\p" .string "Sie hat zwei POKéMON in der PENSION\n" .string "abgegeben und heraus kam ein EI...$" -LavaridgeTown_House_Text_176D94:: @ 8176D94 +LavaridgeTown_House_Text_Zigzagoon:: @ 8176D94 .string "ZIGZACHS: Pshoo!$" diff --git a/data-de/maps/LavaridgeTown_Mart/text.inc b/data-de/maps/LavaridgeTown_Mart/text.inc index fc957492c..ef99a5c3f 100644 --- a/data-de/maps/LavaridgeTown_Mart/text.inc +++ b/data-de/maps/LavaridgeTown_Mart/text.inc @@ -1,11 +1,11 @@ -LavaridgeTown_Mart_Text_176DA6:: @ 8176DA6 +LavaridgeTown_Mart_Text_XSpeedFirstStrike:: @ 8176DA6 .string "Mit X-TEMPO kannst du die INITIATIVE\n" .string "im Kampf erhöhen.\p" .string "So kann man eventuell den ersten\n" .string "Angriff ausführen - ein entscheidender\l" .string "Vorteil!$" -LavaridgeTown_Mart_Text_176E1A:: @ 8176E1A +LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney:: @ 8176E1A .string "Auf dem Gipfel des SCHLOTBERGS wird\n" .string "eine lokale Spezialität angeboten.\p" .string "Gib sie einem POKéMON und es wird\n" diff --git a/data-de/maps/LavaridgeTown_PokemonCenter_1F/text.inc b/data-de/maps/LavaridgeTown_PokemonCenter_1F/text.inc index e0425c1ee..97fb1bd55 100644 --- a/data-de/maps/LavaridgeTown_PokemonCenter_1F/text.inc +++ b/data-de/maps/LavaridgeTown_PokemonCenter_1F/text.inc @@ -1,17 +1,17 @@ -LavaridgeTown_PokemonCenter_1F_Text_176E92:: @ 8176E92 +LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether:: @ 8176E92 .string "Ich denke, die POKéMON fühlen sich\n" .string "ihrem TRAINER mehr verbunden, wenn sie\l" .string "viel Zeit miteinander verbringen.\p" .string "Je länger, desto besser.\n" .string "Das ist meine Meinung.$" -LavaridgeTown_PokemonCenter_1F_Text_176F08:: @ 8176F08 +LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate:: @ 8176F08 .string "Ich habe meinem POKéMON einen {POKEBLOCK}\n" .string "ROT gegeben. Seitdem ist es cooler.\p" .string "Hmm... Vielleicht sollte ich auch einen\n" .string "{POKEBLOCK} ROT essen...$" -LavaridgeTown_PokemonCenter_1F_Text_176F7A:: @ 8176F7A +LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo:: @ 8176F7A .string "Hohoho! Hey, Kindchen, du kannst von\n" .string "hier die Heißen Quellen erreichen.\p" .string "Wenn POKéMON ausruhen, sollten sich\n" diff --git a/data-de/maps/LilycoveCity/text.inc b/data-de/maps/LilycoveCity/text.inc index eb11d39b5..5027dff3e 100644 --- a/data-de/maps/LilycoveCity/text.inc +++ b/data-de/maps/LilycoveCity/text.inc @@ -1,4 +1,4 @@ -LilycoveCity_Text_1679BF:: @ 81679BF +LilycoveCity_Text_MayShoppingLetsBattle:: @ 81679BF .string "MAIKE: Oh, hey?\n" .string "{PLAYER}{KUN}, bist du auch am Einkaufen?\p" .string "Ich habe eine Menge PUPPEN und POSTER\n" @@ -11,21 +11,21 @@ LilycoveCity_Text_1679BF:: @ 81679BF .string "Ich werde gegen dich kämpfen, dann\n" .string "sehe ich, ob du sie gut behandelst.$" -LilycoveCity_Text_167AEB:: @ 8167AEB +LilycoveCity_Text_MayNotRaisingPokemon:: @ 8167AEB .string "MAIKE: Oh, hui. Hast du dich denn nicht\n" .string "um deine POKéMON gekümmert, {PLAYER}{KUN}?\p" .string "Als Trainer machst du wirklich keinen\n" .string "guten Eindruck!$" -LilycoveCity_Text_167B55:: @ 8167B55 +LilycoveCity_Text_MayBattleMe:: @ 8167B55 .string "MAIKE: Komm, kämpfe mit mir, dann kann\n" .string "ich deine POKéMON beurteilen.$" -LilycoveCity_Text_167B94:: @ 8167B94 +LilycoveCity_Text_MayWontBeBeaten:: @ 8167B94 .string "MAIKE: Die POKéMON, die ich aufgezogen\n" .string "habe, sind mit Sicherheit unbesiegbar.$" -LilycoveCity_Text_167BD5:: @ 8167BD5 +LilycoveCity_Text_MayDefeat:: @ 8167BD5 .string "... ... ... ... ... ... ... ...\p" .string "Ich kann mich noch gut an unseren\n" .string "Kampf auf der ROUTE 103 erinnern,\l" @@ -33,7 +33,7 @@ LilycoveCity_Text_167BD5:: @ 8167BD5 .string "Dieser Kampf hat dir enorm geholfen,\n" .string "stärker zu werden, oder?$" -LilycoveCity_Text_167C6B:: @ 8167C6B +LilycoveCity_Text_MayGoingBackToLittleroot:: @ 8167C6B .string "MAIKE: Ich überlege, ob ich bald nach\n" .string "WURZELHEIM zurückgehe.\p" .string "Ich habe eine anständige Gruppe von\n" @@ -41,7 +41,7 @@ LilycoveCity_Text_167C6B:: @ 8167C6B .string "sieht immer besser aus. Ich gehe nach\n" .string "Hause und zeige das meinem Papa.$" -LilycoveCity_Text_167D08:: @ 8167D08 +LilycoveCity_Text_MayYouGoingToCollectBadges:: @ 8167D08 .string "{PLAYER}{KUN}, was wirst du machen?\p" .string "Alle ORDEN der ARENEN sammeln und die\n" .string "POKéMON LIGA herausfordern?\p" @@ -51,7 +51,7 @@ LilycoveCity_Text_167D08:: @ 8167D08 .string "haben als du, wetten?\p" .string "Bis dann!$" -LilycoveCity_Text_167DDD:: @ 8167DDD +LilycoveCity_Text_MayYouGoingToPokemonLeague:: @ 8167DDD .string "Und, {PLAYER}{KUN}, was wirst du machen?\p" .string "Wirst du die POKéMON LIGA heraus-\n" .string "fordern?\p" @@ -62,7 +62,7 @@ LilycoveCity_Text_167DDD:: @ 8167DDD .string "haben als du!!\p" .string "Man sieht sich!$" -LilycoveCity_Text_167EAA:: @ 8167EAA +LilycoveCity_Text_MayYouGoingToBattleTower:: @ 8167EAA .string "Und, {PLAYER}{KUN}, was wirst du machen?\p" .string "Wirst du im DUELLTURM antreten?\p" .string "Oder wirst du deinen POKéDEX vervoll-\n" @@ -72,7 +72,7 @@ LilycoveCity_Text_167EAA:: @ 8167EAA .string "haben als du!\p" .string "Man sieht sich!$" -LilycoveCity_Text_167F75:: @ 8167F75 +LilycoveCity_Text_BrendanShoppingLetsBattle:: @ 8167F75 .string "BRIX: Oh, du bist es, {PLAYER}.\p" .string "Ich mache Besorgungen für meinen\n" .string "Vater. Nein, ich kaufe keine PUPPEN!\p" @@ -80,40 +80,40 @@ LilycoveCity_Text_167F75:: @ 8167F75 .string "Sollen wir kämpfen, um zu sehen, wer\n" .string "seine POKéMON besser trainiert?$" -LilycoveCity_Text_16802C:: @ 816802C +LilycoveCity_Text_BrendanNoConfidence:: @ 816802C .string "BRIX: Oh, hast du ein Problem? Nicht\n" .string "genügend Selbstbewusstsein, was?$" -LilycoveCity_Text_168067:: @ 8168067 +LilycoveCity_Text_BrendanBattleMe:: @ 8168067 .string "BRIX: Sollen wir kämpfen, um zu\n" .string "sehen, wer seine POKéMON besser\l" .string "trainiert?$" -LilycoveCity_Text_1680A9:: @ 81680A9 +LilycoveCity_Text_BrendanWontBeBeaten:: @ 81680A9 .string "BRIX: Aah, ich werde doch nicht\n" .string "gegen {PLAYER} verlieren! Niemals!$" -LilycoveCity_Text_1680E4:: @ 81680E4 +LilycoveCity_Text_BrendanDefeat:: @ 81680E4 .string "Ach...\n" .string "Du hast dich stark verbessert.\p" .string "Das schmerzt - und dabei hatte ich als\n" .string "TRAINER sogar einen Vorsprung...$" -LilycoveCity_Text_168149:: @ 8168149 +LilycoveCity_Text_BrendanGoingBackToLittleroot:: @ 8168149 .string "BRIX: Ich...\n" .string "Ich gehe nach Hause, nach WURZELHEIM.\p" .string "Weißt du, ich helfe meinem Vater bei dem\n" .string "POKéDEX. Es geht ganz anständig voran\l" .string "und ich sollte ihm das mal zeigen.$" -LilycoveCity_Text_1681EA:: @ 81681EA +LilycoveCity_Text_BrendanYouGoingToCollectBadges:: @ 81681EA .string "Und, {PLAYER}, was wirst du tun?\p" .string "Wirst du alle ORDEN der ARENEN sammeln\n" .string "und die POKéMON LIGA herausfordern?\p" .string "Vielleicht werde ich das auch machen...\p" .string "Gut, bleib am Ball!$" -LilycoveCity_Text_168282:: @ 8168282 +LilycoveCity_Text_BrendanYouGoingToPokemonLeague:: @ 8168282 .string "Und, {PLAYER}, was wirst du tun?\p" .string "Da du so stark geworden bist, wirst du\n" .string "die POKéMON LIGA herausfordern?\p" @@ -122,7 +122,7 @@ LilycoveCity_Text_168282:: @ 8168282 .string "eigentlich stärker sein als du...\p" .string "Nun ja, bleib am Ball!$" -LilycoveCity_Text_16835A:: @ 816835A +LilycoveCity_Text_BrendanYouGoingToBattleTower:: @ 816835A .string "Und, {PLAYER}, was machst du nun?\p" .string "Da du so stark geworden bist, wirst du\n" .string "zum DUELLTURM gehen?\p" @@ -132,14 +132,14 @@ LilycoveCity_Text_16835A:: @ 816835A .string "Vielleicht gehe ich zum DUELLTURM...\p" .string "Nun, bleib am Ball!$" -LilycoveCity_Text_168455:: @ 8168455 +LilycoveCity_Text_MovedLootIntoHideoutToday:: @ 8168455 .string "Hähähä...\p" .string "Heute haben wir noch mehr Beute in\n" .string "unser VERSTECK gebracht...\p" .string "We...wer bist du denn??? Ich... äh, habe\n" .string "mit mir selbst gesprochen!$" -LilycoveCity_Text_1684C2:: @ 81684C2 +LilycoveCity_Text_ChanceToDoBigThings:: @ 81684C2 .string "Ich bin nur ein RÜPEL, ich weiß nicht,\n" .string "was unser BOSS so vorhat...\p" .string "Aber als Mitglied vom TEAM {EVIL_TEAM} habe\n" @@ -147,38 +147,38 @@ LilycoveCity_Text_1684C2:: @ 81684C2 .string "Ww...wer bist du denn??? I-Ich... hähähä,\n" .string "habe nur mit mir selber gesprochen!$" -LilycoveCity_Text_168573:: @ 8168573 +LilycoveCity_Text_DontGoNearCaveInCove:: @ 8168573 .string "Hey, du da!\p" .string "Komm bloß nicht in die Nähe der Höhle in\n" .string "der Bucht!\p" .string "Warum nicht? Das geht dich nichts an!\n" .string "Ich bin ein Erwachsener, also gehorche!$" -LilycoveCity_Text_1685EB:: @ 81685EB +LilycoveCity_Text_IfWorldBecomesOurs:: @ 81685EB .string "Wenn die ganze Welt erst einmal uns\n" .string "gehört, dem TEAM {EVIL_TEAM}, dann wird sie\l" .string "ein besserer Ort für POKéMON sein.$" -LilycoveCity_Text_16864A:: @ 816864A +LilycoveCity_Text_WailmerLeapOutOfWater:: @ 816864A .string "Hier, WAILMER!!!\n" .string "Springt aus dem Wasser!$" -LilycoveCity_Text_168675:: @ 8168675 +LilycoveCity_Text_GetLostMessingUpTraining:: @ 8168675 .string "Häh? Was willst du?\p" .string "Du störst uns beim Training, also würde\n" .string "ich vorschlagen, du verschwindest!$" -LilycoveCity_Text_1686C9:: @ 81686C9 +LilycoveCity_Text_ContestHallInTown:: @ 81686C9 .string "Die POKéMON, die in diese WETTBEWERBS-\n" .string "HALLE kommen, sind alle preisgekrönt.\l" .string "Sie kommen aus dem ganzen Land.\p" .string "Mein Herz strömt über vor Begeisterung!$" -LilycoveCity_Text_168750:: @ 8168750 +LilycoveCity_Text_StrangeCaveInCove:: @ 8168750 .string "Hast du die seltsame Höhle in der Bucht\n" .string "am Ende des Ortes gesehen?$" -LilycoveCity_Text_168791:: @ 8168791 +LilycoveCity_Text_GoingToMoveDeleterForHMs:: @ 8168791 .string "Ich werde meinem POKéMON einige neue\n" .string "Attacken für den WETTBEWERB\l" .string "beibringen.\p" @@ -186,7 +186,7 @@ LilycoveCity_Text_168791:: @ 8168791 .string "VERLERNER besuchen, damit einige\l" .string "VM verlernt werden.$" -LilycoveCity_Text_168819:: @ 8168819 +LilycoveCity_Text_ImFromKanto:: @ 8168819 .string "Ich komme aus KANTO.\p" .string "Die HOENN-Region ist wunderschön mit\n" .string "all dem Wasser und dem Grün.\p" @@ -194,20 +194,20 @@ LilycoveCity_Text_168819:: @ 8168819 .string "Ob es seltene POKéMON gibt, die nur in\n" .string "dieser Region leben???$" -LilycoveCity_Text_1688C1:: @ 81688C1 +LilycoveCity_Text_EvilTeamBeenTrainingWailmer:: @ 81688C1 .string "TEAM {EVIL_TEAM} trainieren ihre WAILMER\n" .string "drüben in der Bucht.\p" .string "Wir MATROSEN können nicht auslaufen,\n" .string "da sie uns im Weg sind.$" -LilycoveCity_Text_168934:: @ 8168934 +LilycoveCity_Text_SomeonePuntedEvilTeamOut:: @ 8168934 .string "Ahoi, hast du das mitbekommen?\p" .string "Jemand hat für uns TEAM {EVIL_TEAM} aus\n" .string "unserer Fahrrinne verjagt!\p" .string "Die WAILMER befinden sich nicht mehr in\n" .string "der Bucht und wir haben freie Fahrt.$" -LilycoveCity_Text_1689BF:: @ 81689BF +LilycoveCity_Text_SomeoneStoleMyPokemon:: @ 81689BF .string "Ich habe ein entspannendes Nickerchen\n" .string "im Gasthof am Meer gehalten. Das\l" .string "Rauschen der Wellen war so angenehm.\p" @@ -216,11 +216,11 @@ LilycoveCity_Text_1689BF:: @ 81689BF .string "Wer ist der schändliche Dieb?\n" .string "TEAM {EVIL_TEAM}? Es war TEAM {EVIL_TEAM}?!?$" -LilycoveCity_Text_168A55:: @ 8168A55 +LilycoveCity_Text_MissingPokemonCameBack:: @ 8168A55 .string "Mein gestohlenes POKéMON...\n" .string "Es kam zurück, ohne dass ich es merkte.$" -LilycoveCity_Text_168A8D:: @ 8168A8D +LilycoveCity_Text_ImArtDealer:: @ 8168A8D .string "Ich bin ein KUNSTHÄNDLER.\p" .string "Ich kaufe und verkaufe Kunstgegen-\n" .string "stände. Vorzugsweise Gemälde.\p" @@ -228,19 +228,19 @@ LilycoveCity_Text_168A8D:: @ 8168A8D .string "MUSEUM ständig erstklassige Werke\l" .string "ausstellt.$" -LilycoveCity_Text_168B1F:: @ 8168B1F +LilycoveCity_Text_SeaRemainsForeverYoung:: @ 8168B1F .string "Auch wenn ich alt und grau werde, das\n" .string "Meer wird immer jung und voll von Leben\l" .string "sein...\p" .string "Hahahahaha... Haaahahahaha...$" -LilycoveCity_Text_168B9B:: @ 8168B9B +LilycoveCity_Text_SixtyYearsAgoHusbandProposed:: @ 8168B9B .string "Vor 60 Jahren hat mein Mann hier um\n" .string "meine Hand angehalten. Und das Meer\l" .string "ist immer noch genauso schön.\p" .string "Hahahahaha... Haaahahahaha...$" -LilycoveCity_Text_168C16:: @ 8168C16 +LilycoveCity_Text_EvilTeamRenovatedCavern:: @ 8168C16 .string "Hm, kennst du diese besondere Höhle in\n" .string "der Bucht?\p" .string "Das ist eine natürlich Formation, aber\n" @@ -251,63 +251,63 @@ LilycoveCity_Text_168C16:: @ 8168C16 .string "Aber was sie sagen und was sie tun,\n" .string "passt überhaupt nicht zusammen!$" -LilycoveCity_Text_168D15:: @ 8168D15 +LilycoveCity_Text_EvilTeamLotGoneForGood:: @ 8168D15 .string "Die Höhle in der Bucht...\n" .string "Jemand scheint den Eingang versiegelt\l" .string "zu haben, niemand kommt hinein.\p" .string "TEAM {EVIL_TEAM} muss verschwunden sein.$" -LilycoveCity_Text_168DA9:: @ 8168DA9 +LilycoveCity_Text_CitySign:: @ 8168DA9 .string "SEEGRASULB CITY\p" .string "“Wo das Land endet und das\n" .string "Meer beginnt.”$" -LilycoveCity_Text_168DE1:: @ 8168DE1 +LilycoveCity_Text_ContestHallSign:: @ 8168DE1 .string "POKéMON WETTBEWERB\n" .string "MASTER-KLASSE REGISTRIERUNGEN\p" .string "“Nimm mit deinen FREUNDEN am\n" .string "WETTBEWERB teil!”$" -LilycoveCity_Text_168E2F:: @ 8168E2F +LilycoveCity_Text_MotelSign:: @ 8168E2F .string "GRASSEE MOTEL\p" .string "“Behalte uns als Rose der\n" .string "SEEGRASULB CITY in Erinnerung.”$" -LilycoveCity_Text_168E67:: @ 8168E67 +LilycoveCity_Text_MuseumSign:: @ 8168E67 .string "SEEGRASULB CITY MUSEUM\p" .string "“Ausstellung von\n" .string "POKéMON-Meisterwerken!”$" -LilycoveCity_Text_168EA4:: @ 8168EA4 +LilycoveCity_Text_MuseumSignPlayersExhibit:: @ 8168EA4 .string "SEEGRASULB CITY MUSEUM\p" .string "“Aktuelle Ausstellung:\n" .string "Die POKéMON-Sammlung von {PLAYER}!”$" -LilycoveCity_Text_168EDA:: @ 8168EDA +LilycoveCity_Text_HarborSignUnderConstruction:: @ 8168EDA .string "HAFEN SEEGRASULB CITY\p" .string "“Die Fähre MS TIDE wird momentan\n" .string "in der WERFT gebaut.\p" .string "Die Fähre wird so bald wie möglich ihren\n" .string "Dienst aufnehmen.”$" -LilycoveCity_Text_168F57:: @ 8168F57 +LilycoveCity_Text_HarborSign:: @ 8168F57 .string "HAFEN SEEGRASULB CITY\p" .string "“Genießen Sie die entspannende Fahrt\n" .string "mit der Fähre MS TIDE.”$" -LilycoveCity_Text_168FA1:: @ 8168FA1 +LilycoveCity_Text_TrainerFanClubSign:: @ 8168FA1 .string "POKéMON TRAINER-FANCLUB\p" .string "Die Namen von TRAINERN sind auf dem\n" .string "Schild eingeritzt...$" -LilycoveCity_Text_168FF3:: @ 8168FF3 +LilycoveCity_Text_DepartmentStoreSign:: @ 8168FF3 .string "SEEGRASULB CITY EINKAUFSZENTRUM\p" .string "“Ein Überfluss an Waren und\n" .string "Überraschungen!\p" .string "Ein Ort, an dem man alles findet, was\n" .string "das Herz begehrt!”$" -LilycoveCity_Text_169072:: @ 8169072 +LilycoveCity_Text_MoveDeletersHouseSign:: @ 8169072 .string "HAUS des ATTACKEN-VERLERNERS\p" .string "“Hier werden POKéMON-Attacken\n" .string "verlernt.”$" diff --git a/data-de/maps/LilycoveCity_CoveLilyMotel_1F/text.inc b/data-de/maps/LilycoveCity_CoveLilyMotel_1F/text.inc index 3bce2592b..130d5597d 100644 --- a/data-de/maps/LilycoveCity_CoveLilyMotel_1F/text.inc +++ b/data-de/maps/LilycoveCity_CoveLilyMotel_1F/text.inc @@ -1,4 +1,4 @@ -LilycoveCity_CoveLilyMotel_1F_Text_186B71:: @ 8186B71 +LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot:: @ 8186B71 .string "Hm, so haben sie also die Anzahl der\n" .string "Gäste verdoppelt. Indem sie POKéMON\l" .string "als Attraktion präsentieren?\p" @@ -8,17 +8,17 @@ LilycoveCity_CoveLilyMotel_1F_Text_186B71:: @ 8186B71 .string "Ich frage mich, ob ich so mehr\n" .string "Gäste hätte?$" -LilycoveCity_CoveLilyMotel_1F_Text_186C2B:: @ 8186C2B +LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithEvilTeam:: @ 8186C2B .string "Oh, tut mir Leid, tut mir Leid!\n" .string "Ich habe so konzentriert ferngesehen!\p" .string "Seit TEAM {EVIL_TEAM} in diesem Ort ist,\n" .string "bleiben die Gäste aus.$" -LilycoveCity_CoveLilyMotel_1F_Text_186CA6:: @ 8186CA6 +LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV:: @ 8186CA6 .string "Hey, geh weg da!\n" .string "Du bist doch nicht aus Glas!$" -LilycoveCity_CoveLilyMotel_1F_Text_186CCE:: @ 8186CCE +LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem:: @ 8186CCE .string "Interessant! Du sagst, ein POKéMON\n" .string "hat ein Item gefunden, das jemand ver-\l" .string "loren hat?\p" @@ -27,7 +27,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_186CCE:: @ 8186CCE .string "Dann könnten wir alles wiederfinden, was\n" .string "unsere Gäste verloren haben.$" -LilycoveCity_CoveLilyMotel_1F_Text_186D7F:: @ 8186D7F +LilycoveCity_CoveLilyMotel_1F_Text_HeardEvilTeamHideoutBusted:: @ 8186D7F .string "Oh, tut mir Leid, tut mir Leid!\n" .string "Ich habe so konzentriert ferngesehen!\p" .string "Ich habe gehört, dass jemand das VER-\n" @@ -37,7 +37,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_186D7F:: @ 8186D7F .string "Das sind Angestellte einer Firma... Äh...\n" .string "GAME irgendwas...$" -LilycoveCity_CoveLilyMotel_1F_Text_186E57:: @ 8186E57 +LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar:: @ 8186E57 .string "Irre! Ein POKéMON, das das Haus be-\n" .string "wachte, hat Einbrecher geschnappt?\p" .string "Klasse! Wir sollten auch über einen\n" @@ -45,7 +45,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_186E57:: @ 8186E57 .string "Dadurch könnten wir unseren Gästen\n" .string "viel mehr Sicherheit bieten.$" -LilycoveCity_CoveLilyMotel_1F_Text_186F09:: @ 8186F09 +LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner:: @ 8186F09 .string "Oh, tut mir Leid, tut mir Leid!\n" .string "Ich habe so konzentriert ferngesehen!\p" .string "Oh, ja. Eine große Gruppe von Gästen\n" diff --git a/data-de/maps/LilycoveCity_CoveLilyMotel_2F/text.inc b/data-de/maps/LilycoveCity_CoveLilyMotel_2F/text.inc index 648e1d684..3839dee3a 100644 --- a/data-de/maps/LilycoveCity_CoveLilyMotel_2F/text.inc +++ b/data-de/maps/LilycoveCity_CoveLilyMotel_2F/text.inc @@ -1,4 +1,4 @@ -LilycoveCity_CoveLilyMotel_2F_Text_186FE7:: @ 8186FE7 +LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex:: @ 8186FE7 .string "Ich bin der GAME DESIGNER.\p" .string "Oh, wirklich?\n" .string "Du arbeitest an einem POKéDEX?\p" @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_186FE7:: @ 8186FE7 .string "Sobald du ihn vervollständigt hast,\n" .string "komm mich wieder besuchen.$" -LilycoveCity_CoveLilyMotel_2F_Text_18708F:: @ 818708F +LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis:: @ 818708F .string "Wow! Das ist beeindruckend!\n" .string "Wirklich äußerst beeindruckend!\p" .string "Dein POKéDEX ist absolut vollständig!\n" @@ -16,18 +16,18 @@ LilycoveCity_CoveLilyMotel_2F_Text_18708F:: @ 818708F .string "Ich möchte dir als Zeichen meiner Aner-\n" .string "kennung gerne etwas schenken!$" -LilycoveCity_CoveLilyMotel_2F_Text_187149:: @ 8187149 +LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer:: @ 8187149 .string "Ich? Sprichst du mit mir?\n" .string "Ich bin der PROGRAMMIERER.\p" .string "Ich frage mich, wie die EINARMIGEN\n" .string "BANDITEN hier wohl so sind.$" -LilycoveCity_CoveLilyMotel_2F_Text_18719E:: @ 818719E +LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist:: @ 818719E .string "Ich bin der GRAPHIC ARTIST! Sind die\n" .string "POKéMON in der Region von HOENN\l" .string "nicht interessant?$" -LilycoveCity_CoveLilyMotel_2F_Text_1871DF:: @ 81871DF +LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute:: @ 81871DF .string "Die MÄDCHEN mit den SCHWIMMREIFEN\n" .string "sind total niedlich, meinst du nicht?\l" .string "Ein Kampf gegen so niedliche Mädchen...\p" @@ -36,11 +36,11 @@ LilycoveCity_CoveLilyMotel_2F_Text_1871DF:: @ 81871DF .string "Ein 2-gegen-2 Kampf mit ZWILLINGEN...\p" .string "Huuh, einfach unglaublicher Spaß!$" -LilycoveCity_CoveLilyMotel_2F_Text_18729A:: @ 818729A +LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart:: @ 818729A .string "Die frische Seebrise berührt mein Herz.\n" .string "Es ist einfach wundervoll hier.$" -LilycoveCity_CoveLilyMotel_2F_Text_1872D4:: @ 81872D4 +LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy:: @ 81872D4 .string "Du kannst nie vorhersagen, wann und wo\n" .string "die Leute dich herausfordern.\p" .string "Daher gehe ich niemals ohne meinen GAME\n" diff --git a/data-de/maps/LilycoveCity_DepartmentStoreRooftop/text.inc b/data-de/maps/LilycoveCity_DepartmentStoreRooftop/text.inc index f09c4aa08..ce0e92683 100644 --- a/data-de/maps/LilycoveCity_DepartmentStoreRooftop/text.inc +++ b/data-de/maps/LilycoveCity_DepartmentStoreRooftop/text.inc @@ -1,33 +1,33 @@ -LilycoveCity_DepartmentStoreRooftop_Text_18C61F:: @ 818C61F +LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales:: @ 818C61F .string "Haben sie noch nicht bekannt gegeben,\n" .string "wann sie den Ausverkauf starten?\p" .string "Ich achte immer auf die Werbung im\n" .string "Fernsehen, aber bisher war da nichts.$" -LilycoveCity_DepartmentStoreRooftop_Text_18C685:: @ 818C685 +LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale:: @ 818C685 .string "Ja! Ich habe schon lange auf diesen\n" .string "Ausverkauf gewartet.\p" .string "Hier gibt es Items, die findest du sonst\n" .string "nirgends. Ich decke mich damit ein!$" -LilycoveCity_DepartmentStoreRooftop_Text_18C70E:: @ 818C70E +LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty:: @ 818C70E .string "Ooh... Ich bin am Verdursten!$" -LilycoveCity_DepartmentStoreRooftop_Text_18C72B:: @ 818C72B +LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike:: @ 818C72B .string "Das ist ein GETRÄNKEAUTOMAT.\n" .string "Möchtest du etwas trinken?$" -LilycoveCity_DepartmentStoreRooftop_Text_18C75F:: @ 818C75F +LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown:: @ 818C75F .string "Deng!\p" .string "Eine Dose {STR_VAR_1} fällt heraus.$" -LilycoveCity_DepartmentStoreRooftop_Text_18C780:: @ 818C780 +LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown:: @ 818C780 .string "Deng!\p" .string "Treffer! Eine weitere Dose\n" .string "{STR_VAR_1} fällt heraus!$" -LilycoveCity_DepartmentStoreRooftop_Text_18C7AF:: @ 818C7AF +LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney:: @ 818C7AF .string "Nicht genug Geld...$" -LilycoveCity_DepartmentStoreRooftop_Text_18C7C3:: @ 818C7C3 +LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink:: @ 818C7C3 .string "Es wird kein Getränk gekauft.$" diff --git a/data-de/maps/LilycoveCity_DepartmentStore_1F/text.inc b/data-de/maps/LilycoveCity_DepartmentStore_1F/text.inc index fb4d5b589..05ecb331f 100644 --- a/data-de/maps/LilycoveCity_DepartmentStore_1F/text.inc +++ b/data-de/maps/LilycoveCity_DepartmentStore_1F/text.inc @@ -1,25 +1,25 @@ -LilycoveCity_DepartmentStore_1F_Text_18BFB5:: @ 818BFB5 +LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore:: @ 818BFB5 .string "Willkommen im EINKAUFSZENTRUM von\n" .string "SEEGRASULB CITY.$" -LilycoveCity_DepartmentStore_1F_Text_18BFDB:: @ 818BFDB +LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings:: @ 818BFDB .string "Immer wenn ich in das EINKAUFSZENTRUM\n" .string "gehe, endet das damit, dass ich tausend\l" .string "Dinge kaufe, weil es so viel Spaß macht.$" -LilycoveCity_DepartmentStore_1F_Text_18C044:: @ 818C044 +LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture:: @ 818C044 .string "Heute wird mir meine Mama ein paar\n" .string "schöne Möbel kaufen.$" -LilycoveCity_DepartmentStore_1F_Text_18C07A:: @ 818C07A +LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill:: @ 818C07A .string "Ich kaufe etwas Schönes für mein\n" .string "AZUMARILL, weil es einen WETTBEWERB\l" .string "gewonnen hat.$" -LilycoveCity_DepartmentStore_1F_Text_18C0C3:: @ 818C0C3 +LilycoveCity_DepartmentStore_1F_Text_Azumarill:: @ 818C0C3 .string "AZUMARILL: Maririroo!$" -LilycoveCity_DepartmentStore_1F_Text_18C0D9:: @ 818C0D9 +LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign:: @ 818C0D9 .string "EG: INFORMATION\n" .string " LOTTERIE\p" .string "1S: ALLES FÜR DEN TRAINER\p" diff --git a/data-de/maps/LilycoveCity_DepartmentStore_2F/text.inc b/data-de/maps/LilycoveCity_DepartmentStore_2F/text.inc index 721974796..62b6ddfff 100644 --- a/data-de/maps/LilycoveCity_DepartmentStore_2F/text.inc +++ b/data-de/maps/LilycoveCity_DepartmentStore_2F/text.inc @@ -1,16 +1,16 @@ -LilycoveCity_DepartmentStore_2F_Text_18C162:: @ 818C162 +LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly:: @ 818C162 .string "Lerne, mit Items vernünftig umzugehen.\n" .string "Das ist essentiell. Ehrlich.$" -LilycoveCity_DepartmentStore_2F_Text_18C195:: @ 818C195 +LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband:: @ 818C195 .string "Mein Mann wartet zu Hause auf mich.\n" .string "Was wäre wohl ein passendes Geschenk\l" .string "für ihn?$" -LilycoveCity_DepartmentStore_2F_Text_18C1D9:: @ 818C1D9 +LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems:: @ 818C1D9 .string "Ich werde bald auf eine lange Reise\n" .string "gehen. Ich muss daher Items kaufen.$" -UnknownString_818C21A: @ 818C21A +LilycoveCity_DepartmentStore_2F_Text_UnusedFloorInfo: @ 818C21A .string "FÜR DEINE REISEBEGLEITER\n" .string "1S: ALLES FÜR DEN TRAINER$" diff --git a/data-de/maps/LilycoveCity_DepartmentStore_3F/text.inc b/data-de/maps/LilycoveCity_DepartmentStore_3F/text.inc index eb430e21c..449c7f4b9 100644 --- a/data-de/maps/LilycoveCity_DepartmentStore_3F/text.inc +++ b/data-de/maps/LilycoveCity_DepartmentStore_3F/text.inc @@ -1,21 +1,21 @@ -LilycoveCity_DepartmentStore_3F_Text_18C24B:: @ 818C24B +LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon:: @ 818C24B .string "Um POKéMON schnell stärker zu machen,\n" .string "eignen sich Items hervorragend.\p" .string "PROTEIN steigert den ANGRIFF und\n" .string "KALZIUM den SPEZ. ANGRIFF.$" -LilycoveCity_DepartmentStore_3F_Text_18C2B5:: @ 818C2B5 +LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance:: @ 818C2B5 .string "Ich möchte, dass mein POKéMON mehr\n" .string "Ausdauer hat.\p" .string "Ich frage mich, ob ich lieber die\n" .string "VERTEIDIGUNG mit EISEN oder die SPEZ.\l" .string "VER. mit ZINK steigern soll.$" -LilycoveCity_DepartmentStore_3F_Text_18C32E:: @ 818C32E +LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon:: @ 818C32E .string "Ich habe meinem POKéMON CARBON\n" .string "gegeben, um die INIT. zu erhöhen.$" -UnknownString_818C363: @ 818C363 +LilycoveCity_DepartmentStore_3F_Text_UnusedFloorInfo: @ 818C363 .string "UNVERZICHTBARES FÜR UNBESIEGBARE\n" .string "TRAINER\l" .string "2S: ALLES FÜR DEN KAMPF$" diff --git a/data-de/maps/LilycoveCity_DepartmentStore_4F/text.inc b/data-de/maps/LilycoveCity_DepartmentStore_4F/text.inc index 86a1438a2..acb3f6936 100644 --- a/data-de/maps/LilycoveCity_DepartmentStore_4F/text.inc +++ b/data-de/maps/LilycoveCity_DepartmentStore_4F/text.inc @@ -1,21 +1,21 @@ -LilycoveCity_DepartmentStore_4F_Text_18C39C:: @ 818C39C +LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM:: @ 818C39C .string "Hmm...\p" .string "Eine offensive Attacke...\n" .string "Oder defensive Attacke...\p" .string "Es ist nicht einfach, zu entscheiden,\n" .string "welche TM ein POKéMON lernen soll.$" -LilycoveCity_DepartmentStore_4F_Text_18C41B:: @ 818C41B +LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs:: @ 818C41B .string "Es gibt so viele verschiedene Arten von\n" .string "TMs.\p" .string "In einem Katalog habe ich gelesen, dass\n" .string "es 50 verschiedene Arten gibt.$" -LilycoveCity_DepartmentStore_4F_Text_18C481:: @ 818C481 +LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves:: @ 818C481 .string "Ich hätte gerne all die unterschied-\n" .string "lichen TMs, aber ein POKéMON kann nur\l" .string "vier Attacken lernen.$" -UnknownString_818C4CE: @ 818C4CE +LilycoveCity_DepartmentStore_4F_Text_UnusedFloorInfo: @ 818C4CE .string "EINE ABKÜRZUNG ZUR POKéMON LIGA\n" .string "3S: TM$" diff --git a/data-de/maps/LilycoveCity_DepartmentStore_5F/text.inc b/data-de/maps/LilycoveCity_DepartmentStore_5F/text.inc index 821a85431..5aa86cdf2 100644 --- a/data-de/maps/LilycoveCity_DepartmentStore_5F/text.inc +++ b/data-de/maps/LilycoveCity_DepartmentStore_5F/text.inc @@ -1,17 +1,17 @@ -LilycoveCity_DepartmentStore_5F_Text_18C4F9:: @ 818C4F9 +LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls:: @ 818C4F9 .string "Hier gibt es viele niedliche PUPPEN.\p" .string "Ich sollte lieber mir selbst welche\n" .string "kaufen, anstatt immer für meine Kinder.$" -LilycoveCity_DepartmentStore_5F_Text_18C556:: @ 818C556 +LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon:: @ 818C556 .string "Ich bin noch zu klein, um POKéMON auf-\n" .string "zuziehen, daher bekomme ich eine PUPPE.$" -LilycoveCity_DepartmentStore_5F_Text_18C59F:: @ 818C59F +LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere:: @ 818C59F .string "Sie verkaufen viele hübsche MATTEN.\p" .string "Welche soll ich nur kaufen?\n" .string "Ich sollte sie alle kaufen...$" -UnknownString_818C5FA: @ 818C5FA +LilycoveCity_DepartmentStore_5F_Text_UnusedFloorInfo: @ 818C5FA .string "ANBETUNGSWÜRDIGE FREUNDE\n" .string "4S: POKéPUPPEN$" diff --git a/data-de/maps/LilycoveCity_Harbor/text.inc b/data-de/maps/LilycoveCity_Harbor/text.inc index 1282cb3b9..8bcc51ba8 100644 --- a/data-de/maps/LilycoveCity_Harbor/text.inc +++ b/data-de/maps/LilycoveCity_Harbor/text.inc @@ -1,40 +1,40 @@ -LilycoveCity_Harbor_Text_18B306:: @ 818B306 +LilycoveCity_Harbor_Text_FerryUnavailable:: @ 818B306 .string "Bitte?\n" .string "Du suchst ein Schiff?\p" .string "Tut mir Leid, aber die Fähre ist\n" .string "momentan nicht in Betrieb...$" -LilycoveCity_Harbor_Text_18B36F:: @ 818B36F +LilycoveCity_Harbor_Text_MayISeeYourTicket:: @ 818B36F .string "Hallo, du willst mit der Fähre fahren?\n" .string "Zeigst du mir dann bitte dein TICKET?$" -LilycoveCity_Harbor_Text_18B3A9:: @ 818B3A9 +LilycoveCity_Harbor_Text_NoTicket:: @ 818B3A9 .string "{PLAYER} besitzt kein TICKET.\p" .string "Das tut mir Leid!\p" .string "Du benötigst ein TICKET, um mit der\n" .string "Fähre fahren zu können.$" -LilycoveCity_Harbor_Text_18B406:: @ 818B406 +LilycoveCity_Harbor_Text_FlashTicketWhereTo:: @ 818B406 .string "{PLAYER} zeigt das TICKET.\p" .string "Perfekt! Das ist alles, was du brauchst!\p" .string "Und wo soll die Reise hingehen?$" -LilycoveCity_Harbor_Text_18B45B:: @ 818B45B +LilycoveCity_Harbor_Text_SailAnotherTime:: @ 818B45B .string "Bitte fahre bald mit uns!$" -LilycoveCity_Harbor_Text_18B47D:: @ 818B47D +LilycoveCity_Harbor_Text_SlateportItIs:: @ 818B47D .string "Nach GRAPHITPORT CITY, einverstanden?$" -LilycoveCity_Harbor_Text_18B499:: @ 818B499 +LilycoveCity_Harbor_Text_BattleTowerItIs:: @ 818B499 .string "Zum DUELLTURM, einverstanden?$" -LilycoveCity_Harbor_Text_18B4B3:: @ 818B4B3 +LilycoveCity_Harbor_Text_PleaseBoard:: @ 818B4B3 .string "Bitte komm an Bord. Wir legen bald ab.$" -LilycoveCity_Harbor_Text_18B4E2:: @ 818B4E2 +LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo:: @ 818B4E2 .string "Und? Wo soll die Reise hingehen?$" -LilycoveCity_Harbor_Text_18B504:: @ 818B504 +LilycoveCity_Harbor_Text_SailorFerryUnavailable:: @ 818B504 .string "Solange die Fähre noch nicht see-\n" .string "tüchtig ist, haben wir Seeleute\l" .string "nichts zu tun...\p" @@ -42,7 +42,7 @@ LilycoveCity_Harbor_Text_18B504:: @ 818B504 .string "bisschen beeilen - die Leute von der\l" .string "WERFT von GRAPHITPORT CITY.$" -LilycoveCity_Harbor_Text_18B58E:: @ 818B58E +LilycoveCity_Harbor_Text_SailorFerryAvailable:: @ 818B58E .string "Die Fähre MS TIDE ist endlich in\n" .string "Betrieb.\p" .string "Die Leute von der WERFT in\n" diff --git a/data-de/maps/LilycoveCity_House1/text.inc b/data-de/maps/LilycoveCity_House1/text.inc index c374ed813..fdeffece3 100644 --- a/data-de/maps/LilycoveCity_House1/text.inc +++ b/data-de/maps/LilycoveCity_House1/text.inc @@ -1,8 +1,8 @@ -LilycoveCity_House1_Text_18B7B0:: @ 818B7B0 +LilycoveCity_House1_Text_PokemonPartnersNotTools:: @ 818B7B0 .string "POKéMON sind die Partner der Menschen.\n" .string "Sie sind nicht unser Spielzeug!\p" .string "Leider gibt es immer wieder Menschen,\n" .string "die das nicht begreifen.$" -LilycoveCity_House1_Text_18B82B:: @ 818B82B +LilycoveCity_House1_Text_Kecleon:: @ 818B82B .string "KECLEON: Ruroro?$" diff --git a/data-de/maps/LilycoveCity_House2/text.inc b/data-de/maps/LilycoveCity_House2/text.inc index f5aae781d..916fa0c11 100644 --- a/data-de/maps/LilycoveCity_House2/text.inc +++ b/data-de/maps/LilycoveCity_House2/text.inc @@ -1,9 +1,9 @@ -LilycoveCity_House2_Text_18B83C:: @ 818B83C +LilycoveCity_House2_Text_NotAwakeYetHaveThis:: @ 818B83C .string "Huch? Was? Wie?\p" .string "Ich bin noch nicht ganz wach...\n" .string "Hier, das kannst du haben...$" -LilycoveCity_House2_Text_18B883:: @ 818B883 +LilycoveCity_House2_Text_SleepIsEssential:: @ 818B883 .string "Gääähn...\p" .string "Schlaf ist wichtig für die Gesundheit...\n" .string "Schlafe und erhole dich...$" diff --git a/data-de/maps/LilycoveCity_House3/text.inc b/data-de/maps/LilycoveCity_House3/text.inc index b9f243868..7e4e35db4 100644 --- a/data-de/maps/LilycoveCity_House3/text.inc +++ b/data-de/maps/LilycoveCity_House3/text.inc @@ -1,4 +1,4 @@ -LilycoveCity_House3_Text_18B8CC:: @ 818B8CC +LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks:: @ 818B8CC .string "Ach, du liebes bisschen! Reist du ganz\n" .string "alleine? Aber du bist so jung! Gut!\p" .string "Ich bin sicher, meine Kinder könnten\n" @@ -9,12 +9,12 @@ LilycoveCity_House3_Text_18B8CC:: @ 818B8CC .string "Möchtest du das von mir, der Expertin\n" .string "der {POKEBLOCK}, lernen?$" -LilycoveCity_House3_Text_18B9DC:: @ 818B9DC +LilycoveCity_House3_Text_OhAreYouSure:: @ 818B9DC .string "Oh? Ganz sicher?\p" .string "Du solltest nicht immer versuchen, alles\n" .string "alleine zu meistern, mein Kind.$" -LilycoveCity_House3_Text_18BA2B:: @ 818BA2B +LilycoveCity_House3_Text_ExplainPokeblocks:: @ 818BA2B .string "Oh, schön! Du bist clever! Das\n" .string "wird eine lange Erklärung. Hör gut zu.\p" .string "Bist du bereit?\p" @@ -46,27 +46,27 @@ LilycoveCity_House3_Text_18BA2B:: @ 818BA2B .string "besser aus.\p" .string "Lass dich nicht unterkriegen, Schatz!$" -LilycoveCity_House3_Text_18BD64:: @ 818BD64 +LilycoveCity_House3_Text_HappyToHaveQuadruplets:: @ 818BD64 .string "Als meine Frau Vierlinge zur Welt\n" .string "brachte, war ich zuerst geschockt.\p" .string "Aber wenn ich sie jetzt zusammen\n" .string "spielen sehe, bin ich richtig glücklich.$" -LilycoveCity_House3_Text_18BDDB:: @ 818BDDB +LilycoveCity_House3_Text_GoingToWinMultiBattles:: @ 818BDDB .string "Wir üben MULTIKÄMPFE aus, aber ich\n" .string "weiß, dass ich gewinnen werde.$" -LilycoveCity_House3_Text_18BE14:: @ 818BE14 +LilycoveCity_House3_Text_LikeMixingAtRecordCorner:: @ 818BE14 .string "Wir lieben es, Sachen beim STATISTIK-\n" .string "TAUSCH durcheinander zu würfeln.\p" .string "Aber, was kann man durcheinander\n" .string "würfeln?$" -LilycoveCity_House3_Text_18BE57:: @ 818BE57 +LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender:: @ 818BE57 .string "Wir wollen super {POKEBLOCK}\n" .string "im BEERENMIXER machen!$" -LilycoveCity_House3_Text_18BE8E:: @ 818BE8E +LilycoveCity_House3_Text_GoingToEnterContest:: @ 818BE8E .string "Ich möchte damit angeben, wie stark\n" .string "mein POKéMON ist, daher werden wir\l" .string "an einem WETTBEWERB teilnehmen.$" diff --git a/data-de/maps/LilycoveCity_House4/text.inc b/data-de/maps/LilycoveCity_House4/text.inc index ee6b0fa8b..361434a10 100644 --- a/data-de/maps/LilycoveCity_House4/text.inc +++ b/data-de/maps/LilycoveCity_House4/text.inc @@ -1,10 +1,10 @@ -LilycoveCity_House4_Text_18BEE8:: @ 818BEE8 +LilycoveCity_House4_Text_MysteriesAtBottomOfSea:: @ 818BEE8 .string "Das größte Geheimnis dieses Planeten\n" .string "hütet der Meeresboden.\p" .string "Das hat mal jemand gesagt, aber ich\n" .string "weiß nicht...$" -LilycoveCity_House4_Text_18BF4E:: @ 818BF4E +LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis:: @ 818BF4E .string "Zwischen MOOSBACH CITY und\n" .string "XENEROVILLE befindet sich ein\l" .string "tiefer Unterwassergraben.\p" diff --git a/data-de/maps/LilycoveCity_LilycoveMuseum_1F/text.inc b/data-de/maps/LilycoveCity_LilycoveMuseum_1F/text.inc index 93f9d2f7e..97101ec97 100644 --- a/data-de/maps/LilycoveCity_LilycoveMuseum_1F/text.inc +++ b/data-de/maps/LilycoveCity_LilycoveMuseum_1F/text.inc @@ -1,11 +1,11 @@ -LilycoveCity_LilycoveMuseum_1F_Text_187348:: @ 8187348 +LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum:: @ 8187348 .string "Willkommen im MUSEUM von\n" .string "SEEGRASULB CITY.\p" .string "Bitte nimm dir die Zeit, unsere Sammlung\n" .string "wunderbarer Kunstwerke zum Thema\l" .string "POKéMON zu betrachten.$" -LilycoveCity_LilycoveMuseum_1F_Text_1873B9:: @ 81873B9 +LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings:: @ 81873B9 .string "Ich bin der KURATOR dieses MUSEUMS der\n" .string "schönen Künste.\p" .string "Es freut mich immer wieder, junge\n" @@ -13,64 +13,64 @@ LilycoveCity_LilycoveMuseum_1F_Text_1873B9:: @ 81873B9 .string "Hast du dir schon unsere Gemäldesamm-\n" .string "lung angesehen?$" -LilycoveCity_LilycoveMuseum_1F_Text_187459:: @ 8187459 +LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime:: @ 8187459 .string "Ah, dann möchte ich dich nicht länger\n" .string "aufhalten. Bitte, nimm dir Zeit.$" -LilycoveCity_LilycoveMuseum_1F_Text_187495:: @ 8187495 +LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings:: @ 8187495 .string "Oh? Ich glaube, du bist ein POKéMON-\n" .string "TRAINER.\p" .string "Bist du auch an Gemälden interessiert?$" -LilycoveCity_LilycoveMuseum_1F_Text_1874F5:: @ 81874F5 +LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat:: @ 81874F5 .string "Ich verstehe...\p" .string "Ich fühle mich geehrt, dass du uns\n" .string "trotzdem besuchst.$" -LilycoveCity_LilycoveMuseum_1F_Text_187534:: @ 8187534 +LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe:: @ 8187534 .string "Ah, exzellent!\n" .string "Du magst Gemälde!\p" .string "Dann möchte ich dir gerne etwas zeigen.$" -LilycoveCity_LilycoveMuseum_1F_Text_18757F:: @ 818757F +LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting:: @ 818757F .string "Dies ist ein sehr altes Gemälde.\n" .string "Die Farbe blättert hier und da schon ab.$" -LilycoveCity_LilycoveMuseum_1F_Text_1875BE:: @ 81875BE +LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery:: @ 81875BE .string "Eine merkwürdige Landschaft mit\n" .string "bizarren und fantastischen Details.$" -LilycoveCity_LilycoveMuseum_1F_Text_1875F8:: @ 81875F8 +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman:: @ 81875F8 .string "Das Bildnis einer hübschen, lächelnden\n" .string "Frau mit einem POKéMON auf dem Schoß.$" -LilycoveCity_LilycoveMuseum_1F_Text_187641:: @ 8187641 +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon:: @ 8187641 .string "Das Bild eines legendären POKéMON aus\n" .string "längst vergangener Zeit.\p" .string "Der Künstler hat dies aus der\n" .string "Vorstellung heraus gemalt.$" -LilycoveCity_LilycoveMuseum_1F_Text_1876A1:: @ 81876A1 +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon:: @ 81876A1 .string "PFLANZEN-POKéMON, die sich im\n" .string "Wind wiegen.\p" .string "Es scheint, als genießen sie das zarte\n" .string "Streicheln des Windes.$" -LilycoveCity_LilycoveMuseum_1F_Text_18770C:: @ 818770C +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries:: @ 818770C .string "BEEREN. Sie sehen äußerst delikat aus.\p" .string "Das Bild kann einen hungrig machen!$" -LilycoveCity_LilycoveMuseum_1F_Text_18775F:: @ 818775F +LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica:: @ 818775F .string "Ein Replikat einer berühmten Skulptur.\p" .string "Es zeigt ein antikes VOGEL-POKéMON.$" -LilycoveCity_LilycoveMuseum_1F_Text_1877A9:: @ 81877A9 +LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone:: @ 81877A9 .string "Ein großer POKéBALL aus schwarzem\n" .string "Stein gehauen.\p" .string "In früheren Zeiten wurde er zu\n" .string "Festlichkeiten ausgestellt.$" -LilycoveCity_LilycoveMuseum_1F_Text_187810:: @ 8187810 +LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText:: @ 8187810 .string "Eine große Steintafel, auf der POKéMON\n" .string "und eng gesetzte, kleine Schrift-\l" .string "zeichen einer alten unverständlichen\l" @@ -80,28 +80,28 @@ UnknownString_818788B: @ 818788B .string "Hmmm...\n" .string "Was für eine große Pracht...$" -LilycoveCity_LilycoveMuseum_1F_Text_1878B7:: @ 81878B7 +LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts:: @ 81878B7 .string "Die Kämpfe mit POKéMON machen schon\n" .string "Spaß, das gebe ich zu.\p" .string "Aber man darf darüber nicht seine Liebe\n" .string "zu den schönen Künsten vergessen.$" -LilycoveCity_LilycoveMuseum_1F_Text_18791D:: @ 818791D +LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration:: @ 818791D .string "Dieses KUNSTMUSEUM... Hier bekommst du\n" .string "viele fantastische Gemälde zu sehen.\p" .string "Und der KURATOR ist einfach wunderbar.\p" .string "Unter Künstlern wie mir ist dieses\n" .string "MUSEUM einfach eine Inspiration.$" -LilycoveCity_LilycoveMuseum_1F_Text_1879BF:: @ 81879BF +LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty:: @ 81879BF .string "Diese Frau ist hübsch!\n" .string "Genau wie meine Mama!$" -LilycoveCity_LilycoveMuseum_1F_Text_1879E6:: @ 81879E6 +LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable:: @ 81879E6 .string "Dieses POKéMON ist anbetungswürdig!\n" .string "Genau wie unser kleiner Sohn!$" -LilycoveCity_LilycoveMuseum_1F_Text_187A1A:: @ 8187A1A +LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings:: @ 8187A1A .string "Ich habe gehört, dass das KUNSTMUSEUM\n" .string "einige neue Gemälde erhalten hat.\p" .string "Die will ich mir natürlich sofort\n" @@ -109,19 +109,19 @@ LilycoveCity_LilycoveMuseum_1F_Text_187A1A:: @ 8187A1A .string "Befinden sich die neuen Gemälde im\n" .string "zweiten Stockwerk?$" -LilycoveCity_LilycoveMuseum_1F_Text_187AA0:: @ 8187AA0 +LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful:: @ 8187AA0 .string "In letzter Zeit war der KURATOR außer-\n" .string "gewöhnlich gut gelaunt.\p" .string "Ich wette, er hat etwas Tolles erlebt.\n" .string "Mit Sicherheit!$" -LilycoveCity_LilycoveMuseum_1F_Text_187B04:: @ 8187B04 +LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings:: @ 8187B04 .string "Ich will mir hier viele große Werke an-\n" .string "schauen und von ihnen lernen.\p" .string "Ich träume davon, eines Tages hier\n" .string "meine eigene Ausstellung zu haben.$" -LilycoveCity_LilycoveMuseum_1F_Text_187B7F:: @ 8187B7F +LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination:: @ 8187B7F .string "Das KUNSTMUSEUM ist zu einem\n" .string "beliebten Ziel für Touristen geworden.\p" .string "Das ist großartig für SEEGRASULB CITY.\n" diff --git a/data-de/maps/LilycoveCity_LilycoveMuseum_2F/text.inc b/data-de/maps/LilycoveCity_LilycoveMuseum_2F/text.inc index 4fc29ee73..3dc98640a 100644 --- a/data-de/maps/LilycoveCity_LilycoveMuseum_2F/text.inc +++ b/data-de/maps/LilycoveCity_LilycoveMuseum_2F/text.inc @@ -1,8 +1,8 @@ -LilycoveCity_LilycoveMuseum_2F_Text_187C42:: @ 8187C42 +LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall:: @ 8187C42 .string "Dies ist unser besonderer Ausstellungs-\n" .string "raum.$" -LilycoveCity_LilycoveMuseum_2F_Text_187C64:: @ 8187C64 +LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall:: @ 8187C64 .string "Wie du klar erkennen kannst, gibt es\n" .string "hier nicht ein einziges Gemälde.\p" .string "Ich möchte hier auch nicht einfach die\n" @@ -17,7 +17,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_187C64:: @ 8187C64 .string "POKéMON sehen, die bereit sind, in\l" .string "ein ruhmreiches Leben zu treten!$" -LilycoveCity_LilycoveMuseum_2F_Text_187E1D:: @ 8187E1D +LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit:: @ 8187E1D .string "Oh, entschuldige. Ich wollte dich nicht\n" .string "mit meinen Monologen langweilen.\p" .string "Nun, du bist jung und offensichtlich\n" @@ -28,23 +28,23 @@ LilycoveCity_LilycoveMuseum_2F_Text_187E1D:: @ 8187E1D .string "du den Künstler bitte fragen, ob wir\l" .string "sein Werk hier ausstellen dürfen?$" -LilycoveCity_LilycoveMuseum_2F_Text_187F4E:: @ 8187F4E +LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit:: @ 8187F4E .string "Ich möchte diesen Ausstellungsraum mit\n" .string "modernen und lebendigen Gemälden von\l" .string "POKéMON füllen.$" -LilycoveCity_LilycoveMuseum_2F_Text_187F9D:: @ 8187F9D +LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting:: @ 8187F9D .string "Dank dir konnten wir ein neues Gemälde\n" .string "für unsere Kollektion erwerben!\p" .string "Ich habe gehört, es stellt dein POKéMON\n" .string "dar. Wirklich einzigartig!\p" .string "Vielen, vielen Dank!$" -LilycoveCity_LilycoveMuseum_2F_Text_18802F:: @ 818802F +LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer:: @ 818802F .string "Ah! Du bist es!\n" .string "{PLAYER}!$" -LilycoveCity_LilycoveMuseum_2F_Text_188041:: @ 8188041 +LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests:: @ 8188041 .string "Ist das nicht fantastisch?\n" .string "Diese Sammlung von Gemälden!\p" .string "Jedes einzelne makellos!\n" @@ -54,60 +54,60 @@ LilycoveCity_LilycoveMuseum_2F_Text_188041:: @ 8188041 .string "Ehrlich, ich danke dir, {PLAYER}.\n" .string "Mein Traum ist wahr geworden!$" -LilycoveCity_LilycoveMuseum_2F_Text_188120:: @ 8188120 +LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude:: @ 8188120 .string "Dies ist nur ein kleines Dankeschön.$" UnknownString_8188148: @ 8188148 .string "{PLAYER} erhält das GLASORNAMENT.$" -LilycoveCity_LilycoveMuseum_2F_Text_188166:: @ 8188166 +LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou:: @ 8188166 .string "Ich werde das für dich aufbewahren, bis\n" .string "wir uns wieder sehen.$" -LilycoveCity_LilycoveMuseum_2F_Text_188194:: @ 8188194 +LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit:: @ 8188194 .string "Ah, schön dich zu sehen, {PLAYER}!\p" .string "Es ist eine Ehre für uns, dass du uns\n" .string "trotz deiner vielen Aufgaben besuchst.\p" .string "Bitte, entspanne dich und genieße\n" .string "deinen Besuch bei uns.$" -LilycoveCity_LilycoveMuseum_2F_Text_188219:: @ 8188219 +LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame:: @ 8188219 .string "Ein Bilderrahmen mit pinkfarbenen\n" .string "Verzierungen.$" -LilycoveCity_LilycoveMuseum_2F_Text_18824C:: @ 818824C +LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame:: @ 818824C .string "Ein Bilderrahmen mit gelben\n" .string "Verzierungen.$" -LilycoveCity_LilycoveMuseum_2F_Text_188281:: @ 8188281 +LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame:: @ 8188281 .string "Ein Bilderrahmen mit blauen\n" .string "Verzierungen.$" -LilycoveCity_LilycoveMuseum_2F_Text_1882B4:: @ 81882B4 +LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame:: @ 81882B4 .string "Ein Bilderrahmen mit roten\n" .string "Verzierungen.$" -LilycoveCity_LilycoveMuseum_2F_Text_1882E6:: @ 81882E6 +LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame:: @ 81882E6 .string "Ein Bilderrahmen mit grünen\n" .string "Verzierungen.$" -LilycoveCity_LilycoveMuseum_2F_Text_18831A:: @ 818831A +LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon:: @ 818831A .string "Ein Bild eines POKéMON.$" -LilycoveCity_LilycoveMuseum_2F_Text_188336:: @ 8188336 +LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe:: @ 8188336 .string "Ich war eine Weile nicht hier, daher\n" .string "haben mich die neuen Gemälde über-\l" .string "rascht.\p" .string "Ich wünschte, jemand würde mein\n" .string "POKéMON so wunderbar porträtieren.$" -LilycoveCity_LilycoveMuseum_2F_Text_1883AB:: @ 81883AB +LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing:: @ 81883AB .string "Nun... Hier stellen sie also Werke zum\n" .string "Thema POKéMON aus.\p" .string "Ich sehe schon. Die Gemälde sind\n" .string "wirklich amüsant.$" -LilycoveCity_LilycoveMuseum_2F_Text_188423:: @ 8188423 +LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon:: @ 8188423 .string "Wow, ehrlich?\n" .string "Das sind Gemälde deiner POKéMON?\p" .string "Ist das nicht die absolute Freude für\n" diff --git a/data-de/maps/LilycoveCity_MoveDeletersHouse/text.inc b/data-de/maps/LilycoveCity_MoveDeletersHouse/text.inc index 0898d7e2a..24934f238 100644 --- a/data-de/maps/LilycoveCity_MoveDeletersHouse/text.inc +++ b/data-de/maps/LilycoveCity_MoveDeletersHouse/text.inc @@ -1,34 +1,34 @@ -LilycoveCity_MoveDeletersHouse_Text_18B622:: @ 818B622 +LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove:: @ 818B622 .string "Äh...\n" .string "Oh, ja. Ich bin der ATTACKEN-VERLERNER.\p" .string "Ich sorge dafür, dass die POKéMON ihre\n" .string "Attacken vergessen.\p" .string "Möchtest du, dass ich dir helfe?$" -LilycoveCity_MoveDeletersHouse_Text_18B68C:: @ 818B68C +LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget:: @ 818B68C .string "Welches POKéMON soll eine Attacke\n" .string "vergessen?$" -LilycoveCity_MoveDeletersHouse_Text_18B6B0:: @ 818B6B0 +LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten:: @ 818B6B0 .string "Welche Attacke soll vergessen werden?$" -LilycoveCity_MoveDeletersHouse_Text_18B6D0:: @ 818B6D0 +LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove:: @ 818B6D0 .string "{STR_VAR_1} kennt scheinbar nur eine\n" .string "einzige Attacke...$" -LilycoveCity_MoveDeletersHouse_Text_18B6F2:: @ 818B6F2 +LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten:: @ 818B6F2 .string "Hm! {STR_VAR_2} von {STR_VAR_1}?\n" .string "Diese Attacke soll vergessen werden?$" -LilycoveCity_MoveDeletersHouse_Text_18B71E:: @ 818B71E +LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove:: @ 818B71E .string "Das klappte doch perfekt!\p" .string "{STR_VAR_1} hat {STR_VAR_2}\n" .string "komplett vergessen.$" -LilycoveCity_MoveDeletersHouse_Text_18B757:: @ 818B757 +LilycoveCity_MoveDeletersHouse_Text_ComeAgain:: @ 818B757 .string "Komm wieder, wenn es andere Attacken\n" .string "gibt, die vergessen werden sollen.$" -LilycoveCity_MoveDeletersHouse_Text_18B78C:: @ 818B78C +LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves:: @ 818B78C .string "Was?\n" .string "Ein EI kennt doch keine Attacken!$" diff --git a/data-de/maps/LilycoveCity_PokemonCenter_1F/text.inc b/data-de/maps/LilycoveCity_PokemonCenter_1F/text.inc index b1f676671..9761229e5 100644 --- a/data-de/maps/LilycoveCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/LilycoveCity_PokemonCenter_1F/text.inc @@ -1,16 +1,16 @@ -LilycoveCity_PokemonCenter_1F_Text_189FC9:: @ 8189FC9 +LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon:: @ 8189FC9 .string "Ich frage mich, wie viele Arten von\n" .string "POKéMON es in der Welt wohl gibt?\p" .string "Es muss toll sein, die Meere zu über-\n" .string "queren und POKéMON mit Leuten zu\l" .string "tauschen, die weit weg leben.$" -LilycoveCity_PokemonCenter_1F_Text_18A048:: @ 818A048 +LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels:: @ 818A048 .string "Ich habe von einigen Schurken gehört,\n" .string "die POKéMON stehlen und METEORITEN\l" .string "klauen.$" -LilycoveCity_PokemonCenter_1F_Text_18A0A1:: @ 818A0A1 +LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels:: @ 818A0A1 .string "Diese verkommenen Schurken, die\n" .string "POKéMON stehlen und METEORITEN\l" .string "klauen...\p" diff --git a/data-de/maps/LilycoveCity_PokemonTrainerFanClub/text.inc b/data-de/maps/LilycoveCity_PokemonTrainerFanClub/text.inc index 758f7a592..04858a9a9 100644 --- a/data-de/maps/LilycoveCity_PokemonTrainerFanClub/text.inc +++ b/data-de/maps/LilycoveCity_PokemonTrainerFanClub/text.inc @@ -1,8 +1,8 @@ -LilycoveCity_PokemonTrainerFanClub_Text_18A1D6:: @ 818A1D6 +LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer:: @ 818A1D6 .string "Oh, wow!\n" .string "Das ist {PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A1E8:: @ 818A1E8 +LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan:: @ 818A1E8 .string "Ich habe die Neuigkeit schon gehört.\n" .string "Du bist wirklich stark, nicht wahr?\p" .string "Wir diskutieren immer darüber, wer hier\n" @@ -18,29 +18,29 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A1E8:: @ 818A1E8 .string "Denk dran: Ich jubele dir zu,\n" .string "{PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A36A:: @ 818A36A +LilycoveCity_PokemonTrainerFanClub_Text_YoureOneWeWantToWin:: @ 818A36A .string "Ja, {PLAYER}!\n" .string "Dich wollen wir als Sieger sehen!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A391:: @ 818A391 +LilycoveCity_PokemonTrainerFanClub_Text_OthersDontKnowYoureTheBest:: @ 818A391 .string "Die anderen wissen gar nicht, dass du\n" .string "besser bist als alle anderen!\p" .string "Das stimmt doch, oder {PLAYER}?\n" .string "Zeig ihnen, was du drauf hast!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A400:: @ 818A400 +LilycoveCity_PokemonTrainerFanClub_Text_TrainersPowerIsOutOfTheOrdinary:: @ 818A400 .string "Ich sage es ja nicht gerne, aber der\n" .string "TRAINER, über den alle sprechen, ist\l" .string "{STR_VAR_1}, keine Frage!\p" .string "Die Stärke dieses TRAINERS...\n" .string "Ganz außergewöhnlich.$" -LilycoveCity_PokemonTrainerFanClub_Text_18A48D:: @ 818A48D +LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsBestNoOneWantsToListen:: @ 818A48D .string "Mist... Ich sage jedem, dass {STR_VAR_1}\n" .string "der Beste von allen ist.\p" .string "Aber niemand hört mir zu...$" -LilycoveCity_PokemonTrainerFanClub_Text_18A4EA:: @ 818A4EA +LilycoveCity_PokemonTrainerFanClub_Text_HearingAboutToughNewTrainer:: @ 818A4EA .string "Ich habe etwas über einen neuen,\n" .string "starken TRAINER gehört.\p" .string "Dieser TRAINER wird bestimmt auch die\n" @@ -48,13 +48,13 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A4EA:: @ 818A4EA .string "Weißt du irgendwas über diesen neuen\n" .string "TRAINER?$" -LilycoveCity_PokemonTrainerFanClub_Text_18A584:: @ 818A584 +LilycoveCity_PokemonTrainerFanClub_Text_ImPullingForYou:: @ 818A584 .string "Oh!\n" .string "{PLAYER}!\p" .string "Los!\n" .string "Ich drücke dir die Daumen!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A5AC:: @ 818A5AC +LilycoveCity_PokemonTrainerFanClub_Text_BrawlyNoImYourFan:: @ 818A5AC .string "Seufz...\n" .string "KAMILLO...\p" .string "Oh, nein! Warte mal!\n" @@ -63,36 +63,36 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A5AC:: @ 818A5AC .string "Also mach mich stolz!\n" .string "Los!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A629:: @ 818A629 +LilycoveCity_PokemonTrainerFanClub_Text_ICantHelpLikingBrawly:: @ 818A629 .string "Ich kann mir nicht helfen, aber ich\n" .string "finde nur KAMILLO klasse...$" -LilycoveCity_PokemonTrainerFanClub_Text_18A65B:: @ 818A65B +LilycoveCity_PokemonTrainerFanClub_Text_NobodyUnderstandsBrawly:: @ 818A65B .string "Niemand erkennt den Charme von\n" .string "KAMILLO...\p" .string "Mir doch egal!\p" .string "Auch wenn keiner ihm zujubelt, ICH\n" .string "unterstütze KAMILLO!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A6D4:: @ 818A6D4 +LilycoveCity_PokemonTrainerFanClub_Text_MyFavoriteTrainerIsBrawly:: @ 818A6D4 .string "Egal, was die anderen sagen, der ARENA-\n" .string "LEITER von FAUSTAUHAVEN, KAMILLO,\l" .string "ist mein Favorit!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A71E:: @ 818A71E +LilycoveCity_PokemonTrainerFanClub_Text_YouveSurpassedYourFather:: @ 818A71E .string "Du hast deinen Vater in jeder Hinsicht\n" .string "übertroffen!\p" .string "Das sag ich dir. Und da gibt es\n" .string "überhaupt keinen Zweifel dran!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A789:: @ 818A789 +LilycoveCity_PokemonTrainerFanClub_Text_YourFatherNeverGaveUpSoKeepOnBattling:: @ 818A789 .string "Selbst in scheinbar aussichtslosen\n" .string "Situationen gibt dein Vater nicht auf.\p" .string "Ich weiß, dass das stimmt!\p" .string "Und du verhältst dich genauso.\n" .string "Also, kämpfe fleißig weiter.$" -LilycoveCity_PokemonTrainerFanClub_Text_18A814:: @ 818A814 +LilycoveCity_PokemonTrainerFanClub_Text_LongWayToGoComparedToNorman:: @ 818A814 .string "NORMAN hat im Kampf mehr Kraft, \n" .string "Charisma und Darbietungstalent\l" .string "gezeigt als du.\p" @@ -101,7 +101,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A814:: @ 818A814 .string "Du hast noch einen weiten Weg vor dir,\n" .string "wenn du so werden willst wie dein Vater.$" -LilycoveCity_PokemonTrainerFanClub_Text_18A8C4:: @ 818A8C4 +LilycoveCity_PokemonTrainerFanClub_Text_YouAndNormanAreDifferent:: @ 818A8C4 .string "Du bekommst langsam auch die Aura von\n" .string "Autorität, die NORMAN umgibt.\p" .string "Aber es gibt einen gewaltigen\n" @@ -109,7 +109,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A8C4:: @ 818A8C4 .string "Aber ich kann dir nicht sagen, was das\n" .string "ist. Du musst es selbst herausfinden.$" -LilycoveCity_PokemonTrainerFanClub_Text_18A984:: @ 818A984 +LilycoveCity_PokemonTrainerFanClub_Text_WeDiscussStrongestTrainers:: @ 818A984 .string "Jeder hier ist ein großer Fan von\n" .string "POKéMON-Kämpfen.\p" .string "Wir diskutieren gerade, welcher\n" @@ -117,12 +117,12 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A984:: @ 818A984 .string "Wenn du berühmt wirst, werden wir\n" .string "vielleicht deine Fans!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AA39:: @ 818AA39 +LilycoveCity_PokemonTrainerFanClub_Text_OhWoweeItsPlayer:: @ 818AA39 .string "KREISCH! Das ist {PLAYER}!\n" .string "Wirklich und wahrhaftig!!!\p" .string "Bitte, schüttle mir die Hand! Biiitte!!!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AA83:: @ 818AA83 +LilycoveCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: @ 818AA83 .string "Ich juble dir ständig zu, {PLAYER}!\n" .string "Immer! Iiimmer!\p" .string "Ich möchte dich niemals als Verlierer\n" @@ -130,48 +130,48 @@ LilycoveCity_PokemonTrainerFanClub_Text_18AA83:: @ 818AA83 .string "Ich weiß, dass du sehr, sehr, sehr stark\n" .string "bist, {PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AB0A:: @ 818AB0A +LilycoveCity_PokemonTrainerFanClub_Text_EveryoneThinksTrainerIsCool:: @ 818AB0A .string "{STR_VAR_1} ist wirklich megacool...\p" .string "Jeder denkt das, stimmt's? Stimmt's?!?$" -LilycoveCity_PokemonTrainerFanClub_Text_18AB41:: @ 818AB41 +LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsReallyCoolItsJustMe:: @ 818AB41 .string "{STR_VAR_1} ist cooool, meinst du nicht\n" .string "auch?\p" .string "Selbst ein Würstchen wie ich jubelt\n" .string "seinem favorisierten TRAINER zu.$" -LilycoveCity_PokemonTrainerFanClub_Text_18ABAE:: @ 818ABAE +LilycoveCity_PokemonTrainerFanClub_Text_WishThereWasTrainerLikeThat:: @ 818ABAE .string "Mein Lieblings-TRAINER muss...\p" .string "cool...\p" .string "stark...\p" .string "und total nett sein...\p" .string "Ich wollte, es gäbe so einen TRAINER...$" -LilycoveCity_PokemonTrainerFanClub_Text_18AC15:: @ 818AC15 +LilycoveCity_PokemonTrainerFanClub_Text_WantToBeStrongLikeYou:: @ 818AC15 .string "Hui! Das ist {PLAYER}!\n" .string "Wahnsinn!\p" .string "Wenn ich groß bin, möchte ich auch so\n" .string "stark sein wie du, {PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AC5E:: @ 818AC5E +LilycoveCity_PokemonTrainerFanClub_Text_OnlyOneWhoCheersForYou:: @ 818AC5E .string "Auch wenn ich dein einziger Fan bin...\p" .string "Ich werde dir immer zujubeln, du bist\n" .string "mein Favorit, {PLAYER}!\p" .string "Denn ich glaube an dich, {PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18ACC7:: @ 818ACC7 +LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsWickedlyCool:: @ 818ACC7 .string "{STR_VAR_1} ist so unverschämt cool...\n" .string "Ich möchte meinem Held die Hand\l" .string "schütteln.$" -LilycoveCity_PokemonTrainerFanClub_Text_18AD05:: @ 818AD05 +LilycoveCity_PokemonTrainerFanClub_Text_NeverGoingToStopBeingTrainersFan:: @ 818AD05 .string "Auch wenn ich der einzige Fan bin...\p" .string "Ich werde niemals aufhören,\n" .string "ein Fan von {STR_VAR_1} zu sein!\p" .string "Denn ich habe gehört, dass {STR_VAR_1}\n" .string "niemals verliert!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AD6D:: @ 818AD6D +LilycoveCity_PokemonTrainerFanClub_Text_YoureAmazingAfterAll:: @ 818AD6D .string "{PLAYER}!\n" .string "Du bist wirklich unglaublich!\p" .string "Schon als ich dich das erste Mal gesehen\n" @@ -180,13 +180,13 @@ LilycoveCity_PokemonTrainerFanClub_Text_18AD6D:: @ 818AD6D .string "Scheinbar täuschen mich meine Augen\n" .string "nie.$" -LilycoveCity_PokemonTrainerFanClub_Text_18ADEF:: @ 818ADEF +LilycoveCity_PokemonTrainerFanClub_Text_ImInYourCorner:: @ 818ADEF .string "Wen kümmern schon die anderen?\n" .string "Ich bin auf deiner Seite!\p" .string "Keine Sorge. Geh da raus und kämpfe\n" .string "wie immer.$" -LilycoveCity_PokemonTrainerFanClub_Text_18AE63:: @ 818AE63 +LilycoveCity_PokemonTrainerFanClub_Text_ThinkTrainerIsNumberOne:: @ 818AE63 .string "Du bist ein anständiger TRAINER.\n" .string "Das ist meine Meinung.\p" .string "Aber ich denke, {STR_VAR_1} ist im\n" @@ -195,7 +195,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_18AE63:: @ 818AE63 .string "Aber lass dir darüber keine grauen\l" .string "Haare wachsen.$" -LilycoveCity_PokemonTrainerFanClub_Text_18AEF5:: @ 818AEF5 +LilycoveCity_PokemonTrainerFanClub_Text_YoureMaybeStrongerThanTrainer:: @ 818AEF5 .string "Wow, du bist wirklich sehr stark.\n" .string "Vielleicht sogar stärker als\l" .string "{STR_VAR_1}.\p" @@ -203,19 +203,19 @@ LilycoveCity_PokemonTrainerFanClub_Text_18AEF5:: @ 818AEF5 .string "Wenn ich {STR_VAR_1} nicht zujuble, wer\n" .string "wird es dann tun?$" -LilycoveCity_PokemonTrainerFanClub_Text_18AF62:: @ 818AF62 +LilycoveCity_PokemonTrainerFanClub_Text_YouChangedMyMind:: @ 818AF62 .string "Du hast mich überzeugt.\n" .string "Du bist stark, nicht wahr?\p" .string "Würdest du mir bitte erzählen, wie\n" .string "du so stark geworden bist?$" -LilycoveCity_PokemonTrainerFanClub_Text_18AFD0:: @ 818AFD0 +LilycoveCity_PokemonTrainerFanClub_Text_YouBattleAttractivelyInToughSituation:: @ 818AFD0 .string "Je schwieriger die Lage, desto\n" .string "ästhetischer wird dein Kampf.\p" .string "Ich kann deinen nächsten Kampf gar\n" .string "nicht erwarten!$" -LilycoveCity_PokemonTrainerFanClub_Text_18B030:: @ 818B030 +LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsStandout:: @ 818B030 .string "Unter den wirklich heißen TRAINERN\n" .string "hebt sich {STR_VAR_1} besonders hervor.\p" .string "Diese Stärke. Das ist nicht normal.\p" @@ -223,7 +223,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_18B030:: @ 818B030 .string "gehörst nicht in die gleiche Klasse\l" .string "wie {STR_VAR_1}.$" -LilycoveCity_PokemonTrainerFanClub_Text_18B0C8:: @ 818B0C8 +LilycoveCity_PokemonTrainerFanClub_Text_NoOneCanKnockYouButTrainerStronger:: @ 818B0C8 .string "Du bist sehr populär...\p" .string "Du bist stark und du sorgst gut für\n" .string "deine POKéMON.\p" @@ -232,24 +232,24 @@ LilycoveCity_PokemonTrainerFanClub_Text_18B0C8:: @ 818B0C8 .string "{STR_VAR_1} ist definitiv stärker!\n" .string "Ich bin mir da sicher!$" -LilycoveCity_PokemonTrainerFanClub_Text_18B16E:: @ 818B16E +LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive:: @ 818B16E .string "Du...\p" .string "Beeindruckend!$" -LilycoveCity_PokemonTrainerFanClub_Text_18B181:: @ 818B181 +LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth:: @ 818B181 .string "Dein wahrer Wert... Es ist gut, wenn\n" .string "nur ich ihn erkenne.\p" .string "Ich glaube nicht, dass die anderen die\n" .string "versteckten Kräfte verstehen würden.$" -LilycoveCity_PokemonTrainerFanClub_Text_18B1FD:: @ 818B1FD +LilycoveCity_PokemonTrainerFanClub_Text_HaventRealizedPotential:: @ 818B1FD .string "Ja, deine Augen spiegeln deine Stärke\n" .string "wider.\p" .string "Aber!\p" .string "Du hast dein eigenes Potential noch\n" .string "nicht erkannt.$" -LilycoveCity_PokemonTrainerFanClub_Text_18B24F:: @ 818B24F +LilycoveCity_PokemonTrainerFanClub_Text_YourePowerfulButNotTrueStrength:: @ 818B24F .string "Es stimmt, du agierst wirklich sehr\n" .string "kraftvoll.\p" .string "Aber!\n" diff --git a/data-de/maps/LittlerootTown/text.inc b/data-de/maps/LittlerootTown/text.inc index 9205321c9..568e955a0 100644 --- a/data-de/maps/LittlerootTown/text.inc +++ b/data-de/maps/LittlerootTown/text.inc @@ -1,4 +1,4 @@ -LittlerootTown_Text_16A7C9:: @ 816A7C9 +LittlerootTown_Text_OurNewHomeLetsGoInside:: @ 816A7C9 .string "MUTTER: {PLAYER}, wir sind da, Schatz!\p" .string "Die Fahrt im Umzugswagen zwischen all\n" .string "unseren Sachen war bestimmt ermüdend.\p" @@ -10,10 +10,10 @@ LittlerootTown_Text_16A7C9:: @ 816A7C9 .string "Und... Du bekommst dein eigenes\n" .string "Zimmer, {PLAYER}! Lass uns hineingehen!$" -LittlerootTown_Text_16A8EE:: @ 816A8EE +LittlerootTown_Text_WaitPlayer:: @ 816A8EE .string "MUTTER: Warte, {PLAYER}!$" -LittlerootTown_Text_16A8FD:: @ 816A8FD +LittlerootTown_Text_WearTheseRunningShoes:: @ 816A8FD .string "MUTTER: {PLAYER}! Hast du dich schon\n" .string "PROF. BIRK vorgestellt?\p" .string "Oh! Was für ein hübsches POKéMON! Du\n" @@ -26,10 +26,10 @@ LittlerootTown_Text_16A8FD:: @ 816A8FD .string "Sie werden deinen Schritt\n" .string "beschleunigen!$" -LittlerootTown_Text_16AA32:: @ 816AA32 +LittlerootTown_Text_SwitchShoesWithRunningShoes:: @ 816AA32 .string "{PLAYER} zieht die TURBOTRETER an.$" -LittlerootTown_Text_16AA5C:: @ 816AA5C +LittlerootTown_Text_ExplainRunningShoes:: @ 816AA5C .string "MUTTER: {PLAYER}, für diese Schuhe gibt\n" .string "es eine Bedienungsanleitung.\p" .string "“Halte den B-Knopf gedrückt,\n" @@ -38,7 +38,7 @@ LittlerootTown_Text_16AA5C:: @ 816AA5C .string "Schlüpf in diese TURBOTRETER und\n" .string "erobere die Welt da draußen!”$" -LittlerootTown_Text_16AB10:: @ 816AB10 +LittlerootTown_Text_ComeHomeIfAnythingHappens:: @ 816AB10 .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" .string "Sich vorzustellen, dass du nun dein\n" @@ -49,13 +49,13 @@ LittlerootTown_Text_16AB10:: @ 816AB10 .string "nach Hause.\p" .string "Lauf, schnapp' sie dir alle, Schatz!$" -LittlerootTown_Text_16AC00:: @ 816AC00 +LittlerootTown_Text_CanUsePCToStoreItems:: @ 816AC00 .string "Wenn du einen PC benutzt, kannst du\n" .string "dort Items und POKéMON lagern.\p" .string "Die Kraft der Wissenschaft ist\n" .string "atemberaubend!$" -LittlerootTown_Text_16AC56:: @ 816AC56 +LittlerootTown_Text_BirchSpendsDaysInLab:: @ 816AC56 .string "PROF. BIRK verbringt seine Tage in\n" .string "seinem LABOR, dann rennt er plötzlich\l" .string "nach draußen in die Wildnis, um zu\l" @@ -63,38 +63,38 @@ LittlerootTown_Text_16AC56:: @ 816AC56 .string "Wann ist PROF. BIRK eigentlich mal\n" .string "zu Hause?$" -LittlerootTown_Text_16ACEB:: @ 816ACEB +LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut:: @ 816ACEB .string "Wenn du in das hohe Gras am Seitenrand\n" .string "der Pfade gehst, triffst du auf\l" .string "wilde POKéMON.$" -LittlerootTown_Text_16AD3C:: @ 816AD3C +LittlerootTown_Text_DangerousIfYouDontHavePokemon:: @ 816AD3C .string "Hast du keine POKéMON dabei, ist es\n" .string "dort sehr gefährlich.$" -LittlerootTown_Text_16AD82:: @ 816AD82 +LittlerootTown_Text_CanYouGoSeeWhatsHappening:: @ 816AD82 .string "Ich kann am Ende dieser Straße\n" .string "jemanden schreien hören.\p" .string "Was soll ich tun? Was sollen wir tun?\n" .string "Jemand muss doch helfen...$" -LittlerootTown_Text_16ADF2:: @ 816ADF2 +LittlerootTown_Text_YouSavedBirch:: @ 816ADF2 .string "Junge, bin ich froh, dass du den\n" .string "PROFESSOR gerettet hast!$" -LittlerootTown_Text_16AE25:: @ 816AE25 +LittlerootTown_Text_GoodLuckCatchingPokemon:: @ 816AE25 .string "Gehst du POKéMON fangen?\n" .string "Viel Glück!$" -LittlerootTown_Text_16AE50:: @ 816AE50 +LittlerootTown_Text_TownSign:: @ 816AE50 .string "WURZELHEIM\n" .string "“Ein Ort, wie es ihn nur einmal gibt.”$" -LittlerootTown_Text_16AE87:: @ 816AE87 +LittlerootTown_Text_ProfBirchsLab:: @ 816AE87 .string "PROF. BIRKS POKéMON-LABOR$" -LittlerootTown_Text_16AEA1:: @ 816AEA1 +LittlerootTown_Text_PlayersHouse:: @ 816AEA1 .string "HAUS von {PLAYER}$" -LittlerootTown_Text_16AEAC:: @ 816AEAC +LittlerootTown_Text_ProfBirchsHouse:: @ 816AEAC .string "PROF. BIRKS HAUS$" 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-de/maps/MauvilleCity/text.inc b/data-de/maps/MauvilleCity/text.inc index 4a06fff34..7a94efd28 100644 --- a/data-de/maps/MauvilleCity/text.inc +++ b/data-de/maps/MauvilleCity/text.inc @@ -1,27 +1,27 @@ -MauvilleCity_Text_165B76:: @ 8165B76 +MauvilleCity_Text_UncleHesTooPeppy:: @ 8165B76 .string "ONKEL: Ich glaube, es liegt an dem\n" .string "POKéMON, dass dieser Junge mehr Pep\l" .string "hat. Aber er hat zu viel Pep...$" -MauvilleCity_Text_165BE3:: @ 8165BE3 +MauvilleCity_Text_WallyWantToChallengeGym:: @ 8165BE3 .string "HEIKO: Oooch, bitte, ONKEL, bitte!\p" .string "Ich möchte in dieser ARENA antreten,\n" .string "um zu sehen, wie gut ich bin.\p" .string "Bitte! Darf ich? Biiiitte!$" -MauvilleCity_Text_165C57:: @ 8165C57 +MauvilleCity_Text_UncleYourePushingIt:: @ 8165C57 .string "ONKEL: Nun hör mal auf, HEIKO.\p" .string "Seit du mit POKéMON zusammenlebst, bist\n" .string "du viel stärker geworden.\p" .string "Aber - du überforderst dich, wenn du\n" .string "plötzlich in einer ARENA antrittst.$" -MauvilleCity_Text_165D01:: @ 8165D01 +MauvilleCity_Text_WallyWeCanBeatAnyone:: @ 8165D01 .string "HEIKO: Ich bin nicht überfordert!\p" .string "Wenn ich die Kräfte von TRASLA\n" .string "kombiniere, besiege ich jeden!$" -MauvilleCity_Text_165D50:: @ 8165D50 +MauvilleCity_Text_WallyWillYouBattleMe:: @ 8165D50 .string "HEIKO: Oh! Hi, {PLAYER}!\p" .string "Seit wir uns das letzte Mal gesehen\n" .string "haben, bin ich viel stärker geworden.\p" @@ -30,43 +30,43 @@ MauvilleCity_Text_165D50:: @ 8165D50 .string "{PLAYER}, bitte, würdest du gegen mich\n" .string "kämpfen?$" -MauvilleCity_Text_165DE8:: @ 8165DE8 +MauvilleCity_Text_WallyMyUncleWontKnowImStrong:: @ 8165DE8 .string "HEIKO: Oh... Wenn du nicht gegen mich an-\n" .string "treten willst, {PLAYER}, wird mein ONKEL\l" .string "nie erkennen, wie stark ich schon bin.$" -MauvilleCity_Text_165E45:: @ 8165E45 +MauvilleCity_Text_UncleCanYouBattleWally:: @ 8165E45 .string "ONKEL: {PLAYER}{KUN}, richtig?\n" .string "Darf ich dich um HEIKOS Willen bitten,\l" .string "dieses eine Mal gegen ihn zu kämpfen?\p" .string "Ich glaube nicht, dass er mir im Moment\n" .string "überhaupt zuhören will...$" -MauvilleCity_Text_165EE2:: @ 8165EE2 +MauvilleCity_Text_WallyPleaseBattleMe:: @ 8165EE2 .string "HEIKO: {PLAYER}, bitte!\n" .string "Kämpfe gegen mich! Biiiitte!$" -MauvilleCity_Text_165F0D:: @ 8165F0D +MauvilleCity_Text_WallyHereICome:: @ 8165F0D .string "HEIKO: {PLAYER}, vielen Dank!\p" .string "Okay... Jetzt komme ich!$" -MauvilleCity_Text_165F38:: @ 8165F38 +MauvilleCity_Text_WallyDefeat:: @ 8165F38 .string "HEIKO: ... ... ... ... ... ... ...\p" .string "... ... ... ... ... ... ... ...\p" .string "Ich habe verloren...$" -MauvilleCity_Text_165F85:: @ 8165F85 +MauvilleCity_Text_WallyIllGoBackToVerdanturf:: @ 8165F85 .string "HEIKO: ONKEL...\n" .string "Ich gehe zurück nach WIESENFLUR...$" -MauvilleCity_Text_165FB3:: @ 8165FB3 +MauvilleCity_Text_ThankYouNotEnoughToBattle:: @ 8165FB3 .string "{PLAYER}, herzlichen Dank! TRAINER zu\n" .string "sein verlangt viel von einem, oder?\p" .string "Man besitzt nicht einfach nur POKéMON\n" .string "und lässt sie kämpfen. Um ein richtiger\l" .string "TRAINER zu sein, braucht es mehr.$" -MauvilleCity_Text_166050:: @ 8166050 +MauvilleCity_Text_UncleNoNeedToBeDown:: @ 8166050 .string "ONKEL: HEIKO, du brauchst deshalb nicht\n" .string "so niedergeschlagen zu sein.\p" .string "Was hält dich davon ab, stärker und\n" @@ -74,7 +74,7 @@ MauvilleCity_Text_166050:: @ 8166050 .string "Komm, gehen wir nach Hause.\n" .string "Da warten sie alle schon auf dich.$" -MauvilleCity_Text_1660FA:: @ 81660FA +MauvilleCity_Text_UncleVisitUsSometime:: @ 81660FA .string "ONKEL: {PLAYER}{KUN}, mir dämmert es so\n" .string "langsam. Du musst der TRAINER sein, der\l" .string "sich damals um HEIKO gekümmert hat, als\l" @@ -83,7 +83,7 @@ MauvilleCity_Text_1660FA:: @ 81660FA .string "in WIESENFLUR? Ich bin sicher,\l" .string "HEIKO würde sich sehr freuen.$" -MauvilleCity_Text_1661C1:: @ 81661C1 +MauvilleCity_Text_WattsonNeedFavorTakeKey:: @ 81661C1 .string "WALTER: Oh, {PLAYER}{KUN}!\n" .string "Du siehst aus, als hättest du Mumm!\l" .string "Das ist sehr gut, hähähähähä...\p" @@ -100,7 +100,7 @@ MauvilleCity_Text_1661C1:: @ 81661C1 .string "Hier hast du den SCHLÜSSEL für\n" .string "NEU MALVENFROH.$" -MauvilleCity_Text_166331:: @ 8166331 +MauvilleCity_Text_WattsonWontBeChallenge:: @ 8166331 .string "WALTER: Mach dir keine Sorgen. Man\n" .string "kann das nicht gerade eine Heraus-\l" .string "forderung nennen.\p" @@ -110,7 +110,7 @@ MauvilleCity_Text_166331:: @ 8166331 .string "Das ist alles. Du kannst mir vertrauen!\n" .string "Wahahahahahaha!$" -MauvilleCity_Text_1663EB:: @ 81663EB +MauvilleCity_Text_WattsonThanksTakeTM:: @ 81663EB .string "WALTER: Wahahahahaha!\p" .string "Ich wusste es, {PLAYER}{KUN}! Ich wusste, ich\n" .string "habe die richtige Person herausgepickt!\p" @@ -118,51 +118,51 @@ MauvilleCity_Text_1663EB:: @ 81663EB .string "die DONNERBLITZ enthält!\p" .string "Nimm! Du hast sie dir wirklich verdient!$" -MauvilleCity_Text_166488:: @ 8166488 +MauvilleCity_Text_WattsonYoungTakeCharge:: @ 8166488 .string "WALTER: Wahahahahaha!\p" .string "Es freut mich zu sehen, wie energetisch\n" .string "sich die jungen Leute heute entwickeln!$" -MauvilleCity_Text_1664DF:: @ 81664DF +MauvilleCity_Text_NurseHurtMonBackToHealth:: @ 81664DF .string "Weißt du, es ist cool, dass es POKéMON-\n" .string "Kämpfe und all das Zeugs gibt...\p" .string "Aber wenn dein POKéMON verletzt wird,\n" .string "dann musst du es gesund pflegen.$" -MauvilleCity_Text_16655C:: @ 816655C +MauvilleCity_Text_AllSortsOfPeopleComeThrough:: @ 816655C .string "Die Straßen dieses Ortes führen nach\n" .string "Norden, Süden, nach Westen und Osten.\p" .string "Daher reisen hier auch so viele ver-\n" .string "schiedene Leute durch.$" -MauvilleCity_Text_1665DB:: @ 81665DB +MauvilleCity_Text_RydelVeryGenerous:: @ 81665DB .string "Warst du schon in RADLAS RADLADEN?\p" .string "RADLA, der Eigentümer, ist ein sehr\n" .string "großzügiger Mann.$" -MauvilleCity_Text_16662A:: @ 816662A +MauvilleCity_Text_PokemonCanJumpYouOnBike:: @ 816662A .string "Selbst wenn du mit dem RAD fährst,\n" .string "können dich POKéMON anspringen.$" -MauvilleCity_Text_166665:: @ 8166665 +MauvilleCity_Text_CitySign:: @ 8166665 .string "MALVENFROH CITY\n" .string "“Die strahlende Stadt der Freude!”$" -MauvilleCity_Text_166697:: @ 8166697 +MauvilleCity_Text_GymSign:: @ 8166697 .string "POKéMON ARENA von MALVENFROH CITY\n" .string "LEITER: WALTER\l" .string "“Der Mann, der Spannung entlädt!”$" -MauvilleCity_Text_1666E4:: @ 81666E4 +MauvilleCity_Text_BikeShopSign:: @ 81666E4 .string "“Fahre im Kies und lass dich durch-\n" .string "schütteln!”\l" .string "RADLAS RÄDER$" -MauvilleCity_Text_16671C:: @ 816671C +MauvilleCity_Text_GameCornerSign:: @ 816671C .string "“Der Ort für alle Spieler!”\n" .string "MALVENFROH CITY SPIELHALLE$" -MauvilleCity_Text_16674A:: @ 816674A +MauvilleCity_Text_ExplainTV:: @ 816674A .string "Hi, hast du in letzter Zeit ferngesehen?\p" .string "Da gibt es jetzt jede Menge coole, neue\n" .string "Shows.\p" @@ -174,5 +174,5 @@ MauvilleCity_Text_16674A:: @ 816674A .string "Du solltest immer mal wieder den\n" .string "Fernseher einschalten...$" -MauvilleCity_Text_166879:: @ 8166879 +MauvilleCity_Text_BeenCheckingOutTV:: @ 8166879 .string "Hi, hast du in letzter Zeit ferngesehen?$" diff --git a/data-de/maps/MauvilleCity_BikeShop/text.inc b/data-de/maps/MauvilleCity_BikeShop/text.inc index 6587535ef..dd65b853e 100644 --- a/data-de/maps/MauvilleCity_BikeShop/text.inc +++ b/data-de/maps/MauvilleCity_BikeShop/text.inc @@ -1,20 +1,20 @@ -MauvilleCity_BikeShop_Text_180F9F:: @ 8180F9F +MauvilleCity_BikeShop_Text_RydelGreeting:: @ 8180F9F .string "Nun, was haben wir denn hier?\n" .string "Einen höchst energetischen Kunden!\p" .string "Ich? Du kannst RADLA zu mir sagen.\n" .string "Ich bin der Besitzer des Fahrrad-Shops.$" -MauvilleCity_BikeShop_Text_181016:: @ 8181016 +MauvilleCity_BikeShop_Text_DidYouComeFromFarAway:: @ 8181016 .string "RADLA: Deine TURBOTRETER...\n" .string "Die sehen ja wirklich schmuddelig aus...\p" .string "Kommst du von weit her?$" -MauvilleCity_BikeShop_Text_181067:: @ 8181067 +MauvilleCity_BikeShop_Text_GuessYouDontNeedBike:: @ 8181067 .string "RADLA: Stimmt das wirklich?\p" .string "Dann kannst du, glaube ich, keines\n" .string "meiner Fahrräder gebrauchen.$" -MauvilleCity_BikeShop_Text_1810B1:: @ 81810B1 +MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne:: @ 81810B1 .string "RADLA: Hm, hm... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" .string "Du kommst den ganzen Weg von\n" @@ -39,37 +39,37 @@ MauvilleCity_BikeShop_Text_1810B1:: @ 81810B1 .string "darfst du dir eines aussuchen!\p" .string "Welches möchtest du haben?$" -MauvilleCity_BikeShop_Text_181332:: @ 8181332 +MauvilleCity_BikeShop_Text_ChoseMachBike:: @ 8181332 .string "{PLAYER} wählt das EILRAD.$" -MauvilleCity_BikeShop_Text_18134A:: @ 818134A +MauvilleCity_BikeShop_Text_ChoseAcroBike:: @ 818134A .string "{PLAYER} wählt das KUNSTRAD.$" -MauvilleCity_BikeShop_Text_181362:: @ 8181362 +MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes:: @ 8181362 .string "RADLA: Wenn du die RÄDER tauschen\n" .string "möchtest, komm einfach wieder vorbei!$" -MauvilleCity_BikeShop_Text_1813A0:: @ 81813A0 +MauvilleCity_BikeShop_Text_WantToSwitchBikes:: @ 81813A0 .string "RADLA: Oh. Du möchtest die RÄDER\n" .string "tauschen?$" -MauvilleCity_BikeShop_Text_1813D4:: @ 81813D4 +MauvilleCity_BikeShop_Text_IllSwitchBikes:: @ 81813D4 .string "RADLA: Kein Problem!\n" .string "Ich tausche die RÄDER für dich aus!$" -MauvilleCity_BikeShop_Text_181408:: @ 8181408 +MauvilleCity_BikeShop_Text_ExchangedMachForAcro:: @ 8181408 .string "{PLAYER} bekommt für das EILRAD ein\n" .string "KUNSTRAD.$" -MauvilleCity_BikeShop_Text_181439:: @ 8181439 +MauvilleCity_BikeShop_Text_ExchangedAcroForMach:: @ 8181439 .string "{PLAYER} bekommt für das KUNSTRAD ein\n" .string "EILRAD.$" -MauvilleCity_BikeShop_Text_181469:: @ 8181469 +MauvilleCity_BikeShop_Text_HappyYouLikeIt:: @ 8181469 .string "RADLA: Wunderbar!\n" .string "Ich freue mich, dass es dir gefällt!$" -MauvilleCity_BikeShop_Text_181498:: @ 8181498 +MauvilleCity_BikeShop_Text_OhYourBikeIsInPC:: @ 8181498 .string "Oh? Was ist mit dem RAD geschehen,\n" .string "das ich dir gegeben habe?\p" .string "Ach so, du hast es in deinem PC gelagert.\p" @@ -78,18 +78,18 @@ MauvilleCity_BikeShop_Text_181498:: @ 8181498 .string "Möge der Wind dir stets im Rücken sein\n" .string "bei deinem Abenteuer!$" -MauvilleCity_BikeShop_Text_181568:: @ 8181568 +MauvilleCity_BikeShop_Text_HandbooksAreInBack:: @ 8181568 .string "Ich lerne etwas über RÄDER,\n" .string "während ich hier arbeite.\p" .string "Wenn du eine Anleitung brauchst, wie\n" .string "man RAD fährt - da vorne findest du\l" .string "einige Handbücher.$" -MauvilleCity_BikeShop_Text_1815EA:: @ 81815EA +MauvilleCity_BikeShop_Text_MachHandbookWhichPage:: @ 81815EA .string "Ein Handbuch zum EILRAD.\p" .string "Welche Seite möchtest du lesen?$" -MauvilleCity_BikeShop_Text_18162C:: @ 818162C +MauvilleCity_BikeShop_Text_HowToRideMachBike:: @ 818162C .string "Mit Hilfe des + Steuerkreuzes lässt\n" .string "sich das RAD lenken.\p" .string "Es wird immer schneller, wenn es\n" @@ -98,7 +98,7 @@ MauvilleCity_BikeShop_Text_18162C:: @ 818162C .string "RAD anzuhalten.\p" .string "Eine andere Seite lesen?$" -MauvilleCity_BikeShop_Text_1816F5:: @ 81816F5 +MauvilleCity_BikeShop_Text_HowToTurnMachBike:: @ 81816F5 .string "Ein EILRAD ist sehr schnell und kann\n" .string "nicht schnell gestoppt werden.\p" .string "Das Kurvenfahren ist sehr schwierig.\p" @@ -106,7 +106,7 @@ MauvilleCity_BikeShop_Text_1816F5:: @ 81816F5 .string "bremse, bevor du an eine Kurve kommst.\p" .string "Eine andere Seite lesen?$" -MauvilleCity_BikeShop_Text_1817BF:: @ 81817BF +MauvilleCity_BikeShop_Text_SandySlopes:: @ 81817BF .string "In der ganzen HOENN-Region gibt es\n" .string "sandige Gefälle.\p" .string "Der lose Sand erlaubt es nicht, diese\n" @@ -115,11 +115,11 @@ MauvilleCity_BikeShop_Text_1817BF:: @ 81817BF .string "diese Gefälle gemeistert werden.\p" .string "Eine andere Seite lesen?$" -MauvilleCity_BikeShop_Text_181892:: @ 8181892 +MauvilleCity_BikeShop_Text_AcroHandbookWhichPage:: @ 8181892 .string "Ein Handbuch zum KUNSTRAD.\p" .string "Welche Seite möchtest du lesen?$" -MauvilleCity_BikeShop_Text_1818D4:: @ 81818D4 +MauvilleCity_BikeShop_Text_Wheelies:: @ 81818D4 .string "Drücke während des Fahrens den\n" .string "B-Knopf, um das Vorderrad anzuheben.\p" .string "Ist das Vorderrad angehoben, können\n" @@ -128,7 +128,7 @@ MauvilleCity_BikeShop_Text_1818D4:: @ 81818D4 .string "Diese Technik nennt sich Wheelie.\p" .string "Eine andere Seite lesen?$" -MauvilleCity_BikeShop_Text_18199A:: @ 818199A +MauvilleCity_BikeShop_Text_BunnyHops:: @ 818199A .string "Wird der B-Knopf gedrückt, kann auf der\n" .string "Stelle gehüpft werden.\p" .string "Diese Technik nennt sich Hoppeln.\p" @@ -136,7 +136,7 @@ MauvilleCity_BikeShop_Text_18199A:: @ 818199A .string "werden.\p" .string "Eine andere Seite lesen?$" -MauvilleCity_BikeShop_Text_181A3D:: @ 8181A3D +MauvilleCity_BikeShop_Text_Jumps:: @ 8181A3D .string "Drücke gleichzeitig den B-Knopf und das\n" .string "Steuerkreuz, um zu springen.\p" .string "Drücke das + Steuerkreuz seitlich, um\n" diff --git a/data-de/maps/MauvilleCity_GameCorner/text.inc b/data-de/maps/MauvilleCity_GameCorner/text.inc index a8756771a..60b9e61b1 100644 --- a/data-de/maps/MauvilleCity_GameCorner/text.inc +++ b/data-de/maps/MauvilleCity_GameCorner/text.inc @@ -1,30 +1,30 @@ -MauvilleCity_GameCorner_Text_181C35:: @ 8181C35 +MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner:: @ 8181C35 .string "Willkommen in unserer SPIELHALLE.$" -MauvilleCity_GameCorner_Text_181C53:: @ 8181C53 +MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins:: @ 8181C53 .string "Okay, du möchtest MÜNZEN für die\n" .string "Spiele haben?\p" .string "Aber du hast keinen MÜNZKORB für die\n" .string "MÜNZEN.$" -MauvilleCity_GameCorner_Text_181CB4:: @ 8181CB4 +MauvilleCity_GameCorner_Text_WereYouLookingForCoins:: @ 8181CB4 .string "Suchst du nach MÜNZEN?\p" .string "Das macht ¥1000 für 50 MÜNZEN.\n" .string "Möchtest du welche haben?$" -MauvilleCity_GameCorner_Text_181CFE:: @ 8181CFE +MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins:: @ 8181CFE .string "Vielen Dank!\n" .string "Hier sind deine MÜNZEN!$" -MauvilleCity_GameCorner_Text_181D28:: @ 8181D28 +MauvilleCity_GameCorner_Text_DontHaveEnoughMoney:: @ 8181D28 .string "Ähm... Es scheint, du hast nicht\n" .string "genügend Geld dabei...$" -MauvilleCity_GameCorner_Text_181D57:: @ 8181D57 +MauvilleCity_GameCorner_Text_CoinCaseIsFull:: @ 8181D57 .string "Oh?\n" .string "Dein MÜNZKORB ist voll.$" -MauvilleCity_GameCorner_Text_181D73:: @ 8181D73 +MauvilleCity_GameCorner_Text_DontNeedCoinsThen:: @ 8181D73 .string "Oh... Dann brauchst du keine MÜNZEN?\n" .string "Viel Glück bei deinem Abenteuer!$" @@ -32,110 +32,110 @@ UnknownString_8181DB2: @ 8181DB2 .string "Das macht ¥1000 für 50 MÜNZEN.\n" .string "Möchtest du welche haben?$" -MauvilleCity_GameCorner_Text_181DE1:: @ 8181DE1 +MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes:: @ 8181DE1 .string "Willkommen.\p" .string "Hier kannst du deine MÜNZEN gegen\n" .string "Preise eintauschen.$" -MauvilleCity_GameCorner_Text_181E17:: @ 8181E17 +MauvilleCity_GameCorner_Text_WhichPrize:: @ 8181E17 .string "Welchen Preis hättest du gerne?$" -MauvilleCity_GameCorner_Text_181E33:: @ 8181E33 +MauvilleCity_GameCorner_Text_SoYourChoiceIsX:: @ 8181E33 .string "Du möchtest also {STR_VAR_1}?$" -MauvilleCity_GameCorner_Text_181E49:: @ 8181E49 +MauvilleCity_GameCorner_Text_SendToYourHomePC:: @ 8181E49 .string "Danke!\n" .string "Wir senden das auf deinen PC.$" -MauvilleCity_GameCorner_Text_181E76:: @ 8181E76 +MauvilleCity_GameCorner_Text_NotEnoughCoins:: @ 8181E76 .string "Du hast nicht genügend MÜNZEN.$" UnknownString_8181E93: @ 8181E93 .string "Du hast nicht genügend Platz, um\n" .string "{STR_VAR_1} zu lagern.$" -MauvilleCity_GameCorner_Text_181EC2:: @ 8181EC2 +MauvilleCity_GameCorner_Text_OhIsThatSo:: @ 8181EC2 .string "Oh, wirklich?\n" .string "Du musst einige MÜNZEN sparen, bevor\l" .string "du wiederkommst.$" -MauvilleCity_GameCorner_Text_181F08:: @ 8181F08 +MauvilleCity_GameCorner_Text_HereYouGo:: @ 8181F08 .string "Bitte schön!$" UnknownString_8181F15: @ 8181F15 .string "Oh, du kannst nicht mehr tragen.$" -MauvilleCity_GameCorner_Text_181F3D:: @ 8181F3D +MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne:: @ 8181F3D .string "Ich habe mich vertan und zweimal die\n" .string "gleiche PUPPE genommen.\p" .string "Möchtest du eine davon haben?$" -MauvilleCity_GameCorner_Text_181F89:: @ 8181F89 +MauvilleCity_GameCorner_Text_HereYouGo2:: @ 8181F89 .string "Bitte schön!$" -MauvilleCity_GameCorner_Text_181F97:: @ 8181F97 +MauvilleCity_GameCorner_Text_YouWantItButNotNow:: @ 8181F97 .string "Bitte?\n" .string "Du möchtest sie, aber nicht jetzt???$" -MauvilleCity_GameCorner_Text_181FBC:: @ 8181FBC +MauvilleCity_GameCorner_Text_DontBeNegative:: @ 8181FBC .string "Oh, sei doch nicht so negativ drauf!\n" .string "Du kannst sie wirklich gerne haben!$" -MauvilleCity_GameCorner_Text_181FE9:: @ 8181FE9 +MauvilleCity_GameCorner_Text_CantWinJackpot:: @ 8181FE9 .string "Es gibt einen Preis, den ich haben\n" .string "möchte, aber ich kann den Jackpot\l" .string "nicht knacken.$" -MauvilleCity_GameCorner_Text_18201E:: @ 818201E +MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor:: @ 818201E .string "Hey, Kindchen, wenn du hier spielen\n" .string "willst, brauchst du einen MÜNZKORB.\p" .string "Ich glaube, die junge Dame nebenan hat\n" .string "einen. Besuche sie mal!$" -MauvilleCity_GameCorner_Text_18208E:: @ 818208E +MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins:: @ 818208E .string "Mein Glück wird nicht immer anhalten.\n" .string "Das ist zu viel für mich.\l" .string "Hier, nimm die MÜNZEN!$" -MauvilleCity_GameCorner_Text_1820DD:: @ 81820DD +MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone:: @ 81820DD .string "Immer wenn ich in MALVENFROH CITY bin,\n" .string "gehe ich in die SPIELHALLE.\p" .string "MALVENFROH CITY bringt mir einfach\n" .string "Glück.$" -MauvilleCity_GameCorner_Text_182120:: @ 8182120 +MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates:: @ 8182120 .string "Beim ROULETTE gibt es verschiedene\n" .string "Einsatzhöhen.\p" .string "Überprüf deine MÜNZEN, bevor du dich\n" .string "für einen Tisch entscheidest.$" -MauvilleCity_GameCorner_Text_18217C:: @ 818217C +MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime:: @ 818217C .string "Hier kann man leicht die Zeit vergessen.\n" .string "Ich sollte wieder an die Arbeit gehen.$" -MauvilleCity_GameCorner_Text_1821C1:: @ 81821C1 +MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay:: @ 81821C1 .string "MÜNZEN werden gebraucht, um hier in der\n" .string "SPIELHALLE spielen zu können.$" -MauvilleCity_GameCorner_Text_1821F3:: @ 81821F3 +MauvilleCity_GameCorner_Text_RouletteOnlyLuck:: @ 81821F3 .string "Dieses ROULETTE-Dingens...\n" .string "Es ist ziemlich anstrengend.\p" .string "Ich versuche, zu gewinnen. Aber ich\n" .string "verliere immer. Doch ich gebe nicht auf.$" -MauvilleCity_GameCorner_Text_182241:: @ 8182241 +MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed:: @ 8182241 .string "Bis zu drei MÜNZEN können an den EIN-\n" .string "ARMIGEN BANDITEN eingesetzt werden.\p" .string "Je mehr Münzen du einsetzt, desto\n" .string "höher ist deine Chance auf den Jackpot.$" -MauvilleCity_GameCorner_Text_182272:: @ 8182272 +MauvilleCity_GameCorner_Text_DifficultToStopOn7:: @ 8182272 .string "Kannst du es genau bei “7” stoppen?\p" .string "Wenn es bei “7” stoppt,\n" .string "während ein REEL TIME gespielt wird,\l" .string "erhältst du Extra-MÜNZEN.$" -MauvilleCity_GameCorner_Text_1822F4:: @ 81822F4 +MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo:: @ 81822F4 .string "Ich kann dir einige nützliche Tipps zu\n" .string "den EINARMIGEN BANDITEN geben.\p" .string "Je mehr Blitze du anhältst, desto größer\n" @@ -148,5 +148,5 @@ MauvilleCity_GameCorner_Text_1822F4:: @ 81822F4 .string "Der Big Bonus bringt 660 MÜNZEN,\n" .string "aber der ist sehr schwer zu gewinnen.$" -MauvilleCity_GameCorner_Text_182420:: @ 8182420 +MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase:: @ 8182420 .string "Du kannst ohne MÜNZKORB nicht spielen.$" diff --git a/data-de/maps/MauvilleCity_Gym/text.inc b/data-de/maps/MauvilleCity_Gym/text.inc index 9d002ba9e..3607c83ea 100644 --- a/data-de/maps/MauvilleCity_Gym/text.inc +++ b/data-de/maps/MauvilleCity_Gym/text.inc @@ -1,4 +1,4 @@ -MauvilleCity_Gym_Text_180815:: @ 8180815 +MauvilleCity_Gym_Text_GymGuideAdvice:: @ 8180815 .string "Hey, wie sieht es aus, auf dem Weg zum\n" .string "CHAMP, {PLAYER}?\p" .string "WALTER, der ARENALEITER von\n" @@ -10,61 +10,61 @@ MauvilleCity_Gym_Text_180815:: @ 8180815 .string "Schaltern öffnen! Wahnsinn!\p" .string "Nun, dann mal los!$" -MauvilleCity_Gym_Text_18091D:: @ 818091D +MauvilleCity_Gym_Text_GymGuidePostVictory:: @ 818091D .string "Aah, du bist elektrifizierend!\n" .string "Du hast die Tür offen gezwungen!$" -MauvilleCity_Gym_Text_180956:: @ 8180956 +MauvilleCity_Gym_Text_KirkIntro:: @ 8180956 .string "Die Spannung meiner Seele, sie setzt\n" .string "alle deine Träume unter Strom! Ja-haha!$" -MauvilleCity_Gym_Text_180997:: @ 8180997 +MauvilleCity_Gym_Text_KirkDefeat:: @ 8180997 .string "Da wurde der Stromkreis geschlossen\n" .string "und bis zum Kurzschluss belastet!$" -MauvilleCity_Gym_Text_1809D1:: @ 81809D1 +MauvilleCity_Gym_Text_KirkPostBattle:: @ 81809D1 .string "POKéMON und Rock... Alles, was ins Herz\n" .string "trifft, boh yeah!$" -MauvilleCity_Gym_Text_180A05:: @ 8180A05 +MauvilleCity_Gym_Text_ShawnIntro:: @ 8180A05 .string "Ich habe unter WALTER trainiert!\n" .string "So einfach verliere ich nicht.$" -MauvilleCity_Gym_Text_180A42:: @ 8180A42 +MauvilleCity_Gym_Text_ShawnDefeat:: @ 8180A42 .string "Stecker raus und ausgeschaltet...$" -MauvilleCity_Gym_Text_180A5E:: @ 8180A5E +MauvilleCity_Gym_Text_ShawnPostBattle:: @ 8180A5E .string "WALTER, unser ARENALEITER, ist schon\n" .string "sehr sehr lange hier ansässig.\p" .string "Er kämpfte schon, da war dein Vater\n" .string "noch nicht geboren.$" -MauvilleCity_Gym_Text_180AE0:: @ 8180AE0 +MauvilleCity_Gym_Text_BenIntro:: @ 8180AE0 .string "Diese ARENA stellt dir eine Knobel-\n" .string "aufgabe. Ist das nicht lustig?$" -MauvilleCity_Gym_Text_180B06:: @ 8180B06 +MauvilleCity_Gym_Text_BenDefeat:: @ 8180B06 .string "Verlieren ist gar nicht lustig...$" -MauvilleCity_Gym_Text_180B1D:: @ 8180B1D +MauvilleCity_Gym_Text_BenPostBattle:: @ 8180B1D .string "WALTER sagt, er liebt es, Fallen mit\n" .string "Schaltern zu installieren.$" -MauvilleCity_Gym_Text_180B5A:: @ 8180B5A +MauvilleCity_Gym_Text_VivianIntro:: @ 8180B5A .string "Mein Charme und die Attacken meiner\n" .string "POKéMON werden dich schocken!$" -MauvilleCity_Gym_Text_180B93:: @ 8180B93 +MauvilleCity_Gym_Text_VivianDefeat:: @ 8180B93 .string "Ich bin geschockt von deiner Stärke!$" -MauvilleCity_Gym_Text_180BAE:: @ 8180BAE +MauvilleCity_Gym_Text_VivianPostBattle:: @ 8180BAE .string "Ich habe gehört, dass MALVENFROH CITY\n" .string "von WALTER gegründet wurde.\p" .string "Er war TRAINER, lange bevor wir geboren\n" .string "wurden. Er muss ein umfangreiches\l" .string "Wissen besitzen.$" -MauvilleCity_Gym_Text_180C32:: @ 8180C32 +MauvilleCity_Gym_Text_WattsonIntro:: @ 8180C32 .string "Ich habe es aufgegeben, die Stadt\n" .string "umpolen zu wollen.\p" .string "Stattdessen verwende ich meine Energie\n" @@ -79,18 +79,18 @@ MauvilleCity_Gym_Text_180C32:: @ 8180C32 .string "ARENALEITER von MALVENFROH CITY\l" .string "- dich unter Spannung zu setzen!$" -MauvilleCity_Gym_Text_180D64:: @ 8180D64 +MauvilleCity_Gym_Text_WattsonDefeat:: @ 8180D64 .string "Uahahahaha!\n" .string "Schön, ich habe verloren!\p" .string "Du hast es geschafft, meinen Strom-\n" .string "kreis zu unterbrechen! Nimm diesen\l" .string "ORDEN!$" -MauvilleCity_Gym_Text_180DAF:: @ 8180DAF +MauvilleCity_Gym_Text_ReceivedDynamoBadge:: @ 8180DAF .string "{PLAYER} hat den DYNAMO-ORDEN von\n" .string "WALTER erhalten.$" -MauvilleCity_Gym_Text_180DDA:: @ 8180DDA +MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis:: @ 8180DDA .string "Mit dem DYNAMO-ORDEN können POKéMON\n" .string "ZERTRÜMMERER auch außerhalb eines\l" .string "Kampfes einsetzen.\p" @@ -99,24 +99,24 @@ MauvilleCity_Gym_Text_180DDA:: @ 8180DDA .string "Hmm...\n" .string "Dies hier solltest du auch nehmen!$" -MauvilleCity_Gym_Text_180E76:: @ 8180E76 +MauvilleCity_Gym_Text_ExplainShockWave:: @ 8180E76 .string "Dies ist TM34 - SCHOCKWELLE.\p" .string "Eine verlässliche Attacke, die niemals\n" .string "daneben geht! Verlass dich drauf!$" -MauvilleCity_Gym_Text_180EDB:: @ 8180EDB +MauvilleCity_Gym_Text_WattsonPostBattle:: @ 8180EDB .string "Optimismus erfüllt mich, wenn ich einen\n" .string "so viel versprechenden TRAINER wie dich\l" .string "sehe!$" -MauvilleCity_Gym_Text_180F1D:: @ 8180F1D +MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor:: @ 8180F1D .string "Ahahahaha!\n" .string "Mach weiter so, streng dich an, Kind!$" -MauvilleCity_Gym_Text_180F4A:: @ 8180F4A +MauvilleCity_Gym_Text_GymStatue:: @ 8180F4A .string "POKéMON ARENA von MALVENFROH CITY$" -MauvilleCity_Gym_Text_180F64:: @ 8180F64 +MauvilleCity_Gym_Text_GymStatueCertified:: @ 8180F64 .string "POKéMON ARENA von MALVENFROH CITY\p" .string "WALTERS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/MauvilleCity_House1/text.inc b/data-de/maps/MauvilleCity_House1/text.inc index 2f0067526..05c15db5c 100644 --- a/data-de/maps/MauvilleCity_House1/text.inc +++ b/data-de/maps/MauvilleCity_House1/text.inc @@ -1,17 +1,17 @@ -MauvilleCity_House1_Text_181B1A:: @ 8181B1A +MauvilleCity_House1_Text_TakeHMRockSmash:: @ 8181B1A .string "Woohoo, deine POKéMON sehen wirklich\n" .string "sehr stark aus.\p" .string "Das sehe ich gerne!\n" .string "Hier, nimm diese VM!$" -MauvilleCity_House1_Text_181B64:: @ 8181B64 +MauvilleCity_House1_Text_ExplainRockSmash:: @ 8181B64 .string "Diese VM enthält ZERTRÜMMERER.\p" .string "Wenn du unterwegs auf große\n" .string "Felsbrocken stößt...\p" .string "Dann nutze diese VM, um dir den Weg\n" .string "freizumachen.$" -MauvilleCity_House1_Text_181BF6:: @ 8181BF6 +MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock:: @ 8181BF6 .string "Oh ja, wenn du einen Felsen\n" .string "zertrümmerst, könnte ein POKéMON\l" .string "zum Vorschein kommen.$" diff --git a/data-de/maps/MauvilleCity_House2/text.inc b/data-de/maps/MauvilleCity_House2/text.inc index 6de1ff1d9..adb9417eb 100644 --- a/data-de/maps/MauvilleCity_House2/text.inc +++ b/data-de/maps/MauvilleCity_House2/text.inc @@ -1,24 +1,24 @@ -MauvilleCity_House2_Text_18244E:: @ 818244E +MauvilleCity_House2_Text_BuyHarborMailAtSlateport:: @ 818244E .string "Wenn ich doch nur ein RAD hätte...\n" .string "Dann könnte ich nach GRAPHITPORT\l" .string "CITY zum Einkaufen fahren.\p" .string "Dort würde ich mir dann einen HAFEN-\n" .string "BRIEF im PKMN-SUPERMARKT kaufen...$" -MauvilleCity_House2_Text_1824D8:: @ 81824D8 +MauvilleCity_House2_Text_TradeHarborMailForCoinCase:: @ 81824D8 .string "Oh! Du besitzt einen HAFENBRIEF!!!\n" .string "Würdest du den gegen einen MÜNZKORB\l" .string "tauschen?$" -MauvilleCity_House2_Text_182515:: @ 8182515 +MauvilleCity_House2_Text_IllTradeYouCoinCase:: @ 8182515 .string "Oh, ich bin so glücklich!\n" .string "Okay, ich gebe dir diesen MÜNZKORB!$" -MauvilleCity_House2_Text_182549:: @ 8182549 +MauvilleCity_House2_Text_UseCoinCaseAtGameCorner:: @ 8182549 .string "Diesen MÜNZKORB brauchst du in der\n" .string "SPIELHALLE.$" -MauvilleCity_House2_Text_182578:: @ 8182578 +MauvilleCity_House2_Text_ThatsDisappointing:: @ 8182578 .string "Oh, das ist schade.\p" .string "In der SPIELHALLE benötigt man einen\n" .string "MÜNZKORB.$" diff --git a/data-de/maps/MauvilleCity_Mart/text.inc b/data-de/maps/MauvilleCity_Mart/text.inc index b8bf2ebb5..3b57981f0 100644 --- a/data-de/maps/MauvilleCity_Mart/text.inc +++ b/data-de/maps/MauvilleCity_Mart/text.inc @@ -1,4 +1,4 @@ -MauvilleCity_Mart_Text_1827D3:: @ 81827D3 +MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats:: @ 81827D3 .string "Es gibt Items, die den Status eines\n" .string "POKéMON kurzzeitig erhöhen.\p" .string "Ich weiß, dass man X-ANGRIFF und\n" @@ -7,7 +7,7 @@ MauvilleCity_Mart_Text_1827D3:: @ 81827D3 .string "Ich glaube, es gibt aber auch noch\n" .string "andere.$" -MauvilleCity_Mart_Text_18287F:: @ 818287F +MauvilleCity_Mart_Text_DecisionsDetermineBattle:: @ 818287F .string "Setze eine bestimmte Attacke ein,\n" .string "oder stattdessen ein Item...\p" .string "Ich glaube, die Entscheidungen des\n" diff --git a/data-de/maps/MauvilleCity_PokemonCenter_1F/text.inc b/data-de/maps/MauvilleCity_PokemonCenter_1F/text.inc index bb09903b0..d3453a7bd 100644 --- a/data-de/maps/MauvilleCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/MauvilleCity_PokemonCenter_1F/text.inc @@ -1,17 +1,17 @@ -MauvilleCity_PokemonCenter_1F_Text_1825BD:: @ 81825BD +MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings:: @ 81825BD .string "Der Mann dort drüben, der sagt\n" .string "vielleicht verrückte Dinge!\p" .string "Auf seltsame Weise ist er aber amüsant.\n" .string "Den werde ich wohl nicht vergessen!$" -MauvilleCity_PokemonCenter_1F_Text_182622:: @ 8182622 +MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner:: @ 8182622 .string "Wenn ich auf STATISTIKTAUSCH Zugriff\n" .string "nehme, werden die neuesten Nachrichten\l" .string "aus FAUSTAUHAVEN hochgeladen.\p" .string "Diese Daten decken sich nun mit denen\n" .string "meines Freundes!$" -MauvilleCity_PokemonCenter_1F_Text_1826A6:: @ 81826A6 +MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun:: @ 81826A6 .string "Im oberen Stockwerk des POKéMON-\n" .string "CENTERS wurde die Möglichkeit des\l" .string "STATISTIKTAUSCHES eingerichtet.\p" diff --git a/data-de/maps/MossdeepCity/text.inc b/data-de/maps/MossdeepCity/text.inc index 48d0e95d0..27167f74f 100644 --- a/data-de/maps/MossdeepCity/text.inc +++ b/data-de/maps/MossdeepCity/text.inc @@ -1,24 +1,24 @@ -MossdeepCity_Text_1690A9:: @ 81690A9 +MossdeepCity_Text_WantKingsRockStevenGaveMe:: @ 81690A9 .string "Ich habe das von TROY bekommen, weiß\n" .string "aber nicht, was ich damit machen soll.\p" .string "Ich glaube, es heißt KING-STEIN.\n" .string "Möchtest du das haben?$" -MossdeepCity_Text_169117:: @ 8169117 +MossdeepCity_Text_YouCanKeepIt:: @ 8169117 .string "Warum willst du das haben?\n" .string "Du bist komisch.\p" .string "Du kannst es behalten, aber erzähle\n" .string "es nicht TROY.$" -MossdeepCity_Text_16916F:: @ 816916F +MossdeepCity_Text_CollectingRocks:: @ 816916F .string "Macht es wirklich so viel Spaß, Steine zu\n" .string "sammeln? Kann ich gar nicht verstehen.$" -MossdeepCity_Text_1691A7:: @ 81691A7 +MossdeepCity_Text_WhatToDoWithWeirdRock:: @ 81691A7 .string "Ach, du denkst das auch! Was soll man\n" .string "auch mit komischen Steinen anfangen?$" -MossdeepCity_Text_1691F2:: @ 81691F2 +MossdeepCity_Text_WailmerWatching:: @ 81691F2 .string "In der Nähe von MOOSBACH CITY\n" .string "kann man wilde WAILMER sehen.\p" .string "Das nennt man, äh...\n" @@ -26,23 +26,23 @@ MossdeepCity_Text_1691F2:: @ 81691F2 .string "WAI..., WAI..., WAI...\p" .string "WAILMER Watching!$" -MossdeepCity_Text_169266:: @ 8169266 +MossdeepCity_Text_SpaceCenterLaunchingRockets:: @ 8169266 .string "Am RAUMFAHRTZENTRUM auf der Insel\n" .string "werden große Raketen gestartet.$" -MossdeepCity_Text_1692A1:: @ 81692A1 +MossdeepCity_Text_WailmerDisappeared:: @ 81692A1 .string "Ich habe von Freunden in SEEGRA-\n" .string "SULB gehört, dass eine Herde WAILMER\l" .string "verschwunden ist.\p" .string "Was mag da wohl passiert sein?$" -MossdeepCity_Text_169314:: @ 8169314 +MossdeepCity_Text_NiceIfWorldCoveredByFlowers:: @ 8169314 .string "Wäre das nicht schön?\p" .string "Wenn die ganze Welt so mit Blumen und\n" .string "Pflanzen bewachsen wäre wie diese\l" .string "Insel?$" -MossdeepCity_Text_169370:: @ 8169370 +MossdeepCity_Text_LifeNeedsSeaToLive:: @ 8169370 .string "Alle Lebewesen brauchen das Meer, um\n" .string "leben zu können, auch wenn sie an Land\l" .string "leben.\p" @@ -53,14 +53,14 @@ MossdeepCity_Text_169370:: @ 8169370 .string "zum Land.\p" .string "Genau wie dieses Ufer hier.$" -MossdeepCity_Text_16944E:: @ 816944E +MossdeepCity_Text_SurfExhilarating:: @ 816944E .string "Eine Reise auf einem Schiff ist toll.\p" .string "Aber das Meer auf einem POKéMON zu\n" .string "überqueren, das SURFER einsetzt...\p" .string "Das ist wirklich eine aufregende Sache.\n" .string "Meinst du nicht auch, Kindchen?$" -MossdeepCity_Text_1694DA:: @ 81694DA +MossdeepCity_Text_SpecialSpaceCenterRock:: @ 81694DA .string "Dieser Felsen hat eine ganz besondere\n" .string "Bedeutung für das RAUMFAHRTZENTRUM.\p" .string "Sie haben ihn hier hingesetzt als\n" @@ -71,18 +71,18 @@ MossdeepCity_Text_1694DA:: @ 81694DA .string "Ich benutze ein Wunschkärtchen.\n" .string "Genau das mache ich.$" -MossdeepCity_Text_1695D3:: @ 81695D3 +MossdeepCity_Text_ItsAWhiteRock:: @ 81695D3 .string "Ein weißer Felsen.$" -MossdeepCity_Text_1695E6:: @ 81695E6 +MossdeepCity_Text_GymSign:: @ 81695E6 .string "POKéMON ARENA von MOOSBACH CITY \n" .string "LEITER: SVENJA & BEN\p" .string "“Die mystische Kombination!”$" -MossdeepCity_Text_16962F:: @ 816962F +MossdeepCity_Text_CitySign:: @ 816962F .string "MOOSBACH CITY\n" .string "“Unser Motto: Liebe POKéMON!”$" -MossdeepCity_Text_16965C:: @ 816965C +MossdeepCity_Text_SpaceCenterSign:: @ 816965C .string "MOOSBACH CITY RAUMFAHRTZENTRUM\n" .string "“Der letzte Ort vor dem All.”$" diff --git a/data-de/maps/MossdeepCity_GameCorner_1F/text.inc b/data-de/maps/MossdeepCity_GameCorner_1F/text.inc index 277f8008a..2985fc332 100644 --- a/data-de/maps/MossdeepCity_GameCorner_1F/text.inc +++ b/data-de/maps/MossdeepCity_GameCorner_1F/text.inc @@ -1,4 +1,4 @@ -MossdeepCity_GameCorner_1F_Text_18E59A:: @ 818E59A +MossdeepCity_GameCorner_B1F_Text_OldManGreeting:: @ 818E59A .string "Als ich noch jung war, bin ich als\n" .string "POKéMON-TRAINER durch die Welt\l" .string "gereist.\p" @@ -6,40 +6,40 @@ MossdeepCity_GameCorner_1F_Text_18E59A:: @ 818E59A .string "beobachte ich mit Freuden die jungen\l" .string "TRAINER bei ihren Kämpfen.$" -MossdeepCity_GameCorner_1F_Text_18E631:: @ 818E631 +MossdeepCity_GameCorner_B1F_Text_DoorIsLocked:: @ 818E631 .string "Diese Tür ist verschlossen.$" -MossdeepCity_GameCorner_1F_Text_18E650:: @ 818E650 +MossdeepCity_GameCorner_B1F_Text_ChallengeVisitingTrainer:: @ 818E650 .string "Ein TRAINER namens {STR_VAR_1} ist bei\n" .string "mir zu Besuch.\p" .string "Möchtest du einmal gegen {STR_VAR_1}\n" .string "antreten?$" -MossdeepCity_GameCorner_1F_Text_18E698:: @ 818E698 +MossdeepCity_GameCorner_B1F_Text_YouWontBattle:: @ 818E698 .string "Du möchtest nicht kämpfen? Es ent-\n" .string "täuscht mich, dass ich dich nicht\l" .string "kämpfen sehen kann.$" -MossdeepCity_GameCorner_1F_Text_18E6DA:: @ 818E6DA +MossdeepCity_GameCorner_B1F_Text_KeepItToA3On3:: @ 818E6DA .string "Oh, sehr gut!\p" .string "Aber mein Haus ist nicht sehr stabil.\p" .string "Könntet ihr einen 3-gegen-3-Kampf\n" .string "ausfechten?$" -MossdeepCity_GameCorner_1F_Text_18E741:: @ 818E741 +MossdeepCity_GameCorner_B1F_Text_SaveYourProgress:: @ 818E741 .string "Bevor ihr gegeneinander antretet,\n" .string "solltet ihr eure Spiele speichern!$" -MossdeepCity_GameCorner_1F_Text_18E777:: @ 818E777 +MossdeepCity_GameCorner_B1F_Text_HopeToSeeAGoodMatch:: @ 818E777 .string "Ich hoffe, einen guten Kampf zu sehen!$" UnknownString_818E793: @ 818E793 .string "{STR_VAR_1}$" -MossdeepCity_GameCorner_B1F_Text_18E796:: @ 818E796 +MossdeepCity_GameCorner_B1F_Text_MatchEndedUpDraw:: @ 818E796 .string "Der Kampf endet unentschieden.$" -MossdeepCity_GameCorner_1F_Text_18E7B1:: @ 818E7B1 +MossdeepCity_GameCorner_B1F_Text_BattleTie:: @ 818E7B1 .string "So, also ist es ein Unentschieden.\p" .string "Ein brillanter Kampf, in dem niemand\n" .string "auch nur einen Schritt ausgewichen ist.$" @@ -47,7 +47,7 @@ MossdeepCity_GameCorner_1F_Text_18E7B1:: @ 818E7B1 UnknownString_818E80B: @ 818E80B .string "{STR_VAR_1}$" -MossdeepCity_GameCorner_1F_Text_18E80E:: @ 818E80E +MossdeepCity_GameCorner_B1F_Text_BattleWon:: @ 818E80E .string "Das war absolute Spitzenklasse!\p" .string "Ich habe mich wieder erkannt - mich in\n" .string "meinen jungen Jahren!$" @@ -55,7 +55,7 @@ MossdeepCity_GameCorner_1F_Text_18E80E:: @ 818E80E UnknownString_818E856: @ 818E856 .string "{STR_VAR_1}$" -MossdeepCity_GameCorner_1F_Text_18E859:: @ 818E859 +MossdeepCity_GameCorner_B1F_Text_BattleLost:: @ 818E859 .string "Ach, wie bedauerlich für dich!\p" .string "Aber es war ein guter Kampf.\n" .string "Ich hoffe, das nächste Mal gewinnst du.$" diff --git a/data-de/maps/MossdeepCity_Gym/text.inc b/data-de/maps/MossdeepCity_Gym/text.inc index 5ed0f5ac8..04cd1a022 100644 --- a/data-de/maps/MossdeepCity_Gym/text.inc +++ b/data-de/maps/MossdeepCity_Gym/text.inc @@ -1,4 +1,4 @@ -MossdeepCity_Gym_Text_18C7E3:: @ 818C7E3 +MossdeepCity_Gym_Text_GymGuideAdvice:: @ 818C7E3 .string "Na, wie sieht es aus, auf dem Weg zum\n" .string "CHAMP, {PLAYER}?\p" .string "Die ARENALEITER hier setzen PSYCHO-\n" @@ -12,36 +12,36 @@ MossdeepCity_Gym_Text_18C7E3:: @ 818C7E3 .string "beweisen, wie sehr du mit deinen\l" .string "POKéMON verbunden bist! Und nun los!$" -MossdeepCity_Gym_Text_18C938:: @ 818C938 +MossdeepCity_Gym_Text_GymGuidePostVictory:: @ 818C938 .string "Wow, du bist erstaunlich!\n" .string "Du bist ein großartiger TRAINER!$" -MossdeepCity_Gym_Text_18C96A:: @ 818C96A +MossdeepCity_Gym_Text_PrestonIntro:: @ 818C96A .string "Kämpfe hängen von der Stärke deines\n" .string "Geistes ab! Die mit schwachem Geist\l" .string "werden niemals gewinnen.$" -MossdeepCity_Gym_Text_18C9BA:: @ 818C9BA +MossdeepCity_Gym_Text_PrestonDefeat:: @ 818C9BA .string "Ich habe verloren! Ich muss meinen\n" .string "Geist stärken!$" -MossdeepCity_Gym_Text_18C9E1:: @ 818C9E1 +MossdeepCity_Gym_Text_PrestonPostBattle:: @ 818C9E1 .string "Eine nichtssagende Niederlage.\n" .string "Das war doch nur eine Warnung an dich.$" -MossdeepCity_Gym_Text_18CA10:: @ 818CA10 +MossdeepCity_Gym_Text_VirgilIntro:: @ 818CA10 .string "Zeig mir, ob du Talent hast.$" -MossdeepCity_Gym_Text_18CA28:: @ 818CA28 +MossdeepCity_Gym_Text_VirgilDefeat:: @ 818CA28 .string "Du besitzt offensichtlich Talent.$" -MossdeepCity_Gym_Text_18CA48:: @ 818CA48 +MossdeepCity_Gym_Text_VirgilPostBattle:: @ 818CA48 .string "Wenn es überhaupt Wunderkinder gibt, \n" .string "dann sind es unsere ARENALEITER.\p" .string "Aber du scheinst doch talentierter\n" .string "als sie zu sein...$" -MossdeepCity_Gym_Text_18CAC0:: @ 818CAC0 +MossdeepCity_Gym_Text_FritzIntro:: @ 818CAC0 .string "Hihihihi... Achtung! Ich lasse meinen\n" .string "POKéBALL durch Telekinese schweben!\p" .string "Wuhuuuuuuuhuiii!\n" @@ -49,10 +49,10 @@ MossdeepCity_Gym_Text_18CAC0:: @ 818CAC0 .string "Äh, manchmal fehlt es mir etwas an\n" .string "Balance...$" -MossdeepCity_Gym_Text_18CB46:: @ 818CB46 +MossdeepCity_Gym_Text_FritzDefeat:: @ 818CB46 .string "Meine POKéMON kämpften nicht synchron!$" -MossdeepCity_Gym_Text_18CB77:: @ 818CB77 +MossdeepCity_Gym_Text_FritzPostBattle:: @ 818CB77 .string "Ein POKéBALL ist doch etwas zu schwer,\n" .string "um ihn schweben zu lassen!\l" .string "Aber ein Staubknäuel...\p" @@ -61,54 +61,54 @@ MossdeepCity_Gym_Text_18CB77:: @ 818CB77 .string "Das ist kein Trick!\n" .string "Da ist kein Luftstrom! Ehrlich!$" -MossdeepCity_Gym_Text_18CC1E:: @ 818CC1E +MossdeepCity_Gym_Text_HannahIntro:: @ 818CC1E .string "Solltest du gegen mich verlieren, darfst\n" .string "du dir das nicht so zu Herzen nehmen.\p" .string "Du bist nicht zu schwach - ich bin nur\n" .string "zu stark für dich!$" -MossdeepCity_Gym_Text_18CC83:: @ 818CC83 +MossdeepCity_Gym_Text_HannahDefeat:: @ 818CC83 .string "Du bist nur zu stark für mich!$" -MossdeepCity_Gym_Text_18CC9B:: @ 818CC9B +MossdeepCity_Gym_Text_HannahPostBattle:: @ 818CC9B .string "Ich lasse mich von dieser Niederlage\n" .string "nicht herunterziehen. Ich werde härter\l" .string "trainieren.\p" .string "Positives Denken - das ist meine\n" .string "Stärke!$" -MossdeepCity_Gym_Text_18CD14:: @ 818CD14 +MossdeepCity_Gym_Text_SamanthaIntro:: @ 818CD14 .string "Ich kann sie sehen...\n" .string "Ich sehe deine Zukunft...\p" .string "Wenn du mich besiegen kannst, sage ich\n" .string "dir deine Zukunft voraus.$" -MossdeepCity_Gym_Text_18CD66:: @ 818CD66 +MossdeepCity_Gym_Text_SamanthaDefeat:: @ 818CD66 .string "Ich ergebe mich!$" -MossdeepCity_Gym_Text_18CD73:: @ 818CD73 +MossdeepCity_Gym_Text_SamanthaPostBattle:: @ 818CD73 .string "Du wirst einen irrsinnigen Kampf gegen\n" .string "unsere ARENALEITER führen...\p" .string "Der Ausgang dieses Kampfes...\n" .string "Meine Lippen sind versiegelt.$" -MossdeepCity_Gym_Text_18CDE0:: @ 818CDE0 +MossdeepCity_Gym_Text_MauraIntro:: @ 818CDE0 .string "Die Straßen, die du gewandert bist...\n" .string "Das, was du erfahren hast...\p" .string "Leg mir alles, was du gelernt hast,\n" .string "zu Füßen.$" -MossdeepCity_Gym_Text_18CE47:: @ 818CE47 +MossdeepCity_Gym_Text_MauraDefeat:: @ 818CE47 .string "Du wandelst auf dem Pfad der Größe!$" -MossdeepCity_Gym_Text_18CE6C:: @ 818CE6C +MossdeepCity_Gym_Text_MauraPostBattle:: @ 818CE6C .string "Eine glänzende Zukunft erwartet die,\n" .string "die fleißig sind.\p" .string "Die, die dem Müßiggang frönen, erwartet\n" .string "am Ende des Weges nur die Verzweiflung.\p" .string "Man erntet das, was man sät.$" -MossdeepCity_Gym_Text_18CF02:: @ 818CF02 +MossdeepCity_Gym_Text_TateAndLizaIntro:: @ 818CF02 .string "BEN: Hähähä... Bist du überrascht?\p" .string "SVENJA: Hihihi... Bist du überrascht?\p" .string "BEN: Dass es hier 2 ARENALEITER gibt?\n" @@ -123,17 +123,17 @@ MossdeepCity_Gym_Text_18CF02:: @ 818CF02 .string "BEN: Diese doppelte Stärke...\n" .string "SVENJA: Kannst du sie besiegen?$" -MossdeepCity_Gym_Text_18D077:: @ 818D077 +MossdeepCity_Gym_Text_TateAndLizaDefeat:: @ 818D077 .string "BEN: Was?!? Unsere Kombination...\n" .string "SVENJA: Wurde auseinander gerissen!\p" .string "BEN: So sieht's aus. Du hast gewonnen.\n" .string "SVENJA: Daher überreichen wir dir dies.$" -MossdeepCity_Gym_Text_18D0F9:: @ 818D0F9 +MossdeepCity_Gym_Text_ReceivedMindBadge:: @ 818D0F9 .string "{PLAYER} erhält den MENTALORDEN von\n" .string "SVENJA und BEN.$" -MossdeepCity_Gym_Text_18D128:: @ 818D128 +MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis:: @ 818D128 .string "BEN: Der MENTALORDEN erhöht den SP.\n" .string "ANG. und die SP. VER. von POKéMON.\p" .string "SVENJA: Und du kannst damit die VM\n" @@ -141,7 +141,7 @@ MossdeepCity_Gym_Text_18D128:: @ 818D128 .string "einsetzen.\p" .string "BEN: Dies ist ebenfalls für dich.$" -MossdeepCity_Gym_Text_18D1CF:: @ 818D1CF +MossdeepCity_Gym_Text_ExplainCalmMind:: @ 818D1CF .string "BEN: TM04 enthält...\n" .string "SVENJA: GEDANKENGUT!\p" .string "BEN: Dies erhöht den SP. ANG. und...\n" @@ -149,7 +149,7 @@ MossdeepCity_Gym_Text_18D1CF:: @ 818D1CF .string "BEN: Eine Attacke, die perfekt...\n" .string "SVENJA: Für PSYCHO-POKéMON ist!$" -MossdeepCity_Gym_Text_18D273:: @ 818D273 +MossdeepCity_Gym_Text_TateAndLizaPostBattle:: @ 818D273 .string "BEN: Es scheint, als sei das Band\n" .string "zwischen dir und deinen POKéMON viel\l" .string "stärker als zwischen uns Zwillingen.\p" @@ -157,7 +157,7 @@ MossdeepCity_Gym_Text_18D273:: @ 818D273 .string "werden! Wir haben gegen dich gekämpft,\l" .string "daher können wir das vorhersagen.$" -MossdeepCity_Gym_Text_18D324:: @ 818D324 +MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons:: @ 818D324 .string "BEN: Hähähä... Bist du überrascht?\p" .string "SVENJA: Dass es hier 2 ARENALEITER\n" .string "gibt?\p" @@ -168,10 +168,10 @@ MossdeepCity_Gym_Text_18D324:: @ 818D324 .string "willst, dann musst du mehr POKéMON\l" .string "haben.$" -MossdeepCity_Gym_Text_18D40A:: @ 818D40A +MossdeepCity_Gym_Text_GymStatue:: @ 818D40A .string "POKéMON ARENA von MOOSBACH CITY$" -MossdeepCity_Gym_Text_18D424:: @ 818D424 +MossdeepCity_Gym_Text_GymStatueCertified:: @ 818D424 .string "POKéMON ARENA von MOOSBACH CITY\p" .string "SVENJA UND BENS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/MossdeepCity_House1/text.inc b/data-de/maps/MossdeepCity_House1/text.inc index bb6520f6f..9c7a7a0e1 100644 --- a/data-de/maps/MossdeepCity_House1/text.inc +++ b/data-de/maps/MossdeepCity_House1/text.inc @@ -1,18 +1,18 @@ -MossdeepCity_House1_Text_18D465:: @ 818D465 +MossdeepCity_House1_Text_HmmYourPokemon:: @ 818D465 .string "Hmm!\n" .string "Dein {STR_VAR_1}...$" -MossdeepCity_House1_Text_18D475:: @ 818D475 +MossdeepCity_House1_Text_ItLikesXPokeblocks:: @ 818D475 .string "Es mag {STR_VAR_1},\n" .string "nicht wahr?\p" .string "Nein, ich bin mir sicher. Es mag mit\n" .string "Sicherheit {STR_VAR_1}!$" -MossdeepCity_House1_Text_18D4C0:: @ 818D4C0 +MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks:: @ 818D4C0 .string "Es scheint {POKEBLOCK}\n" .string "weder zu lieben noch abzulehnen.$" -MossdeepCity_House1_Text_18D4F1:: @ 818D4F1 +MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes:: @ 818D4F1 .string "Mein Mann weiß auf den ersten Blick,\n" .string "welche Art von {POKEBLOCK}\l" .string "ein POKéMON mag und welche nicht.$" diff --git a/data-de/maps/MossdeepCity_House2/text.inc b/data-de/maps/MossdeepCity_House2/text.inc index 2a3774ad7..7a098b094 100644 --- a/data-de/maps/MossdeepCity_House2/text.inc +++ b/data-de/maps/MossdeepCity_House2/text.inc @@ -1,15 +1,15 @@ -MossdeepCity_House2_Text_18D536:: @ 818D536 +MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree:: @ 818D536 .string "Meine kleine Schwester tauscht immer\n" .string "BRIEFE mit ihrem Freund in BAUMHAUSEN\l" .string "CITY aus.\p" .string "Ich beneide sie kein bisschen darum.$" -MossdeepCity_House2_Text_18D596:: @ 818D596 +MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth:: @ 818D596 .string "Auch wenn ich meinen Freund in\n" .string "BAUMHAUSEN CITY nicht sehen kann...\l" .string "Mein POKéMON bringt uns unsere BRIEFE.\p" .string "Ich bin nicht einsam, auch wenn wir\n" .string "getrennt sind.$" -MossdeepCity_House2_Text_18D61E:: @ 818D61E +MossdeepCity_House2_Text_Wingull:: @ 818D61E .string "WINGULL: Pihyoh!$" diff --git a/data-de/maps/MossdeepCity_House3/text.inc b/data-de/maps/MossdeepCity_House3/text.inc index c4dc6f0d3..b1f2145e9 100644 --- a/data-de/maps/MossdeepCity_House3/text.inc +++ b/data-de/maps/MossdeepCity_House3/text.inc @@ -1,4 +1,4 @@ -MossdeepCity_House3_Text_18D909:: @ 818D909 +MossdeepCity_House3_Text_YouWantSuperRod:: @ 818D909 .string "Hey, du da! TRAINER!\n" .string "Eine SUPERANGEL ist wirklich super!\p" .string "Man kann sagen, was man will, aber mit\n" @@ -7,18 +7,18 @@ MossdeepCity_House3_Text_18D909:: @ 818D909 .string "Na? Du würdest doch zu gerne auch so\n" .string "eine Angel haben, oder?$" -MossdeepCity_House3_Text_18D9A9:: @ 818D9A9 +MossdeepCity_House3_Text_SuperRodIsSuper:: @ 818D9A9 .string "Sicher, sicher!\n" .string "Schließlich ist eine SUPERANGEL super!$" -MossdeepCity_House3_Text_18D9E3:: @ 818D9E3 +MossdeepCity_House3_Text_TryDroppingRodInWater:: @ 818D9E3 .string "Stehst du am Wasser, dann wirf die\n" .string "ANGEL aus und schau, was anbeißt!$" -MossdeepCity_House3_Text_18DA26:: @ 818DA26 +MossdeepCity_House3_Text_DontYouLikeToFish:: @ 818DA26 .string "Was???\n" .string "Liebst du das Angeln nicht?$" -MossdeepCity_House3_Text_18DA44:: @ 818DA44 +MossdeepCity_House3_Text_GoAfterSeafloorPokemon:: @ 818DA44 .string "Mit deiner SUPERANGEL kannst du die\n" .string "POKéMON am Meeresboden fangen.$" diff --git a/data-de/maps/MossdeepCity_House4/text.inc b/data-de/maps/MossdeepCity_House4/text.inc index 0738d9563..c7ba50dcf 100644 --- a/data-de/maps/MossdeepCity_House4/text.inc +++ b/data-de/maps/MossdeepCity_House4/text.inc @@ -1,20 +1,20 @@ -MossdeepCity_House4_Text_18E0E3:: @ 818E0E3 +MossdeepCity_House4_Text_BrotherLikesToFindBases:: @ 818E0E3 .string "Mein kleiner Bruder liebt es, die GEHEIM-\n" .string "BASEN der anderen zu finden.$" -MossdeepCity_House4_Text_18E125:: @ 818E125 +MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle:: @ 818E125 .string "Mein kleiner Bruder sagt, er liebt es, die\n" .string "GEHEIMBASEN der anderen zu finden und\l" .string "Kämpfe mit POKéMON auszutragen.$" -MossdeepCity_House4_Text_18E17E:: @ 818E17E +MossdeepCity_House4_Text_YouMadeSecretBaseNearX:: @ 818E17E .string "Hast du dir eine GEHEIMBASIS in\n" .string "{STR_VAR_1} eingerichtet?$" -MossdeepCity_House4_Text_18E1A7:: @ 818E1A7 +MossdeepCity_House4_Text_MakeSecretBase:: @ 818E1A7 .string "Solltest du dir irgendwo eine GEHEIM-\n" .string "BASIS einrichten, werde ich sie sicher\l" .string "finden.$" -MossdeepCity_House4_Text_18E1E1:: @ 818E1E1 +MossdeepCity_House4_Text_Delcatty:: @ 818E1E1 .string "ENEKORO: Miyaan?$" diff --git a/data-de/maps/MossdeepCity_Mart/text.inc b/data-de/maps/MossdeepCity_Mart/text.inc index 7f1761efc..0d325a438 100644 --- a/data-de/maps/MossdeepCity_Mart/text.inc +++ b/data-de/maps/MossdeepCity_Mart/text.inc @@ -1,17 +1,17 @@ -MossdeepCity_Mart_Text_18D758:: @ 818D758 +MossdeepCity_Mart_Text_ReviveIsFantastic:: @ 818D758 .string "BELEBER ist einfach fantastisch!\p" .string "Gib es einem besiegten POKéMON und\n" .string "es ist wieder fit.\p" .string "Aber Vorsicht! BELEBER füllt nicht die\n" .string "verbrauchten AP neu auf!$" -MossdeepCity_Mart_Text_18D7E7:: @ 818D7E7 +MossdeepCity_Mart_Text_MaxRepelLastsLongest:: @ 818D7E7 .string "TOP-SCHUTZ hält alle schwachen POKéMON\n" .string "auf Distanz.\p" .string "Von allen SCHUTZ-Sprays hält dieses am\n" .string "längsten an.$" -MossdeepCity_Mart_Text_18D841:: @ 818D841 +MossdeepCity_Mart_Text_NetAndDiveBallsRare:: @ 818D841 .string "Der NETZ- und der TAUCHBALL sind\n" .string "seltene POKéBÄLLE, die in\l" .string "MOOSBACH CITY hergestellt werden.\p" diff --git a/data-de/maps/MossdeepCity_PokemonCenter_1F/text.inc b/data-de/maps/MossdeepCity_PokemonCenter_1F/text.inc index 397b90178..1db6ca256 100644 --- a/data-de/maps/MossdeepCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/MossdeepCity_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -MossdeepCity_PokemonCenter_1F_Text_18D62F:: @ 818D62F +MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable:: @ 818D62F .string "Die ARENALEITER dieses Ortes sind ein\n" .string "ausgezeichnetes Team.\p" .string "Die Kombination ihrer Attacken ist\n" .string "einfach exzellent und... wow!$" -MossdeepCity_PokemonCenter_1F_Text_18D69A:: @ 818D69A +MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves:: @ 818D69A .string "Abhängig von den speziellen Fähigkeiten\n" .string "eines POKéMON, werden einige Attacken\p" .string "in ihrer Wirkung verändert oder\n" diff --git a/data-de/maps/MossdeepCity_SpaceCenter_1F/text.inc b/data-de/maps/MossdeepCity_SpaceCenter_1F/text.inc index 4c5703222..0dd47f2e2 100644 --- a/data-de/maps/MossdeepCity_SpaceCenter_1F/text.inc +++ b/data-de/maps/MossdeepCity_SpaceCenter_1F/text.inc @@ -1,11 +1,11 @@ -MossdeepCity_SpaceCenter_1F_Text_18E1F3:: @ 818E1F3 +MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent:: @ 818E1F3 .string "Die Rakete wird in Kürze starten.$" -MossdeepCity_SpaceCenter_1F_Text_18E214:: @ 818E214 +MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber:: @ 818E214 .string "Die Rakete ist sicher gestartet!\n" .string "Das war der erfolgreiche Start Nr. {STR_VAR_1}!$" -MossdeepCity_SpaceCenter_1F_Text_18E251:: @ 818E251 +MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection:: @ 818E251 .string "Jeder Raketenstart verlangt\n" .string "sorgfältige Vorbereitungen. Die Fehler-\l" .string "quote darf nicht einmal 1% betragen.\p" @@ -14,22 +14,22 @@ MossdeepCity_SpaceCenter_1F_Text_18E251:: @ 818E251 .string "Trotzdem versuchen wir es immer wieder.\n" .string "Warum? Weil es ein ewiger Traum ist.$" -MossdeepCity_SpaceCenter_1F_Text_18E335:: @ 818E335 +MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt:: @ 818E335 .string "Ich schlenderte am Strand entlang, da\n" .string "habe ich dieses hier gefunden.\p" .string "Ich kann damit nichts anfangen, daher\n" .string "kannst du es haben.$" -MossdeepCity_SpaceCenter_1F_Text_18E39B:: @ 818E39B +MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers:: @ 818E39B .string "Die HOENN-Region ist bekannt für die\n" .string "Häufigkeit der Meteoriteneinschläge.$" -MossdeepCity_SpaceCenter_1F_Text_18E3E5:: @ 818E3E5 +MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace:: @ 818E3E5 .string "Einige Menschen nehmen an, dass die\n" .string "POKéMON aus dem Weltall kommen. Ob das\l" .string "stimmt?$" -MossdeepCity_SpaceCenter_1F_Text_18E427:: @ 818E427 +MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind:: @ 818E427 .string "Ein gigantischer Brocken Metall durch-\n" .string "bricht den Himmel und fliegt ins All...\p" .string "Das übersteigt jede Vorstellungskraft.$" diff --git a/data-de/maps/MossdeepCity_SpaceCenter_2F/text.inc b/data-de/maps/MossdeepCity_SpaceCenter_2F/text.inc index e6b42eef1..eea087c67 100644 --- a/data-de/maps/MossdeepCity_SpaceCenter_2F/text.inc +++ b/data-de/maps/MossdeepCity_SpaceCenter_2F/text.inc @@ -1,15 +1,15 @@ -MossdeepCity_SpaceCenter_2F_Text_18E483:: @ 818E483 +MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets:: @ 818E483 .string "MOOSBACH CITY hat meistens sonniges\n" .string "Wetter und einen beständigen Wind.\p" .string "Ein idealer Ort, um Raketen ins All zu\n" .string "schicken.$" -MossdeepCity_SpaceCenter_2F_Text_18E4EE:: @ 818E4EE +MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut:: @ 818E4EE .string "Wenn ich jünger wäre, würde ich mit\n" .string "Sicherheit Astronaut...\p" .string "Nein... Dazu ist es nie zu spät!\n" .string "Ich werde es versuchen!!!$" -MossdeepCity_SpaceCenter_2F_Text_18E564:: @ 818E564 +MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace:: @ 818E564 .string "Ich wünschte, auch normale Leute\n" .string "könnten eines Tages ins All reisen...$" diff --git a/data-de/maps/MossdeepCity_StevensHouse/text.inc b/data-de/maps/MossdeepCity_StevensHouse/text.inc index abf80ddda..779e36d07 100644 --- a/data-de/maps/MossdeepCity_StevensHouse/text.inc +++ b/data-de/maps/MossdeepCity_StevensHouse/text.inc @@ -1,4 +1,4 @@ -MossdeepCity_StevensHouse_Text_18DA77:: @ 818DA77 +MossdeepCity_StevensHouse_Text_YouveEarnedHMDive:: @ 818DA77 .string "TROY: {PLAYER}{KUN}?\p" .string "Ja, das ist mein Zuhause. Peinlich, wie\n" .string "kahl die Räume hier sind.\p" @@ -6,7 +6,7 @@ MossdeepCity_StevensHouse_Text_18DA77:: @ 818DA77 .string "Sie enthält TAUCHER. Ich habe das\n" .string "meinen POKéMON schon beigebracht.$" -MossdeepCity_StevensHouse_Text_18DB22:: @ 818DB22 +MossdeepCity_StevensHouse_Text_ExplainDive:: @ 818DB22 .string "TROY: Wenn du SURFER einsetzt und\n" .string "über das Meer gleitest, wirst du dunkle\l" .string "Stellen im Wasser bemerken können.\p" @@ -17,7 +17,7 @@ MossdeepCity_StevensHouse_Text_18DB22:: @ 818DB22 .string "An manchen Stellen ist das Auftauchen\n" .string "allerdings nicht möglich.$" -MossdeepCity_StevensHouse_Text_18DC25:: @ 818DC25 +MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis:: @ 818DC25 .string "TROY: Zwischen MOOSBACH CITY und\n" .string "XENEROVILLE gibt es eine Unterwasser-\l" .string "höhle.\p" @@ -28,23 +28,23 @@ MossdeepCity_StevensHouse_Text_18DC25:: @ 818DC25 .string "Steine zu finden... Ich sollte auch\l" .string "einmal TAUCHER einsetzen...$" -MossdeepCity_StevensHouse_Text_18DD12:: @ 818DD12 +MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum:: @ 818DD12 .string "{PLAYER} überprüft den POKéBALL.\p" .string "Er enthält das POKéMON\n" .string "TANHEL.\p" .string "Den POKéBALL nehmen?$" -MossdeepCity_StevensHouse_Text_18DD61:: @ 818DD61 +MossdeepCity_StevensHouse_Text_ObtainedBeldum:: @ 818DD61 .string "{PLAYER} hat TANHEL erhalten.$" -MossdeepCity_StevensHouse_Text_18DD77:: @ 818DD77 +MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon:: @ 818DD77 .string "Es ist nicht genug Platz vorhanden für\n" .string "ein weiteres POKéMON.$" -MossdeepCity_StevensHouse_Text_18DD9E:: @ 818DD9E +MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas:: @ 818DD9E .string "{PLAYER} legt den POKéBALL zurück.$" -MossdeepCity_StevensHouse_Text_18DDC2:: @ 818DDC2 +MossdeepCity_StevensHouse_Text_LetterFromSteven:: @ 818DDC2 .string "Das ist ein Brief.\p" .string "\n" .string "... ... ... ... ... ...\p" @@ -64,7 +64,7 @@ MossdeepCity_StevensHouse_Text_18DDC2:: @ 818DDC2 .string "Mögen wir uns eines Tages wieder sehen.\p" .string "TROY TRUMM$" -MossdeepCity_StevensHouse_Text_18DF1A:: @ 818DF1A +MossdeepCity_StevensHouse_Text_LetterFromStevenWithDive:: @ 818DF1A .string "Das ist ein Brief.\p" .string "\n" .string "... ... ... ... ... ...\p" @@ -86,6 +86,6 @@ MossdeepCity_StevensHouse_Text_18DF1A:: @ 818DF1A .string "Mögen wir uns eines Tages wieder sehen.\p" .string "TROY TRUMM$" -MossdeepCity_StevensHouse_Text_18E0A3:: @ 818E0A3 +MossdeepCity_StevensHouse_Text_CollectionOfRareRocks:: @ 818E0A3 .string "Eine Kollektion seltener Steine,\n" .string "zusammengetragen von TROY.$" diff --git a/data-de/maps/OldaleTown/text.inc b/data-de/maps/OldaleTown/text.inc index 39d3f8142..df7c0bb14 100644 --- a/data-de/maps/OldaleTown/text.inc +++ b/data-de/maps/OldaleTown/text.inc @@ -1,13 +1,13 @@ -OldaleTown_Text_16AEC0:: @ 816AEC0 +OldaleTown_Text_SavingMyProgress:: @ 816AEC0 .string "Ich möchte eine Pause einlegen, daher\n" .string "speichere ich mein Spiel.$" -OldaleTown_Text_16AEF2:: @ 816AEF2 +OldaleTown_Text_IWorkAtPokemonMart:: @ 816AEF2 .string "Hi!\n" .string "Ich arbeite in einem PKMN-SUPERMARKT.\p" .string "Kommst du bitte einmal mit mir?$" -OldaleTown_Text_16AF2F:: @ 816AF2F +OldaleTown_Text_ThisIsAPokemonMart:: @ 816AF2F .string "Dies ist ein PKMN-SUPERMARKT.\n" .string "Er ist an dem blauen Dach erkennbar.\p" .string "Wir verkaufen eine Menge nützlicher\n" @@ -16,13 +16,13 @@ OldaleTown_Text_16AF2F:: @ 816AF2F .string "Hier, dies ist ein Item, quasi als Werbe-\n" .string "geschenk für dich.$" -OldaleTown_Text_16AFE1:: @ 816AFE1 +OldaleTown_Text_PotionExplanation:: @ 816AFE1 .string "Ein TRANK kann zu jeder Zeit eingesetzt\n" .string "werden, daher ist er in manchen\l" .string "Situationen wertvoller als ein POKéMON-\l" .string "CENTER.$" -OldaleTown_Text_16B045:: @ 816B045 +OldaleTown_Text_WaitDontComeInHere:: @ 816B045 .string "Aaaah! Warte!\n" .string "Bitte nicht dort entlang laufen!\p" .string "Ich habe dort die Fußspuren eines\n" @@ -30,28 +30,28 @@ OldaleTown_Text_16B045:: @ 816B045 .string "Warte bis ich fertig bin, sie\n" .string "abzuzeichnen, okay?$" -OldaleTown_Text_16B0CC:: @ 816B0CC +OldaleTown_Text_DiscoveredFootprints:: @ 816B0CC .string "Ich habe dort die Fußspuren eines\n" .string "seltenen POKéMON gesehen!\p" .string "Warte, bis ich fertig bin, sie\n" .string "abzuzeichnen, okay?$" -OldaleTown_Text_16B12A:: @ 816B12A +OldaleTown_Text_FinishedSketchingFootprints:: @ 816B12A .string "Ich habe die Fußspuren eines seltenen\n" .string "POKéMON abgezeichnet.\p" .string "Aber hinterher habe ich festgestellt,\n" .string "dass es meine eigenen Spuren waren...$" -OldaleTown_Text_16B196:: @ 816B196 +OldaleTown_Text_MayLetsGoBack:: @ 816B196 .string "MAIKE: {PLAYER}{KUN}!\n" .string "Hier entlang!\l" .string "Lass uns nach Hause gehen!$" -OldaleTown_Text_16B1BE:: @ 816B1BE +OldaleTown_Text_BrendanLetsGoBack:: @ 816B1BE .string "BRIX: Ich gehe nun in das LABOR\n" .string "meines Vaters.\l" .string "{PLAYER}, du solltest auch zurücklaufen.$" -OldaleTown_Text_16B20E:: @ 816B20E +OldaleTown_Text_TownSign:: @ 816B20E .string "ROSALTSTADT\n" .string "“Wo Dinge selten ihren Anfang nehmen.”$" diff --git a/data-de/maps/OldaleTown_House1/text.inc b/data-de/maps/OldaleTown_House1/text.inc index d12e86fb7..51ae52e16 100644 --- a/data-de/maps/OldaleTown_House1/text.inc +++ b/data-de/maps/OldaleTown_House1/text.inc @@ -1,4 +1,4 @@ -OldaleTown_House1_Text_17476D:: @ 817476D +OldaleTown_House1_Text_LeftPokemonGoesOutFirst:: @ 817476D .string "Das POKéMON auf der linken Seite der\n" .string "Liste tritt im Kampf als Erstes an.\p" .string "Hast du mehrere POKéMON in deinem Team,\n" diff --git a/data-de/maps/OldaleTown_House2/text.inc b/data-de/maps/OldaleTown_House2/text.inc index c14c3803a..96f618f06 100644 --- a/data-de/maps/OldaleTown_House2/text.inc +++ b/data-de/maps/OldaleTown_House2/text.inc @@ -1,9 +1,9 @@ -OldaleTown_House2_Text_174838:: @ 8174838 +OldaleTown_House2_Text_PokemonLevelUp:: @ 8174838 .string "Während eines Kampfes können POKéMON\n" .string "manchmal einen Level dazugewinnen und\l" .string "stärker werden.$" -OldaleTown_House2_Text_17487B:: @ 817487B +OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon:: @ 817487B .string "Sobald deine Team-POKéMON stärker\n" .string "geworden sind, kannst du auch andere\l" .string "Orte bereisen.$" diff --git a/data-de/maps/OldaleTown_Mart/text.inc b/data-de/maps/OldaleTown_Mart/text.inc index 19e1e600f..2637fde7e 100644 --- a/data-de/maps/OldaleTown_Mart/text.inc +++ b/data-de/maps/OldaleTown_Mart/text.inc @@ -1,13 +1,13 @@ -OldaleTown_Mart_Text_174A8A:: @ 8174A8A +OldaleTown_Mart_Text_PokeBallsAreSoldOut:: @ 8174A8A .string "Der Verkäufer sagt, es sei alles ausver-\n" .string "kauft. Jetzt stehe ich ohne\l" .string "POKéBÄLLE da.$" -OldaleTown_Mart_Text_174ACB:: @ 8174ACB +OldaleTown_Mart_Text_ImGoingToBuyPokeBalls:: @ 8174ACB .string "Ich will mir viele POKéBÄLLE kaufen und\n" .string "damit genauso viele POKéMON fangen!$" -OldaleTown_Mart_Text_174B10:: @ 8174B10 +OldaleTown_Mart_Text_RestoreHPWithPotion:: @ 8174B10 .string "Wird ein POKéMON verletzt und verliert\n" .string "alle KP, so ist es kampfunfähig.\p" .string "Um das zu vermeiden, solltest du die KP\n" diff --git a/data-de/maps/OldaleTown_PokemonCenter_1F/text.inc b/data-de/maps/OldaleTown_PokemonCenter_1F/text.inc index 4396e8638..b35f89357 100644 --- a/data-de/maps/OldaleTown_PokemonCenter_1F/text.inc +++ b/data-de/maps/OldaleTown_PokemonCenter_1F/text.inc @@ -1,23 +1,23 @@ -OldaleTown_PokemonCenter_1F_Text_1748D1:: @ 81748D1 +OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC:: @ 81748D1 .string "Der PC dort in der Ecke ist für alle\n" .string "POKéMON-TRAINER.\p" .string "Das heißt, dass auch du ihn benutzen\n" .string "darfst.$" -OldaleTown_PokemonCenter_1F_Text_174945:: @ 8174945 +OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat:: @ 8174945 .string "POKéMON-CENTER sind eine großartige\n" .string "Einrichtung!\p" .string "Du kannst ihren Service sooft du willst\n" .string "in Anspruch nehmen - kostenlos! Daher\l" .string "kannst du unbeschwert umherreisen.$" -OldaleTown_PokemonCenter_1F_Text_1749C0:: @ 81749C0 +OldaleTown_PokemonCenter_1F_Text_CableClubNotAvailable:: @ 81749C0 .string "Der POKéMON KABEL-CLUB im zweiten\n" .string "Stock wurde erst kürzlich eröffnet.\p" .string "Und sie sind immer noch nicht ganz\n" .string "fertig mit dem Einrichten.$" -OldaleTown_PokemonCenter_1F_Text_174A2E:: @ 8174A2E +OldaleTown_PokemonCenter_1F_Text_TradedInCableClub:: @ 8174A2E .string "Der POKéMON KABEL-CLUB im zweiten\n" .string "Stock wurde erst kürzlich eröffnet.\p" .string "Ich habe schon POKéMON getauscht!$" diff --git a/data-de/maps/PacifidlogTown/text.inc b/data-de/maps/PacifidlogTown/text.inc index f9cf80a48..8128c8a0f 100644 --- a/data-de/maps/PacifidlogTown/text.inc +++ b/data-de/maps/PacifidlogTown/text.inc @@ -1,20 +1,20 @@ -PacifidlogTown_Text_16CFC5:: @ 816CFC5 +PacifidlogTown_Text_FastRunningCurrent:: @ 816CFC5 .string "Im Meer zwischen FLOSSBRUNN und\n" .string "GRAPHITPORT CITY befinden sich\l" .string "reißende Strömungen.\p" .string "Wenn du dort SURFER einsetzt, kann es\n" .string "sein, dass du fortgetrieben wirst.$" -PacifidlogTown_Text_16D04A:: @ 816D04A +PacifidlogTown_Text_NeatHousesOnWater:: @ 816D04A .string "Schau mal. Ist das nicht hübsch?\n" .string "Die Häuser stehen auf dem Wasser.\p" .string "Ich wurde hier geboren.$" -PacifidlogTown_Text_16D08A:: @ 816D08A +PacifidlogTown_Text_FishAndDiveLifestyle:: @ 816D08A .string "Das Volk von FLOSSBRUNN fischt und\n" .string "taucht. Das gehört zu ihrem Leben.$" -PacifidlogTown_Text_16D0CE:: @ 816D0CE +PacifidlogTown_Text_TownSign:: @ 816D0CE .string "FLOSSBRUNN\p" .string "“Wo die Morgensonne ein Lächeln auf\n" .string "das Meer zaubert.”$" diff --git a/data-de/maps/PacifidlogTown_House1/text.inc b/data-de/maps/PacifidlogTown_House1/text.inc index deed4a0f6..3b928b607 100644 --- a/data-de/maps/PacifidlogTown_House1/text.inc +++ b/data-de/maps/PacifidlogTown_House1/text.inc @@ -1,4 +1,4 @@ -PacifidlogTown_House1_Text_178F9F:: @ 8178F9F +PacifidlogTown_House1_Text_RegiStory:: @ 8178F9F .string "In der HOENN-Region gibt es drei\n" .string "POKéMON, die die Stärke von Gestein,\l" .string "Eis und Stahl repräsentieren.\p" @@ -7,7 +7,7 @@ PacifidlogTown_House1_Text_178F9F:: @ 8178F9F .string "Diese Geschichte wurde mir als Kind\n" .string "erzählt.$" -PacifidlogTown_House1_Text_17906A:: @ 817906A +PacifidlogTown_House1_Text_SixDotsOpenThreeDoors:: @ 817906A .string "“Sechs Punkte öffnen drei Türen.”\p" .string "Mein Großvater sagte das immer, aber\n" .string "ich habe keine Ahnung, was es bedeutet.$" diff --git a/data-de/maps/PacifidlogTown_House2/text.inc b/data-de/maps/PacifidlogTown_House2/text.inc index d5d93ae24..d947e9efc 100644 --- a/data-de/maps/PacifidlogTown_House2/text.inc +++ b/data-de/maps/PacifidlogTown_House2/text.inc @@ -1,4 +1,4 @@ -PacifidlogTown_House2_Text_1790C1:: @ 81790C1 +PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation:: @ 81790C1 .string "Ähhäm!\p" .string "Ich bin die wichtigste Person des\n" .string "POKéMON-FANCLUBS, ich bin der kleine\l" @@ -6,49 +6,49 @@ PacifidlogTown_House2_Text_1790C1:: @ 81790C1 .string "Ich genieße hier die Ferien mit meinen\n" .string "POKéMON. Ja, das tue ich.$" -PacifidlogTown_House2_Text_179155:: @ 8179155 +PacifidlogTown_House2_Text_AhYourPokemon:: @ 8179155 .string "Ah!\n" .string "Dein POKéMON...$" -PacifidlogTown_House2_Text_179169:: @ 8179169 +PacifidlogTown_House2_Text_AdoringPokemonTakeThis:: @ 8179169 .string "Es mag dich offensichtlich sehr.\p" .string "Ein derart liebevolles und wunderbares\n" .string "POKéMON verdient eine TM wie diese!$" -PacifidlogTown_House2_Text_1791CA:: @ 81791CA +PacifidlogTown_House2_Text_PutInSomeMoreEffort:: @ 81791CA .string "Hmm...\n" .string "Nicht schlecht... Aber auch nicht gut.\p" .string "Du musst dich als TRAINER mehr\n" .string "anstrengen.$" -PacifidlogTown_House2_Text_17922D:: @ 817922D +PacifidlogTown_House2_Text_ViciousPokemonTakeThis:: @ 817922D .string "Es hat einen bösartigen Blick.\p" .string "Ein Furcht erregendes POKéMON wie\n" .string "dieses verdient eine TM wie diese!$" -PacifidlogTown_House2_Text_179283:: @ 8179283 +PacifidlogTown_House2_Text_ExplainReturnFrustration:: @ 8179283 .string "Wenn ein POKéMON dich sehr mag, wird die\n" .string "Kraft von RÜCKKEHR verstärkt.\p" .string "Wenn es dich nicht mag, wird die Kraft\n" .string "von FRUSTRATION verstärkt.$" -PacifidlogTown_House2_Text_1792F2:: @ 81792F2 +PacifidlogTown_House2_Text_GetGoodTMInXDays:: @ 81792F2 .string "Oh, ja. In {STR_VAR_1} Tag/en müsste\n" .string "ich eine gute TM bekommen haben.\p" .string "Komm doch dann wieder vorbei.\n" .string "Ich werde dir dann eine TM geben, die\l" .string "wunderbar zu deinem POKéMON passt.$" -PacifidlogTown_House2_Text_17938B:: @ 817938B +PacifidlogTown_House2_Text_Rurii:: @ 817938B .string "AZURILL: Rurii.$" -PacifidlogTown_House2_Text_17939B:: @ 817939B +PacifidlogTown_House2_Text_VeryFriendlyWithTrainer:: @ 817939B .string "Es scheint freundschaftlich mit dem\n" .string "TRAINER umzugehen.$" -PacifidlogTown_House2_Text_1793CC:: @ 81793CC +PacifidlogTown_House2_Text_Rururi:: @ 81793CC .string "AZURILL: Rururi!$" -PacifidlogTown_House2_Text_1793DD:: @ 81793DD +PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch:: @ 81793DD .string "Es scheint den TRAINER nicht\n" .string "sonderlich zu mögen.$" diff --git a/data-de/maps/PacifidlogTown_House3/text.inc b/data-de/maps/PacifidlogTown_House3/text.inc index 2e0e34d9e..e5d7c52a9 100644 --- a/data-de/maps/PacifidlogTown_House3/text.inc +++ b/data-de/maps/PacifidlogTown_House3/text.inc @@ -1,4 +1,4 @@ -PacifidlogTown_House3_Text_17940E:: @ 817940E +PacifidlogTown_House3_Text_WillingToTradeIt:: @ 817940E .string "Hallo, TRAINER. Würdest du POKéMON\n" .string "mit mir tauschen?\p" .string "Da ich in FLOSSBRUNN lebe, kann ich nur\n" @@ -6,21 +6,21 @@ PacifidlogTown_House3_Text_17940E:: @ 817940E .string "{STR_VAR_1}? Hast du das POKéMON?\n" .string "Ich gebe dir mein {STR_VAR_2} dafür.$" -PacifidlogTown_House3_Text_1794C4:: @ 81794C4 +PacifidlogTown_House3_Text_MonIsSoFluffy:: @ 81794C4 .string "Wow!\n" .string "Das {STR_VAR_1} ist so weich!$" -PacifidlogTown_House3_Text_1794DF:: @ 81794DF +PacifidlogTown_House3_Text_ThatsNoMon:: @ 81794DF .string "Das ist kein {STR_VAR_1}.$" -PacifidlogTown_House3_Text_1794ED:: @ 81794ED +PacifidlogTown_House3_Text_ImDisappointed:: @ 81794ED .string "Ich bin ein bisschen enttäuscht.$" -PacifidlogTown_House3_Text_17950A:: @ 817950A +PacifidlogTown_House3_Text_NowWereFriends:: @ 817950A .string "Seit wir POKéMON getauscht haben, sind\n" .string "wir Freunde, nicht wahr?$" -PacifidlogTown_House3_Text_179541:: @ 8179541 +PacifidlogTown_House3_Text_IsThatAPokedex:: @ 8179541 .string "Ist das ein POKéDEX?\p" .string "Hast du schon viele verschiedene\n" .string "POKéMON getroffen?\p" diff --git a/data-de/maps/PacifidlogTown_House4/text.inc b/data-de/maps/PacifidlogTown_House4/text.inc index 6e1dfb1db..60ebf6144 100644 --- a/data-de/maps/PacifidlogTown_House4/text.inc +++ b/data-de/maps/PacifidlogTown_House4/text.inc @@ -1,22 +1,22 @@ -PacifidlogTown_House4_Text_17959B:: @ 817959B +PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon:: @ 817959B .string "Die Menschen sagen, sie hätten ein \n" .string "POKéMON über HOENN FLIEGEN sehen.\p" .string "FLIEGT es die ganze Zeit über herum?\n" .string "Muss es sich nicht ausruhen?$" -PacifidlogTown_House4_Text_17961F:: @ 817961F +PacifidlogTown_House4_Text_SkyPokemon:: @ 817961F .string "Ein Himmels-POKéMON!\n" .string "Ein Himmels-POKéMON!$" -PacifidlogTown_House4_Text_17963D:: @ 817963D +PacifidlogTown_House4_Text_WhereDidYouComeFrom:: @ 817963D .string "Woher kommst du?$" -PacifidlogTown_House4_Text_179656:: @ 8179656 +PacifidlogTown_House4_Text_YesTown:: @ 8179656 .string "Ja?\n" .string "JA-Stadt???\p" .string "Davon habe ich ja noch nie gehört!$" -PacifidlogTown_House4_Text_17968C:: @ 817968C +PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere:: @ 817968C .string "Nein? Das ergibt doch gar keinen Sinn.\n" .string "Du musst doch von irgendwo herkommen!\p" .string "Oh! Warte! Du willst doch nicht etwa be-\n" diff --git a/data-de/maps/PacifidlogTown_House5/text.inc b/data-de/maps/PacifidlogTown_House5/text.inc index eaba254c7..e1a01578a 100644 --- a/data-de/maps/PacifidlogTown_House5/text.inc +++ b/data-de/maps/PacifidlogTown_House5/text.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House5_Text_179718:: @ 8179718 +PacifidlogTown_House5_Text_CantSeeMirageIslandToday:: @ 8179718 .string "Ich kann WUNDEREILAND heute\n" .string "nicht sehen...$" -PacifidlogTown_House5_Text_17973B:: @ 817973B +PacifidlogTown_House5_Text_CanSeeMirageIslandToday:: @ 817973B .string "Oh! Oh! Heute kann ich WUNDEREILAND\n" .string "sehen!$" -PacifidlogTown_House5_Text_179765:: @ 8179765 +PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather:: @ 8179765 .string "WUNDEREILAND...\p" .string "Die Insel ist sichtbar oder nicht\n" .string "sichtbar. Das hängt vom Wetter ab, das\l" diff --git a/data-de/maps/PacifidlogTown_PokemonCenter_1F/text.inc b/data-de/maps/PacifidlogTown_PokemonCenter_1F/text.inc index 648c562fe..116194862 100644 --- a/data-de/maps/PacifidlogTown_PokemonCenter_1F/text.inc +++ b/data-de/maps/PacifidlogTown_PokemonCenter_1F/text.inc @@ -1,13 +1,13 @@ -PacifidlogTown_PokemonCenter_1F_Text_178E47:: @ 8178E47 +PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard:: @ 8178E47 .string "Welche Farbe hat dein TRAINERPASS?\n" .string "Meiner ist kupferrot.$" -PacifidlogTown_PokemonCenter_1F_Text_178E79:: @ 8178E79 +PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola:: @ 8178E79 .string "FLOSSBRUNN schwimmt auf einer\n" .string "Kolonie von CORASONN.\p" .string "Glaubst du mir das?$" -PacifidlogTown_PokemonCenter_1F_Text_178ED9:: @ 8178ED9 +PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats:: @ 8178ED9 .string "Man sagt, die Vorfahren der Menschen in\n" .string "FLOSSBRUNN wurden an Bord von\l" .string "Schiffen geboren, lebten und starben\l" diff --git a/data-de/maps/PetalburgCity/text.inc b/data-de/maps/PetalburgCity/text.inc index 2e8d02124..c35e285e6 100644 --- a/data-de/maps/PetalburgCity/text.inc +++ b/data-de/maps/PetalburgCity/text.inc @@ -1,9 +1,9 @@ -PetalburgCity_Text_16433E:: @ 816433E +PetalburgCity_Text_WhereIsWally:: @ 816433E .string "Wohin ist unser HEIKO nur gegangen?\p" .string "Wir müssen doch bald nach WIESENFLUR\n" .string "aufbrechen...$" -PetalburgCity_Text_16438A:: @ 816438A +PetalburgCity_Text_AreYouRookieTrainer:: @ 816438A .string "He da! Bist du vielleicht...\n" .string "Ein Anfänger unter den TRAINERN?\p" .string "Weißt du, was POKéMON-TRAINER machen,\n" @@ -11,36 +11,36 @@ PetalburgCity_Text_16438A:: @ 816438A .string "Sie sehen sich als Erstes die ARENA\n" .string "im Ort an.$" -PetalburgCity_Text_164426:: @ 8164426 +PetalburgCity_Text_ThisIsPetalburgGym:: @ 8164426 .string "Schau. Das ist die ARENA von\n" .string "BLÜTENBURG CITY.$" -PetalburgCity_Text_164449:: @ 8164449 +PetalburgCity_Text_ThisIsGymSign:: @ 8164449 .string "Das ist das Logo der ARENA. Daran\n" .string "kannst du immer eine ARENA erkennen.$" -PetalburgCity_Text_164490:: @ 8164490 +PetalburgCity_Text_WaterReflection:: @ 8164490 .string "Mein Gesicht spiegelt sich im Wasser...\p" .string "Ein schimmerndes Lächeln der Hoffnung.\p" .string "Oder ist es der Ausdruck düsterer\n" .string "Stille, an der die Angst nagt...\p" .string "Was siehst du in deinem Spiegelbild?$" -PetalburgCity_Text_16453F:: @ 816453F +PetalburgCity_Text_FullPartyExplanation:: @ 816453F .string "Nehmen wir an, du hättest 6 POKéMON.\n" .string "Wenn du jetzt ein weiteres fängst...\p" .string "wird es automatisch in das POKéMON-\n" .string "LAGERUNGS-SYSTEM gesendet.$" -PetalburgCity_Text_1645BB:: @ 81645BB +PetalburgCity_Text_GymSign:: @ 81645BB .string "POKéMON ARENA von BLÜTENBURG CITY\n" .string "LEITER: NORMAN\l" .string "“Ein Mann, der nach Stärke strebt!”$" -PetalburgCity_Text_164602:: @ 8164602 +PetalburgCity_Text_CitySign:: @ 8164602 .string "BLÜTENBURG CITY\n" .string "“Wo Menschen Hand in Hand\l" .string "mit der Natur gehen.”$" -PetalburgCity_Text_164634:: @ 8164634 +PetalburgCity_Text_WallyHouseSign:: @ 8164634 .string "HEIKOS HAUS$" diff --git a/data-de/maps/PetalburgCity_Gym/text.inc b/data-de/maps/PetalburgCity_Gym/text.inc index 1d1ca9db7..3cb8fb2e0 100644 --- a/data-de/maps/PetalburgCity_Gym/text.inc +++ b/data-de/maps/PetalburgCity_Gym/text.inc @@ -1,4 +1,4 @@ -PetalburgCity_Gym_Text_179DF6:: @ 8179DF6 +PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon:: @ 8179DF6 .string "VATER: Hm?\p" .string "Na, wenn das nicht {PLAYER} ist!\n" .string "Dann habt ihr also den Umzug beendet?\p" @@ -11,15 +11,15 @@ PetalburgCity_Gym_Text_179DF6:: @ 8179DF6 .string "Das sind großartige Aussichten!\n" .string "Ich kann es kaum erwarten!$" -PetalburgCity_Gym_Text_179F07:: @ 8179F07 +PetalburgCity_Gym_Text_WallyIdLikeAPokemon:: @ 8179F07 .string "Äh... Ich... Ich hätte so gerne ein\n" .string "POKéMON. Bitte...$" -PetalburgCity_Gym_Text_179F37:: @ 8179F37 +PetalburgCity_Gym_Text_DadOhYoureWallyRight:: @ 8179F37 .string "VATER: Wie? Du... Ach... Gut.\n" .string "Du bist HEIKO, nicht wahr?$" -PetalburgCity_Gym_Text_179F70:: @ 8179F70 +PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon:: @ 8179F70 .string "HEIKO: Ich werde meine Verwandten\n" .string "in WIESENFLUR besuchen.\p" .string "Ich glaube, ich werde mich da doch\n" @@ -28,37 +28,37 @@ PetalburgCity_Gym_Text_179F70:: @ 8179F70 .string "Aber ich habe noch nie eines gefangen.\n" .string "Ich weiß nicht, wie das geht...$" -PetalburgCity_Gym_Text_17A03A:: @ 817A03A +PetalburgCity_Gym_Text_DadHmISee:: @ 817A03A .string "VATER: Oh, ich verstehe...$" -PetalburgCity_Gym_Text_17A04A:: @ 817A04A +PetalburgCity_Gym_Text_DadPlayerGoWithWally:: @ 817A04A .string "VATER: {PLAYER}, hast du das gehört?\p" .string "Hilf doch bitte HEIKO dabei,\n" .string "ein POKéMON zu fangen.$" -PetalburgCity_Gym_Text_17A0A8:: @ 817A0A8 +PetalburgCity_Gym_Text_IllLoanYouMyZigzagoon:: @ 817A0A8 .string "HEIKO, hier, ich leihe dir mein\n" .string "POKéMON.\p" .string "HEIKO hat ein ZIGZACHS erhalten.$" -PetalburgCity_Gym_Text_17A0EB:: @ 817A0EB +PetalburgCity_Gym_Text_WallyThankYouAndDadGivesPokeBall:: @ 817A0EB .string "HEIKO: Oh, wow!!!\n" .string "Ein POKéMON!\p" .string "VATER: Hm. Ich gebe dir auch diesen\n" .string "POKéBALL. Dann leg los!\p" .string "HEIKO erhält einen POKéBALL!$" -PetalburgCity_Gym_Text_17A156:: @ 817A156 +PetalburgCity_Gym_Text_WallyOhWowThankYou:: @ 817A156 .string "HEIKO: Oh, wow!!!\n" .string "Danke schön!$" -PetalburgCity_Gym_Text_17A171:: @ 817A171 +PetalburgCity_Gym_Text_WouldYouReallyComeWithMe:: @ 817A171 .string "{PLAYER}... Kommst du wirklich mit mir???$" -PetalburgCity_Gym_Text_17A196:: @ 817A196 +PetalburgCity_Gym_Text_DadSoDidItWorkOut:: @ 817A196 .string "VATER: Und? Hat es geklappt?$" -PetalburgCity_Gym_Text_17A1B0:: @ 817A1B0 +PetalburgCity_Gym_Text_WallyThankYouBye:: @ 817A1B0 .string "HEIKO: Danke. Ja, wunderbar.\n" .string "Hier haben Sie Ihr POKéMON zurück.\p" .string "Danke, {PLAYER}, dass du mit mir\n" @@ -72,7 +72,7 @@ PetalburgCity_Gym_Text_17A1B0:: @ 817A1B0 .string "mich! Ich muss nach Hause!\p" .string "Bis bald, {PLAYER}!$" -PetalburgCity_Gym_Text_17A2A4:: @ 817A2A4 +PetalburgCity_Gym_Text_DadGoCollectBadges:: @ 817A2A4 .string "VATER: Nun...\p" .string "{PLAYER}, wenn du ein guter TRAINER\n" .string "werden willst - hier ist mein Rat.\p" @@ -90,7 +90,7 @@ PetalburgCity_Gym_Text_17A2A4:: @ 817A2A4 .string "Aber erst, wenn du stärker geworden\n" .string "bist, {PLAYER}.$" -PetalburgCity_Gym_Text_17A41E:: @ 817A41E +PetalburgCity_Gym_Text_NormanGoToRustboro:: @ 817A41E .string "VATER: Hm? Wolltest du nicht zur\n" .string "POKéMON ARENA in METAROST CITY?\p" .string "Für mich ist es keine Herausforderung,\n" @@ -100,7 +100,7 @@ PetalburgCity_Gym_Text_17A41E:: @ 817A41E .string "Ich werde gegen dich kämpfen, {PLAYER},\n" .string "sobald du vier ORDEN erhalten hast, ja?$" -PetalburgCity_Gym_Text_17A518:: @ 817A518 +PetalburgCity_Gym_Text_NormanGoToDewford:: @ 817A518 .string "VATER: Oh, ich sehe schon... Du hast die\n" .string "ARENALEITERIN in METAROST CITY\l" .string "besiegt.\p" @@ -111,13 +111,13 @@ PetalburgCity_Gym_Text_17A518:: @ 817A518 .string "den ARENALEITER KAMILLO.\p" .string "Du solltest ihn wirklich herausfordern...$" -PetalburgCity_Gym_Text_17A5F3:: @ 817A5F3 +PetalburgCity_Gym_Text_YouHaveGottenStronger:: @ 817A5F3 .string "VATER: Hm... {PLAYER}, du bist stärker\n" .string "geworden.\p" .string "Das sehe ich an der Anzahl der ORDEN,\n" .string "die du dir verdient hast.$" -PetalburgCity_Gym_Text_17A653:: @ 817A653 +PetalburgCity_Gym_Text_NormanIntro:: @ 817A653 .string "VATER: Hm...\n" .string "Du besitzt vier ORDEN.\p" .string "Fein. Wie versprochen werden wir nun\n" @@ -132,7 +132,7 @@ PetalburgCity_Gym_Text_17A653:: @ 817A653 .string "{PLAYER}, du solltest ebenfalls dein\n" .string "Bestes geben!$" -PetalburgCity_Gym_Text_17A77A:: @ 817A77A +PetalburgCity_Gym_Text_NormanDefeat:: @ 817A77A .string "...\p" .string "Ich... Ich kann es nicht...\p" .string "Ich kann es nicht glauben, {PLAYER}...\p" @@ -140,11 +140,11 @@ PetalburgCity_Gym_Text_17A77A:: @ 817A77A .string "Nun, Regeln sind Regeln!\n" .string "Hier, das ist für dich.$" -PetalburgCity_Gym_Text_17A7DD:: @ 817A7DD +PetalburgCity_Gym_Text_ReceivedBalanceBadge:: @ 817A7DD .string "{PLAYER} hat den BALANCEORDEN vom\n" .string "VATER erhalten!$" -PetalburgCity_Gym_Text_17A805:: @ 817A805 +PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis:: @ 817A805 .string "VATER: Mit diesem ORDEN erhöht sich die\n" .string "VERTEIDIGUNG all deiner POKéMON.\p" .string "POKéMON, die die VM SURFER erlernt\n" @@ -154,7 +154,7 @@ PetalburgCity_Gym_Text_17A805:: @ 817A805 .string "dich. Ich bin sicher, du wirst es gut\l" .string "nutzen.$" -PetalburgCity_Gym_Text_17A8CF:: @ 817A8CF +PetalburgCity_Gym_Text_ExplainFacade:: @ 817A8CF .string "VATER: TM42 enthält FASSADE.\p" .string "Sie verdoppelt die Stärke der Attacken,\n" .string "wenn das POKéMON vergiftet,\l" @@ -162,20 +162,20 @@ PetalburgCity_Gym_Text_17A8CF:: @ 817A8CF .string "So kann eine vermeintlich aussichtslose\n" .string "Situation vielleicht gerettet werden.$" -PetalburgCity_Gym_Text_17A976:: @ 817A976 +PetalburgCity_Gym_Text_DadHappyAndSad:: @ 817A976 .string "VATER: Als ARENALEITER kann ich gar\n" .string "nicht sagen, wie bestürzt ich bin...\p" .string "Als Vater macht es mich einerseits sehr\n" .string "stolz, andererseits aber auch traurig...$" -PetalburgCity_Gym_Text_17A9F6:: @ 817A9F6 +PetalburgCity_Gym_Text_WallysParentsHaveGiftForYou:: @ 817A9F6 .string "VATER: Oh, ja...\p" .string "Die Eltern von HEIKO sind vor\n" .string "kurzem hier gewesen.\p" .string "Sie sagten, dass sie dir etwas schenken\n" .string "möchten, {PLAYER}.$" -PetalburgCity_Gym_Text_17AA6B:: @ 817AA6B +PetalburgCity_Gym_Text_DadGoingToKeepTraining:: @ 817AA6B .string "VATER: {PLAYER}, du solltest deine\n" .string "Mutter öfter mal besuchen.\p" .string "Ich bleibe hier und werde mein Training\n" @@ -183,14 +183,14 @@ PetalburgCity_Gym_Text_17AA6B:: @ 817AA6B .string "Als TRAINER lässt es mir keine Ruhe. Ich\n" .string "möchte irgendwann gegen dich gewinnen.$" -PetalburgCity_Gym_Text_17AB17:: @ 817AB17 +PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough:: @ 817AB17 .string "VATER: {PLAYER}! Wie geht es dir?\p" .string "Die Welt der POKéMON ist vielfältig.\p" .string "Ich bin überzeugt, dass selbst das \n" .string "härteste Training dieser Vielfalt nicht\l" .string "gerecht wird.$" -PetalburgCity_Gym_Text_17AB96:: @ 817AB96 +PetalburgCity_Gym_Text_GymGuideAdvice:: @ 817AB96 .string "Na, wie sieht es aus, auf dem Weg zum\n" .string "CHAMP, {PLAYER}?\p" .string "Die Türen dieser ARENA öffnen sich,\n" @@ -209,22 +209,22 @@ PetalburgCity_Gym_Text_17AB96:: @ 817AB96 .string "Hast du dich für eine Tür entschieden...\n" .string "Nun, ähm, genug der Worte!$" -PetalburgCity_Gym_Text_17AD49:: @ 817AD49 +PetalburgCity_Gym_Text_GymGuidePostVictory:: @ 817AD49 .string "{PLAYER}! Hui! Du hast sogar deinen\n" .string "eigenen Vater besiegt!\p" .string "Wie... Unglaublich!\n" .string "Die Ereignisse überschlagen sich!$" -PetalburgCity_Gym_Text_17ADA5:: @ 817ADA5 +PetalburgCity_Gym_Text_RandallIntro:: @ 817ADA5 .string "Die Fähigkeit, dem Gegner mit einer\n" .string "Attacke zuvorzukommen...\p" .string "Das alleine gibt einem doch schon einen\n" .string "enormen Vorteil, meinst du nicht auch?$" -PetalburgCity_Gym_Text_17AE11:: @ 817AE11 +PetalburgCity_Gym_Text_RandallDefeat:: @ 817AE11 .string "Das war ein unglaublicher Kampf!$" -PetalburgCity_Gym_Text_17AE30:: @ 817AE30 +PetalburgCity_Gym_Text_RandallPostBattle:: @ 817AE30 .string "Geh weiter in den nächsten Raum, wo\n" .string "eine neue Herausforderung wartet.\p" .string "Auf der linken Seite befindet sich der\n" @@ -232,33 +232,33 @@ PetalburgCity_Gym_Text_17AE30:: @ 817AE30 .string "Auf der rechten Seite findest du den\n" .string "RAUM der VERTEIDIGUNG.$" -PetalburgCity_Gym_Text_17AEBB:: @ 817AEBB +PetalburgCity_Gym_Text_RandallPostBadge:: @ 817AEBB .string "Ob du siegst oder verlierst... Du darfst\n" .string "dein Training und das deiner POKéMON\l" .string "auf keinen Fall vernachlässigen.\p" .string "Das macht für mich einen wahren\n" .string "ARENALEITER aus.$" -PetalburgCity_Gym_Text_17AF5A:: @ 817AF5A +PetalburgCity_Gym_Text_ParkerIntro:: @ 817AF5A .string "Verschwende deine kostbare Zeit nicht\n" .string "damit, die Fähigkeiten meines POKéMON\l" .string "zu blockieren!$" -PetalburgCity_Gym_Text_17AF98:: @ 817AF98 +PetalburgCity_Gym_Text_ParkerDefeat:: @ 817AF98 .string "Die Fähigkeiten meines POKéMON wurden\n" .string "nicht blockiert, und doch habe ich\l" .string "verloren...$" -PetalburgCity_Gym_Text_17AFD3:: @ 817AFD3 +PetalburgCity_Gym_Text_ParkerPostBattle:: @ 817AFD3 .string "Der nächste Raum ist der RAUM der\n" .string "STÄRKE. Kommst du gegen pure\l" .string "Gewalt an?$" -PetalburgCity_Gym_Text_17B016:: @ 817B016 +PetalburgCity_Gym_Text_ParkerPostBadge:: @ 817B016 .string "Nachdem du unseren ARENALEITER be-\n" .string "siegt hast, wurde unser Training härter.$" -PetalburgCity_Gym_Text_17B058:: @ 817B058 +PetalburgCity_Gym_Text_GeorgeIntro:: @ 817B058 .string "Immer, wenn du den Sieg in greifbarer\n" .string "Nähe siehst, füllt dein Gegner KP auf...\p" .string "Kannst du dir vorstellen, wie man sich in\n" @@ -266,11 +266,11 @@ PetalburgCity_Gym_Text_17B058:: @ 817B058 .string "Ich werde dir so eine Situation\n" .string "demonstrieren!$" -PetalburgCity_Gym_Text_17B0F7:: @ 817B0F7 +PetalburgCity_Gym_Text_GeorgeDefeat:: @ 817B0F7 .string "Ich konnte nicht genügend KP\n" .string "auffüllen... Welch eine ANGRIFFskraft...$" -PetalburgCity_Gym_Text_17B12C:: @ 817B12C +PetalburgCity_Gym_Text_GeorgePostBattle:: @ 817B12C .string "Ich hatte vom Kind unseres ARENA-\n" .string "LEITERS nichts anderes erwartet!\p" .string "Nein! Die Fähigkeiten eines TRAINERS\n" @@ -280,11 +280,11 @@ PetalburgCity_Gym_Text_17B12C:: @ 817B12C .string "Geh! Der nächste Raum ist der K.O.-\n" .string "TREFFER-RAUM.$" -PetalburgCity_Gym_Text_17B1F4:: @ 817B1F4 +PetalburgCity_Gym_Text_GeorgePostBadge:: @ 817B1F4 .string "Ich werde auch weiterhin in den ARENEN\n" .string "trainieren. Und ARENALEITER werden!$" -PetalburgCity_Gym_Text_17B237:: @ 817B237 +PetalburgCity_Gym_Text_BerkeIntro:: @ 817B237 .string "Ich werde es dir nicht leicht machen,\n" .string "nur weil du das Kind unseres LEITERS\l" .string "bist.\p" @@ -292,11 +292,11 @@ PetalburgCity_Gym_Text_17B237:: @ 817B237 .string "POKéMON bedeutet, einen kritischen\l" .string "Schlag zu erhalten.$" -PetalburgCity_Gym_Text_17B2C0:: @ 817B2C0 +PetalburgCity_Gym_Text_BerkeDefeat:: @ 817B2C0 .string "Deine Stärke...\n" .string "Du kämpfst großartig!$" -PetalburgCity_Gym_Text_17B2E4:: @ 817B2E4 +PetalburgCity_Gym_Text_BerkePostBattle:: @ 817B2E4 .string "Dein Vater ist stark. Als TRAINER\n" .string "erweise ich ihm den größten Respekt.\p" .string "Und ich sehe, dass die gleiche Stärke\n" @@ -304,21 +304,21 @@ PetalburgCity_Gym_Text_17B2E4:: @ 817B2E4 .string "Ich fühle, dass du dich nun einem\n" .string "Kampf mit deinem Vater stellen kannst.$" -PetalburgCity_Gym_Text_17B39B:: @ 817B39B +PetalburgCity_Gym_Text_BerkePostBadge:: @ 817B39B .string "Seit dein Vater der LEITER der ARENA\n" .string "von BLÜTENBURG CITY ist, sind die\l" .string "TRAINER dort viel stärker geworden.$" -PetalburgCity_Gym_Text_17B3F7:: @ 817B3F7 +PetalburgCity_Gym_Text_MaryIntro:: @ 817B3F7 .string "Kicher...\n" .string "Dies ist der RAUM der GENAUIGKEIT.\p" .string "Es ist schon ziemlich fies, wenn jede\n" .string "Attacke ein Treffer ist.$" -PetalburgCity_Gym_Text_17B454:: @ 817B454 +PetalburgCity_Gym_Text_MaryDefeat:: @ 817B454 .string "Du bist ein bisschen stärker als ich...$" -PetalburgCity_Gym_Text_17B46F:: @ 817B46F +PetalburgCity_Gym_Text_MaryPostBattle:: @ 817B46F .string "Es warten noch weitaus stärkere\n" .string "TRAINER auf dich.\p" .string "Der linke ist der RAUM der VERTEIDIGUNG\n" @@ -326,20 +326,20 @@ PetalburgCity_Gym_Text_17B46F:: @ 817B46F .string "Die ATTACKEN deiner POKéMON werden\n" .string "in beiden Räumen auf die Probe gestellt.$" -PetalburgCity_Gym_Text_17B521:: @ 817B521 +PetalburgCity_Gym_Text_MaryPostBadge:: @ 817B521 .string "Weißt du, wonach wir als TRAINER\n" .string "streben?\p" .string "Wir streben danach, die Seelenfreunde\n" .string "unserer POKéMON zu werden.$" -PetalburgCity_Gym_Text_17B58D:: @ 817B58D +PetalburgCity_Gym_Text_LoriIntro:: @ 817B58D .string "Je stärker die VERTEIDIGUNG ist, desto\n" .string "rücksichtsloser kann ich angreifen.$" -PetalburgCity_Gym_Text_17B5CB:: @ 817B5CB +PetalburgCity_Gym_Text_LoriDefeat:: @ 817B5CB .string "Unsere Verteidigung reichte nicht aus...$" -PetalburgCity_Gym_Text_17B5EA:: @ 817B5EA +PetalburgCity_Gym_Text_LoriPostBattle:: @ 817B5EA .string "Ich denke, du hast mir eine wertvolle\n" .string "Lektion erteilt.\p" .string "Nun, geh weiter. Die linke Tür führt in\n" @@ -349,24 +349,24 @@ PetalburgCity_Gym_Text_17B5EA:: @ 817B5EA .string "In beiden warten äußerst talentierte\n" .string "TRAINER.$" -PetalburgCity_Gym_Text_17B6B5:: @ 817B6B5 +PetalburgCity_Gym_Text_LoriPostBadge:: @ 817B6B5 .string "Hallo! Hast du mal SURFER ausprobiert?$" -PetalburgCity_Gym_Text_17B6D4:: @ 817B6D4 +PetalburgCity_Gym_Text_JodyIntro:: @ 817B6D4 .string "Unser ARENALEITER hat uns angewiesen,\n" .string "alles zu geben und dich zu besiegen.\p" .string "Auch wenn du das Kind des LEITERS bist!$" -PetalburgCity_Gym_Text_17B732:: @ 817B732 +PetalburgCity_Gym_Text_JodyDefeat:: @ 817B732 .string "Aber... Das war wohl nichts!$" -PetalburgCity_Gym_Text_17B749:: @ 817B749 +PetalburgCity_Gym_Text_JodiPostBattle:: @ 817B749 .string "Wie du deine POKéMON einsetzt...\n" .string "Du bist wie dein Vater.\p" .string "Geh weiter! Der ARENALEITER, dein\n" .string "Vater, erwartet dich bereits!$" -PetalburgCity_Gym_Text_17B7C0:: @ 817B7C0 +PetalburgCity_Gym_Text_JodiPostBadge:: @ 817B7C0 .string "Sicher, es ist immer von Vorteil, die\n" .string "POKéMON stärker werden zu lassen.\p" .string "Aber was macht einen Gewinner aus?\p" @@ -374,10 +374,10 @@ PetalburgCity_Gym_Text_17B7C0:: @ 817B7C0 .string "TRAINER seinen POKéMON entgegen-\l" .string "bringt.$" -PetalburgCity_Gym_Text_17B844:: @ 817B844 +PetalburgCity_Gym_Text_DoorAppearsLocked:: @ 817B844 .string "Die Tür ist noch verschlossen...$" -PetalburgCity_Gym_Text_17B870:: @ 817B870 +PetalburgCity_Gym_Text_EnterSpeedRoom:: @ 817B870 .string "“INITIATIVE-RAUM” steht auf\n" .string "dem Schild.\p" .string "Möchtest du die Tür öffnen?$" @@ -385,46 +385,46 @@ PetalburgCity_Gym_Text_17B870:: @ 817B870 UnknownString_817B8A8: @ 817B8A8 .string "Die Tür ist noch verschlossen...$" -PetalburgCity_Gym_Text_17B8D4:: @ 817B8D4 +PetalburgCity_Gym_Text_EnterAccuracyRoom:: @ 817B8D4 .string "“RAUM der GENAUIGKEIT” steht\n" .string "auf dem Schild.\p" .string "Möchtest du die Tür öffnen?$" -PetalburgCity_Gym_Text_17B90F:: @ 817B90F +PetalburgCity_Gym_Text_EnterZeroReductionRoom:: @ 817B90F .string "“KP-SAUGER-RAUM”\n" .string "steht auf dem Schild.\p" .string "Möchtest du die Tür öffnen?$" -PetalburgCity_Gym_Text_17B950:: @ 817B950 +PetalburgCity_Gym_Text_EnterDefenseRoom:: @ 817B950 .string "“RAUM der VERTEIDIGUNG” steht\n" .string "auf dem Schild.\p" .string "Möchtest du die Tür öffnen?$" -PetalburgCity_Gym_Text_17B98A:: @ 817B98A +PetalburgCity_Gym_Text_EnterRecoveryRoom:: @ 817B98A .string "“RAUM der ERHOLUNG” steht auf\n" .string "dem Schild.\p" .string "Möchtest du die Tür öffnen?$" -PetalburgCity_Gym_Text_17B9C5:: @ 817B9C5 +PetalburgCity_Gym_Text_EnterStrengthRoom:: @ 817B9C5 .string "“RAUM der STÄRKE” steht auf\n" .string "dem Schild.\p" .string "Möchtest du die Tür öffnen?$" -PetalburgCity_Gym_Text_17BA00:: @ 817BA00 +PetalburgCity_Gym_Text_EnterOHKORoom:: @ 817BA00 .string "“K.O.-TREFFER-RAUM”\n" .string "steht auf dem Schild.\p" .string "Möchtest du die Tür öffnen?$" -PetalburgCity_Gym_Text_17BA3D:: @ 817BA3D +PetalburgCity_Gym_Text_EnterGymLeadersRoom:: @ 817BA3D .string "“ARENALEITER”\p" .string "“Sieh selbst, welche POKéMON dich\n" .string "erwarten!” steht auf dem Schild.\p" .string "Möchtest du die Tür öffnen?$" -PetalburgCity_Gym_Text_17BAA5:: @ 817BAA5 +PetalburgCity_Gym_Text_GymStatue:: @ 817BAA5 .string "POKéMON ARENA von BLÜTENBURG CITY$" -PetalburgCity_Gym_Text_17BAC0:: @ 817BAC0 +PetalburgCity_Gym_Text_GymStatueCertified:: @ 817BAC0 .string "POKéMON ARENA von BLÜTENBURG CITY\p" .string "NORMANS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/PetalburgCity_House1/text.inc b/data-de/maps/PetalburgCity_House1/text.inc index 84bc33fed..1829e7f1e 100644 --- a/data-de/maps/PetalburgCity_House1/text.inc +++ b/data-de/maps/PetalburgCity_House1/text.inc @@ -1,9 +1,9 @@ -PetalburgCity_House1_Text_17BAFB:: @ 817BAFB +PetalburgCity_House1_Text_TravelingIsWonderful:: @ 817BAFB .string "Reisen ist einfach wundervoll!\p" .string "Als ich noch jung war, waren die See und\n" .string "die Berge mein Zuhause.$" -PetalburgCity_House1_Text_17BB4A:: @ 817BB4A +PetalburgCity_House1_Text_GoOnAdventure:: @ 817BB4A .string "Seufz...\p" .string "Ich wünschte, ich könnte mit einigen\n" .string "POKéMON auf Abenteuerreise gehen...\p" diff --git a/data-de/maps/PetalburgCity_House2/text.inc b/data-de/maps/PetalburgCity_House2/text.inc index 35af2bb8b..f9634c33a 100644 --- a/data-de/maps/PetalburgCity_House2/text.inc +++ b/data-de/maps/PetalburgCity_House2/text.inc @@ -1,9 +1,9 @@ -PetalburgCity_House2_Text_17BC4F:: @ 817BC4F +PetalburgCity_House2_Text_NormanBecameGymLeader:: @ 817BC4F .string "NORMAN ist unser neuer ARENALEITER.\p" .string "Ich glaube, er ist mit seiner Familie aus\n" .string "der JOHTO-Region hier hergezogen.$" -PetalburgCity_House2_Text_17BCB1:: @ 817BCB1 +PetalburgCity_House2_Text_BattledNormanOnce:: @ 817BCB1 .string "Ich bin erst einmal gegen NORMAN\n" .string "angetreten. Wow, war der stark!\p" .string "Wie soll ich es sagen?\p" diff --git a/data-de/maps/PetalburgCity_Mart/text.inc b/data-de/maps/PetalburgCity_Mart/text.inc index 988502492..1171f1f1c 100644 --- a/data-de/maps/PetalburgCity_Mart/text.inc +++ b/data-de/maps/PetalburgCity_Mart/text.inc @@ -1,15 +1,15 @@ -PetalburgCity_Mart_Text_17BFFD:: @ 817BFFD +PetalburgCity_Mart_Text_WeakWillGrowStronger:: @ 817BFFD .string "Auch wenn ein POKéMON jetzt noch\n" .string "schwach ist - es wird ständig stärker.\p" .string "Das Schlüsselwort heißt Liebe!\n" .string "Liebe für deine POKéMON!$" -PetalburgCity_Mart_Text_17C06C:: @ 817C06C +PetalburgCity_Mart_Text_RepelIsUseful:: @ 817C06C .string "Setzt du SCHUTZ ein?\n" .string "Das hält POKéMON fern und ist sehr\l" .string "nützlich, wenn du es eilig hast.$" -PetalburgCity_Mart_Text_17C0BC:: @ 817C0BC +PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou:: @ 817C0BC .string "Hast du etwas GEGENGIFT dabei?\p" .string "Ein vergiftetes POKéMON verliert\n" .string "ständig KP, bis es kampfunfähig wird.\l" diff --git a/data-de/maps/PetalburgCity_PokemonCenter_1F/text.inc b/data-de/maps/PetalburgCity_PokemonCenter_1F/text.inc index 15235279a..7bb0be752 100644 --- a/data-de/maps/PetalburgCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/PetalburgCity_PokemonCenter_1F/text.inc @@ -1,21 +1,21 @@ -PetalburgCity_PokemonCenter_1F_Text_17BD30:: @ 817BD30 +PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem:: @ 817BD30 .string "Computerbasiertes POKéMON-Lagerungs-\n" .string "System...\p" .string "Wer auch immer dies entwickelt hat, muss\n" .string "ein wahrer Zauberer sein!$" -PetalburgCity_PokemonCenter_1F_Text_17BD92:: @ 817BD92 +PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP:: @ 817BD92 .string "Als mein POKéMON eine SINELBEERE\n" .string "aß, wurden seine KP aufgefüllt!$" -PetalburgCity_PokemonCenter_1F_Text_17BDC5:: @ 817BDC5 +PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon:: @ 817BDC5 .string "Es gibt viele Typen von POKéMON.\p" .string "Jeder Typ hat seine Stärken und\n" .string "Schwächen gegenüber anderen Typen.\p" .string "Je nach Typ des POKéMON kann der\n" .string "Kampf leicht oder schwer sein.$" -PetalburgCity_PokemonCenter_1F_Text_17BE6C:: @ 817BE6C +PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType:: @ 817BE6C .string "Dein GECKARBOR ist beispielsweise ein\n" .string "PFLANZEN-Typ.\p" .string "Es ist stark gegenüber dem WASSER-\n" @@ -23,7 +23,7 @@ PetalburgCity_PokemonCenter_1F_Text_17BE6C:: @ 817BE6C .string "Aber es ist schwach gegenüber den\n" .string "FEUER-POKéMON.$" -PetalburgCity_PokemonCenter_1F_Text_17BEF1:: @ 817BEF1 +PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType:: @ 817BEF1 .string "Dein FLEMMLI ist beispielsweise ein\n" .string "FEUER-Typ.\p" .string "Es ist stark gegenüber dem PFLANZEN-\n" @@ -31,7 +31,7 @@ PetalburgCity_PokemonCenter_1F_Text_17BEF1:: @ 817BEF1 .string "Aber es ist schwach gegenüber den\n" .string "WASSER-POKéMON.$" -PetalburgCity_PokemonCenter_1F_Text_17BF73:: @ 817BF73 +PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType:: @ 817BF73 .string "Dein HYDROPI ist beispielsweise ein\n" .string "WASSER-Typ.\p" .string "Es ist stark gegenüber dem FEUER-Typ.\p" diff --git a/data-de/maps/PetalburgCity_WallysHouse/text.inc b/data-de/maps/PetalburgCity_WallysHouse/text.inc index 765bf3be8..bedc27a79 100644 --- a/data-de/maps/PetalburgCity_WallysHouse/text.inc +++ b/data-de/maps/PetalburgCity_WallysHouse/text.inc @@ -1,4 +1,4 @@ -PetalburgCity_WallysHouse_Text_179805:: @ 8179805 +PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally:: @ 8179805 .string "Du...\n" .string "Ach, du bist bestimmt {PLAYER}{KUN}, richtig?\p" .string "Danke, dass du dich um HEIKO gekümmert\n" @@ -14,11 +14,11 @@ PetalburgCity_WallysHouse_Text_179805:: @ 8179805 .string "Ich frage mich, wo er jetzt wohl sein\n" .string "mag?$" -PetalburgCity_WallysHouse_Text_179975:: @ 8179975 +PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing:: @ 8179975 .string "Ich frage mich, wie es unserem\n" .string "HEIKO geht.$" -PetalburgCity_WallysHouse_Text_179996:: @ 8179996 +PetalburgCity_WallysHouse_Text_WallyHasBecomeHealthy:: @ 8179996 .string "Hallo, {PLAYER}{KUN}!\p" .string "Unser HEIKO ist viel robuster ge-\n" .string "worden, seit er in WIESENFLUR ist.\p" @@ -35,15 +35,15 @@ PetalburgCity_WallysHouse_Text_179996:: @ 8179996 .string "Das soll jetzt keine Bestechung sein!\n" .string "Aber ich möchte dir dies schenken.$" -PetalburgCity_WallysHouse_Text_179B14:: @ 8179B14 +PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces:: @ 8179B14 .string "Wenn dein POKéMON SURFER beherrscht,\n" .string "kannst du viele neue Orte bereisen.$" -PetalburgCity_WallysHouse_Text_179B5B:: @ 8179B5B +PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon:: @ 8179B5B .string "HEIKO wird bald wieder nach Hause\n" .string "kommen. Ich freue mich schon so.$" -PetalburgCity_WallysHouse_Text_179B92:: @ 8179B92 +PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity:: @ 8179B92 .string "Oh! Du hast HEIKO in PRACHTPOLIS CITY\n" .string "getroffen?\p" .string "Ach, {PLAYER}{KUN}, du willst mich auf den Arm\n" @@ -52,20 +52,20 @@ PetalburgCity_WallysHouse_Text_179B92:: @ 8179B92 .string "aber er wird nicht alleine so weit fort-\l" .string "gegangen sein!$" -PetalburgCity_WallysHouse_Text_179C2C:: @ 8179C2C +PetalburgCity_WallysHouse_Text_WallyWasReallyHappy:: @ 8179C2C .string "HEIKO war richtig glücklich, als er\n" .string "uns erzählte, dass er ein POKéMON\l" .string "gefangen habe.\p" .string "Ich habe ihn schon seit Ewigkeiten\n" .string "nicht mehr so glücklich erlebt!$" -PetalburgCity_WallysHouse_Text_179CA1:: @ 8179CA1 +PetalburgCity_WallysHouse_Text_HusbandHasSomethingForYou:: @ 8179CA1 .string "Oh, hallo {PLAYER}! Wir haben hier etwas,\n" .string "das wir dir gerne schenken möchten.\p" .string "Mein Mann hat es. Sprich doch mal mit\n" .string "ihm, Liebes.$" -PetalburgCity_WallysHouse_Text_179D12:: @ 8179D12 +PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling:: @ 8179D12 .string "Ich muss das vor meinem Mann\n" .string "verheimlichen...\p" .string "Aber unser HEIKO hat WIESENFLUR\n" diff --git a/data-de/maps/Route102/text.inc b/data-de/maps/Route102/text.inc index c544db7d5..3532839f9 100644 --- a/data-de/maps/Route102/text.inc +++ b/data-de/maps/Route102/text.inc @@ -1,4 +1,4 @@ -PetalburgCity_Text_16D361:: @ 816D361 +Route102_Text_WatchMeCatchPokemon:: @ 816D361 .string "HEIKO: {PLAYER}...\n" .string "POKéMON verstecken sich in hohem Gras\l" .string "wie diesem hier, oder?\p" @@ -6,11 +6,11 @@ PetalburgCity_Text_16D361:: @ 816D361 .string "auch richtig fange.\p" .string "...Whoa!$" -PetalburgCity_Text_16D3DE:: @ 816D3DE +Route102_Text_WallyIDidIt:: @ 816D3DE .string "HEIKO: Ich habe es geschafft... Es\n" .string "gehört mir... Mein POKéMON!!!$" -PetalburgCity_Text_16D408:: @ 816D408 +Route102_Text_LetsGoBack:: @ 816D408 .string "{PLAYER}, danke schön!\n" .string "Lass uns zurück zur ARENA gehen!$" diff --git a/data-de/maps/Route109/text.inc b/data-de/maps/Route109/text.inc index 61e48788c..e70729185 100644 --- a/data-de/maps/Route109/text.inc +++ b/data-de/maps/Route109/text.inc @@ -1,4 +1,4 @@ -DewfordTown_Text_16E080:: @ 816E080 +DewfordTown_Text_BrineyLandedInSlateportDeliverGoods:: @ 816E080 .string "MR. BRACK: Ahoi!\n" .string "Wir haben in GRAPHITPORT CITY angelegt.\p" .string "Ich vermute, du gehst jetzt zu KAPT.\n" @@ -20,7 +20,7 @@ Route109_Text_16E1B1:: @ 816E1B1 .string "MR. BRACK: Dann geh und überbringe die\n" .string "DEVON-WAREN. Ich warte hier.$" -DewfordTown_Text_16E1FA:: @ 816E1FA +DewfordTown_Text_BrineyLandedInSlateport:: @ 816E1FA .string "MR. BRACK: Ahoi! Wir haben in\n" .string "GRAPHITPORT CITY angelegt!\p" .string "Wann immer du magst, können wir wieder\n" diff --git a/data-de/maps/Route110_TrickHouseEnd/text.inc b/data-de/maps/Route110_TrickHouseEnd/text.inc index 508e52b85..ff2783ac6 100644 --- a/data-de/maps/Route110_TrickHouseEnd/text.inc +++ b/data-de/maps/Route110_TrickHouseEnd/text.inc @@ -1,16 +1,16 @@ -Route110_TrickHouseEnd_Text_19C281:: @ 819C281 +Route110_TrickHouseEnd_Text_YouveMadeItToMe:: @ 819C281 .string "Argh!\n" .string "Du hast mich gefunden?\l" .string "Hmmm... Du bist verdammt clever!$" -Route110_TrickHouseEnd_Text_19C2B2:: @ 819C2B2 +Route110_TrickHouseEnd_Text_AllNightToPlantTrees:: @ 819C2B2 .string "Ich habe die ganze Nacht gebraucht,\n" .string "all die Bäume zu pflanzen...\p" .string "Du bist meiner Größe fast ebenbürtig,\n" .string "bis auf ein, zwei, drei, vier, fünf, sechs\l" .string "Punkte!$" -Route110_TrickHouseEnd_Text_19C333:: @ 819C333 +Route110_TrickHouseEnd_Text_AllNightToMakeMaze:: @ 819C333 .string "Ich habe die ganze Nacht gebraucht,\n" .string "das Labyrinth anzulegen...\p" .string "Du bist meiner Größe fast ebenbürtig,\n" @@ -23,36 +23,36 @@ Route110_TrickHouseEnd_Text_19C3A7:: @ 819C3A7 .string "Du bist meiner Größe fast ebenbürtig,\n" .string "bis auf ein, zwei, drei, vier Punkte!$" -Route110_TrickHouseEnd_Text_19C41F:: @ 819C41F +Route110_TrickHouseEnd_Text_AllNightToShoveBoulders:: @ 819C41F .string "Ich habe die ganze Nacht gebraucht,\n" .string "die Felsen hin- und herzuschieben...\p" .string "Du bist meiner Größe fast ebenbürtig,\n" .string "bis auf ein, zwei, drei Punkte!$" -Route110_TrickHouseEnd_Text_19C491:: @ 819C491 +Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls:: @ 819C491 .string "Ich habe die ganze Nacht gebraucht,\n" .string "die ROBOPUPPEN zu konstruieren und\l" .string "mir das Quiz auszudenken...\p" .string "Du bist meiner Größe fast ebenbürtig,\n" .string "bis auf ein oder zwei Punkte!$" -Route110_TrickHouseEnd_Text_19C515:: @ 819C515 +Route110_TrickHouseEnd_Text_AllNightToInstallDoors:: @ 819C515 .string "Ich habe die ganze Nacht gebraucht,\n" .string "die Türen zu installieren...\p" .string "Du bist meiner Größe fast ebenbürtig!$" -Route110_TrickHouseEnd_Text_19C567:: @ 819C567 +Route110_TrickHouseEnd_Text_AllNightSettingUpArrows:: @ 819C567 .string "Ich habe die ganze Nacht gebraucht,\n" .string "die Pfeile anzubringen.\p" .string "Du bist meiner Größe ebenbürtig!$" -Route110_TrickHouseEnd_Text_19C5AF:: @ 819C5AF +Route110_TrickHouseEnd_Text_AllNightPolishingFloors:: @ 819C5AF .string "Ich habe die ganze Nacht gebraucht,\n" .string "den Boden zu polieren...\p" .string "Du bist mir weit überlegen!\n" .string "Unmöglich...$" -Route110_TrickHouseEnd_Text_19C602:: @ 819C602 +Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry:: @ 819C602 .string "Was soll ich nur tun?\n" .string "Die Quelle der Ideen für meine Tricks\l" .string "ist trocken gelegt...\p" @@ -60,7 +60,7 @@ Route110_TrickHouseEnd_Text_19C602:: @ 819C602 .string "Lande zu reisen und mich für neue\l" .string "Tricks inspirieren zu lassen...$" -Route110_TrickHouseEnd_Text_19C691:: @ 819C691 +Route110_TrickHouseEnd_Text_DefeatedMeTakeTent:: @ 819C691 .string "Ich hasse es, zuzugeben, dass ich be-\n" .string "siegt wurde. Du hast mich geschlagen!\p" .string "Mein Charisma muss dich gefangen\n" @@ -73,14 +73,14 @@ Route110_TrickHouseEnd_Text_19C691:: @ 819C691 .string "Genie, überreiche ich dir dieses\l" .string "Andenken!$" -Route110_TrickHouseEnd_Text_19C7D7:: @ 819C7D7 +Route110_TrickHouseEnd_Text_NoRoomInPC:: @ 819C7D7 .string "Was? Du hast keinen Platz im PC?\n" .string "Und was soll ich jetzt damit machen?\p" .string "Sei froh, dass ich so nett und rück-\n" .string "sichtsvoll bin. Ich verwahre es für\l" .string "dich. Komm einfach später wieder.$" -Route110_TrickHouseEnd_Text_19C85C:: @ 819C85C +Route110_TrickHouseEnd_Text_LeavingOnJourney:: @ 819C85C .string "... ... ... ... ... ...\p" .string "Ich gehe jetzt auf eine Entdeckungs-\n" .string "reise. Auf die Suche nach neuen Tricks.\p" @@ -88,17 +88,17 @@ Route110_TrickHouseEnd_Text_19C85C:: @ 819C85C .string "Tages wieder und unterhältst mich.\p" .string "Für heute lebe wohl!$" -Route110_TrickHouseEnd_Text_19C90B:: @ 819C90B +Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward:: @ 819C90B .string "Gut!\n" .string "Du hast dir diese Belohnung verdient!$" -Route110_TrickHouseEnd_Text_19C92E:: @ 819C92E +Route110_TrickHouseEnd_Text_NoRoomForThis:: @ 819C92E .string "Was? Du hast keinen Platz dafür?\n" .string "Wie viele Items schleppst du denn mit?\p" .string "Aber du kannst dir deine Belohnung\n" .string "auch später bei mir abholen.$" -Route110_TrickHouseEnd_Text_19C9BD:: @ 819C9BD +Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou:: @ 819C9BD .string "Putz dir das selbstgefällige Grinsen von\n" .string "der Backe! Noch hast du nicht gewonnen!\p" .string "Ich werde neue Tricks erfinden, die\n" @@ -108,7 +108,7 @@ Route110_TrickHouseEnd_Text_19C9BD:: @ 819C9BD .string "Komm wieder, wenn ich die nächste\n" .string "interessante Installation fertig habe.$" -Route110_TrickHouseEnd_Text_19CA8B:: @ 819CA8B +Route110_TrickHouseEnd_Text_YoureIgnoringMe:: @ 819CA8B .string "Nun, nun! Du ignorierst mich?\n" .string "Das bricht mir glatt das Herz!$" diff --git a/data-de/maps/Route110_TrickHouseEntrance/text.inc b/data-de/maps/Route110_TrickHouseEntrance/text.inc index 5d218bc1a..f85c4f207 100644 --- a/data-de/maps/Route110_TrickHouseEntrance/text.inc +++ b/data-de/maps/Route110_TrickHouseEntrance/text.inc @@ -1,47 +1,47 @@ -Route110_TrickHouseEntrance_Text_19BA56:: @ 819BA56 +Route110_TrickHouseEntrance_Text_YoureBeingWatched:: @ 819BA56 .string "Du wirst beobachtet...$" -Route110_TrickHouseEntrance_Text_19BA6E:: @ 819BA6E +Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk:: @ 819BA6E .string "Was? Grrrr...\p" .string "Woher wusstest du, dass ich mich unter\n" .string "dem Tisch versteckt hatte? Clever!$" -Route110_TrickHouseEntrance_Text_19BAC0:: @ 819BAC0 +Route110_TrickHouseEntrance_Text_ConcealedBehindTree:: @ 819BAC0 .string "Was? Grrrr...\p" .string "Woher wusstest du, dass ich mich hinter\n" .string "dem Baum versteckt hatte? Clever!$" -Route110_TrickHouseEntrance_Text_19BB11:: @ 819BB11 +Route110_TrickHouseEntrance_Text_ConcealedInDresser:: @ 819BB11 .string "Was? Grrrr...\p" .string "Woher wusstest du, dass ich mich in\n" .string "der Kommode versteckt hatte? Clever!$" -Route110_TrickHouseEntrance_Text_19BB61:: @ 819BB61 +Route110_TrickHouseEntrance_Text_ConealedBeyondWindow:: @ 819BB61 .string "Was? Grrrr...\p" .string "Woher wusstest du, dass ich mich über\n" .string "dem Fenster versteckt hatte? Clever!$" -Route110_TrickHouseEntrance_Text_19BBB4:: @ 819BBB4 +Route110_TrickHouseEntrance_Text_ConcealedInPlanter:: @ 819BBB4 .string "Was? Grrrr...\p" .string "Woher wusstest du, dass ich mich in\n" .string "der Pflanze versteckt hatte? Clever!$" -Route110_TrickHouseEntrance_Text_19BC04:: @ 819BC04 +Route110_TrickHouseEntrance_Text_ConcealedInCupboard:: @ 819BC04 .string "Was? Grrrr...\p" .string "Woher wusstest du, dass ich mich\n" .string "im Schrank versteckt hatte? Clever!$" -Route110_TrickHouseEntrance_Text_19BC55:: @ 819BC55 +Route110_TrickHouseEntrance_Text_ConcealedBehindWindow:: @ 819BC55 .string "Was? Grrrr...\p" .string "Woher wusstest du, dass ich mich hinter\n" .string "dem Fenster versteckt hatte? Clever!$" -Route110_TrickHouseEntrance_Text_19BCA8:: @ 819BCA8 +Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion:: @ 819BCA8 .string "Was? Grrrr...\p" .string "Woher wusstest du, dass ich mich unter\n" .string "dem Kissen versteckt hatte? Clever!$" -Route110_TrickHouseEntrance_Text_19BCFD:: @ 819BCFD +Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster:: @ 819BCFD .string "Sehe und staune!\p" .string "Ich bin das größte lebende menschliche\n" .string "Mysterium in ganz HOENN!\l" @@ -49,7 +49,7 @@ Route110_TrickHouseEntrance_Text_19BCFD:: @ 819BCFD .string "RÄTSELMEISTER!\n" .string "Hahaha! Erfreut dich kennen zu lernen!$" -Route110_TrickHouseEntrance_Text_19BD82:: @ 819BD82 +Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse:: @ 819BD82 .string "Du, du bist hier, um mein RÄTSELHAUS\n" .string "herauszufordern, oder?\p" .string "Deshalb bist du doch hier?\n" @@ -60,26 +60,26 @@ Route110_TrickHouseEntrance_Text_19BD82:: @ 819BD82 .string "die Herausforderung beginnt!\p" .string "Ich warte im hinteren Bereich!$" -Route110_TrickHouseEntrance_Text_19BE6E:: @ 819BE6E +Route110_TrickHouseEntrance_Text_ItsAScroll:: @ 819BE6E .string "Das ist eine Schriftrolle.$" -Route110_TrickHouseEntrance_Text_19BE7D:: @ 819BE7D +Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll:: @ 819BE7D .string "Hinter der Schriftrolle ist ein Loch!\p" .string "Möchtest du hindurchgehen?$" -Route110_TrickHouseEntrance_Text_19BEB3:: @ 819BEB3 +Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote:: @ 819BEB3 .string "Auf der Schriftrolle steht etwas...\p" .string "“Ich bin auf eine Reise gegangen.\n" .string "Sucht mich nicht. RÄTSELMEISTER”$" -Route110_TrickHouseEntrance_Text_19BF19:: @ 819BF19 +Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick:: @ 819BF19 .string "Nächstes Mal nehme ich diesen Trick,\n" .string "nach diesem Schema und mit List und...\p" .string "Ähähähä... Ich muss sagen, ich habe mich\n" .string "in meiner Brillanz mal wieder selbst\l" .string "übertroffen!$" -Route110_TrickHouseEntrance_Text_19BFAB:: @ 819BFAB +Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges:: @ 819BFAB .string "Hah! Was???\n" .string "Ach, du bist das!\p" .string "Ich bin gerade dabei, mir neue Tricks\n" @@ -89,26 +89,26 @@ Route110_TrickHouseEntrance_Text_19BFAB:: @ 819BFAB .string "geben, oder? Das ist mir doch gegönnt,\l" .string "oder? Danke. Komm später wieder!$" -Route110_TrickHouseEntrance_Text_19C07E:: @ 819C07E +Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward:: @ 819C07E .string "Ah, du bist es! Du willst dir deine\n" .string "Belohnung von eben abholen, habe ich\l" .string "Recht? Natürlich habe ich Recht!\p" .string "Hier!\n" .string "Das ist für dich!$" -Route110_TrickHouseEntrance_Text_19C0FC:: @ 819C0FC +Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward:: @ 819C0FC .string "Was? Du kommst nicht, um deine\n" .string "Belohnung abzuholen?$" -Route110_TrickHouseEntrance_Text_19C128:: @ 819C128 +Route110_TrickHouseEntrance_Text_MechadollWhichTent:: @ 819C128 .string "ROBOPUPPE 5 BIN ICH!\n" .string "HOLST DU DIE BELOHNUNG NICHT AB,\l" .string "DANN KANNST DU RÄTSELMEISTER NICHT\l" .string "FOLGEN!$" -Route110_TrickHouseEntrance_Text_19C17E:: @ 819C17E +Route110_TrickHouseEntrance_Text_ThenFarewell:: @ 819C17E .string "DANN LEBE WOHL.$" -Route110_TrickHouseEntrance_Text_19C18D:: @ 819C18D +Route110_TrickHouseEntrance_Text_PCFullAgain:: @ 819C18D .string "PC-STATUS: WIEDER VOLL.\n" .string "GEMEIN DU BIST.$" diff --git a/data-de/maps/Route110_TrickHousePuzzle1/text.inc b/data-de/maps/Route110_TrickHousePuzzle1/text.inc index 96eb9115e..f9246d1e6 100644 --- a/data-de/maps/Route110_TrickHousePuzzle1/text.inc +++ b/data-de/maps/Route110_TrickHousePuzzle1/text.inc @@ -1,38 +1,38 @@ -Route110_TrickHousePuzzle1_Text_19CB4F:: @ 819CB4F +Route110_TrickHousePuzzle1_Text_SallyIntro:: @ 819CB4F .string "Ich habe mir den Weg zum Sieg mit dem\n" .string "ZERSCHNEIDER, den wir gerade gelernt\l" .string "haben, gebahnt.$" -Route110_TrickHousePuzzle1_Text_19CB93:: @ 819CB93 +Route110_TrickHousePuzzle1_Text_SallyDefeat:: @ 819CB93 .string "Warum nimmst du das so ernst?$" -Route110_TrickHousePuzzle1_Text_19CBAB:: @ 819CBAB +Route110_TrickHousePuzzle1_Text_SallyPostBattle:: @ 819CBAB .string "Ich werde des Hackens und\n" .string "Schneidens nie müde!$" -Route110_TrickHousePuzzle1_Text_19CBD6:: @ 819CBD6 +Route110_TrickHousePuzzle1_Text_EddieIntro:: @ 819CBD6 .string "Ich bin nur zufällig in diesem\n" .string "verrückten Haus gelandet...$" -Route110_TrickHousePuzzle1_Text_19CC06:: @ 819CC06 +Route110_TrickHousePuzzle1_Text_EddieDefeat:: @ 819CC06 .string "Und nun habe ich verloren...$" -Route110_TrickHousePuzzle1_Text_19CC1B:: @ 819CC1B +Route110_TrickHousePuzzle1_Text_EddiePostBattle:: @ 819CC1B .string "Ich bin vom Weg abgekommen, ich habe\n" .string "verloren und bin verloren. Ich finde den\l" .string "Ausgang nicht mehr...$" -Route110_TrickHousePuzzle1_Text_19CC68:: @ 819CC68 +Route110_TrickHousePuzzle1_Text_RobinIntro:: @ 819CC68 .string "Wer ist dieser RÄTSELMEISTER bloß?$" -Route110_TrickHousePuzzle1_Text_19CC86:: @ 819CC86 +Route110_TrickHousePuzzle1_Text_RobinDefeat:: @ 819CC86 .string "Ich verlor ganz gedankenverloren.$" -Route110_TrickHousePuzzle1_Text_19CCAA:: @ 819CCAA +Route110_TrickHousePuzzle1_Text_RobinPostBattle:: @ 819CCAA .string "Du bist stark!\n" .string "Wer bist du eigentlich?$" -UnknownString_819CCCB: @ 819CCCB +Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened: @ 819CCCB .string "{PLAYER} hat den geheimen Code auf die\n" .string "Tür geschrieben.\p" .string "“RÄTSELMEISTER ist gewieft.”\n" diff --git a/data-de/maps/Route110_TrickHousePuzzle2/text.inc b/data-de/maps/Route110_TrickHousePuzzle2/text.inc index a737ec0cf..594cdc055 100644 --- a/data-de/maps/Route110_TrickHousePuzzle2/text.inc +++ b/data-de/maps/Route110_TrickHousePuzzle2/text.inc @@ -1,38 +1,38 @@ -Route110_TrickHousePuzzle2_Text_19CD46:: @ 819CD46 +Route110_TrickHousePuzzle2_Text_TedIntro:: @ 819CD46 .string "Welcher Schalter schließt welches Loch?$" -Route110_TrickHousePuzzle2_Text_19CD66:: @ 819CD66 +Route110_TrickHousePuzzle2_Text_TedDefeat:: @ 819CD66 .string "Nach diesem Kampf bin ich nur noch\n" .string "verwirrter!$" -Route110_TrickHousePuzzle2_Text_19CD91:: @ 819CD91 +Route110_TrickHousePuzzle2_Text_TedPostBattle:: @ 819CD91 .string "Kannst du nicht alle Schalter für mich\n" .string "betätigen?$" -Route110_TrickHousePuzzle2_Text_19CDBF:: @ 819CDBF +Route110_TrickHousePuzzle2_Text_PaulIntro:: @ 819CDBF .string "Oh! Du forderst das RÄTSELHAUS schon\n" .string "zum zweiten Mal heraus!?!$" -Route110_TrickHousePuzzle2_Text_19CDF0:: @ 819CDF0 +Route110_TrickHousePuzzle2_Text_PaulDefeat:: @ 819CDF0 .string "Du bist auch im Kämpfen so gut!?!$" -Route110_TrickHousePuzzle2_Text_19CE0D:: @ 819CE0D +Route110_TrickHousePuzzle2_Text_PaulPostBattle:: @ 819CE0D .string "Der RÄTSELMEISTER tüftelt alle Tricks\n" .string "in diesem Haus selber aus.$" -Route110_TrickHousePuzzle2_Text_19CE52:: @ 819CE52 +Route110_TrickHousePuzzle2_Text_GeorgiaIntro:: @ 819CE52 .string "Eines Tages gründe ich meine eigene\n" .string "ARENA. Und hier studiere ich die Fallen.$" -Route110_TrickHousePuzzle2_Text_19CE98:: @ 819CE98 +Route110_TrickHousePuzzle2_Text_GeorgiaDefeat:: @ 819CE98 .string "Ich habe das Kämpfen nicht genug\n" .string "studiert!$" -Route110_TrickHousePuzzle2_Text_19CEB8:: @ 819CEB8 +Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle:: @ 819CEB8 .string "Du bist stark, nicht wahr?\n" .string "Stark genug, ein ARENALEITER zu sein.$" -UnknownString_819CEF9: @ 819CEF9 +Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened: @ 819CEF9 .string "{PLAYER} hat den geheimen Code auf die\n" .string "Tür geschrieben.\p" .string "“RÄTSELMEISTER ist gefragt.”\n" diff --git a/data-de/maps/Route110_TrickHousePuzzle3/text.inc b/data-de/maps/Route110_TrickHousePuzzle3/text.inc index de3c0116d..32527a54d 100644 --- a/data-de/maps/Route110_TrickHousePuzzle3/text.inc +++ b/data-de/maps/Route110_TrickHousePuzzle3/text.inc @@ -1,41 +1,41 @@ -Route110_TrickHousePuzzle3_Text_19CF76:: @ 819CF76 +Route110_TrickHousePuzzle3_Text_JustinIntro:: @ 819CF76 .string "Ich laufe und laufe und lande immer\n" .string "wieder hier.$" -Route110_TrickHousePuzzle3_Text_19CF9D:: @ 819CF9D +Route110_TrickHousePuzzle3_Text_JustinDefeat:: @ 819CF9D .string "Ich habe eh schon Probleme und dann\n" .string "musst du mich auch noch besiegen? Pfui.$" -Route110_TrickHousePuzzle3_Text_19CFE6:: @ 819CFE6 +Route110_TrickHousePuzzle3_Text_JustinPostBattle:: @ 819CFE6 .string "Hier sieht man vor lauter Türen den Aus-\n" .string "gang nicht! Ich bin total verwirrt...$" -Route110_TrickHousePuzzle3_Text_19D026:: @ 819D026 +Route110_TrickHousePuzzle3_Text_MarthaIntro:: @ 819D026 .string "Ich weiß nicht, was hier vorgeht.\n" .string "Ich habe ein ganz schlechtes Gefühl...$" -Route110_TrickHousePuzzle3_Text_19D065:: @ 819D065 +Route110_TrickHousePuzzle3_Text_MarthaDefeat:: @ 819D065 .string "Du... Du bist furchtbar!$" -Route110_TrickHousePuzzle3_Text_19D07A:: @ 819D07A +Route110_TrickHousePuzzle3_Text_MarthaPostBattle:: @ 819D07A .string "Ich weiß, ich bin schwach! Ich weiß\n" .string "nicht, in welche Richtung es weitergeht.$" -Route110_TrickHousePuzzle3_Text_19D0AE:: @ 819D0AE +Route110_TrickHousePuzzle3_Text_AlanIntro:: @ 819D0AE .string "Ich verstehe es nicht. Was macht einer\n" .string "mit so einem bizarren Haus???$" -Route110_TrickHousePuzzle3_Text_19D0F0:: @ 819D0F0 +Route110_TrickHousePuzzle3_Text_AlanDefeat:: @ 819D0F0 .string "Ich verstehe es wieder nicht.\n" .string "Wie konnte ich jetzt verlieren?$" -Route110_TrickHousePuzzle3_Text_19D110:: @ 819D110 +Route110_TrickHousePuzzle3_Text_AlanPostBattle:: @ 819D110 .string "Ich habe absolut keine Ahnung...\n" .string "Wie viele Fallen gibt es in diesem Haus?\p" .string "Du kannst mir das bestimmt\n" .string "beantworten!$" -UnknownString_819D164: @ 819D164 +Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened: @ 819D164 .string "{PLAYER} hat den geheimen Code auf die\n" .string "Tür geschrieben.\p" .string "“RÄTSELMEISTER ist cool.”\n" diff --git a/data-de/maps/Route110_TrickHousePuzzle4/text.inc b/data-de/maps/Route110_TrickHousePuzzle4/text.inc index 126a27eab..55976e898 100644 --- a/data-de/maps/Route110_TrickHousePuzzle4/text.inc +++ b/data-de/maps/Route110_TrickHousePuzzle4/text.inc @@ -1,39 +1,39 @@ -Route110_TrickHousePuzzle4_Text_19D1DE:: @ 819D1DE +Route110_TrickHousePuzzle4_Text_CoraIntro:: @ 819D1DE .string "Ich habe keine Zeit, das zu verstehen.\n" .string "Ich will nur kämpfen!$" -Route110_TrickHousePuzzle4_Text_19D21F:: @ 819D21F +Route110_TrickHousePuzzle4_Text_CoraDefeat:: @ 819D21F .string "Auch wenn ich verloren habe, liebe ich\n" .string "das Kämpfen.$" -Route110_TrickHousePuzzle4_Text_19D253:: @ 819D253 +Route110_TrickHousePuzzle4_Text_CoraPostBattle:: @ 819D253 .string "Stimmst du mir zu? Du würdest überall\n" .string "hingehen, wo man TRAINER findet.$" -Route110_TrickHousePuzzle4_Text_19D295:: @ 819D295 +Route110_TrickHousePuzzle4_Text_YujiIntro:: @ 819D295 .string "Hey! Felsen wie diese räume ich mit\n" .string "dem kleinen Finger aus dem Weg.$" -Route110_TrickHousePuzzle4_Text_19D2D1:: @ 819D2D1 +Route110_TrickHousePuzzle4_Text_YujiDefeat:: @ 819D2D1 .string "Ich kann Felsen bewegen, aber ein\n" .string "Rätsel zu lösen ist mir zu schwer...$" -Route110_TrickHousePuzzle4_Text_19D306:: @ 819D306 +Route110_TrickHousePuzzle4_Text_YujiPostBattle:: @ 819D306 .string "Muskeln alleine sind nicht alles... Auch\n" .string "Gehirnschmalz ist wichtig. Sei helle!$" -Route110_TrickHousePuzzle4_Text_19D351:: @ 819D351 +Route110_TrickHousePuzzle4_Text_JillIntro:: @ 819D351 .string "Das RÄTSELHAUS wird immer\n" .string "verrätselter... äh, komplizierter, oder?$" -Route110_TrickHousePuzzle4_Text_19D380:: @ 819D380 +Route110_TrickHousePuzzle4_Text_JillDefeat:: @ 819D380 .string "Aaaak!$" -Route110_TrickHousePuzzle4_Text_19D386:: @ 819D386 +Route110_TrickHousePuzzle4_Text_JillPostBattle:: @ 819D386 .string "Hat es jemand schon mal bis zum\n" .string "Ende geschafft?$" -UnknownString_819D3A5: @ 819D3A5 +Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened: @ 819D3A5 .string "{PLAYER} hat den geheimen Code auf die\n" .string "Tür geschrieben.\p" .string "“RÄTSELMEISTER ist ein Genie.”\n" diff --git a/data-de/maps/Route110_TrickHousePuzzle5/text.inc b/data-de/maps/Route110_TrickHousePuzzle5/text.inc index 69870f2c8..0ec48faa5 100644 --- a/data-de/maps/Route110_TrickHousePuzzle5/text.inc +++ b/data-de/maps/Route110_TrickHousePuzzle5/text.inc @@ -1,142 +1,142 @@ -Route110_TrickHousePuzzle5_Text_19D423:: @ 819D423 +Route110_TrickHousePuzzle5_Text_Mechadoll1Intro:: @ 819D423 .string "KLICK-KLACK...\n" .string "ROBOPUPPE 1 ICH BIN!\p" .string "GIBST DU IM QUIZ RICHTIGE ANTWORTEN,\n" .string "ERREICHST DU BALD ROBOPUPPE 5.\l" .string "DORT ERHÄLTST DU DEN GEHEIMEN CODE.$" -Route110_TrickHousePuzzle5_Text_19D4AE:: @ 819D4AE +Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1:: @ 819D4AE .string "ROBOPUPPE 1 QUIZ.\p" .string "Eines dieser POKéMON kann man nicht\n" .string "auf der ROUTE 103 finden. Welches?$" -Route110_TrickHousePuzzle5_Text_19D501:: @ 819D501 +Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2:: @ 819D501 .string "ROBOPUPPE 1 QUIZ.\p" .string "Eines dieser POKéMON ist kein\n" .string "PFLANZEN-POKéMON. Welches?$" -Route110_TrickHousePuzzle5_Text_19D553:: @ 819D553 +Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3:: @ 819D553 .string "ROBOPUPPE 1 QUIZ.\p" .string "Eines dieser POKéMON setzt\n" .string "KRATZER ein. Welches?$" -Route110_TrickHousePuzzle5_Text_19D599:: @ 819D599 +Route110_TrickHousePuzzle5_Text_CorrectGoThrough1:: @ 819D599 .string "GLÜCKWUNSCH! RICHTIG.\n" .string "GEHE HINDURCH. BITTE.$" -Route110_TrickHousePuzzle5_Text_19D5CF:: @ 819D5CF +Route110_TrickHousePuzzle5_Text_DisappointmentError:: @ 819D5CF .string "BZZZT. ENTTÄUSCHEND.\n" .string "FEHLER.$" -Route110_TrickHousePuzzle5_Text_19D5ED:: @ 819D5ED +Route110_TrickHousePuzzle5_Text_Wahahahaha:: @ 819D5ED .string "WAHAHAHAHA! WAHAHAHAHA!\n" .string "KLICK-KLACK!$" -Route110_TrickHousePuzzle5_Text_19D615:: @ 819D615 +Route110_TrickHousePuzzle5_Text_WaitForNextChallenge:: @ 819D615 .string "DEINE NÄCHSTE HERAUSFORDERUNG WIR\n" .string "ERWARTEN.$" -Route110_TrickHousePuzzle5_Text_19D636:: @ 819D636 +Route110_TrickHousePuzzle5_Text_Mechadoll2Intro:: @ 819D636 .string "KLICK-KLACK...\n" .string "ROBOPUPPE 2 ICH BIN!\p" .string "ROBOPUPPE 1 QUIZ-SCHWIERIGKEITS-\n" .string "GRAD IST ZU NIEDRIG.$" -Route110_TrickHousePuzzle5_Text_19D68E:: @ 819D68E +Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1:: @ 819D68E .string "ROBOPUPPE 2 QUIZ.\p" .string "In PROF. BIRKS Beutel befanden sich\n" .string "drei POKéMON. Welches lag ganz rechts?$" -Route110_TrickHousePuzzle5_Text_19D6EC:: @ 819D6EC +Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2:: @ 819D6EC .string "ROBOPUPPE 2 QUIZ.\p" .string "Welches POKéMON wurde in der POKéMON\n" .string "TRAINERSCHULE zum Tausch angeboten?$" -Route110_TrickHousePuzzle5_Text_19D745:: @ 819D745 +Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3:: @ 819D745 .string "ROBOPUPPE 2 QUIZ.\p" .string "Welches POKéMON hat der FORSCHER von\n" .string "DEVON im BLÜTENBURGWALD gesucht?$" -UnknownString_819D79D: @ 819D79D +Route110_TrickHousePuzzle5_Text_CorrectGoThrough2: @ 819D79D .string "GLÜCKWUNSCH! RICHTIG.\n" .string "GEHE HINDURCH. BITTE.$" -Route110_TrickHousePuzzle5_Text_19D7D3:: @ 819D7D3 +Route110_TrickHousePuzzle5_Text_Mechadoll3Intro:: @ 819D7D3 .string "KLICK-KLACK...\n" .string "ROBOPUPPE 3 ICH BIN!\p" .string "FÜR MICH ZÄHLT NUR GELD.$" -Route110_TrickHousePuzzle5_Text_19D81B:: @ 819D81B +Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1:: @ 819D81B .string "ROBOPUPPE 3 QUIZ.\p" .string "Was ist teurer?\n" .string "Drei POKéBÄLLE oder ein SUPERTRANK?$" -Route110_TrickHousePuzzle5_Text_19D865:: @ 819D865 +Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2:: @ 819D865 .string "ROBOPUPPE 3 QUIZ.\p" .string "Verkaufe ein FLUCHTSEIL und kaufe ein\n" .string "GEGENGIFT. Wie viel Geld bleibt übrig?$" -Route110_TrickHousePuzzle5_Text_19D8BA:: @ 819D8BA +Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3:: @ 819D8BA .string "ROBOPUPPE 3 QUIZ.\p" .string "Kosten ein HYPERHEILER und ein\n" .string "SUPERBALL mehr als ein BELEBER?$" -UnknownString_819D907: @ 819D907 +Route110_TrickHousePuzzle5_Text_CorrectGoThrough3: @ 819D907 .string "GLÜCKWUNSCH! RICHTIG.\n" .string "GEHE HINDURCH. BITTE.$" -Route110_TrickHousePuzzle5_Text_19D93D:: @ 819D93D +Route110_TrickHousePuzzle5_Text_Mechadoll4Intro:: @ 819D93D .string "KLICK-KLACK...\n" .string "ROBOPUPPE 4 ICH BIN!\p" .string "ICH INTERESSIERE MICH FÜR SCHÖNES.$" -Route110_TrickHousePuzzle5_Text_19D987:: @ 819D987 +Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1:: @ 819D987 .string "ROBOPUPPE 4 QUIZ.\p" .string "ARENALEITERIN FELIZIA in METAROST\n" .string "CITY kämpft mit KLEINSTEIN. Ist es\l" .string "männlich oder weiblich?$" -Route110_TrickHousePuzzle5_Text_19D9DC:: @ 819D9DC +Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2:: @ 819D9DC .string "ROBOPUPPE 4 QUIZ.\p" .string "Befanden sich in der FAUSTAUHAVEN\n" .string "HALLE mehr Männer oder mehr Frauen?$" -Route110_TrickHousePuzzle5_Text_19DA1D:: @ 819DA1D +Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3:: @ 819DA1D .string "ROBOPUPPE 4 QUIZ.\p" .string "Der erste TRAINER in der ARENA von\n" .string "FAUSTAUHAVEN, war der männlich oder\l" .string "weiblich?$" -UnknownString_819DA64: @ 819DA64 +Route110_TrickHousePuzzle5_Text_CorrectGoThrough4: @ 819DA64 .string "GLÜCKWUNSCH! RICHTIG.\n" .string "GEHE HINDURCH. BITTE.$" -Route110_TrickHousePuzzle5_Text_19DA9A:: @ 819DA9A +Route110_TrickHousePuzzle5_Text_Mechadoll5Intro:: @ 819DA9A .string "KLICK-KLACK...\n" .string "ROBOPUPPE 5 ICH BIN!\p" .string "DES MEISTERS BESTE UND STOLZESTE\n" .string "ERFINDUNG ICH BIN.$" -Route110_TrickHousePuzzle5_Text_19DAEF:: @ 819DAEF +Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1:: @ 819DAEF .string "ROBOPUPPE 5 QUIZ.\p" .string "Wie viele RÄDER stehen bei\n" .string "RADLA vor dem Laden?$" -Route110_TrickHousePuzzle5_Text_19DB43:: @ 819DB43 +Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2:: @ 819DB43 .string "ROBOPUPPE 5 QUIZ.\p" .string "Von wie vielen Leuten bekommst du im\n" .string "BLÜTENTRAUM BLUMENLADEN BEEREN?$" -Route110_TrickHousePuzzle5_Text_19DB97:: @ 819DB97 +Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3:: @ 819DB97 .string "ROBOPUPPE 5 QUIZ.\p" .string "Wie viele Schilder gibt es in\n" .string "SEEGRASULB CITY?$" -UnknownString_819DBD4: @ 819DBD4 +Route110_TrickHousePuzzle5_Text_CorrectGoThrough5: @ 819DBD4 .string "GLÜCKWUNSCH! RICHTIG.\n" .string "GEHE HINDURCH. BITTE.$" -UnknownString_819DC0A: @ 819DC0A +Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened: @ 819DC0A .string "{PLAYER} hat den geheimen Code auf die\n" .string "Tür geschrieben.\p" .string "“RÄTSELMEISTER ist mein Leben.”\n" diff --git a/data-de/maps/Route110_TrickHousePuzzle6/text.inc b/data-de/maps/Route110_TrickHousePuzzle6/text.inc index ed61ec7b4..19bab3c9c 100644 --- a/data-de/maps/Route110_TrickHousePuzzle6/text.inc +++ b/data-de/maps/Route110_TrickHousePuzzle6/text.inc @@ -1,41 +1,41 @@ -Route110_TrickHousePuzzle6_Text_19DC87:: @ 819DC87 +Route110_TrickHousePuzzle6_Text_SophiaIntro:: @ 819DC87 .string "Als ich von dem seltsamen Haus hörte,\n" .string "musste ich mir das sofort ansehen.$" -Route110_TrickHousePuzzle6_Text_19DCC6:: @ 819DCC6 +Route110_TrickHousePuzzle6_Text_SophiaDefeat:: @ 819DCC6 .string "Ich habe einen starken TRAINER\n" .string "entdeckt!$" -Route110_TrickHousePuzzle6_Text_19DCE7:: @ 819DCE7 +Route110_TrickHousePuzzle6_Text_SophiaPostBattle:: @ 819DCE7 .string "Es hat viel Spaß gemacht, diesen Ort zu\n" .string "erforschen.\p" .string "Eine Herausforderung, die ich gerne\n" .string "wiederholen möchte!$" -Route110_TrickHousePuzzle6_Text_19DD49:: @ 819DD49 +Route110_TrickHousePuzzle6_Text_BennyIntro:: @ 819DD49 .string "Vielleicht kann mein VOGEL-POKéMON\n" .string "über die Mauer fliegen...$" -Route110_TrickHousePuzzle6_Text_19DD83:: @ 819DD83 +Route110_TrickHousePuzzle6_Text_BennyDefeat:: @ 819DD83 .string "Uaah! Ich hab's vermasselt!$" -Route110_TrickHousePuzzle6_Text_19DD96:: @ 819DD96 +Route110_TrickHousePuzzle6_Text_BennyPostBattle:: @ 819DD96 .string "Hihihihi... Ich habe doch nur verloren,\n" .string "weil ich bescheißen wollte.$" -Route110_TrickHousePuzzle6_Text_19DDCF:: @ 819DDCF +Route110_TrickHousePuzzle6_Text_SebastianIntro:: @ 819DDCF .string "Mir wird ganz schwindelig von diesen\n" .string "rotierenden Türen... Huuh...$" -Route110_TrickHousePuzzle6_Text_19DDFE:: @ 819DDFE +Route110_TrickHousePuzzle6_Text_SebastianDefeat:: @ 819DDFE .string "Bei mir dreht sich alles. Mir wird übel.\n" .string "Ich kann nicht mehr...$" -Route110_TrickHousePuzzle6_Text_19DE44:: @ 819DE44 +Route110_TrickHousePuzzle6_Text_SebastianPostBattle:: @ 819DE44 .string "Dir scheint das gar nichts auszumachen.\n" .string "Oder ist das nur Show?$" -UnknownString_819DE8D: @ 819DE8D +Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened: @ 819DE8D .string "{PLAYER} hat den geheimen Code auf die\n" .string "Tür geschrieben.\p" .string "“RÄTSELMEISTER ist riesig.”\n" diff --git a/data-de/maps/Route110_TrickHousePuzzle7/text.inc b/data-de/maps/Route110_TrickHousePuzzle7/text.inc index 3111fcb65..0a6117fce 100644 --- a/data-de/maps/Route110_TrickHousePuzzle7/text.inc +++ b/data-de/maps/Route110_TrickHousePuzzle7/text.inc @@ -1,40 +1,40 @@ -Route110_TrickHousePuzzle7_Text_19DF0B:: @ 819DF0B +Route110_TrickHousePuzzle7_Text_JoshuaIntro:: @ 819DF0B .string "Der RÄTSELMEISTER verschwindet immer\n" .string "wie Rauch. Wie macht er das nur?$" -Route110_TrickHousePuzzle7_Text_19DF4B:: @ 819DF4B +Route110_TrickHousePuzzle7_Text_JoshuaDefeat:: @ 819DF4B .string "Aiijeeh! Du bist viel zu stark!\n" .string "Wie machst du das nur?$" -Route110_TrickHousePuzzle7_Text_19DF7E:: @ 819DF7E +Route110_TrickHousePuzzle7_Text_JoshuaPostBattle:: @ 819DF7E .string "Ich wollte, ich könnte mich auch wie\n" .string "Rauch in Luft auflösen...$" -Route110_TrickHousePuzzle7_Text_19DFBB:: @ 819DFBB +Route110_TrickHousePuzzle7_Text_PatriciaIntro:: @ 819DFBB .string "Immer am gleichen Ort herumgeistern...\n" .string "Das bringt Unglück...$" -Route110_TrickHousePuzzle7_Text_19DFF2:: @ 819DFF2 +Route110_TrickHousePuzzle7_Text_PatriciaDefeat:: @ 819DFF2 .string "Besiegt!\n" .string "Das ist ein schlechtes Omen...$" -Route110_TrickHousePuzzle7_Text_19E00F:: @ 819E00F +Route110_TrickHousePuzzle7_Text_PatriciaPostBattle:: @ 819E00F .string "Ich bin nun schon zehn Mal an diesem Ort\n" .string "herumgegeistert. Daher hatte ich Pech!$" -Route110_TrickHousePuzzle7_Text_19E054:: @ 819E054 +Route110_TrickHousePuzzle7_Text_AlexisIntro:: @ 819E054 .string "Ich glaube, der Sieger wird der erste\n" .string "Gewinner an diesem Ort überhaupt sein.$" -Route110_TrickHousePuzzle7_Text_19E098:: @ 819E098 +Route110_TrickHousePuzzle7_Text_AlexisDefeat:: @ 819E098 .string "Ah!\n" .string "Dann geh hurtig weiter!$" -Route110_TrickHousePuzzle7_Text_19E0B2:: @ 819E0B2 +Route110_TrickHousePuzzle7_Text_AlexisPostBattle:: @ 819E0B2 .string "Ich glaube, du wirst alle Rätsel in\n" .string "diesem RÄTSELHAUS lösen!$" -UnknownString_819E0FF: @ 819E0FF +Route110_TrickHousePuzzle7_Text_WroteSecretCodeLockOpened: @ 819E0FF .string "{PLAYER} hat den geheimen Code auf die\n" .string "Tür geschrieben.\p" .string "“Ich liebe den RÄTSELMEISTER.”\n" diff --git a/data-de/maps/Route110_TrickHousePuzzle8/text.inc b/data-de/maps/Route110_TrickHousePuzzle8/text.inc index 74a7c868b..1a69c95f7 100644 --- a/data-de/maps/Route110_TrickHousePuzzle8/text.inc +++ b/data-de/maps/Route110_TrickHousePuzzle8/text.inc @@ -1,34 +1,34 @@ -Route110_TrickHousePuzzle8_Text_19E178:: @ 819E178 +Route110_TrickHousePuzzle8_Text_VincentIntro:: @ 819E178 .string "Nicht viele TRAINER haben es bis\n" .string "hierher geschafft.$" -Route110_TrickHousePuzzle8_Text_19E1A1:: @ 819E1A1 +Route110_TrickHousePuzzle8_Text_VincentDefeat:: @ 819E1A1 .string "Das bedeutet, dass du sehr stark bist...$" -Route110_TrickHousePuzzle8_Text_19E1C5:: @ 819E1C5 +Route110_TrickHousePuzzle8_Text_VincentPostBattle:: @ 819E1C5 .string "Du hast den CHAMP der POKéMON LIGA\n" .string "besiegt? Das ist zu viel für mich!$" -Route110_TrickHousePuzzle8_Text_19E201:: @ 819E201 +Route110_TrickHousePuzzle8_Text_ElaineIntro:: @ 819E201 .string "Sieh es als Glücksfall an, dass du gegen\n" .string "mich antreten darfst.$" -Route110_TrickHousePuzzle8_Text_19E22C:: @ 819E22C +Route110_TrickHousePuzzle8_Text_ElaineDefeat:: @ 819E22C .string "Das ist nicht korrekt!\n" .string "Ich darf nicht verlieren!$" -Route110_TrickHousePuzzle8_Text_19E24C:: @ 819E24C +Route110_TrickHousePuzzle8_Text_ElainePostBattle:: @ 819E24C .string "Nur ein Wunder hat dir zu diesem Sieg\n" .string "verholfen. Prahl doch damit...$" -Route110_TrickHousePuzzle8_Text_19E284:: @ 819E284 +Route110_TrickHousePuzzle8_Text_LeroyIntro:: @ 819E284 .string "Du schleichst hier auch durch das\n" .string "RÄTSELHAUS?$" -Route110_TrickHousePuzzle8_Text_19E2C1:: @ 819E2C1 +Route110_TrickHousePuzzle8_Text_LeroyDefeat:: @ 819E2C1 .string "Ich verstehe...\n" .string "Du hast einen außergewöhnlichen Stil.$" -Route110_TrickHousePuzzle8_Text_19E2EE:: @ 819E2EE +Route110_TrickHousePuzzle8_Text_LeroyPostBattle:: @ 819E2EE .string "Dein Anblick wird den RÄTSELMEISTER\n" .string "bestimmt erfreuen.$" diff --git a/data-de/maps/RustboroCity/text.inc b/data-de/maps/RustboroCity/text.inc index 6248b9e30..258a52c69 100644 --- a/data-de/maps/RustboroCity/text.inc +++ b/data-de/maps/RustboroCity/text.inc @@ -1,16 +1,16 @@ -RustboroCity_Text_16689D:: @ 816689D +RustboroCity_Text_WeShortenItToDevon:: @ 816689D .string "Die DEVON CORPORATION...\n" .string "Wir nennen sie kurz DEVON.\p" .string "Die Firma stellt viele praktische\n" .string "Dinge her.$" -RustboroCity_Text_16690C:: @ 816690C +RustboroCity_Text_SneakyLookingManWentAroundCorner:: @ 816690C .string "Hm? Ein verschlagen wirkender Mann?\p" .string "Wenn ich so darüber nachdenke, fällt mir\n" .string "ein, dass ich einen zwielichtigen Typen\l" .string "eben hier an der Ecke gesehen habe.$" -RustboroCity_Text_16696D:: @ 816696D +RustboroCity_Text_HaveYouChallengedGym:: @ 816696D .string "Hast du schon die Herausforderung der\n" .string "POKéMON ARENA angenommen?\p" .string "Ich glaube, wenn sie den glänzenden\n" @@ -18,19 +18,19 @@ RustboroCity_Text_16696D:: @ 816696D .string "den TRAINERN klar, was von ihnen\l" .string "verlangt wird.$" -RustboroCity_Text_1669FE:: @ 81669FE +RustboroCity_Text_HeyThatsRustborosGymBadge:: @ 81669FE .string "Hey, das ist der ORDEN der ARENA von\n" .string "METAROST CITY!\p" .string "Von allen ARENA-ORDEN ist der von\n" .string "METAROST CITY der coolste, sage ich dir.$" -RustboroCity_Text_166A67:: @ 8166A67 +RustboroCity_Text_YoureNewAroundHere:: @ 8166A67 .string "Oh? Wer magst du wohl sein?\n" .string "Ein neues Gesicht in dieser Gegend.\p" .string "Bist du gerade in die POKéMON TRAINER-\n" .string "SCHULE gekommen?$" -RustboroCity_Text_166AE0:: @ 8166AE0 +RustboroCity_Text_GymLeaderIsntEasyWithFire:: @ 8166AE0 .string "Ich habe den ARENALEITER heraus-\n" .string "gefordert, aber...\p" .string "Es ist nicht einfach, mit meinen FEUER-\n" @@ -38,13 +38,13 @@ RustboroCity_Text_166AE0:: @ 8166AE0 .string "FEUER-POKéMON haben keinen guten\n" .string "Stand gegenüber GESTEINS-POKéMON.$" -RustboroCity_Text_166B86:: @ 8166B86 +RustboroCity_Text_MrBrineyWalksInTheTunnel:: @ 8166B86 .string "Der alte Seebär MR. BRACK lebt in einer\n" .string "Hütte am Meer.\p" .string "Er geht sehr oft in dem Tunnel\n" .string "spazieren.$" -RustboroCity_Text_166BEF:: @ 8166BEF +RustboroCity_Text_MrBrineyLovesPeeko:: @ 8166BEF .string "Der alte Seebär MR. BRACK lebt in einer\n" .string "Hütte am Meer.\p" .string "Er sagt, er wäre in GRAPHITPORT CITY\n" @@ -53,42 +53,42 @@ RustboroCity_Text_166BEF:: @ 8166BEF .string "Der alte Seebär muss sein PECKO wirklich\n" .string "sehr lieben.$" -RustboroCity_Text_166C98:: @ 8166C98 +RustboroCity_Text_WowYouHavePokemon:: @ 8166C98 .string "Wow, du hast ja auch POKéMON dabei.\p" .string "Wenn ich größer bin, werde ich auch\n" .string "immer POKéMON dabeihaben.$" -RustboroCity_Text_166CFA:: @ 8166CFA +RustboroCity_Text_CatchRarePokemonIfIGoToSchool:: @ 8166CFA .string "POKéMON TRAINERSCHULE!\p" .string "Wenn ich in diese Schule gehe, werde ich\n" .string "später seltene POKéMON fangen können?$" -RustboroCity_Text_166D59:: @ 8166D59 +RustboroCity_Text_PokemonCanChangeLookFromExp:: @ 8166D59 .string "Wenn ein POKéMON Erfahrungen im Kampf\n" .string "sammelt, kann es vorkommen, dass es\l" .string "irgendwann sein Aussehen verändert.$" -RustboroCity_Text_166DB0:: @ 8166DB0 +RustboroCity_Text_PokemonChangeShape:: @ 8166DB0 .string "Ein POKéMON verändert sein Aussehen?!?\n" .string "Wenn es das tun würde, wäre ich zu Tode\l" .string "erschrocken!$" -RustboroCity_Text_166DEE:: @ 8166DEE +RustboroCity_Text_TradePokemonGrowFast:: @ 8166DEE .string "Ein POKéMON, das du durch Tausch\n" .string "erhältst, wächst schnell.\p" .string "Aber wenn dir ORDEN von bestimmten\n" .string "ARENEN fehlen, wird es dir eventuell\l" .string "nicht gehorchen.$" -RustboroCity_Text_166E65:: @ 8166E65 +RustboroCity_Text_OutOfTheWay:: @ 8166E65 .string "Geh weg! Aus dem Weg!!!$" -RustboroCity_Text_166E7E:: @ 8166E7E +RustboroCity_Text_WaitDontTakeMyGoods:: @ 8166E7E .string "Warte! Waaaaarte doch! Bitte!\p" .string "Du kannst doch nicht einfach meine\n" .string "WAREN stehlen!!!$" -RustboroCity_Text_166EA5:: @ 8166EA5 +RustboroCity_Text_HelpMeIWasRobbed:: @ 8166EA5 .string "Oh, du bist das!\p" .string "Du bist dieser großartige TRAINER, der\n" .string "mir im BLÜTENBURGWALD geholfen hat.\p" @@ -98,11 +98,11 @@ RustboroCity_Text_166EA5:: @ 8166EA5 .string "Wenn ich sie nicht bekomme...\n" .string "Dann habe ich ein riesiges Problem.$" -RustboroCity_Text_166F6B:: @ 8166F6B +RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel:: @ 8166F6B .string "Ich glaube, dieser zwielichtige Typ ist\n" .string "in Richtung Tunnel gelaufen.$" -RustboroCity_Text_166FB4:: @ 8166FB4 +RustboroCity_Text_YouGotItThankYou:: @ 8166FB4 .string "Oh! Und? Wie sieht es aus?\n" .string "Die DEVON-WAREN?\p" .string "Du hast es geschafft!\n" @@ -111,15 +111,15 @@ RustboroCity_Text_166FB4:: @ 8166FB4 .string "Ich weiß! Ich werde dir zum Dank einen\l" .string "weiteren SUPERBALL schenken!$" -RustboroCity_Text_16704C:: @ 816704C +RustboroCity_Text_YoureLoadedWithItems:: @ 816704C .string "Dein BEUTEL ist voll.\n" .string "Ich kann dir den SUPERBALL nicht geben.$" -RustboroCity_Text_16707F:: @ 816707F +RustboroCity_Text_PleaseComeWithMe:: @ 816707F .string "Bitte entschuldige!\n" .string "Würdest du mir bitte folgen?$" -RustboroCity_Text_1670A7:: @ 81670A7 +RustboroCity_Text_MayHiHowsPokedexComing:: @ 81670A7 .string "MAIKE: Oh, hi {PLAYER}{KUN}!\n" .string "Wie geht es mit deinem POKéDEX voran?\p" .string "Meiner sieht schon ganz anständig aus.\p" @@ -127,7 +127,7 @@ RustboroCity_Text_1670A7:: @ 81670A7 .string "POKéMON gefangen, bis ich keine\l" .string "POKéBÄLLE mehr hatte.$" -RustboroCity_Text_16713C:: @ 816713C +RustboroCity_Text_MayMrBrineyHint:: @ 816713C .string "MAIKE: Ach, übrigens. Ich habe MR.\n" .string "BRACK im BLÜTENBURGWALD gesehen.\p" .string "Ich glaube, er ist auf dem Weg zu seiner\n" @@ -136,7 +136,7 @@ RustboroCity_Text_16713C:: @ 816713C .string "gezogen, daher kannst du das nicht\l" .string "wissen, aber MR. BRACK war Seefahrer.$" -RustboroCity_Text_167213:: @ 8167213 +RustboroCity_Text_BrendanHiHowsPokedexComing:: @ 8167213 .string "BRIX: {PLAYER}, wie sieht es mit\n" .string "deinem POKéDEX aus?\p" .string "Meiner ist eine Wucht.\p" @@ -144,7 +144,7 @@ RustboroCity_Text_167213:: @ 8167213 .string "Menge POKéMON gefangen, bis ich keine\l" .string "POKéBÄLLE mehr hatte.$" -RustboroCity_Text_1672B8:: @ 81672B8 +RustboroCity_Text_BrendanMrBrineyHint:: @ 81672B8 .string "BRIX: Übrigens habe ich dort auch\n" .string "MR. BRACK gesehen.\p" .string "Ich wette, er ist auf dem Weg zu seiner\n" @@ -152,37 +152,37 @@ RustboroCity_Text_1672B8:: @ 81672B8 .string "Und ich wette, du weißt nicht, dass er\n" .string "immer ein POKéMON bei sich hat.$" -RustboroCity_Text_167374:: @ 8167374 +RustboroCity_Text_TunnelNearingCompletion:: @ 8167374 .string "“Tunnel zur Abkürzung steht vor\n" .string "Fertigstellung!”\p" .string "...Das steht auf dem Schild, aber darüber\n" .string "wurde ein “X” in roter Farbe gemalt...$" -RustboroCity_Text_1673FA:: @ 81673FA +RustboroCity_Text_DevonCorpSign:: @ 81673FA .string "DEVON CORPORATION\p" .string "“Alles, was man im Leben braucht - \n" .string "wir stellen es her.”$" -RustboroCity_Text_167439:: @ 8167439 +RustboroCity_Text_GymSign:: @ 8167439 .string "POKéMON ARENA von METAROST CITY\n" .string "LEITER: FELIZIA\p" .string "“GESTEINS-Liebhaberin und\n" .string "ihre Schüler!”$" -RustboroCity_Text_167485: @ 8167485 +RustboroCity_Text_DevonCorpBranchOfficeSign: @ 8167485 .string "DEVON CORP. FILIALE\p" .string "“Zutritt nur für Angestellte von DEVON\n" .string "und autorisierte Personen.”$" -RustboroCity_Text_1674DD:: @ 81674DD +RustboroCity_Text_CitySign:: @ 81674DD .string "METAROST CITY\p" .string "“Diese Stadt steht im Zeichen der Inte-\n" .string "gration von Natur und Wissenschaften.”$" -RustboroCity_Text_167525:: @ 8167525 +RustboroCity_Text_TrainersSchoolSign:: @ 8167525 .string "POKéMON TRAINERSCHULE\p" .string "“Wir bringen dir alles über die\n" .string "POKéMON bei!”$" -RustboroCity_Text_167568:: @ 8167568 +RustboroCity_Text_CuttersHouse:: @ 8167568 .string "HAUS DES ZERSCHNEIDERS$" diff --git a/data-de/maps/RustboroCity_CuttersHouse/text.inc b/data-de/maps/RustboroCity_CuttersHouse/text.inc index 7e8448070..8227096df 100644 --- a/data-de/maps/RustboroCity_CuttersHouse/text.inc +++ b/data-de/maps/RustboroCity_CuttersHouse/text.inc @@ -1,4 +1,4 @@ -RustboroCity_CuttersHouse_Text_18509C:: @ 818509C +RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse:: @ 818509C .string "Diese Entschlossenheit...\n" .string "Deine Beweglichkeit...\l" .string "Deine Hingabe für POKéMON...\p" @@ -11,7 +11,7 @@ RustboroCity_CuttersHouse_Text_18509C:: @ 818509C .string "Kein Grund, so schüchtern zu sein.\n" .string "Hier, nimm sie!$" -RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 +RustboroCity_CuttersHouse_Text_ExplainCut:: @ 81851C9 .string "Diese VM, sie enthält ZERSCHNEIDER.\p" .string "Eine VM ist eine Attacke, die auch\n" .string "außerhalb des Kampfes von einem\l" @@ -23,7 +23,7 @@ RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 .string "Und, im Gegensatz zur TM, kann eine VM\n" .string "mehrfach gelehrt werden.$" -RustboroCity_CuttersHouse_Text_1852B3:: @ 81852B3 +RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees:: @ 81852B3 .string "Als sie die Stadt METAROST CITY\n" .string "vergrößert haben, hat mein Vater ihnen\l" .string "geholfen.\p" diff --git a/data-de/maps/RustboroCity_DevonCorp_1F/text.inc b/data-de/maps/RustboroCity_DevonCorp_1F/text.inc index c7b4b4028..7555c5e32 100644 --- a/data-de/maps/RustboroCity_DevonCorp_1F/text.inc +++ b/data-de/maps/RustboroCity_DevonCorp_1F/text.inc @@ -1,23 +1,23 @@ -RustboroCity_DevonCorp_1F_Text_1828EE:: @ 81828EE +RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp:: @ 81828EE .string "Hallo und Willkommen in der\n" .string "DEVON CORPORATION.\p" .string "Wir sind die stolzen Entwickler von\n" .string "Medizin und Items, die das Leben\l" .string "bereichern.$" -RustboroCity_DevonCorp_1F_Text_18295E:: @ 818295E +RustboroCity_DevonCorp_1F_Text_StaffGotRobbed:: @ 818295E .string "Einem Mitglied unseres Forschungsteams\n" .string "ist blöderweise ein wichtiges Paket\l" .string "gestohlen worden.$" -RustboroCity_DevonCorp_1F_Text_1829A4:: @ 81829A4 +RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct:: @ 81829A4 .string "Hey, diese TURBOTRETER!\n" .string "Die haben wir auch entwickelt!\p" .string "Ich freue mich immer, wenn ich jemanden\n" .string "treffe, der eines unserer Produkte\l" .string "benutzt.$" -RustboroCity_DevonCorp_1F_Text_182A19:: @ 8182A19 +RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright:: @ 8182A19 .string "Das gestohlene Paket...\p" .string "Nun, es ist natürlich sehr wichtig, aber\n" .string "mit dem Inhalt kann niemand etwas\l" @@ -25,18 +25,18 @@ RustboroCity_DevonCorp_1F_Text_182A19:: @ 8182A19 .string "Meiner Einschätzung nach ist der Dieb\n" .string "wirklich nicht sehr schlau gewesen...$" -RustboroCity_DevonCorp_1F_Text_182AB3:: @ 8182AB3 +RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered:: @ 8182AB3 .string "Klingt, als hätten wir die gestohlenen\n" .string "DEVON-WAREN zurückerhalten.$" -RustboroCity_DevonCorp_1F_Text_182AF0:: @ 8182AF0 +RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter:: @ 8182AF0 .string "Tut mir Leid, aber nur autorisierte\n" .string "Personen haben hier Zutritt.$" -RustboroCity_DevonCorp_1F_Text_182B2D:: @ 8182B2D +RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed:: @ 8182B2D .string "Das ist mehr als blöd.\n" .string "Wie konnten wir nur ausgeraubt werden?$" -RustboroCity_DevonCorp_1F_Text_182B5A:: @ 8182B5A +RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere:: @ 8182B5A .string "Hi, du da!\n" .string "Du bist hier jederzeit willkommen!$" diff --git a/data-de/maps/RustboroCity_DevonCorp_2F/text.inc b/data-de/maps/RustboroCity_DevonCorp_2F/text.inc index 3e672ab46..3e29edcb7 100644 --- a/data-de/maps/RustboroCity_DevonCorp_2F/text.inc +++ b/data-de/maps/RustboroCity_DevonCorp_2F/text.inc @@ -1,16 +1,16 @@ -RustboroCity_DevonCorp_2F_Text_182B81:: @ 8182B81 +RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon:: @ 8182B81 .string "Wir wollen ein Gerät entwickeln, mit dem\n" .string "wir mit POKéMON reden können.\p" .string "Aber bisher waren wir nicht sehr\n" .string "erfolgreich...$" -RustboroCity_DevonCorp_2F_Text_182BD8:: @ 8182BD8 +RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls:: @ 8182BD8 .string "Ich entwickle neue Arten von\n" .string "POKéBÄLLEN...\p" .string "Aber noch bin ich nicht sonderlich weit\n" .string "mit der Entwicklung gekommen...$" -RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 +RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls:: @ 8182C25 .string "Wir haben endlich neue POKéBÄLLE\n" .string "entwickelt!\p" .string "Mit dem WIEDERBALL lassen sich\n" @@ -23,13 +23,13 @@ RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 .string "DEVON CORPORATION präsentiert.\p" .string "Probiere sie bitte unbedingt aus!$" -RustboroCity_DevonCorp_2F_Text_182D2A:: @ 8182D2A +RustboroCity_DevonCorp_2F_Text_IMadePokenav:: @ 8182D2A .string "Ich habe den POKéNAV entwickelt!\p" .string "Als Ingenieur erfüllt es mich mit Stolz,\n" .string "so etwas Großartiges entwickelt zu\l" .string "haben.$" -RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E +RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav:: @ 8182D7E .string "Oh, wow!\n" .string "Das ist ein POKéNAV!\p" .string "Er ist das Resultat der Wissbegierde\n" @@ -40,19 +40,19 @@ RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E .string "Ach was, du findest sie schon ganz\n" .string "alleine heraus.$" -RustboroCity_DevonCorp_2F_Text_182E6B:: @ 8182E6B +RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams:: @ 8182E6B .string "Ich arbeite an einer Vorrichtung, die\n" .string "die Träume der POKéMON visualisieren\l" .string "kann...\p" .string "Aber so richtig geht es nicht voran.$" -RustboroCity_DevonCorp_2F_Text_182ED5:: @ 8182ED5 +RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils:: @ 8182ED5 .string "Ich arbeite an einer Vorrichtung, die\n" .string "POKéMON aus Fossilien wieder zum Leben\l" .string "erweckt.\p" .string "Und... Es klappt!!!$" -RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 +RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife:: @ 8182F35 .string "Warte! Das Teil dort...\n" .string "Ist das ein POKéMON-Fossil?\p" .string "Möchtest du das POKéMON wieder zum\n" @@ -61,19 +61,19 @@ RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 .string "wicklung, dem FOSSIL-REGENERATOR,\l" .string "dabei helfen.$" -RustboroCity_DevonCorp_2F_Text_182FD7:: @ 8182FD7 +RustboroCity_DevonCorp_2F_Text_OhIsThatSo:: @ 8182FD7 .string "Ehrlich?\p" .string "DEVON besitzt einen hervorragenden\n" .string "Ruf in Sachen Technik. \l" .string "Das versichere ich dir!$" -RustboroCity_DevonCorp_2F_Text_183023:: @ 8183023 +RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher:: @ 8183023 .string "Exzellent!\n" .string "Dann lass uns sofort zur Tat schreiten.\p" .string "{PLAYER} gibt dem FORSCHER von DEVON\n" .string "{STR_VAR_1}.$" -RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 +RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime:: @ 8183072 .string "Der FOSSIL-REGENERATOR, den ich ent-\n" .string "wickelt habe, ist einfach unglaublich.\p" .string "Aber einen Nachteil gibt es: Es dauert\n" @@ -82,17 +82,17 @@ RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 .string "Also, äh... Warum schaust du dich in der\n" .string "Zeit nicht ein wenig um?$" -RustboroCity_DevonCorp_2F_Text_183124:: @ 8183124 +RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife:: @ 8183124 .string "Danke für deine Geduld!\p" .string "Dein fossiles POKéMON wurde zu neuem\n" .string "Leben erweckt!\p" .string "Das Fossil war ein altertümliches\n" .string "POKéMON. Ein {STR_VAR_2}!$" -RustboroCity_DevonCorp_2F_Text_18319E:: @ 818319E +RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher:: @ 818319E .string "{PLAYER} erhält das {STR_VAR_2} vom\n" .string "FORSCHER von DEVON.$" -RustboroCity_DevonCorp_2F_Text_1831C8:: @ 81831C8 +RustboroCity_DevonCorp_2F_Text_TooManyPokemon:: @ 81831C8 .string "Oh oh, du hast zu viele POKéMON bei dir.\n" .string "Du hast keinen Platz für dieses hier.$" diff --git a/data-de/maps/RustboroCity_DevonCorp_3F/text.inc b/data-de/maps/RustboroCity_DevonCorp_3F/text.inc index 01bca10d4..22a68c360 100644 --- a/data-de/maps/RustboroCity_DevonCorp_3F/text.inc +++ b/data-de/maps/RustboroCity_DevonCorp_3F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B +RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor:: @ 818320B .string "Ich bin MR. TRUMM, der PRÄSIDENT der\n" .string "DEVON CORPORATION.\p" .string "Ich muss etwas mit dir besprechen!\p" @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B .string "Und TROY in FAUSTAUHAVEN einen BRIEF\n" .string "von mir überbringen?$" -RustboroCity_DevonCorp_3F_Text_18337E:: @ 818337E +RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis:: @ 818337E .string "MR. TRUMM: Nun, du sollst wissen, dass\n" .string "ich ein einflussreicher PRÄSIDENT bin.\p" .string "Und daher würde ich dich nie um einen\n" @@ -23,10 +23,10 @@ RustboroCity_DevonCorp_3F_Text_18337E:: @ 818337E .string "Gegenleistung zu erbringen!\p" .string "Deshalb möchte ich dir dies hier geben.$" -RustboroCity_DevonCorp_3F_Text_183422:: @ 8183422 +RustboroCity_DevonCorp_3F_Text_ReceivedPokenav:: @ 8183422 .string "{PLAYER} erhält den POKéNAV.$" -RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 +RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenav:: @ 8183439 .string "MR. TRUMM: Dieses Gerät...\p" .string "Es ist ein POKéMON NAVIGATOR - oder\n" .string "kurz ein POKéNAV.\p" @@ -37,16 +37,16 @@ RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 .string "wo die Orte FAUSTAUHAVEN und\l" .string "GRAPHITPORT CITY liegen.$" -RustboroCity_DevonCorp_3F_Text_18351E:: @ 818351E +RustboroCity_DevonCorp_3F_Text_CountingOnYou:: @ 818351E .string "MR. TRUMM: Ich verlasse mich auf dich!$" -RustboroCity_DevonCorp_3F_Text_18353E:: @ 818353E +RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter:: @ 818353E .string "MR. TRUMM: Du hast meinen BRIEF\n" .string "überbracht? Herzlichen Dank!\p" .string "Dies ist ein Dankeschön von mir.\n" .string "Es wird dir als TRAINER sicher helfen.$" -RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 +RustboroCity_DevonCorp_3F_Text_ExplainExpShare:: @ 81835B3 .string "MR. TRUMM: Trägt ein POKéMON den EP-\n" .string "TEILER, so erhält es in jedem Kampf\l" .string "Erfahrungspunkte.\p" @@ -56,7 +56,7 @@ RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 .string "nützlich, um schwache POKéMON aufzu-\l" .string "ziehen.$" -RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D +RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends:: @ 818368D .string "MR. TRUMM: Schon in meiner Jugend habe\n" .string "ich mich voll auf die Arbeit\l" .string "konzentriert.\p" @@ -65,7 +65,7 @@ RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D .string "Wollen alle jungen Leute TRAINER in der\n" .string "POKéMON LIGA werden?$" -RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C +RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere:: @ 818374C .string "Dies ist die zweite Etage der DEVON\n" .string "CORPORATION.\p" .string "Hier befindet sich das BÜRO des\n" @@ -83,24 +83,24 @@ RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C .string "Ach, da fällt mir ein... Würdest du mich\n" .string "einen Moment entschuldigen?$" -RustboroCity_DevonCorp_3F_Text_183903:: @ 8183903 +RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe:: @ 8183903 .string "Unser PRÄSIDENT würde gerne kurz mit\n" .string "dir sprechen.\p" .string "Komm bitte mit mir.$" -RustboroCity_DevonCorp_3F_Text_18394A:: @ 818394A +RustboroCity_DevonCorp_3F_Text_PleaseGoAhead:: @ 818394A .string "Bitte, hier entlang.$" -RustboroCity_DevonCorp_3F_Text_18395C:: @ 818395C +RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard:: @ 818395C .string "Wenn du die WERFT in GRAPHITPORT CITY\n" .string "besuchst, solltest du mit KAPT. BRIGG\l" .string "sprechen.$" -RustboroCity_DevonCorp_3F_Text_1839A3:: @ 81839A3 +RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular:: @ 81839A3 .string "DEVONS neue Produkte, der WIEDERBALL\n" .string "und der TIMERBALL, sind mittlerweile\l" .string "sehr populär unter den TRAINERN.$" -RustboroCity_DevonCorp_3F_Text_183A04:: @ 8183A04 +RustboroCity_DevonCorp_3F_Text_RareRocksDisplay:: @ 8183A04 .string "Eine Kollektion seltener Steine und\n" .string "Mineralien - gesammelt vom PRÄSIDENTEN.$" diff --git a/data-de/maps/RustboroCity_Flat1_1F/text.inc b/data-de/maps/RustboroCity_Flat1_1F/text.inc index 44a6d8800..38881a2e8 100644 --- a/data-de/maps/RustboroCity_Flat1_1F/text.inc +++ b/data-de/maps/RustboroCity_Flat1_1F/text.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat1_1F_Text_184DB4:: @ 8184DB4 +RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility:: @ 8184DB4 .string "Jedes POKéMON besitzt eine spezielle\n" .string "Begabung, die es einsetzen kann.$" -RustboroCity_Flat1_1F_Text_184DE9:: @ 8184DE9 +RustboroCity_Flat1_1F_Text_PokemonStrange:: @ 8184DE9 .string "POKéMON sind sehr seltsame Geschöpfe.$" diff --git a/data-de/maps/RustboroCity_Flat1_2F/text.inc b/data-de/maps/RustboroCity_Flat1_2F/text.inc index d744b8484..cbec502fc 100644 --- a/data-de/maps/RustboroCity_Flat1_2F/text.inc +++ b/data-de/maps/RustboroCity_Flat1_2F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_Flat1_2F_Text_184E0D:: @ 8184E0D +RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard:: @ 8184E0D .string "Oh, jeden Tag wird es schwerer...\p" .string "Was so schwer ist?\n" .string "Das fragst du noch?\p" diff --git a/data-de/maps/RustboroCity_Flat2_1F/text.inc b/data-de/maps/RustboroCity_Flat2_1F/text.inc index d6cb53734..d112b0c70 100644 --- a/data-de/maps/RustboroCity_Flat2_1F/text.inc +++ b/data-de/maps/RustboroCity_Flat2_1F/text.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat2_1F_Text_1853DD:: @ 81853DD +RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere:: @ 81853DD .string "Die Angestellten der DEVON CORPORATION\n" .string "leben in diesem Haus.$" -RustboroCity_Flat2_1F_Text_185410:: @ 8185410 +RustboroCity_Flat2_1F_Text_Skitty:: @ 8185410 .string "ENECO: Gyaaaah!$" diff --git a/data-de/maps/RustboroCity_Flat2_2F/text.inc b/data-de/maps/RustboroCity_Flat2_2F/text.inc index 13d9b9f93..1974599ee 100644 --- a/data-de/maps/RustboroCity_Flat2_2F/text.inc +++ b/data-de/maps/RustboroCity_Flat2_2F/text.inc @@ -1,14 +1,14 @@ -RustboroCity_Flat2_2F_Text_185421:: @ 8185421 +RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays:: @ 8185421 .string "Vor langer, langer Zeit war DEVON eine\n" .string "kleine, überschaubare Firma.$" -RustboroCity_Flat2_2F_Text_185461:: @ 8185461 +RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt:: @ 8185461 .string "Mein Papa arbeitet für die CORPORATION.\p" .string "Mein Papa hat dies gemacht! Ich kann\n" .string "damit aber nichts anfangen, daher\l" .string "schenke ich es dir.$" -RustboroCity_Flat2_2F_Text_1854C4:: @ 81854C4 +RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo:: @ 81854C4 .string "Mein Papa arbeitet für die CORPORATION.\p" .string "Wenn ich groß bin, werde ich auch für\n" .string "DEVON arbeiten.$" diff --git a/data-de/maps/RustboroCity_Flat2_3F/text.inc b/data-de/maps/RustboroCity_Flat2_3F/text.inc index 3bb2affc0..bffc01907 100644 --- a/data-de/maps/RustboroCity_Flat2_3F/text.inc +++ b/data-de/maps/RustboroCity_Flat2_3F/text.inc @@ -1,7 +1,7 @@ -RustboroCity_Flat2_3F_Text_18551D:: @ 818551D +RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones:: @ 818551D .string "Der PRÄSIDENT von DEVON sammelt\n" .string "leidenschaftlich gerne seltene Steine.$" -RustboroCity_Flat2_3F_Text_18554D:: @ 818554D +RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones:: @ 818554D .string "Ich glaube, der Sohn des PRÄSIDENTEN\n" .string "sammelt auch seltene Steine.$" diff --git a/data-de/maps/RustboroCity_Gym/text.inc b/data-de/maps/RustboroCity_Gym/text.inc index d5c514fd8..885db4867 100644 --- a/data-de/maps/RustboroCity_Gym/text.inc +++ b/data-de/maps/RustboroCity_Gym/text.inc @@ -1,4 +1,4 @@ -RustboroCity_Gym_Text_183A4B:: @ 8183A4B +RustboroCity_Gym_Text_GymGuideAdvice:: @ 8183A4B .string "Hi, wie geht's?\p" .string "Hör zu, mein Freund!\n" .string "Würdest du gerne CHAMP werden?\p" @@ -23,7 +23,7 @@ RustboroCity_Gym_Text_183A4B:: @ 8183A4B .string "LEITERIN besiegt hast.\p" .string "Nun zeig, was du drauf hast!$" -RustboroCity_Gym_Text_183C90:: @ 8183C90 +RustboroCity_Gym_Text_GymGuidePostVictory:: @ 8183C90 .string "Hui! Was für ein atemberaubender Sieg!\n" .string "Meine Zurufe müssen gewirkt haben!\p" .string "Großartig!\n" @@ -35,31 +35,31 @@ RustboroCity_Gym_Text_183C90:: @ 8183C90 .string "hinter dir!\p" .string "Ein großartiges Gefühl!$" -RustboroCity_Gym_Text_183D99:: @ 8183D99 +RustboroCity_Gym_Text_JoshIntro:: @ 8183D99 .string "Unterschätze die TRAINER einer ARENA\n" .string "nicht! Ich zeige dir, warum wir die\l" .string "Besten sind!$" -RustboroCity_Gym_Text_183DDD:: @ 8183DDD +RustboroCity_Gym_Text_JoshDefeat:: @ 8183DDD .string "Du warst viel zu gut für mich...$" -RustboroCity_Gym_Text_183DF9:: @ 8183DF9 +RustboroCity_Gym_Text_JoshPostBattle:: @ 8183DF9 .string "Du hast noch gar nicht gesehen, was\n" .string "GESTEINS-POKéMON alles können.$" -RustboroCity_Gym_Text_183E38:: @ 8183E38 +RustboroCity_Gym_Text_TommyIntro:: @ 8183E38 .string "Wenn du mich nicht besiegen kannst,\n" .string "hast du keine Chance gegen FELIZIA.$" -RustboroCity_Gym_Text_183E78:: @ 8183E78 +RustboroCity_Gym_Text_TommyDefeat:: @ 8183E78 .string "Wow! Du hast wirklich Talent!$" -RustboroCity_Gym_Text_183E98:: @ 8183E98 +RustboroCity_Gym_Text_TommyPostBattle:: @ 8183E98 .string "FELIZIA ist um ein Vielfaches stärker\n" .string "als ich.\p" .string "Du solltest dich besser wappnen!$" -RustboroCity_Gym_Text_183EE5:: @ 8183EE5 +RustboroCity_Gym_Text_RoxanneIntro:: @ 8183EE5 .string "Hallo, ich bin FELIZIA, die LEITERIN der\n" .string "ARENA von METAROST CITY.\p" .string "Ich wurde ARENALEITERIN, um mein\n" @@ -68,7 +68,7 @@ RustboroCity_Gym_Text_183EE5:: @ 8183EE5 .string "Würdest du mir bitte zeigen, wie du\n" .string "kämpfst und mit welchen POKéMON?$" -RustboroCity_Gym_Text_183FC4:: @ 8183FC4 +RustboroCity_Gym_Text_RoxanneDefeat:: @ 8183FC4 .string "So...\n" .string "Ich habe verloren...\p" .string "Es scheint, ich muss noch eine ganze\n" @@ -80,11 +80,11 @@ RustboroCity_Gym_Text_183FC4:: @ 8183FC4 .string "Bitte nimm den offiziellen POKéMON LIGA\n" .string "STEINORDEN an!$" -RustboroCity_Gym_Text_1840AB:: @ 81840AB +RustboroCity_Gym_Text_ReceivedStoneBadge:: @ 81840AB .string "{PLAYER} hat den STEINORDEN von\n" .string "FELIZIA erhalten.$" -RustboroCity_Gym_Text_1840D5:: @ 81840D5 +RustboroCity_Gym_Text_StoneBadgeInfoTakeThis:: @ 81840D5 .string "Der STEINORDEN erhöht die Kraft der\n" .string "ATTACKEN deiner POKéMON.\p" .string "Außerdem sind sie nun in der Lage, die\n" @@ -92,7 +92,7 @@ RustboroCity_Gym_Text_1840D5:: @ 81840D5 .string "Kampfes einzusetzen.\p" .string "Dies möchte ich dir auch noch geben.$" -RustboroCity_Gym_Text_184170:: @ 8184170 +RustboroCity_Gym_Text_ExplainRockTomb:: @ 8184170 .string "Diese TM39 enthält FELSGRAB.\p" .string "Sie richtet nicht nur durch das Fallen\n" .string "von Steinen Schaden an, sondern\l" @@ -103,16 +103,16 @@ RustboroCity_Gym_Text_184170:: @ 8184170 .string "einmal beigebracht werden kann. Ihr\l" .string "Einsatz will also überlegt sein.$" -RustboroCity_Gym_Text_184252:: @ 8184252 +RustboroCity_Gym_Text_RoxannePostBattle:: @ 8184252 .string "Da du so stark bist, solltest du auch die\n" .string "anderen ARENALEITER herausfordern.\p" .string "Du lernst wertvolle Dinge dazu, wenn du\n" .string "gegen viele TRAINER antrittst.$" -RustboroCity_Gym_Text_1842CC:: @ 81842CC +RustboroCity_Gym_Text_GymStatue:: @ 81842CC .string "POKéMON ARENA von METAROST CITY$" -RustboroCity_Gym_Text_1842E6:: @ 81842E6 +RustboroCity_Gym_Text_GymStatueCertified:: @ 81842E6 .string "POKéMON ARENA von METAROST CITY\p" .string "FELIZIAS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/RustboroCity_House1/text.inc b/data-de/maps/RustboroCity_House1/text.inc index e47e4a727..c8f00b0c7 100644 --- a/data-de/maps/RustboroCity_House1/text.inc +++ b/data-de/maps/RustboroCity_House1/text.inc @@ -1,4 +1,4 @@ -RustboroCity_House1_Text_184EBA:: @ 8184EBA +RustboroCity_House1_Text_IllTradeIfYouWant:: @ 8184EBA .string "Gibst du deinen POKéMON Kosenamen?\n" .string "Ich habe meinem einen coolen Namen\l" .string "gegeben.\p" @@ -7,21 +7,21 @@ RustboroCity_House1_Text_184EBA:: @ 8184EBA .string "Hast du Lust, dein {STR_VAR_1} gegen\n" .string "mein {STR_VAR_2} zu tauschen?$" -RustboroCity_House1_Text_184F6B:: @ 8184F6B +RustboroCity_House1_Text_PleaseBeGoodToMyPokemon:: @ 8184F6B .string "Hihihihihi, oooh, ist das aufregend!$" -RustboroCity_House1_Text_184F8F:: @ 8184F8F +RustboroCity_House1_Text_ThatIsNoMon:: @ 8184F8F .string "Aber das ist kein {STR_VAR_1}.\n" .string "Tse, wie enttäuschend.$" -RustboroCity_House1_Text_184FC1:: @ 8184FC1 +RustboroCity_House1_Text_AwwItsAGoodMon:: @ 8184FC1 .string "Ooh, das ist ein gutes POKéMON...$" -RustboroCity_House1_Text_184FDD:: @ 8184FDD +RustboroCity_House1_Text_WontYouGetCurious:: @ 8184FDD .string "Willst du nicht wissen, wie andere\n" .string "Leute ihre POKéMON nennen?$" -RustboroCity_House1_Text_185020:: @ 8185020 +RustboroCity_House1_Text_AllSortsOfPlaces:: @ 8185020 .string "An allen Orten gibt es alle Sorten von\n" .string "POKéMON und Menschen.\p" .string "Ich finde das faszinierend, daher\n" diff --git a/data-de/maps/RustboroCity_House2/text.inc b/data-de/maps/RustboroCity_House2/text.inc index 2d9e4ab4d..42fca9903 100644 --- a/data-de/maps/RustboroCity_House2/text.inc +++ b/data-de/maps/RustboroCity_House2/text.inc @@ -1,9 +1,9 @@ -RustboroCity_House2_Text_18532D:: @ 818532D +RustboroCity_House2_Text_TrainerSchoolExcellent:: @ 818532D .string "Die TRAINERSCHULE ist hervorragend.\p" .string "Wenn du dort lernst, kannst du später\n" .string "sogar ARENALEITER werden.$" -RustboroCity_House2_Text_185388:: @ 8185388 +RustboroCity_House2_Text_RoxanneKnowsALot:: @ 8185388 .string "FELIZIA, die ARENALEITERIN, weiß\n" .string "wirklich eine Menge über POKéMON.\p" .string "Und sie ist sehr stark!$" diff --git a/data-de/maps/RustboroCity_House3/text.inc b/data-de/maps/RustboroCity_House3/text.inc index 1da0876d9..2221a4986 100644 --- a/data-de/maps/RustboroCity_House3/text.inc +++ b/data-de/maps/RustboroCity_House3/text.inc @@ -1,10 +1,10 @@ -RustboroCity_House3_Text_185584:: @ 8185584 +RustboroCity_House3_Text_IGivePerfectlySuitedNicknames:: @ 8185584 .string "Meinen eigenen POKéMON habe ich\n" .string "perfekt passende Kosenamen gegeben!\p" .string "Das ist mein Ausdruck von... äh...\n" .string "Originalität. Genau! Originalität!$" -RustboroCity_House3_Text_1855FA:: @ 81855FA +RustboroCity_House3_Text_NamingPikachuPekachu:: @ 81855FA .string "Aber ein PIKACHU einfach PEKACHU zu\n" .string "nennen? Das haut einen nicht gerade\l" .string "vom Hocker.\p" @@ -12,5 +12,5 @@ RustboroCity_House3_Text_1855FA:: @ 81855FA .string "leicht verständlichen Kosenamen wählen,\l" .string "aber irgendwie...$" -RustboroCity_House3_Text_18567D:: @ 818567D +RustboroCity_House3_Text_Pekachu:: @ 818567D .string "PEKACHU: Peka!$" diff --git a/data-de/maps/RustboroCity_Mart/text.inc b/data-de/maps/RustboroCity_Mart/text.inc index 5288402dc..b07c910d1 100644 --- a/data-de/maps/RustboroCity_Mart/text.inc +++ b/data-de/maps/RustboroCity_Mart/text.inc @@ -1,17 +1,17 @@ -RustboroCity_Mart_Text_184C76:: @ 8184C76 +RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish:: @ 8184C76 .string "Ich habe einige PARA-HEILER und\n" .string "etwas GEGENGIFT gekauft.\p" .string "Nur für den Fall, dass mir ein\n" .string "KNILZ im BLÜTENBURGWALD\l" .string "über den Weg läuft.$" -RustboroCity_Mart_Text_184CD8:: @ 8184CD8 +RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead:: @ 8184CD8 .string "Mein POKéMON hat sich entwickelt.\n" .string "Es hat jetzt sehr viele KP.\p" .string "Ich sollte nun einige SUPERTRÄNKE\n" .string "anstelle der normalen TRÄNKE kaufen.$" -RustboroCity_Mart_Text_184D43:: @ 8184D43 +RustboroCity_Mart_Text_GettingEscapeRopeJustInCase:: @ 8184D43 .string "Ich habe ein FLUCHTSEIL besorgt, falls\n" .string "ich mich mal in einer Höhle verlaufe.\p" .string "Damit kann ich zurück zum Eingang der\n" diff --git a/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc b/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc index 8c73d883e..f4b424237 100644 --- a/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37 +RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities:: @ 8184B37 .string "Mein POKéMON hat ein NAIVES\n" .string "Wesen und das meines Freundes ein\l" .string "FRÖHLICHES.\p" @@ -6,12 +6,12 @@ RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37 .string "unterschiedliche Persönlichkeiten\l" .string "haben.$" -RustboroCity_PokemonCenter_1F_Text_184BAB:: @ 8184BAB +RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon:: @ 8184BAB .string "Es gibt männliche und weibliche POKéMON.\p" .string "Aber niemand kann sagen, worin der\n" .string "eigentliche Unterschied liegt.$" -RustboroCity_PokemonCenter_1F_Text_184C19:: @ 8184C19 +RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor:: @ 8184C19 .string "Der Mann nebenan hat mir eine VM\n" .string "gegeben!\p" .string "Ich habe meinem POKéMON beigebracht,\n" diff --git a/data-de/maps/RustboroCity_PokemonSchool/text.inc b/data-de/maps/RustboroCity_PokemonSchool/text.inc index 9e477deaa..209a82c24 100644 --- a/data-de/maps/RustboroCity_PokemonSchool/text.inc +++ b/data-de/maps/RustboroCity_PokemonSchool/text.inc @@ -1,11 +1,11 @@ -RustboroCity_PokemonSchool_Text_184321:: @ 8184321 +RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges:: @ 8184321 .string "Auf der Tafel sind die Statusverände-\n" .string "rungen von POKéMON aufgelistet.$" -RustboroCity_PokemonSchool_Text_184368:: @ 8184368 +RustboroCity_PokemonSchool_Text_ReadWhichTopic:: @ 8184368 .string "Welches Thema möchtest du lesen?$" -RustboroCity_PokemonSchool_Text_184389:: @ 8184389 +RustboroCity_PokemonSchool_Text_ExplainPoison:: @ 8184389 .string "Wenn ein POKéMON vergiftet wurde, wird\n" .string "es ständig KP verlieren.\p" .string "Die Auswirkungen des Giftes halten\n" @@ -15,7 +15,7 @@ RustboroCity_PokemonSchool_Text_184389:: @ 8184389 .string "Mit einem GEGENGIFT kann das POKéMON\n" .string "geheilt werden.$" -RustboroCity_PokemonSchool_Text_184447:: @ 8184447 +RustboroCity_PokemonSchool_Text_ExplainParalysis:: @ 8184447 .string "Wurde ein POKéMON paralysiert, sinkt\n" .string "seine INITIATIVE.\p" .string "Es kann passieren, dass es während des\n" @@ -23,7 +23,7 @@ RustboroCity_PokemonSchool_Text_184447:: @ 8184447 .string "Die Paralyse hält auch nach dem Kampf\n" .string "an. Heile das POKéMON mit PARA-HEILER.$" -RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC +RustboroCity_PokemonSchool_Text_ExplainSleep:: @ 81844EC .string "Wenn ein POKéMON einschläft, kann es\n" .string "nicht mehr angreifen.\p" .string "Das POKéMON wird vielleicht von selber\n" @@ -31,25 +31,25 @@ RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC .string "und es noch schläft, schläft es weiter.\p" .string "Wecke es mit AUFWECKER auf.$" -RustboroCity_PokemonSchool_Text_1845A5:: @ 81845A5 +RustboroCity_PokemonSchool_Text_ExplainBurn:: @ 81845A5 .string "Eine Verbrennung senkt die Kraft des\n" .string "ANGRIFFS. Die KP nehmen ständig ab.\p" .string "Eine Verbrennung hält auch nach dem\n" .string "Kampf an. Setze FEUERHEILER ein!$" -RustboroCity_PokemonSchool_Text_184627:: @ 8184627 +RustboroCity_PokemonSchool_Text_ExplainFreeze:: @ 8184627 .string "Wurde ein POKéMON eingefroren, so ist\n" .string "es völlig hilflos.\p" .string "Auch nach dem Kampf hält der Zustand\n" .string "an. Setze dann EISHEILER ein.$" -RustboroCity_PokemonSchool_Text_1846A2:: @ 81846A2 +RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw:: @ 81846A2 .string "Schüler, die nicht aufpassen, bekommen\n" .string "meine FLINKKLAUE zu spüren.\p" .string "Wie du dieses Item einsetzt, zeigt,\n" .string "ob du ein guter Schüler bist oder nicht.$" -RustboroCity_PokemonSchool_Text_184737:: @ 8184737 +RustboroCity_PokemonSchool_Text_ExplainQuickClaw:: @ 8184737 .string "Ein POKéMON, das die FLINKKLAUE trägt,\n" .string "steigert seine Schnelligkeit und greift\l" .string "eventuell schneller an als sein Gegner.\p" @@ -57,21 +57,21 @@ RustboroCity_PokemonSchool_Text_184737:: @ 8184737 .string "einem POKéMON getragen werden können.\p" .string "Du kannst also noch viel lernen.$" -RustboroCity_PokemonSchool_Text_18480E:: @ 818480E +RustboroCity_PokemonSchool_Text_TradingRightNow:: @ 818480E .string "Ich tausche gerade mit meinem Freund\n" .string "POKéMON.$" -RustboroCity_PokemonSchool_Text_18483C:: @ 818483C +RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot:: @ 818483C .string "Ich wollte schon immer ein SAMURZEL\n" .string "haben - und endlich habe ich eines!$" -RustboroCity_PokemonSchool_Text_184873:: @ 8184873 +RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems:: @ 8184873 .string "POKéMON können Items tragen, aber sie\n" .string "wissen nicht, was sie mit Items von\l" .string "Menschen wie TRANK oder GEGENGIFT\l" .string "machen sollen.$" -RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 +RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself:: @ 81848D8 .string "Weißt du, wie man mit einigen POKéMON-\n" .string "Attacken ein POKéMON verwirren kann?\p" .string "Ein verwirrtes POKéMON wird manchmal\n" @@ -79,7 +79,7 @@ RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 .string "Aber sobald es aus dem Kampf genommen\n" .string "wird, ist es wieder normal.$" -RustboroCity_PokemonSchool_Text_184988:: @ 8184988 +RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry:: @ 8184988 .string "Ein POKéMON, das eine BEERE trägt, wird\n" .string "sich selber heilen...\p" .string "Es gibt viele Items, die ein POKéMON\n" @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_Text_184988:: @ 8184988 .string "Junge, Junge, ist das alles schwer\n" .string "zu merken...$" -RustboroCity_PokemonSchool_Text_184A17:: @ 8184A17 +RustboroCity_PokemonSchool_Text_StudentsNotes:: @ 8184A17 .string "Das ist das Heft eines Schülers...\p" .string "POKéMON werden mit POKéBÄLLEN\n" .string "gefangen.\p" diff --git a/data-de/maps/SlateportCity/text.inc b/data-de/maps/SlateportCity/text.inc index b65cf82a4..9ce6fa354 100644 --- a/data-de/maps/SlateportCity/text.inc +++ b/data-de/maps/SlateportCity/text.inc @@ -1,229 +1,229 @@ -SlateportCity_Text_164642:: @ 8164642 +SlateportCity_Text_EnergyGuruSellWhatYouNeed:: @ 8164642 .string "Ich bin der STATUSWERTE GURU!\n" .string "Ich werde dir verkaufen, was du\l" .string "brauchst!$" -SlateportCity_Text_164682:: @ 8164682 +SlateportCity_Text_OhYourPokemon:: @ 8164682 .string "Oh?\n" .string "Dein {STR_VAR_1}...$" -SlateportCity_Text_164691:: @ 8164691 +SlateportCity_Text_PleaseGiveItThisEffortRibbon:: @ 8164691 .string "Es hat sich enorm angestrengt!\p" .string "Gib ihm als Belohnung bitte dieses\n" .string "FLEISS-BAND.$" -SlateportCity_Text_1646DD:: @ 81646DD +SlateportCity_Text_ReceivedEffortRibbon:: @ 81646DD .string "{PLAYER} erhält das FLEISS-BAND.$" -SlateportCity_Text_1646FC:: @ 81646FC +SlateportCity_Text_PutEffortRibbonOnMon:: @ 81646FC .string "{PLAYER} steckt {STR_VAR_1} das\n" .string "FLEISS-BAND an.$" -SlateportCity_Text_16471C:: @ 816471C +SlateportCity_Text_GoForItLittleHarder:: @ 816471C .string "Du musst dich mehr anstrengen.\p" .string "Dann gebe ich dir und deinen POKéMON\n" .string "ein schönes Geschenk.$" -SlateportCity_Text_164775:: @ 8164775 +SlateportCity_Text_EffortRibbonLooksGoodOnIt:: @ 8164775 .string "Oh! Dein {STR_VAR_1} sieht gut mit dem\n" .string "FLEISS-BAND aus!$" -SlateportCity_Text_1647A7:: @ 81647A7 +SlateportCity_Text_WonderIfLighthouseStartlesPokemon:: @ 81647A7 .string "Das Licht dieses Leuchtturms sieht man\n" .string "dutzende von Kilometern weit.\p" .string "Ich frage mich, ob es nicht die POKéMON\n" .string "im Meer verwirrt.$" -SlateportCity_Text_164814:: @ 8164814 +SlateportCity_Text_SeaweedFullOfLife:: @ 8164814 .string "Ooh, schau dir das an!\p" .string "Das Seegras hier in dieser Gegend sieht\n" .string "frisch und fast lebendig aus.\p" .string "Es sieht aus, als könne es sich auf-\n" .string "richten und angreifen!$" -SlateportCity_Text_1648A0:: @ 81648A0 +SlateportCity_Text_HowTownIsBornAndGrows:: @ 81648A0 .string "Wo das Wasser sauber ist, geben die\n" .string "Früchte eine reiche Ernte.\p" .string "Und wo es eine reiche Ernte gibt, gibt\n" .string "es auch bald einen Markt.\p" .string "So entsteht und wächst eine Stadt.$" -SlateportCity_Text_164937:: @ 8164937 +SlateportCity_Text_SlateportWonderfulPlace:: @ 8164937 .string "Einkaufen, wo man die salzige Luft des\n" .string "Meeres einatmen kann...\p" .string "GRAPHITPORT CITY ist so ein toller Ort!$" -SlateportCity_Text_164995:: @ 8164995 +SlateportCity_Text_BuyBricksSoDecorWontGetDirty:: @ 8164995 .string "Wenn du PUPPEN oder KISSEN einfach auf\n" .string "den Boden legst, werden sie schmutzig.\p" .string "Ich kaufe mir einige BACKSTEINE, auf\n" .string "die ich meine PUPPEN und KISSEN lege.\l" .string "So bleiben sie schön sauber.$" -SlateportCity_Text_164A30:: @ 8164A30 +SlateportCity_Text_GoingToCompeteInPokemonContest:: @ 8164A30 .string "Yeah! Darauf habe ich lange gewartet!\n" .string "WETTBEWERBE für POKéMON!\l" .string "Ich werde mit Sicherheit teilnehmen!\p" .string "Aber vorher muss ich mir einige\n" .string "POKéMON fangen!$" -SlateportCity_Text_164AA9:: @ 8164AA9 +SlateportCity_Text_BushedHikingFromMauville:: @ 8164AA9 .string "Puuuh... Ich bin fix und fertig...\p" .string "Ich komme aus MALVENFROH CITY. Diese\n" .string "Stadt ist vielleicht groß! Riesengroß!\p" .string "Hätte ich das gewusst, wäre ich mit dem\n" .string "RAD gekommen.$" -SlateportCity_Text_164B34:: @ 8164B34 +SlateportCity_Text_EveryoneCallsHimCaptStern:: @ 8164B34 .string "Der Typ, der das MUSEUM gebaut\n" .string "hat, ist auch der Leiter eines Teams zur\l" .string "Erforschung der Tiefsee.\p" .string "Daher nennt ihn jeder KAPT. BRIGG.$" -SlateportCity_Text_164BBF:: @ 8164BBF +SlateportCity_Text_WhatsLongLineOverThere:: @ 8164BBF .string "Was ist das dort drüben?\n" .string "Diese Menschenansammlung...$" -SlateportCity_Text_164BEA:: @ 8164BEA +SlateportCity_Text_VisitedMuseumOften:: @ 8164BEA .string "Als ich noch ein Kind war, war ich oft in\n" .string "dem MUSEUM.\p" .string "Ich habe danach immer von den\n" .string "Mysterien des Meeres geträumt.$" -SlateportCity_Text_164C64:: @ 8164C64 +SlateportCity_Text_QuitPushing:: @ 8164C64 .string "Hey, du da! Hör auf zu drängeln!\n" .string "Wir stehen hier ordentlich an!$" -SlateportCity_Text_164C9F:: @ 8164C9F +SlateportCity_Text_EvilTeamHasPolicy:: @ 8164C9F .string "TEAM {EVIL_TEAM} verfolgt die Strategie des\n" .string "Versammelns und Verteilens.$" -SlateportCity_Text_164CE8:: @ 8164CE8 +SlateportCity_Text_BossIsBrilliant:: @ 8164CE8 .string "Unser BOSS ist brillant.\p" .string "Wozu er jetzt wohl Interesse am\n" .string "MUSEUM zeigt?$" -SlateportCity_Text_164D2B:: @ 8164D2B +SlateportCity_Text_WhatsNewSchemeIWonder:: @ 8164D2B .string "Was hat diese neue Masche zu bedeuten?\p" .string "Unser BOSS ist richtig Furcht ein-\n" .string "flößend, wenn er so abgedreht ist. Ich\l" .string "halte lieber Abstand und frage nicht...$" -SlateportCity_Text_164D92:: @ 8164D92 +SlateportCity_Text_ShouldTakeItAll:: @ 8164D92 .string "Wenn es im MUSEUM etwas Brauchbares\n" .string "gibt, dann müssen wir das an uns nehmen!$" -SlateportCity_Text_164DD5:: @ 8164DD5 +SlateportCity_Text_DontButtIn:: @ 8164DD5 .string "Hey, du! Du willst dich doch wohl\n" .string "nicht vordrängeln!?!$" -SlateportCity_Text_164DF4:: @ 8164DF4 +SlateportCity_Text_RemindsMeOfLongLineForGames:: @ 8164DF4 .string "Eine lange Schlange, was?\p" .string "Erinnert mich an die Zeiten, als ich\n" .string "Ewigkeiten anstand, um mir die neuesten\l" .string "brandheißen Spiele zu kaufen...$" -SlateportCity_Text_164E46:: @ 8164E46 +SlateportCity_Text_WhyAreWeLiningUp:: @ 8164E46 .string "Warum stehen wir hier eigentlich an und\n" .string "bezahlen? Wir sollten einfach\l" .string "hineingehen.$" -SlateportCity_Text_164E85:: @ 8164E85 +SlateportCity_Text_SeaIsSoWet:: @ 8164E85 .string "Das Meer ist wirklich überwältigend...\p" .string "Ob es durch die vergossenen Tränen der\n" .string "POKéMON entstanden ist?$" -SlateportCity_Text_164EDB:: @ 8164EDB +SlateportCity_Text_SinkOldBoats:: @ 8164EDB .string "Weißt du, was mit alten, nicht mehr\n" .string "seetüchtigen Schiffen gemacht wird?\p" .string "Sie werden im Meer versenkt und so\n" .string "zu Lebensraum für die POKéMON.$" -SlateportCity_Text_164F62:: @ 8164F62 +SlateportCity_Text_BuyTooMuch:: @ 8164F62 .string "Immer wenn ich hier herkomme, vergesse\n" .string "ich mich und kaufe wie bescheuert ein.$" -SlateportCity_Text_164F9E:: @ 8164F9E +SlateportCity_Text_GetNameRaterToHelpYou:: @ 8164F9E .string "Wenn du die Kosenamen deiner POKéMON\n" .string "ändern willst, solltest du den NAMEN-\l" .string "BEWERTER um Hilfe bitten.$" -SlateportCity_Text_164FFC:: @ 8164FFC +SlateportCity_Text_CantChangeTradeMonName:: @ 8164FFC .string "Erhältst du ein POKéMON durch Tausch,\n" .string "kannst du den Kosenamen nicht ändern.\p" .string "Die Liebe des ursprünglichen TRAINERS\n" .string "drückt sich in dem Kosenamen aus.$" -SlateportCity_Text_16507C:: @ 816507C +SlateportCity_Text_ContestHallBuiltRecently:: @ 816507C .string "Eine WETTBEWERBSHALLE für POKéMON\n" .string "wurde kürzlich in GRAPHITPORT CITY\l" .string "eröffnet.\p" .string "Ich plane dort hinzugehen, wenn ich\n" .string "meine POKéMON besser trainiert habe.$" -SlateportCity_Text_1650F1:: @ 81650F1 +SlateportCity_Text_DoYouKnowAboutBerryBlender:: @ 81650F1 .string "Hast du schon mal etwas über den\n" .string "BEERENMIXER gehört?$" -SlateportCity_Text_16511E:: @ 816511E +SlateportCity_Text_FasterSpinBetterPokeblocks:: @ 816511E .string "Man muss mit anderen zusammenarbeiten,\n" .string "um ihn schneller drehen zu können.\p" .string "Ich habe gehört, je schneller man ihn\n" .string "dreht, desto besser werden die {POKEBLOCK}.$" -SlateportCity_Text_1651A1:: @ 81651A1 +SlateportCity_Text_ExplainBerryBlender:: @ 81651A1 .string "Damit stellt man eine Leckerei her, die\n" .string "{POKEBLOCK} genannt wird.\p" .string "Wenn du einem POKéMON einen guten\n" .string "{POKEBLOCK} gibst, verbessern sich seine\l" .string "Eigenschaften.$" -SlateportCity_Text_165222:: @ 8165222 +SlateportCity_Text_CaptSternBeingInterviewed:: @ 8165222 .string "Ich habe gehofft, es wäre ein berühmter\n" .string "Star. Dann hätte ich mir ein Autogramm\l" .string "geben lassen.\p" .string "Aber wer wird denn da interviewt?\n" .string "Ist das nicht KAPT. BRIGG?$" -SlateportCity_Text_1652A0:: @ 81652A0 +SlateportCity_Text_InterviewerSoCool:: @ 81652A0 .string "Die Interviewerin ist so cool und\n" .string "hübsch.\p" .string "Wenn ich groß bin, werde ich ein\n" .string "weltberühmter Journalist.$" -SlateportCity_Text_16530A:: @ 816530A +SlateportCity_Text_SternSaysDiscoveredSomething:: @ 816530A .string "KAPT. BRIGG sagt, sie hätten etwas auf\n" .string "dem Meeresgrund entdeckt.\p" .string "Ich frage mich, was das wohl ist.\n" .string "Was könnte das sein???$" -SlateportCity_Text_165376:: @ 8165376 +SlateportCity_Text_CaptainComeBackWithBigFish:: @ 8165376 .string "Was ist denn hier los?\p" .string "Hat KAPT. BRIGG etwa einen Riesen-\n" .string "fisch vom Meeresgrund mitgebracht?$" -SlateportCity_Text_1653D1:: @ 81653D1 +SlateportCity_Text_AmIOnTV:: @ 81653D1 .string "Hey! Nimmst du mich auf?\n" .string "Komm ich jetzt ins Fernsehen?$" -SlateportCity_Text_1653F4:: @ 81653F4 +SlateportCity_Text_CaptainsACelebrity:: @ 81653F4 .string "Ein TV-Interview! Hier!!!\n" .string "Der KAPITÄN ist ein Star!$" -SlateportCity_Text_165425:: @ 8165425 +SlateportCity_Text_BigSmileForCamera:: @ 8165425 .string "UDO: Okay, KAPT. BRIGG, schenken Sie\n" .string "unserer Kamera Ihr schönstes Lächeln!$" -SlateportCity_Text_165458:: @ 8165458 +SlateportCity_Text_MostInvaluableExperience:: @ 8165458 .string "PIA: Ich verstehe, ich verstehe. Sie\n" .string "haben eine unschätzbare Entdeckung\l" .string "gemacht...$" -SlateportCity_Text_165498:: @ 8165498 +SlateportCity_Text_SternMoveAheadWithExploration:: @ 8165498 .string "KAPT. BRIGG: Ja, genau. Wir haben vor,\n" .string "unsere Expedition weiter fortzuführen.$" -SlateportCity_Text_1654E0:: @ 81654E0 +SlateportCity_Text_GabbyWonderfulThanksForInterview:: @ 81654E0 .string "PIA: Das ist wunderbar, KAPT. BRIGG!\n" .string "Vielen Dank, dass Sie trotz Ihres vollen\l" .string "Terminkalenders Zeit für uns gefunden\l" @@ -232,13 +232,13 @@ SlateportCity_Text_1654E0:: @ 81654E0 .string "aufregenden Funden interviewen zu\l" .string "dürfen!$" -SlateportCity_Text_16558D:: @ 816558D +SlateportCity_Text_SternWhewFirstInterview:: @ 816558D .string "KAPT. BRIGG: Puuh...\p" .string "Das war das erste Mal, dass ich für eine\n" .string "Fernsehsendung interviewt wurde. Ich\l" .string "war vielleicht nervööös!$" -SlateportCity_Text_1655E7:: @ 81655E7 +SlateportCity_Text_OhPlayerWeMadeDiscovery:: @ 81655E7 .string "Oh! {PLAYER}{KUN}!\n" .string "Gut siehst du aus!\p" .string "Wir haben bei unserer letzten Tiefsee-\n" @@ -250,7 +250,7 @@ SlateportCity_Text_1655E7:: @ 81655E7 .string "POKéMON, das schon lange ausge-\l" .string "storben ist.$" -SlateportCity_Text_1656BC:: @ 81656BC +SlateportCity_Text_EvilTeamWillAssumeControlOfSubmarine:: @ 81656BC .string "Hähähä...\n" .string "KAPT. BRIGG, nehme ich an.\p" .string "Wir vom TEAM {EVIL_TEAM} werden das U-Boot\n" @@ -261,76 +261,76 @@ SlateportCity_Text_1656BC:: @ 81656BC .string "Mal sehen, was ihr zu den Plänen von\l" .string "TEAM {EVIL_TEAM} sagt!$" -SlateportCity_Text_16578F:: @ 816578F +SlateportCity_Text_SternWhatWasAllThat:: @ 816578F .string "KAPT. BRIGG: Was soll das Ganze?\p" .string "Sieht aus, als benutze jemand ein\n" .string "Megaphon...\p" .string "Wo kommt das her?$" -SlateportCity_Text_1657FA:: @ 81657FA +SlateportCity_Text_FromHarborTryingToTakeSub:: @ 81657FA .string "Das kommt von der Anlegestelle!\p" .string "Das U-Boot!\n" .string "Jemand versucht, es zu stehlen!$" -SlateportCity_Text_16583A:: @ 816583A +SlateportCity_Text_PleaseComeWithMe:: @ 816583A .string "{PLAYER}{KUN}!\n" .string "Bitte, komm mit mir!$" -SlateportCity_Text_165856:: @ 8165856 +SlateportCity_Text_ContestHallSign:: @ 8165856 .string "POKéMON WETTBEWERBE\n" .string "HYPER-KLASSE REGISTRIERUNGEN\l" .string "“Lasst es krachen! POKéMON-\l" .string "TRAINER!”$" -SlateportCity_Text_1658A0:: @ 81658A0 +SlateportCity_Text_SternsShipyardWantedSign:: @ 81658A0 .string "BRIGGWERFT\p" .string "“Gesucht: Ein erfahrener Seemann,\n" .string "der die Gefahr nicht scheut.”$" -SlateportCity_Text_1658E8:: @ 81658E8 +SlateportCity_Text_SternsShipyardNearsCompletion:: @ 81658E8 .string "BRIGGWERFT\p" .string "“Die Fähre MS TIDE wird bald fertig\n" .string "gestellt sein und die Häfen von\l" .string "GRAPHITPORT CITY und SEEGRASULB CITY\l" .string "bedienen.”$" -SlateportCity_Text_165952:: @ 8165952 +SlateportCity_Text_SternsShipyardFerryComplete:: @ 8165952 .string "BRIGGWERFT\p" .string "“Bordkarten für die GRAPHITPORT CITY-\n" .string "SEEGRASULB CITY Fähre MS TIDE werden\l" .string "am HAFEN ausgegeben.”$" -SlateportCity_Text_1659B3:: @ 81659B3 +SlateportCity_Text_PokemonFanClubSign:: @ 81659B3 .string "POKéMON-FANCLUB\n" .string "“Wir rufen alle Fans der POKéMON!”$" -SlateportCity_Text_1659E3:: @ 81659E3 +SlateportCity_Text_OceanicMuseumSign:: @ 81659E3 .string "“Das unendliche Meer erhält\n" .string "alles Leben.”\p" .string "OZEANMUSEUM$" -SlateportCity_Text_165A17:: @ 8165A17 +SlateportCity_Text_CitySign:: @ 8165A17 .string "GRAPHITPORT CITY\p" .string "“Der Hafen, an dem sich Menschen\n" .string "und POKéMON begegnen.”$" -SlateportCity_Text_165A57:: @ 8165A57 +SlateportCity_Text_MarketSign:: @ 8165A57 .string "GRAPHITPORT CITY MARKT\n" .string "“Einzigartige Items, die es\l" .string "nirgendwo sonst gibt!”$" -SlateportCity_Text_165A8B:: @ 8165A8B +SlateportCity_Text_HarborFerryUnderConstruction:: @ 8165A8B .string "HAFEN GRAPHITPORT CITY\p" .string "“Die Fähre MS TIDE wird momentan\n" .string "in der WERFT gebaut.\p" .string "Die Fähre wird so bald wie möglich ihren\n" .string "Dienst aufnehmen.”$" -SlateportCity_Text_165B02:: @ 8165B02 +SlateportCity_Text_HarborSign:: @ 8165B02 .string "HAFEN GRAPHITPORT CITY\p" .string "“Genießen Sie die entspannende Fahrt\n" .string "mit der Fähre MS TIDE.”$" -SlateportCity_Text_165B48:: @ 8165B48 +SlateportCity_Text_NameRatersHouseSign:: @ 8165B48 .string "HAUS DES NAMENBEWERTERS\n" .string "“Bewertung von POKéMON-Kosenamen.”$" diff --git a/data-de/maps/SlateportCity_ContestLobby/text.inc b/data-de/maps/SlateportCity_ContestLobby/text.inc index 24d4c8529..36a07903c 100644 --- a/data-de/maps/SlateportCity_ContestLobby/text.inc +++ b/data-de/maps/SlateportCity_ContestLobby/text.inc @@ -1,27 +1,27 @@ -SlateportCity_ContestLobby_Text_17C937:: @ 817C937 +SlateportCity_ContestLobby_Text_WantToRaiseUltimateMon:: @ 817C937 .string "Ich möchte ein POKéMON aufziehen, das\n" .string "im Kampf und im WETTBEWERB\l" .string "“unbesiegbar” ist.\p" .string "Es ist schon verwirrend, herauszu-\n" .string "finden, welche Attacken es lernen soll.$" -SlateportCity_ContestLobby_Text_17C9D5:: @ 817C9D5 +SlateportCity_ContestLobby_Text_DoYourFriendsHaveBerries:: @ 817C9D5 .string "Haben einige deiner Freunde BEEREN?\p" .string "Du kannst den BEERENMIXER benutzen\n" .string "und zusammen mit ihnen {POKEBLOCK}\l" .string "herstellen.\p" .string "Das macht sehr viel Spaß!$" -SlateportCity_ContestLobby_Text_17CA67:: @ 817CA67 +SlateportCity_ContestLobby_Text_YouCanHavePokeblockCase:: @ 817CA67 .string "Ich habe zwei. Du kannst eine haben.$" -SlateportCity_ContestLobby_Text_17CA88:: @ 817CA88 +SlateportCity_ContestLobby_Text_PutPokeblocksInThere:: @ 817CA88 .string "Stelle {POKEBLOCK} her und verstaue sie\n" .string "darin.\p" .string "Wenn ihr einen {POKEBLOCK} herstellt, muss\n" .string "jeder eine andere BEERE einsetzen.$" -SlateportCity_ContestLobby_Text_17CAEC:: @ 817CAEC +SlateportCity_ContestLobby_Text_ContestWinnerPostersOnWall:: @ 817CAEC .string "Wenn du einen WETTBEWERB gewinnst,\n" .string "wird ein Bild deines POKéMON an die\l" .string "Wand gehängt.\p" diff --git a/data-de/maps/SlateportCity_Harbor/text.inc b/data-de/maps/SlateportCity_Harbor/text.inc index 930375a5f..08a15132b 100644 --- a/data-de/maps/SlateportCity_Harbor/text.inc +++ b/data-de/maps/SlateportCity_Harbor/text.inc @@ -1,46 +1,46 @@ -SlateportCity_Harbor_Text_17FA0A:: @ 817FA0A +SlateportCity_Harbor_Text_FerryServiceUnavailable:: @ 817FA0A .string "Verzeihung?\n" .string "Du suchst nach einem Schiff?\p" .string "Oh, das tut mir Leid, aber die Fähre\n" .string "steht momentan nicht zur Verfügung...$" -SlateportCity_Harbor_Text_17FA73:: @ 817FA73 +SlateportCity_Harbor_Text_MayISeeYourTicket:: @ 817FA73 .string "Hallo! Möchtest du mit der Fähre fahren?\n" .string "Zeigst du mir bitte dein TICKET?$" -SlateportCity_Harbor_Text_17FAAD:: @ 817FAAD +SlateportCity_Harbor_Text_YouMustHaveTicket:: @ 817FAAD .string "{PLAYER} hat kein TICKET...\p" .string "Das tut mir schrecklich Leid.\p" .string "Nur mit einem TICKET kannst du mit der\n" .string "Fähre fahren.$" -SlateportCity_Harbor_Text_17FB0A:: @ 817FB0A +SlateportCity_Harbor_Text_FlashedTicketWhereTo:: @ 817FB0A .string "{PLAYER} zückt das TICKET.\p" .string "Perfekt! Damit kannst du an Bord!\p" .string "Und wo soll die Reise hingehen?$" -SlateportCity_Harbor_Text_17FB5F:: @ 817FB5F +SlateportCity_Harbor_Text_SailAnotherTime:: @ 817FB5F .string "Bitte komm später noch einmal wieder!$" -SlateportCity_Harbor_Text_17FB81:: @ 817FB81 +SlateportCity_Harbor_Text_LilycoveItIs:: @ 817FB81 .string "Nach SEEGRASULB CITY?$" -SlateportCity_Harbor_Text_17FB9C:: @ 817FB9C +SlateportCity_Harbor_Text_BattleTowerItIs:: @ 817FB9C .string "Zum DUELLTURM?$" -SlateportCity_Harbor_Text_17FBB6:: @ 817FBB6 +SlateportCity_Harbor_Text_PleaseBoardFerry:: @ 817FBB6 .string "Bitte komm an Bord. Wir legen bald ab.$" -SlateportCity_Harbor_Text_17FBE5:: @ 817FBE5 +SlateportCity_Harbor_Text_WhereWouldYouLikeToGo:: @ 817FBE5 .string "Und wo soll die Reise hingehen?$" -SlateportCity_Harbor_Text_17FC07:: @ 817FC07 +SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday:: @ 817FC07 .string "Eine Reise zum Meeresboden...\n" .string "Ich frage mich, wie es dort wohl ist?\p" .string "Eines Tages möchte ich auch einmal so\n" .string "tief unter Wasser reisen.$" -SlateportCity_Harbor_Text_17FC7C:: @ 817FC7C +SlateportCity_Harbor_Text_SubTooSmallForMe:: @ 817FC7C .string "Ich wäre gerne mit KAPT. BRIGG auf die\n" .string "Expedition zum Meeresboden gegangen.\p" .string "Aber das U-Boot ist zu klein für mich.\p" @@ -48,13 +48,13 @@ SlateportCity_Harbor_Text_17FC7C:: @ 817FC7C .string "dann hätte der KAPITÄN keinen Platz\l" .string "mehr...$" -SlateportCity_Harbor_Text_17FD1C:: @ 817FD1C +SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum:: @ 817FD1C .string "KAPT. BRIGG: Diese Schlägertypen...\p" .string "Das sind die gleichen Typen, die\n" .string "versucht haben, die DEVON-WAREN aus\l" .string "dem MUSEUM zu stehlen.$" -SlateportCity_Harbor_Text_17FD7D:: @ 817FD7D +SlateportCity_Harbor_Text_YouAgainHideoutInLilycove:: @ 817FD7D .string "{EVIL_LEADER}: Ahahahahaha!!!!!\n" .string "Du tust mir ja so Leid!\p" .string "All die Mühen, um mir vom PYROBERG\n" @@ -65,7 +65,7 @@ SlateportCity_Harbor_Text_17FD7D:: @ 817FD7D .string "STECK in SEEGRASULB CITY folgen?\p" .string "Ahahahahaha!!!!!$" -SlateportCity_Harbor_Text_17FE60:: @ 817FE60 +SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine:: @ 817FE60 .string "KAPT. BRIGG: Warum...\p" .string "Warum sollte TEAM {EVIL_TEAM} mein TIEF-\n" .string "SEE-FORSCHUNGSBOOT 1 stehlen wollen?\p" @@ -75,7 +75,7 @@ SlateportCity_Harbor_Text_17FE60:: @ 817FE60 .string "Selbst wenn ich sie verfolgen würde...\n" .string "Ich hätte keine Chance gegen sie...$" -SlateportCity_Harbor_Text_17FF35:: @ 817FF35 +SlateportCity_Harbor_Text_EvilTeamLeftNeedDive:: @ 817FF35 .string "KAPT. BRIGG: Oh, {PLAYER}{KUN}...\p" .string "Okay... Du konntest TEAM {EVIL_TEAM} nicht\n" .string "aufhalten...\p" @@ -92,7 +92,7 @@ SlateportCity_Harbor_Text_17FF35:: @ 817FF35 .string "Vielleicht kann dir einer das\l" .string "beibringen...$" -SlateportCity_Harbor_Text_1800A0:: @ 81800A0 +SlateportCity_Harbor_Text_NeedDiveToCatchSub:: @ 81800A0 .string "KAPT. BRIGG: Ein U-Boot einzuholen und\n" .string "aufzuhalten... Das ist unmöglich.\p" .string "Du benötigst ein POKéMON, das weiß, wie\n" @@ -103,13 +103,13 @@ SlateportCity_Harbor_Text_1800A0:: @ 81800A0 .string "vielleicht kann dir einer das bei-\l" .string "bringen...$" -SlateportCity_Harbor_Text_18017B:: @ 818017B +SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry:: @ 818017B .string "KAPT. BRIGG: Oh, ja.\n" .string "MR. BRACK kam in unsere WERFT.\p" .string "Nun dauert es nicht mehr lange, bis wir\n" .string "unsere Fähre fertig stellen!$" -SlateportCity_Harbor_Text_1801EA:: @ 81801EA +SlateportCity_Harbor_Text_FinishedMakingFerry:: @ 81801EA .string "KAPT. BRIGG: {PLAYER}{KUN}!\p" .string "Wir haben die Fähre MS TIDE endlich\n" .string "fertig gestellt.\p" @@ -117,7 +117,7 @@ SlateportCity_Harbor_Text_1801EA:: @ 81801EA .string "BRACK hätten wir das nicht geschafft.\p" .string "Bitte, nimm an einer kurzen Fahrt teil!$" -SlateportCity_Harbor_Text_18028B:: @ 818028B +SlateportCity_Harbor_Text_WouldYouTradeScanner:: @ 818028B .string "KAPT. BRIGG: Oh?\n" .string "{PLAYER}{KUN}, das Item, das du da hast...\p" .string "Das ist ein SCANNER! Der würde uns\n" @@ -127,28 +127,28 @@ SlateportCity_Harbor_Text_18028B:: @ 818028B .string "Zum Beispiel gegen einen ABYSSZAHN\n" .string "oder eine ABYSSPLATTE?$" -SlateportCity_Harbor_Text_180360:: @ 8180360 +SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow:: @ 8180360 .string "KAPT. BRIGG: Bist du sicher? Aber damit\n" .string "kannst du doch nichts anfangen...\p" .string "Also gut. Wenn du aber den SCANNER doch\n" .string "noch gegen etwas anderes tauschen\l" .string "willst, dann lass es mich wissen!$" -SlateportCity_Harbor_Text_1803DD:: @ 81803DD +SlateportCity_Harbor_Text_TradeForDeepSeaTooth:: @ 81803DD .string "KAPT. BRIGG: Du möchtest den\n" .string "ABYSSZAHN dafür haben?$" -SlateportCity_Harbor_Text_180412:: @ 8180412 +SlateportCity_Harbor_Text_TradeForDeepSeaScale:: @ 8180412 .string "KAPT. BRIGG: Du möchtest die\n" .string "ABYSSPLATTE dafür haben?$" -SlateportCity_Harbor_Text_180447:: @ 8180447 +SlateportCity_Harbor_Text_WhichOneDoYouWant:: @ 8180447 .string "KAPT. BRIGG: Was hättest du gerne?$" -SlateportCity_Harbor_Text_18046B:: @ 818046B +SlateportCity_Harbor_Text_HandedScannerToStern:: @ 818046B .string "{PLAYER} gibt KAPT. BRIGG den SCANNER.$" -SlateportCity_Harbor_Text_180491:: @ 8180491 +SlateportCity_Harbor_Text_ThisWillHelpResearch:: @ 8180491 .string "KAPT. BRIGG: Danke, {PLAYER}{KUN}!\n" .string "Das wird unsere Forschungen weiter-\l" .string "bringen!$" diff --git a/data-de/maps/SlateportCity_House1/text.inc b/data-de/maps/SlateportCity_House1/text.inc index 1a5f503dd..3a6191382 100644 --- a/data-de/maps/SlateportCity_House1/text.inc +++ b/data-de/maps/SlateportCity_House1/text.inc @@ -1,47 +1,47 @@ -SlateportCity_House1_Text_17D46A:: @ 817D46A +SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname:: @ 817D46A .string "Hallo! Ich bin der NAMENBEWERTER!\n" .string "Ich bin das Orakel der Namen!\p" .string "Ich würde mich freuen, die Kosenamen\n" .string "deiner POKéMON bewerten zu dürfen.$" -SlateportCity_House1_Text_17D4DB:: @ 817D4DB +SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname:: @ 817D4DB .string "Für welches POKéMON soll ich den\n" .string "Kosenamen bewerten?$" -SlateportCity_House1_Text_17D505:: @ 817D505 +SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne:: @ 817D505 .string "Hmmm... {STR_VAR_1}, nicht wahr? Da hast\n" .string "du aber einen schönen Namen verliehen.\p" .string "Aber! Was hältst du davon, wenn ich ihm\n" .string "einen etwas besseren Namen gebe?$" -SlateportCity_House1_Text_17D580:: @ 817D580 +SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe:: @ 817D580 .string "Sehr schön! Und wie soll der neue\n" .string "Kosename lauten?$" -SlateportCity_House1_Text_17D5B0:: @ 817D5B0 +SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName:: @ 817D5B0 .string "Fertig! Von nun an heißt dein POKéMON\n" .string "{STR_VAR_1}!\p" .string "Das ist ein besserer Name als der\n" .string "vorherige. Welch ein Glück für dich!$" -SlateportCity_House1_Text_17D61E:: @ 817D61E +SlateportCity_NameRatersHouse_Text_DoVisitAgain:: @ 817D61E .string "Ich verstehe.\n" .string "Komm mich mal wieder besuchen.$" -SlateportCity_House1_Text_17D63A:: @ 817D63A +SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior:: @ 817D63A .string "Fertig! Von nun an heißt dein POKéMON\n" .string "{STR_VAR_1}!\p" .string "Eigentlich unterscheidet sich der Name\n" .string "nicht von dem vorherigen, und doch ist\l" .string "er um einiges besser! Welch ein Glück!$" -SlateportCity_House1_Text_17D6CC:: @ 817D6CC +SlateportCity_NameRatersHouse_Text_MagnificentName:: @ 817D6CC .string "Hmmm... {STR_VAR_1}!\p" .string "Das ist ein wundervoller Kosename!\n" .string "Ein Name ohne Fehl und Tadel!\p" .string "Du tust gut daran, {STR_VAR_1} auch\n" .string "weiterhin liebevoll zu behandeln!$" -SlateportCity_House1_Text_17D752:: @ 817D752 +SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg:: @ 817D752 .string "Mhm, mhm...\n" .string "Das ist eigentlich ein EI!$" diff --git a/data-de/maps/SlateportCity_House2/text.inc b/data-de/maps/SlateportCity_House2/text.inc index 360e4c1a7..c8d424815 100644 --- a/data-de/maps/SlateportCity_House2/text.inc +++ b/data-de/maps/SlateportCity_House2/text.inc @@ -1,17 +1,17 @@ -SlateportCity_House2_Text_1804CF:: @ 81804CF +SlateportCity_House_Text_NatureToDoWithStatGains:: @ 81804CF .string "Mein POKéMON hat ein HASTIGES Wesen.\p" .string "Seine INITIATIVE ist im Vergleich\n" .string "zu meinen anderen POKéMON höher.\p" .string "Vielleicht hat ihr Wesen etwas mit den\n" .string "Statusvorteilen der POKéMON zu tun.$" -SlateportCity_House2_Text_180567:: @ 8180567 +SlateportCity_House_Text_NeedContestPass:: @ 8180567 .string "Um an dem WETTBEWERB teilnehmen zu\n" .string "können, brauchst du eine\l" .string "WETTBEWERBSKARTE.\p" .string "Die bekommst du leicht. Jeder, der ein\n" .string "POKéMON hat, bekommt eine.$" -SlateportCity_House2_Text_1805CD:: @ 81805CD +SlateportCity_House_Text_HaveContestPass:: @ 81805CD .string "Oh, eine WETTBEWERBSKARTE!\n" .string "Bist du auch ein Bewerber?$" diff --git a/data-de/maps/SlateportCity_Mart/text.inc b/data-de/maps/SlateportCity_Mart/text.inc index 8c09f7874..c5c829b25 100644 --- a/data-de/maps/SlateportCity_Mart/text.inc +++ b/data-de/maps/SlateportCity_Mart/text.inc @@ -1,10 +1,10 @@ -SlateportCity_Mart_Text_180730:: @ 8180730 +SlateportCity_Mart_Text_SomeItemsOnlyAtMart:: @ 8180730 .string "Der MARKT bietet einige interessante\n" .string "Merchandising-Artikel an.\p" .string "Aber einige Sachen wirst du nur in einem\n" .string "POKéMON-SUPERMARKT finden.$" -SlateportCity_Mart_Text_18079D:: @ 818079D +SlateportCity_Mart_Text_GreatBallIsBetter:: @ 818079D .string "Ein SUPERBALL eignet sich besser zum\n" .string "Fangen von POKéMON als ein POKéBALL.\p" .string "Hiermit sollte ich in der Lage sein, das\n" diff --git a/data-de/maps/SlateportCity_OceanicMuseum_1F/text.inc b/data-de/maps/SlateportCity_OceanicMuseum_1F/text.inc index 5087f3278..9feaf084c 100644 --- a/data-de/maps/SlateportCity_OceanicMuseum_1F/text.inc +++ b/data-de/maps/SlateportCity_OceanicMuseum_1F/text.inc @@ -1,16 +1,16 @@ -SlateportCity_OceanicMuseum_1F_Text_17E18D:: @ 817E18D +SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter:: @ 817E18D .string "Willkommen im OZEANMUSEUM.\p" .string "Der Eintritt kostet ¥50.\n" .string "Hast du Interesse?$" -SlateportCity_OceanicMuseum_1F_Text_17E1DE:: @ 817E1DE +SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself:: @ 817E1DE .string "Viel Vergnügen!$" -SlateportCity_OceanicMuseum_1F_Text_17E1F5:: @ 817E1F5 +SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney:: @ 817E1F5 .string "Oh. Tut mir Leid, aber du hast\n" .string "anscheinend nicht genug Geld bei dir.$" -SlateportCity_OceanicMuseum_1F_Text_17E22D:: @ 817E22D +SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup:: @ 817E22D .string "Oh. Du gehörst zu der Gruppe, die gerade\n" .string "hineingegangen ist?\p" .string "Sie sind alle schon drin. Beeil dich,\n" @@ -19,57 +19,57 @@ SlateportCity_OceanicMuseum_1F_Text_17E22D:: @ 817E22D UnknownString_817E2A0: @ 817E2A0 .string "Bitte komm ein anderes Mal wieder!$" -SlateportCity_OceanicMuseum_1F_Text_17E2BB:: @ 817E2BB +SlateportCity_OceanicMuseum_1F_Text_EvilTeamExistForGoodOfAll:: @ 817E2BB .string "Wir, TEAM {EVIL_TEAM}, bestehen zum Besten\n" .string "für alle!$" -SlateportCity_OceanicMuseum_1F_Text_17E2E3:: @ 817E2E3 +SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere:: @ 817E2E3 .string "Uns wurde befohlen, uns hier zu\n" .string "versammeln. Das taten wir, aber...\p" .string "Unser BOSS, der Galgenvogel, ist nicht\n" .string "hier.$" -SlateportCity_OceanicMuseum_1F_Text_17E338:: @ 817E338 +SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich:: @ 817E338 .string "Wenn ich diese ganzen Sachen an mich\n" .string "reißen würde, wäre ich dann reich?$" -SlateportCity_OceanicMuseum_1F_Text_17E36F:: @ 817E36F +SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds:: @ 817E36F .string "Was ich hier lerne, kann ich für meine\n" .string "ruchlosen Taten gut gebrauchen...$" -SlateportCity_OceanicMuseum_1F_Text_17E3A9:: @ 817E3A9 +SlateportCity_OceanicMuseum_1F_Text_RustboroBungled:: @ 817E3A9 .string "Wenn dieser Idiot die Sache in\n" .string "METAROST CITY nicht vermasselt hätte,\l" .string "wären wir jetzt nicht hier.$" -SlateportCity_OceanicMuseum_1F_Text_17E3ED:: @ 817E3ED +SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney:: @ 817E3ED .string "Ich hatte keine ¥50, daher habe ich\n" .string "Ewigkeiten gebraucht, an der Rezeption\l" .string "vorbeizukommen.$" -SlateportCity_OceanicMuseum_1F_Text_17E434:: @ 817E434 +SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling:: @ 817E434 .string "Ich möchte etwas über das Meer lernen\n" .string "und dieses Wissen in Kämpfen einsetzen.$" -SlateportCity_OceanicMuseum_1F_Text_17E477:: @ 817E477 +SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel:: @ 817E477 .string "Mir wird ganz schwindelig und rühr-\n" .string "selig, wenn ich das Meer erblicke!\p" .string "Für mich ist KAPT. BRIGG das absolute\n" .string "Vorbild!$" -SlateportCity_OceanicMuseum_1F_Text_17E4D7:: @ 817E4D7 +SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow:: @ 817E4D7 .string "Das Meer ist erbarmungslos rau und\n" .string "unendlich tief...\p" .string "In ihm müssen viele POKéMON leben, die\n" .string "wir bisher noch nicht kennen.$" -SlateportCity_OceanicMuseum_1F_Text_17E540:: @ 817E540 +SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon:: @ 817E540 .string "Ich möchte ein POKéMON aus dem Meer\n" .string "haben.\p" .string "Wenn man das umarmt, ist es bestimmt\n" .string "schön kalt und wunderbar glitschig.$" -SlateportCity_OceanicMuseum_1F_Text_17E582:: @ 817E582 +SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis:: @ 817E582 .string "Aiyeeh!\n" .string "Was machst du hier?\p" .string "Ich? Ich bin vom TEAM {EVIL_TEAM}. Du hast\n" @@ -78,7 +78,7 @@ SlateportCity_OceanicMuseum_1F_Text_17E582:: @ 817E582 .string "Hier, das ist für dich!\n" .string "Vergeben und vergessen!$" -SlateportCity_OceanicMuseum_1F_Text_17E606:: @ 817E606 +SlateportCity_OceanicMuseum_1F_Text_YouScrewedUpOurPlans:: @ 817E606 .string "Au, verdammt!\n" .string "Du hast unsere Pläne zunichte gemacht!\p" .string "Ich wollte als Ausgleich etwas mitgehen\n" @@ -86,25 +86,25 @@ SlateportCity_OceanicMuseum_1F_Text_17E606:: @ 817E606 .string "Warte!\n" .string "Du bekommst deine Belohnung auch noch!$" -SlateportCity_OceanicMuseum_1F_Text_17E695:: @ 817E695 +SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis:: @ 817E695 .string "Oooch, komm schon!\n" .string "Nimm es und lass mich gehen!$" -SlateportCity_OceanicMuseum_1F_Text_17E6C9:: @ 817E6C9 +SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment:: @ 817E6C9 .string "Eine blaue Flüssigkeit bewegt sich\n" .string "spiralförmig in einem Glasgefäß.\p" .string "“Dies ist ein Experiment, das einen\n" .string "künstlichen WHIRLPOOL mit Hilfe von\l" .string "Wind erzeugt.”$" -SlateportCity_OceanicMuseum_1F_Text_17E741:: @ 817E741 +SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment:: @ 817E741 .string "Ein roter Ball hüpft in dem Glasgefäß\n" .string "auf und ab.\p" .string "“Dies ist ein Experiment, das eine\n" .string "künstliche KASKADE mit Hilfe des\l" .string "Ballauftriebs erzeugt.”$" -SlateportCity_OceanicMuseum_1F_Text_17E7C4:: @ 817E7C4 +SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay:: @ 817E7C4 .string "Dies ist eine Probe vom Meeresboden.\p" .string "“Über viele Jahre haben sich die Spuren\n" .string "allen Lebens als Sedimente auf dem\l" @@ -112,7 +112,7 @@ SlateportCity_OceanicMuseum_1F_Text_17E7C4:: @ 817E7C4 .string "Analysen dieser Proben geben einen\n" .string "Einblick in längst vergangenes Leben.”$" -SlateportCity_OceanicMuseum_1F_Text_17E892:: @ 817E892 +SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay:: @ 817E892 .string "Dies ist eine Probe vom Sand der Küste.\p" .string "“Die Gesteinsschichten der Berge\n" .string "wurden im Laufe der Jahre durch Wasser\l" @@ -120,7 +120,7 @@ SlateportCity_OceanicMuseum_1F_Text_17E892:: @ 817E892 .string "Nun sind sie nur noch kleine Körnchen,\n" .string "die den Sand an der Küste bilden.”$" -SlateportCity_OceanicMuseum_1F_Text_17E944:: @ 817E944 +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1:: @ 817E944 .string "“MEERESKUNDE FAKT 1”\n" .string "Warum ist das Wasser im Meer blau?\p" .string "“Licht setzt sich aus vielen\n" @@ -130,7 +130,7 @@ SlateportCity_OceanicMuseum_1F_Text_17E944:: @ 817E944 .string "Der Blauanteil des Lichts bleibt aber\n" .string "erhalten, das Wasser erscheint blau.”$" -SlateportCity_OceanicMuseum_1F_Text_17EA19:: @ 817EA19 +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2:: @ 817EA19 .string "“MEERESKUNDE FAKT 2”\n" .string "Warum ist das Meer salzig?\p" .string "“Meerwasser enthält gelöste Salzionen\n" @@ -140,7 +140,7 @@ SlateportCity_OceanicMuseum_1F_Text_17EA19:: @ 817EA19 .string "Die Konzentration des aufgelösten\n" .string "Salzes macht das Meer salzig.”$" -SlateportCity_OceanicMuseum_1F_Text_17EB0D:: @ 817EB0D +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3:: @ 817EB0D .string "“MEERESKUNDE FAKT 3”\n" .string "Was ist größer? Das Meer oder das Land?\p" .string "“Die Erde ist zu 70% von Wasser\n" @@ -148,7 +148,7 @@ SlateportCity_OceanicMuseum_1F_Text_17EB0D:: @ 817EB0D .string "Das Meer ist also mehr als doppelt\n" .string "so groß wie das Land.”$" -SlateportCity_OceanicMuseum_1F_Text_17EBBC:: @ 817EBBC +SlateportCity_OceanicMuseum_1F_Text_FossilDisplay:: @ 817EBBC .string "Das ist ein Fossil mit vielen Furchen.\p" .string "“Das Erdreich des Meeresbodens wird\n" .string "durch die Gezeiten abgetragen.\p" @@ -157,7 +157,7 @@ SlateportCity_OceanicMuseum_1F_Text_17EBBC:: @ 817EBBC .string "Wenn der Meeresboden versteinert, wird\n" .string "ein Bodenrelief sichtbar.”$" -SlateportCity_OceanicMuseum_1F_Text_17EC98:: @ 817EC98 +SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine:: @ 817EC98 .string "Eine seltsame Vorrichtung rotiert unter\n" .string "einer Glaskuppel.\p" .string "Vielleicht misst sie die Tiefe von\n" diff --git a/data-de/maps/SlateportCity_OceanicMuseum_2F/text.inc b/data-de/maps/SlateportCity_OceanicMuseum_2F/text.inc index 9f5c3eeab..3bf6c3a2d 100644 --- a/data-de/maps/SlateportCity_OceanicMuseum_2F/text.inc +++ b/data-de/maps/SlateportCity_OceanicMuseum_2F/text.inc @@ -1,4 +1,4 @@ -SlateportCity_OceanicMuseum_2F_Text_17ECFD:: @ 817ECFD +SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts:: @ 817ECFD .string "Ja? Wenn du BRIGG suchst... Der\n" .string "bin ich.\p" .string "Ah! Das müssen die Stücke sein, die ich\n" @@ -7,37 +7,37 @@ SlateportCity_OceanicMuseum_2F_Text_17ECFD:: @ 817ECFD .string "Nun können wir unsere Expedition\l" .string "vorbereiten.$" -SlateportCity_OceanicMuseum_2F_Text_17EDAE:: @ 817EDAE +SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts:: @ 817EDAE .string "Hähähähä! Wartet! Das ist doch viel zu\n" .string "schwer für euch! Wir nehmen das an uns!$" -SlateportCity_OceanicMuseum_2F_Text_17EDD7:: @ 817EDD7 +SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou:: @ 817EDD7 .string "KAPT. BRIGG: W... Was?\n" .string "Wer seid ihr?$" -SlateportCity_OceanicMuseum_2F_Text_17EE01:: @ 817EE01 +SlateportCity_OceanicMuseum_2F_Text_WereEvilTeam:: @ 817EE01 .string "Wir sind TEAM {EVIL_TEAM}!\p" .string "Unser BOSS will diese Dinge haben!\n" .string "Also hört auf zu labern und lasst die\l" .string "Teile rüberwachsen!$" -SlateportCity_OceanicMuseum_2F_Text_17EE4E:: @ 817EE4E +SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat:: @ 817EE4E .string "Oooaaah!\n" .string "Geschlagen von einem KIND!$" -SlateportCity_OceanicMuseum_2F_Text_17EE66:: @ 817EE66 +SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious:: @ 817EE66 .string "Oh, Mann! Was für ein Desaster...\n" .string "Der BOSS wird verdammt wütend sein...$" -SlateportCity_OceanicMuseum_2F_Text_17EEA5:: @ 817EEA5 +SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis:: @ 817EEA5 .string "Pah, du Waschlappen!\n" .string "Ich werde das Ding schon schaukeln!$" -SlateportCity_OceanicMuseum_2F_Text_17EED6:: @ 817EED6 +SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat:: @ 817EED6 .string "Was?!?\n" .string "Ich habe auch verloren?!?$" -SlateportCity_OceanicMuseum_2F_Text_17EEEA:: @ 817EEEA +SlateportCity_OceanicMuseum_2F_Text_MeddlingKid:: @ 817EEEA .string "Und nun? Wenn wir die Stücke nicht\n" .string "bekommen, können wir uns auf etwas\l" .string "gefasst machen!\p" @@ -45,13 +45,13 @@ SlateportCity_OceanicMuseum_2F_Text_17EEEA:: @ 817EEEA .string "dass ein nervendes Kind meine Nerven\l" .string "nervt.$" -SlateportCity_OceanicMuseum_2F_Text_17EF62:: @ 817EF62 +SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong:: @ 817EF62 .string "Ich bin gekommen, um zu sehen, warum ihr\n" .string "so lange braucht. Und was sehe ich? Ihr\l" .string "Idioten lasst euch von einem kleinen\l" .string "Kind die Suppe versalzen!$" -SlateportCity_OceanicMuseum_2F_Text_17EFC9:: @ 817EFC9 +SlateportCity_OceanicMuseum_2F_Text_ArchieWarning:: @ 817EFC9 .string "Ich bin ADRIAN vom TEAM AQUA.\p" .string "Kannst du mir verraten, warum du dich in\n" .string "die ehrbaren Pläne von TEAM AQUA ein-\l" @@ -72,7 +72,7 @@ SlateportCity_OceanicMuseum_2F_Text_17EFC9:: @ 817EFC9 .string "Das ist eine Warnung!\n" .string "Leb wohl!$" -SlateportCity_OceanicMuseum_2F_Text_17F17E:: @ 817F17E +SlateportCity_OceanicMuseum_2F_Text_MaxieWarning:: @ 817F17E .string "Ich bin MARC vom TEAM MAGMA.\p" .string "Himmel noch mal! Warum mischst du dich in\n" .string "die Pläne von TEAM MAGMA ein?\p" @@ -92,7 +92,7 @@ SlateportCity_OceanicMuseum_2F_Text_17F17E:: @ 817F17E .string "Das solltest du nicht vergessen!\n" .string "Leb wohl!$" -SlateportCity_OceanicMuseum_2F_Text_17F352:: @ 817F352 +SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs:: @ 817F352 .string "KAPT. BRIGG: Du bist...\n" .string "Aah, du bist {PLAYER}{KUN}...\p" .string "Wow, das war eine kritische Situation!\n" @@ -104,41 +104,41 @@ UnknownString_817F404: @ 817F404 .string "{PLAYER} gibt die DEVON-WAREN an\n" .string "KAPT. BRIGG.$" -SlateportCity_OceanicMuseum_2F_Text_17F433:: @ 817F433 +SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo:: @ 817F433 .string "KAPT. BRIGG: Hoppla!\n" .string "Wir dürfen keine Zeit mehr verlieren!\p" .string "Wir müssen so schnell wie möglich zur Ex-\n" .string "pedition zum Meeresgrund aufbrechen.\p" .string "Danke! Und entschuldige mich nun!$" -SlateportCity_OceanicMuseum_2F_Text_17F4B6:: @ 817F4B6 +SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip:: @ 817F4B6 .string "Ich habe hier ein Schiffsmodell\n" .string "gesehen.\p" .string "Es erinnert mich an das SCHIFFSWRACK\n" .string "in der Nähe von FAUSTAUHAVEN...$" -SlateportCity_OceanicMuseum_2F_Text_17F50E:: @ 817F50E +SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum:: @ 817F50E .string "Es ist strikt verboten, im MUSEUM\n" .string "zu rennen!$" -SlateportCity_OceanicMuseum_2F_Text_17F53B:: @ 817F53B +SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine:: @ 817F53B .string "Wow, das U-Boot ist der helle Wahnsinn!\n" .string "Damit würde ich gerne auf Fahrt gehen!$" -SlateportCity_OceanicMuseum_2F_Text_17F572:: @ 817F572 +SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1:: @ 817F572 .string "“KANTO WASSERQUALITÄT”\n" .string "steht auf dem Schild.\p" .string "Das Meer ist grenzübergreifend, aber\n" .string "das Wasser scheint in jeder Region eine\l" .string "andere Qualität zu haben.$" -SlateportCity_OceanicMuseum_2F_Text_17F5E3:: @ 817F5E3 +SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2:: @ 817F5E3 .string "“JOHTO WASSERQUALITÄT”\n" .string "steht auf dem Schild.\p" .string "Anscheinend ist der Salzgehalt in jeder\n" .string "Region anders.$" -SlateportCity_OceanicMuseum_2F_Text_17F653:: @ 817F653 +SlateportCity_OceanicMuseum_2F_Text_PressureExperiment:: @ 817F653 .string "Ein Gummiball wird größer und kleiner.\p" .string "“Im Meer sorgt das Gewicht des Wassers\n" .string "für ständigen Druck.\p" @@ -148,43 +148,43 @@ SlateportCity_OceanicMuseum_2F_Text_17F653:: @ 817F653 .string "Druck zehntausende von Tonnen inner-\l" .string "halb eines kleinen Bereiches betragen.”$" -SlateportCity_OceanicMuseum_2F_Text_17F754:: @ 817F754 +SlateportCity_OceanicMuseum_2F_Text_HoennModel:: @ 817F754 .string "“MODELL DER HOENN-REGION”\p" .string "Ein Diorama der HOENN-Region.\p" .string "Wo liegt hier WURZELHEIM?$" -SlateportCity_OceanicMuseum_2F_Text_17F7BC:: @ 817F7BC +SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay:: @ 817F7BC .string "Dies ist eine Anzeige der Meeres-\n" .string "strömungen.\p" .string "“In der Nähe des Meeresbodens sind die\n" .string "Strömungen abhängig von Faktoren wie\l" .string "Temperatur und Salzgehalt.”$" -SlateportCity_OceanicMuseum_2F_Text_17F84E:: @ 817F84E +SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay:: @ 817F84E .string "Dies ist eine Anzeige der Meeres-\n" .string "strömungen.\p" .string "“An der Oberfläche sind die Strömungen\n" .string "abhängig vom Einfluss des Windes.”$" -SlateportCity_OceanicMuseum_2F_Text_17F8BC:: @ 817F8BC +SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica:: @ 817F8BC .string "“DIE FÄHRE MS TIDE”\p" .string "“Ein maßstabsgetreues Modell eines\n" .string "Schiffes unter Konstruktion in der\l" .string "BRIGGWERFT.”$" -SlateportCity_OceanicMuseum_2F_Text_17F918:: @ 817F918 +SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica:: @ 817F918 .string "“TIEFSEE-FORSCHUNGSBOOT 1”\p" .string "“Ein Replikat des Hochleistungs-\n" .string "U-Bootes zur Erforschung des\l" .string "Meeresbodens.”$" -SlateportCity_OceanicMuseum_2F_Text_17F975:: @ 817F975 +SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica:: @ 817F975 .string "“TAUCHBOOT”\p" .string "“Ein Replikat eines kompakten,\n" .string "unbemannten Spezial-U-Bootes zur Er-\l" .string "forschung des Meeresbodens.”$" -SlateportCity_OceanicMuseum_2F_Text_17F9C7:: @ 817F9C7 +SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica:: @ 817F9C7 .string "“MS ANNE”\p" .string "“Ein Replikat eines Luxusliners, der\n" .string "um den Globus kreuzt.”$" diff --git a/data-de/maps/SlateportCity_PokemonCenter_1F/text.inc b/data-de/maps/SlateportCity_PokemonCenter_1F/text.inc index 291a0212d..aba387059 100644 --- a/data-de/maps/SlateportCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/SlateportCity_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -SlateportCity_PokemonCenter_1F_Text_180602:: @ 8180602 +SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon:: @ 8180602 .string "Möchtest du einen Tipp?\p" .string "Ich sage dir, es ist wichtig, die unter-\n" .string "schiedlichsten POKéMON zu trainieren.\p" @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F_Text_180602:: @ 8180602 .string "kann auch ein sehr starkes POKéMON\l" .string "einen Kampf verlieren.$" -SlateportCity_PokemonCenter_1F_Text_1806CB:: @ 81806CB +SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend:: @ 81806CB .string "Ich tausche mit Freunden POKéMON.\p" .string "Und wenn ein getauschtes POKéMON ein\n" .string "Item trägt, bin ich umso glücklicher!$" diff --git a/data-de/maps/SlateportCity_PokemonFanClub/text.inc b/data-de/maps/SlateportCity_PokemonFanClub/text.inc index e3dfa27c8..de7893844 100644 --- a/data-de/maps/SlateportCity_PokemonFanClub/text.inc +++ b/data-de/maps/SlateportCity_PokemonFanClub/text.inc @@ -1,4 +1,4 @@ -SlateportCity_PokemonFanClub_Text_17D773:: @ 817D773 +SlateportCity_PokemonFanClub_Text_MeetChairman:: @ 817D773 .string "Äh-hm. Ich bin der VORSITZENDE des\n" .string "POKéMON-FANCLUBS!\p" .string "Als VORSITZENDER bin ich natürlich die\n" @@ -24,15 +24,15 @@ SlateportCity_PokemonFanClub_Text_17D773:: @ 817D773 .string "Bitte, erlaube mir einen Blick auf deine\n" .string "POKéMON. Wie sind sie gewachsen?$" -SlateportCity_PokemonFanClub_Text_17DA14:: @ 817DA14 +SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing:: @ 817DA14 .string "Wie sehen deine POKéMON aus? Wie sind\n" .string "sie gewachsen? Erlaube mir einen Blick!$" -SlateportCity_PokemonFanClub_Text_17DA49:: @ 817DA49 +SlateportCity_PokemonFanClub_Text_HmHmISee:: @ 817DA49 .string "Hm, hm...\n" .string "Verstehe...$" -SlateportCity_PokemonFanClub_Text_17DA5C:: @ 817DA5C +SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks:: @ 817DA5C .string "Hmmm... Das ist weder gut noch\n" .string "schlecht...\p" .string "Du bist der TRAINER. Streng dich bei der\n" @@ -40,7 +40,7 @@ SlateportCity_PokemonFanClub_Text_17DA5C:: @ 817DA5C .string "Dürfte ich vorschlagen, ihm mehr\n" .string "{POKEBLOCK} zu geben?$" -SlateportCity_PokemonFanClub_Text_17DB0B:: @ 817DB0B +SlateportCity_PokemonFanClub_Text_NoSpaceForReward:: @ 817DB0B .string "Oh, hey...\p" .string "Dein POKéMON macht einen guten Ein-\n" .string "druck. Ich möchte dir eine Belohnung\l" @@ -48,51 +48,51 @@ SlateportCity_PokemonFanClub_Text_17DB0B:: @ 817DB0B .string "Leider hast du in deinem BEUTEL nicht\n" .string "mehr genügend Platz.$" -SlateportCity_PokemonFanClub_Text_17DB89:: @ 817DB89 +SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis:: @ 817DB89 .string "Dein {STR_VAR_1} ist wirklich sehr\n" .string "beeindruckend! Das ist wirklich ein\l" .string "wunderbares Exemplar!\p" .string "Und wenn du ihm dies gibst, wird\n" .string "es noch besser wachsen! Wirklich!$" -SlateportCity_PokemonFanClub_Text_17DC1B:: @ 817DC1B +SlateportCity_PokemonFanClub_Text_ExplainRedScarf:: @ 817DC1B .string "Lass ein POKéMON einen ROTEN SCHAL\n" .string "tragen.\p" .string "Dadurch wird die Coolness deines\n" .string "POKéMON unübersehbar!$" -SlateportCity_PokemonFanClub_Text_17DC74:: @ 817DC74 +SlateportCity_PokemonFanClub_Text_ExplainBlueScarf:: @ 817DC74 .string "Lass ein POKéMON einen BLAUEN SCHAL\n" .string "tragen.\p" .string "Dadurch wird die Schönheit deines\n" .string "POKéMON unübersehbar!$" -SlateportCity_PokemonFanClub_Text_17DCCB:: @ 817DCCB +SlateportCity_PokemonFanClub_Text_ExplainPinkScarf:: @ 817DCCB .string "Lass ein POKéMON einen ROSA SCHAL\n" .string "tragen.\p" .string "Dadurch wird die Anmut deines\n" .string "POKéMON unübersehbar!$" -SlateportCity_PokemonFanClub_Text_17DD27:: @ 817DD27 +SlateportCity_PokemonFanClub_Text_ExplainGreenScarf:: @ 817DD27 .string "Lass ein POKéMON einen GRÜNEN SCHAL\n" .string "tragen.\p" .string "Dadurch wird die Klugheit deines\n" .string "POKéMON unübersehbar!$" -SlateportCity_PokemonFanClub_Text_17DD78:: @ 817DD78 +SlateportCity_PokemonFanClub_Text_ExplainYellowScarf:: @ 817DD78 .string "Lass ein POKéMON einen GELBEN SCHAL\n" .string "tragen.\p" .string "Dadurch wird die Stärke deines\n" .string "POKéMON unübersehbar!$" -SlateportCity_PokemonFanClub_Text_17DDD5:: @ 817DDD5 +SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou:: @ 817DDD5 .string "Tut mir Leid, mehr kann ich dir leider\n" .string "nicht geben! Ich habe nichts mehr!\p" .string "Aber du besitzt etwas viel Wertvolleres:\n" .string "Das Talent, POKéMON ohne Zuhilfenahme\l" .string "von Items perfekt aufzuziehen!$" -SlateportCity_PokemonFanClub_Text_17DE6B:: @ 817DE6B +SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou:: @ 817DE6B .string "Ich freue mich immer, POKéMON zu sehen,\n" .string "die ihre TRAINER lieben.\p" .string "POKéMON haben ein sensibles Gespür\n" @@ -103,19 +103,19 @@ SlateportCity_PokemonFanClub_Text_17DE6B:: @ 817DE6B .string "Sobald dein POKéMON dich liebt, komm und\n" .string "besuche mich nochmals.$" -SlateportCity_PokemonFanClub_Text_17DF57:: @ 817DF57 +SlateportCity_PokemonFanClub_Text_PokemonAdoresYou:: @ 817DF57 .string "Dein POKéMON betet dich geradezu an.\p" .string "Für einen so mitfühlenden TRAINER\n" .string "hat der FANCLUB ein Geschenk!$" -SlateportCity_PokemonFanClub_Text_17DFB8:: @ 817DFB8 +SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove:: @ 817DFB8 .string "POKéMON haben ein sensibles Gespür\n" .string "für die Gefühle ihrer TRAINER.\p" .string "Wenn du einem POKéMON Liebe und\n" .string "Achtung entgegenbringst, werden die\l" .string "Gefühle erwidert.$" -SlateportCity_PokemonFanClub_Text_17E03B:: @ 817E03B +SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting:: @ 817E03B .string "Wenn ein POKéMON in einem Kampf besiegt\n" .string "wird, nimmt es das übel.\p" .string "Und bald wird es dem TRAINER weniger\n" @@ -123,16 +123,16 @@ SlateportCity_PokemonFanClub_Text_17E03B:: @ 817E03B .string "Mit anderen Worten: Es wird dich nicht\n" .string "mehr so sehr mögen.$" -SlateportCity_PokemonFanClub_Text_17E0ED:: @ 817E0ED +SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein:: @ 817E0ED .string "Mögen POKéMON Items?\p" .string "Mein POKéMON hat sich sehr gefreut,\n" .string "als ich ihm PROTEIN gegeben habe.$" -SlateportCity_PokemonFanClub_Text_17E14E:: @ 817E14E +SlateportCity_PokemonFanClub_Text_Skitty:: @ 817E14E .string "ENECO: Fffnyaaaah...$" -SlateportCity_PokemonFanClub_Text_17E164:: @ 817E164 +SlateportCity_PokemonFanClub_Text_Zigzagoon:: @ 817E164 .string "ZIGZACHS: Kyuuu...$" -SlateportCity_PokemonFanClub_Text_17E178:: @ 817E178 +SlateportCity_PokemonFanClub_Text_Azumarill:: @ 817E178 .string "AZUMARILL: Marimari?$" diff --git a/data-de/maps/SlateportCity_SternsShipyard_1F/text.inc b/data-de/maps/SlateportCity_SternsShipyard_1F/text.inc index d38e4b7ae..3fdb0b1ac 100644 --- a/data-de/maps/SlateportCity_SternsShipyard_1F/text.inc +++ b/data-de/maps/SlateportCity_SternsShipyard_1F/text.inc @@ -1,4 +1,4 @@ -SlateportCity_SternsShipyard_1F_Text_17C14B:: @ 817C14B +SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails:: @ 817C14B .string "Ähmm... Wenn das hierhin gehört und das\n" .string "dahin...\p" .string "Wo gehört dieses dann hin?\n" @@ -6,7 +6,7 @@ SlateportCity_SternsShipyard_1F_Text_17C14B:: @ 817C14B .string "Aaargh! Ich werde daraus einfach nicht\n" .string "schlau!$" -SlateportCity_SternsShipyard_1F_Text_17C1EC:: @ 817C1EC +SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern:: @ 817C1EC .string "Hm?\n" .string "Hallo, ich bin BOOTMAR.\p" .string "KAPT. BRIGG hat mich damit\n" @@ -21,26 +21,26 @@ SlateportCity_SternsShipyard_1F_Text_17C1EC:: @ 817C1EC .string "Kann ich dich bitten, KAPT. BRIGG zu\n" .string "suchen und ihm das Paket zu bringen?$" -SlateportCity_SternsShipyard_1F_Text_17C2F2:: @ 817C2F2 +SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern:: @ 817C2F2 .string "BOOTMAR: Wo könnte KAPT. BRIGG wohl\n" .string "hingegangen sein?\p" .string "Kannst du bitte KAPT. BRIGG suchen und\n" .string "ihm die Waren übergeben?$" -SlateportCity_SternsShipyard_1F_Text_17C360:: @ 817C360 +SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran:: @ 817C360 .string "BOOTMAR: Der Schiffsbau ist eine Kunst.\p" .string "Manche Dinge lassen sich auch durch\n" .string "Berechnungen nicht vorhersehen.\p" .string "Jemand, der das Meer kennt wie seine\n" .string "Westentasche, müsste mir helfen...$" -SlateportCity_SternsShipyard_1F_Text_17C3F7:: @ 817C3F7 +SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs:: @ 817C3F7 .string "BOOTMAR: Hallo! MR. BRACK hat sich bereit\n" .string "erklärt, uns zu helfen.\p" .string "Dank dieses erfahrenen Seemannes\n" .string "kommen wir zügig voran.$" -SlateportCity_SternsShipyard_1F_Text_17C472:: @ 817C472 +SlateportCity_SternsShipyard_1F_Text_FerryIsReady:: @ 817C472 .string "BOOTMAR: Die Fähre ist bald fertig!\p" .string "Die neue MS TIDE ist ein wahres\n" .string "Technikwunder!\p" @@ -49,7 +49,7 @@ SlateportCity_SternsShipyard_1F_Text_17C472:: @ 817C472 .string "Weißt du, die technische Entwicklung\n" .string "wird niemals abgeschlossen sein.$" -SlateportCity_SternsShipyard_1F_Text_17C53D:: @ 817C53D +SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock:: @ 817C53D .string "MR. BRACK: Ah, {PLAYER}{KUN}!\n" .string "Es ist schon lange her!\p" .string "Aye, seit ich dich kennen gelernt habe,\n" @@ -67,7 +67,7 @@ SlateportCity_SternsShipyard_1F_Text_17C53D:: @ 817C53D UnknownString_817C6A6: @ 817C6A6 .string "PECKO: Pii piihyoro!$" -SlateportCity_SternsShipyard_1F_Text_17C6BB:: @ 817C6BB +SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing:: @ 817C6BB .string "Die Jahreszeit, das Wetter, der Mond,\n" .string "der vom Himmel herabstrahlt...\p" .string "Das sind die Bedingungen, die die See\n" @@ -75,6 +75,6 @@ SlateportCity_SternsShipyard_1F_Text_17C6BB:: @ 817C6BB .string "Ganz genau!\n" .string "Die See ist wie ein lebendiges Wesen!$" -SlateportCity_SternsShipyard_1F_Text_17C764:: @ 817C764 +SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily:: @ 817C764 .string "Ich werde sehr schnell seekrank.\n" .string "Deshalb helfe ich lieber hier aus.$" diff --git a/data-de/maps/SlateportCity_SternsShipyard_2F/text.inc b/data-de/maps/SlateportCity_SternsShipyard_2F/text.inc index d2a0dbd4c..b534a8515 100644 --- a/data-de/maps/SlateportCity_SternsShipyard_2F/text.inc +++ b/data-de/maps/SlateportCity_SternsShipyard_2F/text.inc @@ -1,9 +1,9 @@ -SlateportCity_SternsShipyard_2F_Text_17C7A2:: @ 817C7A2 +SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding:: @ 817C7A2 .string "Die Konstruktion eines großen Schiffes\n" .string "ist eher vergleichbar mit der eines\l" .string "Gebäudes, als eines Transportmittels.$" -SlateportCity_SternsShipyard_2F_Text_17C80C:: @ 817C80C +SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy:: @ 817C80C .string "Findest du es nicht auch seltsam, dass\n" .string "ein Schiff aus Eisen gebaut wird?\p" .string "Es schwimmt aufgrund des so genannten\n" diff --git a/data-de/maps/SootopolisCity/text.inc b/data-de/maps/SootopolisCity/text.inc index d2c34f86e..9b9c8d4ca 100644 --- a/data-de/maps/SootopolisCity/text.inc +++ b/data-de/maps/SootopolisCity/text.inc @@ -1,7 +1,7 @@ ClosedSootopolisDoorText: @ 8169690 .string "Die Tür ist zu.$" -SootopolisCity_Text_1696A4:: @ 81696A4 +SootopolisCity_Text_CaveOfOriginPleaseLeave:: @ 81696A4 .string "Wer bist du denn wohl?\p" .string "Dies ist die URZEITHÖHLE.\p" .string "Die Geister der POKéMON, zur Ruhe\n" @@ -9,26 +9,26 @@ SootopolisCity_Text_1696A4:: @ 81696A4 .string "hier zum Leben, sagt man.\p" .string "Bitte verlasse diesen Ort.$" -SootopolisCity_Text_16972B:: @ 816972B +SootopolisCity_Text_PhysicallyFitLivingHere:: @ 816972B .string "Im Meer tauchen. Treppenstufen auf und\n" .string "ab rennen...\p" .string "Wenn du in diesem Ort lebst, wirst du\n" .string "körperlich fit.$" -SootopolisCity_Text_1697A7:: @ 81697A7 +SootopolisCity_Text_WonderWhatWorldIsLike:: @ 81697A7 .string "Ich... Ich war noch nie außerhalb der\n" .string "Stadt.\p" .string "Ich frage mich, wie die Welt hinter\n" .string "diesem Horizont aussieht?$" -SootopolisCity_Text_169813:: @ 8169813 +SootopolisCity_Text_NoOrdinaryTourist1:: @ 8169813 .string "Hm! Du bist den ganzen Weg nach\n" .string "XENEROVILLE gekommen? Du bist\l" .string "kein normaler Tourist.\p" .string "Aber das macht dich auch nicht zu einem\n" .string "außergewöhnlichen Touristen.$" -SootopolisCity_Text_1698A0:: @ 81698A0 +SootopolisCity_Text_SootopolisSkyBeautiful:: @ 81698A0 .string "XENEROVILLE entwickelte sich im Krater\n" .string "eines Vulkans.\p" .string "Wenn du in den Himmel schaust, kannst\n" @@ -37,13 +37,13 @@ SootopolisCity_Text_1698A0:: @ 81698A0 .string "Aber das macht den Himmel über\n" .string "XENEROVILLE zum schönsten Himmel.$" -SootopolisCity_Text_169988:: @ 8169988 +SootopolisCity_Text_YouCameInRainstorm:: @ 8169988 .string "TROY: {PLAYER}{KUN}, du bist auch hier?\n" .string "Bei diesem schrecklichen Regen...\p" .string "Oh, ja, kannst du verstehen, was mein\n" .string "Freund gerade sagt?$" -SootopolisCity_Text_1699FD:: @ 81699FD +SootopolisCity_Text_MyNameIsWallaceDownpour:: @ 81699FD .string "Mein Name ist WASSILI.\n" .string "Ich bin der hiesige ARENALEITER.\p" .string "Ich bin auch damit beauftragt, die\n" @@ -51,12 +51,12 @@ SootopolisCity_Text_1699FD:: @ 81699FD .string "Diese Regenschauer werden durch eine\n" .string "Kraft in der Höhle verursacht.$" -SootopolisCity_Text_169AB7:: @ 8169AB7 +SootopolisCity_Text_ThatIsTheBlueOrb:: @ 8169AB7 .string "Das... Das ist die BLAUE KUGEL.\p" .string "Ich verstehe.\n" .string "Folge mir.$" -SootopolisCity_Text_169AE7:: @ 8169AE7 +SootopolisCity_Text_PeopleNeedRainToLive:: @ 8169AE7 .string "TROY: Dieser Regen...\p" .string "Menschen und POKéMON brauchen\n" .string "Wasser zum Leben...\p" @@ -66,7 +66,7 @@ SootopolisCity_Text_169AE7:: @ 8169AE7 .string "über XENEROVILLE bilden und sich über\l" .string "die ganze HOENN-Region ausbreiten.$" -SootopolisCity_Text_169BC7:: @ 8169BC7 +SootopolisCity_Text_CaveOfOriginWithBlueOrb:: @ 8169BC7 .string "WASSILI: Die URZEITHÖHLE ist dort\n" .string "drüben.\p" .string "Niemandem in XENEROVILLE ist es\n" @@ -76,7 +76,7 @@ SootopolisCity_Text_169BC7:: @ 8169BC7 .string "Du musst gehen, egal was dich im Inneren\n" .string "der Höhle erwartet...$" -SootopolisCity_Text_169C99:: @ 8169C99 +SootopolisCity_Text_NeverExpectedHoldingBlueOrb:: @ 8169C99 .string "TROY: {PLAYER}{KUN}, ich hätte nie ver-\n" .string "mutet, dass du die BLAUE KUGEL bei dir\l" .string "hast.\p" @@ -84,25 +84,25 @@ SootopolisCity_Text_169C99:: @ 8169C99 .string "POKéMON an deiner Seite schaffst du es.\p" .string "Davon bin ich überzeugt!$" -SootopolisCity_Text_169D37:: @ 8169D37 +SootopolisCity_Text_YouMustGoWithBlueOrb:: @ 8169D37 .string "WASSILI: Du musst deine BLAUE KUGEL\n" .string "mitnehmen.\p" .string "Du musst gehen, egal was dich im Inneren\n" .string "der HÖHLE erwartet...$" -SootopolisCity_Text_169DA6:: @ 8169DA6 +SootopolisCity_Text_YoullBeOkaySapphire:: @ 8169DA6 .string "TROY: Dir wird nichts passieren.\n" .string "Mit deinen POKéMON an deiner Seite\l" .string "schaffst du es.\p" .string "Davon bin ich überzeugt!$" -SootopolisCity_Text_169E0F:: @ 8169E0F +SootopolisCity_Text_YouCameInScorchingSun:: @ 8169E0F .string "TROY: {PLAYER}{KUN}, du bist auch hier?\n" .string "Bei diesem heißen Sonnenschein...\p" .string "Oh, ja, kannst du verstehen, was mein\n" .string "Freund gerade sagt?$" -SootopolisCity_Text_169E82:: @ 8169E82 +SootopolisCity_Text_MyNameIsWallaceSunshine:: @ 8169E82 .string "Mein Name ist WASSILI.\n" .string "Ich bin der hiesige ARENALEITER.\p" .string "Ich bin auch damit beauftragt, die\n" @@ -110,12 +110,12 @@ SootopolisCity_Text_169E82:: @ 8169E82 .string "Dieser Sonnenschein wird durch eine\n" .string "Kraft in der Höhle verursacht.$" -SootopolisCity_Text_169F3C:: @ 8169F3C +SootopolisCity_Text_ThatIsTheRedOrb:: @ 8169F3C .string "Das... Das ist die ROTE KUGEL.\p" .string "Ich verstehe.\n" .string "Folge mir.$" -SootopolisCity_Text_169F6B:: @ 8169F6B +SootopolisCity_Text_PeopleNeedSunlightToLive:: @ 8169F6B .string "TROY: Dieser Sonnenschein...\p" .string "Menschen und POKéMON brauchen\n" .string "Sonnenlicht zum Leben...\p" @@ -126,7 +126,7 @@ SootopolisCity_Text_169F6B:: @ 8169F6B .string "wird es in ganz HOENN zu heiß.\p" .string "Und wenn das passiert...$" -SootopolisCity_Text_16A06C:: @ 816A06C +SootopolisCity_Text_CaveOfOriginWithRedOrb:: @ 816A06C .string "WASSILI: Die URZEITHÖHLE ist dort\n" .string "drüben.\p" .string "Niemandem in XENEROVILLE ist es\n" @@ -136,7 +136,7 @@ SootopolisCity_Text_16A06C:: @ 816A06C .string "Du musst gehen, egal was dich im Inneren\n" .string "der Höhle erwartet...$" -SootopolisCity_Text_16A13E:: @ 816A13E +SootopolisCity_Text_NeverExpectedHoldingRedOrb:: @ 816A13E .string "TROY: {PLAYER}{KUN}, ich hätte nie ver-\n" .string "mutet, dass du die ROTE KUGEL bei dir\l" .string "hast.\p" @@ -144,27 +144,27 @@ SootopolisCity_Text_16A13E:: @ 816A13E .string "POKéMON an deiner Seite schaffst du es.\p" .string "Davon bin ich überzeugt!$" -SootopolisCity_Text_16A1DB:: @ 816A1DB +SootopolisCity_Text_YouMustGoWithRedOrb:: @ 816A1DB .string "WASSILI: Du musst deine ROTE KUGEL\n" .string "mitnehmen.\p" .string "Du musst gehen, egal was dich im Inneren\n" .string "der Höhle erwartet...$" -SootopolisCity_Text_16A249:: @ 816A249 +SootopolisCity_Text_YoullBeOkayRuby:: @ 816A249 .string "TROY: Dir wird nichts passieren. Mit\n" .string "deinen POKéMON an deiner Seite\l" .string "schaffst du es.\p" .string "Davon bin ich überzeugt!$" -SootopolisCity_Text_16A2B2:: @ 816A2B2 +SootopolisCity_Text_TheLegendWasTrue:: @ 816A2B2 .string "Die Legende, die der alte Mann am PYRO-\n" .string "BERG erzählt hat... war kein Märchen.$" -SootopolisCity_Text_16A2FB:: @ 816A2FB +SootopolisCity_Text_NaturalBalanceIsShifting:: @ 816A2FB .string "Das natürliche Gleichgewicht von HOENN\n" .string "verändert sich dramatisch...$" -SootopolisCity_Text_16A33E:: @ 816A33E +SootopolisCity_Text_WeOweItAllToYou:: @ 816A33E .string "TROY: {PLAYER}{KUN}, dir verdanken\n" .string "wir alles.\p" .string "Der Himmel über XENEROVILLE ist\n" @@ -177,46 +177,46 @@ SootopolisCity_Text_16A33E:: @ 816A33E .string "keine Probleme haben, ihn zu besiegen.\p" .string "Gib dein Bestes.$" -SootopolisCity_Text_16A455:: @ 816A455 +SootopolisCity_Text_AllLifeStartsAtTheCave:: @ 816A455 .string "Alles Leben beginnt in der URZEITHÖHLE\n" .string "und endet am PYROBERG...\p" .string "Woher kommen die Menschen und\n" .string "POKéMON? Wohin gehen wir?$" -SootopolisCity_Text_16A4D6:: @ 816A4D6 +SootopolisCity_Text_YoureGoingToChallengeWallace:: @ 816A4D6 .string "Lass mich raten! Du wirst WASSILI\n" .string "herausfordern?!?\p" .string "Wirklich?\n" .string "Du bist wirklich mutig!$" -SootopolisCity_Text_16A531:: @ 816A531 +SootopolisCity_Text_BecomeYourFan:: @ 816A531 .string "Lass mich raten! Du hast WASSILI\n" .string "besiegt!?! Wirklich!?!\p" .string "Dann werde ich vielleicht dein Fan!$" -SootopolisCity_Text_16A587:: @ 816A587 +SootopolisCity_Text_NoOrdinaryTourist2:: @ 816A587 .string "Hm! Du bist den ganzen Weg nach\n" .string "XENEROVILLE gekommen? Du bist\l" .string "kein gewöhnlicher Tourist.\p" .string "Aber das macht dich auch nicht zu einem\n" .string "außergewöhnlichen Touristen.$" -SootopolisCity_Text_16A614:: @ 816A614 +SootopolisCity_Text_NightSkyFavoriteScenery:: @ 816A614 .string "Ein Stück des Nachthimmels, umgeben\n" .string "vom Rund des Vulkankraters...\p" .string "Und in diesem runden Stück Himmel\n" .string "strahlen und blinken die Sterne, als\l" .string "wären sie lebendig. Ich liebe das...$" -SootopolisCity_Text_16A6AE:: @ 816A6AE +SootopolisCity_Text_WhereIsMyHouse:: @ 816A6AE .string "Huch! Wo ist mein Haus?$" -SootopolisCity_Text_16A6C7:: @ 816A6C7 +SootopolisCity_Text_GymSign:: @ 816A6C7 .string "POKéMON ARENA von XENEROVILLE\n" .string "LEITER: WASSILI\p" .string "“Künstler und Liebhaber des WASSERS.”$" -SootopolisCity_Text_16A711:: @ 816A711 +SootopolisCity_Text_CitySign:: @ 816A711 .string "XENEROVILLE\p" .string "“Die mystische Stadt, in der die\n" .string "Geschichte stillsteht.”$" diff --git a/data-de/maps/SootopolisCity_Gym_1F/text.inc b/data-de/maps/SootopolisCity_Gym_1F/text.inc index 3216ea0c9..63ec6ea07 100644 --- a/data-de/maps/SootopolisCity_Gym_1F/text.inc +++ b/data-de/maps/SootopolisCity_Gym_1F/text.inc @@ -1,4 +1,4 @@ -SootopolisCity_Gym_1F_Text_18E8A5:: @ 818E8A5 +SootopolisCity_Gym_1F_Text_GymGuideAdvice:: @ 818E8A5 .string "Na, wie sieht es aus, auf dem Weg zum\n" .string "CHAMP, {PLAYER}?\p" .string "ARENALEITER WASSILI in XENEROVILLE\n" @@ -10,7 +10,7 @@ SootopolisCity_Gym_1F_Text_18E8A5:: @ 818E8A5 .string "Den Rest des Weges musst du alleine\n" .string "meistern.$" -SootopolisCity_Gym_1F_Text_18E9C9:: @ 818E9C9 +SootopolisCity_Gym_1F_Text_GymGuidePostVictory:: @ 818E9C9 .string "Hui! Du hast WASSILI besiegt, von dem\n" .string "man sagt, er sei der beste TRAINER in\l" .string "der HOENN-Region.\p" @@ -20,113 +20,113 @@ SootopolisCity_Gym_1F_Text_18E9C9:: @ 818E9C9 .string "kannst du die POKéMON LIGA\l" .string "herausfordern!$" -SootopolisCity_Gym_B1F_Text_18EA87:: @ 818EA87 +SootopolisCity_Gym_B1F_Text_AndreaIntro:: @ 818EA87 .string "Ich zeige dir die sublimen Techniken,\n" .string "die ich vom ARENALEITER WASSILI\l" .string "gelernt habe.$" -SootopolisCity_Gym_B1F_Text_18EACF:: @ 818EACF +SootopolisCity_Gym_B1F_Text_AndreaDefeat:: @ 818EACF .string "Bitte verzeih mir, WASSILI...$" -SootopolisCity_Gym_B1F_Text_18EAED:: @ 818EAED +SootopolisCity_Gym_B1F_Text_AndreaPostBattle:: @ 818EAED .string "Pass auf, was passiert, wenn du alle\n" .string "Bodenfliesen betreten hast...$" -SootopolisCity_Gym_B1F_Text_18EB22:: @ 818EB22 +SootopolisCity_Gym_B1F_Text_CrissyIntro:: @ 818EB22 .string "Du bist den ganzen Weg hierher ge-\n" .string "kommen, aber bis zu WASSILI dringst\l" .string "du nicht vor.\p" .string "Weil du gegen mich verlieren wirst!$" -SootopolisCity_Gym_B1F_Text_18EB81:: @ 818EB81 +SootopolisCity_Gym_B1F_Text_CrissyDefeat:: @ 818EB81 .string "Du bist stark! Ich habe mich durch dein\n" .string "unschuldiges Aussehen täuschen lassen.$" -SootopolisCity_Gym_B1F_Text_18EBB1:: @ 818EBB1 +SootopolisCity_Gym_B1F_Text_CrissyPostBattle:: @ 818EBB1 .string "Du bist gut genug, um nicht sofort von\n" .string "WASSILI besiegt zu werden.$" -SootopolisCity_Gym_B1F_Text_18EBFA:: @ 818EBFA +SootopolisCity_Gym_B1F_Text_BriannaIntro:: @ 818EBFA .string "Die Art, wie WASSILI kämpft...\p" .string "Dieser wunderbare Anblick hat mich dazu\n" .string "inspiriert, TRAINER zu werden.$" -SootopolisCity_Gym_B1F_Text_18EC5E:: @ 818EC5E +SootopolisCity_Gym_B1F_Text_BriannaDefeat:: @ 818EC5E .string "Du kämpfst mit mehr Anmut als ich...$" -SootopolisCity_Gym_B1F_Text_18EC92:: @ 818EC92 +SootopolisCity_Gym_B1F_Text_BriannaPostBattle:: @ 818EC92 .string "Die Ästhetik, die du in den Kampf ein-\n" .string "bringst, ist unbeschreiblich.\p" .string "Oh... Ich bin so glücklich, dass ich mich\n" .string "für POKéMON entschieden habe.$" -SootopolisCity_Gym_B1F_Text_18ECEB:: @ 818ECEB +SootopolisCity_Gym_1F_Text_ConnieIntro:: @ 818ECEB .string "Ich werde dir beibringen, dass Kämpfe\n" .string "kein Zuckerschlecken sind!$" -SootopolisCity_Gym_B1F_Text_18ED18:: @ 818ED18 +SootopolisCity_Gym_1F_Text_ConnieDefeat:: @ 818ED18 .string "Oh.\n" .string "Du bist stark.$" -SootopolisCity_Gym_B1F_Text_18ED2B:: @ 818ED2B +SootopolisCity_Gym_B1F_Text_ConniePostBattle:: @ 818ED2B .string "Ich verrate dir etwas.\p" .string "Wenn du zu WASSILI willst, dann darfst\n" .string "du auf jede Fliese nur ein Mal treten.$" -SootopolisCity_Gym_B1F_Text_18ED91:: @ 818ED91 +SootopolisCity_Gym_1F_Text_BridgetIntro:: @ 818ED91 .string "Die POKéMON ARENA mit den höchsten\n" .string "Anforderungen in der HOENN-Region...\p" .string "Das ist die ARENA von XENEROVILLE.$" -SootopolisCity_Gym_B1F_Text_18EDE8:: @ 818EDE8 +SootopolisCity_Gym_1F_Text_BridgetDefeat:: @ 818EDE8 .string "Du kämpfst aber auf einem hohen Niveau!$" -SootopolisCity_Gym_B1F_Text_18EE03:: @ 818EE03 +SootopolisCity_Gym_1F_Text_BridgetPostBattle:: @ 818EE03 .string "Statt damit zufrieden zu sein, zur\n" .string "besten ARENA zu gehören, würde ich\l" .string "gerne auch an anderen Orten trainieren.\l" .string "Aber hier ist es so lustig!$" -SootopolisCity_Gym_B1F_Text_18EE96:: @ 818EE96 +SootopolisCity_Gym_1F_Text_OliviaIntro:: @ 818EE96 .string "Ich trainiere meine POKéMON zusammen\n" .string "mit WASSILI.\p" .string "Ich bin nicht leicht zu nehmen!$" -SootopolisCity_Gym_B1F_Text_18EEDC:: @ 818EEDC +SootopolisCity_Gym_1F_Text_OliviaDefeat:: @ 818EEDC .string "Da wurde ich glatt überrollt...$" -SootopolisCity_Gym_B1F_Text_18EEF7:: @ 818EEF7 +SootopolisCity_Gym_1F_Text_OliviaPostBattle:: @ 818EEF7 .string "Ich denke, du hast durchaus Potential.\n" .string "Warum bleibst du nicht bei uns?$" -SootopolisCity_Gym_B1F_Text_18EF39:: @ 818EF39 +SootopolisCity_Gym_1F_Text_TiffanyIntro:: @ 818EF39 .string "Anmutig über das Eis zu gleiten, ohne\n" .string "die Linien zu berühren...\p" .string "Ein TRAINER, der das beherrscht, wird\n" .string "auch in anderen Dingen elegant wirken.$" -SootopolisCity_Gym_B1F_Text_18EFB8:: @ 818EFB8 +SootopolisCity_Gym_1F_Text_TiffanyDefeat:: @ 818EFB8 .string "Äh, entschuldige mich...$" -SootopolisCity_Gym_B1F_Text_18EFCA:: @ 818EFCA +SootopolisCity_Gym_1F_Text_TiffanyPostBattle:: @ 818EFCA .string "Es ist offensichtlich: Die Stärke eines\n" .string "TRAINERS hat nichts mit seinem Alter\l" .string "zu tun!$" -SootopolisCity_Gym_B1F_Text_18F037:: @ 818F037 +SootopolisCity_Gym_1F_Text_MarissaIntro:: @ 818F037 .string "Wenn ich mit meinen POKéMON zusammen\n" .string "bin, vergeht die Zeit so schnell, dass\l" .string "ich noch nicht mal “Uuups” sagen kann.$" -SootopolisCity_Gym_B1F_Text_18F07F:: @ 818F07F +SootopolisCity_Gym_1F_Text_MarissaDefeat:: @ 818F07F .string "Uuups!$" -SootopolisCity_Gym_B1F_Text_18F085:: @ 818F085 +SootopolisCity_Gym_1F_Text_MarissaPostBattle:: @ 818F085 .string "Ich wollte, ich könnte meine Niederlagen\n" .string "vergessen, bevor ich “Uuups”\l" .string "ausgesprochen habe.$" -SootopolisCity_Gym_1F_Text_18F0CA:: @ 818F0CA +SootopolisCity_Gym_1F_Text_WallaceIntro:: @ 818F0CA .string "Erlaube mir, mich kurz vorzustellen.\p" .string "Ich bin WASSILI.\n" .string "Der ARENALEITER von XENEROVILLE.\p" @@ -142,7 +142,7 @@ SootopolisCity_Gym_1F_Text_18F0CA:: @ 818F0CA .string "Illusion im Wasser. Dargeboten von mir\l" .string "und meinen POKéMON.$" -SootopolisCity_Gym_1F_Text_18F282:: @ 818F282 +SootopolisCity_Gym_1F_Text_WallaceDefeat:: @ 818F282 .string "Bravo.\p" .string "Jetzt erkenne ich, welch ein groß-\n" .string "artiger POKéMON-TRAINER vor mir steht.\p" @@ -151,11 +151,11 @@ SootopolisCity_Gym_1F_Text_18F282:: @ 818F282 .string "Du verdienst zu Recht den\n" .string "SCHAUERORDEN. Bitte nimm ihn an.$" -SootopolisCity_Gym_1F_Text_18F342:: @ 818F342 +SootopolisCity_Gym_1F_Text_ReceivedRainBadge:: @ 818F342 .string "{PLAYER} erhält den SCHAUERORDEN\n" .string "von WASSILI.$" -SootopolisCity_Gym_1F_Text_18F36B:: @ 818F36B +SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis:: @ 818F36B .string "Dieser ORDEN sorgt dafür, dass dir alle\n" .string "deine POKéMON gehorchen.\p" .string "Der ORDEN befähigt dich außerdem dazu,\n" @@ -164,12 +164,12 @@ SootopolisCity_Gym_1F_Text_18F36B:: @ 818F36B .string "Und damit du unseren Kampf stets in\n" .string "Erinnerung behältst, gebe ich dir dies...$" -SootopolisCity_Gym_1F_Text_18F466:: @ 818F466 +SootopolisCity_Gym_1F_Text_ExplainWaterPulse:: @ 818F466 .string "Diese TM enthält AQUAWELLE.\p" .string "Damit kann das gegnerische POKéMON\n" .string "mit Ultraschallwellen verwirrt werden.$" -SootopolisCity_Gym_1F_Text_18F4D7:: @ 818F4D7 +SootopolisCity_Gym_1F_Text_WallacePostBattle:: @ 818F4D7 .string "TRAINER, die alle ORDEN der ARENEN in\n" .string "HOENN erhalten haben, sollten sich...\p" .string "Auf den Weg zur ultimativen Heraus-\n" @@ -178,17 +178,17 @@ SootopolisCity_Gym_1F_Text_18F4D7:: @ 818F4D7 .string "HOENN, zur Insel PRACHTPOLIS CITY. Dort\l" .string "findest du die POKéMON LIGA.$" -SootopolisCity_Gym_1F_Text_18F5B4:: @ 818F5B4 +SootopolisCity_Gym_1F_Text_GoGetFortreeBadge:: @ 818F5B4 .string "In HOENN gibt es nur noch einen ORDEN\n" .string "zu verdienen.\p" .string "Wenn du die POKéMON LIGA herausfordern\n" .string "willst, musst du zuerst den ORDEN der\l" .string "ARENA in BAUMHAUSEN CITY bekommen.$" -SootopolisCity_Gym_1F_Text_18F649:: @ 818F649 +SootopolisCity_Gym_1F_Text_GymStatue:: @ 818F649 .string "POKéMON ARENA von XENEROVILLE$" -SootopolisCity_Gym_1F_Text_18F665:: @ 818F665 +SootopolisCity_Gym_1F_Text_GymStatueCertified:: @ 818F665 .string "POKéMON ARENA von XENEROVILLE\p" .string "WASSILIS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/SootopolisCity_House1/text.inc b/data-de/maps/SootopolisCity_House1/text.inc index b028594a8..e6a250955 100644 --- a/data-de/maps/SootopolisCity_House1/text.inc +++ b/data-de/maps/SootopolisCity_House1/text.inc @@ -1,12 +1,12 @@ -SootopolisCity_House1_Text_18F991:: @ 818F991 +SootopolisCity_House1_Text_DevelopedThisTM:: @ 818F991 .string "Seit 30 Jahren lebe ich in XENEROVILLE\n" .string "und verbessere meine Fähigkeiten.\p" .string "Ich habe eine alles erschütternde TM\n" .string "entwickelt. Die schenke ich dir!$" -SootopolisCity_House1_Text_18FA03:: @ 818FA03 +SootopolisCity_House1_Text_ExplainBrickBreak:: @ 818FA03 .string "TM31 enthält DURCHBRUCH! Eine schier\n" .string "unbeschreibliche Attacke. Horror!$" -SootopolisCity_House1_Text_18FA50:: @ 818FA50 +SootopolisCity_House1_Text_Kecleon:: @ 818FA50 .string "KECLEON: Puu puhyaah.$" diff --git a/data-de/maps/SootopolisCity_House2/text.inc b/data-de/maps/SootopolisCity_House2/text.inc index b19b34275..9b43df3be 100644 --- a/data-de/maps/SootopolisCity_House2/text.inc +++ b/data-de/maps/SootopolisCity_House2/text.inc @@ -1,13 +1,13 @@ -SootopolisCity_House2_Text_18FA66:: @ 818FA66 +SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs:: @ 818FA66 .string "PYROBERG...\p" .string "Auf seiner Spitze sind 2 Kugeln neben-\n" .string "einander angebracht. Wusstest du das?$" -SootopolisCity_House2_Text_18FAAE:: @ 818FAAE +SootopolisCity_House2_Text_YesTwoOrbsSideBySide:: @ 818FAAE .string "Ja, genau. 2 Kugeln nebeneinander...\p" .string "Der Anblick dieser beiden...\n" .string "Irgendwie wirkt er beruhigend...$" -SootopolisCity_House2_Text_18FB04:: @ 818FB04 +SootopolisCity_House2_Text_OughtToVisitAndSee:: @ 818FB04 .string "Ehrlich?\n" .string "Du solltest dir das mal selber ansehen...$" diff --git a/data-de/maps/SootopolisCity_House3/text.inc b/data-de/maps/SootopolisCity_House3/text.inc index 338881d2e..888f192e2 100644 --- a/data-de/maps/SootopolisCity_House3/text.inc +++ b/data-de/maps/SootopolisCity_House3/text.inc @@ -1,19 +1,19 @@ -SootopolisCity_House3_Text_18FB36:: @ 818FB36 +SootopolisCity_House3_Text_WallaceHasManyFansDoYou:: @ 818FB36 .string "Du bist ein POKéMON-TRAINER, oder?\p" .string "Der ARENALEITER von XENEROVILLE, \n" .string "WASSILI, hat viele Fans.\l" .string "Hast du auch Fans?$" -SootopolisCity_House3_Text_18FB9C:: @ 818FB9C +SootopolisCity_House3_Text_YouMustBePrettyStrong:: @ 818FB9C .string "Oh, dann musst du aber sehr stark sein.$" -SootopolisCity_House3_Text_18FBC0:: @ 818FBC0 +SootopolisCity_House3_Text_LonesomeTryWorkingHarder:: @ 818FBC0 .string "Oh, meine Güte...\n" .string "Dann stehst du ja ganz alleine da.\p" .string "Streng dich einfach mehr an, dann\n" .string "bekommst du auch einen Fan.$" -SootopolisCity_House3_Text_18FC1A:: @ 818FC1A +SootopolisCity_House3_Text_TrainerFanClubWasWild:: @ 818FC1A .string "Die Fans strömen sogar aus KANTO und\n" .string "JOHTO herbei.\p" .string "Ich habe den TRAINER-FANCLUB in\n" diff --git a/data-de/maps/SootopolisCity_House4/text.inc b/data-de/maps/SootopolisCity_House4/text.inc index d603808da..5c519ef9d 100644 --- a/data-de/maps/SootopolisCity_House4/text.inc +++ b/data-de/maps/SootopolisCity_House4/text.inc @@ -1,16 +1,16 @@ -SootopolisCity_House4_Text_18FC92:: @ 818FC92 +SootopolisCity_House4_Text_AncientTreasuresWaitingInSea:: @ 818FC92 .string "Hör mir zu und ich verrate dir etwas.\p" .string "Unter Wasser soll sich eine antike\n" .string "Ruine befinden.\p" .string "Da gibt es bestimmt Schätze, die nur\n" .string "darauf warten, gehoben zu werden.$" -SootopolisCity_House4_Text_18FD41:: @ 818FD41 +SootopolisCity_House4_Text_StrollUnderwaterWithPokemon:: @ 818FD41 .string "Antike Schätze...\p" .string "Wäre das schön, wenn es die tatsächlich\n" .string "gäbe. Aber auch ohne Schätze wäre eine\p" .string "Reise unter Wasser zusammen mit\n" .string "meinen POKéMON herrlich.$" -SootopolisCity_House4_Text_18FDD8:: @ 818FDD8 +SootopolisCity_House4_Text_Azumarill:: @ 818FDD8 .string "AZUMARILL: Marurii.$" diff --git a/data-de/maps/SootopolisCity_House5/text.inc b/data-de/maps/SootopolisCity_House5/text.inc index ca22756e3..ece5d73c1 100644 --- a/data-de/maps/SootopolisCity_House5/text.inc +++ b/data-de/maps/SootopolisCity_House5/text.inc @@ -1,9 +1,9 @@ -SootopolisCity_House5_Text_18FDEC:: @ 818FDEC +SootopolisCity_House5_Text_SootopolisMtPyreConnection:: @ 818FDEC .string "Es muss eine Verbindung zwischen\n" .string "XENEROVILLE und dem PYROBERG geben.\p" .string "Meine Freunde und ich haben ein\n" .string "bisschen nachgeforscht - im Labor,\l" .string "in dem wir gearbeitet haben.$" -SootopolisCity_House5_Text_18FE7B:: @ 818FE7B +SootopolisCity_House5_Text_BrotherUsedToStudySea:: @ 818FE7B .string "Mein großer Bruder studiert das Meer.$" diff --git a/data-de/maps/SootopolisCity_House6/text.inc b/data-de/maps/SootopolisCity_House6/text.inc index ca1c6236b..6708c8e66 100644 --- a/data-de/maps/SootopolisCity_House6/text.inc +++ b/data-de/maps/SootopolisCity_House6/text.inc @@ -1,20 +1,20 @@ -SootopolisCity_House6_Text_18FEA1:: @ 818FEA1 +SootopolisCity_House6_Text_FirstGuestInWhileTakeDoll:: @ 818FEA1 .string "Hallo! Du bist nach langer Zeit der erste\n" .string "Gast, den ich begrüße.\p" .string "Du hast mir den Tag gerettet, daher\n" .string "möchte ich dir diese WAILMER-PUPPE\l" .string "schenken.$" -SootopolisCity_House6_Text_18FF12:: @ 818FF12 +SootopolisCity_House6_Text_TakeGoodCareOfIt:: @ 818FF12 .string "Pass gut auf sie auf!$" -SootopolisCity_House6_Text_18FF28:: @ 818FF28 +SootopolisCity_House6_Text_IllHoldItForYou:: @ 818FF28 .string "Oh, du möchtest sie zwar haben, aber\n" .string "nicht sofort? Dann hebe ich sie dir auf.$" -SootopolisCity_House6_Text_18FF6D:: @ 818FF6D +SootopolisCity_House6_Text_DontWantThisDoll:: @ 818FF6D .string "Bist du sicher?\n" .string "Du möchtest diese PUPPE wirklich nicht?$" -SootopolisCity_House6_Text_18FF95:: @ 818FF95 +SootopolisCity_House6_Text_LovePlushDolls:: @ 818FF95 .string "Ich liiiiebe Plüsch-PUPPEN!$" diff --git a/data-de/maps/SootopolisCity_House7/text.inc b/data-de/maps/SootopolisCity_House7/text.inc index e58e57222..2f794f188 100644 --- a/data-de/maps/SootopolisCity_House7/text.inc +++ b/data-de/maps/SootopolisCity_House7/text.inc @@ -1,4 +1,4 @@ -SootopolisCity_House7_Text_18FFA9:: @ 818FFA9 +SootopolisCity_House7_Text_CityFromEruptedVolcano:: @ 818FFA9 .string "Ein Unterwasservulkan brach aus\n" .string "und schob sich an die Oberfläche.\p" .string "Der Krater lag über der Meeresober-\n" @@ -6,7 +6,7 @@ SootopolisCity_House7_Text_18FFA9:: @ 818FFA9 .string "wasser füllen.\n" .string "Und so entstand XENEROVILLE.$" -SootopolisCity_House7_Text_19005B:: @ 819005B +SootopolisCity_House7_Text_CaveMadeToKeepSomething:: @ 819005B .string "Die Höhle, die XENEROVILLE mit der Welt\n" .string "verbindet...\p" .string "Sie sollte ursprünglich wohl etwas\n" diff --git a/data-de/maps/SootopolisCity_House8/text.inc b/data-de/maps/SootopolisCity_House8/text.inc index 0ea3dff9b..74bea4b2c 100644 --- a/data-de/maps/SootopolisCity_House8/text.inc +++ b/data-de/maps/SootopolisCity_House8/text.inc @@ -1,4 +1,4 @@ -SootopolisCity_House8_Text_1900F7:: @ 81900F7 +SootopolisCity_MonSizeRecordHouse_Text_PleaseShowMeBigShroomish:: @ 81900F7 .string "Kennst du das POKéMON KNILZ?\n" .string "In XENEROVILLE wird es kaum gesehen.\p" .string "Aber ich liebe große KNILZ.\n" @@ -10,7 +10,7 @@ SootopolisCity_House8_Text_1900F7:: @ 81900F7 .string "Wie? Du hast ein KNILZ dabei???\n" .string "B-b-bitte zeig es mir!$" -SootopolisCity_House8_Text_19021D:: @ 819021D +SootopolisCity_MonSizeRecordHouse_Text_GoshMightBeBiggerThanBarboach:: @ 819021D .string "{STR_VAR_2}cm!\n" .string "Meine Güte, ist das aber groß!\p" .string "Das wird sogar größer als das SCHMERBE\n" @@ -21,32 +21,32 @@ SootopolisCity_House8_Text_19021D:: @ 819021D UnknownString_81902AE: @ 81902AE .string "{PLAYER} erhält einen TRANK.$" -SootopolisCity_House8_Text_1902C4:: @ 81902C4 +SootopolisCity_MonSizeRecordHouse_Text_BagCrammedFull1:: @ 81902C4 .string "Huch.\n" .string "Dein BEUTEL ist ja randvoll.$" -SootopolisCity_House8_Text_1902E4:: @ 81902E4 +SootopolisCity_MonSizeRecordHouse_Text_SeenBiggerShroomish:: @ 81902E4 .string "{STR_VAR_2}cm, nicht wahr?\p" .string "Hmm... Ich habe schon größere\n" .string "KNILZ als dieses gesehen.$" -SootopolisCity_House8_Text_190329:: @ 8190329 +SootopolisCity_MonSizeRecordHouse_Text_ThatsNotShroomish:: @ 8190329 .string "Na, das ist doch schon ganz ordentlich...\n" .string "Aber das ist kein KNILZ!$" -SootopolisCity_House8_Text_190366:: @ 8190366 +SootopolisCity_MonSizeRecordHouse_Text_DontHaveBigShroomish:: @ 8190366 .string "Du hast gar kein großes KNILZ?\n" .string "Och, wie schade...\p" .string "Wenn du ein großes KNILZ hast,\n" .string "dann komm bitte wieder und zeig es mir.$" -SootopolisCity_House8_Text_1903C9:: @ 81903C9 +SootopolisCity_MonSizeRecordHouse_Text_BiggestShroomishInHistory:: @ 81903C9 .string "Das größte KNILZ aller Zeiten!\n" .string "Der {STR_VAR_3}cm-Gigant von {STR_VAR_2}!\p" .string "Ein KNILZ so groß, wie ein\n" .string "SCHMERBE gerne sein würde!$" -SootopolisCity_House8_Text_190431:: @ 8190431 +SootopolisCity_MonSizeRecordHouse_Text_PleaseShowMeBigBarboach:: @ 8190431 .string "Kennst du das POKéMON SCHMERBE?\n" .string "Das ist bisher selten in XENEROVILLE\l" .string "aufgetaucht.\p" @@ -59,7 +59,7 @@ SootopolisCity_House8_Text_190431:: @ 8190431 .string "Wie? Oh, du hast ein SCHMERBE?\n" .string "Bitte, bitte zeig es mir!$" -SootopolisCity_House8_Text_190536:: @ 8190536 +SootopolisCity_MonSizeRecordHouse_Text_WowMightBeBiggerThanBarboach:: @ 8190536 .string "{STR_VAR_2}cm!\n" .string "Wow, das ist aber groß!\p" .string "Das ist bestimmt größer als das\n" @@ -68,25 +68,25 @@ SootopolisCity_House8_Text_190536:: @ 8190536 .string "Danke, dass ich es anschauen durfte.\n" .string "Hier, ein kleines Dankeschön!$" -SootopolisCity_House8_Text_1905C1:: @ 81905C1 +SootopolisCity_House8_Text_BagIsFull:: @ 81905C1 .string "Huups, dein BEUTEL ist voll.$" -SootopolisCity_House8_Text_1905E6:: @ 81905E6 +SootopolisCity_MonSizeRecordHouse_Text_SeenBiggerBarboach:: @ 81905E6 .string "{STR_VAR_2}cm?\p" .string "Ach... Da habe ich aber schon ein\n" .string "größeres SCHMERBE gesehen.$" -SootopolisCity_House8_Text_190628:: @ 8190628 +SootopolisCity_MonSizeRecordHouse_Text_ThatsNotBarboach:: @ 8190628 .string "Nun, das ist ganz stattlich.\n" .string "Aber es ist kein SCHMERBE!$" -SootopolisCity_House8_Text_19065A:: @ 819065A +SootopolisCity_MonSizeRecordHouse_Text_DontHaveBigBarboach:: @ 819065A .string "Hast du kein großes SCHMERBE?\n" .string "Och, wie enttäuschend...\p" .string "Wenn du ein großes SCHMERBE hast,\n" .string "dann komm bitte wieder her.$" -SootopolisCity_House8_Text_1906BE:: @ 81906BE +SootopolisCity_MonSizeRecordHouse_Text_BiggestBarboachInHistory:: @ 81906BE .string "Das größte SCHMERBE aller Zeiten!\n" .string "Der {STR_VAR_3}cm-Koloss von {STR_VAR_2}!\p" .string "Ein SCHMERBE so groß, wie ein\n" diff --git a/data-de/maps/SootopolisCity_Mart/text.inc b/data-de/maps/SootopolisCity_Mart/text.inc index 74db2bcd9..6014442a2 100644 --- a/data-de/maps/SootopolisCity_Mart/text.inc +++ b/data-de/maps/SootopolisCity_Mart/text.inc @@ -1,17 +1,17 @@ -SootopolisCity_Mart_Text_18F890:: @ 818F890 +SootopolisCity_Mart_Text_PPUpIsGreat:: @ 818F890 .string "AP-PLUS ist sehr nützlich!\p" .string "Es steigert die ANGRIFFSPUNKTE, die AP\n" .string "einer POKéMON-Attacke.$" -SootopolisCity_Mart_Text_18F8D7:: @ 818F8D7 +SootopolisCity_Mart_Text_TooScaryOutside:: @ 818F8D7 .string "Was... Was ist passiert?$" -SootopolisCity_Mart_Text_18F8F2:: @ 818F8F2 +SootopolisCity_Mart_Text_FullRestoreItemOfDreams:: @ 818F8F2 .string "Kennst du TOP-GENESUNG?\p" .string "Alle KP werden aufgefüllt!\n" .string "Alle Statusprobleme werden aufgehoben!\p" .string "Ein wundervolles Item!$" -SootopolisCity_Mart_Text_18F96B:: @ 818F96B +SootopolisCity_Mart_Text_DidSomethingAwaken:: @ 818F96B .string "Dieses Wetter...\n" .string "Wurde etwas aufgeweckt?$" diff --git a/data-de/maps/SootopolisCity_PokemonCenter_1F/text.inc b/data-de/maps/SootopolisCity_PokemonCenter_1F/text.inc index 034b51f4d..0298090e9 100644 --- a/data-de/maps/SootopolisCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/SootopolisCity_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -SootopolisCity_PokemonCenter_1F_Text_18F6A2:: @ 818F6A2 +SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn:: @ 818F6A2 .string "WASSILI, der ARENALEITER dieses Ortes,\n" .string "ist ein mächtiger TRAINER.\p" .string "Man sagt, er sei der beste TRAINER der\n" @@ -7,19 +7,19 @@ SootopolisCity_PokemonCenter_1F_Text_18F6A2:: @ 818F6A2 .string "Man sagt, sie seien stärker als WASSILI.\n" .string "Wie stark müssen sie dann erst sein?$" -SootopolisCity_PokemonCenter_1F_Text_18F770:: @ 818F770 +SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge:: @ 818F770 .string "Jeder im Ort hat sich zurückgezogen in\n" .string "sein Haus und bleibt auch dort.\p" .string "Dieses Wetter...\n" .string "Ob dies die Ouvertüre von etwas ist?$" -SootopolisCity_PokemonCenter_1F_Text_18F7EA:: @ 818F7EA +SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon:: @ 818F7EA .string "Was auch immer wann oder wo passiert,\n" .string "meine Freundschaft zu den POKéMON\l" .string "leidet darunter bestimmt nicht!\p" .string "Ich liebe es, mit POKéMON zusammen\n" .string "zu sein.$" -SootopolisCity_PokemonCenter_1F_Text_18F860:: @ 818F860 +SootopolisCity_PokemonCenter_1F_Text_ImReallyScared:: @ 818F860 .string "Ich weiß nicht, warum...\n" .string "Aber... Ich habe richtig Angst...$" diff --git a/data-de/maps/VerdanturfTown/text.inc b/data-de/maps/VerdanturfTown/text.inc index a1a394ac7..979b54625 100644 --- a/data-de/maps/VerdanturfTown/text.inc +++ b/data-de/maps/VerdanturfTown/text.inc @@ -1,4 +1,4 @@ -VerdanturfTown_Text_16CAEB:: @ 816CAEB +VerdanturfTown_Text_ManTryingToDigTunnel:: @ 816CAEB .string "Mein Papa hat mir das erzählt.\p" .string "Er sagt, der Tunnel sei voller scheuer\n" .string "POKéMON.\p" @@ -9,14 +9,14 @@ VerdanturfTown_Text_16CAEB:: @ 816CAEB .string "Aber es gibt da einen Mann. Der ver-\n" .string "sucht, den Tunnel alleine zu graben.$" -VerdanturfTown_Text_16CBCE:: @ 816CBCE +VerdanturfTown_Text_ManDugTunnelForLove:: @ 816CBCE .string "Da war ein Mann, der hat den Tunnel\n" .string "ganz alleine für die Frau seines Herzens\l" .string "gegraben.\p" .string "Ich habe das nie so ganz verstanden.\n" .string "Aber, hey, ich finde es trotzdem klasse.$" -VerdanturfTown_Text_16CC24:: @ 816CC24 +VerdanturfTown_Text_AirCleanHere:: @ 816CC24 .string "Der Wind steht immer so günstig, dass\n" .string "die Asche vom Vulkan nie hierher\l" .string "geweht wird.\p" @@ -24,13 +24,13 @@ VerdanturfTown_Text_16CC24:: @ 816CC24 .string "Hier zu leben hilft auch den schwachen\l" .string "und kränklichen Menschen.$" -VerdanturfTown_Text_16CCD0:: @ 816CCD0 +VerdanturfTown_Text_MakeContestDebut:: @ 816CCD0 .string "Ich bin doch zufrieden mit der Anmut\n" .string "meiner POKéMON.\p" .string "Ich möchte hier zum ersten Mal an einem\n" .string "WETTBEWERB teilnehmen.$" -VerdanturfTown_Text_16CD4D:: @ 816CD4D +VerdanturfTown_Text_GuyTryingToBustThroughCave:: @ 816CD4D .string "Siehst du die Höhle neben dem PKMN-\n" .string "SUPERMARKT?\p" .string "Da ist ein Typ drin, der die Felsbrocken\n" @@ -40,27 +40,27 @@ VerdanturfTown_Text_16CD4D:: @ 816CD4D .string "gehen könnte... Ein Besuch in\l" .string "METAROST CITY wäre dann ganz einfach.$" -VerdanturfTown_Text_16CE30:: @ 816CE30 +VerdanturfTown_Text_EasyToGetToRustboroNow:: @ 816CE30 .string "Die Höhle neben dem PKMN-SUPERMARKT\n" .string "ist nun ein Tunnel zur anderen Seite.\p" .string "Das ist toll! Jetzt kommt man ganz\n" .string "einfach nach METAROST CITY, um\l" .string "DEVON-WAREN zu kaufen.$" -VerdanturfTown_Text_16CEC0:: @ 816CEC0 +VerdanturfTown_Text_TownSign:: @ 816CEC0 .string "WIESENFLUR\p" .string "“Das vom Wind gestreichelte Hoch-\n" .string "land mit dem süßen Duft des Grases.”$" -VerdanturfTown_Text_16CF0D:: @ 816CF0D +VerdanturfTown_Text_WandasHouse:: @ 816CF0D .string "HEIKES HAUS$" -VerdanturfTown_Text_16CF1B:: @ 816CF1B +VerdanturfTown_Text_ContestHallSign:: @ 816CF1B .string "POKéMON WETTBEWERBE\n" .string "NORMAL-KLASSE REGISTRIERUNGEN\p" .string "“Kommt her, all ihr POKéMON-TRAINER!”$" -VerdanturfTown_Text_16CF6D:: @ 816CF6D +VerdanturfTown_Text_RusturfTunnelSign:: @ 816CF6D .string "METAFLURTUNNEL\n" .string "“Die Verbindung zwischen\l" .string "METAROST CITY und WIESENFLUR.\p" diff --git a/data-de/maps/VerdanturfTown_FriendshipRatersHouse/text.inc b/data-de/maps/VerdanturfTown_FriendshipRatersHouse/text.inc index 39b1b5f4c..812a4d861 100644 --- a/data-de/maps/VerdanturfTown_FriendshipRatersHouse/text.inc +++ b/data-de/maps/VerdanturfTown_FriendshipRatersHouse/text.inc @@ -1,39 +1,39 @@ -VerdanturfTown_FriendshipRatersHouse_Text_178A9C:: @ 8178A9C +VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou:: @ 8178A9C .string "Zeig mir doch mal dein POKéMON.\n" .string "Ich prüfe, wie sehr es dich mag.\p" .string "Oh.\n" .string "Dein POKéMON...$" -VerdanturfTown_FriendshipRatersHouse_Text_178AF2:: @ 8178AF2 +VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou:: @ 8178AF2 .string "Es liebt dich über alles.\n" .string "Mehr lieben könnte es dich gar nicht.\l" .string "Das zu sehen, macht mich glücklich.$" -VerdanturfTown_FriendshipRatersHouse_Text_178B43:: @ 8178B43 +VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy:: @ 8178B43 .string "Es scheint sehr glücklich zu sein.\n" .string "Es mag dich wirklich sehr.$" -VerdanturfTown_FriendshipRatersHouse_Text_178B82:: @ 8178B82 +VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot:: @ 8178B82 .string "Es mag dich.\n" .string "Es möchte von dir verwöhnt werden.$" -VerdanturfTown_FriendshipRatersHouse_Text_178BC4:: @ 8178BC4 +VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou:: @ 8178BC4 .string "Es gewöhnt sich langsam an dich.\n" .string "Es glaubt an dich.$" -VerdanturfTown_FriendshipRatersHouse_Text_178BFA:: @ 8178BFA +VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou:: @ 8178BFA .string "Es hat sich noch nicht an dich gewöhnt.\n" .string "Weder liebt es dich, noch hasst es dich.$" -VerdanturfTown_FriendshipRatersHouse_Text_178C39:: @ 8178C39 +VerdanturfTown_FriendshipRatersHouse_Text_VeryWary:: @ 8178C39 .string "Es schwankt in seinen Gefühlen.\n" .string "Es hat eine beängstigende Bösartigkeit\l" .string "in den Augen. Es mag dich nicht.$" -VerdanturfTown_FriendshipRatersHouse_Text_178C90:: @ 8178C90 +VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou:: @ 8178C90 .string "Es fällt mir schwer, das zu sagen...\p" .string "Dein POKéMON hasst dich. Das ist nicht\n" .string "gerade angenehm für dich, oder?$" -VerdanturfTown_FriendshipRatersHouse_Text_178CFD:: @ 8178CFD +VerdanturfTown_FriendshipRatersHouse_Text_Pikachu:: @ 8178CFD .string "PIKACHU: Pika pika!$" diff --git a/data-de/maps/VerdanturfTown_House/text.inc b/data-de/maps/VerdanturfTown_House/text.inc index 0e6b1eaf1..bbf37e7aa 100644 --- a/data-de/maps/VerdanturfTown_House/text.inc +++ b/data-de/maps/VerdanturfTown_House/text.inc @@ -1,10 +1,10 @@ -VerdanturfTown_House_Text_178D11:: @ 8178D11 +VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague:: @ 8178D11 .string "Weit von hier, in PRACHTPOLIS CITY,\n" .string "findest du die POKéMON LIGA.\p" .string "Die TRAINER dort sind alle geradezu\n" .string "Furcht erregend talentiert.$" -VerdanturfTown_House_Text_178D8E:: @ 8178D8E +VerdanturfTown_House_Text_DefeatEliteFourInARow:: @ 8178D8E .string "In der POKéMON LIGA musst du die TOP\n" .string "VIER hintereinander besiegen. Das\l" .string "sagen die Regeln.\p" diff --git a/data-de/maps/VerdanturfTown_Mart/text.inc b/data-de/maps/VerdanturfTown_Mart/text.inc index 35f88e2f1..15f4a38fb 100644 --- a/data-de/maps/VerdanturfTown_Mart/text.inc +++ b/data-de/maps/VerdanturfTown_Mart/text.inc @@ -1,17 +1,17 @@ -VerdanturfTown_Mart_Text_1781C9:: @ 81781C9 +VerdanturfTown_Mart_Text_XSpecialIsCrucial:: @ 81781C9 .string "X-SPEZIAL ist für jeden POKéMON-Kampf\n" .string "äußerst wichtig.\p" .string "Es erhöht die Stärke mancher Attacken.\n" .string "Aber leider nur für einen Kampf.$" -VerdanturfTown_Mart_Text_178240:: @ 8178240 +VerdanturfTown_Mart_Text_NoStrategyGuidesForContest:: @ 8178240 .string "Sie verkaufen keine Items, mit denen\n" .string "man einen WETTBEWERB gewinnen kann...\p" .string "Und das bedeutet, dass du deine\n" .string "POKéMON mit äußerster Sorgfalt\l" .string "aufziehen musst.$" -VerdanturfTown_Mart_Text_1782C0:: @ 81782C0 +VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon:: @ 81782C0 .string "Der NESTBALL ist bei schwächeren\n" .string "POKéMON hervorragend geeignet.\p" .string "Den kannst du nur in WIESENFLUR\n" diff --git a/data-de/maps/VerdanturfTown_PokemonCenter_1F/text.inc b/data-de/maps/VerdanturfTown_PokemonCenter_1F/text.inc index 33b100c01..8ad9f6d8d 100644 --- a/data-de/maps/VerdanturfTown_PokemonCenter_1F/text.inc +++ b/data-de/maps/VerdanturfTown_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -VerdanturfTown_PokemonCenter_1F_Text_17831D:: @ 817831D +VerdanturfTown_PokemonCenter_1F_Text_TrainerIsntQualifiedIf:: @ 817831D .string "Ich wage zu behaupten, ein TRAINER ist\n" .string "nicht qualifiziert, wenn seine POKéMON\p" .string "nicht freundlich sind und sich wohl-\n" .string "fühlen. Hast du ihnen {POKEBLOCK} gegeben?$" -VerdanturfTown_PokemonCenter_1F_Text_178389:: @ 8178389 +VerdanturfTown_PokemonCenter_1F_Text_AllContestsOriginateHere:: @ 8178389 .string "Lass mich raten, warum du in WIESENFLUR\n" .string "bist... Wegen des WETTBEWERBS!\p" .string "Hier ist die Wiege aller WETTBEWERBE.$" diff --git a/data-de/maps/VerdanturfTown_WandasHouse/text.inc b/data-de/maps/VerdanturfTown_WandasHouse/text.inc index 85028a3c4..6a6e173e1 100644 --- a/data-de/maps/VerdanturfTown_WandasHouse/text.inc +++ b/data-de/maps/VerdanturfTown_WandasHouse/text.inc @@ -1,4 +1,4 @@ -VerdanturfTown_WandasHouse_Text_1783F6:: @ 81783F6 +VerdanturfTown_WandasHouse_Text_StrongerSpeech:: @ 81783F6 .string "HEIKO: Ich habe gegen dich verloren,\n" .string "{PLAYER}. Aber das betrübt mich nicht.\p" .string "Ich habe ein neues Ziel in meinem Leben.\n" @@ -11,13 +11,13 @@ VerdanturfTown_WandasHouse_Text_1783F6:: @ 81783F6 .string "Und dann werde ich dich zu einem neuen\n" .string "Kampf herausfordern.$" -VerdanturfTown_WandasHouse_Text_178521:: @ 8178521 +VerdanturfTown_WandasHouse_Text_StrongerSpeechShort:: @ 8178521 .string "HEIKO: Behalte mich ruhig im Auge,\n" .string "{PLAYER}. Bald bin ich stärker als du!\p" .string "Und dann werde ich dich zu einem neuen\n" .string "Kampf herausfordern.$" -VerdanturfTown_WandasHouse_Text_17859A:: @ 817859A +VerdanturfTown_WandasHouse_Text_WallysNextDoor:: @ 817859A .string "ONKEL: Oh! {PLAYER}{KUN}!\n" .string "Du findest HEIKO nebenan.\p" .string "Aber es gibt etwas, das ich dir sagen\n" @@ -28,18 +28,18 @@ VerdanturfTown_WandasHouse_Text_17859A:: @ 817859A .string "Ich denke, auch die Freundschaft zu\l" .string "den POKéMON hat ihm geholfen...$" -VerdanturfTown_WandasHouse_Text_178683:: @ 8178683 +VerdanturfTown_WandasHouse_Text_WallySlippedOff:: @ 8178683 .string "HEIKO ist weggegangen...\n" .string "Er ist nun auf seinem eigenen Weg...$" -VerdanturfTown_WandasHouse_Text_1786B5:: @ 81786B5 +VerdanturfTown_WandasHouse_Text_WallyGoneThatFar:: @ 81786B5 .string "ONKEL: Stimmt das?\n" .string "HEIKO ist ganz alleine in die Welt\l" .string "hinausgezogen...\p" .string "Ich sollte ihn unterstützen - er ist der\n" .string "Sohn meines kleinen Bruders...$" -VerdanturfTown_WandasHouse_Text_178739:: @ 8178739 +VerdanturfTown_WandasHouse_Text_MeetWanda:: @ 8178739 .string "HEIKE: Wer bist du?\n" .string "Oh, ja, ich weiß schon...\p" .string "Du bist {PLAYER}. HEIKO hat mir schon\n" @@ -49,18 +49,18 @@ VerdanturfTown_WandasHouse_Text_178739:: @ 8178739 .string "Ich finde, seit HEIKO hier lebt, ist er\n" .string "viel gesünder und lebendiger geworden.$" -VerdanturfTown_WandasHouse_Text_1787FB:: @ 81787FB +VerdanturfTown_WandasHouse_Text_DontWorryAboutWally:: @ 81787FB .string "HEIKE: Mach dir keine Sorgen um HEIKO.\n" .string "Ihm geht es mit Sicherheit gut.\p" .string "Ich kenne doch meinen kleinen Vetter.\n" .string "Außerdem hat er sein POKéMON dabei.$" -VerdanturfTown_WandasHouse_Text_17886A:: @ 817886A +VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay:: @ 817886A .string "Dank dir kann ich meine Freundin jetzt\n" .string "jeden Tag sehen. Ob ich glücklich bin?\l" .string "Darauf kannst du wetten!$" -VerdanturfTown_WandasHouse_Text_1788B1:: @ 81788B1 +VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven:: @ 81788B1 .string "Der Freund meiner Tochter besitzt viel\n" .string "Schwung und Energie.\p" .string "Er gräbt ununterbrochen einen Tunnel,\n" @@ -68,17 +68,17 @@ VerdanturfTown_WandasHouse_Text_1788B1:: @ 81788B1 .string "Meine Tochter ist etwas besorgt des-\n" .string "wegen und schaut jeden Tag nach ihm.$" -VerdanturfTown_WandasHouse_Text_178983:: @ 8178983 +VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging:: @ 8178983 .string "Es ist unglaublich! Der Freund meiner \n" .string "Tochter hat den Tunnel\p" .string "von Hand gegraben! Einfach sagenhaft!$" -VerdanturfTown_WandasHouse_Text_1789DD:: @ 81789DD +VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally:: @ 81789DD .string "Sollte HEIKO irgendetwas passieren,\n" .string "könnte ich seinen Eltern in BLÜTENBURG\l" .string "CITY nicht mehr in die Augen schauen...$" -VerdanturfTown_WandasHouse_Text_178A47:: @ 8178A47 +VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande:: @ 8178A47 .string "HEIKO war in PRACHTPOLIS CITY?\p" .string "Seine Eltern in BLÜTENBURG CITY werden\n" .string "erstaunt sein, das zu hören.$" diff --git a/data-de/maps/VictoryRoad_1F/text.inc b/data-de/maps/VictoryRoad_1F/text.inc index 770e75b3b..e7e093b7e 100644 --- a/data-de/maps/VictoryRoad_1F/text.inc +++ b/data-de/maps/VictoryRoad_1F/text.inc @@ -1,4 +1,4 @@ -VictoryRoad_1F_Text_19782B:: @ 819782B +VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore:: @ 819782B .string "HEIKO: Hallo, {PLAYER}!\p" .string "Du bist bestimmt überrascht, mich hier\n" .string "zu treffen!\p" @@ -11,65 +11,65 @@ VictoryRoad_1F_Text_19782B:: @ 819782B .string "die mir Mut und Kraft gegeben haben!\p" .string "Okay... Jetzt komme ich!$" -VictoryRoad_1F_Text_197943:: @ 8197943 +VictoryRoad_1F_Text_WallyEntranceDefeat:: @ 8197943 .string "Wow!\n" .string "{PLAYER}, du wirst immer stärker!$" -VictoryRoad_1F_Text_197967:: @ 8197967 +VictoryRoad_1F_Text_WallyPostEntranceBattle:: @ 8197967 .string "HEIKO: Ich konnte dich heute nicht be-\n" .string "siegen, aber eines Tages werde ich es\l" .string "mit dir aufnehmen!$" -VictoryRoad_1F_Text_1979BA:: @ 81979BA +VictoryRoad_1F_Text_WallyIntro:: @ 81979BA .string "HEIKO: Hallo, {PLAYER}!\p" .string "Ich bin viel stärker geworden! Das\n" .string "möchte ich dir zeigen, {PLAYER}!\p" .string "Okay... Jetzt komme ich!$" -VictoryRoad_1F_Text_197A23:: @ 8197A23 +VictoryRoad_1F_Text_WallyDefeat:: @ 8197A23 .string "Wow!\n" .string "{PLAYER}, du bist immer noch zu stark!$" -VictoryRoad_1F_Text_197A47:: @ 8197A47 +VictoryRoad_1F_Text_WallyPostBattle:: @ 8197A47 .string "HEIKO: Ich konnte dich wieder nicht\n" .string "besiegen... Aber eines Tages, {PLAYER},\l" .string "eines Tages...\p" .string "Da werde ich sogar die POKéMON LIGA\n" .string "herausfordern!$" -VictoryRoad_1F_Text_197AD1:: @ 8197AD1 +VictoryRoad_1F_Text_EdgarIntro:: @ 8197AD1 .string "Ich habe es innerhalb kürzester Zeit\n" .string "bis hierher geschafft, aber das letzte\l" .string "Stück zieht sich wie Kaugummi...$" -VictoryRoad_1F_Text_197B1A:: @ 8197B1A +VictoryRoad_1F_Text_EdgarDefeat:: @ 8197B1A .string "Hier enden meine Träume...$" -VictoryRoad_1F_Text_197B36:: @ 8197B36 +VictoryRoad_1F_Text_EdgarPostBattle:: @ 8197B36 .string "Du bist weit gekommen. Lasse nicht nach\n" .string "und versuche, der CHAMP zu werden!\l" .string "Wenn einer das kann, dann du!$" -VictoryRoad_1F_Text_197B99:: @ 8197B99 +VictoryRoad_1F_Text_AlbertIntro:: @ 8197B99 .string "Ich bin nicht hierher gekommen, um zu\n" .string "verlieren. Diese Option existiert nicht!$" -VictoryRoad_1F_Text_197BE1:: @ 8197BE1 +VictoryRoad_1F_Text_AlbertDefeat:: @ 8197BE1 .string "Unmöglich...\n" .string "Ich habe verloren???$" -VictoryRoad_1F_Text_197BF7:: @ 8197BF7 +VictoryRoad_1F_Text_AlbertPostBattle:: @ 8197BF7 .string "Ich habe hier verloren...\p" .string "Das heißt, mir fehlt noch eine Menge,\n" .string "um CHAMP werden zu können.$" -VictoryRoad_1F_Text_197C45:: @ 8197C45 +VictoryRoad_1F_Text_HopeIntro:: @ 8197C45 .string "Diese unendliche, raue Straße wird\n" .string "ihrem Namen - SIEG - gerecht.$" -VictoryRoad_1F_Text_197C8D:: @ 8197C8D +VictoryRoad_1F_Text_HopeDefeat:: @ 8197C8D .string "Dein Kampfstil ist fantastisch...$" -VictoryRoad_1F_Text_197CAF:: @ 8197CAF +VictoryRoad_1F_Text_HopePostBattle:: @ 8197CAF .string "Du hast wirklich das Potential, der\n" .string "CHAMP zu werden.$" diff --git a/data-de/maps/VictoryRoad_B1F/text.inc b/data-de/maps/VictoryRoad_B1F/text.inc index 2261fceff..4798d776c 100644 --- a/data-de/maps/VictoryRoad_B1F/text.inc +++ b/data-de/maps/VictoryRoad_B1F/text.inc @@ -1,37 +1,37 @@ -VictoryRoad_B1F_Text_197CE9:: @ 8197CE9 +VictoryRoad_B1F_Text_SamuelIntro:: @ 8197CE9 .string "Der Gedanke, dass ich der POKéMON LIGA\n" .string "immer näher komme...\p" .string "Ich bekomme Lampenfieber...$" -VictoryRoad_B1F_Text_197D42:: @ 8197D42 +VictoryRoad_B1F_Text_SamuelDefeat:: @ 8197D42 .string "Ich konnte gar nichts machen...$" -VictoryRoad_B1F_Text_197D5B:: @ 8197D5B +VictoryRoad_B1F_Text_SamuelPostBattle:: @ 8197D5B .string "Die POKéMON LIGA rückt in weite Ferne...\n" .string "Was für eine Enttäuschung...$" -VictoryRoad_B1F_Text_197D98:: @ 8197D98 +VictoryRoad_B1F_Text_ShannonIntro:: @ 8197D98 .string "Um dich siegreich durch die POKéMON\n" .string "LIGA zu kämpfen, brauchst du das\l" .string "Vertrauen deiner POKéMON.$" -VictoryRoad_B1F_Text_197DE8:: @ 8197DE8 +VictoryRoad_B1F_Text_ShannonDefeat:: @ 8197DE8 .string "Eure Beziehung ist auf solidem\n" .string "Vertrauen aufgebaut.$" -VictoryRoad_B1F_Text_197E13:: @ 8197E13 +VictoryRoad_B1F_Text_ShannonPostBattle:: @ 8197E13 .string "Das Vertrauen zwischen POKéMON und\n" .string "TRAINER wächst beständig, da sie immer\l" .string "zusammen sind.$" -VictoryRoad_B1F_Text_197E5D:: @ 8197E5D +VictoryRoad_B1F_Text_MichelleIntro:: @ 8197E5D .string "Das ist nicht das Ziel. Nur eine\n" .string "Zwischenstation auf dem Weg zur\l" .string "POKéMON LIGA.$" -VictoryRoad_B1F_Text_197EA6:: @ 8197EA6 +VictoryRoad_B1F_Text_MichelleDefeat:: @ 8197EA6 .string "Das ist der Weg!$" -VictoryRoad_B1F_Text_197EB6:: @ 8197EB6 +VictoryRoad_B1F_Text_MichellePostBattle:: @ 8197EB6 .string "Du wirst dich sehr gut schlagen, das ist\n" .string "sicher. Deine POKéMON lieben dich!$" diff --git a/data-de/maps/VictoryRoad_B2F/text.inc b/data-de/maps/VictoryRoad_B2F/text.inc index 2d3301d39..c1a8c1c81 100644 --- a/data-de/maps/VictoryRoad_B2F/text.inc +++ b/data-de/maps/VictoryRoad_B2F/text.inc @@ -1,50 +1,50 @@ -VictoryRoad_B2F_Text_197EF2:: @ 8197EF2 +VictoryRoad_B2F_Text_VitoIntro:: @ 8197EF2 .string "Ich habe mit meiner Familie trainiert,\n" .string "mit jedem einzelnen Mitglied!\l" .string "Ich verliere gegen niemanden!$" -VictoryRoad_B2F_Text_197F46:: @ 8197F46 +VictoryRoad_B2F_Text_VitoDefeat:: @ 8197F46 .string "Besser als meine Familie?\n" .string "Ist das möglich?$" -VictoryRoad_B2F_Text_197F71:: @ 8197F71 +VictoryRoad_B2F_Text_VitoPostBattle:: @ 8197F71 .string "Ich war besser als jeder andere aus\n" .string "meiner Familie. Ich habe nie verloren!\p" .string "Ich habe mein Selbstvertrauen ver-\n" .string "loren. Ich gehe nach Hause...$" -VictoryRoad_B2F_Text_197FE5:: @ 8197FE5 +VictoryRoad_B2F_Text_OwenIntro:: @ 8197FE5 .string "Ich habe gehört, dass sich hier ein sehr\n" .string "starkes Kind herumtreibt. Bist du das?$" -VictoryRoad_B2F_Text_19802B:: @ 819802B +VictoryRoad_B2F_Text_OwenDefeat:: @ 819802B .string "Diese kleine Kröte ist echt stark!$" -VictoryRoad_B2F_Text_198047:: @ 8198047 +VictoryRoad_B2F_Text_OwenPostBattle:: @ 8198047 .string "Das Gerücht sagt, das Kind käme aus\n" .string "BLÜTENBURG CITY.$" -VictoryRoad_B2F_Text_198089:: @ 8198089 +VictoryRoad_B2F_Text_CarolineIntro:: @ 8198089 .string "Du musst doch langsam mal müde werden.$" -VictoryRoad_B2F_Text_1980AD:: @ 81980AD +VictoryRoad_B2F_Text_CarolineDefeat:: @ 81980AD .string "Keine Anzeichen von Müdigkeit...$" -VictoryRoad_B2F_Text_1980C8:: @ 81980C8 +VictoryRoad_B2F_Text_CarolinePostBattle:: @ 81980C8 .string "Die SIEGESSTRASSE und die POKéMON\n" .string "LIGA sind große und langwierige Heraus-\l" .string "forderungen. Werde bloß nicht müde!!!$" -VictoryRoad_B2F_Text_198121:: @ 8198121 +VictoryRoad_B2F_Text_JulieIntro:: @ 8198121 .string "Du solltest nicht selbstzufrieden\n" .string "werden, nur weil du viele ORDEN der\l" .string "ARENEN besitzt.\p" .string "Es wird immer jemanden geben, der\n" .string "besser ist als du!$" -VictoryRoad_B2F_Text_1981A3:: @ 81981A3 +VictoryRoad_B2F_Text_JulieDefeat:: @ 81981A3 .string "Du bist besser als ich!$" -VictoryRoad_B2F_Text_1981BA:: @ 81981BA +VictoryRoad_B2F_Text_JuliePostBattle:: @ 81981BA .string "Schau dir deine ORDEN an - erinnere dich\n" .string "an die TRAINER, die du getroffen hast.$" diff --git a/data-de/text/berries.inc b/data-de/text/berries.inc index 1e6ddefd5..b151f426c 100644 --- a/data-de/text/berries.inc +++ b/data-de/text/berries.inc @@ -1,4 +1,4 @@ -PetalburgCity_Gym_Text_1C5570:: @ 81C5570 +PetalburgCity_Gym_Text_GiveEnigmaBerry:: @ 81C5570 .string "VATER: Hallo, {PLAYER}!\p" .string "Ich habe gerade eine sehr seltene\n" .string "BEERE erhalten. Die schenke ich dir.$" @@ -73,7 +73,7 @@ Route120_Text_1C5A4D:: @ 81C5A4D .string "Ich habe einige BEEREN vom\n" .string "BEERENMEISTER erhalten.$" -LilycoveCity_Text_1C5A7A:: @ 81C5A7A +LilycoveCity_Text_BerrySuitsYou:: @ 81C5A7A .string "Also, im Grunde ist es so...\p" .string "Ein Anzug passt zu mir wie die\n" .string "Brise zum Meer - perfekt!\p" @@ -81,11 +81,11 @@ LilycoveCity_Text_1C5A7A:: @ 81C5A7A .string "“T”...\p" .string "Warum ist das so?$" -LilycoveCity_Text_1C5B1D:: @ 81C5B1D +LilycoveCity_Text_BecauseYoureTrainer:: @ 81C5B1D .string "Also, im Grunde ist es so...\p" .string "Weil du ein TRAINER bist.$" -LilycoveCity_Text_1C5B5D:: @ 81C5B5D +LilycoveCity_Text_PokeblocksSuitPokemon:: @ 81C5B5D .string "Grundsätzlich verhält es sich so...\p" .string "So wie die würdevolle Einfachheit mich\n" .string "ziert, zieren {POKEBLOCK} POKéMON.$" @@ -205,7 +205,7 @@ Route104_PrettyPetalFlowerShop_Text_1C6335:: @ 81C6335 .string "POKéMON daraus machen.\p" .string "Ich möchte auch Süßigkeiten haben.$" -SootopolisCity_Text_1C63F2:: @ 81C63F2 +SootopolisCity_Text_NameIsKiriHaveOneOfThese:: @ 81C63F2 .string "Hi, wie heißt du?\p" .string "... ... ... ... ... ... ... ... ...\n" .string "Okay. Netter Name!\p" @@ -215,26 +215,26 @@ SootopolisCity_Text_1C63F2:: @ 81C63F2 .string "Das war ihr Wunsch.\p" .string "Hier, das schenke ich dir.$" -SootopolisCity_Text_1C64D0:: @ 81C64D0 +SootopolisCity_Text_GiveYouThisBerryToo:: @ 81C64D0 .string "BERTA will dir auch diese BEERE geben.\n" .string "Ich mag sie sehr!$" -SootopolisCity_Text_1C650B:: @ 81C650B +SootopolisCity_Text_WhatKindOfWishInYourName:: @ 81C650B .string "Ich frage mich, welcher Wunsch in deinem\n" .string "Namen verborgen ist.$" -SootopolisCity_Text_1C6540:: @ 81C6540 +SootopolisCity_Text_KiriBornInSeasons:: @ 81C6540 .string "Frühling, Sommer, Herbst und Winter.\p" .string "Wenn du im Frühling geboren bist, magst\n" .string "du dann den Frühling? Wenn du im Sommer\l" .string "geboren bist, magst du den Sommer?$" -SootopolisCity_Text_1C65D4:: @ 81C65D4 +SootopolisCity_Text_ThenILoveAutumn:: @ 81C65D4 .string "Dann wurde BERTA im Herbst geboren,\n" .string "denn ich liebe den Herbst!\p" .string "Welche Jahreszeit hast du am liebsten?$" -SootopolisCity_Text_1C6626:: @ 81C6626 +SootopolisCity_Text_OhDoesntMatter:: @ 81C6626 .string "Oh...\n" .string "Das macht nichts...\p" .string "Es gibt so viel, was ich wissen möchte...$" diff --git a/data-de/text/eon_ticket.inc b/data-de/text/eon_ticket.inc index 440337b90..bb3f0f1a6 100644 --- a/data-de/text/eon_ticket.inc +++ b/data-de/text/eon_ticket.inc @@ -8,12 +8,12 @@ UnknownString_81C5070: @ 81C5070 .string "In SEEGRASULB CITY kann dir bestimmt\n" .string "jemand mehr dazu sagen.$" -LilycoveCity_Harbor_Text_1C50F2:: @ 81C50F2 +EventTicket_Text_ThatPass:: @ 81C50F2 .string "Die Fähre nach GRAPHITPORT CITY ist...\p" .string "Oh!\n" .string "Der FAHRSCHEIN...$" -LilycoveCity_Harbor_Text_1C5120:: @ 81C5120 +EventTicket_Text_ShowEonTicket:: @ 81C5120 .string "Aye, Maat, hast du den alten FAHRSCHEIN\n" .string "mitgebracht?\p" .string "Ich sage dir, du bist auf dem Weg zu\n" diff --git a/data-de/text/lottery_corner.inc b/data-de/text/lottery_corner.inc index b38a328d4..a3adbddbf 100644 --- a/data-de/text/lottery_corner.inc +++ b/data-de/text/lottery_corner.inc @@ -1,4 +1,4 @@ -LilycoveCity_DepartmentStore_1F_Text_1C4B5E:: @ 81C4B5E +LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket:: @ 81C4B5E .string "Dies ist die POKéMON-LOTTERIE.\p" .string "Alle Besucher des EINKAUFSZENTRUMS\n" .string "können einen POKéMON-LOTTOSCHEIN\l" @@ -9,74 +9,74 @@ LilycoveCity_DepartmentStore_1F_Text_1C4B5E:: @ 81C4B5E .string "Möchtest du einen\n" .string "POKéMON-LOTTOSCHEIN ziehen?$" -LilycoveCity_DepartmentStore_1F_Text_1C4C6A:: @ 81C4C6A +LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow:: @ 81C4C6A .string "Bitte, komme morgen wieder.$" -LilycoveCity_DepartmentStore_1F_Text_1C4C85:: @ 81C4C85 +LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain:: @ 81C4C85 .string "Bitte, besuche uns bald wieder.$" UnknownString_81C4C9F: @ 81C4C9F .string "Bitte, ziehe einen LOTTOSCHEIN.\n" .string "... ... ...$" -LilycoveCity_DepartmentStore_1F_Text_1C4CC6:: @ 81C4CC6 +LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket:: @ 81C4CC6 .string "Bitte, ziehe einen LOTTOSCHEIN.\n" .string "...{0xFC}Ë{0x39} ...{0xFC}Ë{0x39} ...{0xFC}Ë{0x39}$" -LilycoveCity_DepartmentStore_1F_Text_1C4CF6:: @ 81C4CF6 +LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait:: @ 81C4CF6 .string "Der LOTTOSCHEIN hat die Nummer {STR_VAR_1}.\p" .string "Ich muss diese Nummer jetzt prüfen,\n" .string "um zu sehen, ob sie mit der ID-Nummer\l" .string "eines deiner POKéMON übereinstimmt.$" -LilycoveCity_DepartmentStore_1F_Text_1C4D7D:: @ 81C4D7D +LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon:: @ 81C4D7D .string "Herzlichen Glückwunsch!\p" .string "Die ID-Nummer deines {STR_VAR_1} im\n" .string "Team stimmt mit der des LOTTO-\l" .string "SCHEINS überein!$" -LilycoveCity_DepartmentStore_1F_Text_1C4DD1:: @ 81C4DD1 +LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon:: @ 81C4DD1 .string "Herzlichen Glückwunsch!\p" .string "Die ID-Nummer deines {STR_VAR_1} in\n" .string "der Box des PCs stimmt mit der des\l" .string "LOTTOSCHEINS überein!$" -LilycoveCity_DepartmentStore_1F_Text_1C4E27:: @ 81C4E27 +LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched:: @ 81C4E27 .string "Tut mir Leid.\n" .string "Keine der Nummern stimmt überein.$" -LilycoveCity_DepartmentStore_1F_Text_1C4E4F:: @ 81C4E4F +LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched:: @ 81C4E4F .string "Zwei Ziffern stimmen überein,\n" .string "daher bekommst du den dritten Preis!\l" .string "Du gewinnst {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_1C4E92:: @ 81C4E92 +LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched:: @ 81C4E92 .string "Drei Ziffern stimmen überein,\n" .string "daher bekommst du den zweiten Preis!\l" .string "Du gewinnst {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_1C4ED8:: @ 81C4ED8 +LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched:: @ 81C4ED8 .string "Vier Ziffern stimmen überein,\n" .string "daher bekommst du den ersten Preis!\l" .string "Du gewinnst {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_1C4F1C:: @ 81C4F1C +LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched:: @ 81C4F1C .string "Meine Güte! Alle fünf Ziffern stimmen\n" .string "überein!\p" .string "Du hast den Jackpot geknackt!\n" .string "Du gewinnst {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_1C4F77:: @ 81C4F77 +LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis:: @ 81C4F77 .string "Oh! Du scheinst keinen Platz\n" .string "dafür zu haben.\p" .string "Wenn du wieder Platz in deinem BEUTEL\n" .string "hast, lass es mich wissen.$" -LilycoveCity_DepartmentStore_1F_Text_1C4FCC:: @ 81C4FCC +LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding:: @ 81C4FCC .string "{PLAYER}?\n" .string "Ja, ich habe dich schon erwartet.\p" .string "Diesen Preis habe ich für dich\n" .string "aufbewahrt.$" -LilycoveCity_DepartmentStore_1F_Text_1C501C:: @ 81C501C +LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2:: @ 81C501C .string "Bitte, besuche uns bald wieder.$" diff --git a/data-de/text/pokeblocks.inc b/data-de/text/pokeblocks.inc index f137c8fb5..b8f10157b 100644 --- a/data-de/text/pokeblocks.inc +++ b/data-de/text/pokeblocks.inc @@ -53,8 +53,8 @@ FallarborTown_ContestLobby_Text_1B71D2:: @ 81B71D2 .string "Besorg dir eine {POKEBLOCK}BOX und\n" .string "komm dann wieder.$" -LilycoveCity_ContestLobby_Text_1B7225:: @ 81B7225 -SlateportCity_ContestLobby_Text_1B7225:: @ 81B7225 +SlateportCity_ContestLobby_Text_LetsGetBlendingAlready:: @ 81B7225 +SlateportCity_ContestLobby_Text_LetsGetBlendingAlready:: @ 81B7225 .string "Dann lass uns mal mixen.$" LilycoveCity_ContestLobby_Text_1B7241:: @ 81B7241 diff --git a/data/event_scripts.s b/data/event_scripts.s index 21bde6c49..e57c39b2e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -681,17 +681,17 @@ gStdScripts_End:: .include "data/maps/Route109_SeashoreHouse/text.inc" .include "data/maps/Route110_TrickHouseEntrance/text.inc" -Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8 +Route110_TrickHousePuzzle1_Text_FoundAScroll:: @ 819C1B8 .string "{PLAYER} found a scroll.$" -Route110_TrickHousePuzzle1_Text_19C1CB:: @ 819C1CB +Route110_TrickHousePuzzle1_Text_MemorizedTheCode:: @ 819C1CB .string "{PLAYER} memorized the secret code\n" .string "written on the scroll.$" -Route110_TrickHousePuzzle1_Text_19C1FF:: @ 819C1FF +Route110_TrickHousePuzzle1_Text_SecretCodeOnIt:: @ 819C1FF .string "A secret code is written on it.$" -UnknownString_819C21F: @ 819C21F +Route110_TrickHousePuzzle_Text_DoorLockedWriteSecretCodeHere: @ 819C21F .string "The door is locked.\p" .string "...On closer inspection, this is written\n" .string "on it: “Write the secret code here.”$" @@ -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 @@ -1035,7 +1035,7 @@ UnknownString_81A0E68: @ 81A0E68 UnknownString_81A0ED6: @ 81A0ED6 .string "What should I do for fun today?$" -LilycoveCity_DepartmentStoreElevator_Text_1A0EF6:: @ 81A0EF6 +LilycoveCity_DepartmentStoreElevator_Text_WhichFloorWouldYouLike:: @ 81A0EF6 .string "Welcome to LILYCOVE DEPARTMENT STORE.\p" .string "Which floor would you like?$" @@ -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,15 +1068,13 @@ 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 .string "The link was canceled.$" -MossdeepCity_StevensHouse_Text_1A1102:: @ 81A1102 -RustboroCity_DevonCorp_2F_Text_1A1102:: @ 81A1102 +gText_NicknameReceivedPokemon:: @ 81A1102 .string "Want to give a nickname to the\n" .string "{STR_VAR_2} you received?$" @@ -1088,7 +1085,7 @@ UnknownString_81A1141: @ 81A1141 .string "{PLAYER} is out of useable POKéMON!\p" .string "{PLAYER} whited out!$" -SlateportCity_Text_1A116E:: @ 81A116E +gText_ComeBackWithSecretPower:: @ 81A116E .string "Do you know the TM SECRET POWER?\p" .string "Our group, we love the TM SECRET\n" .string "POWER.\p" @@ -1362,9 +1359,9 @@ SlateportCity_PokemonFanClub_EventScript_1AE0AC:: @ 81AE0AC release end -FallarborTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 +FallarborTown_ContestLobby_EventScript_Reporter:: @ 81AE0B6 LilycoveCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 -SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 +SlateportCity_ContestLobby_EventScript_Reporter:: @ 81AE0B6 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 lock faceplayer @@ -1599,7 +1596,7 @@ Text_RepelWoreOff: @ 81C33EF MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 0 getpricereduction 2 compare VAR_RESULT, 0 @@ -1611,7 +1608,7 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 1 getpricereduction 2 compare VAR_RESULT, 0 diff --git a/data/item_ball_scripts.inc b/data/item_ball_scripts.inc index 4e8f253e4..ff15b4094 100644 --- a/data/item_ball_scripts.inc +++ b/data/item_ball_scripts.inc @@ -218,7 +218,7 @@ Route133_EventScript_1B16F7:: @ 81B16F7 finditem ITEM_STAR_PIECE end -PetalburgCity_EventScript_1B1704:: @ 81B1704 +PetalburgCity_EventScript_ItemMaxRevive:: @ 81B1704 finditem ITEM_MAX_REVIVE end @@ -226,11 +226,11 @@ PetalburgCity_EventScript_1B1711:: @ 81B1711 finditem ITEM_ETHER end -MauvilleCity_EventScript_1B171E:: @ 81B171E +MauvilleCity_EventScript_ItemXSpeed:: @ 81B171E finditem ITEM_X_SPEED end -RustboroCity_EventScript_1B172B:: @ 81B172B +RustboroCity_EventScript_ItemXDefend:: @ 81B172B finditem ITEM_X_DEFEND end @@ -334,43 +334,43 @@ NewMauville_Inside_EventScript_1B1870:: @ 81B1870 finditem ITEM_PARALYZE_HEAL end -AbandonedShip_Rooms_1F_EventScript_1B187D:: @ 81B187D +AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 81B187D finditem ITEM_HARBOR_MAIL end -AbandonedShip_Rooms_B1F_EventScript_1B188A:: @ 81B188A +AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 81B188A finditem ITEM_ESCAPE_ROPE end -AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897 +AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 81B1897 finditem ITEM_DIVE_BALL end -AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4 +AbandonedShip_Room_B1F_EventScript_ItemTMIceBeam:: @ 81B18A4 finditem ITEM_TM13_ICE_BEAM end -AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1 +AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 81B18B1 finditem ITEM_REVIVE end -AbandonedShip_CaptainsOffice_EventScript_1B18BE:: @ 81B18BE +AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 81B18BE finditem ITEM_STORAGE_KEY end -AbandonedShip_HiddenFloorRooms_EventScript_1B18CB:: @ 81B18CB +AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 81B18CB finditem ITEM_LUXURY_BALL end -AbandonedShip_HiddenFloorRooms_EventScript_1B18D8:: @ 81B18D8 +AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 81B18D8 finditem ITEM_SCANNER end -AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5 +AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 81B18E5 finditem ITEM_WATER_STONE end -AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2 +AbandonedShip_HiddenFloorRooms_EventScript_ItemTMRainDance:: @ 81B18F2 finditem ITEM_TM18_RAIN_DANCE end @@ -478,39 +478,39 @@ CaveOfOrigin_B3F_EventScript_1B1A44:: @ 81B1A44 finditem ITEM_HM07_WATERFALL end -Route110_TrickHousePuzzle1_EventScript_1B1A51:: @ 81B1A51 +Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 81B1A51 finditem ITEM_ORANGE_MAIL end -Route110_TrickHousePuzzle2_EventScript_1B1A5E:: @ 81B1A5E +Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 81B1A5E finditem ITEM_HARBOR_MAIL end -Route110_TrickHousePuzzle2_EventScript_1B1A6B:: @ 81B1A6B +Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 81B1A6B finditem ITEM_WAVE_MAIL end -Route110_TrickHousePuzzle3_EventScript_1B1A78:: @ 81B1A78 +Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 81B1A78 finditem ITEM_SHADOW_MAIL end -Route110_TrickHousePuzzle3_EventScript_1B1A85:: @ 81B1A85 +Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 81B1A85 finditem ITEM_WOOD_MAIL end -Route110_TrickHousePuzzle4_EventScript_1B1A92:: @ 81B1A92 +Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 81B1A92 finditem ITEM_MECH_MAIL end -Route110_TrickHousePuzzle6_EventScript_1B1A9F:: @ 81B1A9F +Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 81B1A9F finditem ITEM_GLITTER_MAIL end -Route110_TrickHousePuzzle7_EventScript_1B1AAC:: @ 81B1AAC +Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 81B1AAC finditem ITEM_TROPIC_MAIL end -Route110_TrickHousePuzzle8_EventScript_1B1AB9:: @ 81B1AB9 +Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 81B1AB9 finditem ITEM_BEAD_MAIL end diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 9f1dd1c32..561117e42 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_CaptainsOffice_EventScript_15EAF5", + "script": "AbandonedShip_CaptainsOffice_EventScript_CaptSternAide", "flag": "0" }, { @@ -34,8 +34,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_CaptainsOffice_EventScript_1B18BE", - "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1" + "script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey", + "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY" } ], "warp_events": [ diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index b9335025d..29acdbfb9 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -1,24 +1,24 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4 .byte 0 -AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 +AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 815EAF5 lock faceplayer - goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 - goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, AbandonedShip_CaptainsOffice_EventScript_15EB2D - msgbox AbandonedShip_CaptainsOffice_Text_198C85, MSGBOX_DEFAULT + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner + goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus + msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT release end -AbandonedShip_CaptainsOffice_EventScript_15EB23:: @ 815EB23 - msgbox AbandonedShip_CaptainsOffice_Text_198D00, MSGBOX_DEFAULT +AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner:: @ 815EB23 + msgbox AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner, MSGBOX_DEFAULT release end -AbandonedShip_CaptainsOffice_EventScript_15EB2D:: @ 815EB2D - msgbox AbandonedShip_CaptainsOffice_Text_198D7B, MSGBOX_DEFAULT +AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus:: @ 815EB2D + msgbox AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus, MSGBOX_DEFAULT release end diff --git a/data/maps/AbandonedShip_CaptainsOffice/text.inc b/data/maps/AbandonedShip_CaptainsOffice/text.inc index 817b8c448..126601a37 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/text.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/text.inc @@ -1,16 +1,16 @@ -AbandonedShip_CaptainsOffice_Text_198C85:: @ 8198C85 +AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner:: @ 8198C85 .string "I'm investigating this ship on behalf\n" .string "of CAPT. STERN.\p" .string "He also asked me to find a SCANNER,\n" .string "but I haven't had any success...$" -AbandonedShip_CaptainsOffice_Text_198D00:: @ 8198D00 +AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner:: @ 8198D00 .string "Oh! That's a SCANNER!\p" .string "Listen, can I get you to deliver that\n" .string "to CAPT. STERN?\p" .string "I want to investigate this ship a\n" .string "little more.$" -AbandonedShip_CaptainsOffice_Text_198D7B:: @ 8198D7B +AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus:: @ 8198D7B .string "This ship is called S.S. CACTUS.\n" .string "It seems to be from an earlier era.$" diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index a7d1cff58..3d8d41d61 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Corridors_1F_EventScript_15E965", + "script": "AbandonedShip_Corridors_1F_EventScript_Youngster", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 7, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "AbandonedShip_Corridors_1F_EventScript_15E96E", + "script": "AbandonedShip_Corridors_1F_EventScript_Charlie", "flag": "0" } ], diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index e48f730f9..7ec9f78af 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -1,11 +1,11 @@ AbandonedShip_Corridors_1F_MapScripts:: @ 815E964 .byte 0 -AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965 - msgbox AbandonedShip_Corridors_1F_Text_1984D8, MSGBOX_NPC +AbandonedShip_Corridors_1F_EventScript_Youngster:: @ 815E965 + msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC end -AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E - trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 - msgbox AbandonedShip_Corridors_1F_Text_198493, MSGBOX_AUTOCLOSE +AbandonedShip_Corridors_1F_EventScript_Charlie:: @ 815E96E + trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_CharlieIntro, AbandonedShip_Corridors_1F_Text_CharlieDefeat + msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AbandonedShip_Corridors_1F/text.inc b/data/maps/AbandonedShip_Corridors_1F/text.inc index 3867be6d7..eca429c52 100644 --- a/data/maps/AbandonedShip_Corridors_1F/text.inc +++ b/data/maps/AbandonedShip_Corridors_1F/text.inc @@ -1,14 +1,14 @@ -AbandonedShip_Corridors_1F_Text_19843D:: @ 819843D +AbandonedShip_Corridors_1F_Text_CharlieIntro:: @ 819843D .string "What's so funny about having my inner\n" .string "tube aboard the ship?$" -AbandonedShip_Corridors_1F_Text_198479:: @ 8198479 +AbandonedShip_Corridors_1F_Text_CharlieDefeat:: @ 8198479 .string "Whoa, you overwhelmed me!$" -AbandonedShip_Corridors_1F_Text_198493:: @ 8198493 +AbandonedShip_Corridors_1F_Text_CharliePostBattle:: @ 8198493 .string "It's not easy throwing POKé BALLS\n" .string "while hanging on to an inner tube!$" -AbandonedShip_Corridors_1F_Text_1984D8:: @ 81984D8 +AbandonedShip_Corridors_1F_Text_IsntItFunHere:: @ 81984D8 .string "Isn't it fun here?\n" .string "I get excited just being here!$" diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc index 8e796436e..98b7e6dd4 100644 --- a/data/maps/AbandonedShip_Deck/scripts.inc +++ b/data/maps/AbandonedShip_Deck/scripts.inc @@ -1,7 +1,7 @@ AbandonedShip_Deck_MapScripts:: @ 815E95A - map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_15E960 + map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition .byte 0 -AbandonedShip_Deck_MapScript1_15E960:: @ 815E960 +AbandonedShip_Deck_OnTransition:: @ 815E960 setflag FLAG_LANDMARK_ABANDONED_SHIP end diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 98b9f2657..d4c833ff3 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -21,8 +21,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18CB", - "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL" }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", @@ -34,8 +34,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18D8", - "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER" }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", @@ -47,8 +47,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18F2", - "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTMRainDance", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_RAIN_DANCE" }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", @@ -60,8 +60,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_1B18E5", - "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE" } ], "warp_events": [ @@ -137,7 +137,7 @@ "y": 10, "elevation": 3, "item": "ITEM_ROOM_1_KEY", - "flag": "FLAG_HIDDEN_ITEM_1F" + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY" }, { "type": "hidden_item", @@ -145,7 +145,7 @@ "y": 5, "elevation": 3, "item": "ITEM_ROOM_2_KEY", - "flag": "FLAG_HIDDEN_ITEM_20" + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY" }, { "type": "hidden_item", @@ -153,7 +153,7 @@ "y": 12, "elevation": 3, "item": "ITEM_ROOM_4_KEY", - "flag": "FLAG_HIDDEN_ITEM_21" + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY" }, { "type": "hidden_item", @@ -161,7 +161,7 @@ "y": 2, "elevation": 0, "item": "ITEM_ROOM_6_KEY", - "flag": "FLAG_HIDDEN_ITEM_22" + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY" }, { "type": "sign", @@ -169,7 +169,7 @@ "y": 5, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -177,7 +177,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -185,7 +185,7 @@ "y": 10, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -193,7 +193,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -201,7 +201,7 @@ "y": 2, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" }, { "type": "sign", @@ -209,7 +209,7 @@ "y": 6, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB" + "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" } ] } diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 97c5ebff2..c2cf5427b 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -1,43 +1,43 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01 - map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_15ED07 + map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_OnFrame .byte 0 -AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07 - map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 +AbandonedShip_HiddenFloorRooms_OnFrame:: @ 815ED07 + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle .2byte 0 -AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 +AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle:: @ 815ED11 setvar VAR_TEMP_1, 1 getplayerxy VAR_TEMP_2, VAR_TEMP_3 setvar VAR_TEMP_4, 1 compare VAR_TEMP_2, 21 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED89 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn compare VAR_TEMP_2, 36 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED8F + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn compare VAR_TEMP_3, 2 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED95 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow switch VAR_TEMP_4 - case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B - case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 - case 3, AbandonedShip_HiddenFloorRooms_EventScript_15EDC5 - case 4, AbandonedShip_HiddenFloorRooms_EventScript_15EDEB - case 5, AbandonedShip_HiddenFloorRooms_EventScript_15EE23 - case 6, AbandonedShip_HiddenFloorRooms_EventScript_15EE6A + case 1, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1 + case 2, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2 + case 3, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3 + case 4, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4 + case 5, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5 + case 6, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6 end -AbandonedShip_HiddenFloorRooms_EventScript_15ED89:: @ 815ED89 +AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn:: @ 815ED89 addvar VAR_TEMP_4, 1 return -AbandonedShip_HiddenFloorRooms_EventScript_15ED8F:: @ 815ED8F +AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn:: @ 815ED8F addvar VAR_TEMP_4, 2 return -AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 +AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 815ED95 addvar VAR_TEMP_4, 3 return -AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 815ED9B delay 20 setfieldeffectargument 0, 10 setfieldeffectargument 1, 10 @@ -45,29 +45,29 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B dofieldeffect FLDEFF_SPARKLE specialvar VAR_RESULT, FoundAbandonedShipRoom4Key compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2:: @ 815EDC4 end -AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 815EDC5 specialvar VAR_RESULT, FoundAbandonedShipRoom1Key compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA + goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle delay 20 compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA +AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 815EDEA end -AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 815EDEB delay 20 setfieldeffectargument 0, 8 setfieldeffectargument 1, 5 @@ -79,12 +79,12 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB dofieldeffect FLDEFF_SPARKLE specialvar VAR_RESULT, FoundAbandonedShipRoom6Key compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 815EE23 delay 20 setfieldeffectargument 0, 16 setfieldeffectargument 1, 3 @@ -100,43 +100,43 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 dofieldeffect FLDEFF_SPARKLE specialvar VAR_RESULT, FoundAbandonedShipRoom2Key compare VAR_RESULT, 0 - call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle waitfieldeffect FLDEFF_SPARKLE delay 10 end -AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A +AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 815EE6A end -AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B +AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 815EE6B setfieldeffectargument 0, 42 setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 dofieldeffect FLDEFF_SPARKLE return -AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B +AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 815EE7B setfieldeffectargument 0, 20 setfieldeffectargument 1, 5 setfieldeffectargument 2, 0 dofieldeffect FLDEFF_SPARKLE return -AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B +AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 815EE8B setfieldeffectargument 0, 1 setfieldeffectargument 1, 12 setfieldeffectargument 2, 0 dofieldeffect FLDEFF_SPARKLE return -AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B +AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 815EE9B setfieldeffectargument 0, 1 setfieldeffectargument 1, 2 setfieldeffectargument 2, 0 dofieldeffect FLDEFF_SPARKLE return -AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB +AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 815EEAB lockall msgbox AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash, MSGBOX_DEFAULT releaseall diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index 7c1e790ee..863551540 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -21,8 +21,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Room_B1F_EventScript_1B18A4", - "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1" + "script": "AbandonedShip_Room_B1F_EventScript_ItemTMIceBeam", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_ICE_BEAM" } ], "warp_events": [ diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 3270f180f..57075f780 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms2_1F_EventScript_15EA68", + "script": "AbandonedShip_Rooms2_1F_EventScript_Hal", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms2_1F_EventScript_15EAAE", + "script": "AbandonedShip_Rooms2_1F_EventScript_Lois", "flag": "0" }, { @@ -47,8 +47,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms2_1F_EventScript_1B18B1", - "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1" + "script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE" } ], "warp_events": [ diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index a1bad74b4..68ca3cf4e 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -1,28 +1,28 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 .byte 0 -AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 - trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F +AbandonedShip_Rooms2_1F_EventScript_Hal:: @ 815EA68 + trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_HalIntro, AbandonedShip_Rooms2_1F_Text_HalDefeat, AbandonedShip_Rooms2_1F_Text_HalNeedTwoPokemon specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 - msgbox AbandonedShip_Rooms2_1F_Text_198835, MSGBOX_AUTOCLOSE + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_HalRematch + msgbox AbandonedShip_Rooms2_1F_Text_HalPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 - trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE - msgbox AbandonedShip_Rooms2_1F_Text_198A70, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_HalRematch:: @ 815EA93 + trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_HalRematchIntro, AbandonedShip_Rooms2_1F_Text_HalRematchDefeat, AbandonedShip_Rooms2_1F_Text_HalRematchNeedTwoPokemon + msgbox AbandonedShip_Rooms2_1F_Text_HalRematchPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE - trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A +AbandonedShip_Rooms2_1F_EventScript_Lois:: @ 815EAAE + trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_LoisIntro, AbandonedShip_Rooms2_1F_Text_LoisDefeat, AbandonedShip_Rooms2_1F_Text_LoisNeedTwoPokemon specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 - msgbox AbandonedShip_Rooms2_1F_Text_198934, MSGBOX_AUTOCLOSE + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_LoisRematch + msgbox AbandonedShip_Rooms2_1F_Text_LoisPostBattle, MSGBOX_AUTOCLOSE end -AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9 - trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 - msgbox AbandonedShip_Rooms2_1F_Text_198BEA, MSGBOX_AUTOCLOSE +AbandonedShip_Rooms2_1F_EventScript_LoisRematch:: @ 815EAD9 + trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_LoisRematchIntro, AbandonedShip_Rooms2_1F_Text_LoisRematchDefeat, AbandonedShip_Rooms2_1F_Text_LoisRematchNeedTwoPokemon + msgbox AbandonedShip_Rooms2_1F_Text_LoisRematchPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AbandonedShip_Rooms2_1F/text.inc b/data/maps/AbandonedShip_Rooms2_1F/text.inc index 6f539b8bc..2a2123294 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/text.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/text.inc @@ -1,70 +1,70 @@ -AbandonedShip_Rooms2_1F_Text_1987C1:: @ 81987C1 +AbandonedShip_Rooms2_1F_Text_HalIntro:: @ 81987C1 .string "HAL: While searching for treasures,\n" .string "we discovered a TRAINER!$" -AbandonedShip_Rooms2_1F_Text_1987FE:: @ 81987FE +AbandonedShip_Rooms2_1F_Text_HalDefeat:: @ 81987FE .string "HAL: We couldn't win even though\n" .string "we worked together...$" -AbandonedShip_Rooms2_1F_Text_198835:: @ 8198835 +AbandonedShip_Rooms2_1F_Text_HalPostBattle:: @ 8198835 .string "HAL: We can't find any treasures...\n" .string "I wonder if someone got them already?$" -AbandonedShip_Rooms2_1F_Text_19887F:: @ 819887F +AbandonedShip_Rooms2_1F_Text_HalNeedTwoPokemon:: @ 819887F .string "HAL: You don't even have two POKéMON.\n" .string "You can't expect to beat us like that.$" -AbandonedShip_Rooms2_1F_Text_1988CC:: @ 81988CC +AbandonedShip_Rooms2_1F_Text_LoisIntro:: @ 81988CC .string "LOIS: Oh? We were looking for some\n" .string "treasure, but we only found a TRAINER.$" -AbandonedShip_Rooms2_1F_Text_198916:: @ 8198916 +AbandonedShip_Rooms2_1F_Text_LoisDefeat:: @ 8198916 .string "LOIS: Oh, wow, you're strong!$" -AbandonedShip_Rooms2_1F_Text_198934:: @ 8198934 +AbandonedShip_Rooms2_1F_Text_LoisPostBattle:: @ 8198934 .string "LOIS: I wonder where the treasures\n" .string "are hidden?\p" .string "I already know what I'm going to buy\n" .string "when I find them!$" -AbandonedShip_Rooms2_1F_Text_19899A:: @ 819899A +AbandonedShip_Rooms2_1F_Text_LoisNeedTwoPokemon:: @ 819899A .string "LOIS: Don't you have two POKéMON?\n" .string "We'll have to battle another time!$" -AbandonedShip_Rooms2_1F_Text_1989DF:: @ 81989DF +AbandonedShip_Rooms2_1F_Text_HalRematchIntro:: @ 81989DF .string "HAL: We've been searching for\n" .string "treasures all this time.\p" .string "Our POKéMON have grown stronger, too.\n" .string "Let us show you, okay?$" -AbandonedShip_Rooms2_1F_Text_198A53:: @ 8198A53 +AbandonedShip_Rooms2_1F_Text_HalRematchDefeat:: @ 8198A53 .string "HAL: You're strong as usual!$" -AbandonedShip_Rooms2_1F_Text_198A70:: @ 8198A70 +AbandonedShip_Rooms2_1F_Text_HalRematchPostBattle:: @ 8198A70 .string "HAL: We can't find any treasures,\n" .string "we lose at POKéMON...\p" .string "I want to go home... But if I say that,\n" .string "she gets all angry with me...$" -AbandonedShip_Rooms2_1F_Text_198AEE:: @ 8198AEE +AbandonedShip_Rooms2_1F_Text_HalRematchNeedTwoPokemon:: @ 8198AEE .string "HAL: You don't even have two POKéMON.\n" .string "You can't expect to beat us like that.$" -AbandonedShip_Rooms2_1F_Text_198B3B:: @ 8198B3B +AbandonedShip_Rooms2_1F_Text_LoisRematchIntro:: @ 8198B3B .string "LOIS: Oh, hi, we meet again!\p" .string "Just like us, you haven't given up\n" .string "searching for treasures!\p" .string "How about we battle, and the loser has\n" .string "to give up looking?$" -AbandonedShip_Rooms2_1F_Text_198BCF:: @ 8198BCF +AbandonedShip_Rooms2_1F_Text_LoisRematchDefeat:: @ 8198BCF .string "LOIS: Oh, we lost again...$" -AbandonedShip_Rooms2_1F_Text_198BEA:: @ 8198BEA +AbandonedShip_Rooms2_1F_Text_LoisRematchPostBattle:: @ 8198BEA .string "LOIS: We'll raise our POKéMON more.\p" .string "We're not going home until we find our\n" .string "treasures!$" -AbandonedShip_Rooms2_1F_Text_198C40:: @ 8198C40 +AbandonedShip_Rooms2_1F_Text_LoisRematchNeedTwoPokemon:: @ 8198C40 .string "LOIS: Don't you have two POKéMON?\n" .string "We'll have to battle another time!$" diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 0e57552fe..b0f63937f 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms2_B1F_EventScript_15EA4E", + "script": "AbandonedShip_Rooms2_B1F_EventScript_Camper", "flag": "0" }, { @@ -34,8 +34,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms2_B1F_EventScript_1B1897", - "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1" + "script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL" } ], "warp_events": [ diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc index 073b78a38..c283e6eae 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms2_B1F_MapScripts:: @ 815EA4D .byte 0 -AbandonedShip_Rooms2_B1F_EventScript_15EA4E:: @ 815EA4E - msgbox AbandonedShip_Rooms2_B1F_Text_198759, MSGBOX_NPC +AbandonedShip_Rooms2_B1F_EventScript_Camper:: @ 815EA4E + msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC end diff --git a/data/maps/AbandonedShip_Rooms2_B1F/text.inc b/data/maps/AbandonedShip_Rooms2_B1F/text.inc index 193c416fe..9c3056672 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/text.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/text.inc @@ -1,4 +1,4 @@ -AbandonedShip_Rooms2_B1F_Text_198759:: @ 8198759 +AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring:: @ 8198759 .string "This is a perfect place to go exploring!\n" .string "It's exciting here!\p" .string "I bet there're amazing treasures on\n" diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 31887be9d..54aa2c8eb 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms_1F_EventScript_15E986", + "script": "AbandonedShip_Rooms_1F_EventScript_Gentleman", "flag": "0" }, { @@ -34,8 +34,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms_1F_EventScript_1B187D", - "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1" + "script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL" } ], "warp_events": [ diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 2db19af0d..e036db273 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_1F_MapScripts:: @ 815E985 .byte 0 -AbandonedShip_Rooms_1F_EventScript_15E986:: @ 815E986 - msgbox AbandonedShip_Rooms_1F_Text_19850A, MSGBOX_NPC +AbandonedShip_Rooms_1F_EventScript_Gentleman:: @ 815E986 + msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC end diff --git a/data/maps/AbandonedShip_Rooms_1F/text.inc b/data/maps/AbandonedShip_Rooms_1F/text.inc index e9523ce0d..83b036182 100644 --- a/data/maps/AbandonedShip_Rooms_1F/text.inc +++ b/data/maps/AbandonedShip_Rooms_1F/text.inc @@ -1,4 +1,4 @@ -AbandonedShip_Rooms_1F_Text_19850A:: @ 819850A +AbandonedShip_Rooms_1F_Text_TakingALookAround:: @ 819850A .string "Ships of this sort are rare, so I'm\n" .string "taking a look around.\p" .string "Hmhm...\n" diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 607205a3a..8f7c3a19a 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms_B1F_EventScript_15EA44", + "script": "AbandonedShip_Rooms_B1F_EventScript_FatMan", "flag": "0" }, { @@ -34,8 +34,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "AbandonedShip_Rooms_B1F_EventScript_1B188A", - "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1" + "script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE" } ], "warp_events": [ diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index 6cce989c1..1d447d41e 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -1,11 +1,11 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35 - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_15EA3B + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_OnResume .byte 0 -AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B +AbandonedShip_Rooms_B1F_MapScript1_OnResume:: @ 815EA3B setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end -AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44 - msgbox AbandonedShip_Rooms_B1F_Text_1986FE, MSGBOX_NPC +AbandonedShip_Rooms_B1F_EventScript_FatMan:: @ 815EA44 + msgbox AbandonedShip_Rooms_B1F_Text_GettingQueasy, MSGBOX_NPC end diff --git a/data/maps/AbandonedShip_Rooms_B1F/text.inc b/data/maps/AbandonedShip_Rooms_B1F/text.inc index bc7412574..e85363dd8 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/text.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/text.inc @@ -1,4 +1,4 @@ -AbandonedShip_Rooms_B1F_Text_1986FE:: @ 81986FE +AbandonedShip_Rooms_B1F_Text_GettingQueasy:: @ 81986FE .string "Urrrrppp...\p" .string "I'm getting queasy just being aboard\n" .string "this ship...\p" diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc index b4bc0e6b2..e18f17e57 100644 --- a/data/maps/AbandonedShip_Underwater1/scripts.inc +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -1,7 +1,7 @@ AbandonedShip_Underwater1_MapScripts:: @ 815EA57 - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_15EA5D + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_OnResume .byte 0 -AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D +AbandonedShip_Underwater1_OnResume:: @ 815EA5D setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 end diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc index d00fa1a59..1d4ba13f8 100644 --- a/data/maps/AbandonedShip_Underwater2/scripts.inc +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -1,7 +1,7 @@ AbandonedShip_Underwater2_MapScripts:: @ 815EB37 - map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_15EB3D + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_OnResume .byte 0 -AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D +AbandonedShip_Underwater2_OnResume:: @ 815EB3D setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 87ea42d83..e29a1b2eb 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -32,7 +32,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_14E0A2", + "script": "DewfordTown_EventScript_Woman", "flag": "0" }, { @@ -45,7 +45,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_EventScript_14E002", + "script": "DewfordTown_EventScript_Briney", "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, { @@ -58,7 +58,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_14E0C6", + "script": "DewfordTown_EventScript_OldRodFisherman", "flag": "0" }, { @@ -84,7 +84,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_14E413", + "script": "DewfordTown_EventScript_TrendyPhraseBoy", "flag": "0" } ], @@ -133,7 +133,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_14E0AB" + "script": "DewfordTown_EventScript_TownSign" }, { "type": "sign", @@ -141,7 +141,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_14E0B4" + "script": "DewfordTown_EventScript_GymSign" }, { "type": "sign", @@ -165,7 +165,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_14E0BD" + "script": "DewfordTown_EventScript_HallSign" } ] } diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 073a5d39e..3342b711f 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -1,136 +1,136 @@ DewfordTown_MapScripts:: @ 814DFF8 - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_14DFFE + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_OnTransition .byte 0 -DewfordTown_MapScript1_14DFFE:: @ 814DFFE +DewfordTown_OnTransition:: @ 814DFFE setflag FLAG_VISITED_DEWFORD_TOWN end -DewfordTown_EventScript_14E002:: @ 814E002 +DewfordTown_EventScript_Briney:: @ 814E002 lock faceplayer - goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_14E076 - message DewfordTown_Text_16B522 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_ReturnToPetalburgPrompt + message DewfordTown_Text_WhereAreWeBound waitmessage multichoicedefault 21, 6, 0, 2, 0 switch VAR_RESULT - case 0, DewfordTown_EventScript_14E04B - case 1, DewfordTown_EventScript_14E05B - case 2, DewfordTown_EventScript_14E06B - case 127, DewfordTown_EventScript_14E06B + case 0, DewfordTown_EventScript_ChoosePetalburg + case 1, DewfordTown_EventScript_ChooseSlateport + case 2, DewfordTown_EventScript_CancelSailSelect + case 127, DewfordTown_EventScript_CancelSailSelect end -DewfordTown_EventScript_14E04B:: @ 814E04B - msgbox DewfordTown_Text_16B57D, MSGBOX_DEFAULT +DewfordTown_EventScript_ChoosePetalburg:: @ 814E04B + msgbox DewfordTown_Text_PetalburgWereSettingSail, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_14E151 + goto DewfordTown_EventScript_SailToPetalburg release end -DewfordTown_EventScript_14E05B:: @ 814E05B - msgbox DewfordTown_Text_16B5D2, MSGBOX_DEFAULT +DewfordTown_EventScript_ChooseSlateport:: @ 814E05B + msgbox DewfordTown_Text_SlateportWereSettingSail, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_14E1D8 + goto DewfordTown_EventScript_SailToSlateport release end -DewfordTown_EventScript_14E06B:: @ 814E06B - msgbox DewfordTown_Text_16B627, MSGBOX_DEFAULT +DewfordTown_EventScript_CancelSailSelect:: @ 814E06B + msgbox DewfordTown_Text_JustTellMeWhenYouNeedToSetSail, MSGBOX_DEFAULT closemessage release end -DewfordTown_EventScript_14E076:: @ 814E076 - msgbox DewfordTown_Text_16B3BC, MSGBOX_YESNO +DewfordTown_EventScript_ReturnToPetalburgPrompt:: @ 814E076 + msgbox DewfordTown_Text_SetSailBackToPetalburg, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_14E093 - msgbox DewfordTown_Text_16B471, MSGBOX_DEFAULT + goto_if_eq DewfordTown_EventScript_SailBackToPetalburg + msgbox DewfordTown_Text_GoDeliverIllBeWaiting, MSGBOX_DEFAULT release end -DewfordTown_EventScript_14E093:: @ 814E093 - msgbox DewfordTown_Text_16B417, MSGBOX_DEFAULT +DewfordTown_EventScript_SailBackToPetalburg:: @ 814E093 + msgbox DewfordTown_Text_PetalburgWereSettingSail2, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_14E151 + goto DewfordTown_EventScript_SailToPetalburg end -DewfordTown_EventScript_14E0A2:: @ 814E0A2 - msgbox DewfordTown_Text_16B23B, MSGBOX_NPC +DewfordTown_EventScript_Woman:: @ 814E0A2 + msgbox DewfordTown_Text_TinyIslandCommunity, MSGBOX_NPC end -DewfordTown_EventScript_14E0AB:: @ 814E0AB - msgbox DewfordTown_Text_16B2A7, MSGBOX_SIGN +DewfordTown_EventScript_TownSign:: @ 814E0AB + msgbox DewfordTown_Text_TownSign, MSGBOX_SIGN end -DewfordTown_EventScript_14E0B4:: @ 814E0B4 - msgbox DewfordTown_Text_16B2D5, MSGBOX_SIGN +DewfordTown_EventScript_GymSign:: @ 814E0B4 + msgbox DewfordTown_Text_GymSign, MSGBOX_SIGN end -DewfordTown_EventScript_14E0BD:: @ 814E0BD - msgbox DewfordTown_Text_16B317, MSGBOX_SIGN +DewfordTown_EventScript_HallSign:: @ 814E0BD + msgbox DewfordTown_Text_HallSign, MSGBOX_SIGN end -DewfordTown_EventScript_14E0C6:: @ 814E0C6 +DewfordTown_EventScript_OldRodFisherman:: @ 814E0C6 lock faceplayer - goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_14E11B - msgbox DewfordTown_Text_16B665, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_HowsFishing + msgbox DewfordTown_Text_GettingItchToFish, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_14E0F0 + goto_if_eq DewfordTown_EventScript_GiveOldRod compare VAR_RESULT, NO - goto_if_eq DewfordTown_EventScript_14E111 + goto_if_eq DewfordTown_EventScript_NotGettingItchToFish end -DewfordTown_EventScript_14E0F0:: @ 814E0F0 - msgbox DewfordTown_Text_16B6A8, MSGBOX_DEFAULT +DewfordTown_EventScript_GiveOldRod:: @ 814E0F0 + msgbox DewfordTown_Text_GiveYouOneOfMyRods, MSGBOX_DEFAULT giveitem ITEM_OLD_ROD setflag FLAG_RECEIVED_OLD_ROD - msgbox DewfordTown_Text_16B6F9, MSGBOX_DEFAULT + msgbox DewfordTown_Text_ThrowInFishingAdvice, MSGBOX_DEFAULT release end -DewfordTown_EventScript_14E111:: @ 814E111 - msgbox DewfordTown_Text_16B828, MSGBOX_DEFAULT +DewfordTown_EventScript_NotGettingItchToFish:: @ 814E111 + msgbox DewfordTown_Text_ThatsTooBadThen, MSGBOX_DEFAULT release end -DewfordTown_EventScript_14E11B:: @ 814E11B - message DewfordTown_Text_16B84E +DewfordTown_EventScript_HowsFishing:: @ 814E11B + message DewfordTown_Text_HowsYourFishing waitmessage multichoice 20, 8, 50, 1 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_EventScript_14E13D + goto_if_eq DewfordTown_EventScript_FishingExcellent compare VAR_RESULT, 1 - goto_if_eq DewfordTown_EventScript_14E147 + goto_if_eq DewfordTown_EventScript_FishingNotSoGood end -DewfordTown_EventScript_14E13D:: @ 814E13D - msgbox DewfordTown_Text_16B866, MSGBOX_DEFAULT +DewfordTown_EventScript_FishingExcellent:: @ 814E13D + msgbox DewfordTown_Text_GreatHaulInSomeBigOnes, MSGBOX_DEFAULT release end -DewfordTown_EventScript_14E147:: @ 814E147 - msgbox DewfordTown_Text_16B89A, MSGBOX_DEFAULT +DewfordTown_EventScript_FishingNotSoGood:: @ 814E147 + msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT release end -DewfordTown_EventScript_14E151:: @ 814E151 +DewfordTown_EventScript_SailToPetalburg:: @ 814E151 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority 255, MAP_DEWFORD_TOWN, 0 - applymovement 2, DewfordTown_Movement_14E40E + applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement LOCALID_PLAYER, DewfordTown_Movement_14E402 + applymovement LOCALID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat LOCALID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_14E293 - applymovement LOCALID_PLAYER, DewfordTown_Movement_14E293 + applymovement 4, DewfordTown_Movement_SailToPetalburg + applymovement LOCALID_PLAYER, DewfordTown_Movement_SailToPetalburg waitmovement 0 showobjectat LOCALID_PLAYER, MAP_ROUTE104 call Common_EventScript_StopBrineysBoatMusic - applymovement LOCALID_PLAYER, DewfordTown_Movement_14E405 + applymovement LOCALID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg waitmovement 0 showobjectat LOCALID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE @@ -146,36 +146,36 @@ DewfordTown_EventScript_14E151:: @ 814E151 release end -DewfordTown_EventScript_14E1D8:: @ 814E1D8 +DewfordTown_EventScript_SailToSlateport:: @ 814E1D8 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority 255, MAP_DEWFORD_TOWN, 1 - applymovement 2, DewfordTown_Movement_14E40E + applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement LOCALID_PLAYER, DewfordTown_Movement_14E402 + applymovement LOCALID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat LOCALID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_14E356 - applymovement LOCALID_PLAYER, DewfordTown_Movement_14E356 + applymovement 4, DewfordTown_Movement_SailToSlateport + applymovement LOCALID_PLAYER, DewfordTown_Movement_SailToSlateport waitmovement 0 call Common_EventScript_StopBrineysBoatMusic showobjectat LOCALID_PLAYER, MAP_ROUTE109 - applymovement LOCALID_PLAYER, DewfordTown_Movement_14E409 + applymovement LOCALID_PLAYER, DewfordTown_Movement_ExitBoatSlateport waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 setobjectpriority 2, MAP_ROUTE109, 0 - applymovement 2, DewfordTown_Movement_14E410 + applymovement 2, DewfordTown_Movement_BrineyExitBoat waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 addobject 1 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobjectat 4, MAP_DEWFORD_TOWN - call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E281 - call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A + call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateportDeliverGoods + call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority LOCALID_PLAYER, MAP_DEWFORD_TOWN @@ -184,15 +184,15 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 release end -DewfordTown_EventScript_14E281:: @ 814E281 - msgbox DewfordTown_Text_16E080, MSGBOX_DEFAULT +DewfordTown_EventScript_LandedSlateportDeliverGoods:: @ 814E281 + msgbox DewfordTown_Text_BrineyLandedInSlateportDeliverGoods, MSGBOX_DEFAULT return -DewfordTown_EventScript_14E28A:: @ 814E28A - msgbox DewfordTown_Text_16E1FA, MSGBOX_DEFAULT +DewfordTown_EventScript_LandedSlateport:: @ 814E28A + msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT return -DewfordTown_Movement_14E293:: @ 814E293 +DewfordTown_Movement_SailToPetalburg:: @ 814E293 walk_up walk_up walk_fast_up @@ -389,7 +389,7 @@ DewfordTown_Movement_14E293:: @ 814E293 walk_up step_end -DewfordTown_Movement_14E356:: @ 814E356 +DewfordTown_Movement_SailToSlateport:: @ 814E356 walk_right walk_fast_right walk_fast_right @@ -563,80 +563,80 @@ DewfordTown_Movement_14E356:: @ 814E356 walk_fast_up step_end -DewfordTown_Movement_14E402:: @ 814E402 +DewfordTown_Movement_PlayerBoardBoat:: @ 814E402 walk_right walk_up step_end -DewfordTown_Movement_14E405:: @ 814E405 +DewfordTown_Movement_ExitBoatPetalburg:: @ 814E405 walk_up walk_up walk_up step_end -DewfordTown_Movement_14E409:: @ 814E409 +DewfordTown_Movement_ExitBoatSlateport:: @ 814E409 walk_up walk_up walk_up walk_in_place_fastest_down step_end -DewfordTown_Movement_14E40E:: @ 814E40E +DewfordTown_Movement_BrineyBoardBoat:: @ 814E40E walk_up step_end -DewfordTown_Movement_14E410:: @ 814E410 +DewfordTown_Movement_BrineyExitBoat:: @ 814E410 walk_up walk_up step_end -DewfordTown_EventScript_14E413:: @ 814E413 +DewfordTown_EventScript_TrendyPhraseBoy:: @ 814E413 lock faceplayer call Common_EventScript_BufferTrendyPhrase - msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO + msgbox DewfordTown_Text_XIsTheBiggestHappeningThingRight, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_14E439 + goto_if_eq DewfordTown_EventScript_ConfirmTrendyPhrase compare VAR_RESULT, NO - goto_if_eq DewfordTown_EventScript_14E443 + goto_if_eq DewfordTown_EventScript_RejectTrendyPhrase end -DewfordTown_EventScript_14E439:: @ 814E439 - msgbox DewfordTown_Text_16BD37, MSGBOX_DEFAULT +DewfordTown_EventScript_ConfirmTrendyPhrase:: @ 814E439 + msgbox DewfordTown_Text_YeahDefinitionOfInRightNow, MSGBOX_DEFAULT release end -DewfordTown_EventScript_14E443:: @ 814E443 - msgbox DewfordTown_Text_16BADC, MSGBOX_DEFAULT +DewfordTown_EventScript_RejectTrendyPhrase:: @ 814E443 + msgbox DewfordTown_Text_TellMeWhatsNewAndIn, MSGBOX_DEFAULT setvar VAR_0x8004, 9 call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 - goto_if_eq DewfordTown_EventScript_14E46E + goto_if_eq DewfordTown_EventScript_GiveNewTrendyPhrase compare VAR_RESULT, 0 - goto_if_eq DewfordTown_EventScript_14E485 + goto_if_eq DewfordTown_EventScript_CancelNewTrendyPhrase end -DewfordTown_EventScript_14E46E:: @ 814E46E +DewfordTown_EventScript_GiveNewTrendyPhrase:: @ 814E46E incrementgamestat GAME_STAT_STARTED_TRENDS compare VAR_0x8004, 0 - goto_if_eq DewfordTown_EventScript_14E48F - msgbox DewfordTown_Text_16BB44, MSGBOX_DEFAULT + goto_if_eq DewfordTown_EventScript_PhraseNotTrendyEnough + msgbox DewfordTown_Text_OfCourseIKnowAboutThat, MSGBOX_DEFAULT release end -DewfordTown_EventScript_14E485:: @ 814E485 - msgbox DewfordTown_Text_16BCE9, MSGBOX_DEFAULT +DewfordTown_EventScript_CancelNewTrendyPhrase:: @ 814E485 + msgbox DewfordTown_Text_HearOfAnyTrendsComeShareWithMe, MSGBOX_DEFAULT release end -DewfordTown_EventScript_14E48F:: @ 814E48F - msgbox DewfordTown_Text_16BCA2, MSGBOX_DEFAULT +DewfordTown_EventScript_PhraseNotTrendyEnough:: @ 814E48F + msgbox DewfordTown_Text_XHuhIThinkYIsCool, MSGBOX_DEFAULT release end -@ 814E499 - msgbox DewfordTown_Text_16BD79, MSGBOX_DEFAULT +DewfordTown_EventScript_PinnacleOfCool:: @ 814E499 + msgbox DewfordTown_Text_PinnacleOfCool, MSGBOX_DEFAULT release end diff --git a/data/maps/DewfordTown/text.inc b/data/maps/DewfordTown/text.inc index 35c748160..d9ad46f58 100644 --- a/data/maps/DewfordTown/text.inc +++ b/data/maps/DewfordTown/text.inc @@ -1,78 +1,78 @@ -DewfordTown_Text_16B23B:: @ 816B23B +DewfordTown_Text_TinyIslandCommunity:: @ 816B23B .string "DEWFORD TOWN is a tiny island community.\n" .string "If something gets trendy here,\l" .string "everyone picks up on it right away.$" -DewfordTown_Text_16B2A7:: @ 816B2A7 +DewfordTown_Text_TownSign:: @ 816B2A7 .string "DEWFORD TOWN\n" .string "“A tiny island in the blue sea.”$" -DewfordTown_Text_16B2D5:: @ 816B2D5 +DewfordTown_Text_GymSign:: @ 816B2D5 .string "DEWFORD TOWN POKéMON GYM\n" .string "LEADER: BRAWLY\l" .string "“A big wave in fighting!”$" -DewfordTown_Text_16B317:: @ 816B317 +DewfordTown_Text_HallSign:: @ 816B317 .string "DEWFORD HALL\n" .string "“Everyone's information exchange!”$" -Route104_Text_16B347:: @ 816B347 +Route104_Text_LandedInDewfordDeliverLetter:: @ 816B347 .string "MR. BRINEY: Ahoy!\n" .string "We've hit land in DEWFORD.\p" .string "I suppose you're off to deliver that\n" .string "LETTER to, who was it now, STEVEN!$" -DewfordTown_Text_16B3BC:: @ 816B3BC +DewfordTown_Text_SetSailBackToPetalburg:: @ 816B3BC .string "MR. BRINEY: Have you delivered your\n" .string "LETTER?\p" .string "Or were you meaning to sail back to\n" .string "PETALBURG?$" -DewfordTown_Text_16B417:: @ 816B417 +DewfordTown_Text_PetalburgWereSettingSail2:: @ 816B417 .string "MR. BRINEY: PETALBURG it is, then!\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_16B471:: @ 816B471 +DewfordTown_Text_GoDeliverIllBeWaiting:: @ 816B471 .string "MR. BRINEY: Then you go on and deliver\n" .string "the LETTER. I'll be waiting.$" -Route104_Text_16B4B5:: @ 816B4B5 -Route109_Text_16B4B5:: @ 816B4B5 +Route104_Text_BrineyLandedInDewford:: @ 816B4B5 +Route109_Text_BrineyLandedInDewford:: @ 816B4B5 .string "MR. BRINEY: Ahoy!\n" .string "We've hit land in DEWFORD!\p" .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" -DewfordTown_Text_16B522:: @ 816B522 +DewfordTown_Text_WhereAreWeBound:: @ 816B522 .string "MR. BRINEY: Ahoy!\n" .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" -DewfordTown_Text_16B57D:: @ 816B57D +DewfordTown_Text_PetalburgWereSettingSail:: @ 816B57D .string "MR. BRINEY: PETALBURG, is it?\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_16B5D2:: @ 816B5D2 +DewfordTown_Text_SlateportWereSettingSail:: @ 816B5D2 .string "MR. BRINEY: SLATEPORT, is it?\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_16B627:: @ 816B627 +DewfordTown_Text_JustTellMeWhenYouNeedToSetSail:: @ 816B627 .string "MR. BRINEY: Just tell me whenever you\n" .string "want to set sail again.$" -DewfordTown_Text_16B665:: @ 816B665 +DewfordTown_Text_GettingItchToFish:: @ 816B665 .string "This is a renowned fishing spot.\n" .string "Are you getting the itch to fish?$" -DewfordTown_Text_16B6A8:: @ 816B6A8 +DewfordTown_Text_GiveYouOneOfMyRods:: @ 816B6A8 .string "I hear you, and I like what\n" .string "you're saying!\p" .string "I'll give you one of my fishing RODS.$" -DewfordTown_Text_16B6F9:: @ 816B6F9 +DewfordTown_Text_ThrowInFishingAdvice:: @ 816B6F9 .string "And, as an added bonus, I'll even throw\n" .string "in a little fishing advice!\p" .string "First, you want to face the water,\n" @@ -84,19 +84,19 @@ DewfordTown_Text_16B6F9:: @ 816B6F9 .string "you need to time the pulls on your ROD\l" .string "to haul them in.$" -DewfordTown_Text_16B828:: @ 816B828 +DewfordTown_Text_ThatsTooBadThen:: @ 816B828 .string "Oh, is that so?\n" .string "That's too bad, then.$" -DewfordTown_Text_16B84E:: @ 816B84E +DewfordTown_Text_HowsYourFishing:: @ 816B84E .string "Yo!\n" .string "How's your fishing?$" -DewfordTown_Text_16B866:: @ 816B866 +DewfordTown_Text_GreatHaulInSomeBigOnes:: @ 816B866 .string "Is that right! That's great!\n" .string "Haul in some big ones!$" -DewfordTown_Text_16B89A:: @ 816B89A +DewfordTown_Text_FishingAdvice:: @ 816B89A .string "Oh, hey, don't get down on yourself!\n" .string "I'll give you a little fishing advice.\p" .string "First, you want to face the water,\n" @@ -108,7 +108,7 @@ DewfordTown_Text_16B89A:: @ 816B89A .string "you need to time the pulls on your ROD\l" .string "to haul them in.$" -DewfordTown_Text_16B9CE:: @ 816B9CE +DewfordTown_Text_XIsTheBiggestHappeningThingRight:: @ 816B9CE .string "I like what's hip, happening, and trendy.\n" .string "I'm always checking it out.\p" .string "Listen, have you heard about this new\n" @@ -122,13 +122,13 @@ DewfordTown_Text_16B9CE:: @ 816B9CE .string "“{STR_VAR_1}”\l" .string "is the biggest happening thing, right?$" -DewfordTown_Text_16BADC:: @ 816BADC +DewfordTown_Text_TellMeWhatsNewAndIn:: @ 816BADC .string "Hunh?\n" .string "It's not the hip and happening thing?\p" .string "Well, hey, you have to tell me,\n" .string "what's new and what's “in”?$" -DewfordTown_Text_16BB44:: @ 816BB44 +DewfordTown_Text_OfCourseIKnowAboutThat:: @ 816BB44 .string "Hunh?\n" .string "“{STR_VAR_2}”?\p" .string "... ...\p" @@ -146,22 +146,22 @@ DewfordTown_Text_16BB44:: @ 816BB44 .string "Now, “{STR_VAR_2}” is\n" .string "what's vital and in tune with the times!$" -DewfordTown_Text_16BCA2:: @ 816BCA2 +DewfordTown_Text_XHuhIThinkYIsCool:: @ 816BCA2 .string "Hmm...\n" .string "“{STR_VAR_2},” huh?\p" .string "But personally, I think\n" .string "“{STR_VAR_1}”\l" .string "is what's real in cool.$" -DewfordTown_Text_16BCE9:: @ 816BCE9 +DewfordTown_Text_HearOfAnyTrendsComeShareWithMe:: @ 816BCE9 .string "Well, if you hear of any happening new\n" .string "trends, come share them with me, okay?$" -DewfordTown_Text_16BD37:: @ 816BD37 +DewfordTown_Text_YeahDefinitionOfInRightNow:: @ 816BD37 .string "Yeah, absolutely right!\p" .string "“{STR_VAR_1}” is the\n" .string "definition of “in” right now.$" -DewfordTown_Text_16BD79: @ 816BD79 +DewfordTown_Text_PinnacleOfCool: @ 816BD79 .string "“{STR_VAR_2}” is at\n" .string "the pinnacle of cool right now.$" diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index e67095a10..7aba61b6f 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Gym_EventScript_153152", + "script": "DewfordTown_Gym_EventScript_Brawly", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_Gym_EventScript_1531D9", + "script": "DewfordTown_Gym_EventScript_Hideki", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_Gym_EventScript_1531FB", + "script": "DewfordTown_Gym_EventScript_Tessa", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "DewfordTown_Gym_EventScript_15321D", + "script": "DewfordTown_Gym_EventScript_Laura", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Gym_EventScript_15323F", + "script": "DewfordTown_Gym_EventScript_GymGuide", "flag": "0" } ], @@ -101,7 +101,7 @@ "y": 21, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_Gym_EventScript_15325E" + "script": "DewfordTown_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -109,7 +109,7 @@ "y": 21, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_Gym_EventScript_15326E" + "script": "DewfordTown_Gym_EventScript_RightGymStatue" }, { "type": "sign", @@ -117,7 +117,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_Gym_EventScript_15325E" + "script": "DewfordTown_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -125,7 +125,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_Gym_EventScript_15326E" + "script": "DewfordTown_Gym_EventScript_RightGymStatue" } ] } diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index d4a5372dd..aaa239a5c 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -1,112 +1,112 @@ DewfordTown_Gym_MapScripts:: @ 8153065 - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_15306B + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_OnTransition .byte 0 -DewfordTown_Gym_MapScript1_15306B:: @ 815306B - call DewfordTown_Gym_EventScript_153071 +DewfordTown_Gym_OnTransition:: @ 815306B + call DewfordTown_Gym_EventScript_SetFlashLevel end -DewfordTown_Gym_EventScript_153071:: @ 8153071 - goto_if_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA - call DewfordTown_Gym_EventScript_153122 +DewfordTown_Gym_EventScript_SetFlashLevel:: @ 8153071 + goto_if_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_SetLightsOn + call DewfordTown_Gym_EventScript_CheckHideki copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 0 - goto_if_eq DewfordTown_Gym_EventScript_1530BA + goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel4 compare VAR_0x8000, 1 - goto_if_eq DewfordTown_Gym_EventScript_1530B6 + goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel3 compare VAR_0x8000, 2 - goto_if_eq DewfordTown_Gym_EventScript_1530B2 - goto DewfordTown_Gym_EventScript_1530AE + goto_if_eq DewfordTown_Gym_EventScript_SetFlashLevel2 + goto DewfordTown_Gym_EventScript_SetFlashLevel1 -DewfordTown_Gym_EventScript_1530AA:: @ 81530AA +DewfordTown_Gym_EventScript_SetLightsOn:: @ 81530AA setflashradius 0 return -DewfordTown_Gym_EventScript_1530AE:: @ 81530AE +DewfordTown_Gym_EventScript_SetFlashLevel1:: @ 81530AE setflashradius 1 return -DewfordTown_Gym_EventScript_1530B2:: @ 81530B2 +DewfordTown_Gym_EventScript_SetFlashLevel2:: @ 81530B2 setflashradius 2 return -DewfordTown_Gym_EventScript_1530B6:: @ 81530B6 +DewfordTown_Gym_EventScript_SetFlashLevel3:: @ 81530B6 setflashradius 3 return -DewfordTown_Gym_EventScript_1530BA:: @ 81530BA +DewfordTown_Gym_EventScript_SetFlashLevel4:: @ 81530BA setflashradius 4 return -DewfordTown_Gym_EventScript_1530BE:: @ 81530BE - call DewfordTown_Gym_EventScript_153122 +DewfordTown_Gym_EventScript_BrightenRoom:: @ 81530BE + call DewfordTown_Gym_EventScript_CheckHideki nop1 compare VAR_0x8000, VAR_0x8001 - goto_if_eq DewfordTown_Gym_EventScript_1530F5 + goto_if_eq DewfordTown_Gym_EventScript_NoLightChange copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 1 - goto_if_eq DewfordTown_Gym_EventScript_1530F6 + goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash1Trainers compare VAR_0x8000, 2 - goto_if_eq DewfordTown_Gym_EventScript_153101 + goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash2Trainers compare VAR_0x8000, 3 - goto_if_eq DewfordTown_Gym_EventScript_15310C + goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash3Trainers -DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 +DewfordTown_Gym_EventScript_NoLightChange:: @ 81530F5 return -DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 +DewfordTown_Gym_EventScript_AnimateFlash1Trainers:: @ 81530F6 playse SE_SWITCH animateflash 3 - call DewfordTown_Gym_EventScript_153071 + call DewfordTown_Gym_EventScript_SetFlashLevel return -DewfordTown_Gym_EventScript_153101:: @ 8153101 +DewfordTown_Gym_EventScript_AnimateFlash2Trainers:: @ 8153101 playse SE_SWITCH animateflash 2 - call DewfordTown_Gym_EventScript_153071 + call DewfordTown_Gym_EventScript_SetFlashLevel return -DewfordTown_Gym_EventScript_15310C:: @ 815310C +DewfordTown_Gym_EventScript_AnimateFlash3Trainers:: @ 815310C playse SE_SWITCH animateflash 1 - call DewfordTown_Gym_EventScript_153071 + call DewfordTown_Gym_EventScript_SetFlashLevel return -DewfordTown_Gym_EventScript_153117:: @ 8153117 +DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 8153117 playse SE_SWITCH animateflash 0 - call DewfordTown_Gym_EventScript_153071 + call DewfordTown_Gym_EventScript_SetFlashLevel return -DewfordTown_Gym_EventScript_153122:: @ 8153122 +DewfordTown_Gym_EventScript_CheckHideki:: @ 8153122 setvar VAR_0x8000, 0 - goto_if_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 + goto_if_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_CheckTessa addvar VAR_0x8000, 1 -DewfordTown_Gym_EventScript_153135:: @ 8153135 - goto_if_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 +DewfordTown_Gym_EventScript_CheckTessa:: @ 8153135 + goto_if_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_CheckLaura addvar VAR_0x8000, 1 -DewfordTown_Gym_EventScript_153143:: @ 8153143 - goto_if_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 +DewfordTown_Gym_EventScript_CheckLaura:: @ 8153143 + goto_if_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_StopCountingTrainers addvar VAR_0x8000, 1 -DewfordTown_Gym_EventScript_153151:: @ 8153151 +DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 8153151 return -DewfordTown_Gym_EventScript_153152:: @ 8153152 - trainerbattle_single TRAINER_BRAWLY, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177, NO_MUSIC - goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 - msgbox DewfordTown_Gym_Text_175412, MSGBOX_DEFAULT +DewfordTown_Gym_EventScript_Brawly:: @ 8153152 + trainerbattle_single TRAINER_BRAWLY, DewfordTown_Gym_Text_BrawlyIntro, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC + goto_if_unset FLAG_RECEIVED_TM_BULK_UP, DewfordTown_Gym_EventScript_GiveBulkUp + msgbox DewfordTown_Gym_Text_BrawlyPostBattle, MSGBOX_DEFAULT release end -DewfordTown_Gym_EventScript_153177:: @ 8153177 - call DewfordTown_Gym_EventScript_153117 - message DewfordTown_Gym_Text_1752BB +DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 8153177 + call DewfordTown_Gym_EventScript_AnimateFlashFullBrightness + message DewfordTown_Gym_Text_ReceivedKnuckleBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox DewfordTown_Gym_Text_1752E6, MSGBOX_DEFAULT + msgbox DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET addvar VAR_PETALBURG_GYM_STATE, 1 @@ -114,79 +114,79 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 call_if_eq Common_EventScript_ReadyPetalburgGymForBattle setvar VAR_0x8008, 2 call Common_EventScript_SetGymTrainers - goto DewfordTown_Gym_EventScript_1531B5 + goto DewfordTown_Gym_EventScript_GiveBulkUp end -DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 +DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81531B5 giveitem ITEM_TM08_BULK_UP compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox DewfordTown_Gym_Text_1753BF, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM08 + msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_BULK_UP release end -DewfordTown_Gym_EventScript_1531D9:: @ 81531D9 - trainerbattle_single TRAINER_HIDEKI, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 - msgbox DewfordTown_Gym_Text_174F8E, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_Hideki:: @ 81531D9 + trainerbattle_single TRAINER_HIDEKI, DewfordTown_Gym_Text_HidekiIntro, DewfordTown_Gym_Text_HidekiDefeat, DewfordTown_Gym_EventScript_HidekiBrightenRoom + msgbox DewfordTown_Gym_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 - call DewfordTown_Gym_EventScript_1530BE +DewfordTown_Gym_EventScript_HidekiBrightenRoom:: @ 81531F4 + call DewfordTown_Gym_EventScript_BrightenRoom release end -DewfordTown_Gym_EventScript_1531FB:: @ 81531FB - trainerbattle_single TRAINER_TESSA, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 - msgbox DewfordTown_Gym_Text_175031, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_Tessa:: @ 81531FB + trainerbattle_single TRAINER_TESSA, DewfordTown_Gym_Text_TessaIntro, DewfordTown_Gym_Text_TessaDefeat, DewfordTown_Gym_EventScript_TessaBrightenRoom + msgbox DewfordTown_Gym_Text_TessaPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_153216:: @ 8153216 - call DewfordTown_Gym_EventScript_1530BE +DewfordTown_Gym_EventScript_TessaBrightenRoom:: @ 8153216 + call DewfordTown_Gym_EventScript_BrightenRoom release end -DewfordTown_Gym_EventScript_15321D:: @ 815321D - trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 - msgbox DewfordTown_Gym_Text_175117, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_Laura:: @ 815321D + trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_LauraIntro, DewfordTown_Gym_Text_LauraDefeat, DewfordTown_Gym_EventScript_LauraBrightenRoom + msgbox DewfordTown_Gym_Text_LauraPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_153238:: @ 8153238 - call DewfordTown_Gym_EventScript_1530BE +DewfordTown_Gym_EventScript_LauraBrightenRoom:: @ 8153238 + call DewfordTown_Gym_EventScript_BrightenRoom release end -DewfordTown_Gym_EventScript_15323F:: @ 815323F +DewfordTown_Gym_EventScript_GymGuide:: @ 815323F lock faceplayer - goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_153254 - msgbox DewfordTown_Gym_Text_174D98, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_GymGuidePostVictory + msgbox DewfordTown_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -DewfordTown_Gym_EventScript_153254:: @ 8153254 - msgbox DewfordTown_Gym_Text_174F1E, MSGBOX_DEFAULT +DewfordTown_Gym_EventScript_GymGuidePostVictory:: @ 8153254 + msgbox DewfordTown_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -DewfordTown_Gym_EventScript_15325E:: @ 815325E +DewfordTown_Gym_EventScript_LeftGymStatue:: @ 815325E lockall - goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E - goto DewfordTown_Gym_EventScript_153288 + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified + goto DewfordTown_Gym_EventScript_GymStatue end -DewfordTown_Gym_EventScript_15326E:: @ 815326E +DewfordTown_Gym_EventScript_RightGymStatue:: @ 815326E lockall - goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E - goto DewfordTown_Gym_EventScript_153288 + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified + goto DewfordTown_Gym_EventScript_GymStatue end -DewfordTown_Gym_EventScript_15327E:: @ 815327E - msgbox DewfordTown_Gym_Text_175490, MSGBOX_DEFAULT +DewfordTown_Gym_EventScript_GymStatueCertified:: @ 815327E + msgbox DewfordTown_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -DewfordTown_Gym_EventScript_153288:: @ 8153288 - msgbox DewfordTown_Gym_Text_175477, MSGBOX_DEFAULT +DewfordTown_Gym_EventScript_GymStatue:: @ 8153288 + msgbox DewfordTown_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/DewfordTown_Gym/text.inc b/data/maps/DewfordTown_Gym/text.inc index c00ff273a..acde714da 100644 --- a/data/maps/DewfordTown_Gym/text.inc +++ b/data/maps/DewfordTown_Gym/text.inc @@ -1,4 +1,4 @@ -DewfordTown_Gym_Text_174D98:: @ 8174D98 +DewfordTown_Gym_Text_GymGuideAdvice:: @ 8174D98 .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "DEWFORD's GYM LEADER BRAWLY commands\n" @@ -14,52 +14,52 @@ DewfordTown_Gym_Text_174D98:: @ 8174D98 .string "the TRAINERS in your way.\p" .string "Hey, okay, go for it!$" -DewfordTown_Gym_Text_174F1E:: @ 8174F1E +DewfordTown_Gym_Text_GymGuidePostVictory:: @ 8174F1E .string "Whoah! It's turned too bright in here!\p" .string "Your future is bright, too!$" -DewfordTown_Gym_Text_174F61:: @ 8174F61 +DewfordTown_Gym_Text_HidekiIntro:: @ 8174F61 .string "Might is right!\n" .string "Come on!$" -DewfordTown_Gym_Text_174F7A:: @ 8174F7A +DewfordTown_Gym_Text_HidekiDefeat:: @ 8174F7A .string "Not enough power...$" -DewfordTown_Gym_Text_174F8E:: @ 8174F8E +DewfordTown_Gym_Text_HidekiPostBattle:: @ 8174F8E .string "Your skill overcame my strength!\n" .string "Your technique is commendable!$" -DewfordTown_Gym_Text_174FCE:: @ 8174FCE +DewfordTown_Gym_Text_TessaIntro:: @ 8174FCE .string "There's no need for BRAWLY to be\n" .string "involved!\p" .string "I'll crush you!$" -DewfordTown_Gym_Text_175009:: @ 8175009 +DewfordTown_Gym_Text_TessaDefeat:: @ 8175009 .string "But... How?\n" .string "How could I lose so easily?$" -DewfordTown_Gym_Text_175031:: @ 8175031 +DewfordTown_Gym_Text_TessaPostBattle:: @ 8175031 .string "I'm not going to waste this loss.\n" .string "I'll use it to motivate me to train!\p" .string "One day I'll become a GYM LEADER...\p" .string "No, I'll become the POKéMON LEAGUE\n" .string "CHAMPION!$" -DewfordTown_Gym_Text_1750C9:: @ 81750C9 +DewfordTown_Gym_Text_LauraIntro:: @ 81750C9 .string "Don't you dare brush me off!\n" .string "It's not my fault if you cry!$" -DewfordTown_Gym_Text_175104:: @ 8175104 +DewfordTown_Gym_Text_LauraDefeat:: @ 8175104 .string "Waaaaaaah!\n" .string "I lost!$" -DewfordTown_Gym_Text_175117:: @ 8175117 +DewfordTown_Gym_Text_LauraPostBattle:: @ 8175117 .string "I battle in the dark to make my heart\n" .string "stronger.\p" .string "But because it's so dark, I can never\n" .string "see BRAWLY's face...$" -DewfordTown_Gym_Text_175182:: @ 8175182 +DewfordTown_Gym_Text_BrawlyIntro:: @ 8175182 .string "I'm BRAWLY!\n" .string "DEWFORD's GYM LEADER!\p" .string "I've been churned in the rough waves\n" @@ -68,18 +68,18 @@ DewfordTown_Gym_Text_175182:: @ 8175182 .string "So you wanted to challenge me?\n" .string "Let me see what you're made of!$" -DewfordTown_Gym_Text_175246:: @ 8175246 +DewfordTown_Gym_Text_BrawlyDefeat:: @ 8175246 .string "Whoah, wow! You made a much bigger\n" .string "splash than I expected!\p" .string "You swamped me!\p" .string "Okay, you've got me.\n" .string "Take this GYM BADGE!$" -DewfordTown_Gym_Text_1752BB:: @ 81752BB +DewfordTown_Gym_Text_ReceivedKnuckleBadge:: @ 81752BB .string "{PLAYER} received the KNUCKLE BADGE\n" .string "from BRAWLY.$" -DewfordTown_Gym_Text_1752E6:: @ 81752E6 +DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis:: @ 81752E6 .string "The KNUCKLE BADGE makes all POKéMON\n" .string "up to Level 30, even those you get in\l" .string "trades, obey without question.\p" @@ -88,20 +88,20 @@ DewfordTown_Gym_Text_1752E6:: @ 81752E6 .string "If you'd like, use this TECHNICAL\n" .string "MACHINE, too.$" -DewfordTown_Gym_Text_1753BF:: @ 81753BF +DewfordTown_Gym_Text_ExplainBulkUp:: @ 81753BF .string "That TM08 contains BULK UP.\p" .string "It's a move that raises both ATTACK\n" .string "and DEFENSE stats.$" -DewfordTown_Gym_Text_175412:: @ 8175412 +DewfordTown_Gym_Text_BrawlyPostBattle:: @ 8175412 .string "I can see your talent becoming a giant\n" .string "wave to cause a storm of astonishment\l" .string "among TRAINERS one day!$" -DewfordTown_Gym_Text_175477:: @ 8175477 +DewfordTown_Gym_Text_GymStatue:: @ 8175477 .string "DEWFORD TOWN POKéMON GYM$" -DewfordTown_Gym_Text_175490:: @ 8175490 +DewfordTown_Gym_Text_GymStatueCertified:: @ 8175490 .string "DEWFORD TOWN POKéMON GYM\p" .string "BRAWLY'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index c08612017..b576a6698 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_153293", + "script": "DewfordTown_Hall_EventScript_Girl", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1532BC", + "script": "DewfordTown_Hall_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1532CD", + "script": "DewfordTown_Hall_EventScript_Man", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_15330A", + "script": "DewfordTown_Hall_EventScript_ExpertM", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_153326", + "script": "DewfordTown_Hall_EventScript_Twin", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_153342", + "script": "DewfordTown_Hall_EventScript_LittleBoy", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1533F2", + "script": "DewfordTown_Hall_EventScript_SchoolKidM", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1533FE", + "script": "DewfordTown_Hall_EventScript_PsychicM", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_15359D", + "script": "DewfordTown_Hall_EventScript_SludgeBombMan", "flag": "FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL" } ], @@ -153,7 +153,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_Hall_EventScript_153353" + "script": "DewfordTown_Hall_EventScript_Bookshelf" }, { "type": "sign", @@ -161,7 +161,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_Hall_EventScript_153363" + "script": "DewfordTown_Hall_EventScript_Painting" } ] } diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 574a6ebbc..19b5350d2 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -1,267 +1,267 @@ DewfordTown_Hall_MapScripts:: @ 8153292 .byte 0 -DewfordTown_Hall_EventScript_153293:: @ 8153293 +DewfordTown_Hall_EventScript_Girl:: @ 8153293 lock faceplayer call Common_EventScript_BufferTrendyPhrase - special TrendyPhraseIsOld + special IsTrendyPhraseBoring compare VAR_RESULT, 1 - goto_if_eq DewfordTown_Hall_EventScript_1532B2 - msgbox DewfordTown_Hall_Text_1754C9, MSGBOX_DEFAULT + goto_if_eq DewfordTown_Hall_EventScript_GirlBoredOfTrend + msgbox DewfordTown_Hall_Text_CantImagineLifeWithoutTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1532B2:: @ 81532B2 - msgbox DewfordTown_Hall_Text_175528, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_GirlBoredOfTrend:: @ 81532B2 + msgbox DewfordTown_Hall_Text_GettingBoredOfTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1532BC:: @ 81532BC +DewfordTown_Hall_EventScript_Woman:: @ 81532BC lock faceplayer call Common_EventScript_BufferTrendyPhrase - msgbox DewfordTown_Hall_Text_17559E, MSGBOX_DEFAULT + msgbox DewfordTown_Hall_Text_TeachingMonAboutTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1532CD:: @ 81532CD +DewfordTown_Hall_EventScript_Man:: @ 81532CD lock faceplayer call Common_EventScript_BufferTrendyPhrase special BufferRandomHobbyOrLifestyleString - msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO + msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_Hall_EventScript_1532F6 + goto_if_eq DewfordTown_Hall_EventScript_ConfirmTrendLink compare VAR_RESULT, NO - goto_if_eq DewfordTown_Hall_EventScript_153300 + goto_if_eq DewfordTown_Hall_EventScript_RejectTrendLink end -DewfordTown_Hall_EventScript_1532F6:: @ 81532F6 - msgbox DewfordTown_Hall_Text_175664, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ConfirmTrendLink:: @ 81532F6 + msgbox DewfordTown_Hall_Text_MyHunchWasRight, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_153300:: @ 8153300 - msgbox DewfordTown_Hall_Text_1756B7, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_RejectTrendLink:: @ 8153300 + msgbox DewfordTown_Hall_Text_NotEasyToKeepUp, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_15330A:: @ 815330A +DewfordTown_Hall_EventScript_ExpertM:: @ 815330A lock faceplayer call Common_EventScript_BufferTrendyPhrase - msgbox DewfordTown_Hall_Text_17570D, MSGBOX_DEFAULT + msgbox DewfordTown_Hall_Text_TVShowAboutTrend, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end -DewfordTown_Hall_EventScript_153326:: @ 8153326 +DewfordTown_Hall_EventScript_Twin:: @ 8153326 lock faceplayer call Common_EventScript_BufferTrendyPhrase - msgbox DewfordTown_Hall_Text_17574C, MSGBOX_DEFAULT + msgbox DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end -DewfordTown_Hall_EventScript_153342:: @ 8153342 +DewfordTown_Hall_EventScript_LittleBoy:: @ 8153342 lock faceplayer call Common_EventScript_BufferTrendyPhrase - msgbox DewfordTown_Hall_Text_175779, MSGBOX_DEFAULT + msgbox DewfordTown_Hall_Text_CollectTrendMerchandise, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_153353:: @ 8153353 +DewfordTown_Hall_EventScript_Bookshelf:: @ 8153353 lockall call Common_EventScript_BufferTrendyPhrase - msgbox DewfordTown_Hall_Text_175842, MSGBOX_DEFAULT + msgbox DewfordTown_Hall_Text_BooksAboutTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_153363:: @ 8153363 +DewfordTown_Hall_EventScript_Painting:: @ 8153363 lockall call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_1533CA - case 4, DewfordTown_Hall_EventScript_1533CA - case 1, DewfordTown_Hall_EventScript_1533D4 - case 5, DewfordTown_Hall_EventScript_1533CA - case 2, DewfordTown_Hall_EventScript_1533DE - case 6, DewfordTown_Hall_EventScript_1533DE - case 3, DewfordTown_Hall_EventScript_1533E8 - case 7, DewfordTown_Hall_EventScript_1533DE + case 0, DewfordTown_Hall_EventScript_ScreamTitle + case 4, DewfordTown_Hall_EventScript_ScreamTitle + case 1, DewfordTown_Hall_EventScript_SmileTitle + case 5, DewfordTown_Hall_EventScript_ScreamTitle + case 2, DewfordTown_Hall_EventScript_LastTitle + case 6, DewfordTown_Hall_EventScript_LastTitle + case 3, DewfordTown_Hall_EventScript_BirthTitle + case 7, DewfordTown_Hall_EventScript_LastTitle end -DewfordTown_Hall_EventScript_1533CA:: @ 81533CA - msgbox DewfordTown_Hall_Text_1758C4, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ScreamTitle:: @ 81533CA + msgbox DewfordTown_Hall_Text_TrendsScream, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1533D4:: @ 81533D4 - msgbox DewfordTown_Hall_Text_1758E0, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_SmileTitle:: @ 81533D4 + msgbox DewfordTown_Hall_Text_TrendsSmile, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1533DE:: @ 81533DE - msgbox DewfordTown_Hall_Text_1758FB, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_LastTitle:: @ 81533DE + msgbox DewfordTown_Hall_Text_LastTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 - msgbox DewfordTown_Hall_Text_175916, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_BirthTitle:: @ 81533E8 + msgbox DewfordTown_Hall_Text_BirthOfTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 +DewfordTown_Hall_EventScript_SchoolKidM:: @ 81533F2 lockall setvar VAR_0x8008, 0 - goto DewfordTown_Hall_EventScript_15340A + goto DewfordTown_Hall_EventScript_DoTrendDebate end -DewfordTown_Hall_EventScript_1533FE:: @ 81533FE +DewfordTown_Hall_EventScript_PsychicM:: @ 81533FE lockall setvar VAR_0x8008, 1 - goto DewfordTown_Hall_EventScript_15340A + goto DewfordTown_Hall_EventScript_DoTrendDebate end -DewfordTown_Hall_EventScript_15340A:: @ 815340A +DewfordTown_Hall_EventScript_DoTrendDebate:: @ 815340A call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_153470 - case 1, DewfordTown_Hall_EventScript_153470 - case 2, DewfordTown_Hall_EventScript_15348C - case 3, DewfordTown_Hall_EventScript_15348C - case 4, DewfordTown_Hall_EventScript_1534A8 - case 5, DewfordTown_Hall_EventScript_1534A8 - case 6, DewfordTown_Hall_EventScript_1534C4 - case 7, DewfordTown_Hall_EventScript_1534E0 + case 0, DewfordTown_Hall_EventScript_TrendDebate1 + case 1, DewfordTown_Hall_EventScript_TrendDebate1 + case 2, DewfordTown_Hall_EventScript_TrendDebate2 + case 3, DewfordTown_Hall_EventScript_TrendDebate2 + case 4, DewfordTown_Hall_EventScript_TrendDebate3 + case 5, DewfordTown_Hall_EventScript_TrendDebate3 + case 6, DewfordTown_Hall_EventScript_TrendDebate4 + case 7, DewfordTown_Hall_EventScript_TrendDebate5 end -DewfordTown_Hall_EventScript_153470:: @ 8153470 - call DewfordTown_Hall_EventScript_1534FD - msgbox DewfordTown_Hall_Text_175935, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_153535 - msgbox DewfordTown_Hall_Text_1759A1, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate1:: @ 8153470 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_SawTrendCoolestThing, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_AllegedTrendNotAuthentic, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_15348C:: @ 815348C - call DewfordTown_Hall_EventScript_1534FD - msgbox DewfordTown_Hall_Text_175A5C, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_153535 - msgbox DewfordTown_Hall_Text_175AD9, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate2:: @ 815348C + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_ComposedTrendThemeSong, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_WorkOnYourSinging, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1534A8:: @ 81534A8 - call DewfordTown_Hall_EventScript_1534FD - msgbox DewfordTown_Hall_Text_175B46, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_153535 - msgbox DewfordTown_Hall_Text_175BA7, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate3:: @ 81534A8 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_OrganizeTrendParty, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_BrilliantIndeed, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1534C4:: @ 81534C4 - call DewfordTown_Hall_EventScript_1534FD - msgbox DewfordTown_Hall_Text_175C41, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_153535 - msgbox DewfordTown_Hall_Text_175CC2, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate4:: @ 81534C4 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_TrendHasBecomePartOfLife, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1534E0:: @ 81534E0 - call DewfordTown_Hall_EventScript_1534FD - msgbox DewfordTown_Hall_Text_175D6B, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_153535 - msgbox DewfordTown_Hall_Text_175DC3, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate5:: @ 81534E0 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_WellBeTrendDuo, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1534FC:: @ 81534FC +DewfordTown_Hall_EventScript_DontMovePlayer1:: @ 81534FC return -DewfordTown_Hall_EventScript_1534FD:: @ 81534FD - applymovement 8, DewfordTown_Hall_Movement_153599 +DewfordTown_Hall_EventScript_DebateReact1:: @ 81534FD + applymovement 8, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq DewfordTown_Hall_EventScript_15351E + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactWest compare VAR_0x8008, 1 - goto_if_eq DewfordTown_Hall_EventScript_153534 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer2 end -DewfordTown_Hall_EventScript_15351E:: @ 815351E +DewfordTown_Hall_EventScript_PlayerReactWest:: @ 815351E compare VAR_FACING, 4 - goto_if_eq DewfordTown_Hall_EventScript_1534FC + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -DewfordTown_Hall_EventScript_153534:: @ 8153534 +DewfordTown_Hall_EventScript_DontMovePlayer2:: @ 8153534 return -DewfordTown_Hall_EventScript_153535:: @ 8153535 - applymovement 7, DewfordTown_Hall_Movement_15359B +DewfordTown_Hall_EventScript_DebateReact2:: @ 8153535 + applymovement 7, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq DewfordTown_Hall_EventScript_153556 + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactNorthSouth compare VAR_0x8008, 1 - goto_if_eq DewfordTown_Hall_EventScript_153583 + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactEast end -DewfordTown_Hall_EventScript_153556:: @ 8153556 +DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: @ 8153556 compare VAR_FACING, 2 - call_if_eq DewfordTown_Hall_EventScript_15356D + call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp compare VAR_FACING, 1 - call_if_eq DewfordTown_Hall_EventScript_153578 + call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown return -DewfordTown_Hall_EventScript_15356D:: @ 815356D +DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: @ 815356D applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -DewfordTown_Hall_EventScript_153578:: @ 8153578 +DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: @ 8153578 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -DewfordTown_Hall_EventScript_153583:: @ 8153583 +DewfordTown_Hall_EventScript_PlayerReactEast:: @ 8153583 compare VAR_FACING, 3 - goto_if_eq DewfordTown_Hall_EventScript_1534FC + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -DewfordTown_Hall_Movement_153599:: @ 8153599 +DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft:: @ 8153599 walk_in_place_left step_end -DewfordTown_Hall_Movement_15359B:: @ 815359B +DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight:: @ 815359B walk_in_place_right step_end -DewfordTown_Hall_EventScript_15359D:: @ 815359D +DewfordTown_Hall_EventScript_SludgeBombMan:: @ 815359D lock faceplayer call Common_EventScript_BufferTrendyPhrase - goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 - msgbox DewfordTown_Hall_Text_175E13, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM_SLUDGE_BOMB, DewfordTown_Hall_EventScript_ReceivedSludgeBomb + msgbox DewfordTown_Hall_Text_GiveYouSludgeBomb, MSGBOX_DEFAULT giveitem ITEM_TM36_SLUDGE_BOMB compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - setflag FLAG_RECEIVED_TM36 + setflag FLAG_RECEIVED_TM_SLUDGE_BOMB release end -DewfordTown_Hall_EventScript_1535D1:: @ 81535D1 - msgbox DewfordTown_Hall_Text_175EBE, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ReceivedSludgeBomb:: @ 81535D1 + msgbox DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo, MSGBOX_DEFAULT release end diff --git a/data/maps/DewfordTown_Hall/text.inc b/data/maps/DewfordTown_Hall/text.inc index 0486371ff..7edcc848a 100644 --- a/data/maps/DewfordTown_Hall/text.inc +++ b/data/maps/DewfordTown_Hall/text.inc @@ -1,51 +1,51 @@ -DewfordTown_Hall_Text_1754C9:: @ 81754C9 +DewfordTown_Hall_Text_CantImagineLifeWithoutTrend:: @ 81754C9 .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" .string "I can't imagine what life would be like\n" .string "without “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_175528:: @ 8175528 +DewfordTown_Hall_Text_GettingBoredOfTrend:: @ 8175528 .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" .string "But I'm getting kind of bored with it.\p" .string "I should look for the next big thing.$" -DewfordTown_Hall_Text_17559E:: @ 817559E +DewfordTown_Hall_Text_TeachingMonAboutTrend:: @ 817559E .string "I'm teaching my POKéMON about\n" .string "“{STR_VAR_1},”\l" .string "but it's not going well.\p" .string "It's a bit too much, I think.$" -DewfordTown_Hall_Text_1755F9:: @ 81755F9 +DewfordTown_Hall_Text_DeepLinkBetweenXAndY:: @ 81755F9 .string "I'm studying up on the hip and trendy\n" .string "“{STR_VAR_1}” now.\p" .string "Is it true that there's a deep link\n" .string "between “{STR_VAR_1}”\l" .string "and “{STR_VAR_2}”?$" -DewfordTown_Hall_Text_175664:: @ 8175664 +DewfordTown_Hall_Text_MyHunchWasRight:: @ 8175664 .string "Oh!\n" .string "So, my hunch was right!\p" .string "I'm one step closer to being hip and\n" .string "happening, yowza!$" -DewfordTown_Hall_Text_1756B7:: @ 81756B7 +DewfordTown_Hall_Text_NotEasyToKeepUp:: @ 81756B7 .string "What?!\n" .string "Is that so?!\p" .string "It's not easy for an older fellow like\n" .string "me to keep up with trends!$" -DewfordTown_Hall_Text_17570D:: @ 817570D +DewfordTown_Hall_Text_TVShowAboutTrend:: @ 817570D .string "This whole business about\n" .string "“{STR_VAR_1}”...\l" .string "Isn't there a TV show on it?$" -DewfordTown_Hall_Text_17574C:: @ 817574C +DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea:: @ 817574C .string "Across the sea...\p" .string "Is “{STR_VAR_1}”\n" .string "even more popular?$" -DewfordTown_Hall_Text_175779:: @ 8175779 +DewfordTown_Hall_Text_CollectTrendMerchandise:: @ 8175779 .string "I collect official\n" .string "“{STR_VAR_1}”\l" .string "licensed merchandise.\p" @@ -59,7 +59,7 @@ DewfordTown_Hall_Text_175779:: @ 8175779 .string "Heheh, I own!\n" .string "I'm not sharing anything with you!$" -DewfordTown_Hall_Text_175842:: @ 8175842 +DewfordTown_Hall_Text_BooksAboutTrend:: @ 8175842 .string "IDENTIFYING GOOD\n" .string "“{STR_VAR_1}” &\l" .string "BAD “{STR_VAR_1}”...\p" @@ -71,30 +71,30 @@ DewfordTown_Hall_Text_175842:: @ 8175842 .string "It's neatly jammed with books about\n" .string "“{STR_VAR_1}.”$" -DewfordTown_Hall_Text_1758C4:: @ 81758C4 +DewfordTown_Hall_Text_TrendsScream:: @ 81758C4 .string "“{STR_VAR_1}'S\n" .string "SCREAM” is the title.$" -DewfordTown_Hall_Text_1758E0:: @ 81758E0 +DewfordTown_Hall_Text_TrendsSmile:: @ 81758E0 .string "“{STR_VAR_1}'S\n" .string "SMILE” is the title.$" -DewfordTown_Hall_Text_1758FB:: @ 81758FB +DewfordTown_Hall_Text_LastTrend:: @ 81758FB .string "It's titled “THE LAST\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_175916:: @ 8175916 +DewfordTown_Hall_Text_BirthOfTrend:: @ 8175916 .string "It's titled “THE BIRTH OF\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_175935:: @ 8175935 +DewfordTown_Hall_Text_SawTrendCoolestThing:: @ 8175935 .string "I saw “{STR_VAR_1}”!\n" .string "Cool, huh?\p" .string "It's, like, the coolest thing going!\p" .string "It was awesome!\n" .string "It was the real thing, oh yeah!$" -DewfordTown_Hall_Text_1759A1:: @ 81759A1 +DewfordTown_Hall_Text_AllegedTrendNotAuthentic:: @ 81759A1 .string "Oh, no, no, no.\p" .string "That alleged\n" .string "“{STR_VAR_1}”\l" @@ -104,7 +104,7 @@ DewfordTown_Hall_Text_1759A1:: @ 81759A1 .string "Sharper, yet more mellifluous!\p" .string "Ah, no matter. It's astonishing!$" -DewfordTown_Hall_Text_175A5C:: @ 8175A5C +DewfordTown_Hall_Text_ComposedTrendThemeSong:: @ 8175A5C .string "Hey, listen, I composed a theme song\n" .string "for “{STR_VAR_1}.”\p" .string "“{STR_VAR_1}”\n" @@ -116,20 +116,20 @@ DewfordTown_Hall_Text_175A5C:: @ 8175A5C .string "Wonderful\n" .string "{STR_VAR_1}!$" -DewfordTown_Hall_Text_175AD9:: @ 8175AD9 +DewfordTown_Hall_Text_WorkOnYourSinging:: @ 8175AD9 .string "... ...\p" .string "I dare say, chap, it would pay for you\n" .string "to work on your singing before you\l" .string "trifle yourself with\l" .string "“{STR_VAR_1}.”$" -DewfordTown_Hall_Text_175B46:: @ 8175B46 +DewfordTown_Hall_Text_OrganizeTrendParty:: @ 8175B46 .string "Anyway, as I was saying earlier, we\n" .string "should get together and organize a\l" .string "“{STR_VAR_1}” party\l" .string "on the island.$" -DewfordTown_Hall_Text_175BA7:: @ 8175BA7 +DewfordTown_Hall_Text_BrilliantIndeed:: @ 8175BA7 .string "Oh, a smashing good idea!\p" .string "It will settle once and for all\n" .string "who is the best at\l" @@ -138,14 +138,14 @@ DewfordTown_Hall_Text_175BA7:: @ 8175BA7 .string "Starting today, our lives will revolve\n" .string "around “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_175C41:: @ 8175C41 +DewfordTown_Hall_Text_TrendHasBecomePartOfLife:: @ 8175C41 .string "I was thinking, though...\p" .string "Wouldn't you agree that\n" .string "“{STR_VAR_1}” has\l" .string "grown from being something trendy to\l" .string "being a part of our daily lives?$" -DewfordTown_Hall_Text_175CC2:: @ 8175CC2 +DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind:: @ 8175CC2 .string "Beg pardon?\n" .string "That much, what?\p" .string "However, it's true that\n" @@ -156,19 +156,19 @@ DewfordTown_Hall_Text_175CC2:: @ 8175CC2 .string "“{STR_VAR_1}”\l" .string "PROFESSOR, old sport!$" -DewfordTown_Hall_Text_175D6B:: @ 8175D6B +DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible:: @ 8175D6B .string "If you and me team up as a combo,\n" .string "we'll be invincible when it comes to all\l" .string "things “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_175DC3:: @ 8175DC3 +DewfordTown_Hall_Text_WellBeTrendDuo:: @ 8175DC3 .string "Spot on, my friend!\p" .string "We shall be the\n" .string "“{STR_VAR_1}” DUO!\p" .string "Isn't that a ripe image?\n" .string "Hahahah!$" -DewfordTown_Hall_Text_175E13:: @ 8175E13 +DewfordTown_Hall_Text_GiveYouSludgeBomb:: @ 8175E13 .string "For me, SLUDGE BOMB is at the peak\n" .string "of popularity. It's the one.\p" .string "Hunh? You're telling me that you don't\n" @@ -176,7 +176,7 @@ DewfordTown_Hall_Text_175E13:: @ 8175E13 .string "That's outright pitiful.\n" .string "I'll give you one.$" -DewfordTown_Hall_Text_175EBE:: @ 8175EBE +DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo:: @ 8175EBE .string "I love SLUDGE BOMB.\p" .string "But POKéMON with the\n" .string "“{STR_VAR_1}”\l" diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index b7bc9da98..77284e37a 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_152FF8", + "script": "DewfordTown_House1_EventScript_Woman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_152FEF", + "script": "DewfordTown_House1_EventScript_Man", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_153001", + "script": "DewfordTown_House1_EventScript_Zigzagoon", "flag": "0" } ], diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc index 808d0fdf7..67146186d 100644 --- a/data/maps/DewfordTown_House1/scripts.inc +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -1,20 +1,20 @@ DewfordTown_House1_MapScripts:: @ 8152FEE .byte 0 -DewfordTown_House1_EventScript_152FEF:: @ 8152FEF - msgbox DewfordTown_House1_Text_174BA5, MSGBOX_NPC +DewfordTown_House1_EventScript_Man:: @ 8152FEF + msgbox DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland, MSGBOX_NPC end -DewfordTown_House1_EventScript_152FF8:: @ 8152FF8 - msgbox DewfordTown_House1_Text_174C0D, MSGBOX_NPC +DewfordTown_House1_EventScript_Woman:: @ 8152FF8 + msgbox DewfordTown_House1_Text_LifeGoesSlowlyOnIsland, MSGBOX_NPC end -DewfordTown_House1_EventScript_153001:: @ 8153001 +DewfordTown_House1_EventScript_Zigzagoon:: @ 8153001 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox DewfordTown_House1_Text_174CC8, MSGBOX_DEFAULT + msgbox DewfordTown_House1_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/DewfordTown_House1/text.inc b/data/maps/DewfordTown_House1/text.inc index 8e47a40a3..b80610194 100644 --- a/data/maps/DewfordTown_House1/text.inc +++ b/data/maps/DewfordTown_House1/text.inc @@ -1,14 +1,14 @@ -DewfordTown_House1_Text_174BA5:: @ 8174BA5 +DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland:: @ 8174BA5 .string "There's a lot to be said for living on\n" .string "a small island like this in harmony with\l" .string "POKéMON and the family.$" -DewfordTown_House1_Text_174C0D:: @ 8174C0D +DewfordTown_House1_Text_LifeGoesSlowlyOnIsland:: @ 8174C0D .string "I came from the large port of SLATEPORT\n" .string "CITY when I married my husband here.\p" .string "Life goes by slowly on this little\n" .string "island. But being surrounded by the\l" .string "beautiful sea - that's happiness, too.$" -DewfordTown_House1_Text_174CC8:: @ 8174CC8 +DewfordTown_House1_Text_Zigzagoon:: @ 8174CC8 .string "ZIGZAGOON: Guguuh!$" diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index 6d62655f3..97162e564 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House2_EventScript_1535DC", + "script": "DewfordTown_House2_EventScript_Man", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House2_EventScript_15361F", + "script": "DewfordTown_House2_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index 6748fb5e1..c66ccab35 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -1,28 +1,28 @@ DewfordTown_House2_MapScripts:: @ 81535DB .byte 0 -DewfordTown_House2_EventScript_1535DC:: @ 81535DC +DewfordTown_House2_EventScript_Man:: @ 81535DC lock faceplayer - goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_153615 - msgbox DewfordTown_House2_Text_175EFE, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf + msgbox DewfordTown_House2_Text_WantYouToHaveSilkScarf, MSGBOX_DEFAULT giveitem ITEM_SILK_SCARF compare VAR_RESULT, 0 - goto_if_eq DewfordTown_House2_EventScript_15360B + goto_if_eq DewfordTown_House2_EventScript_NoRoomForScarf setflag FLAG_RECEIVED_SILK_SCARF release end -DewfordTown_House2_EventScript_15360B:: @ 815360B - msgbox DewfordTown_House2_Text_175FDA, MSGBOX_DEFAULT +DewfordTown_House2_EventScript_NoRoomForScarf:: @ 815360B + msgbox DewfordTown_House2_Text_NoRoom, MSGBOX_DEFAULT release end -DewfordTown_House2_EventScript_153615:: @ 8153615 - msgbox DewfordTown_House2_Text_176055, MSGBOX_DEFAULT +DewfordTown_House2_EventScript_ExplainSilkScarf:: @ 8153615 + msgbox DewfordTown_House2_Text_ExplainSilkScarf, MSGBOX_DEFAULT release end -DewfordTown_House2_EventScript_15361F:: @ 815361F - msgbox DewfordTown_House2_Text_1760C8, MSGBOX_NPC +DewfordTown_House2_EventScript_Boy:: @ 815361F + msgbox DewfordTown_House2_Text_BrawlySoCool, MSGBOX_NPC end diff --git a/data/maps/DewfordTown_House2/text.inc b/data/maps/DewfordTown_House2/text.inc index 523849114..8bd56bef0 100644 --- a/data/maps/DewfordTown_House2/text.inc +++ b/data/maps/DewfordTown_House2/text.inc @@ -1,4 +1,4 @@ -DewfordTown_House2_Text_175EFE:: @ 8175EFE +DewfordTown_House2_Text_WantYouToHaveSilkScarf:: @ 8175EFE .string "Gorge your eyes on this!\p" .string "It's a SILK SCARF. It's right at the\n" .string "cutting edge of fashion, yeah!\p" @@ -7,19 +7,19 @@ DewfordTown_House2_Text_175EFE:: @ 8175EFE .string "Oh, you're a delight!\n" .string "Here you go. I want you to have it!$" -DewfordTown_House2_Text_175FDA:: @ 8175FDA +DewfordTown_House2_Text_NoRoom:: @ 8175FDA .string "Oh, you don't have room?\p" .string "Now, listen tight, this SCARF is a must-\n" .string "have! Why, I would sell all my items\l" .string "in order to get it!$" -DewfordTown_House2_Text_176055:: @ 8176055 +DewfordTown_House2_Text_ExplainSilkScarf:: @ 8176055 .string "The SILK SCARF raises the power of\n" .string "NORMAL-type moves.\p" .string "It's a marvelous SCARF that will go\n" .string "with almost all POKéMON!$" -DewfordTown_House2_Text_1760C8:: @ 81760C8 +DewfordTown_House2_Text_BrawlySoCool:: @ 81760C8 .string "Wow, you bothered to cross the sea\n" .string "to visit DEWFORD?\p" .string "Did you maybe come here because you\n" diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 38cf76bfb..53e4fcefb 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_1F_EventScript_153023", + "script": "DewfordTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_1F_EventScript_153031", + "script": "DewfordTown_PokemonCenter_1F_EventScript_PokefanF", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_1F_EventScript_15303A", + "script": "DewfordTown_PokemonCenter_1F_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index b02761b8b..b6911aac2 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,13 +1,13 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_15301A + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition .byte 0 -DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A +DewfordTown_PokemonCenter_1F_OnTransition:: @ 815301A setrespawn HEAL_LOCATION_DEWFORD_TOWN call Common_EventScript_UpdateBrineyLocation end -DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 +DewfordTown_PokemonCenter_1F_EventScript_Nurse:: @ 8153023 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,10 +15,10 @@ DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 release end -DewfordTown_PokemonCenter_1F_EventScript_153031:: @ 8153031 - msgbox DewfordTown_PokemonCenter_1F_Text_174CDB, MSGBOX_NPC +DewfordTown_PokemonCenter_1F_EventScript_PokefanF:: @ 8153031 + msgbox DewfordTown_PokemonCenter_1F_Text_StoneCavern, MSGBOX_NPC end -DewfordTown_PokemonCenter_1F_EventScript_15303A:: @ 815303A - msgbox DewfordTown_PokemonCenter_1F_Text_174D32, MSGBOX_NPC +DewfordTown_PokemonCenter_1F_EventScript_Man:: @ 815303A + msgbox DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM, MSGBOX_NPC end diff --git a/data/maps/DewfordTown_PokemonCenter_1F/text.inc b/data/maps/DewfordTown_PokemonCenter_1F/text.inc index 8d56c23f7..d2d4bfaeb 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/text.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -DewfordTown_PokemonCenter_1F_Text_174CDB:: @ 8174CDB +DewfordTown_PokemonCenter_1F_Text_StoneCavern:: @ 8174CDB .string "There's a stone cavern at the edge\n" .string "of town.\p" .string "I've heard you can find rare stones\n" .string "there.$" -DewfordTown_PokemonCenter_1F_Text_174D32:: @ 8174D32 +DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM:: @ 8174D32 .string "Even if a POKéMON faints and can't\n" .string "battle, it can still use a move learned\l" .string "from a Hidden Machine, HM.$" diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 051976aef..4ddf02d36 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -55,7 +55,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -64,7 +64,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -73,7 +73,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -82,7 +82,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -91,7 +91,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -100,7 +100,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -109,7 +109,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -118,7 +118,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -127,7 +127,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -136,7 +136,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 1, "var": "VAR_TEMP_1", "var_value": "0", - "script": "EverGrandeCity_EventScript_14D500" + "script": "EverGrandeCity_EventScript_SetVisitedEverGrande" } ], "bg_events": [ @@ -155,7 +155,7 @@ "y": 43, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EverGrandeCity_EventScript_14D4E5" + "script": "EverGrandeCity_EventScript_VictoryRoadSign" }, { "type": "sign", @@ -171,7 +171,7 @@ "y": 52, "elevation": 5, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EverGrandeCity_EventScript_14D4EE" + "script": "EverGrandeCity_EventScript_CitySign" }, { "type": "sign", @@ -179,7 +179,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EverGrandeCity_EventScript_14D4F7" + "script": "EverGrandeCity_EventScript_PokemonLeagueSign" }, { "type": "sign", diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index c49486ddd..d389642d0 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -1,24 +1,24 @@ EverGrandeCity_MapScripts:: @ 814D4D5 - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_14D4DB + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_OnTransition .byte 0 -EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB +EverGrandeCity_OnTransition:: @ 814D4DB call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather end -EverGrandeCity_EventScript_14D4E5:: @ 814D4E5 - msgbox EverGrandeCity_Text_16A74D, MSGBOX_SIGN +EverGrandeCity_EventScript_VictoryRoadSign:: @ 814D4E5 + msgbox EverGrandeCity_Text_EnteringVictoryRoad, MSGBOX_SIGN end -EverGrandeCity_EventScript_14D4EE:: @ 814D4EE - msgbox EverGrandeCity_Text_16A787, MSGBOX_SIGN +EverGrandeCity_EventScript_CitySign:: @ 814D4EE + msgbox EverGrandeCity_Text_CitySign, MSGBOX_SIGN end -EverGrandeCity_EventScript_14D4F7:: @ 814D4F7 - msgbox EverGrandeCity_Text_16A763, MSGBOX_SIGN +EverGrandeCity_EventScript_PokemonLeagueSign:: @ 814D4F7 + msgbox EverGrandeCity_Text_EnteringPokemonLeague, MSGBOX_SIGN end -EverGrandeCity_EventScript_14D500:: @ 814D500 +EverGrandeCity_EventScript_SetVisitedEverGrande:: @ 814D500 setflag FLAG_VISITED_EVER_GRANDE_CITY setvar VAR_TEMP_1, 1 end diff --git a/data/maps/EverGrandeCity/text.inc b/data/maps/EverGrandeCity/text.inc index f468bf3b7..0b02742ba 100644 --- a/data/maps/EverGrandeCity/text.inc +++ b/data/maps/EverGrandeCity/text.inc @@ -1,11 +1,11 @@ -EverGrandeCity_Text_16A74D:: @ 816A74D +EverGrandeCity_Text_EnteringVictoryRoad:: @ 816A74D .string "ENTERING VICTORY ROAD$" -EverGrandeCity_Text_16A763:: @ 816A763 +EverGrandeCity_Text_EnteringPokemonLeague:: @ 816A763 .string "ENTERING POKéMON LEAGUE\n" .string "CENTER GATE$" -EverGrandeCity_Text_16A787:: @ 816A787 +EverGrandeCity_Text_CitySign:: @ 816A787 .string "EVER GRANDE CITY\p" .string "“The paradise of flowers, the sea,\n" .string "and POKéMON.”$" diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 8ddd4efc7..491bcc6ca 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,140 +1,140 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 815B7AF - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_OnFrame .byte 0 -EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF +EverGrandeCity_ChampionsRoom_OnTransition:: @ 815B7BF call Common_EventScript_SetupRivalGfxId end -EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF +EverGrandeCity_ChampionsRoom_OnWarp:: @ 815B7C5 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF +EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth:: @ 815B7CF turnobject LOCALID_PLAYER, 2 end -EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE +EverGrandeCity_ChampionsRoom_OnFrame:: @ 815B7D4 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_EnterRoom .2byte 0 -EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE +EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: @ 815B7DE lockall applymovement LOCALID_PLAYER, Common_Movement_WalkUp4 waitmovement 0 delay 40 - applymovement LOCALID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_15B802 + applymovement LOCALID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachSteven waitmovement 0 setvar VAR_TEMP_1, 1 - goto EverGrandeCity_ChampionsRoom_EventScript_15B805 + goto EverGrandeCity_ChampionsRoom_EventScript_Steven releaseall end -EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 +EverGrandeCity_ChampionsRoom_Movement_PlayerApproachSteven:: @ 815B802 walk_up walk_up step_end -EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 +EverGrandeCity_ChampionsRoom_EventScript_Steven:: @ 815B805 playbgm MUS_ENCOUNTER_CHAMPION, FALSE - msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_STEVEN, EverGrandeCity_ChampionsRoom_Text_1910A0 - goto EverGrandeCity_ChampionsRoom_EventScript_15B821 + msgbox EverGrandeCity_ChampionsRoom_Text_IntroSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_STEVEN, EverGrandeCity_ChampionsRoom_Text_Defeat + goto EverGrandeCity_ChampionsRoom_EventScript_Defeated end -EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 +EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 815B821 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0 setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0 special DrawWholeMapView - msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT closemessage playse SE_DOOR checkplayergender compare VAR_RESULT, 0 - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic compare VAR_RESULT, 1 - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic addobject 2 - call EverGrandeCity_ChampionsRoom_EventScript_15B9BD + call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer checkplayergender compare VAR_RESULT, 0 - goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayAdvice compare VAR_RESULT, 1 - goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice end -EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C +EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: @ 815B87C playbgm MUS_ENCOUNTER_MAY, FALSE return -EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 +EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic:: @ 815B881 playbgm MUS_ENCOUNTER_BRENDAN, FALSE return -EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 - msgbox EverGrandeCity_ChampionsRoom_Text_191225, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 815B886 + msgbox EverGrandeCity_ChampionsRoom_Text_MayAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, Common_Movement_ExclamationMark waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 - msgbox EverGrandeCity_ChampionsRoom_Text_191268, MSGBOX_DEFAULT - goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 + call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth + msgbox EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver, MSGBOX_DEFAULT + goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF end -EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB - msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: @ 815B8BB + msgbox EverGrandeCity_ChampionsRoom_Text_BrendanAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, Common_Movement_ExclamationMark waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 - msgbox EverGrandeCity_ChampionsRoom_Text_191305, MSGBOX_DEFAULT - goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 + call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth + msgbox EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon, MSGBOX_DEFAULT + goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF end -EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 +EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 815B8F0 closemessage addobject 3 - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_19134D, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT call ProfBirch_EventScript_RatePokedex - msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_191512, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_StevenComeWithMe, MSGBOX_DEFAULT closemessage delay 30 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB - applymovement LOCALID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_15B9DD + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_StevenExitStart + applymovement LOCALID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart applymovement 3, Common_Movement_WalkInPlaceFastestUp - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows waitmovement 0 delay 20 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_191546, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_StevenWaitOutside, MSGBOX_DEFAULT checkplayergender compare VAR_RESULT, 0 - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations compare VAR_RESULT, 1 - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations closemessage - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF - applymovement LOCALID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_15B9E0 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_StevenExit + applymovement LOCALID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit waitmovement 0 setflag FLAG_HIDE_PETALBURG_GYM_GUIDE warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 @@ -142,32 +142,32 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 releaseall end -EverGrandeCity_ChampionsRoom_EventScript_15B9AB:: @ 815B9AB - msgbox EverGrandeCity_ChampionsRoom_Text_1915D7, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations:: @ 815B9AB + msgbox EverGrandeCity_ChampionsRoom_Text_MayCongratulations, MSGBOX_DEFAULT return -EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4 - msgbox EverGrandeCity_ChampionsRoom_Text_191675, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 815B9B4 + msgbox EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations, MSGBOX_DEFAULT return -EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6 +EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 815B9BD + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF +EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth:: @ 815B9D2 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth waitmovement 0 return -EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD +EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart:: @ 815B9DD walk_up walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0 +EverGrandeCity_ChampionsRoom_Movement_PlayerExit:: @ 815B9E0 walk_up delay_16 walk_up @@ -175,7 +175,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0 set_invisible step_end -EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6 +EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer:: @ 815B9E6 walk_up walk_up walk_up @@ -186,7 +186,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6 walk_in_place_fastest_right step_end -EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF +EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth:: @ 815B9EF walk_in_place_fastest_up delay_16 walk_in_place_fastest_right @@ -197,24 +197,24 @@ EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF delay_16 step_end -EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8 +EverGrandeCity_ChampionsRoom_Movement_RivalFollows:: @ 815B9F8 walk_right walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB +EverGrandeCity_ChampionsRoom_Movement_StevenExitStart:: @ 815B9FB walk_up walk_up walk_in_place_fastest_down step_end -EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF +EverGrandeCity_ChampionsRoom_Movement_StevenExit:: @ 815B9FF walk_up delay_8 set_invisible step_end -EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03 +EverGrandeCity_ChampionsRoom_Movement_BirchArrives:: @ 815BA03 walk_up walk_up walk_up diff --git a/data/maps/EverGrandeCity_ChampionsRoom/text.inc b/data/maps/EverGrandeCity_ChampionsRoom/text.inc index 90c5eeccd..c316ab45e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/text.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_ChampionsRoom_Text_190F9C:: @ 8190F9C +EverGrandeCity_ChampionsRoom_Text_IntroSpeech:: @ 8190F9C .string "STEVEN: Welcome, {PLAYER}{KUN}.\p" .string "I was looking forward to seeing you\n" .string "here one day.\p" @@ -10,13 +10,13 @@ EverGrandeCity_ChampionsRoom_Text_190F9C:: @ 8190F9C .string "I want you to hit me with it all!\p" .string "Now, bring it!$" -EverGrandeCity_ChampionsRoom_Text_1910A0:: @ 81910A0 +EverGrandeCity_ChampionsRoom_Text_Defeat:: @ 81910A0 .string "I, the CHAMPION, fall in defeat...\p" .string "Kudos to you, {PLAYER}{KUN}!\p" .string "You are a truly noble POKéMON\n" .string "TRAINER!$" -EverGrandeCity_ChampionsRoom_Text_1910FE:: @ 81910FE +EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech:: @ 81910FE .string "STEVEN: Congratulations!\p" .string "The feelings you have for your\n" .string "POKéMON...\p" @@ -29,28 +29,28 @@ EverGrandeCity_ChampionsRoom_Text_1910FE:: @ 81910FE .string "You are rightfully the HOENN region's\n" .string "new...$" -EverGrandeCity_ChampionsRoom_Text_191225:: @ 8191225 +EverGrandeCity_ChampionsRoom_Text_MayAdvice:: @ 8191225 .string "MAY: {PLAYER}{KUN}!\p" .string "Here's some advice before you challenge\n" .string "the CHAMPION...$" -EverGrandeCity_ChampionsRoom_Text_191268:: @ 8191268 +EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver:: @ 8191268 .string "MAY: Huh? What, what, what?\p" .string "{PLAYER}{KUN}...\n" .string "Could it be that...\l" .string "It's already over?$" -EverGrandeCity_ChampionsRoom_Text_1912B3:: @ 81912B3 +EverGrandeCity_ChampionsRoom_Text_BrendanAdvice:: @ 81912B3 .string "BRENDAN: {PLAYER}!\p" .string "How would you like some advice before\n" .string "you challenge the CHAMPION?...$" -EverGrandeCity_ChampionsRoom_Text_191305:: @ 8191305 +EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon:: @ 8191305 .string "BRENDAN: {PLAYER}...\p" .string "Are you trying to tell me...\n" .string "You've beaten the CHAMPION?$" -EverGrandeCity_ChampionsRoom_Text_19134D:: @ 819134D +EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex:: @ 819134D .string "PROF. BIRCH: See?\n" .string "What did I tell you, {RIVAL}?\p" .string "Didn't I tell you that you don't need\n" @@ -66,24 +66,24 @@ EverGrandeCity_ChampionsRoom_Text_19134D:: @ 819134D .string "What became of your POKéDEX?\n" .string "Here, let me see.$" -EverGrandeCity_ChampionsRoom_Text_1914C6:: @ 81914C6 +EverGrandeCity_ChampionsRoom_Text_BirchCongratulations:: @ 81914C6 .string "PROF. BIRCH: Anyways,\n" .string "congratulations!\p" .string "Now, go proudly into the final room!$" -EverGrandeCity_ChampionsRoom_Text_191512:: @ 8191512 +EverGrandeCity_ChampionsRoom_Text_StevenComeWithMe:: @ 8191512 .string "STEVEN: {PLAYER}{KUN}...\p" .string "No, the new CHAMPION!\p" .string "Come with me.$" -EverGrandeCity_ChampionsRoom_Text_191546:: @ 8191546 +EverGrandeCity_ChampionsRoom_Text_StevenWaitOutside:: @ 8191546 .string "STEVEN: I'm sorry, but...\p" .string "From here on, only those TRAINERS who\n" .string "have become CHAMPIONS may enter.\p" .string "You'll have to wait outside with the\n" .string "PROFESSOR.$" -EverGrandeCity_ChampionsRoom_Text_1915D7:: @ 81915D7 +EverGrandeCity_ChampionsRoom_Text_MayCongratulations:: @ 81915D7 .string "MAY: Groan...\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" @@ -92,7 +92,7 @@ EverGrandeCity_ChampionsRoom_Text_1915D7:: @ 81915D7 .string "{PLAYER}{KUN}!\n" .string "Honestly, congratulations!$" -EverGrandeCity_ChampionsRoom_Text_191675:: @ 8191675 +EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations:: @ 8191675 .string "BRENDAN: ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" .string "It can't be helped if that's the rule.\p" diff --git a/data/maps/EverGrandeCity_Corridor1/scripts.inc b/data/maps/EverGrandeCity_Corridor1/scripts.inc index 16d02fe46..c449ba861 100644 --- a/data/maps/EverGrandeCity_Corridor1/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor1/scripts.inc @@ -1,11 +1,11 @@ EverGrandeCity_Corridor1_MapScripts:: @ 815BA0C - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor1_MapScript2_15BA12 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor1_OnWarp .byte 0 -EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor1_EventScript_15BA1C +EverGrandeCity_Corridor1_OnWarp:: @ 815BA12 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor1_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C +EverGrandeCity_Corridor1_EventScript_TurnPlayerNorth:: @ 815BA1C turnobject LOCALID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Corridor2/scripts.inc b/data/maps/EverGrandeCity_Corridor2/scripts.inc index cc5524fcb..5ee758957 100644 --- a/data/maps/EverGrandeCity_Corridor2/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor2/scripts.inc @@ -1,11 +1,11 @@ EverGrandeCity_Corridor2_MapScripts:: @ 815BA21 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor2_MapScript2_15BA27 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor2_OnWarp .byte 0 -EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor2_EventScript_15BA31 +EverGrandeCity_Corridor2_OnWarp:: @ 815BA27 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor2_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 +EverGrandeCity_Corridor2_EventScript_TurnPlayerNorth:: @ 815BA31 turnobject LOCALID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Corridor3/scripts.inc b/data/maps/EverGrandeCity_Corridor3/scripts.inc index 541e5ca12..de65bc739 100644 --- a/data/maps/EverGrandeCity_Corridor3/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor3/scripts.inc @@ -1,11 +1,11 @@ EverGrandeCity_Corridor3_MapScripts:: @ 815BA36 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor3_MapScript2_15BA3C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor3_OnWarp .byte 0 -EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor3_EventScript_15BA46 +EverGrandeCity_Corridor3_OnWarp:: @ 815BA3C + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor3_TurnPlayerNorth .2byte 0 -EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 +EverGrandeCity_Corridor3_TurnPlayerNorth:: @ 815BA46 turnobject LOCALID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Corridor4/scripts.inc b/data/maps/EverGrandeCity_Corridor4/scripts.inc index 5e5da2f40..e5b5a1c9c 100644 --- a/data/maps/EverGrandeCity_Corridor4/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor4/scripts.inc @@ -1,11 +1,11 @@ EverGrandeCity_Corridor4_MapScripts:: @ 815BA4B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor4_MapScript2_15BA51 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor4_OnWarp .byte 0 -EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor4_EventScript_15BA5B +EverGrandeCity_Corridor4_OnWarp:: @ 815BA51 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor4_TurnPlayerNorth .2byte 0 -EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B +EverGrandeCity_Corridor4_TurnPlayerNorth:: @ 815BA5B turnobject LOCALID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Corridor5/scripts.inc b/data/maps/EverGrandeCity_Corridor5/scripts.inc index fef5e3e6f..4d1efb800 100644 --- a/data/maps/EverGrandeCity_Corridor5/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor5/scripts.inc @@ -1,11 +1,11 @@ EverGrandeCity_Corridor5_MapScripts:: @ 815BA60 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor5_MapScript2_15BA66 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor5_OnWarp .byte 0 -EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor5_EventScript_15BA70 +EverGrandeCity_Corridor5_OnWarp:: @ 815BA66 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor5_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 +EverGrandeCity_Corridor5_EventScript_TurnPlayerNorth:: @ 815BA70 turnobject LOCALID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 4b2e4cc91..a8a69eb3b 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_DrakesRoom_EventScript_15B764", + "script": "EverGrandeCity_DrakesRoom_EventScript_Drake", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index ebd704e5e..758e91996 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -1,62 +1,62 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_15B72C - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_15B743 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_15B570 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_OnFrame + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp .byte 0 @ 815B71D - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 +EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth:: @ 815B727 turnobject LOCALID_PLAYER, 2 end -EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C - map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_15B736 +EverGrandeCity_DrakesRoom_OnFrame:: @ 815B72C + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 +EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor:: @ 815B736 lockall call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 4 releaseall end -EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 - call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758 +EverGrandeCity_DrakesRoom_OnLoad:: @ 815B743 + call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 4 - call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E + call_if_eq EverGrandeCity_DrakesRoom_EventScript_CloseDoor end -EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758 +EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom:: @ 815B758 call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E +EverGrandeCity_DrakesRoom_EventScript_CloseDoor:: @ 815B75E call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 +EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 815B764 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B + goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE - msgbox EverGrandeCity_DrakesRoom_Text_190CEB, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_190E42 - goto EverGrandeCity_DrakesRoom_EventScript_15B795 + msgbox EverGrandeCity_DrakesRoom_Text_IntroSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat + goto EverGrandeCity_DrakesRoom_EventScript_Defeated end -EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B - msgbox EverGrandeCity_DrakesRoom_Text_190E5D, MSGBOX_DEFAULT +EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech:: @ 815B78B + msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 +EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 815B795 setvar VAR_0x8004, 0 special sub_810FF60 setflag FLAG_DEFEATED_ELITE_4_DRAKE call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles - msgbox EverGrandeCity_DrakesRoom_Text_190E5D, MSGBOX_DEFAULT + msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_DrakesRoom/text.inc b/data/maps/EverGrandeCity_DrakesRoom/text.inc index 54a63fd6b..554de1f9a 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/text.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_DrakesRoom_Text_190CEB:: @ 8190CEB +EverGrandeCity_DrakesRoom_Text_IntroSpeech:: @ 8190CEB .string "I am the last of the POKéMON LEAGUE\n" .string "ELITE FOUR, DRAKE the DRAGON master!\p" .string "In their natural state, POKéMON are\n" @@ -11,10 +11,10 @@ EverGrandeCity_DrakesRoom_Text_190CEB:: @ 8190CEB .string "If you don't, then you will never\n" .string "prevail over me!$" -EverGrandeCity_DrakesRoom_Text_190E42:: @ 8190E42 +EverGrandeCity_DrakesRoom_Text_Defeat:: @ 8190E42 .string "Superb, it should be said.$" -EverGrandeCity_DrakesRoom_Text_190E5D:: @ 8190E5D +EverGrandeCity_DrakesRoom_Text_PostBattleSpeech:: @ 8190E5D .string "You deserve every credit for coming\n" .string "this far as a TRAINER of POKéMON.\p" .string "You do seem to know what is needed.\p" diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 123d2cb21..f36c6fe76 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_GlaciasRoom_EventScript_15B6CA", + "script": "EverGrandeCity_GlaciasRoom_EventScript_Glacia", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index e024d29bc..11c4309c6 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -1,60 +1,60 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_15B692 - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_15B683 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_OnFrame + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_OnWarp .byte 0 -EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D +EverGrandeCity_GlaciasRoom_OnWarp:: @ 815B683 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D +EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth:: @ 815B68D turnobject LOCALID_PLAYER, 2 end -EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692 - map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C +EverGrandeCity_GlaciasRoom_OnFrame:: @ 815B692 + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C +EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor:: @ 815B69C lockall call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 3 releaseall end -EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 - call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE +EverGrandeCity_GlaciasRoom_OnLoad:: @ 815B6A9 + call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 3 - call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4 + call_if_eq EverGrandeCity_GlaciasRoom_EventScript_CloseDoor end -EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE +EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom:: @ 815B6BE call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4 +EverGrandeCity_GlaciasRoom_EventScript_CloseDoor:: @ 815B6C4 call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA +EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 815B6CA lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 + goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE - msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_190C01 - goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB + msgbox EverGrandeCity_GlaciasRoom_Text_IntroSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat + goto EverGrandeCity_GlaciasRoom_EventScript_Defeated end -EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1 - msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, MSGBOX_DEFAULT +EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech:: @ 815B6F1 + msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB +EverGrandeCity_GlaciasRoom_EventScript_Defeated:: @ 815B6FB setflag FLAG_DEFEATED_ELITE_4_GLACIA call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles - msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, MSGBOX_DEFAULT + msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/text.inc b/data/maps/EverGrandeCity_GlaciasRoom/text.inc index cc38f636a..5e53836e3 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/text.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_GlaciasRoom_Text_190AF9:: @ 8190AF9 +EverGrandeCity_GlaciasRoom_Text_IntroSpeech:: @ 8190AF9 .string "Welcome, my name is GLACIA of the\n" .string "ELITE FOUR.\p" .string "I've traveled from afar to HOENN so\n" @@ -9,14 +9,14 @@ EverGrandeCity_GlaciasRoom_Text_190AF9:: @ 8190AF9 .string "It would please me to no end if I could\n" .string "go all out against you!$" -EverGrandeCity_GlaciasRoom_Text_190C01:: @ 8190C01 +EverGrandeCity_GlaciasRoom_Text_Defeat:: @ 8190C01 .string "You and your POKéMON...\n" .string "How hot your spirits burn!\p" .string "The all-consuming heat overwhelms.\p" .string "It's no surprise that my icy skills\n" .string "failed to harm you.$" -EverGrandeCity_GlaciasRoom_Text_190C8F:: @ 8190C8F +EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech:: @ 8190C8F .string "Advance to the next room.\p" .string "And there, confirm the truly fearsome\n" .string "side of the POKéMON LEAGUE.$" diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 827425792..d7229e69a 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -1,38 +1,38 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_15BB9E - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_15BB8F + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_OnWarp .byte 0 -EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 +EverGrandeCity_HallOfFame_OnWarp:: @ 815BB8F + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth .2byte 0 -EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 +EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth:: @ 815BB99 turnobject LOCALID_PLAYER, 2 end -EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 +EverGrandeCity_HallOfFame_OnFrame:: @ 815BB9E + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame .2byte 0 -EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 +EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 815BBA8 lockall - applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC59 - applymovement LOCALID_PLAYER, EverGrandeCity_HallOfFame_Movement_15BC59 + applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 + applymovement LOCALID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_191841, MSGBOX_DEFAULT + msgbox EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions, MSGBOX_DEFAULT closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60 - applymovement LOCALID_PLAYER, EverGrandeCity_HallOfFame_Movement_15BC60 + applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 + applymovement LOCALID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 waitmovement 0 delay 20 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_1918D7, MSGBOX_DEFAULT + msgbox EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp @@ -45,12 +45,12 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags checkplayergender compare VAR_RESULT, 0 - goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearMale compare VAR_RESULT, 1 - goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D + goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearFemale end -EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 +EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 815BC41 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F fadescreenspeed 1, 24 special GameClear @@ -58,7 +58,7 @@ EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 releaseall end -EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D +EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 815BC4D setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F fadescreenspeed 1, 24 special GameClear @@ -66,7 +66,7 @@ EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D releaseall end -EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59 +EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1:: @ 815BC59 walk_up walk_up walk_up @@ -75,7 +75,7 @@ EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59 walk_up step_end -EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60 +EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2:: @ 815BC60 walk_up walk_up walk_up diff --git a/data/maps/EverGrandeCity_HallOfFame/text.inc b/data/maps/EverGrandeCity_HallOfFame/text.inc index 632bfcb5f..fc1d82120 100644 --- a/data/maps/EverGrandeCity_HallOfFame/text.inc +++ b/data/maps/EverGrandeCity_HallOfFame/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_HallOfFame_Text_191841:: @ 8191841 +EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions:: @ 8191841 .string "STEVEN: This room...\p" .string "This is where we keep records of\n" .string "POKéMON that prevailed through\l" @@ -6,7 +6,7 @@ EverGrandeCity_HallOfFame_Text_191841:: @ 8191841 .string "It is here that the LEAGUE CHAMPIONS\n" .string "are honored.$" -EverGrandeCity_HallOfFame_Text_1918D7:: @ 81918D7 +EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames:: @ 81918D7 .string "STEVEN: Come on, let's record your\n" .string "name as a TRAINER who triumphed over\l" .string "the POKéMON LEAGUE, and the names of\l" diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index b4af78fa8..770ea5247 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PhoebesRoom_EventScript_15B630", + "script": "EverGrandeCity_PhoebesRoom_EventScript_Phoebe", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 215c9de6b..8f1a6a904 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -1,60 +1,60 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9 - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_15B60F - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_OnFrame .byte 0 -EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 +EverGrandeCity_PhoebesRoom_OnWarp:: @ 815B5E9 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 +EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth:: @ 815B5F3 turnobject LOCALID_PLAYER, 2 end -EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8 - map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602 +EverGrandeCity_PhoebesRoom_OnFrame:: @ 815B5F8 + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 +EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor:: @ 815B602 lockall call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 2 releaseall end -EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F - call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624 +EverGrandeCity_PhoebesRoom_OnLoad:: @ 815B60F + call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 2 - call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A + call_if_eq EverGrandeCity_PhoebesRoom_EventScript_CloseDoor end -EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624 +EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom:: @ 815B624 call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A +EverGrandeCity_PhoebesRoom_EventScript_CloseDoor:: @ 815B62A call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 +EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 815B630 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 + goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE - msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_190A0C - goto EverGrandeCity_PhoebesRoom_EventScript_15B661 + msgbox EverGrandeCity_PhoebesRoom_Text_IntroSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat + goto EverGrandeCity_PhoebesRoom_EventScript_Defeated end -EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657 - msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, MSGBOX_DEFAULT +EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech:: @ 815B657 + msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661 +EverGrandeCity_PhoebesRoom_EventScript_Defeated:: @ 815B661 setflag FLAG_DEFEATED_ELITE_4_PHOEBE call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles - msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, MSGBOX_DEFAULT + msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/text.inc b/data/maps/EverGrandeCity_PhoebesRoom/text.inc index 972d1b525..e86bf7e1f 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/text.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/text.inc @@ -1,4 +1,4 @@ -EverGrandeCity_PhoebesRoom_Text_1908F5:: @ 81908F5 +EverGrandeCity_PhoebesRoom_Text_IntroSpeech:: @ 81908F5 .string "Ahahaha!\p" .string "I'm PHOEBE of the ELITE FOUR.\n" .string "I did my training on MT. PYRE.\p" @@ -9,11 +9,11 @@ EverGrandeCity_PhoebesRoom_Text_1908F5:: @ 81908F5 .string "So, come on, just try and see if you can\n" .string "even inflict damage on my POKéMON!$" -EverGrandeCity_PhoebesRoom_Text_190A0C:: @ 8190A0C +EverGrandeCity_PhoebesRoom_Text_Defeat:: @ 8190A0C .string "Oh, darn.\n" .string "I've gone and lost.$" -EverGrandeCity_PhoebesRoom_Text_190A2A:: @ 8190A2A +EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech:: @ 8190A2A .string "There's a definite bond between you\n" .string "and your POKéMON, too.\p" .string "I didn't recognize it, so it's only\n" diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index b065e0940..d3d8e538b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_1F_EventScript_15BC70", + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E", + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_1F_EventScript_15BC87", + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 067488c55..ef251111d 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,13 +1,12 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66 - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition .byte 0 -EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C +EverGrandeCity_PokemonCenter_1F_OnTransition:: @ 815BC6C setrespawn HEAL_LOCATION_EVER_GRANDE_CITY end -EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 -SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 +EverGrandeCity_PokemonCenter_1F_EventScript_Nurse:: @ 815BC70 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,10 +14,10 @@ SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 release end -EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E:: @ 815BC7E - msgbox EverGrandeCity_PokemonCenter_1F_Text_191967, MSGBOX_NPC +EverGrandeCity_PokemonCenter_1F_EventScript_Woman:: @ 815BC7E + msgbox EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad, MSGBOX_NPC end -EverGrandeCity_PokemonCenter_1F_EventScript_15BC87:: @ 815BC87 - msgbox EverGrandeCity_PokemonCenter_1F_Text_1919EF, MSGBOX_NPC +EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM:: @ 815BC87 + msgbox EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon, MSGBOX_NPC end diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc index a7be5ccff..9161aa8eb 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonCenter_1F_Text_191967:: @ 8191967 +EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad:: @ 8191967 .string "The POKéMON LEAGUE is only a short\n" .string "distance after the VICTORY ROAD.\p" .string "If you've come this far, what choice\n" .string "do you have but to keep going?$" -EverGrandeCity_PokemonCenter_1F_Text_1919EF:: @ 81919EF +EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon:: @ 81919EF .string "The long and harrowing VICTORY ROAD...\p" .string "It's like reliving the path one has\n" .string "traveled in life...\p" diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.json b/data/maps/EverGrandeCity_PokemonLeague/map.json index 721dbe984..6a7afedfe 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_EventScript_15BA9A", + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_EventScript_15BAA8", + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_Clerk", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_EventScript_15BAD2", + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_EventScript_15BAD2", + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index c43b28ea7..500b7ce75 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -1,19 +1,19 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_MapScript1_15BA7B + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition .byte 0 -EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B +EverGrandeCity_PokemonLeague_1F_OnTransition:: @ 815BA7B setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_POKEMON_LEAGUE setflag FLAG_SYS_POKEMON_LEAGUE_FLY - call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B + call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor end -EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B +EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor:: @ 815BA8B setobjectxyperm 3, 9, 2 setobjectxyperm 4, 10, 2 return -EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A +EverGrandeCity_PokemonLeague_1F_EventScript_Nurse:: @ 815BA9A setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -21,7 +21,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A release end -EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8 +EverGrandeCity_PokemonLeague_1F_EventScript_Clerk:: @ 815BAA8 lock faceplayer message Text_HowMayIServeYou @@ -44,25 +44,25 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 release end -EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 +EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 815BAD2 lockall - goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57 + goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GoForth getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 11 - call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34 + call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight compare VAR_TEMP_0, 8 - call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F - message EverGrandeCity_PokemonLeague_Text_1916FD + call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft + message EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges waitmessage delay 75 - goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges closemessage - applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E - applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 + applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay + applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay waitmovement 0 delay 10 playfanfare MUS_OBTAIN_BADGE - message EverGrandeCity_PokemonLeague_Text_191804 + message EverGrandeCity_PokemonLeague_1F_Text_GoForth waitmessage waitfanfare closemessage @@ -72,50 +72,50 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 releaseall end -EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34 - applymovement LOCALID_PLAYER, EverGrandeCity_PokemonLeague_Movement_15BB76 +EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight:: @ 815BB34 + applymovement LOCALID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight waitmovement 0 return -EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F - applymovement LOCALID_PLAYER, EverGrandeCity_PokemonLeague_Movement_15BB7A +EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 815BB3F + applymovement LOCALID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft waitmovement 0 return -EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A +EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: @ 815BB4A playse SE_FAILURE - msgbox EverGrandeCity_PokemonLeague_Text_19179C, MSGBOX_DEFAULT + msgbox EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges, MSGBOX_DEFAULT releaseall end -EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 +EverGrandeCity_PokemonLeague_1F_EventScript_GoForth:: @ 815BB57 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox EverGrandeCity_PokemonLeague_Text_191804, MSGBOX_DEFAULT + msgbox EverGrandeCity_PokemonLeague_1F_Text_GoForth, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76 +EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight:: @ 815BB76 walk_down walk_left walk_in_place_fastest_up step_end -EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A +EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft:: @ 815BB7A walk_down walk_right walk_in_place_fastest_up step_end -EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E +EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay:: @ 815BB7E walk_left walk_in_place_fastest_down step_end -EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81 +EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay:: @ 815BB81 walk_right walk_in_place_fastest_down step_end diff --git a/data/maps/EverGrandeCity_PokemonLeague/text.inc b/data/maps/EverGrandeCity_PokemonLeague/text.inc index a3671beb3..d10ee075c 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/text.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/text.inc @@ -1,15 +1,15 @@ -EverGrandeCity_PokemonLeague_Text_1916FD:: @ 81916FD +EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges:: @ 81916FD .string "Beyond this point, only those TRAINERS\n" .string "who have collected all the GYM BADGES\l" .string "are permitted to enter.\p" .string "TRAINER, let us confirm that you have\n" .string "all the GYM BADGES.$" -EverGrandeCity_PokemonLeague_Text_19179C:: @ 819179C +EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges:: @ 819179C .string "You haven't obtained all the BADGES.\p" .string "If you're bound for the POKéMON\n" .string "LEAGUE, you must return with them.$" -EverGrandeCity_PokemonLeague_Text_191804:: @ 8191804 +EverGrandeCity_PokemonLeague_1F_Text_GoForth:: @ 8191804 .string "TRAINER! Believe in yourself and your\n" .string "POKéMON, and go forth!$" diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 691d9ec78..729318a96 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_SidneysRoom_EventScript_15B596", + "script": "EverGrandeCity_SidneysRoom_EventScript_Sidney", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 083822a54..60139d96b 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,61 +1,60 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_15B54F - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_15B570 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_15B57F + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_OnFrame .byte 0 -EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F - call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564 +EverGrandeCity_SidneysRoom_OnLoad:: @ 815B54F + call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 1 - call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A + call_if_eq EverGrandeCity_SidneysRoom_EventScript_CloseDoor end -EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564 +EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom:: @ 815B564 call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A +EverGrandeCity_SidneysRoom_EventScript_CloseDoor:: @ 815B56A call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570 -EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A +EverGrandeCity_SidneysRoom_OnWarp:: @ 815B570 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A +EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth:: @ 815B57A turnobject LOCALID_PLAYER, 2 end -EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F - map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_15B589 +EverGrandeCity_SidneysRoom_OnFrame:: @ 815B57F + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 +EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor:: @ 815B589 lockall call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 1 releaseall end -EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 +EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 815B596 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD + goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_190823 - goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 + trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat + goto EverGrandeCity_SidneysRoom_EventScript_Defeated end -EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD - msgbox EverGrandeCity_SidneysRoom_Text_19086D, MSGBOX_DEFAULT +EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech:: @ 815B5BD + msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7 +EverGrandeCity_SidneysRoom_EventScript_Defeated:: @ 815B5C7 setflag FLAG_DEFEATED_ELITE_4_SYDNEY call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles - msgbox EverGrandeCity_SidneysRoom_Text_19086D, MSGBOX_DEFAULT + msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_SidneysRoom/text.inc b/data/maps/EverGrandeCity_SidneysRoom/text.inc index 6be995b57..31bfccd50 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/text.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/text.inc @@ -8,11 +8,11 @@ EverGrandeCity_SidneysRoom_Text_190728:: @ 8190728 .string "battle that can only be staged here\l" .string "in the POKéMON LEAGUE!$" -EverGrandeCity_SidneysRoom_Text_190823:: @ 8190823 +EverGrandeCity_SidneysRoom_Text_Defeat:: @ 8190823 .string "Well, how do you like that? I lost!\n" .string "Eh, it was fun, so it doesn't matter.$" -EverGrandeCity_SidneysRoom_Text_19086D:: @ 819086D +EverGrandeCity_SidneysRoom_Text_PostBattleSpeech:: @ 819086D .string "Well, listen to what this loser has\n" .string "to say.\p" .string "You've got what it takes to go far.\n" diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 057f9252c..477e7e444 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -32,7 +32,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_14E814", + "script": "FallarborTown_EventScript_Girl", "flag": "0" }, { @@ -45,7 +45,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_14E7F5", + "script": "FallarborTown_EventScript_ExpertM", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_14E81D", + "script": "FallarborTown_EventScript_Gentleman", "flag": "0" }, { @@ -71,7 +71,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_14E826", + "script": "FallarborTown_EventScript_Azurill", "flag": "FLAG_HIDE_AZURILL_FALLARBOR" } ], @@ -136,7 +136,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_EventScript_14E839" + "script": "FallarborTown_EventScript_ContestHallSign" }, { "type": "sign", @@ -152,7 +152,7 @@ "y": 11, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_EventScript_14E842" + "script": "FallarborTown_EventScript_TownSign" }, { "type": "sign", @@ -168,7 +168,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_EventScript_14E84B" + "script": "FallarborTown_EventScript_MoveTutorSign" }, { "type": "hidden_item", @@ -176,7 +176,7 @@ "y": 15, "elevation": 3, "item": "ITEM_NUGGET", - "flag": "FLAG_HIDDEN_ITEM_1C" + "flag": "FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET" } ] } diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index a39d7e51f..796bd9d21 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,55 +1,53 @@ FallarborTown_MapScripts:: @ 814E7E0 - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_14E7E6 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_OnTransition .byte 0 -FallarborTown_MapScript1_14E7E6:: @ 814E7E6 +FallarborTown_OnTransition:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR clearflag FLAG_CONTEST_SKETCH_CREATED end -FallarborTown_EventScript_14E7F5:: @ 814E7F5 +FallarborTown_EventScript_ExpertM:: @ 814E7F5 lock faceplayer - goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A - msgbox FallarborTown_Text_16C7FF, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_ExpertMNormal + msgbox FallarborTown_Text_ShadyFellowAtLab, MSGBOX_DEFAULT release end -FallarborTown_EventScript_14E80A:: @ 814E80A - msgbox FallarborTown_Text_16C855, MSGBOX_DEFAULT +FallarborTown_EventScript_ExpertMNormal:: @ 814E80A + msgbox FallarborTown_Text_RegionKnownForMeteors, MSGBOX_DEFAULT release end -FallarborTown_EventScript_14E814:: @ 814E814 - msgbox FallarborTown_Text_16C8D6, MSGBOX_NPC +FallarborTown_EventScript_Girl:: @ 814E814 + msgbox FallarborTown_Text_MyPreciousAzurill, MSGBOX_NPC end -FallarborTown_EventScript_14E81D:: @ 814E81D - msgbox FallarborTown_Text_16C941, MSGBOX_NPC +FallarborTown_EventScript_Gentleman:: @ 814E81D + msgbox FallarborTown_Text_HaveYouChallengedFlannery, MSGBOX_NPC end -FallarborTown_EventScript_14E826:: @ 814E826 +FallarborTown_EventScript_Azurill:: @ 814E826 lock faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox FallarborTown_Text_16C92C, MSGBOX_DEFAULT + msgbox FallarborTown_Text_Azurill, MSGBOX_DEFAULT waitmoncry release end -FallarborTown_EventScript_14E839:: @ 814E839 - msgbox FallarborTown_Text_16CA39, MSGBOX_SIGN +FallarborTown_EventScript_ContestHallSign:: @ 814E839 + msgbox FallarborTown_Text_ContestHallSign, MSGBOX_SIGN end -FallarborTown_EventScript_14E842:: @ 814E842 -MeteorFalls_1F_1R_EventScript_14E842:: @ 814E842 -MeteorFalls_1F_2R_EventScript_14E842:: @ 814E842 - msgbox FallarborTown_Text_16CA83, MSGBOX_SIGN +FallarborTown_EventScript_TownSign:: @ 814E842 + msgbox FallarborTown_Text_TownSign, MSGBOX_SIGN end -FallarborTown_EventScript_14E84B:: @ 814E84B - msgbox FallarborTown_Text_16CAB9, MSGBOX_SIGN +FallarborTown_EventScript_MoveTutorSign:: @ 814E84B + msgbox FallarborTown_Text_MoveTutorSign, MSGBOX_SIGN end diff --git a/data/maps/FallarborTown/text.inc b/data/maps/FallarborTown/text.inc index 6f3850b7e..bb9cf9a03 100644 --- a/data/maps/FallarborTown/text.inc +++ b/data/maps/FallarborTown/text.inc @@ -1,23 +1,23 @@ -FallarborTown_Text_16C7FF:: @ 816C7FF +FallarborTown_Text_ShadyFellowAtLab:: @ 816C7FF .string "What's up, what's up?\p" .string "I saw a shady fellow scuttling in and\n" .string "out of PROF. COZMO's LAB.$" -FallarborTown_Text_16C855:: @ 816C855 +FallarborTown_Text_RegionKnownForMeteors:: @ 816C855 .string "This region's been known for meteors\n" .string "since the olden days.\p" .string "They say METEOR FALLS was gouged out\n" .string "by a falling meteorite long ago.$" -FallarborTown_Text_16C8D6:: @ 816C8D6 +FallarborTown_Text_MyPreciousAzurill:: @ 816C8D6 .string "See! Take a look!\n" .string "This is my precious AZURILL!\p" .string "It's slick and smooth and plushy, too!$" -FallarborTown_Text_16C92C:: @ 816C92C +FallarborTown_Text_Azurill:: @ 816C92C .string "AZURILL: Rooreelooo.$" -FallarborTown_Text_16C941:: @ 816C941 +FallarborTown_Text_HaveYouChallengedFlannery:: @ 816C941 .string "Have you already challenged FLANNERY,\n" .string "the LEADER of LAVARIDGE GYM?\p" .string "The girl's grandfather was famous.\n" @@ -27,15 +27,15 @@ FallarborTown_Text_16C941:: @ 816C941 .string "become a great TRAINER in her own\l" .string "right.$" -FallarborTown_Text_16CA39:: @ 816CA39 +FallarborTown_Text_ContestHallSign:: @ 816CA39 .string "POKéMON CONTESTS\n" .string "SUPER RANK REGISTRATION\p" .string "“Burst on to the POKéMON scene!”$" -FallarborTown_Text_16CA83:: @ 816CA83 +FallarborTown_Text_TownSign:: @ 816CA83 .string "FALLARBOR TOWN\n" .string "“A farm community with small gardens.”$" -FallarborTown_Text_16CAB9:: @ 816CAB9 +FallarborTown_Text_MoveTutorSign:: @ 816CAB9 .string "MOVE TUTOR'S HOUSE\n" .string "“New moves taught to POKéMON.”$" diff --git a/data/maps/FallarborTown_ContestHall/map.json b/data/maps/FallarborTown_ContestHall/map.json index 9fea71049..92b956e53 100644 --- a/data/maps/FallarborTown_ContestHall/map.json +++ b/data/maps/FallarborTown_ContestHall/map.json @@ -21,7 +21,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestHall_EventScript_153ACF", + "script": "FallarborTown_ContestHall_EventScript_DoAllRightInPreliminary", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 3, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestHall_EventScript_153AD8", + "script": "FallarborTown_ContestHall_EventScript_MonAllTheseRibbons", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 3, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestHall_EventScript_153AE1", + "script": "FallarborTown_ContestHall_EventScript_CantWinEverywhere", "flag": "0" } ], @@ -75,7 +75,7 @@ "y": 14, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestHall_EventScript_153AEA" + "script": "FallarborTown_ContestHall_EventScript_SuperRankStage" }, { "type": "sign", @@ -83,7 +83,7 @@ "y": 14, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestHall_EventScript_153AEA" + "script": "FallarborTown_ContestHall_EventScript_SuperRankStage" } ] } diff --git a/data/maps/FallarborTown_ContestHall/scripts.inc b/data/maps/FallarborTown_ContestHall/scripts.inc index 34ece82e2..98f37f218 100644 --- a/data/maps/FallarborTown_ContestHall/scripts.inc +++ b/data/maps/FallarborTown_ContestHall/scripts.inc @@ -1,18 +1,18 @@ FallarborTown_ContestHall_MapScripts:: @ 8153ACE .byte 0 -FallarborTown_ContestHall_EventScript_153ACF:: @ 8153ACF - msgbox FallarborTown_ContestHall_Text_177335, MSGBOX_NPC +FallarborTown_ContestHall_EventScript_DoAllRightInPreliminary:: @ 8153ACF + msgbox FallarborTown_ContestHall_Text_DoAllRightInPreliminary, MSGBOX_NPC end -FallarborTown_ContestHall_EventScript_153AD8:: @ 8153AD8 - msgbox FallarborTown_ContestHall_Text_1773C6, MSGBOX_NPC +FallarborTown_ContestHall_EventScript_MonAllTheseRibbons:: @ 8153AD8 + msgbox FallarborTown_ContestHall_Text_MonAllTheseRibbons, MSGBOX_NPC end -FallarborTown_ContestHall_EventScript_153AE1:: @ 8153AE1 - msgbox FallarborTown_ContestHall_Text_177437, MSGBOX_NPC +FallarborTown_ContestHall_EventScript_CantWinEverywhere:: @ 8153AE1 + msgbox FallarborTown_ContestHall_Text_CantWinEverywhere, MSGBOX_NPC end -FallarborTown_ContestHall_EventScript_153AEA:: @ 8153AEA - msgbox FallarborTown_ContestHall_Text_1774B1, MSGBOX_SIGN +FallarborTown_ContestHall_EventScript_SuperRankStage:: @ 8153AEA + msgbox FallarborTown_ContestHall_Text_SuperRankStage, MSGBOX_SIGN end diff --git a/data/maps/FallarborTown_ContestHall/text.inc b/data/maps/FallarborTown_ContestHall/text.inc index 89a595136..0c8f6b688 100644 --- a/data/maps/FallarborTown_ContestHall/text.inc +++ b/data/maps/FallarborTown_ContestHall/text.inc @@ -1,21 +1,21 @@ -FallarborTown_ContestHall_Text_177335:: @ 8177335 +FallarborTown_ContestHall_Text_DoAllRightInPreliminary:: @ 8177335 .string "We do all right in the preliminary round,\n" .string "but we can never win the appeals...\p" .string "Maybe it means I have to watch what\n" .string "other contestants are doing...$" -FallarborTown_ContestHall_Text_1773C6:: @ 81773C6 +FallarborTown_ContestHall_Text_MonAllTheseRibbons:: @ 81773C6 .string "See!\n" .string "My POKéMON won all these RIBBONS!\p" .string "Have your POKéMON earned any RIBBONS?\n" .string "You can check them on your POKéNAV.$" -FallarborTown_ContestHall_Text_177437:: @ 8177437 +FallarborTown_ContestHall_Text_CantWinEverywhere:: @ 8177437 .string "I can't beat GYM LEADERS...\p" .string "I can't win any CONTESTS...\p" .string "I've been here, there, and everywhere,\n" .string "and it's all for naught...$" -FallarborTown_ContestHall_Text_1774B1:: @ 81774B1 +FallarborTown_ContestHall_Text_SuperRankStage:: @ 81774B1 .string "POKéMON CONTESTS\n" .string "SUPER RANK STAGE!$" diff --git a/data/maps/FallarborTown_ContestLobby/map.json b/data/maps/FallarborTown_ContestLobby/map.json index f62471670..084784f9c 100644 --- a/data/maps/FallarborTown_ContestLobby/map.json +++ b/data/maps/FallarborTown_ContestLobby/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_1539CD", + "script": "FallarborTown_ContestLobby_EventScript_ContestReceptionist", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_153A8E", + "script": "FallarborTown_ContestLobby_EventScript_Boy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_153AB2", + "script": "FallarborTown_ContestLobby_EventScript_Lass", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_1B778A", + "script": "FallarborTown_ContestLobby_EventScript_BerryBlenderMan", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_1AE0B6", + "script": "FallarborTown_ContestLobby_EventScript_Reporter", "flag": "FLAG_HIDE_CONTEST_REPORTER_FALLARBOR" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_153A97", + "script": "FallarborTown_ContestLobby_EventScript_SketchArtist", "flag": "0" } ], @@ -121,7 +121,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestLobby_EventScript_1B7823" + "script": "FallarborTown_ContestLobby_EventScript_BerryBlender1" }, { "type": "sign", @@ -129,7 +129,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestLobby_EventScript_1B7604" + "script": "FallarborTown_ContestLobby_EventScript_BerryBlender2" }, { "type": "sign", @@ -137,7 +137,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestLobby_EventScript_153ABB" + "script": "FallarborTown_ContestLobby_EventScript_ContestWinner1" }, { "type": "sign", @@ -145,7 +145,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestLobby_EventScript_153AC2" + "script": "FallarborTown_ContestLobby_EventScript_ContestWinner2" } ] } diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index ba37d473c..b27cce720 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -1,12 +1,12 @@ FallarborTown_ContestLobby_MapScripts:: @ 81539C1 - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_ContestLobby_MapScript1_1539C7 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_ContestLobby_OnTransition .byte 0 -FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 +FallarborTown_ContestLobby_OnTransition:: @ 81539C7 call FallarborTown_ContestLobby_EventScript_1AE188 end -FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD +FallarborTown_ContestLobby_EventScript_ContestReceptionist:: @ 81539CD setvar VAR_0x800B, 6 setvar VAR_CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 @@ -87,31 +87,31 @@ FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C walk_in_place_fastest_right step_end -FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E - msgbox FallarborTown_ContestLobby_Text_177141, MSGBOX_NPC +FallarborTown_ContestLobby_EventScript_Boy:: @ 8153A8E + msgbox FallarborTown_ContestLobby_Text_UsedToHaveSketch, MSGBOX_NPC end -FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 +FallarborTown_ContestLobby_EventScript_SketchArtist:: @ 8153A97 goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9 - msgbox FallarborTown_ContestLobby_Text_177246, MSGBOX_NPC + msgbox FallarborTown_ContestLobby_Text_ICreateSketches, MSGBOX_NPC end FallarborTown_ContestLobby_EventScript_153AA9:: @ 8153AA9 - msgbox FallarborTown_ContestLobby_Text_1772D8, MSGBOX_NPC + msgbox FallarborTown_ContestLobby_Text_YourSketchIsUp, MSGBOX_NPC end -FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2 - msgbox FallarborTown_ContestLobby_Text_1771F2, MSGBOX_NPC +FallarborTown_ContestLobby_EventScript_Lass:: @ 8153AB2 + msgbox FallarborTown_ContestLobby_Text_AreYouMakingPokeblock, MSGBOX_NPC end -FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB +FallarborTown_ContestLobby_EventScript_ContestWinner1:: @ 8153ABB lockall fadescreen FADE_TO_BLACK showcontestwinner 2 releaseall end -FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 +FallarborTown_ContestLobby_EventScript_ContestWinner2:: @ 8153AC2 lockall special ShowBerryBlenderRecordWindow waitbuttonpress diff --git a/data/maps/FallarborTown_ContestLobby/text.inc b/data/maps/FallarborTown_ContestLobby/text.inc index 3bfa87936..c4c32e36c 100644 --- a/data/maps/FallarborTown_ContestLobby/text.inc +++ b/data/maps/FallarborTown_ContestLobby/text.inc @@ -1,23 +1,23 @@ -FallarborTown_ContestLobby_Text_177141:: @ 8177141 +FallarborTown_ContestLobby_Text_UsedToHaveSketch:: @ 8177141 .string "They had a sketch of my POKéMON up\n" .string "on the wall over there, but they\l" .string "changed it with a new one already.\p" .string "I'm going to enter my HANA in CONTESTS\n" .string "so we can get her sketch up again!$" -FallarborTown_ContestLobby_Text_1771F2:: @ 81771F2 +FallarborTown_ContestLobby_Text_AreYouMakingPokeblock:: @ 81771F2 .string "Hi, are you making any {POKEBLOCK}S?\p" .string "You should come by with a bunch of\n" .string "BERRIES sometime.$" -FallarborTown_ContestLobby_Text_177246:: @ 8177246 +FallarborTown_ContestLobby_Text_ICreateSketches:: @ 8177246 .string "You see how they display a sketch of\n" .string "a CONTEST winner here?\p" .string "I sketch them!\p" .string "If any of your POKéMON wins a CONTEST,\n" .string "I'd gladly make a sketch of it!$" -FallarborTown_ContestLobby_Text_1772D8:: @ 81772D8 +FallarborTown_ContestLobby_Text_YourSketchIsUp:: @ 81772D8 .string "Hello! Congratulations!\p" .string "I've put up a sketch of your POKéMON\n" .string "right here for everyone to see!$" diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index cfa8e3ce0..500d9c7c7 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House1_EventScript_153BB5", + "script": "FallarborTown_CozmosHouse_EventScript_ProfCozmo", "flag": "FLAG_HIDE_PROF_COSMO_FALLARBOR" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House1_EventScript_153C5E", + "script": "FallarborTown_CozmosHouse_EventScript_CozmosWife", "flag": "0" } ], diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 9690ccb29..70e9754a1 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -1,72 +1,72 @@ FallarborTown_House1_MapScripts:: @ 8153BAE - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_House1_MapScript1_153BB4 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_House1_OnTransition .byte 0 -FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 +FallarborTown_House1_OnTransition:: @ 8153BB4 end -FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 +FallarborTown_CozmosHouse_EventScript_ProfCozmo:: @ 8153BB5 lock faceplayer - goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C54 + goto_if_set FLAG_RECEIVED_TM_RETURN, FallarborTown_CozmosHouse_EventScript_GaveMeteorite checkitem ITEM_METEORITE, 1 compare VAR_RESULT, 1 - goto_if_eq FallarborTown_House1_EventScript_153BDA - msgbox FallarborTown_House1_Text_177755, MSGBOX_DEFAULT + goto_if_eq FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite + msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153BDA:: @ 8153BDA - call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_153C2D - call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_153C3E +FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8153BDA + call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_NoticeMeteorite + call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_AskForMeteorite compare VAR_RESULT, NO - goto_if_eq FallarborTown_House1_EventScript_153C47 - msgbox FallarborTown_House1_Text_1778C4, MSGBOX_DEFAULT + goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite + msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT giveitem ITEM_TM27_RETURN compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_0x8004, ITEM_METEORITE call Common_EventScript_PlayerHandedOverTheItem - setflag FLAG_RECEIVED_TM27 - msgbox FallarborTown_House1_Text_177910, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_RETURN + msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C2D:: @ 8153C2D - msgbox FallarborTown_House1_Text_177755, MSGBOX_DEFAULT - msgbox FallarborTown_House1_Text_17780E, MSGBOX_YESNO +FallarborTown_CozmosHouse_EventScript_NoticeMeteorite:: @ 8153C2D + msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT + msgbox FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt, MSGBOX_YESNO return -FallarborTown_House1_EventScript_153C3E:: @ 8153C3E - msgbox FallarborTown_House1_Text_1779B8, MSGBOX_YESNO +FallarborTown_CozmosHouse_EventScript_AskForMeteorite:: @ 8153C3E + msgbox FallarborTown_CozmosHouse_Text_MayIHaveMeteorite, MSGBOX_YESNO return -FallarborTown_House1_EventScript_153C47:: @ 8153C47 +FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite:: @ 8153C47 setflag FLAG_TEMP_2 - msgbox FallarborTown_House1_Text_17797D, MSGBOX_DEFAULT + msgbox FallarborTown_CozmosHouse_Text_CrushedWithDisappointment, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C54:: @ 8153C54 - msgbox FallarborTown_House1_Text_177910, MSGBOX_DEFAULT +FallarborTown_CozmosHouse_EventScript_GaveMeteorite:: @ 8153C54 + msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C5E:: @ 8153C5E +FallarborTown_CozmosHouse_EventScript_CozmosWife:: @ 8153C5E lock faceplayer - goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C86 - goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_153C7C - msgbox FallarborTown_House1_Text_177A2B, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM_RETURN, FallarborTown_CozmosHouse_EventScript_CozmoIsHappy + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_CozmosHouse_EventScript_CozmoIsSad + msgbox FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C7C:: @ 8153C7C - msgbox FallarborTown_House1_Text_177A7C, MSGBOX_DEFAULT +FallarborTown_CozmosHouse_EventScript_CozmoIsSad:: @ 8153C7C + msgbox FallarborTown_CozmosHouse_Text_FeelSorryForCozmo, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C86:: @ 8153C86 - msgbox FallarborTown_House1_Text_177ABB, MSGBOX_DEFAULT +FallarborTown_CozmosHouse_EventScript_CozmoIsHappy:: @ 8153C86 + msgbox FallarborTown_CozmosHouse_Text_CozmoIsSoHappy, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_House1/text.inc b/data/maps/FallarborTown_House1/text.inc index c8c155583..bc163fc52 100644 --- a/data/maps/FallarborTown_House1/text.inc +++ b/data/maps/FallarborTown_House1/text.inc @@ -1,4 +1,4 @@ -FallarborTown_House1_Text_177755:: @ 8177755 +FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow:: @ 8177755 .string "PROF. COZMO: Oh...\n" .string "I never should have let myself be\l" .string "conned into telling TEAM {EVIL_TEAM} where\l" @@ -6,7 +6,7 @@ FallarborTown_House1_Text_177755:: @ 8177755 .string "That METEORITE from METEOR FALLS...\n" .string "It's never going to be mine now...$" -FallarborTown_House1_Text_17780E:: @ 817780E +FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt:: @ 817780E .string "Oh!\n" .string "Hah?\p" .string "That item...\p" @@ -17,35 +17,35 @@ FallarborTown_House1_Text_17780E:: @ 817780E .string "I'm not asking for it for free.\n" .string "How about in exchange for this TM?$" -FallarborTown_House1_Text_1778C4:: @ 81778C4 +FallarborTown_CozmosHouse_Text_PleaseUseThisTM:: @ 81778C4 .string "PROF. COZMO: This TM, it represents\n" .string "my feeling of gratitude.\l" .string "Please use it!$" -FallarborTown_House1_Text_177910:: @ 8177910 +FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch:: @ 8177910 .string "PROF. COZMO: Oh, I can't believe it.\n" .string "This is really, really great!\p" .string "This is really going to help my research!$" -FallarborTown_House1_Text_17797D:: @ 817797D +FallarborTown_CozmosHouse_Text_CrushedWithDisappointment:: @ 817797D .string "PROF. COZMO: Oh, but...\n" .string "I'm crushed with disappointment...$" -FallarborTown_House1_Text_1779B8:: @ 81779B8 +FallarborTown_CozmosHouse_Text_MayIHaveMeteorite:: @ 81779B8 .string "PROF. COZMO: Please, may I have that\n" .string "METEORITE?\p" .string "I'm not asking for it for free.\n" .string "How about in exchange for this TM?$" -FallarborTown_House1_Text_177A2B:: @ 8177A2B +FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls:: @ 8177A2B .string "PROF. COZMO went off to METEOR FALLS\n" .string "on ROUTE 114 with some people from\l" .string "TEAM {EVIL_TEAM}.$" -FallarborTown_House1_Text_177A7C:: @ 8177A7C +FallarborTown_CozmosHouse_Text_FeelSorryForCozmo:: @ 8177A7C .string "Poor PROF. COZMO...\n" .string "He's so depressed... I feel sorry for him.$" -FallarborTown_House1_Text_177ABB:: @ 8177ABB +FallarborTown_CozmosHouse_Text_CozmoIsSoHappy:: @ 8177ABB .string "Look at PROF. COZMO...\n" .string "He's so happy! I think it's cute.$" diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index b38c06092..428494609 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House2_EventScript_153C91", + "script": "FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner", "flag": "0" } ], diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 6ea37ea51..ad7930115 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -1,62 +1,62 @@ FallarborTown_House2_MapScripts:: @ 8153C90 .byte 0 -FallarborTown_House2_EventScript_153C91:: @ 8153C91 +FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: @ 8153C91 lockall applymovement 1, Common_Movement_FacePlayer waitmovement 0 - goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6 - msgbox FallarborTown_House2_Text_177AF4, MSGBOX_DEFAULT + goto_if_set FLAG_TEMP_1, FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove + msgbox FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor, MSGBOX_DEFAULT setflag FLAG_TEMP_1 - goto FallarborTown_House2_EventScript_153CB6 + goto FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove end -FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 +FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House2_EventScript_153D60 - msgbox FallarborTown_House2_Text_177BDB, MSGBOX_YESNO + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + msgbox FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove, MSGBOX_YESNO switch VAR_RESULT - case NO, FallarborTown_House2_EventScript_153D60 - goto FallarborTown_House2_EventScript_153CE4 + case NO, FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon end -FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 - msgbox FallarborTown_House2_Text_177C3F, MSGBOX_DEFAULT +FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon:: @ 8153CE4 + msgbox FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon, MSGBOX_DEFAULT special SelectMoveTutorMon waitstate compare VAR_0x8004, 255 - goto_if_eq FallarborTown_House2_EventScript_153D60 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale special IsSelectedMonEgg compare VAR_RESULT, 1 - goto_if_eq FallarborTown_House2_EventScript_153D52 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg compare VAR_0x8005, 0 - goto_if_eq FallarborTown_House2_EventScript_153D44 - goto FallarborTown_House2_EventScript_153D1A + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove end -FallarborTown_House2_EventScript_153D1A:: @ 8153D1A - msgbox FallarborTown_House2_Text_177C5D, MSGBOX_DEFAULT +FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 8153D1A + msgbox FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove, MSGBOX_DEFAULT special DisplayMoveTutorMenu waitstate compare VAR_0x8004, 0 - goto_if_eq FallarborTown_House2_EventScript_153CE4 - msgbox FallarborTown_House2_Text_177CC3, MSGBOX_DEFAULT + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + msgbox FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale, MSGBOX_DEFAULT removeitem ITEM_HEART_SCALE - goto FallarborTown_House2_EventScript_153D60 + goto FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale end -FallarborTown_House2_EventScript_153D44:: @ 8153D44 - msgbox FallarborTown_House2_Text_177C78, MSGBOX_DEFAULT - goto FallarborTown_House2_EventScript_153CE4 +FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon:: @ 8153D44 + msgbox FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon, MSGBOX_DEFAULT + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon end -FallarborTown_House2_EventScript_153D52:: @ 8153D52 - msgbox FallarborTown_House2_Text_177D33, MSGBOX_DEFAULT - goto FallarborTown_House2_EventScript_153CE4 +FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg:: @ 8153D52 + msgbox FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg, MSGBOX_DEFAULT + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon end -FallarborTown_House2_EventScript_153D60:: @ 8153D60 - msgbox FallarborTown_House2_Text_177CEF, MSGBOX_DEFAULT +FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale:: @ 8153D60 + msgbox FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/FallarborTown_House2/text.inc b/data/maps/FallarborTown_House2/text.inc index 2ccea7781..825a4c58b 100644 --- a/data/maps/FallarborTown_House2/text.inc +++ b/data/maps/FallarborTown_House2/text.inc @@ -1,4 +1,4 @@ -FallarborTown_House2_Text_177AF4:: @ 8177AF4 +FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor:: @ 8177AF4 .string "I'm the MOVE TUTOR.\p" .string "I know all the moves that POKéMON\n" .string "learn - every one of them - and I can\l" @@ -8,31 +8,31 @@ FallarborTown_House2_Text_177AF4:: @ 8177AF4 .string "I'll do it for a HEART SCALE.\n" .string "I'm collecting those now.$" -FallarborTown_House2_Text_177BDB:: @ 8177BDB +FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove:: @ 8177BDB .string "Oh! That's it! That's an honest to\n" .string "goodness HEART SCALE!\p" .string "Let me guess, you want me to teach\n" .string "a move?$" -FallarborTown_House2_Text_177C3F:: @ 8177C3F +FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon:: @ 8177C3F .string "Which POKéMON needs tutoring?$" -FallarborTown_House2_Text_177C5D:: @ 8177C5D +FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove:: @ 8177C5D .string "Which move should I teach?$" -FallarborTown_House2_Text_177C78:: @ 8177C78 +FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon:: @ 8177C78 .string "Sorry...\p" .string "It doesn't appear as if I have any move\n" .string "I can teach that POKéMON.$" -FallarborTown_House2_Text_177CC3:: @ 8177CC3 +FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale:: @ 8177CC3 .string "{PLAYER} handed over one HEART SCALE\n" .string "in exchange.$" -FallarborTown_House2_Text_177CEF:: @ 8177CEF +FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale:: @ 8177CEF .string "If your POKéMON need to learn a move,\n" .string "come back with a HEART SCALE.$" -FallarborTown_House2_Text_177D33:: @ 8177D33 +FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg:: @ 8177D33 .string "Hunh? There isn't a single move that\n" .string "I can teach an EGG.$" diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index 20b6e5cde..043340157 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_153967", + "script": "FallarborTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_15399C", + "script": "FallarborTown_Mart_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_1539A5", + "script": "FallarborTown_Mart_EventScript_PokefanM", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_1539AE", + "script": "FallarborTown_Mart_EventScript_Skitty", "flag": "0" } ], diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index 12d92164b..9d44052b2 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -1,7 +1,7 @@ FallarborTown_Mart_MapScripts:: @ 8153966 .byte 0 -FallarborTown_Mart_EventScript_153967:: @ 8153967 +FallarborTown_Mart_EventScript_Clerk:: @ 8153967 lock faceplayer message Text_HowMayIServeYou @@ -29,20 +29,20 @@ FallarborTown_Mart_Items:: @ 8153980 release end -FallarborTown_Mart_EventScript_15399C:: @ 815399C - msgbox FallarborTown_Mart_Text_176FF0, MSGBOX_NPC +FallarborTown_Mart_EventScript_Woman:: @ 815399C + msgbox FallarborTown_Mart_Text_DecidingSkittyEvolve, MSGBOX_NPC end -FallarborTown_Mart_EventScript_1539A5:: @ 81539A5 - msgbox FallarborTown_Mart_Text_1770E2, MSGBOX_NPC +FallarborTown_Mart_EventScript_PokefanM:: @ 81539A5 + msgbox FallarborTown_Mart_Text_SellNuggetIFound, MSGBOX_NPC end -FallarborTown_Mart_EventScript_1539AE:: @ 81539AE +FallarborTown_Mart_EventScript_Skitty:: @ 81539AE lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox FallarborTown_Mart_Text_1770D3, MSGBOX_DEFAULT + msgbox FallarborTown_Mart_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FallarborTown_Mart/text.inc b/data/maps/FallarborTown_Mart/text.inc index a63892874..5860856c0 100644 --- a/data/maps/FallarborTown_Mart/text.inc +++ b/data/maps/FallarborTown_Mart/text.inc @@ -1,4 +1,4 @@ -FallarborTown_Mart_Text_176FF0:: @ 8176FF0 +FallarborTown_Mart_Text_DecidingSkittyEvolve:: @ 8176FF0 .string "I'm having a hard time deciding if I\n" .string "should make my SKITTY evolve or not.\p" .string "I only have to use this MOON STONE,\n" @@ -7,10 +7,10 @@ FallarborTown_Mart_Text_176FF0:: @ 8176FF0 .string "much stronger.\p" .string "But it will look so different, too.$" -FallarborTown_Mart_Text_1770D3:: @ 81770D3 +FallarborTown_Mart_Text_Skitty:: @ 81770D3 .string "SKITTY: Miyao?$" -FallarborTown_Mart_Text_1770E2:: @ 81770E2 +FallarborTown_Mart_Text_SellNuggetIFound:: @ 81770E2 .string "This NUGGET I found here...\n" .string "I suppose I'll have to sell it, seeing\l" .string "as how it has no other use.$" diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index 0a426fa7e..a9d867a6d 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_153B02", + "script": "FallarborTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_153B10", + "script": "FallarborTown_PokemonCenter_1F_EventScript_Girl", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_153B19", + "script": "FallarborTown_PokemonCenter_1F_EventScript_ExpertM", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_153B22", + "script": "FallarborTown_PokemonCenter_1F_EventScript_Lanette", "flag": "FLAG_HIDE_LANETTE_FALLARBOR" } ], diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 93b87791d..19cc4d7e4 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,13 +1,13 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_153AF9 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition .byte 0 -FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 +FallarborTown_PokemonCenter_1F_OnTransition:: @ 8153AF9 setrespawn HEAL_LOCATION_FALLARBOR_TOWN call Common_EventScript_UpdateBrineyLocation end -FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 +FallarborTown_PokemonCenter_1F_EventScript_Nurse:: @ 8153B02 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,44 +15,44 @@ FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 release end -FallarborTown_PokemonCenter_1F_EventScript_153B10:: @ 8153B10 - msgbox FallarborTown_PokemonCenter_1F_Text_17768C, MSGBOX_NPC +FallarborTown_PokemonCenter_1F_EventScript_Girl:: @ 8153B10 + msgbox FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown, MSGBOX_NPC end -FallarborTown_PokemonCenter_1F_EventScript_153B19:: @ 8153B19 - msgbox FallarborTown_PokemonCenter_1F_Text_1776F5, MSGBOX_NPC +FallarborTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8153B19 + msgbox FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees, MSGBOX_NPC end -FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 +FallarborTown_PokemonCenter_1F_EventScript_Lanette:: @ 8153B22 lock faceplayer - msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, MSGBOX_DEFAULT + msgbox FallarborTown_PokemonCenter_1F_Text_LanetteGreeting, MSGBOX_DEFAULT closemessage switch VAR_FACING - case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49 - case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59 + case 2, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth + case 3, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest end -FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49 - applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B74 +FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth:: @ 8153B49 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth waitmovement 0 - goto FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited end -FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 - applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B81 +FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8153B59 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest waitmovement 0 - goto FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited end -FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 +FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8153B69 playse SE_SLIDING_DOOR removeobject 4 clearflag FLAG_HIDE_LANETTE release end -FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74 +FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth:: @ 8153B74 walk_right walk_down walk_down @@ -67,7 +67,7 @@ FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74 delay_8 step_end -FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81 +FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest:: @ 8153B81 walk_down walk_down walk_left diff --git a/data/maps/FallarborTown_PokemonCenter_1F/text.inc b/data/maps/FallarborTown_PokemonCenter_1F/text.inc index 2a9102ebf..049bb2006 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/text.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 +FallarborTown_PokemonCenter_1F_Text_LanetteGreeting:: @ 81774D4 .string "Oh, hello.\n" .string "You are?\p" .string "Okay, your name's {PLAYER}{KUN}.\n" @@ -15,13 +15,13 @@ FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 .string "If you could, please visit me at home.\n" .string "My house is on ROUTE 114.$" -FallarborTown_PokemonCenter_1F_Text_17768C:: @ 817768C +FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown:: @ 817768C .string "I wonder what POKéMON looked like\n" .string "long, long ago?\p" .string "Maybe the FOSSIL MANIAC at the edge\n" .string "of town will know.$" -FallarborTown_PokemonCenter_1F_Text_1776F5:: @ 81776F5 +FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees:: @ 81776F5 .string "In the fields of FALLARBOR, we plant\n" .string "seedlings of hardy trees that thrive\l" .string "even in volcanic ash.$" diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 3bdf1024b..4178cbf4b 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -32,7 +32,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_14C955", + "script": "FortreeCity_EventScript_Man", "flag": "0" }, { @@ -45,7 +45,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_14C97D", + "script": "FortreeCity_EventScript_Girl", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_14C95E", + "script": "FortreeCity_EventScript_Woman", "flag": "0" }, { @@ -71,7 +71,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_14C98F", + "script": "FortreeCity_EventScript_Boy", "flag": "0" }, { @@ -84,7 +84,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_14C986", + "script": "FortreeCity_EventScript_OldMan", "flag": "0" }, { @@ -97,7 +97,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_14C998", + "script": "FortreeCity_EventScript_GameboyKid", "flag": "0" }, { @@ -110,7 +110,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_14C9B3", + "script": "FortreeCity_EventScript_Kecleon", "flag": "FLAG_HIDE_KECLEON_FORTREE" } ], @@ -187,7 +187,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FortreeCity_EventScript_14C9A1" + "script": "FortreeCity_EventScript_CitySign" }, { "type": "sign", @@ -211,7 +211,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FortreeCity_EventScript_14C9AA" + "script": "FortreeCity_EventScript_GymSign" }, { "type": "sign", diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index b46929698..4ffb94d8e 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,76 +1,76 @@ FortreeCity_MapScripts:: @ 814C943 - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_14C94E - map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_14C952 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_OnTransition + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_OnResume .byte 0 -FortreeCity_MapScript1_14C94E:: @ 814C94E +FortreeCity_OnTransition:: @ 814C94E setflag FLAG_VISITED_FORTREE_CITY end -FortreeCity_MapScript1_14C952:: @ 814C952 +FortreeCity_OnResume:: @ 814C952 setstepcallback 2 end -FortreeCity_EventScript_14C955:: @ 814C955 - msgbox FortreeCity_Text_167577, MSGBOX_NPC +FortreeCity_EventScript_Man:: @ 814C955 + msgbox FortreeCity_Text_YouSmellSinged, MSGBOX_NPC end -FortreeCity_EventScript_14C95E:: @ 814C95E +FortreeCity_EventScript_Woman:: @ 814C95E lock faceplayer - goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_14C973 - msgbox FortreeCity_Text_1675C2, MSGBOX_DEFAULT + goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_WomanGymAccessible + msgbox FortreeCity_Text_SomethingBlockingGym, MSGBOX_DEFAULT release end -FortreeCity_EventScript_14C973:: @ 814C973 - msgbox FortreeCity_Text_167642, MSGBOX_DEFAULT +FortreeCity_EventScript_WomanGymAccessible:: @ 814C973 + msgbox FortreeCity_Text_ThisTimeIllBeatWinona, MSGBOX_DEFAULT release end -FortreeCity_EventScript_14C97D:: @ 814C97D - msgbox FortreeCity_Text_16768A, MSGBOX_NPC +FortreeCity_EventScript_Girl:: @ 814C97D + msgbox FortreeCity_Text_TreesGrowByDrinkingRainwater, MSGBOX_NPC end -FortreeCity_EventScript_14C986:: @ 814C986 - msgbox FortreeCity_Text_16770E, MSGBOX_NPC +FortreeCity_EventScript_OldMan:: @ 814C986 + msgbox FortreeCity_Text_EveryoneHealthyAndLively, MSGBOX_NPC end -FortreeCity_EventScript_14C98F:: @ 814C98F - msgbox FortreeCity_Text_1677BD, MSGBOX_NPC +FortreeCity_EventScript_Boy:: @ 814C98F + msgbox FortreeCity_Text_BugPokemonComeThroughWindow, MSGBOX_NPC end -FortreeCity_EventScript_14C998:: @ 814C998 - msgbox FortreeCity_Text_16782C, MSGBOX_NPC +FortreeCity_EventScript_GameboyKid:: @ 814C998 + msgbox FortreeCity_Text_PokemonThatEvolveWhenTraded, MSGBOX_NPC end -FortreeCity_EventScript_14C9A1:: @ 814C9A1 - msgbox FortreeCity_Text_16792F, MSGBOX_SIGN +FortreeCity_EventScript_CitySign:: @ 814C9A1 + msgbox FortreeCity_Text_CitySign, MSGBOX_SIGN end -FortreeCity_EventScript_14C9AA:: @ 814C9AA - msgbox FortreeCity_Text_167969, MSGBOX_SIGN +FortreeCity_EventScript_GymSign:: @ 814C9AA + msgbox FortreeCity_Text_GymSign, MSGBOX_SIGN end -FortreeCity_EventScript_14C9B3:: @ 814C9B3 +FortreeCity_EventScript_Kecleon:: @ 814C9B3 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 - goto_if_eq FortreeCity_EventScript_14C9CF - msgbox FortreeCity_Text_167868, MSGBOX_DEFAULT + goto_if_eq FortreeCity_EventScript_AskUseDevonScope + msgbox FortreeCity_Text_SomethingUnseeable, MSGBOX_DEFAULT release end -FortreeCity_EventScript_14C9CF:: @ 814C9CF - msgbox FortreeCity_Text_16788B, MSGBOX_YESNO +FortreeCity_EventScript_AskUseDevonScope:: @ 814C9CF + msgbox FortreeCity_Text_UnseeableUseDevonScope, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq FortreeCity_EventScript_14C9E4 + goto_if_eq FortreeCity_EventScript_UseDevonScope release end -FortreeCity_EventScript_14C9E4:: @ 814C9E4 - msgbox FortreeCity_Text_1678CB, MSGBOX_DEFAULT +FortreeCity_EventScript_UseDevonScope:: @ 814C9E4 + msgbox FortreeCity_Text_UsedDevonScopePokemonFled, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 @@ -78,13 +78,13 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 playmoncry SPECIES_KECLEON, 2 delay 40 waitmoncry - applymovement VAR_LAST_TALKED, FortreeCity_Movement_14CA13 + applymovement VAR_LAST_TALKED, FortreeCity_Movement_KecleonFlee waitmovement 0 removeobject VAR_LAST_TALKED setflag FLAG_KECLEON_FLED_FORTREE release end -FortreeCity_Movement_14CA13:: @ 814CA13 +FortreeCity_Movement_KecleonFlee:: @ 814CA13 walk_right step_end diff --git a/data/maps/FortreeCity/text.inc b/data/maps/FortreeCity/text.inc index 795fdcbc2..338d9bec2 100644 --- a/data/maps/FortreeCity/text.inc +++ b/data/maps/FortreeCity/text.inc @@ -1,25 +1,25 @@ -FortreeCity_Text_167577:: @ 8167577 +FortreeCity_Text_YouSmellSinged:: @ 8167577 .string "Sniff...\n" .string "Um... You, uh...smell singed.\p" .string "Were you at a volcano or something?$" -FortreeCity_Text_1675C2:: @ 81675C2 +FortreeCity_Text_SomethingBlockingGym:: @ 81675C2 .string "I want to go to the POKéMON GYM, but\n" .string "something's blocking the way.\p" .string "After all the bother I went through\n" .string "training on ROUTE 120...$" -FortreeCity_Text_167642:: @ 8167642 +FortreeCity_Text_ThisTimeIllBeatWinona:: @ 8167642 .string "I've got my pride-and-joy POKéMON\n" .string "with me. This time, I'll beat WINONA.$" -FortreeCity_Text_16768A:: @ 816768A +FortreeCity_Text_TreesGrowByDrinkingRainwater:: @ 816768A .string "The ground absorbs rainwater, and\n" .string "trees grow by drinking that water...\p" .string "Our FORTREE CITY exists because\n" .string "there's both water and soil.$" -FortreeCity_Text_16770E:: @ 816770E +FortreeCity_Text_EveryoneHealthyAndLively:: @ 816770E .string "The CITY consists of homes built on\n" .string "trees.\p" .string "Perhaps because of that lifestyle,\n" @@ -27,35 +27,35 @@ FortreeCity_Text_16770E:: @ 816770E .string "Why, even myself - I feel as if I've\n" .string "grown thirty years younger.$" -FortreeCity_Text_1677BD:: @ 81677BD +FortreeCity_Text_BugPokemonComeThroughWindow:: @ 81677BD .string "Living on top of trees is okay.\p" .string "But sometimes BUG POKéMON come in\n" .string "through windows.\l" .string "It can be really startling.$" -FortreeCity_Text_16782C:: @ 816782C +FortreeCity_Text_PokemonThatEvolveWhenTraded:: @ 816782C .string "Some POKéMON evolve when they go\n" .string "through a Game Link cable.$" -FortreeCity_Text_167868:: @ 8167868 +FortreeCity_Text_SomethingUnseeable:: @ 8167868 .string "Something unseeable is in the way.$" -FortreeCity_Text_16788B:: @ 816788B +FortreeCity_Text_UnseeableUseDevonScope:: @ 816788B .string "Something unseeable is in the way.\p" .string "Want to use the DEVON SCOPE?$" -FortreeCity_Text_1678CB:: @ 81678CB +FortreeCity_Text_UsedDevonScopePokemonFled:: @ 81678CB .string "{PLAYER} used the DEVON SCOPE.\p" .string "An invisible POKéMON became completely\n" .string "visible!\p" .string "The startled POKéMON fled!$" -FortreeCity_Text_16792F:: @ 816792F +FortreeCity_Text_CitySign:: @ 816792F .string "FORTREE CITY\n" .string "“The treetop city that frolics with\l" .string "nature.”$" -FortreeCity_Text_167969:: @ 8167969 +FortreeCity_Text_GymSign:: @ 8167969 .string "FORTREE CITY POKéMON GYM\n" .string "LEADER: WINONA\p" .string "“The bird user taking flight into\n" diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index bd4004dcf..604f68fed 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_158258", + "script": "FortreeCity_DecorationShop_EventScript_PokefanM", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_158261", + "script": "FortreeCity_DecorationShop_EventScript_Girl", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_15826A", + "script": "FortreeCity_DecorationShop_EventScript_ClerkDesks", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_158298", + "script": "FortreeCity_DecorationShop_EventScript_ClerkChairs", "flag": "0" } ], diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index ec7a9a7cb..36fdf157d 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -1,26 +1,26 @@ FortreeCity_DecorationShop_MapScripts:: @ 8158257 .byte 0 -FortreeCity_DecorationShop_EventScript_158258:: @ 8158258 - msgbox FortreeCity_DecorationShop_Text_186A61, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_PokefanM:: @ 8158258 + msgbox FortreeCity_DecorationShop_Text_MerchandiseSentToPC, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_158261:: @ 8158261 - msgbox FortreeCity_DecorationShop_Text_186AD6, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_Girl:: @ 8158261 + msgbox FortreeCity_DecorationShop_Text_BuyingDeskForDolls, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A +FortreeCity_DecorationShop_EventScript_ClerkDesks:: @ 815826A lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration FortreeCity_DecorationShop_Decorations1 + pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Desks msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -FortreeCity_DecorationShop_Decorations1:: @ 8158284 +FortreeCity_DecorationShop_PokemartDecor_Desks:: @ 8158284 .2byte DECOR_SMALL_DESK .2byte DECOR_POKEMON_DESK .2byte DECOR_HEAVY_DESK @@ -33,18 +33,18 @@ FortreeCity_DecorationShop_Decorations1:: @ 8158284 release end -FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 +FortreeCity_DecorationShop_EventScript_ClerkChairs:: @ 8158298 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration FortreeCity_DecorationShop_Decorations2 + pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Chairs msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -FortreeCity_DecorationShop_Decorations2:: @ 81582B0 +FortreeCity_DecorationShop_PokemartDecor_Chairs:: @ 81582B0 .2byte DECOR_SMALL_CHAIR .2byte DECOR_POKEMON_CHAIR .2byte DECOR_HEAVY_CHAIR diff --git a/data/maps/FortreeCity_DecorationShop/text.inc b/data/maps/FortreeCity_DecorationShop/text.inc index 7673c0eea..1830cded6 100644 --- a/data/maps/FortreeCity_DecorationShop/text.inc +++ b/data/maps/FortreeCity_DecorationShop/text.inc @@ -1,10 +1,10 @@ -FortreeCity_DecorationShop_Text_186A61:: @ 8186A61 +FortreeCity_DecorationShop_Text_MerchandiseSentToPC:: @ 8186A61 .string "Merchandise you buy here is sent to\n" .string "your own PC.\p" .string "That's fantastic! I wish they could\n" .string "also deliver me home like that.$" -FortreeCity_DecorationShop_Text_186AD6:: @ 8186AD6 +FortreeCity_DecorationShop_Text_BuyingDeskForDolls:: @ 8186AD6 .string "I'm buying a pretty desk and I'm\n" .string "putting my cute DOLLS on it.\p" .string "If I don't, when I decorate my\n" diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index 6a4def216..76621e475 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Gym_EventScript_157EF0", + "script": "FortreeCity_Gym_EventScript_Winona", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "FortreeCity_Gym_EventScript_157F62", + "script": "FortreeCity_Gym_EventScript_Jared", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "FortreeCity_Gym_EventScript_157F90", + "script": "FortreeCity_Gym_EventScript_Terrell", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", - "script": "FortreeCity_Gym_EventScript_157FA7", + "script": "FortreeCity_Gym_EventScript_Kylee", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "FortreeCity_Gym_EventScript_157F79", + "script": "FortreeCity_Gym_EventScript_Will", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Gym_EventScript_157FBE", + "script": "FortreeCity_Gym_EventScript_GymGuide", "flag": "0" } ], @@ -114,7 +114,7 @@ "y": 21, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_Gym_EventScript_157FDD" + "script": "FortreeCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -122,7 +122,7 @@ "y": 21, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_Gym_EventScript_157FED" + "script": "FortreeCity_Gym_EventScript_RightGymStatue" } ] } diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 5501546d1..b0df36839 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,99 +1,99 @@ FortreeCity_Gym_MapScripts:: @ 8157ED3 - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_157EDE - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_157EE2 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_OnWarp .byte 0 -FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE +FortreeCity_Gym_OnTransition:: @ 8157EDE special RotatingGate_InitPuzzle end -FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2 - map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_157EEC +FortreeCity_Gym_OnWarp:: @ 8157EE2 + map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_InitRotatingGates .2byte 0 -FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC +FortreeCity_Gym_EventScript_InitRotatingGates:: @ 8157EEC special RotatingGate_InitPuzzleAndGraphics end -FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 - trainerbattle_single TRAINER_WINONA, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15, NO_MUSIC - goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E - msgbox FortreeCity_Gym_Text_185F98, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_Winona:: @ 8157EF0 + trainerbattle_single TRAINER_WINONA, FortreeCity_Gym_Text_WinonaIntro, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC + goto_if_unset FLAG_RECEIVED_TM_AERIAL_ACE, FortreeCity_Gym_EventScript_GiveAerialAce2 + msgbox FortreeCity_Gym_Text_WinonaPostBattle, MSGBOX_DEFAULT release end -FortreeCity_Gym_EventScript_157F15:: @ 8157F15 - message FortreeCity_Gym_Text_185E48 +FortreeCity_Gym_EventScript_WinonaDefeated:: @ 8157F15 + message FortreeCity_Gym_Text_ReceivedFeatherBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox FortreeCity_Gym_Text_185E73, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 call Common_EventScript_SetGymTrainers - goto FortreeCity_Gym_EventScript_157F3E + goto FortreeCity_Gym_EventScript_GiveAerialAce2 end -FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E +FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8157F3E giveitem ITEM_TM40_AERIAL_ACE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox FortreeCity_Gym_Text_185F4A, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM40 + msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_AERIAL_ACE release end -FortreeCity_Gym_EventScript_157F62:: @ 8157F62 - trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA - msgbox FortreeCity_Gym_Text_185A02, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Jared:: @ 8157F62 + trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredIntro, FortreeCity_Gym_Text_JaredDefeat + msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_157F79:: @ 8157F79 - trainerbattle_single TRAINER_WILL, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC - msgbox FortreeCity_Gym_Text_185B18, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Will:: @ 8157F79 + trainerbattle_single TRAINER_WILL, FortreeCity_Gym_Text_WillIntro, FortreeCity_Gym_Text_WillDefeat + msgbox FortreeCity_Gym_Text_WillPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_157F90:: @ 8157F90 - trainerbattle_single TRAINER_TERRELL, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB - msgbox FortreeCity_Gym_Text_185C00, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Terrell:: @ 8157F90 + trainerbattle_single TRAINER_TERRELL, FortreeCity_Gym_Text_TerrellIntro, FortreeCity_Gym_Text_TerrellDefeat + msgbox FortreeCity_Gym_Text_TerrellPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 - trainerbattle_single TRAINER_KYLEE, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C - msgbox FortreeCity_Gym_Text_185C8C, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Kylee:: @ 8157FA7 + trainerbattle_single TRAINER_KYLEE, FortreeCity_Gym_Text_KyleeIntro, FortreeCity_Gym_Text_KyleeDefeat + msgbox FortreeCity_Gym_Text_KyleePostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE +FortreeCity_Gym_EventScript_GymGuide:: @ 8157FBE lock faceplayer - goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_157FD3 - msgbox FortreeCity_Gym_Text_18589C, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_GymGuidePostVictory + msgbox FortreeCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 - msgbox FortreeCity_Gym_Text_185994, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_GymGuidePostVictory:: @ 8157FD3 + msgbox FortreeCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD +FortreeCity_Gym_EventScript_LeftGymStatue:: @ 8157FDD lockall - goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD - goto FortreeCity_Gym_EventScript_158007 + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified + goto FortreeCity_Gym_EventScript_GymStatue end -FortreeCity_Gym_EventScript_157FED:: @ 8157FED +FortreeCity_Gym_EventScript_RightGymStatue:: @ 8157FED lockall - goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD - goto FortreeCity_Gym_EventScript_158007 + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified + goto FortreeCity_Gym_EventScript_GymStatue end -FortreeCity_Gym_EventScript_157FFD:: @ 8157FFD - msgbox FortreeCity_Gym_Text_185FEE, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_GymStatueCertified:: @ 8157FFD + msgbox FortreeCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -FortreeCity_Gym_EventScript_158007:: @ 8158007 - msgbox FortreeCity_Gym_Text_185FD5, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_GymStatue:: @ 8158007 + msgbox FortreeCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/FortreeCity_Gym/text.inc b/data/maps/FortreeCity_Gym/text.inc index a63fa957f..285540cd6 100644 --- a/data/maps/FortreeCity_Gym/text.inc +++ b/data/maps/FortreeCity_Gym/text.inc @@ -1,4 +1,4 @@ -FortreeCity_Gym_Text_18589C:: @ 818589C +FortreeCity_Gym_Text_GymGuideAdvice:: @ 818589C .string "Yo, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "FORTREE GYM LEADER WINONA is a\n" @@ -9,66 +9,66 @@ FortreeCity_Gym_Text_18589C:: @ 818589C .string "are trying to take wing!\p" .string "Okay, go for it!$" -FortreeCity_Gym_Text_185994:: @ 8185994 +FortreeCity_Gym_Text_GymGuidePostVictory:: @ 8185994 .string "You did it!\n" .string "You've achieved liftoff!$" -FortreeCity_Gym_Text_1859B9:: @ 81859B9 +FortreeCity_Gym_Text_JaredIntro:: @ 81859B9 .string "Behold the elegant battle style of\n" .string "BIRD POKéMON!$" -FortreeCity_Gym_Text_1859EA:: @ 81859EA +FortreeCity_Gym_Text_JaredDefeat:: @ 81859EA .string "You...\n" .string "You're strong...$" -FortreeCity_Gym_Text_185A02:: @ 8185A02 +FortreeCity_Gym_Text_JaredPostBattle:: @ 8185A02 .string "A TRAINER has to be smart to keep\n" .string "up with unexpected turns of events.\p" .string "Let's see if you have the smarts to\n" .string "get to our LEADER?$" -FortreeCity_Gym_Text_185A7F:: @ 8185A7F +FortreeCity_Gym_Text_WillIntro:: @ 8185A7F .string "The lovers of BIRD POKéMON aspire\n" .string "to join this GYM.\p" .string "As a member of the FORTREE GYM,\n" .string "I'm not allowed to lose!$" -FortreeCity_Gym_Text_185AEC:: @ 8185AEC +FortreeCity_Gym_Text_WillDefeat:: @ 8185AEC .string "It was too much of a load for me\n" .string "to bear...$" -FortreeCity_Gym_Text_185B18:: @ 8185B18 +FortreeCity_Gym_Text_WillPostBattle:: @ 8185B18 .string "The world is huge, and there are\n" .string "countless tough TRAINERS.\p" .string "I'm going to keep training and make\n" .string "myself even stronger.$" -FortreeCity_Gym_Text_185B8D:: @ 8185B8D +FortreeCity_Gym_Text_TerrellIntro:: @ 8185B8D .string "There's no need for WINONA, our GYM\n" .string "LEADER, to deal with you!\p" .string "I'm plenty good enough for you!$" -FortreeCity_Gym_Text_185BEB:: @ 8185BEB +FortreeCity_Gym_Text_TerrellDefeat:: @ 8185BEB .string "WINONA, I...\n" .string "I lost!$" -FortreeCity_Gym_Text_185C00:: @ 8185C00 +FortreeCity_Gym_Text_TerrellPostBattle:: @ 8185C00 .string "WINONA is cute and she's strong.\n" .string "She's the ultimate LEADER!\p" .string "Blush...$" -FortreeCity_Gym_Text_185C45:: @ 8185C45 +FortreeCity_Gym_Text_KyleeIntro:: @ 8185C45 .string "WINONA taught me personally!\n" .string "You can't beat me easily!$" -FortreeCity_Gym_Text_185C7C:: @ 8185C7C +FortreeCity_Gym_Text_KyleeDefeat:: @ 8185C7C .string "I was beaten...$" -FortreeCity_Gym_Text_185C8C:: @ 8185C8C +FortreeCity_Gym_Text_KyleePostBattle:: @ 8185C8C .string "Thanks to WINONA, the people of\n" .string "FORTREE can live without fear.$" -FortreeCity_Gym_Text_185CCB:: @ 8185CCB +FortreeCity_Gym_Text_WinonaIntro:: @ 8185CCB .string "I am WINONA. I am the LEADER of the\n" .string "FORTREE POKéMON GYM.\p" .string "I have become one with BIRD POKéMON\n" @@ -78,18 +78,18 @@ FortreeCity_Gym_Text_185CCB:: @ 8185CCB .string "Witness the elegant choreography\n" .string "of BIRD POKéMON and I!$" -FortreeCity_Gym_Text_185DBA:: @ 8185DBA +FortreeCity_Gym_Text_WinonaDefeat:: @ 8185DBA .string "Never before have I seen a TRAINER\n" .string "command POKéMON with more grace\l" .string "than I...\p" .string "In recognition of your prowess,\n" .string "I present to you this GYM BADGE.$" -FortreeCity_Gym_Text_185E48:: @ 8185E48 +FortreeCity_Gym_Text_ReceivedFeatherBadge:: @ 8185E48 .string "{PLAYER} received the FEATHER BADGE\n" .string "from WINONA.$" -FortreeCity_Gym_Text_185E73:: @ 8185E73 +FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis:: @ 8185E73 .string "With the FEATHER BADGE, all POKéMON up\n" .string "to LV 70, even those received through\l" .string "trades, will obey your every command.\p" @@ -98,19 +98,19 @@ FortreeCity_Gym_Text_185E73:: @ 8185E73 .string "And this...\n" .string "This is a gift from me.$" -FortreeCity_Gym_Text_185F4A:: @ 8185F4A +FortreeCity_Gym_Text_ExplainAerialAce:: @ 8185F4A .string "TM40 contains AERIAL ACE.\p" .string "Its speed...\n" .string "No POKéMON should be able to avoid it.$" -FortreeCity_Gym_Text_185F98:: @ 8185F98 +FortreeCity_Gym_Text_WinonaPostBattle:: @ 8185F98 .string "Though I fell to you, I will remain\n" .string "devoted to BIRD POKéMON.$" -FortreeCity_Gym_Text_185FD5:: @ 8185FD5 +FortreeCity_Gym_Text_GymStatue:: @ 8185FD5 .string "FORTREE CITY POKéMON GYM$" -FortreeCity_Gym_Text_185FEE:: @ 8185FEE +FortreeCity_Gym_Text_GymStatueCertified:: @ 8185FEE .string "FORTREE CITY POKéMON GYM\p" .string "WINONA'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 9afb92218..6a3d9c6d2 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_157E13", + "script": "FortreeCity_House1_EventScript_Trader", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_157EC0", + "script": "FortreeCity_House1_EventScript_Zigzagoon", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_157EB7", + "script": "FortreeCity_House1_EventScript_ExpertF", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 0af969a06..3c054bf5e 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -1,64 +1,64 @@ FortreeCity_House1_MapScripts:: @ 8157E12 .byte 0 -FortreeCity_House1_EventScript_157E13:: @ 8157E13 +FortreeCity_House1_EventScript_Trader:: @ 8157E13 lock faceplayer - goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_157EAD + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_TradeCompleted setvar VAR_0x8008, 1 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox FortreeCity_House1_Text_18568C, MSGBOX_YESNO + msgbox FortreeCity_House1_Text_WouldYouTradeIt, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq FortreeCity_House1_EventScript_157E95 + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade special SelectMonForNPCTrade waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq FortreeCity_House1_EventScript_157E95 + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne FortreeCity_House1_EventScript_157E9F + goto_if_ne FortreeCity_House1_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_1856F7, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_PleaseBeNiceToMon, MSGBOX_DEFAULT setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end -FortreeCity_House1_EventScript_157E95:: @ 8157E95 - msgbox FortreeCity_House1_Text_18577F, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_DeclineTrade:: @ 8157E95 + msgbox FortreeCity_House1_Text_ChangeYourMindSeeMe, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_157E9F:: @ 8157E9F +FortreeCity_House1_EventScript_NotRequestedMon:: @ 8157E9F bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_185737, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_ThatMonIsntAMon, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_157EAD:: @ 8157EAD - msgbox FortreeCity_House1_Text_1857C7, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_TradeCompleted:: @ 8157EAD + msgbox FortreeCity_House1_Text_PromiseToTakeGoodCareOfMon, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_157EB7:: @ 8157EB7 - msgbox FortreeCity_House1_Text_18582A, MSGBOX_NPC +FortreeCity_House1_EventScript_ExpertF:: @ 8157EB7 + msgbox FortreeCity_House1_Text_TradingMemoriesWithOthers, MSGBOX_NPC end -FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 +FortreeCity_House1_EventScript_Zigzagoon:: @ 8157EC0 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House1_Text_185888, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House1/text.inc b/data/maps/FortreeCity_House1/text.inc index 18baa846a..221987017 100644 --- a/data/maps/FortreeCity_House1/text.inc +++ b/data/maps/FortreeCity_House1/text.inc @@ -1,35 +1,35 @@ -FortreeCity_House1_Text_18568C:: @ 818568C +FortreeCity_House1_Text_WouldYouTradeIt:: @ 818568C .string "Hi, there's this POKéMON that I'm\n" .string "looking for.\p" .string "I want a {STR_VAR_1}.\n" .string "Do you have one?\p" .string "Would you trade it for my {STR_VAR_2}?$" -FortreeCity_House1_Text_1856F7:: @ 81856F7 +FortreeCity_House1_Text_PleaseBeNiceToMon:: @ 81856F7 .string "Thank you!\p" .string "I'll be good to your {STR_VAR_1},\n" .string "so please be nice to my {STR_VAR_2}!$" -FortreeCity_House1_Text_185737:: @ 8185737 +FortreeCity_House1_Text_ThatMonIsntAMon:: @ 8185737 .string "Wait!\n" .string "That POKéMON isn't a {STR_VAR_1}.\p" .string "I guess you don't want to trade\n" .string "with me.$" -FortreeCity_House1_Text_18577F:: @ 818577F +FortreeCity_House1_Text_ChangeYourMindSeeMe:: @ 818577F .string "Oh, okay. If you change your mind,\n" .string "please come see me.\p" .string "I'll be waiting!$" -FortreeCity_House1_Text_1857C7:: @ 81857C7 +FortreeCity_House1_Text_PromiseToTakeGoodCareOfMon:: @ 81857C7 .string "Thank you for trading with me!\p" .string "I really wanted this POKéMON, so\n" .string "I promise to take good care of it!$" -FortreeCity_House1_Text_18582A:: @ 818582A +FortreeCity_House1_Text_TradingMemoriesWithOthers:: @ 818582A .string "Trading POKéMON with others...\p" .string "It's as if you're trading your own\n" .string "memories with other people.$" -FortreeCity_House1_Text_185888:: @ 8185888 +FortreeCity_House1_Text_Zigzagoon:: @ 8185888 .string "ZIGZAGOON: Gumomoh?$" diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index a8eb007b4..6c4827c9c 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House2_EventScript_1580B4", + "script": "FortreeCity_House2_EventScript_HiddenPowerGiver", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 815c98f60..c5bde677c 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -1,43 +1,43 @@ FortreeCity_House2_MapScripts:: @ 81580B3 .byte 0 -FortreeCity_House2_EventScript_1580B4:: @ 81580B4 +FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 81580B4 lock faceplayer - goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_158157 - call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_15814B - msgbox FortreeCity_House2_Text_186360, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_ExplainHiddenPower + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_Greeting + msgbox FortreeCity_House2_Text_CoinInWhichHand, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_158161 - msgbox FortreeCity_House2_Text_1863F6, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_158161 - msgbox FortreeCity_House2_Text_186455, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand2, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT - case 0, FortreeCity_House2_EventScript_158161 - msgbox FortreeCity_House2_Text_1864C6, MSGBOX_DEFAULT + case 0, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_YourHiddenPowerHasAwoken, MSGBOX_DEFAULT giveitem ITEM_TM10_HIDDEN_POWER compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 - msgbox FortreeCity_House2_Text_18652F, MSGBOX_DEFAULT + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_15814B:: @ 815814B - msgbox FortreeCity_House2_Text_186306, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_Greeting:: @ 815814B + msgbox FortreeCity_House2_Text_HiddenPowersArousedByNature, MSGBOX_DEFAULT setflag FLAG_MET_HIDDEN_POWER_GIVER return -FortreeCity_House2_EventScript_158157:: @ 8158157 - msgbox FortreeCity_House2_Text_18652F, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_ExplainHiddenPower:: @ 8158157 + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_158161:: @ 8158161 - msgbox FortreeCity_House2_Text_186565, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_WrongGuess:: @ 8158161 + msgbox FortreeCity_House2_Text_YouGuessedWrong, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_House2/text.inc b/data/maps/FortreeCity_House2/text.inc index bf57a3ee6..8ea1da0cc 100644 --- a/data/maps/FortreeCity_House2/text.inc +++ b/data/maps/FortreeCity_House2/text.inc @@ -1,38 +1,38 @@ -FortreeCity_House2_Text_186306:: @ 8186306 +FortreeCity_House2_Text_HiddenPowersArousedByNature:: @ 8186306 .string "People... POKéMON...\p" .string "Their hidden powers are aroused by\n" .string "living in natural environments...$" -FortreeCity_House2_Text_186360:: @ 8186360 +FortreeCity_House2_Text_CoinInWhichHand:: @ 8186360 .string "Let this old woman see if your hidden\n" .string "power has awoken...\p" .string "I hold a coin in my hand.\p" .string "Now, tell me, have I palmed it in the\n" .string "right hand? Or in the left?$" -FortreeCity_House2_Text_1863F6:: @ 81863F6 +FortreeCity_House2_Text_CorrectTryAgainWhichHand:: @ 81863F6 .string "Oh! Yes, correct!\p" .string "We shall try again.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left?$" -FortreeCity_House2_Text_186455:: @ 8186455 +FortreeCity_House2_Text_CorrectTryAgainWhichHand2:: @ 8186455 .string "Oh! Yes, correct again!\p" .string "We shall try once more.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left? Choose!$" -FortreeCity_House2_Text_1864C6:: @ 81864C6 +FortreeCity_House2_Text_YourHiddenPowerHasAwoken:: @ 81864C6 .string "Oh! Splendid!\n" .string "Your hidden power has awoken!\p" .string "Here, take this and awaken the hidden\n" .string "power of your POKéMON.$" -FortreeCity_House2_Text_18652F:: @ 818652F +FortreeCity_House2_Text_ExplainHiddenPower:: @ 818652F .string "HIDDEN POWER is a move that changes\n" .string "with the POKéMON.$" -FortreeCity_House2_Text_186565:: @ 8186565 +FortreeCity_House2_Text_YouGuessedWrong:: @ 8186565 .string "No, too bad.\n" .string "You guessed wrong.$" diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index ba1f04b2c..ce546cf9d 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_15816C", + "script": "FortreeCity_House3_EventScript_Maniac", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_158175", + "script": "FortreeCity_House3_EventScript_SchoolKidM", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc index 3786fe5cf..52b6e786d 100644 --- a/data/maps/FortreeCity_House3/scripts.inc +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -1,10 +1,10 @@ FortreeCity_House3_MapScripts:: @ 815816B .byte 0 -FortreeCity_House3_EventScript_15816C:: @ 815816C - msgbox FortreeCity_House3_Text_186624, MSGBOX_NPC +FortreeCity_House3_EventScript_Maniac:: @ 815816C + msgbox FortreeCity_House3_Text_MetStevenHadAmazingPokemon, MSGBOX_NPC end -FortreeCity_House3_EventScript_158175:: @ 8158175 - msgbox FortreeCity_House3_Text_186745, MSGBOX_NPC +FortreeCity_House3_EventScript_SchoolKidM:: @ 8158175 + msgbox FortreeCity_House3_Text_OhYouHavePokedex, MSGBOX_NPC end diff --git a/data/maps/FortreeCity_House3/text.inc b/data/maps/FortreeCity_House3/text.inc index db8d4ae97..6ffdee9a1 100644 --- a/data/maps/FortreeCity_House3/text.inc +++ b/data/maps/FortreeCity_House3/text.inc @@ -1,4 +1,4 @@ -FortreeCity_House3_Text_186624:: @ 8186624 +FortreeCity_House3_Text_MetStevenHadAmazingPokemon:: @ 8186624 .string "Speaking of POKéDEXES, I remembered\n" .string "something.\p" .string "I met this TRAINER, STEVEN, when\n" @@ -10,7 +10,7 @@ FortreeCity_House3_Text_186624:: @ 8186624 .string "He might even be stronger than the\n" .string "GYM LEADER in this town...$" -FortreeCity_House3_Text_186745:: @ 8186745 +FortreeCity_House3_Text_OhYouHavePokedex:: @ 8186745 .string "What's that thing you have there?\p" .string "... ... ... ... ... ...\p" .string "Oh, it's called a POKéDEX?\n" diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index ce27f0e83..ba50ef7ee 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_15817F", + "script": "FortreeCity_House4_EventScript_Woman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_158188", + "script": "FortreeCity_House4_EventScript_Boy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_15821E", + "script": "FortreeCity_House4_EventScript_Wingull", "flag": "FLAG_HIDE_WINGULL_FORTREE_HOUSE" } ], diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 3e3d0948e..6230881e1 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -1,36 +1,36 @@ FortreeCity_House4_MapScripts:: @ 815817E .byte 0 -FortreeCity_House4_EventScript_15817F:: @ 815817F - msgbox FortreeCity_House4_Text_1867AF, MSGBOX_NPC +FortreeCity_House4_EventScript_Woman:: @ 815817F + msgbox FortreeCity_House4_Text_BringsWorldCloserTogether, MSGBOX_NPC end -FortreeCity_House4_EventScript_158188:: @ 8158188 +FortreeCity_House4_EventScript_Boy:: @ 8158188 lockall - goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204 - goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6 - goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2 - msgbox FortreeCity_House4_Text_186835, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_ReceivedMentalHerb + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_WingullReturned + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_WingullOnErrand + msgbox FortreeCity_House4_Text_GoBirdPokemon, MSGBOX_DEFAULT closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE - applymovement 3, FortreeCity_House4_Movement_158218 + applymovement 3, FortreeCity_House4_Movement_WingullExit waitmovement 0 removeobject 3 releaseall end -FortreeCity_House4_EventScript_1581C2:: @ 81581C2 +FortreeCity_House4_EventScript_WingullOnErrand:: @ 81581C2 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_18684E, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_AskedWingullToRunErrand, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_EventScript_1581D6:: @ 81581D6 +FortreeCity_House4_EventScript_WingullReturned:: @ 81581D6 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_186881, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT giveitem ITEM_MENTAL_HERB compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -38,14 +38,14 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 releaseall end -FortreeCity_House4_EventScript_158204:: @ 8158204 +FortreeCity_House4_EventScript_ReceivedMentalHerb:: @ 8158204 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_186924, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_FriendsFarAwayThanksToWingull, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_Movement_158218:: @ 8158218 +FortreeCity_House4_Movement_WingullExit:: @ 8158218 walk_fast_down walk_fast_down walk_fast_right @@ -53,12 +53,12 @@ FortreeCity_House4_Movement_158218:: @ 8158218 delay_8 step_end -FortreeCity_House4_EventScript_15821E:: @ 815821E +FortreeCity_House4_EventScript_Wingull:: @ 815821E lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox FortreeCity_House4_Text_18695C, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_Wingull, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House4/text.inc b/data/maps/FortreeCity_House4/text.inc index 9de8a7d19..e270856de 100644 --- a/data/maps/FortreeCity_House4/text.inc +++ b/data/maps/FortreeCity_House4/text.inc @@ -1,18 +1,18 @@ -FortreeCity_House4_Text_1867AF:: @ 81867AF +FortreeCity_House4_Text_BringsWorldCloserTogether:: @ 81867AF .string "By being together with POKéMON,\n" .string "people make more and more friends.\p" .string "And that brings the world closer\n" .string "together. I think it's wonderful!$" -FortreeCity_House4_Text_186835:: @ 8186835 +FortreeCity_House4_Text_GoBirdPokemon:: @ 8186835 .string "There!\n" .string "Go, BIRD POKéMON!$" -FortreeCity_House4_Text_18684E:: @ 818684E +FortreeCity_House4_Text_AskedWingullToRunErrand:: @ 818684E .string "Heheh, I asked my WINGULL to run an\n" .string "errand for me.$" -FortreeCity_House4_Text_186881:: @ 8186881 +FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb:: @ 8186881 .string "Good!\n" .string "Welcome back, WINGULL!\p" .string "Huh? What is this?\n" @@ -22,9 +22,9 @@ FortreeCity_House4_Text_186881:: @ 8186881 .string "But I'm not a TRAINER, so you can\n" .string "have it.$" -FortreeCity_House4_Text_186924:: @ 8186924 +FortreeCity_House4_Text_FriendsFarAwayThanksToWingull:: @ 8186924 .string "Thanks to my WINGULL, I have friends\n" .string "who live far away.$" -FortreeCity_House4_Text_18695C:: @ 818695C +FortreeCity_House4_Text_Wingull:: @ 818695C .string "WINGULL: Pihyoh!$" diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 5db037c20..78c597e35 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_158232", + "script": "FortreeCity_House5_EventScript_PokefanF", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_158244", + "script": "FortreeCity_House5_EventScript_Zigzagoon", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_15823B", + "script": "FortreeCity_House5_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc index 3b4b1d436..64d477bda 100644 --- a/data/maps/FortreeCity_House5/scripts.inc +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -1,20 +1,20 @@ FortreeCity_House5_MapScripts:: @ 8158231 .byte 0 -FortreeCity_House5_EventScript_158232:: @ 8158232 - msgbox FortreeCity_House5_Text_18696D, MSGBOX_NPC +FortreeCity_House5_EventScript_PokefanF:: @ 8158232 + msgbox FortreeCity_House5_Text_TreeHousesAreGreat, MSGBOX_NPC end -FortreeCity_House5_EventScript_15823B:: @ 815823B - msgbox FortreeCity_House5_Text_1869D6, MSGBOX_NPC +FortreeCity_House5_EventScript_Man:: @ 815823B + msgbox FortreeCity_House5_Text_AdaptedToNature, MSGBOX_NPC end -FortreeCity_House5_EventScript_158244:: @ 8158244 +FortreeCity_House5_EventScript_Zigzagoon:: @ 8158244 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House5_Text_186A4F, MSGBOX_DEFAULT + msgbox FortreeCity_House5_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House5/text.inc b/data/maps/FortreeCity_House5/text.inc index a2c7a2315..f344ea09a 100644 --- a/data/maps/FortreeCity_House5/text.inc +++ b/data/maps/FortreeCity_House5/text.inc @@ -1,13 +1,13 @@ -FortreeCity_House5_Text_18696D:: @ 818696D +FortreeCity_House5_Text_TreeHousesAreGreat:: @ 818696D .string "The tree houses of FORTREE are great!\p" .string "I think it's the number one town for\n" .string "living together with POKéMON.$" -FortreeCity_House5_Text_1869D6:: @ 81869D6 +FortreeCity_House5_Text_AdaptedToNature:: @ 81869D6 .string "POKéMON and people have adapted to\n" .string "nature to survive.\p" .string "There's no need to make nature\n" .string "conform to the way we want to live.$" -FortreeCity_House5_Text_186A4F:: @ 8186A4F +FortreeCity_House5_Text_Zigzagoon:: @ 8186A4F .string "ZIGZAGOON: Bufuu!$" diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index f36f58635..6776862c3 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_158067", + "script": "FortreeCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_158098", + "script": "FortreeCity_Mart_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_1580A1", + "script": "FortreeCity_Mart_EventScript_Girl", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_1580AA", + "script": "FortreeCity_Mart_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index c41d5edae..d7ce0849d 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -1,7 +1,7 @@ FortreeCity_Mart_MapScripts:: @ 8158066 .byte 0 -FortreeCity_Mart_EventScript_158067:: @ 8158067 +FortreeCity_Mart_EventScript_Clerk:: @ 8158067 lock faceplayer message Text_HowMayIServeYou @@ -27,14 +27,14 @@ FortreeCity_Mart_Items:: @ 8158080 release end -FortreeCity_Mart_EventScript_158098:: @ 8158098 - msgbox FortreeCity_Mart_Text_1861EF, MSGBOX_NPC +FortreeCity_Mart_EventScript_Woman:: @ 8158098 + msgbox FortreeCity_Mart_Text_SuperRepelBetter, MSGBOX_NPC end -FortreeCity_Mart_EventScript_1580A1:: @ 81580A1 - msgbox FortreeCity_Mart_Text_186251, MSGBOX_NPC +FortreeCity_Mart_EventScript_Girl:: @ 81580A1 + msgbox FortreeCity_Mart_Text_StockUpOnItems, MSGBOX_NPC end -FortreeCity_Mart_EventScript_1580AA:: @ 81580AA - msgbox FortreeCity_Mart_Text_1862CA, MSGBOX_NPC +FortreeCity_Mart_EventScript_Boy:: @ 81580AA + msgbox FortreeCity_Mart_Text_RareCandyMakesMonGrow, MSGBOX_NPC end diff --git a/data/maps/FortreeCity_Mart/text.inc b/data/maps/FortreeCity_Mart/text.inc index 244826911..af57db78f 100644 --- a/data/maps/FortreeCity_Mart/text.inc +++ b/data/maps/FortreeCity_Mart/text.inc @@ -1,15 +1,15 @@ -FortreeCity_Mart_Text_1861EF:: @ 81861EF +FortreeCity_Mart_Text_SuperRepelBetter:: @ 81861EF .string "SUPER REPEL lasts a long time, and\n" .string "it gets the job done.\p" .string "It's much better than an ordinary\n" .string "REPEL.$" -FortreeCity_Mart_Text_186251:: @ 8186251 +FortreeCity_Mart_Text_StockUpOnItems:: @ 8186251 .string "I always stock up on more items than\n" .string "I'm sure I'll need.\p" .string "You never know what might happen.\n" .string "Better to be safe than sorry!$" -FortreeCity_Mart_Text_1862CA:: @ 81862CA +FortreeCity_Mart_Text_RareCandyMakesMonGrow:: @ 81862CA .string "A RARE CANDY makes a POKéMON grow\n" .string "immediately by one level.$" diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index a99395fab..6e001da35 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_15801B", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_158029", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_158032", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_15803B", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 90b74adc0..3b4872a28 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,12 +1,12 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_158017 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition .byte 0 -FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 +FortreeCity_PokemonCenter_1F_OnTransition:: @ 8158017 setrespawn HEAL_LOCATION_FORTREE_CITY end -FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B +FortreeCity_PokemonCenter_1F_EventScript_Nurse:: @ 815801B setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -14,14 +14,14 @@ FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B release end -FortreeCity_PokemonCenter_1F_EventScript_158029:: @ 8158029 - msgbox FortreeCity_PokemonCenter_1F_Text_186027, MSGBOX_NPC +FortreeCity_PokemonCenter_1F_EventScript_Gentleman:: @ 8158029 + msgbox FortreeCity_PokemonCenter_1F_Text_GoToSafariZone, MSGBOX_NPC end -FortreeCity_PokemonCenter_1F_EventScript_158032:: @ 8158032 - msgbox FortreeCity_PokemonCenter_1F_Text_186086, MSGBOX_NPC +FortreeCity_PokemonCenter_1F_EventScript_Man:: @ 8158032 + msgbox FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat, MSGBOX_NPC end -FortreeCity_PokemonCenter_1F_EventScript_15803B:: @ 815803B - msgbox FortreeCity_PokemonCenter_1F_Text_186138, MSGBOX_NPC +FortreeCity_PokemonCenter_1F_EventScript_Boy:: @ 815803B + msgbox FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav, MSGBOX_NPC end diff --git a/data/maps/FortreeCity_PokemonCenter_1F/text.inc b/data/maps/FortreeCity_PokemonCenter_1F/text.inc index 7cfdb10bd..aa75c9239 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/text.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -FortreeCity_PokemonCenter_1F_Text_186027:: @ 8186027 +FortreeCity_PokemonCenter_1F_Text_GoToSafariZone:: @ 8186027 .string "Listen, kid, are you working\n" .string "on a POKéDEX?\p" .string "Hmm... Go to the SAFARI ZONE.\n" .string "That's my suggestion.$" -FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 +FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat:: @ 8186086 .string "Have you done anything at the\n" .string "RECORD CORNER?\p" .string "It's pretty neat. It mixes and matches\n" @@ -12,7 +12,7 @@ FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 .string "I don't know quite how it works,\n" .string "but it's cool. It's exciting, even!$" -FortreeCity_PokemonCenter_1F_Text_186138:: @ 8186138 +FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav:: @ 8186138 .string "Hey, you've got a POKéNAV!\n" .string "It's the same as mine.\p" .string "Check out the TRAINER'S EYES on it.\p" diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 07d912f50..fdc98f09c 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -27,7 +27,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_14E751", + "script": "LavaridgeTown_EventScript_ExpertF", "flag": "0" }, { @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_14E724", + "script": "LavaridgeTown_EventScript_ExpertM", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_14E72D", + "script": "LavaridgeTown_EventScript_OldMan", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_14E736", + "script": "LavaridgeTown_EventScript_Twin", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_14E73F", + "script": "LavaridgeTown_EventScript_HotSpringsOldWoman1", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_14E748", + "script": "LavaridgeTown_EventScript_HotSpringsOldWoman2", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_EventScript_14E75A", + "script": "LavaridgeTown_EventScript_EggWoman", "flag": "0" } ], @@ -187,7 +187,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "LavaridgeTown_EventScript_14E710" + "script": "LavaridgeTown_EventScript_HotSpringsTrigger" } ], "bg_events": [ @@ -197,7 +197,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LavaridgeTown_EventScript_14E7D7" + "script": "LavaridgeTown_EventScript_HerbShopSign" }, { "type": "sign", @@ -205,7 +205,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LavaridgeTown_EventScript_14E7C5" + "script": "LavaridgeTown_EventScript_GymSign" }, { "type": "sign", @@ -221,7 +221,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LavaridgeTown_EventScript_14E7BC" + "script": "LavaridgeTown_EventScript_TownSign" }, { "type": "sign", @@ -253,7 +253,7 @@ "y": 5, "elevation": 3, "item": "ITEM_ICE_HEAL", - "flag": "FLAG_HIDDEN_ITEM_0" + "flag": "FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL" } ] } diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index e1df17572..af48936bc 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,37 +1,37 @@ LavaridgeTown_MapScripts:: @ 814E4A3 - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_14E4AE - map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_14E4E3 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_OnFrame .byte 0 -LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE +LavaridgeTown_OnTransition:: @ 814E4AE setflag FLAG_VISITED_LAVARIDGE_TOWN - call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF + call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_ShowMtChimneyTrainers call Common_EventScript_SetupRivalGfxId call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_LAVARIDGE_RIVAL_STATE, 2 - call_if_eq LavaridgeTown_EventScript_14E4D0 + call_if_eq LavaridgeTown_EventScript_SetRivalPos end -LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 +LavaridgeTown_EventScript_SetRivalPos:: @ 814E4D0 setobjectxyperm 8, 11, 9 setobjectxyperm 7, 11, 9 return -LavaridgeTown_EventScript_14E4DF:: @ 814E4DF +LavaridgeTown_EventScript_ShowMtChimneyTrainers:: @ 814E4DF clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE return -LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 - map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_14E4ED +LavaridgeTown_OnFrame:: @ 814E4E3 + map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_RivalGiveGoGoggles .2byte 0 -LavaridgeTown_EventScript_14E4ED:: @ 814E4ED +LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 814E4ED lockall setvar VAR_0x8008, 1 opendoor 12, 15 waitdooranim addobject 8 - applymovement 8, LavaridgeTown_Movement_14E70E + applymovement 8, LavaridgeTown_Movement_RivalExitHerbShop waitmovement 0 closedoor 12, 15 waitdooranim @@ -44,23 +44,23 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitmovement 0 checkplayergender compare VAR_RESULT, 0 - call_if_eq LavaridgeTown_EventScript_14E56B + call_if_eq LavaridgeTown_EventScript_PlayMayMusic compare VAR_RESULT, 1 - call_if_eq LavaridgeTown_EventScript_14E570 + call_if_eq LavaridgeTown_EventScript_PlayBrendanMusic compare VAR_0x8008, 1 - call_if_eq LavaridgeTown_EventScript_14E68F + call_if_eq LavaridgeTown_EventScript_RivalApproachPlayerFromHerbShop checkplayergender compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_EventScript_14E5AB + goto_if_eq LavaridgeTown_EventScript_MayGiveGoGoggles compare VAR_RESULT, 1 - goto_if_eq LavaridgeTown_EventScript_14E5D0 + goto_if_eq LavaridgeTown_EventScript_BrendanGiveGoGoggles end -LavaridgeTown_EventScript_14E56B:: @ 814E56B +LavaridgeTown_EventScript_PlayMayMusic:: @ 814E56B playbgm MUS_ENCOUNTER_MAY, TRUE return -LavaridgeTown_EventScript_14E570:: @ 814E570 +LavaridgeTown_EventScript_PlayBrendanMusic:: @ 814E570 playbgm MUS_ENCOUNTER_BRENDAN, TRUE return @@ -70,33 +70,33 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 setvar VAR_0x8008, 0 checkplayergender compare VAR_RESULT, 0 - call_if_eq LavaridgeTown_EventScript_14E56B + call_if_eq LavaridgeTown_EventScript_PlayMayMusic compare VAR_RESULT, 1 - call_if_eq LavaridgeTown_EventScript_14E570 + call_if_eq LavaridgeTown_EventScript_PlayBrendanMusic checkplayergender compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_EventScript_14E5AB + goto_if_eq LavaridgeTown_EventScript_MayGiveGoGoggles compare VAR_RESULT, 1 - goto_if_eq LavaridgeTown_EventScript_14E5D0 + goto_if_eq LavaridgeTown_EventScript_BrendanGiveGoGoggles end -LavaridgeTown_EventScript_14E5AB:: @ 814E5AB - msgbox LavaridgeTown_Text_16BDA4, MSGBOX_DEFAULT +LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 814E5AB + msgbox LavaridgeTown_Text_MayNiceBadgesTakeThis, MSGBOX_DEFAULT giveitem ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES - msgbox LavaridgeTown_Text_16BE7D, MSGBOX_DEFAULT - goto LavaridgeTown_EventScript_14E5F5 + msgbox LavaridgeTown_Text_MayExplainGoGogglesChallengeDad, MSGBOX_DEFAULT + goto LavaridgeTown_EventScript_RivalExit end -LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 - msgbox LavaridgeTown_Text_16BF92, MSGBOX_DEFAULT +LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 814E5D0 + msgbox LavaridgeTown_Text_BrendanNiceBadgesTakeThis, MSGBOX_DEFAULT giveitem ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES - msgbox LavaridgeTown_Text_16C020, MSGBOX_DEFAULT - goto LavaridgeTown_EventScript_14E5F5 + msgbox LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad, MSGBOX_DEFAULT + goto LavaridgeTown_EventScript_RivalExit end -LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 +LavaridgeTown_EventScript_RivalExit:: @ 814E5F5 closemessage compare VAR_0x8008, 1 call_if_eq LavaridgeTown_EventScript_14E646 @@ -106,7 +106,7 @@ LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 addobject 7 delay 30 compare VAR_0x8008, 1 - call_if_eq LavaridgeTown_EventScript_14E69A + call_if_eq LavaridgeTown_EventScript_RivalExit2 compare VAR_0x8008, 0 call_if_eq LavaridgeTown_EventScript_14E6A5 removeobject 7 @@ -153,13 +153,13 @@ LavaridgeTown_EventScript_14E68A:: @ 814E68A setobjectmovementtype 7, 9 return -LavaridgeTown_EventScript_14E68F:: @ 814E68F - applymovement 8, LavaridgeTown_Movement_14E6E8 +LavaridgeTown_EventScript_RivalApproachPlayerFromHerbShop:: @ 814E68F + applymovement 8, LavaridgeTown_Movement_RivalApproachPlayer2 waitmovement 0 return -LavaridgeTown_EventScript_14E69A:: @ 814E69A - applymovement 7, LavaridgeTown_Movement_14E6EF +LavaridgeTown_EventScript_RivalExit2:: @ 814E69A + applymovement 7, LavaridgeTown_Movement_RivalExit2 waitmovement 0 return @@ -169,7 +169,7 @@ LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 compare VAR_FACING, 1 call_if_eq LavaridgeTown_EventScript_14E6D2 compare VAR_FACING, 3 - call_if_eq LavaridgeTown_EventScript_14E6DD + call_if_eq LavaridgeTown_EventScript_RivalExit1 compare VAR_FACING, 4 call_if_eq LavaridgeTown_EventScript_14E6D2 return @@ -179,12 +179,12 @@ LavaridgeTown_EventScript_14E6D2:: @ 814E6D2 waitmovement 0 return -LavaridgeTown_EventScript_14E6DD:: @ 814E6DD - applymovement 7, LavaridgeTown_Movement_14E703 +LavaridgeTown_EventScript_RivalExit1:: @ 814E6DD + applymovement 7, LavaridgeTown_Movement_RivalExit1 waitmovement 0 return -LavaridgeTown_Movement_14E6E8:: @ 814E6E8 +LavaridgeTown_Movement_RivalApproachPlayer2:: @ 814E6E8 walk_left walk_left walk_left @@ -193,7 +193,7 @@ LavaridgeTown_Movement_14E6E8:: @ 814E6E8 walk_left step_end -LavaridgeTown_Movement_14E6EF:: @ 814E6EF +LavaridgeTown_Movement_RivalExit2:: @ 814E6EF walk_fast_right walk_fast_right walk_fast_right @@ -217,7 +217,7 @@ LavaridgeTown_Movement_14E6FA:: @ 814E6FA walk_fast_right step_end -LavaridgeTown_Movement_14E703:: @ 814E703 +LavaridgeTown_Movement_RivalExit1:: @ 814E703 walk_fast_down walk_fast_right walk_fast_right @@ -230,91 +230,91 @@ LavaridgeTown_Movement_14E703:: @ 814E703 walk_fast_right step_end -LavaridgeTown_Movement_14E70E:: @ 814E70E +LavaridgeTown_Movement_RivalExitHerbShop:: @ 814E70E walk_down step_end -LavaridgeTown_EventScript_14E710:: @ 814E710 +LavaridgeTown_EventScript_HotSpringsTrigger:: @ 814E710 specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, 1 - goto_if_eq LavaridgeTown_EventScript_14E721 + goto_if_eq LavaridgeTown_EventScript_EnteredHotSprings end -LavaridgeTown_EventScript_14E721:: @ 814E721 +LavaridgeTown_EventScript_EnteredHotSprings:: @ 814E721 incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS end -LavaridgeTown_EventScript_14E724:: @ 814E724 - msgbox LavaridgeTown_Text_16C3FD, MSGBOX_NPC +LavaridgeTown_EventScript_ExpertM:: @ 814E724 + msgbox LavaridgeTown_Text_HotSpringsNeverRunDry, MSGBOX_NPC end -LavaridgeTown_EventScript_14E72D:: @ 814E72D - msgbox LavaridgeTown_Text_16C4DB, MSGBOX_SIGN +LavaridgeTown_EventScript_OldMan:: @ 814E72D + msgbox LavaridgeTown_Text_PokemonNippedBackside, MSGBOX_SIGN end -LavaridgeTown_EventScript_14E736:: @ 814E736 - msgbox LavaridgeTown_Text_16C59B, MSGBOX_NPC +LavaridgeTown_EventScript_Twin:: @ 814E736 + msgbox LavaridgeTown_Text_BatheInHotSpringsEveryDay, MSGBOX_NPC end -LavaridgeTown_EventScript_14E73F:: @ 814E73F - msgbox LavaridgeTown_Text_16C603, MSGBOX_NPC +LavaridgeTown_EventScript_HotSpringsOldWoman1:: @ 814E73F + msgbox LavaridgeTown_Text_IfPokemonInHotSprings, MSGBOX_NPC end -LavaridgeTown_EventScript_14E748:: @ 814E748 - msgbox LavaridgeTown_Text_16C694, MSGBOX_NPC +LavaridgeTown_EventScript_HotSpringsOldWoman2:: @ 814E748 + msgbox LavaridgeTown_Text_HotSpringsClaims, MSGBOX_NPC end -LavaridgeTown_EventScript_14E751:: @ 814E751 - msgbox LavaridgeTown_Text_16C54E, MSGBOX_NPC +LavaridgeTown_EventScript_ExpertF:: @ 814E751 + msgbox LavaridgeTown_Text_OhYouLikeHotSprings, MSGBOX_NPC end -LavaridgeTown_EventScript_14E75A:: @ 814E75A +LavaridgeTown_EventScript_EggWoman:: @ 814E75A lock faceplayer - goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E - msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_ReceivedEgg + msgbox LavaridgeTown_Text_HaveEggWillYouTakeIt, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LavaridgeTown_EventScript_14E7B2 + goto_if_eq LavaridgeTown_EventScript_DeclineEgg getpartysize compare VAR_RESULT, 6 - goto_if_eq LavaridgeTown_EventScript_14E7A8 - msgbox LavaridgeTown_Text_16C2B6, MSGBOX_DEFAULT + goto_if_eq LavaridgeTown_EventScript_NoRoomForEgg + msgbox LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg, MSGBOX_DEFAULT setflag FLAG_RECEIVED_LAVARIDGE_EGG playfanfare MUS_OBTAIN_ITEM - message LavaridgeTown_Text_16C2EA + message LavaridgeTown_Text_ReceivedTheEgg waitfanfare waitmessage giveegg SPECIES_WYNAUT release end -LavaridgeTown_EventScript_14E79E:: @ 814E79E - msgbox LavaridgeTown_Text_16C398, MSGBOX_DEFAULT +LavaridgeTown_EventScript_ReceivedEgg:: @ 814E79E + msgbox LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare, MSGBOX_DEFAULT release end -LavaridgeTown_EventScript_14E7A8:: @ 814E7A8 - msgbox LavaridgeTown_Text_16C2FF, MSGBOX_DEFAULT +LavaridgeTown_EventScript_NoRoomForEgg:: @ 814E7A8 + msgbox LavaridgeTown_Text_NoRoomForThisEgg, MSGBOX_DEFAULT release end -LavaridgeTown_EventScript_14E7B2:: @ 814E7B2 - msgbox LavaridgeTown_Text_16C33C, MSGBOX_DEFAULT +LavaridgeTown_EventScript_DeclineEgg:: @ 814E7B2 + msgbox LavaridgeTown_Text_AsYouWishThen, MSGBOX_DEFAULT release end -LavaridgeTown_EventScript_14E7BC:: @ 814E7BC - msgbox LavaridgeTown_Text_16C72F, MSGBOX_SIGN +LavaridgeTown_EventScript_TownSign:: @ 814E7BC + msgbox LavaridgeTown_Text_TownSign, MSGBOX_SIGN end -LavaridgeTown_EventScript_14E7C5:: @ 814E7C5 - msgbox LavaridgeTown_Text_16C77C, MSGBOX_SIGN +LavaridgeTown_EventScript_GymSign:: @ 814E7C5 + msgbox LavaridgeTown_Text_GymSign, MSGBOX_SIGN end @ 814E7CE - msgbox LavaridgeTown_Text_16C7CF, MSGBOX_SIGN + msgbox LavaridgeTown_Text_HerbShopSign, MSGBOX_SIGN end -LavaridgeTown_EventScript_14E7D7:: @ 814E7D7 - msgbox LavaridgeTown_Text_16C7CF, MSGBOX_SIGN +LavaridgeTown_EventScript_HerbShopSign:: @ 814E7D7 + msgbox LavaridgeTown_Text_HerbShopSign, MSGBOX_SIGN end diff --git a/data/maps/LavaridgeTown/text.inc b/data/maps/LavaridgeTown/text.inc index 9057f6e74..c229debee 100644 --- a/data/maps/LavaridgeTown/text.inc +++ b/data/maps/LavaridgeTown/text.inc @@ -1,4 +1,4 @@ -LavaridgeTown_Text_16BDA4:: @ 816BDA4 +LavaridgeTown_Text_MayNiceBadgesTakeThis:: @ 816BDA4 .string "MAY: {PLAYER}{KUN}! Long time no see!\p" .string "Oh? While I was visiting the hot springs,\n" .string "you got the LAVARIDGE GYM BADGE.\p" @@ -7,7 +7,7 @@ LavaridgeTown_Text_16BDA4:: @ 816BDA4 .string "I guess it would be okay for you to\n" .string "have this.$" -LavaridgeTown_Text_16BE7D:: @ 816BE7D +LavaridgeTown_Text_MayExplainGoGogglesChallengeDad:: @ 816BE7D .string "MAY: With those GO-GOGGLES, you'll\n" .string "have no trouble getting through the\l" .string "desert near ROUTE 111.\p" @@ -19,7 +19,7 @@ LavaridgeTown_Text_16BE7D:: @ 816BE7D .string "your dad in PETALBURG GYM.\p" .string "{PLAYER}{KUN}, see you again!$" -LavaridgeTown_Text_16BF92:: @ 816BF92 +LavaridgeTown_Text_BrendanNiceBadgesTakeThis:: @ 816BF92 .string "BRENDAN: {PLAYER}, hey, it's been a while.\n" .string "How's it going?\p" .string "Hmm...\n" @@ -27,7 +27,7 @@ LavaridgeTown_Text_16BF92:: @ 816BF92 .string "All right, then.\n" .string "You may as well have this.$" -LavaridgeTown_Text_16C020:: @ 816C020 +LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad:: @ 816C020 .string "BRENDAN: Keep those with you if you're\n" .string "planning on going into that desert near\l" .string "ROUTE 111.\p" @@ -41,7 +41,7 @@ LavaridgeTown_Text_16C020:: @ 816C020 .string "he really is tough.\p" .string "See you around!$" -LavaridgeTown_Text_16C174:: @ 816C174 +LavaridgeTown_Text_HaveEggWillYouTakeIt:: @ 816C174 .string "I have here an EGG.\p" .string "I'd hoped to hatch it by covering it in\n" .string "hot sand by the hot springs.\l" @@ -54,28 +54,28 @@ LavaridgeTown_Text_16C174:: @ 816C174 .string "So, what say you?\n" .string "Will you take this EGG to hatch?$" -LavaridgeTown_Text_16C2B6:: @ 816C2B6 +LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg:: @ 816C2B6 .string "Good! I hope you'll walk plenty with\n" .string "this here EGG!$" -LavaridgeTown_Text_16C2EA:: @ 816C2EA +LavaridgeTown_Text_ReceivedTheEgg:: @ 816C2EA .string "{PLAYER} received the EGG.$" -LavaridgeTown_Text_16C2FF:: @ 816C2FF +LavaridgeTown_Text_NoRoomForThisEgg:: @ 816C2FF .string "Oh? You've too many POKéMON.\n" .string "There's no room for this EGG...$" -LavaridgeTown_Text_16C33C:: @ 816C33C +LavaridgeTown_Text_AsYouWishThen:: @ 816C33C .string "As you wish, then...\p" .string "If you have a change of heart about\n" .string "hatching this EGG, I will be here.$" -LavaridgeTown_Text_16C398:: @ 816C398 +LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare:: @ 816C398 .string "Every so often, an EGG will be found at\n" .string "the POKéMON DAY CARE.\p" .string "Or at least that's how the rumor goes.$" -LavaridgeTown_Text_16C3FD:: @ 816C3FD +LavaridgeTown_Text_HotSpringsNeverRunDry:: @ 816C3FD .string "We draw as much hot water as we need,\n" .string "and yet the hot springs never run dry.\p" .string "Isn't it magical?\p" @@ -84,46 +84,46 @@ LavaridgeTown_Text_16C3FD:: @ 816C3FD .string "ground are heated by magma to well up\l" .string "as hot springs.$" -LavaridgeTown_Text_16C4DB:: @ 816C4DB +LavaridgeTown_Text_PokemonNippedBackside:: @ 816C4DB .string "Being buried in this hot sand is...\n" .string "Sigh...\p" .string "So warm and heavenly...\p" .string "Eh? Gyaah! Ouch!\p" .string "A POKéMON nipped my backside!$" -LavaridgeTown_Text_16C54E:: @ 816C54E +LavaridgeTown_Text_OhYouLikeHotSprings:: @ 816C54E .string "Oh, you like hot springs, do you?\p" .string "That's surprising for one as young\n" .string "as you.$" -LavaridgeTown_Text_16C59B:: @ 816C59B +LavaridgeTown_Text_BatheInHotSpringsEveryDay:: @ 816C59B .string "I bathe in the hot springs every day.\p" .string "I want to become a beautiful and strong\n" .string "GYM LEADER like FLANNERY.$" -LavaridgeTown_Text_16C603:: @ 816C603 +LavaridgeTown_Text_IfPokemonInHotSprings:: @ 816C603 .string "If people put POKéMON in hot springs,\n" .string "it might be seriously strange.\p" .string "Why, it might be an electric bath, or\n" .string "a bubble bath, or even a lava bath...$" -LavaridgeTown_Text_16C694:: @ 816C694 +LavaridgeTown_Text_HotSpringsClaims:: @ 816C694 .string "They're claiming that these hot springs\n" .string "are good for calming nervous tension,\l" .string "relieving aching muscles, solving\l" .string "romantic problems, and attracting\l" .string "money...$" -LavaridgeTown_Text_16C72F:: @ 816C72F +LavaridgeTown_Text_TownSign:: @ 816C72F .string "LAVARIDGE TOWN\p" .string "“POKéMON CENTER HOT SPRINGS\n" .string "An excellent place for relaxing!”$" -LavaridgeTown_Text_16C77C:: @ 816C77C +LavaridgeTown_Text_GymSign:: @ 816C77C .string "LAVARIDGE TOWN POKéMON GYM\n" .string "LEADER: FLANNERY\l" .string "“One with a fiery passion that burns!”$" -LavaridgeTown_Text_16C7CF:: @ 816C7CF +LavaridgeTown_Text_HerbShopSign:: @ 816C7CF .string "POKéMON HERB SHOP\n" .string "“Bitter taste - better cure!”$" diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 1779ef00b..2338aad3a 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Gym_1F_EventScript_153741", + "script": "LavaridgeTown_Gym_1F_EventScript_Flannery", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_BURIED", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_1F_EventScript_1537CB", + "script": "LavaridgeTown_Gym_1F_EventScript_Cole", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_BURIED", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_1F_EventScript_15383E", + "script": "LavaridgeTown_Gym_1F_EventScript_Zane", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_BURIED", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_1F_EventScript_1537ED", + "script": "LavaridgeTown_Gym_1F_EventScript_Axle", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_BURIED", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_1F_EventScript_153823", + "script": "LavaridgeTown_Gym_1F_EventScript_Sadie", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Gym_1F_EventScript_153859", + "script": "LavaridgeTown_Gym_1F_EventScript_GymGuide", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_BURIED", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_1F_EventScript_153808", + "script": "LavaridgeTown_Gym_1F_EventScript_Andy", "flag": "0" } ], @@ -267,7 +267,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_Gym_1F_EventScript_153878" + "script": "LavaridgeTown_Gym_1F_EventScript_LeftGymStatue" }, { "type": "sign", @@ -275,7 +275,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_Gym_1F_EventScript_153888" + "script": "LavaridgeTown_Gym_1F_EventScript_RightGymStatue" } ] } diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index cc0707fc5..6ed565a7a 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -1,75 +1,75 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 815368E - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_153694 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_OnTransition .byte 0 -LavaridgeTown_Gym_1F_MapScript1_153694:: @ 8153694 - call LavaridgeTown_Gym_1F_EventScript_15369F - call LavaridgeTown_Gym_1F_EventScript_1536FF +LavaridgeTown_Gym_1F_OnTransition:: @ 8153694 + call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars + call LavaridgeTown_Gym_1F_EventScript_CheckBuryTrainers end -LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F +LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 815369F setvar VAR_TEMP_B, 0 setvar VAR_TEMP_C, 0 setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_SetZaneTempVar setvar VAR_TEMP_B, 1 -LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - goto_if_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 +LavaridgeTown_Gym_1F_EventScript_SetZaneTempVar:: @ 81536C6 + goto_if_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar setvar VAR_TEMP_C, 1 -LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 +LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81536D4 + goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_SetSadieTempVar setvar VAR_TEMP_D, 1 -LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - goto_if_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 +LavaridgeTown_Gym_1F_EventScript_SetSadieTempVar:: @ 81536E2 + goto_if_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_SetAndyTempVar setvar VAR_TEMP_E, 1 -LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - goto_if_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE +LavaridgeTown_Gym_1F_EventScript_SetAndyTempVar:: @ 81536F0 + goto_if_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars setvar VAR_TEMP_F, 1 -LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE +LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81536FE return -LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_15370C +LavaridgeTown_Gym_1F_EventScript_CheckBuryTrainers:: @ 81536FF + goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_CheckBuryZane setobjectmovementtype 2, 63 -LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - goto_if_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 +LavaridgeTown_Gym_1F_EventScript_CheckBuryZane:: @ 815370C + goto_if_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_CheckBuryAxle setobjectmovementtype 3, 63 -LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 +LavaridgeTown_Gym_1F_EventScript_CheckBuryAxle:: @ 8153719 + goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_CheckBurySadie setobjectmovementtype 4, 63 -LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - goto_if_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 +LavaridgeTown_Gym_1F_EventScript_CheckBurySadie:: @ 8153726 + goto_if_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_CheckBuryAndy setobjectmovementtype 5, 63 -LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - goto_if_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 +LavaridgeTown_Gym_1F_EventScript_CheckBuryAndy:: @ 8153733 + goto_if_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_EndCheckBuryTrainers setobjectmovementtype 7, 63 -LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 +LavaridgeTown_Gym_1F_EventScript_EndCheckBuryTrainers:: @ 8153740 return -LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 - trainerbattle_single TRAINER_FLANNERY, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766, NO_MUSIC - goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 - msgbox LavaridgeTown_Gym_1F_Text_176C4A, MSGBOX_DEFAULT +LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 8153741 + trainerbattle_single TRAINER_FLANNERY, LavaridgeTown_Gym_1F_Text_FlanneryIntro, LavaridgeTown_Gym_1F_Text_FlanneryDefeat, LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated, NO_MUSIC + goto_if_unset FLAG_RECEIVED_TM_OVERHEAT, LavaridgeTown_Gym_1F_EventScript_GiveOverheat + msgbox LavaridgeTown_Gym_1F_Text_FlanneryPostBattle, MSGBOX_DEFAULT release end -LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 - message LavaridgeTown_Gym_1F_Text_176A62 +LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 8153766 + message LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox LavaridgeTown_Gym_1F_Text_176A8C, MSGBOX_DEFAULT + msgbox LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET addvar VAR_PETALBURG_GYM_STATE, 1 @@ -79,79 +79,79 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call Common_EventScript_SetGymTrainers setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar VAR_LAVARIDGE_RIVAL_STATE, 1 - goto LavaridgeTown_Gym_1F_EventScript_1537A7 + goto LavaridgeTown_Gym_1F_EventScript_GiveOverheat end -LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 +LavaridgeTown_Gym_1F_EventScript_GiveOverheat:: @ 81537A7 giveitem ITEM_TM50_OVERHEAT compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox LavaridgeTown_Gym_1F_Text_176B8F, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM50 + msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_OVERHEAT release end -LavaridgeTown_Gym_1F_EventScript_1537CB:: @ 81537CB - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 - msgbox LavaridgeTown_Gym_1F_Text_176472, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_Cole:: @ 81537CB + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_ColeIntro, LavaridgeTown_Gym_1F_Text_ColeDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_1F_Text_ColePostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6 - call LavaridgeTown_Gym_1F_EventScript_15369F +LavaridgeTown_Gym_EventScript_CheckTrainerScript:: @ 81537E6 + call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars release end -LavaridgeTown_Gym_1F_EventScript_1537ED:: @ 81537ED - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 - msgbox LavaridgeTown_Gym_1F_Text_176537, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_Axle:: @ 81537ED + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_AxleIntro, LavaridgeTown_Gym_1F_Text_AxleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_1F_Text_AxlePostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_153808:: @ 8153808 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 - msgbox LavaridgeTown_Gym_1F_Text_176660, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_Andy:: @ 8153808 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ANDY, 7, LavaridgeTown_Gym_B1F_Text_AndyIntro, LavaridgeTown_Gym_B1F_Text_AndyDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_B1F_Text_AndyPostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_153823:: @ 8153823 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 - msgbox LavaridgeTown_Gym_1F_Text_1767C1, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_Sadie:: @ 8153823 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_SadieIntro, LavaridgeTown_Gym_1F_Text_SadieDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_1F_Text_SadiePostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 - msgbox LavaridgeTown_Gym_1F_Text_17671D, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_Zane:: @ 815383E + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_ZaneIntro, LavaridgeTown_Gym_1F_Text_ZaneDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_1F_Text_ZanePostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 +LavaridgeTown_Gym_1F_EventScript_GymGuide:: @ 8153859 lock faceplayer - goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_15386E - msgbox LavaridgeTown_Gym_1F_Text_176312, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory + msgbox LavaridgeTown_Gym_1F_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E - msgbox LavaridgeTown_Gym_1F_Text_17640C, MSGBOX_DEFAULT +LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory:: @ 815386E + msgbox LavaridgeTown_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 +LavaridgeTown_Gym_1F_EventScript_LeftGymStatue:: @ 8153878 lockall - goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 - goto LavaridgeTown_Gym_1F_EventScript_1538A2 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified + goto LavaridgeTown_Gym_1F_EventScript_GymStatue end -LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 +LavaridgeTown_Gym_1F_EventScript_RightGymStatue:: @ 8153888 lockall - goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 - goto LavaridgeTown_Gym_1F_EventScript_1538A2 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified + goto LavaridgeTown_Gym_1F_EventScript_GymStatue end -LavaridgeTown_Gym_1F_EventScript_153898:: @ 8153898 - msgbox LavaridgeTown_Gym_1F_Text_176CCA, MSGBOX_DEFAULT +LavaridgeTown_Gym_1F_EventScript_GymStatueCertified:: @ 8153898 + msgbox LavaridgeTown_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -LavaridgeTown_Gym_1F_EventScript_1538A2:: @ 81538A2 - msgbox LavaridgeTown_Gym_1F_Text_176CAF, MSGBOX_DEFAULT +LavaridgeTown_Gym_1F_EventScript_GymStatue:: @ 81538A2 + msgbox LavaridgeTown_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/LavaridgeTown_Gym_1F/text.inc b/data/maps/LavaridgeTown_Gym_1F/text.inc index 62462226e..73cf19111 100644 --- a/data/maps/LavaridgeTown_Gym_1F/text.inc +++ b/data/maps/LavaridgeTown_Gym_1F/text.inc @@ -1,4 +1,4 @@ -LavaridgeTown_Gym_1F_Text_176312:: @ 8176312 +LavaridgeTown_Gym_1F_Text_GymGuideAdvice:: @ 8176312 .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "LAVARIDGE's GYM LEADER FLANNERY\n" @@ -9,35 +9,35 @@ LavaridgeTown_Gym_1F_Text_176312:: @ 8176312 .string "Hose her down with water and then\l" .string "go for it!$" -LavaridgeTown_Gym_1F_Text_17640C:: @ 817640C +LavaridgeTown_Gym_1F_Text_GymGuidePostVictory:: @ 817640C .string "Yow! That was a scorching hot battle!$" -LavaridgeTown_Gym_1F_Text_176432:: @ 8176432 +LavaridgeTown_Gym_1F_Text_ColeIntro:: @ 8176432 .string "Owowowowow!\n" .string "Yikes, it's hot!$" -LavaridgeTown_Gym_1F_Text_17644F:: @ 817644F +LavaridgeTown_Gym_1F_Text_ColeDefeat:: @ 817644F .string "I'm blinded by sweat in my eyes...$" -LavaridgeTown_Gym_1F_Text_176472:: @ 8176472 +LavaridgeTown_Gym_1F_Text_ColePostBattle:: @ 8176472 .string "Being buried in hot sand promotes\n" .string "circulation.\p" .string "It's effective for healing pain in\n" .string "your joints.$" -LavaridgeTown_Gym_1F_Text_1764D1:: @ 81764D1 +LavaridgeTown_Gym_1F_Text_AxleIntro:: @ 81764D1 .string "I'm trying to relieve my stress.\n" .string "Don't come along and stress me out!$" -LavaridgeTown_Gym_1F_Text_176516:: @ 8176516 +LavaridgeTown_Gym_1F_Text_AxleDefeat:: @ 8176516 .string "I hope FLANNERY flames you good!$" -LavaridgeTown_Gym_1F_Text_176537:: @ 8176537 +LavaridgeTown_Gym_1F_Text_AxlePostBattle:: @ 8176537 .string "Haaah... Whew...\p" .string "If you spend too much time buried in\n" .string "hot sand, it tuckers you out...$" -LavaridgeTown_Gym_1F_Text_17658D:: @ 817658D +LavaridgeTown_Gym_B1F_Text_AndyIntro:: @ 817658D .string "You must be getting tired by now.\n" .string "You'd like to rest in the hot sand,\l" .string "wouldn't you?\p" @@ -45,40 +45,40 @@ LavaridgeTown_Gym_1F_Text_17658D:: @ 817658D .string "your willpower is an important ability\l" .string "for all TRAINERS.$" -LavaridgeTown_Gym_1F_Text_17663F:: @ 817663F +LavaridgeTown_Gym_B1F_Text_AndyDefeat:: @ 817663F .string "Play with fire, and be burned...$" -LavaridgeTown_Gym_1F_Text_176660:: @ 8176660 +LavaridgeTown_Gym_B1F_Text_AndyPostBattle:: @ 8176660 .string "Your skill is real...\n" .string "But our LEADER FLANNERY is strong.\p" .string "If you don't watch yourself, you'll be\n" .string "burned seriously.$" -LavaridgeTown_Gym_1F_Text_1766D2:: @ 81766D2 +LavaridgeTown_Gym_1F_Text_ZaneIntro:: @ 81766D2 .string "Can your POKéMON withstand\n" .string "392-degree heat?$" -LavaridgeTown_Gym_1F_Text_1766FE:: @ 81766FE +LavaridgeTown_Gym_1F_Text_ZaneDefeat:: @ 81766FE .string "It didn't burn hotly enough...$" -LavaridgeTown_Gym_1F_Text_17671D:: @ 817671D +LavaridgeTown_Gym_1F_Text_ZanePostBattle:: @ 817671D .string "The temperature of magma is\n" .string "392 degrees.\p" .string "Your POKéMON beat me, so they should\n" .string "easily survive in magma.$" -LavaridgeTown_Gym_1F_Text_176784:: @ 8176784 +LavaridgeTown_Gym_1F_Text_SadieIntro:: @ 8176784 .string "Um...\n" .string "Okay, I'll battle with you.$" -LavaridgeTown_Gym_1F_Text_1767A6:: @ 81767A6 +LavaridgeTown_Gym_1F_Text_SadieDefeat:: @ 81767A6 .string "Oh, but you're too strong.$" -LavaridgeTown_Gym_1F_Text_1767C1:: @ 81767C1 +LavaridgeTown_Gym_1F_Text_SadiePostBattle:: @ 81767C1 .string "I'm going to be a pretty and strong\n" .string "TRAINER just like FLANNERY.$" -LavaridgeTown_Gym_1F_Text_176801:: @ 8176801 +LavaridgeTown_Gym_1F_Text_FlanneryIntro:: @ 8176801 .string "Welcome... No, wait.\p" .string "Puny TRAINER, how good to see you've\n" .string "made it here!\p" @@ -93,7 +93,7 @@ LavaridgeTown_Gym_1F_Text_176801:: @ 8176801 .string "father, I shall, uh...demonstrate the\l" .string "hot moves we have honed on this land!$" -LavaridgeTown_Gym_1F_Text_176960:: @ 8176960 +LavaridgeTown_Gym_1F_Text_FlanneryDefeat:: @ 8176960 .string "Oh...\n" .string "I guess I was trying too hard...\p" .string "I... I've only recently become a GYM\n" @@ -104,11 +104,11 @@ LavaridgeTown_Gym_1F_Text_176960:: @ 8176960 .string "Thanks for teaching me that.\n" .string "For that, you deserve this.$" -LavaridgeTown_Gym_1F_Text_176A62:: @ 8176A62 +LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge:: @ 8176A62 .string "{PLAYER} received the HEAT BADGE\n" .string "from FLANNERY.$" -LavaridgeTown_Gym_1F_Text_176A8C:: @ 8176A8C +LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis:: @ 8176A8C .string "If you have a HEAT BADGE, all POKéMON\n" .string "up to Level 50, even those you get in\l" .string "trades from other people, will obey\l" @@ -118,7 +118,7 @@ LavaridgeTown_Gym_1F_Text_176A8C:: @ 8176A8C .string "This is a token of my appreciation.\n" .string "Don't be shy about taking it!$" -LavaridgeTown_Gym_1F_Text_176B8F:: @ 8176B8F +LavaridgeTown_Gym_1F_Text_ExplainOverheat:: @ 8176B8F .string "That TM50 contains OVERHEAT.\p" .string "That move inflicts serious damage on\n" .string "the opponent.\p" @@ -126,15 +126,15 @@ LavaridgeTown_Gym_1F_Text_176B8F:: @ 8176B8F .string "of the POKéMON using it. It might not\l" .string "be suitable for longer battles.$" -LavaridgeTown_Gym_1F_Text_176C4A:: @ 8176C4A +LavaridgeTown_Gym_1F_Text_FlanneryPostBattle:: @ 8176C4A .string "Your power reminds me of someone...\p" .string "Oh! I know! You battle like NORMAN,\n" .string "the GYM LEADER of PETALBURG.$" -LavaridgeTown_Gym_1F_Text_176CAF:: @ 8176CAF +LavaridgeTown_Gym_1F_Text_GymStatue:: @ 8176CAF .string "LAVARIDGE TOWN POKéMON GYM$" -LavaridgeTown_Gym_1F_Text_176CCA:: @ 8176CCA +LavaridgeTown_Gym_1F_Text_GymStatueCertified:: @ 8176CCA .string "LAVARIDGE TOWN POKéMON GYM\p" .string "FLANNERY'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index e8cc562ab..0dbebd658 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_HerbShop_EventScript_153629", + "script": "LavaridgeTown_HerbShop_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_HerbShop_EventScript_153655", + "script": "LavaridgeTown_HerbShop_EventScript_OldMan", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_HerbShop_EventScript_15364C", + "script": "LavaridgeTown_HerbShop_EventScript_ExpertM", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index d0da76367..d3d80cea4 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -1,18 +1,18 @@ LavaridgeTown_HerbShop_MapScripts:: @ 8153628 .byte 0 -LavaridgeTown_HerbShop_EventScript_153629:: @ 8153629 +LavaridgeTown_HerbShop_EventScript_Clerk:: @ 8153629 lock faceplayer - message LavaridgeTown_HerbShop_Text_17615C + message LavaridgeTown_HerbShop_Text_WelcomeToHerbShop waitmessage - pokemart LavaridgeTown_HerbShop_Items + pokemart LavaridgeTown_HerbShop_Pokemart msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LavaridgeTown_HerbShop_Items:: @ 8153640 +LavaridgeTown_HerbShop_Pokemart:: @ 8153640 .2byte ITEM_ENERGY_POWDER .2byte ITEM_ENERGY_ROOT .2byte ITEM_HEAL_POWDER @@ -21,15 +21,15 @@ LavaridgeTown_HerbShop_Items:: @ 8153640 release end -LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C - msgbox LavaridgeTown_HerbShop_Text_1762A3, MSGBOX_NPC +LavaridgeTown_HerbShop_EventScript_ExpertM:: @ 815364C + msgbox LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike, MSGBOX_NPC end -LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 +LavaridgeTown_HerbShop_EventScript_OldMan:: @ 8153655 lock faceplayer - goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_153684 - msgbox LavaridgeTown_HerbShop_Text_1761A2, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_ExplainCharcoal + msgbox LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine, MSGBOX_DEFAULT giveitem ITEM_CHARCOAL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -37,7 +37,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 release end -LavaridgeTown_HerbShop_EventScript_153684:: @ 8153684 - msgbox LavaridgeTown_HerbShop_Text_176209, MSGBOX_DEFAULT +LavaridgeTown_HerbShop_EventScript_ExplainCharcoal:: @ 8153684 + msgbox LavaridgeTown_HerbShop_Text_ExplainCharcoal, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_HerbShop/text.inc b/data/maps/LavaridgeTown_HerbShop/text.inc index 71ed49bc9..c43bf554e 100644 --- a/data/maps/LavaridgeTown_HerbShop/text.inc +++ b/data/maps/LavaridgeTown_HerbShop/text.inc @@ -1,14 +1,14 @@ -LavaridgeTown_HerbShop_Text_17615C:: @ 817615C +LavaridgeTown_HerbShop_Text_WelcomeToHerbShop:: @ 817615C .string "Welcome to the HERB SHOP, home of\n" .string "effective and inexpensive medicine!$" -LavaridgeTown_HerbShop_Text_1761A2:: @ 81761A2 +LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine:: @ 81761A2 .string "You've come to look at herbal medicine\n" .string "in LAVARIDGE?\p" .string "That's rather commendable.\p" .string "I like you! Take this!$" -LavaridgeTown_HerbShop_Text_176209:: @ 8176209 +LavaridgeTown_HerbShop_Text_ExplainCharcoal:: @ 8176209 .string "That CHARCOAL I gave you, it's used\n" .string "for making herbal medicine.\p" .string "It also does wonders when held by\n" @@ -16,7 +16,7 @@ LavaridgeTown_HerbShop_Text_176209:: @ 8176209 .string "It intensifies the power of FIRE-type\n" .string "moves.$" -LavaridgeTown_HerbShop_Text_1762A3:: @ 81762A3 +LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike:: @ 81762A3 .string "Herbal medicine works impressively well.\n" .string "But your POKéMON will dislike you for it.\l" .string "It must be horribly bitter!$" diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index d87129afa..2fe294a80 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_House_EventScript_1538AE", + "script": "LavaridgeTown_House_EventScript_OldMan", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_House_EventScript_1538B7", + "script": "LavaridgeTown_House_EventScript_Zigzagoon", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc index dc881a380..82f847c53 100644 --- a/data/maps/LavaridgeTown_House/scripts.inc +++ b/data/maps/LavaridgeTown_House/scripts.inc @@ -1,16 +1,16 @@ LavaridgeTown_House_MapScripts:: @ 81538AD .byte 0 -LavaridgeTown_House_EventScript_1538AE:: @ 81538AE - msgbox LavaridgeTown_House_Text_176D07, MSGBOX_NPC +LavaridgeTown_House_EventScript_OldMan:: @ 81538AE + msgbox LavaridgeTown_House_Text_WifeWarmingEggInHotSprings, MSGBOX_NPC end -LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 +LavaridgeTown_House_EventScript_Zigzagoon:: @ 81538B7 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox LavaridgeTown_House_Text_176D94, MSGBOX_DEFAULT + msgbox LavaridgeTown_House_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/LavaridgeTown_House/text.inc b/data/maps/LavaridgeTown_House/text.inc index 3e1c6c1c7..9570a2ca7 100644 --- a/data/maps/LavaridgeTown_House/text.inc +++ b/data/maps/LavaridgeTown_House/text.inc @@ -1,8 +1,8 @@ -LavaridgeTown_House_Text_176D07:: @ 8176D07 +LavaridgeTown_House_Text_WifeWarmingEggInHotSprings:: @ 8176D07 .string "My wife's warming an EGG in the hot\n" .string "springs. This is what she told me.\p" .string "She left two POKéMON with the DAY CARE.\n" .string "And they discovered that EGG!$" -LavaridgeTown_House_Text_176D94:: @ 8176D94 +LavaridgeTown_House_Text_Zigzagoon:: @ 8176D94 .string "ZIGZAGOON: Pshoo!$" diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index 235016dde..9e1b650ff 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Mart_EventScript_1538CB", + "script": "LavaridgeTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Mart_EventScript_1538FA", + "script": "LavaridgeTown_Mart_EventScript_ExpertM", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Mart_EventScript_153903", + "script": "LavaridgeTown_Mart_EventScript_OldWoman", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc index 4c527e155..7b0bcbfe4 100644 --- a/data/maps/LavaridgeTown_Mart/scripts.inc +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -1,18 +1,18 @@ LavaridgeTown_Mart_MapScripts:: @ 81538CA .byte 0 -LavaridgeTown_Mart_EventScript_1538CB:: @ 81538CB +LavaridgeTown_Mart_EventScript_Clerk:: @ 81538CB lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart LavaridgeTown_Mart_Items + pokemart LavaridgeTown_Mart_Pokemart msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LavaridgeTown_Mart_Items:: @ 81538E4 +LavaridgeTown_Mart_Pokemart:: @ 81538E4 .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_ANTIDOTE @@ -26,10 +26,10 @@ LavaridgeTown_Mart_Items:: @ 81538E4 release end -LavaridgeTown_Mart_EventScript_1538FA:: @ 81538FA - msgbox LavaridgeTown_Mart_Text_176DA6, MSGBOX_NPC +LavaridgeTown_Mart_EventScript_ExpertM:: @ 81538FA + msgbox LavaridgeTown_Mart_Text_XSpeedFirstStrike, MSGBOX_NPC end -LavaridgeTown_Mart_EventScript_153903:: @ 8153903 - msgbox LavaridgeTown_Mart_Text_176E1A, MSGBOX_NPC +LavaridgeTown_Mart_EventScript_OldWoman:: @ 8153903 + msgbox LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney, MSGBOX_NPC end diff --git a/data/maps/LavaridgeTown_Mart/text.inc b/data/maps/LavaridgeTown_Mart/text.inc index ddf72e430..79813c80b 100644 --- a/data/maps/LavaridgeTown_Mart/text.inc +++ b/data/maps/LavaridgeTown_Mart/text.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Mart_Text_176DA6:: @ 8176DA6 +LavaridgeTown_Mart_Text_XSpeedFirstStrike:: @ 8176DA6 .string "Use X SPEED to add to a POKéMON's\n" .string "SPEED in battle.\p" .string "That will help it get in the first\n" .string "strike - a decided advantage!$" -LavaridgeTown_Mart_Text_176E1A:: @ 8176E1A +LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney:: @ 8176E1A .string "On MT. CHIMNEY's peak, there's a local\n" .string "specialty that you can buy only there.\p" .string "Give it to a POKéMON - it will be elated.$" diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index b0a08a1d8..7d928e8dd 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_1F_EventScript_15391B", + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_1F_EventScript_153929", + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_1F_EventScript_153932", + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_1F_EventScript_15393B", + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 637a1eefa..55411b419 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,13 +1,13 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_153912 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition .byte 0 -LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 +LavaridgeTown_PokemonCenter_1F_OnTransition:: @ 8153912 setrespawn HEAL_LOCATION_LAVARIDGE_TOWN call Common_EventScript_UpdateBrineyLocation end -LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B +LavaridgeTown_PokemonCenter_1F_EventScript_Nurse:: @ 815391B setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,14 +15,14 @@ LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B release end -LavaridgeTown_PokemonCenter_1F_EventScript_153929:: @ 8153929 - msgbox LavaridgeTown_PokemonCenter_1F_Text_176F08, MSGBOX_NPC +LavaridgeTown_PokemonCenter_1F_EventScript_Youngster:: @ 8153929 + msgbox LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate, MSGBOX_NPC end -LavaridgeTown_PokemonCenter_1F_EventScript_153932:: @ 8153932 - msgbox LavaridgeTown_PokemonCenter_1F_Text_176E92, MSGBOX_NPC +LavaridgeTown_PokemonCenter_1F_EventScript_Woman:: @ 8153932 + msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether, MSGBOX_NPC end -LavaridgeTown_PokemonCenter_1F_EventScript_15393B:: @ 815393B - msgbox LavaridgeTown_PokemonCenter_1F_Text_176F7A, MSGBOX_NPC +LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman:: @ 815393B + msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo, MSGBOX_NPC end diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc index 19942e24a..178219702 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc @@ -1,16 +1,16 @@ -LavaridgeTown_PokemonCenter_1F_Text_176E92:: @ 8176E92 +LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether:: @ 8176E92 .string "I think POKéMON get closer to their\n" .string "TRAINERS if they spend time together.\p" .string "The longer the better.\n" .string "That's what I think.$" -LavaridgeTown_PokemonCenter_1F_Text_176F08:: @ 8176F08 +LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate:: @ 8176F08 .string "I gave a RED {POKEBLOCK} to my POKéMON.\n" .string "It looks a lot cooler all of a sudden.\p" .string "Hmm...\n" .string "Maybe I ought to eat a RED {POKEBLOCK}.$" -LavaridgeTown_PokemonCenter_1F_Text_176F7A:: @ 8176F7A +LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo:: @ 8176F7A .string "Hohoho! Hey, kid, you can reach\n" .string "the hot springs from here.\p" .string "If POKéMON are getting rest, so too\n" diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 12a5d9c4a..f6495daa3 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -32,7 +32,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CBEF", + "script": "LilycoveCity_EventScript_Sailor2", "flag": "0" }, { @@ -45,7 +45,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CBC7", + "script": "LilycoveCity_EventScript_Girl", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CBBE", + "script": "LilycoveCity_EventScript_Man3", "flag": "0" }, { @@ -71,7 +71,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CBE6", + "script": "LilycoveCity_EventScript_RichBoy", "flag": "0" }, { @@ -84,7 +84,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CC2D", + "script": "LilycoveCity_EventScript_Man2", "flag": "0" }, { @@ -97,7 +97,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CC0E", + "script": "LilycoveCity_EventScript_Woman2", "flag": "0" }, { @@ -110,7 +110,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CC36", + "script": "LilycoveCity_EventScript_ExpertM1", "flag": "0" }, { @@ -123,7 +123,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CC3F", + "script": "LilycoveCity_EventScript_ExpertF", "flag": "0" }, { @@ -136,7 +136,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CC48", + "script": "LilycoveCity_EventScript_ExpertM2", "flag": "0" }, { @@ -149,7 +149,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CCE5", + "script": "LilycoveCity_EventScript_WailmerTrainerGrunt", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { @@ -175,7 +175,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CD3D", + "script": "LilycoveCity_EventScript_EvilTeamGrunt4", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { @@ -188,7 +188,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CD22", + "script": "LilycoveCity_EventScript_EvilTeamGrunt1", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { @@ -201,7 +201,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CD2B", + "script": "LilycoveCity_EventScript_EvilTeamGrunt2", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { @@ -214,7 +214,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CD34", + "script": "LilycoveCity_EventScript_EvilTeamGrunt3", "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { @@ -227,7 +227,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CB74", + "script": "LilycoveCity_EventScript_BerryGentleman", "flag": "0" }, { @@ -240,7 +240,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_14CD46", + "script": "LilycoveCity_EventScript_Rival", "flag": "FLAG_HIDE_RIVAL_LILYCOVE_MART" } ], @@ -359,7 +359,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_14CC82" + "script": "LilycoveCity_EventScript_MuseumSign" }, { "type": "sign", @@ -375,7 +375,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_14CCD3" + "script": "LilycoveCity_EventScript_DepartmentStoreSign" }, { "type": "sign", @@ -391,7 +391,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_14CC67" + "script": "LilycoveCity_EventScript_CitySign" }, { "type": "sign", @@ -399,7 +399,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_14CC70" + "script": "LilycoveCity_EventScript_ContestHallSign" }, { "type": "sign", @@ -407,7 +407,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_14CC79" + "script": "LilycoveCity_EventScript_MotelSign" }, { "type": "sign", @@ -415,7 +415,7 @@ "y": 30, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_14CCAC" + "script": "LilycoveCity_EventScript_HarborSign" }, { "type": "sign", @@ -423,7 +423,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_14CCCA" + "script": "LilycoveCity_EventScript_TrainerFanClubSign" }, { "type": "sign", @@ -431,7 +431,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_14CCDC" + "script": "LilycoveCity_EventScript_MoveDeletersHouseSign" }, { "type": "hidden_item", @@ -447,7 +447,7 @@ "y": 7, "elevation": 0, "item": "ITEM_PP_UP", - "flag": "FLAG_HIDDEN_ITEM_2B" + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP" }, { "type": "hidden_item", @@ -455,7 +455,7 @@ "y": 31, "elevation": 0, "item": "ITEM_POKE_BALL", - "flag": "FLAG_HIDDEN_ITEM_4B" + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL" } ] } diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index f7df3f4ab..d9e2fa5cb 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,9 +1,9 @@ LilycoveCity_MapScripts:: @ 814CA15 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_14CA20 - map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_14CA3F + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_OnTransition + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_OnLoad .byte 0 -LilycoveCity_MapScript1_14CA20:: @ 814CA20 +LilycoveCity_OnTransition:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE @@ -12,7 +12,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 call Common_EventScript_SetupRivalGfxId end -LilycoveCity_MapScript1_14CA3F:: @ 814CA3F +LilycoveCity_OnLoad:: @ 814CA3F .ifndef SAPPHIRE setmetatile 69, 4, METATILE_General_RockWall_WaterBase, 1 setmetatile 70, 4, METATILE_Lilycove_AquaHideout_Entrance_TopLeft, 1 @@ -27,11 +27,11 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmetatile 71, 6, METATILE_General_CalmWater, 0 setmetatile 72, 6, METATILE_General_Shore_BottomLeft, 0 .endif - call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE - call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B + call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_SetWailmerMetatiles + call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_RemoveEvilTeamBaseEntrance end -LilycoveCity_EventScript_14CABE:: @ 814CABE +LilycoveCity_EventScript_SetWailmerMetatiles:: @ 814CABE setmetatile 76, 12, METATILE_Lilycove_Wailmer0, 1 setmetatile 77, 12, METATILE_Lilycove_Wailmer1, 1 setmetatile 76, 13, METATILE_Lilycove_Wailmer2, 1 @@ -46,7 +46,7 @@ LilycoveCity_EventScript_14CABE:: @ 814CABE setmetatile 78, 17, METATILE_Lilycove_Wailmer3, 1 return -LilycoveCity_EventScript_14CB2B:: @ 814CB2B +LilycoveCity_EventScript_RemoveEvilTeamBaseEntrance:: @ 814CB2B setmetatile 69, 4, METATILE_General_RockWall_WaterBase, 1 setmetatile 70, 4, METATILE_General_RockWall_WaterBase, 1 setmetatile 71, 4, METATILE_General_RockWall_WaterBase, 1 @@ -57,341 +57,341 @@ LilycoveCity_EventScript_14CB2B:: @ 814CB2B setmetatile 72, 5, METATILE_General_RockWall_SandBase, 1 return -LilycoveCity_EventScript_14CB74:: @ 814CB74 +LilycoveCity_EventScript_BerryGentleman:: @ 814CB74 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4 - msgbox LilycoveCity_Text_1C5A7A, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_ReceivedBerry + msgbox LilycoveCity_Text_BerrySuitsYou, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, ITEM_CHERI_BERRY giveitem VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE - msgbox LilycoveCity_Text_1C5B1D, MSGBOX_DEFAULT + msgbox LilycoveCity_Text_BecauseYoureTrainer, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CBB4:: @ 814CBB4 - msgbox LilycoveCity_Text_1C5B5D, MSGBOX_DEFAULT +LilycoveCity_EventScript_ReceivedBerry:: @ 814CBB4 + msgbox LilycoveCity_Text_PokeblocksSuitPokemon, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CBBE:: @ 814CBBE - msgbox LilycoveCity_Text_1686C9, MSGBOX_NPC +LilycoveCity_EventScript_Man3:: @ 814CBBE + msgbox LilycoveCity_Text_ContestHallInTown, MSGBOX_NPC end -LilycoveCity_EventScript_14CBC7:: @ 814CBC7 +LilycoveCity_EventScript_Girl:: @ 814CBC7 lock faceplayer - goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC - msgbox LilycoveCity_Text_168750, MSGBOX_DEFAULT + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_GirlEvilTeamGone + msgbox LilycoveCity_Text_StrangeCaveInCove, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CBDC:: @ 814CBDC - msgbox LilycoveCity_Text_168791, MSGBOX_DEFAULT +LilycoveCity_EventScript_GirlEvilTeamGone:: @ 814CBDC + msgbox LilycoveCity_Text_GoingToMoveDeleterForHMs, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CBE6:: @ 814CBE6 - msgbox LilycoveCity_Text_168819, MSGBOX_NPC +LilycoveCity_EventScript_RichBoy:: @ 814CBE6 + msgbox LilycoveCity_Text_ImFromKanto, MSGBOX_NPC end -LilycoveCity_EventScript_14CBEF:: @ 814CBEF +LilycoveCity_EventScript_Sailor2:: @ 814CBEF lock faceplayer - goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04 - msgbox LilycoveCity_Text_1688C1, MSGBOX_DEFAULT + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Sailor2EvilTeamGone + msgbox LilycoveCity_Text_EvilTeamBeenTrainingWailmer, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CC04:: @ 814CC04 - msgbox LilycoveCity_Text_168934, MSGBOX_DEFAULT +LilycoveCity_EventScript_Sailor2EvilTeamGone:: @ 814CC04 + msgbox LilycoveCity_Text_SomeonePuntedEvilTeamOut, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CC0E:: @ 814CC0E +LilycoveCity_EventScript_Woman2:: @ 814CC0E lock faceplayer - goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23 - msgbox LilycoveCity_Text_1689BF, MSGBOX_DEFAULT + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Woman2EvilTeamGone + msgbox LilycoveCity_Text_SomeoneStoleMyPokemon, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CC23:: @ 814CC23 - msgbox LilycoveCity_Text_168A55, MSGBOX_DEFAULT +LilycoveCity_EventScript_Woman2EvilTeamGone:: @ 814CC23 + msgbox LilycoveCity_Text_MissingPokemonCameBack, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CC2D:: @ 814CC2D - msgbox LilycoveCity_Text_168A8D, MSGBOX_NPC +LilycoveCity_EventScript_Man2:: @ 814CC2D + msgbox LilycoveCity_Text_ImArtDealer, MSGBOX_NPC end -LilycoveCity_EventScript_14CC36:: @ 814CC36 - msgbox LilycoveCity_Text_168B1F, MSGBOX_SIGN +LilycoveCity_EventScript_ExpertM1:: @ 814CC36 + msgbox LilycoveCity_Text_SeaRemainsForeverYoung, MSGBOX_SIGN end -LilycoveCity_EventScript_14CC3F:: @ 814CC3F - msgbox LilycoveCity_Text_168B9B, MSGBOX_SIGN +LilycoveCity_EventScript_ExpertF:: @ 814CC3F + msgbox LilycoveCity_Text_SixtyYearsAgoHusbandProposed, MSGBOX_SIGN end -LilycoveCity_EventScript_14CC48:: @ 814CC48 +LilycoveCity_EventScript_ExpertM2:: @ 814CC48 lock faceplayer - goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D - msgbox LilycoveCity_Text_168C16, MSGBOX_DEFAULT + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_ExpertM2EvilTeamGone + msgbox LilycoveCity_Text_EvilTeamRenovatedCavern, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CC5D:: @ 814CC5D - msgbox LilycoveCity_Text_168D15, MSGBOX_DEFAULT +LilycoveCity_EventScript_ExpertM2EvilTeamGone:: @ 814CC5D + msgbox LilycoveCity_Text_EvilTeamLotGoneForGood, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_14CC67:: @ 814CC67 - msgbox LilycoveCity_Text_168DA9, MSGBOX_SIGN +LilycoveCity_EventScript_CitySign:: @ 814CC67 + msgbox LilycoveCity_Text_CitySign, MSGBOX_SIGN end -LilycoveCity_EventScript_14CC70:: @ 814CC70 - msgbox LilycoveCity_Text_168DE1, MSGBOX_SIGN +LilycoveCity_EventScript_ContestHallSign:: @ 814CC70 + msgbox LilycoveCity_Text_ContestHallSign, MSGBOX_SIGN end -LilycoveCity_EventScript_14CC79:: @ 814CC79 - msgbox LilycoveCity_Text_168E2F, MSGBOX_SIGN +LilycoveCity_EventScript_MotelSign:: @ 814CC79 + msgbox LilycoveCity_Text_MotelSign, MSGBOX_SIGN end -LilycoveCity_EventScript_14CC82:: @ 814CC82 +LilycoveCity_EventScript_MuseumSign:: @ 814CC82 lockall specialvar VAR_0x8004, CountPlayerMuseumPaintings switch VAR_0x8004 - case 0, LilycoveCity_EventScript_14CCA2 - msgbox LilycoveCity_Text_168EA4, MSGBOX_DEFAULT + case 0, LilycoveCity_EventScript_MuseumSignNoPaintings + msgbox LilycoveCity_Text_MuseumSignPlayersExhibit, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_14CCA2:: @ 814CCA2 - msgbox LilycoveCity_Text_168E67, MSGBOX_DEFAULT +LilycoveCity_EventScript_MuseumSignNoPaintings:: @ 814CCA2 + msgbox LilycoveCity_Text_MuseumSign, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_14CCAC:: @ 814CCAC +LilycoveCity_EventScript_HarborSign:: @ 814CCAC lockall - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0 - msgbox LilycoveCity_Text_168EDA, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_HarborSignFerryReady + msgbox LilycoveCity_Text_HarborSignUnderConstruction, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_14CCC0:: @ 814CCC0 - msgbox LilycoveCity_Text_168F57, MSGBOX_DEFAULT +LilycoveCity_EventScript_HarborSignFerryReady:: @ 814CCC0 + msgbox LilycoveCity_Text_HarborSign, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_14CCCA:: @ 814CCCA - msgbox LilycoveCity_Text_168FA1, MSGBOX_SIGN +LilycoveCity_EventScript_TrainerFanClubSign:: @ 814CCCA + msgbox LilycoveCity_Text_TrainerFanClubSign, MSGBOX_SIGN end -LilycoveCity_EventScript_14CCD3:: @ 814CCD3 - msgbox LilycoveCity_Text_168FF3, MSGBOX_SIGN +LilycoveCity_EventScript_DepartmentStoreSign:: @ 814CCD3 + msgbox LilycoveCity_Text_DepartmentStoreSign, MSGBOX_SIGN end -LilycoveCity_EventScript_14CCDC:: @ 814CCDC - msgbox LilycoveCity_Text_169072, MSGBOX_SIGN +LilycoveCity_EventScript_MoveDeletersHouseSign:: @ 814CCDC + msgbox LilycoveCity_Text_MoveDeletersHouseSign, MSGBOX_SIGN end -LilycoveCity_EventScript_14CCE5:: @ 814CCE5 +LilycoveCity_EventScript_WailmerTrainerGrunt:: @ 814CCE5 lockall - goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18 - msgbox LilycoveCity_Text_16864A, MSGBOX_DEFAULT + goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_MetWailmerTrainer + msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_Text_168675, MSGBOX_DEFAULT + msgbox LilycoveCity_Text_GetLostMessingUpTraining, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_MET_WAILMER_TRAINER releaseall end -LilycoveCity_EventScript_14CD18:: @ 814CD18 - msgbox LilycoveCity_Text_16864A, MSGBOX_DEFAULT +LilycoveCity_EventScript_MetWailmerTrainer:: @ 814CD18 + msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_14CD22:: @ 814CD22 - msgbox LilycoveCity_Text_168455, MSGBOX_NPC +LilycoveCity_EventScript_EvilTeamGrunt1:: @ 814CD22 + msgbox LilycoveCity_Text_MovedLootIntoHideoutToday, MSGBOX_NPC end -LilycoveCity_EventScript_14CD2B:: @ 814CD2B - msgbox LilycoveCity_Text_1684C2, MSGBOX_NPC +LilycoveCity_EventScript_EvilTeamGrunt2:: @ 814CD2B + msgbox LilycoveCity_Text_ChanceToDoBigThings, MSGBOX_NPC end -LilycoveCity_EventScript_14CD34:: @ 814CD34 - msgbox LilycoveCity_Text_168573, MSGBOX_NPC +LilycoveCity_EventScript_EvilTeamGrunt3:: @ 814CD34 + msgbox LilycoveCity_Text_DontGoNearCaveInCove, MSGBOX_NPC end -LilycoveCity_EventScript_14CD3D:: @ 814CD3D - msgbox LilycoveCity_Text_1685EB, MSGBOX_NPC +LilycoveCity_EventScript_EvilTeamGrunt4:: @ 814CD3D + msgbox LilycoveCity_Text_IfWorldBecomesOurs, MSGBOX_NPC end -LilycoveCity_EventScript_14CD46:: @ 814CD46 +LilycoveCity_EventScript_Rival:: @ 814CD46 lock faceplayer checkplayergender compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_EventScript_14CD60 + goto_if_eq LilycoveCity_EventScript_May compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_EventScript_14CDD3 + goto_if_eq LilycoveCity_EventScript_Brendan end -LilycoveCity_EventScript_14CD60:: @ 814CD60 +LilycoveCity_EventScript_May:: @ 814CD60 playbgm MUS_ENCOUNTER_MAY, TRUE - call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0 - call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9 + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattleAgain + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattle compare VAR_RESULT, NO - goto_if_eq LilycoveCity_EventScript_14CDC2 - msgbox LilycoveCity_Text_167B94, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_EventScript_DeclineMayBattle + msgbox LilycoveCity_Text_MayWontBeBeaten, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, LilycoveCity_EventScript_14CE46 - case 1, LilycoveCity_EventScript_14CE56 - case 2, LilycoveCity_EventScript_14CE66 + case 0, LilycoveCity_EventScript_BattleMayTreecko + case 1, LilycoveCity_EventScript_BattleMayTorchic + case 2, LilycoveCity_EventScript_BattleMayMudkip end -LilycoveCity_EventScript_14CDB0:: @ 814CDB0 - msgbox LilycoveCity_Text_167B55, MSGBOX_YESNO +LilycoveCity_EventScript_MayAskToBattleAgain:: @ 814CDB0 + msgbox LilycoveCity_Text_MayBattleMe, MSGBOX_YESNO return -LilycoveCity_EventScript_14CDB9:: @ 814CDB9 - msgbox LilycoveCity_Text_1679BF, MSGBOX_YESNO +LilycoveCity_EventScript_MayAskToBattle:: @ 814CDB9 + msgbox LilycoveCity_Text_MayShoppingLetsBattle, MSGBOX_YESNO return -LilycoveCity_EventScript_14CDC2:: @ 814CDC2 +LilycoveCity_EventScript_DeclineMayBattle:: @ 814CDC2 setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - msgbox LilycoveCity_Text_167AEB, MSGBOX_DEFAULT + msgbox LilycoveCity_Text_MayNotRaisingPokemon, MSGBOX_DEFAULT savebgm 0 fadedefaultbgm release end -LilycoveCity_EventScript_14CDD3:: @ 814CDD3 +LilycoveCity_EventScript_Brendan:: @ 814CDD3 playbgm MUS_ENCOUNTER_BRENDAN, TRUE - call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23 - call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattleAgain + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattle compare VAR_RESULT, NO - goto_if_eq LilycoveCity_EventScript_14CE35 - msgbox LilycoveCity_Text_1680A9, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_EventScript_DeclineBrendanBattle + msgbox LilycoveCity_Text_BrendanWontBeBeaten, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, LilycoveCity_EventScript_14CE76 - case 1, LilycoveCity_EventScript_14CE86 - case 2, LilycoveCity_EventScript_14CE96 + case 0, LilycoveCity_EventScript_BattleBrendanTreecko + case 1, LilycoveCity_EventScript_BattleBrendanTorchic + case 2, LilycoveCity_EventScript_BattleBrendanMudkip end -LilycoveCity_EventScript_14CE23:: @ 814CE23 - msgbox LilycoveCity_Text_168067, MSGBOX_YESNO +LilycoveCity_EventScript_BrendanAskToBattleAgain:: @ 814CE23 + msgbox LilycoveCity_Text_BrendanBattleMe, MSGBOX_YESNO return -LilycoveCity_EventScript_14CE2C:: @ 814CE2C - msgbox LilycoveCity_Text_167F75, MSGBOX_YESNO +LilycoveCity_EventScript_BrendanAskToBattle:: @ 814CE2C + msgbox LilycoveCity_Text_BrendanShoppingLetsBattle, MSGBOX_YESNO return -LilycoveCity_EventScript_14CE35:: @ 814CE35 +LilycoveCity_EventScript_DeclineBrendanBattle:: @ 814CE35 setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - msgbox LilycoveCity_Text_16802C, MSGBOX_DEFAULT + msgbox LilycoveCity_Text_BrendanNoConfidence, MSGBOX_DEFAULT savebgm 0 fadedefaultbgm release end -LilycoveCity_EventScript_14CE46:: @ 814CE46 - trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_167BD5 - goto LilycoveCity_EventScript_14CEA6 +LilycoveCity_EventScript_BattleMayTreecko:: @ 814CE46 + trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TREECKO, LilycoveCity_Text_MayDefeat + goto LilycoveCity_EventScript_DefeatedMay end -LilycoveCity_EventScript_14CE56:: @ 814CE56 - trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_167BD5 - goto LilycoveCity_EventScript_14CEA6 +LilycoveCity_EventScript_BattleMayTorchic:: @ 814CE56 + trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TORCHIC, LilycoveCity_Text_MayDefeat + goto LilycoveCity_EventScript_DefeatedMay end -LilycoveCity_EventScript_14CE66:: @ 814CE66 - trainerbattle_no_intro TRAINER_MAY_10, LilycoveCity_Text_167BD5 - goto LilycoveCity_EventScript_14CEA6 +LilycoveCity_EventScript_BattleMayMudkip:: @ 814CE66 + trainerbattle_no_intro TRAINER_MAY_LILYCOVE_MUDKIP, LilycoveCity_Text_MayDefeat + goto LilycoveCity_EventScript_DefeatedMay end -LilycoveCity_EventScript_14CE76:: @ 814CE76 - trainerbattle_no_intro TRAINER_BRENDAN_11, LilycoveCity_Text_1680E4 - goto LilycoveCity_EventScript_14CF12 +LilycoveCity_EventScript_BattleBrendanTreecko:: @ 814CE76 + trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TREECKO, LilycoveCity_Text_BrendanDefeat + goto LilycoveCity_EventScript_DefeatedBrendan end -LilycoveCity_EventScript_14CE86:: @ 814CE86 - trainerbattle_no_intro TRAINER_BRENDAN_12, LilycoveCity_Text_1680E4 - goto LilycoveCity_EventScript_14CF12 +LilycoveCity_EventScript_BattleBrendanTorchic:: @ 814CE86 + trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TORCHIC, LilycoveCity_Text_BrendanDefeat + goto LilycoveCity_EventScript_DefeatedBrendan end -LilycoveCity_EventScript_14CE96:: @ 814CE96 - trainerbattle_no_intro TRAINER_BRENDAN_10, LilycoveCity_Text_1680E4 - goto LilycoveCity_EventScript_14CF12 +LilycoveCity_EventScript_BattleBrendanMudkip:: @ 814CE96 + trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_MUDKIP, LilycoveCity_Text_BrendanDefeat + goto LilycoveCity_EventScript_DefeatedBrendan end -LilycoveCity_EventScript_14CEA6:: @ 814CEA6 - msgbox LilycoveCity_Text_167C6B, MSGBOX_DEFAULT +LilycoveCity_EventScript_DefeatedMay:: @ 814CEA6 + msgbox LilycoveCity_Text_MayGoingBackToLittleroot, MSGBOX_DEFAULT setvar VAR_RESULT, 0 - call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge compare VAR_RESULT, 0 - call_if_eq LilycoveCity_EventScript_14CEEE + call_if_eq LilycoveCity_EventScript_MayCollectBadges compare VAR_RESULT, 1 - call_if_eq LilycoveCity_EventScript_14CEF7 + call_if_eq LilycoveCity_EventScript_MayPokemonLeague clearflag FLAG_HIDE_MAY_UPSTAIRS clearflag FLAG_HIDE_MAY_PICHU_DOLL - goto LilycoveCity_EventScript_14CF6B + goto LilycoveCity_EventScript_RivalFlyAway end -LilycoveCity_EventScript_14CEDE:: @ 814CEDE - goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8 +LilycoveCity_EventScript_CheckFinalBadge:: @ 814CEDE + goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_HasFinalBadge return -LilycoveCity_EventScript_14CEE8:: @ 814CEE8 +LilycoveCity_EventScript_HasFinalBadge:: @ 814CEE8 setvar VAR_RESULT, 1 return -LilycoveCity_EventScript_14CEEE:: @ 814CEEE - msgbox LilycoveCity_Text_167D08, MSGBOX_DEFAULT +LilycoveCity_EventScript_MayCollectBadges:: @ 814CEEE + msgbox LilycoveCity_Text_MayYouGoingToCollectBadges, MSGBOX_DEFAULT return -LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09 - msgbox LilycoveCity_Text_167DDD, MSGBOX_DEFAULT +LilycoveCity_EventScript_MayPokemonLeague:: @ 814CEF7 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_MayBattleTower + msgbox LilycoveCity_Text_MayYouGoingToPokemonLeague, MSGBOX_DEFAULT return -LilycoveCity_EventScript_14CF09:: @ 814CF09 - msgbox LilycoveCity_Text_167EAA, MSGBOX_DEFAULT +LilycoveCity_EventScript_MayBattleTower:: @ 814CF09 + msgbox LilycoveCity_Text_MayYouGoingToBattleTower, MSGBOX_DEFAULT return -LilycoveCity_EventScript_14CF12:: @ 814CF12 - msgbox LilycoveCity_Text_168149, MSGBOX_DEFAULT +LilycoveCity_EventScript_DefeatedBrendan:: @ 814CF12 + msgbox LilycoveCity_Text_BrendanGoingBackToLittleroot, MSGBOX_DEFAULT setvar VAR_RESULT, 0 - call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge compare VAR_RESULT, 0 - call_if_eq LilycoveCity_EventScript_14CF47 + call_if_eq LilycoveCity_EventScript_BrendanCollectBadges compare VAR_RESULT, 1 - call_if_eq LilycoveCity_EventScript_14CF50 + call_if_eq LilycoveCity_EventScript_BrendanPokemonLeague clearflag FLAG_HIDE_BRENDAN_UPSTAIRS - goto LilycoveCity_EventScript_14CF6B + goto LilycoveCity_EventScript_RivalFlyAway end -LilycoveCity_EventScript_14CF47:: @ 814CF47 - msgbox LilycoveCity_Text_1681EA, MSGBOX_DEFAULT +LilycoveCity_EventScript_BrendanCollectBadges:: @ 814CF47 + msgbox LilycoveCity_Text_BrendanYouGoingToCollectBadges, MSGBOX_DEFAULT return -LilycoveCity_EventScript_14CF50:: @ 814CF50 - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62 - msgbox LilycoveCity_Text_168282, MSGBOX_DEFAULT +LilycoveCity_EventScript_BrendanPokemonLeague:: @ 814CF50 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_BrendanBattleTower + msgbox LilycoveCity_Text_BrendanYouGoingToPokemonLeague, MSGBOX_DEFAULT return -LilycoveCity_EventScript_14CF62:: @ 814CF62 - msgbox LilycoveCity_Text_16835A, MSGBOX_DEFAULT +LilycoveCity_EventScript_BrendanBattleTower:: @ 814CF62 + msgbox LilycoveCity_Text_BrendanYouGoingToBattleTower, MSGBOX_DEFAULT return -LilycoveCity_EventScript_14CF6B:: @ 814CF6B +LilycoveCity_EventScript_RivalFlyAway:: @ 814CF6B closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 diff --git a/data/maps/LilycoveCity/text.inc b/data/maps/LilycoveCity/text.inc index a9ff29ec4..6b5759a45 100644 --- a/data/maps/LilycoveCity/text.inc +++ b/data/maps/LilycoveCity/text.inc @@ -1,4 +1,4 @@ -LilycoveCity_Text_1679BF:: @ 81679BF +LilycoveCity_Text_MayShoppingLetsBattle:: @ 81679BF .string "MAY: Oh, hey?\n" .string "{PLAYER}{KUN}, are you shopping, too?\p" .string "I bought a whole bunch of DOLLS and\n" @@ -11,35 +11,35 @@ LilycoveCity_Text_1679BF:: @ 81679BF .string "I'll battle with you, so you can show\n" .string "me your POKéMON, {PLAYER}{KUN}.$" -LilycoveCity_Text_167AEB:: @ 8167AEB +LilycoveCity_Text_MayNotRaisingPokemon:: @ 8167AEB .string "MAY: Oh, why? {PLAYER}{KUN}, haven't you\n" .string "been raising your POKéMON?\p" .string "That's not a very good showing as a\n" .string "TRAINER...$" -LilycoveCity_Text_167B55:: @ 8167B55 +LilycoveCity_Text_MayBattleMe:: @ 8167B55 .string "MAY: Come on, battle with me, so I can\n" .string "check out your POKéMON!$" -LilycoveCity_Text_167B94:: @ 8167B94 +LilycoveCity_Text_MayWontBeBeaten:: @ 8167B94 .string "MAY: The POKéMON I raised won't be\n" .string "beaten by your POKéMON, {PLAYER}{KUN}!$" -LilycoveCity_Text_167BD5:: @ 8167BD5 +LilycoveCity_Text_MayDefeat:: @ 8167BD5 .string "... ... ... ... ... ... ... ...\p" .string "I remember the battle I had with you,\n" .string "{PLAYER}{KUN}, on ROUTE 103.\p" .string "That battle helped you become this\n" .string "strong, {PLAYER}{KUN}, didn't it?$" -LilycoveCity_Text_167C6B:: @ 8167C6B +LilycoveCity_Text_MayGoingBackToLittleroot:: @ 8167C6B .string "MAY: I'm thinking of going back to\n" .string "LITTLEROOT soon.\p" .string "I've caught a decent group of POKéMON,\n" .string "and my POKéDEX is coming along, so\l" .string "I'm going home to show my dad.$" -LilycoveCity_Text_167D08:: @ 8167D08 +LilycoveCity_Text_MayYouGoingToCollectBadges:: @ 8167D08 .string "{PLAYER}{KUN}, what are you going to do?\p" .string "Collect all the GYM BADGES and take\n" .string "the POKéMON LEAGUE challenge?\p" @@ -48,7 +48,7 @@ LilycoveCity_Text_167D08:: @ 8167D08 .string "POKéDEX. I'll complete it before you!\p" .string "See you!$" -LilycoveCity_Text_167DDD:: @ 8167DDD +LilycoveCity_Text_MayYouGoingToPokemonLeague:: @ 8167DDD .string "{PLAYER}{KUN}, what are you going to do?\p" .string "Are you taking the POKéMON LEAGUE\n" .string "challenge?\p" @@ -58,7 +58,7 @@ LilycoveCity_Text_167DDD:: @ 8167DDD .string "but I'll finish my POKéDEX before you!\p" .string "See you!$" -LilycoveCity_Text_167EAA:: @ 8167EAA +LilycoveCity_Text_MayYouGoingToBattleTower:: @ 8167EAA .string "{PLAYER}{KUN}, what are you going to do?\p" .string "Are you taking the BATTLE TOWER\n" .string "challenge?\p" @@ -68,7 +68,7 @@ LilycoveCity_Text_167EAA:: @ 8167EAA .string "but I'll finish my POKéDEX before you!\p" .string "See you!$" -LilycoveCity_Text_167F75:: @ 8167F75 +LilycoveCity_Text_BrendanShoppingLetsBattle:: @ 8167F75 .string "BRENDAN: Oh, hey, it's {PLAYER}.\p" .string "I'm running an errand for my dad.\n" .string "No, I'm not buying any DOLLS.\p" @@ -76,39 +76,39 @@ LilycoveCity_Text_167F75:: @ 8167F75 .string "Want to have a battle to see who's been\n" .string "raising POKéMON better?$" -LilycoveCity_Text_16802C:: @ 816802C +LilycoveCity_Text_BrendanNoConfidence:: @ 816802C .string "BRENDAN: Oh, what's the matter?\n" .string "Don't have the confidence?$" -LilycoveCity_Text_168067:: @ 8168067 +LilycoveCity_Text_BrendanBattleMe:: @ 8168067 .string "BRENDAN: Want to battle to see who's\n" .string "been raising POKéMON better?$" -LilycoveCity_Text_1680A9:: @ 81680A9 +LilycoveCity_Text_BrendanWontBeBeaten:: @ 81680A9 .string "BRENDAN: Aww, but you know I'm not\n" .string "going to lose to no {PLAYER}.$" -LilycoveCity_Text_1680E4:: @ 81680E4 +LilycoveCity_Text_BrendanDefeat:: @ 81680E4 .string "Humph...\n" .string "You've done a lot of raising.\p" .string "That stings a bit - I had a head start\n" .string "on you as a TRAINER...$" -LilycoveCity_Text_168149:: @ 8168149 +LilycoveCity_Text_BrendanGoingBackToLittleroot:: @ 8168149 .string "BRENDAN: I...\n" .string "I plan on going home to LITTLEROOT.\p" .string "You know I'm helping out my dad on his\n" .string "POKéDEX. It's coming together pretty\l" .string "decently, so I should go show him.$" -LilycoveCity_Text_1681EA:: @ 81681EA +LilycoveCity_Text_BrendanYouGoingToCollectBadges:: @ 81681EA .string "{PLAYER}, what are you going to do?\p" .string "Collect all the GYM BADGES and take\n" .string "the POKéMON LEAGUE challenge?\p" .string "Maybe I'll do that, too...\p" .string "Well, anyway, hang in there!$" -LilycoveCity_Text_168282:: @ 8168282 +LilycoveCity_Text_BrendanYouGoingToPokemonLeague:: @ 8168282 .string "{PLAYER}, what are you going to do?\p" .string "Since you're that strong, are you\n" .string "taking the POKéMON LEAGUE challenge?\p" @@ -117,7 +117,7 @@ LilycoveCity_Text_168282:: @ 8168282 .string "you, {PLAYER}.\p" .string "Well, anyway, hang in there!$" -LilycoveCity_Text_16835A:: @ 816835A +LilycoveCity_Text_BrendanYouGoingToBattleTower:: @ 816835A .string "{PLAYER}, what are you going to do?\p" .string "Since you're that strong, are you\n" .string "taking the BATTLE TOWER challenge?\p" @@ -127,14 +127,14 @@ LilycoveCity_Text_16835A:: @ 816835A .string "Maybe I will go to the BATTLE TOWER.\p" .string "Well, anyway, hang in there!$" -LilycoveCity_Text_168455:: @ 8168455 +LilycoveCity_Text_MovedLootIntoHideoutToday:: @ 8168455 .string "Fufufu...\p" .string "We moved more loot into our secret\n" .string "HIDEOUT today...\p" .string "Wh-who are you?!\n" .string "I was just talking to myself!$" -LilycoveCity_Text_1684C2:: @ 81684C2 +LilycoveCity_Text_ChanceToDoBigThings:: @ 81684C2 .string "I'm just a GRUNT, so I don't know what\n" .string "the BOSS is thinking...\p" .string "But being on TEAM {EVIL_TEAM}, I know I'll get\n" @@ -142,43 +142,43 @@ LilycoveCity_Text_1684C2:: @ 81684C2 .string "Wh-who are you?!\n" .string "I was just talking to myself!$" -LilycoveCity_Text_168573:: @ 8168573 +LilycoveCity_Text_DontGoNearCaveInCove:: @ 8168573 .string "Hey, you!\p" .string "Don't go near the cave in the cove!\p" .string "Why? You don't need a reason why!\n" .string "I'm an adult, so you just listen to me!$" -LilycoveCity_Text_1685EB:: @ 81685EB +LilycoveCity_Text_IfWorldBecomesOurs:: @ 81685EB .string "If this whole wide world becomes ours,\n" .string "TEAM {EVIL_TEAM}'s, it will be a happier\l" .string "place for POKéMON, too.$" -LilycoveCity_Text_16864A:: @ 816864A +LilycoveCity_Text_WailmerLeapOutOfWater:: @ 816864A .string "There! WAILMER!\n" .string "Leap out of the water now!$" -LilycoveCity_Text_168675:: @ 8168675 +LilycoveCity_Text_GetLostMessingUpTraining:: @ 8168675 .string "Hunh? What do you want?\p" .string "You're messing up our training, so can\n" .string "you, like, get lost?$" -LilycoveCity_Text_1686C9:: @ 81686C9 +LilycoveCity_Text_ContestHallInTown:: @ 81686C9 .string "The POKéMON that come to this CONTEST\n" .string "HALL are all prizewinners.\l" .string "They come from all over the country.\p" .string "My heart swells with excitement!$" -LilycoveCity_Text_168750:: @ 8168750 +LilycoveCity_Text_StrangeCaveInCove:: @ 8168750 .string "Have you seen that strange cave in\n" .string "the cove at the edge of town?$" -LilycoveCity_Text_168791:: @ 8168791 +LilycoveCity_Text_GoingToMoveDeleterForHMs:: @ 8168791 .string "I'm going to teach my POKéMON some new\n" .string "moves for entering a CONTEST.\p" .string "So, I'm going to see the MOVE DELETER\n" .string "and make it forget HM moves.$" -LilycoveCity_Text_168819:: @ 8168819 +LilycoveCity_Text_ImFromKanto:: @ 8168819 .string "I came from KANTO.\p" .string "The HOENN region is beautiful with\n" .string "all its water and verdant nature.\p" @@ -186,50 +186,50 @@ LilycoveCity_Text_168819:: @ 8168819 .string "Could there be rare POKéMON that live\n" .string "only in this area?$" -LilycoveCity_Text_1688C1:: @ 81688C1 +LilycoveCity_Text_EvilTeamBeenTrainingWailmer:: @ 81688C1 .string "TEAM {EVIL_TEAM}'s been training their\n" .string "WAILMER in the cove.\p" .string "We SAILORS can't get our boats out\n" .string "to sea with them in the way!$" -LilycoveCity_Text_168934:: @ 8168934 +LilycoveCity_Text_SomeonePuntedEvilTeamOut:: @ 8168934 .string "Ahoy, did you know?\p" .string "Someone punted TEAM {EVIL_TEAM} out of the\n" .string "way for us!\p" .string "That got the WAILMER out of the cove,\n" .string "so we can get our boats out again.$" -LilycoveCity_Text_1689BF:: @ 81689BF +LilycoveCity_Text_SomeoneStoleMyPokemon:: @ 81689BF .string "I was taking a relaxing snooze at the\n" .string "seaside inn to the sound of waves...\p" .string "When someone stole my POKéMON!\p" .string "Who's the abductor?\n" .string "TEAM {EVIL_TEAM}? Is it TEAM {EVIL_TEAM}?$" -LilycoveCity_Text_168A55:: @ 8168A55 +LilycoveCity_Text_MissingPokemonCameBack:: @ 8168A55 .string "My missing POKéMON...\n" .string "It came back without me noticing!$" -LilycoveCity_Text_168A8D:: @ 8168A8D +LilycoveCity_Text_ImArtDealer:: @ 8168A8D .string "I'm an ART DEALER.\p" .string "I am a buyer and seller of fine art,\n" .string "especially paintings.\p" .string "I've heard that the MUSEUM here has\n" .string "magnificent works on exhibit...$" -LilycoveCity_Text_168B1F:: @ 8168B1F +LilycoveCity_Text_SeaRemainsForeverYoung:: @ 8168B1F .string "Even as we grow old and wrinkled, the\n" .string "sea remains forever young with the\l" .string "vivid brilliance of life...\p" .string "Fwohoho fwohohohoho...$" -LilycoveCity_Text_168B9B:: @ 8168B9B +LilycoveCity_Text_SixtyYearsAgoHusbandProposed:: @ 8168B9B .string "It was sixty years ago that my husband\n" .string "proposed to me here.\l" .string "The sea remains as beautiful as ever.\p" .string "Mufufufu mufufufufufu...$" -LilycoveCity_Text_168C16:: @ 8168C16 +LilycoveCity_Text_EvilTeamRenovatedCavern:: @ 8168C16 .string "Hm, you know of the peculiar cavern\n" .string "in this cove?\p" .string "That had been a natural formation, but\n" @@ -240,62 +240,62 @@ LilycoveCity_Text_168C16:: @ 8168C16 .string "But what they do and what they say\n" .string "don't match at all!$" -LilycoveCity_Text_168D15:: @ 8168D15 +LilycoveCity_Text_EvilTeamLotGoneForGood:: @ 8168D15 .string "That cave in the cove...\n" .string "It seems someone sealed the entrance,\l" .string "so no one can enter it anymore.\p" .string "That TEAM {EVIL_TEAM} lot, they must\n" .string "have gone away for good.$" -LilycoveCity_Text_168DA9:: @ 8168DA9 +LilycoveCity_Text_CitySign:: @ 8168DA9 .string "LILYCOVE CITY\p" .string "“Where the land ends and the\n" .string "sea begins.”$" -LilycoveCity_Text_168DE1:: @ 8168DE1 +LilycoveCity_Text_ContestHallSign:: @ 8168DE1 .string "POKéMON CONTESTS\n" .string "MASTER RANK REGISTRATION\p" .string "“Enter CONTESTS with your friends!”$" -LilycoveCity_Text_168E2F:: @ 8168E2F +LilycoveCity_Text_MotelSign:: @ 8168E2F .string "COVE LILY MOTEL\p" .string "“Remember us as COVE LILY of\n" .string "LILYCOVE.”$" -LilycoveCity_Text_168E67:: @ 8168E67 +LilycoveCity_Text_MuseumSign:: @ 8168E67 .string "LILYCOVE MUSEUM\p" .string "“POKéMON Masterpiece Collection\n" .string "on exhibit!”$" -LilycoveCity_Text_168EA4:: @ 8168EA4 +LilycoveCity_Text_MuseumSignPlayersExhibit:: @ 8168EA4 .string "LILYCOVE MUSEUM\p" .string "“{PLAYER}'s POKéMON Collection\n" .string "on exhibit!”$" -LilycoveCity_Text_168EDA:: @ 8168EDA +LilycoveCity_Text_HarborSignUnderConstruction:: @ 8168EDA .string "LILYCOVE CITY HARBOR\p" .string "“The ferry S.S. TIDAL is under\n" .string "construction in SLATEPORT CITY.\p" .string "“Service is scheduled to begin\n" .string "shortly.”$" -LilycoveCity_Text_168F57:: @ 8168F57 +LilycoveCity_Text_HarborSign:: @ 8168F57 .string "LILYCOVE CITY HARBOR\p" .string "“Enjoy a delightful cruise on the\n" .string "ferry S.S. TIDAL.”$" -LilycoveCity_Text_168FA1:: @ 8168FA1 +LilycoveCity_Text_TrainerFanClubSign:: @ 8168FA1 .string "POKéMON TRAINER FAN CLUB\p" .string "The names of TRAINERS are scribbled\n" .string "all over the sign...$" -LilycoveCity_Text_168FF3:: @ 8168FF3 +LilycoveCity_Text_DepartmentStoreSign:: @ 8168FF3 .string "LILYCOVE DEPARTMENT STORE\p" .string "“Overflowing with great merchandise\n" .string "and excitement!\p" .string "“A great place to find that something\n" .string "you need!”$" -LilycoveCity_Text_169072:: @ 8169072 +LilycoveCity_Text_MoveDeletersHouseSign:: @ 8169072 .string "MOVE DELETER'S HOUSE\p" .string "“Unwanted POKéMON moves deleted.”$" diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 3d2bcba23..88fc7efa5 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -96,23 +96,23 @@ LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 return LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6 - clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 return LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA - clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 return LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE - clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 return LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2 - clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 return LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6 - clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS return LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA @@ -749,7 +749,7 @@ LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074 end LilycoveCity_ContestLobby_EventScript_15907B:: @ 815907B - msgbox LilycoveCity_ContestLobby_Text_1B7225, MSGBOX_NPC + msgbox SlateportCity_ContestLobby_Text_LetsGetBlendingAlready, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_159084:: @ 8159084 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 795006b57..1037c7ead 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5", + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner", "flag": "0" } ], @@ -56,7 +56,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_15834D" + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV" } ], "bg_events": [] diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index aa2fe7977..3473dab5c 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -1,43 +1,43 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 .byte 0 -LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 +LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner:: @ 81582C5 lockall - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF - msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear + goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted + msgbox LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot, MSGBOX_DEFAULT applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, MSGBOX_DEFAULT + msgbox LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithEvilTeam, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF - msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CCE, MSGBOX_DEFAULT +LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted:: @ 81582FF + msgbox LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem, MSGBOX_DEFAULT applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, MSGBOX_DEFAULT + msgbox LilycoveCity_CoveLilyMotel_1F_Text_HeardEvilTeamHideoutBusted, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_186E57, MSGBOX_DEFAULT +LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear:: @ 8158326 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar, MSGBOX_DEFAULT applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, MSGBOX_DEFAULT + msgbox LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D +LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: @ 815834D lockall playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -46,28 +46,28 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, MSGBOX_DEFAULT + msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_158395 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A + applymovement LOCALID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn waitmovement 0 release end -LilycoveCity_CoveLilyMotel_1F_Movement_158395:: @ 8158395 +LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV:: @ 8158395 face_right lock_facing_direction walk_left unlock_facing_direction step_end -LilycoveCity_CoveLilyMotel_1F_Movement_15839A:: @ 815839A +LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer:: @ 815839A walk_up step_end -LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C +LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn:: @ 815839C face_down walk_down face_up diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc index 9ef849202..78f05362e 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc @@ -1,4 +1,4 @@ -LilycoveCity_CoveLilyMotel_1F_Text_186B71:: @ 8186B71 +LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot:: @ 8186B71 .string "Hm, so they doubled the guests by\n" .string "using POKéMON as attractions?\p" .string "Hm, well, maybe I should make a cute\n" @@ -6,17 +6,17 @@ LilycoveCity_CoveLilyMotel_1F_Text_186B71:: @ 8186B71 .string "I wonder if that will attract more\n" .string "guests to stay with us?$" -LilycoveCity_CoveLilyMotel_1F_Text_186C2B:: @ 8186C2B +LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithEvilTeam:: @ 8186C2B .string "Oh, sorry, sorry!\n" .string "I was too involved in watching TV!\p" .string "Since that TEAM {EVIL_TEAM} came to town,\n" .string "the tourists have been staying away.$" -LilycoveCity_CoveLilyMotel_1F_Text_186CA6:: @ 8186CA6 +LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV:: @ 8186CA6 .string "Hey, down in front!\n" .string "I can't see the TV!$" -LilycoveCity_CoveLilyMotel_1F_Text_186CCE:: @ 8186CCE +LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem:: @ 8186CCE .string "Amazing! You're telling me a POKéMON\n" .string "found someone's lost item?\p" .string "That's something. If we had some smart\n" @@ -24,7 +24,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_186CCE:: @ 8186CCE .string "We could recover anything that our\n" .string "guests mislaid...$" -LilycoveCity_CoveLilyMotel_1F_Text_186D7F:: @ 8186D7F +LilycoveCity_CoveLilyMotel_1F_Text_HeardEvilTeamHideoutBusted:: @ 8186D7F .string "Oh, sorry, sorry!\n" .string "I was too involved in watching TV!\p" .string "I heard that someone busted the\n" @@ -34,7 +34,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_186D7F:: @ 8186D7F .string "It was a company called... Uh...\n" .string "GAME something...$" -LilycoveCity_CoveLilyMotel_1F_Text_186E57:: @ 8186E57 +LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar:: @ 8186E57 .string "Amazing! A house-sitting POKéMON\n" .string "caught a burglar?\p" .string "That's something. If we had a tough\n" @@ -42,7 +42,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_186E57:: @ 8186E57 .string "We would be able to provide our guests\n" .string "with greater safety.$" -LilycoveCity_CoveLilyMotel_1F_Text_186F09:: @ 8186F09 +LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner:: @ 8186F09 .string "Oh, sorry, sorry!\n" .string "I was too involved in watching TV.\p" .string "Oh, yes. A big group of guests arrived\n" diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 85665259e..f23907a4a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_158400", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_158412", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_158409", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Woman", "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" } ], diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index c6fa2f6c0..6724cfc8f 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -1,30 +1,30 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0 .byte 0 -LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 +LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner:: @ 81583A1 lock faceplayer - call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 - call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex + call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma specialvar VAR_RESULT, CompletedHoennPokedex compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 + goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare release end -LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_186FE7, MSGBOX_DEFAULT +LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex:: @ 81583C7 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex, MSGBOX_DEFAULT return -LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 +LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare:: @ 81583D0 setflag FLAG_TEMP_2 playfanfare MUS_OBTAIN_ITEM waitfanfare - goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + goto LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma end -LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD - message LilycoveCity_CoveLilyMotel_2F_Text_18708F +LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma:: @ 81583DD + message LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis waitmessage call Common_EventScript_PlayGymBadgeFanfare special ScrSpecial_ShowDiploma @@ -32,22 +32,22 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD release end -LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE:: @ 81583EE - msgbox LilycoveCity_CoveLilyMotel_2F_Text_187149, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer:: @ 81583EE + msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer, MSGBOX_NPC end -LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7:: @ 81583F7 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_18719E, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist:: @ 81583F7 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist, MSGBOX_NPC end -LilycoveCity_CoveLilyMotel_2F_EventScript_158400:: @ 8158400 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_1871DF, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan:: @ 8158400 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute, MSGBOX_NPC end -LilycoveCity_CoveLilyMotel_2F_EventScript_158409:: @ 8158409 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_18729A, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_Woman:: @ 8158409 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart, MSGBOX_NPC end -LilycoveCity_CoveLilyMotel_2F_EventScript_158412:: @ 8158412 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_1872D4, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid:: @ 8158412 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy, MSGBOX_NPC end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc index d4593cb40..cd054d9b4 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc @@ -1,4 +1,4 @@ -LilycoveCity_CoveLilyMotel_2F_Text_186FE7:: @ 8186FE7 +LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex:: @ 8186FE7 .string "I'm the GAME DESIGNER.\p" .string "Oh, is that right?\n" .string "You're working on a POKéDEX?\p" @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_186FE7:: @ 8186FE7 .string "If you do complete it, please come\n" .string "show me.$" -LilycoveCity_CoveLilyMotel_2F_Text_18708F:: @ 818708F +LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis:: @ 818708F .string "Wow! That's awesome!\n" .string "Yep, it's totally awesome!\p" .string "This POKéDEX is completely filled!\n" @@ -16,17 +16,17 @@ LilycoveCity_CoveLilyMotel_2F_Text_18708F:: @ 818708F .string "Let me give you something in\n" .string "recognition of your feat!$" -LilycoveCity_CoveLilyMotel_2F_Text_187149:: @ 8187149 +LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer:: @ 8187149 .string "Me? You're talking to me?\n" .string "I'm the PROGRAMMER.\p" .string "I wonder what the SLOTS are\n" .string "like here.$" -LilycoveCity_CoveLilyMotel_2F_Text_18719E:: @ 818719E +LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist:: @ 818719E .string "I'm the GRAPHIC ARTIST! Aren't the\n" .string "POKéMON of HOENN interesting?$" -LilycoveCity_CoveLilyMotel_2F_Text_1871DF:: @ 81871DF +LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute:: @ 81871DF .string "The girl TUBERS, they're cute, hey?\n" .string "To battle against a cute TUBER...\p" .string "Whoop, it drives me wild!\p" @@ -34,11 +34,11 @@ LilycoveCity_CoveLilyMotel_2F_Text_1871DF:: @ 81871DF .string "A 2-on-2 battle with TWINS...\p" .string "Whoop, it's unbearably fun!$" -LilycoveCity_CoveLilyMotel_2F_Text_18729A:: @ 818729A +LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart:: @ 818729A .string "The sea breeze tickles my heart.\n" .string "It feels wonderful here!$" -LilycoveCity_CoveLilyMotel_2F_Text_1872D4:: @ 81872D4 +LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy:: @ 81872D4 .string "You never know when and where\n" .string "people will challenge you.\p" .string "That's why I never leave home without\n" diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index dad77acc2..34d6de627 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreElevator_EventScript_15A39C", + "script": "LilycoveCity_DepartmentStoreElevator_EventScript_Attendant", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index eca853db4..67fc101cb 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -1,75 +1,75 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B .byte 0 -LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C +LilycoveCity_DepartmentStoreElevator_EventScript_Attendant:: @ 815A39C lock faceplayer - call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF + call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR special DisplayCurrentElevatorFloor - message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 + message LilycoveCity_DepartmentStoreElevator_Text_WhichFloorWouldYouLike waitmessage multichoice 0, 0, 57, 0 switch VAR_RESULT - case 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A402 - case 1, LilycoveCity_DepartmentStoreElevator_EventScript_15A425 - case 2, LilycoveCity_DepartmentStoreElevator_EventScript_15A448 - case 3, LilycoveCity_DepartmentStoreElevator_EventScript_15A46B - case 4, LilycoveCity_DepartmentStoreElevator_EventScript_15A48E - case 127, LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + case 0, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th + case 1, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th + case 2, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd + case 3, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd + case 4, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st + case 127, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th:: @ 815A402 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 0 - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 - call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th:: @ 815A425 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 1 - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 - call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, 1 - goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd:: @ 815A448 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 2 - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 - call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, 2 - goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd:: @ 815A46B setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 3 - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 - call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, 3 - goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st:: @ 815A48E setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 4 - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 - call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, 4 - goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 +LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect:: @ 815A4B1 erasebox 0, 0, 29, 19 release end -LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 +LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator:: @ 815A4B8 erasebox 0, 0, 29, 19 applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 @@ -78,6 +78,6 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 setflag FLAG_TEMP_2 return -LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF +LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor:: @ 815A4CF special SetDepartmentStoreFloorVar return diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index c4d3b6591..f091834ed 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_Man", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A167", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman", "flag": "FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART" } ], @@ -68,7 +68,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD" + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine" }, { "type": "sign", @@ -76,7 +76,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD" + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine" } ] } diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 4578313b5..0c00456f3 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -1,35 +1,35 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_OnTransition .byte 0 -LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 +LilycoveCity_DepartmentStoreRooftop_OnTransition:: @ 815A145 getpricereduction 3 compare VAR_RESULT, 1 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman compare VAR_RESULT, 0 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F +LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman:: @ 815A15F clearflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART return -LilycoveCity_DepartmentStoreRooftop_EventScript_15A163:: @ 815A163 +LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman:: @ 815A163 setflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART return -LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 +LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman:: @ 815A167 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration LilycoveCity_DepartmentStoreRooftop_Decorations + pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStoreRooftop_Decorations:: @ 815A180 +LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale:: @ 815A180 .2byte DECOR_MUD_BALL .2byte DECOR_FENCE_LENGTH .2byte DECOR_FENCE_WIDTH @@ -48,155 +48,155 @@ LilycoveCity_DepartmentStoreRooftop_Decorations:: @ 815A180 release end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 +LilycoveCity_DepartmentStoreRooftop_EventScript_Man:: @ 815A1A0 lock faceplayer getpricereduction 3 compare VAR_RESULT, 1 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, MSGBOX_DEFAULT + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale + msgbox LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA:: @ 815A1BA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C685, MSGBOX_DEFAULT +LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale:: @ 815A1BA + msgbox LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4:: @ 815A1C4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C70E, MSGBOX_NPC +LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan:: @ 815A1C4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty, MSGBOX_NPC end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD +LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine:: @ 815A1CD lockall - message LilycoveCity_DepartmentStoreRooftop_Text_18C72B + message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike waitmessage showmoneybox 0, 0 nop - goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE +LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink:: @ 815A1DE multichoice 16, 0, 42, 0 copyvar VAR_TEMP_1, VAR_RESULT switch VAR_TEMP_1 - case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C - case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227 - case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_15A232 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7C3, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater + case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop + case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade + msgbox LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink, MSGBOX_DEFAULT + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C +LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater:: @ 815A21C setvar VAR_TEMP_0, ITEM_FRESH_WATER - goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 +LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop:: @ 815A227 setvar VAR_TEMP_0, ITEM_SODA_POP - goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 +LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade:: @ 815A232 setvar VAR_TEMP_0, ITEM_LEMONADE - goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D:: @ 815A23D +LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater:: @ 815A23D checkmoney 200, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_15A244:: @ 815A244 +LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop:: @ 815A244 checkmoney 300, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B:: @ 815A24B +LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade:: @ 815A24B checkmoney 350, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_15A252:: @ 815A252 +LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyFreshWater:: @ 815A252 removemoney 200, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_15A259:: @ 815A259 +LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneySodaPop:: @ 815A259 removemoney 300, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 +LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade:: @ 815A260 removemoney 350, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 +LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 815A267 compare VAR_TEMP_1, 0 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater compare VAR_TEMP_1, 1 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop compare VAR_TEMP_1, 2 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink compare VAR_TEMP_1, 0 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyFreshWater compare VAR_TEMP_1, 1 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneySodaPop compare VAR_TEMP_1, 2 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 playse SE_VEND - msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox Text_PutItemInPocket, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 - goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink playse SE_VEND - msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox Text_PutItemInPocket, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 - goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink playse SE_VEND - msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox Text_PutItemInPocket, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E:: @ 815A36E - message LilycoveCity_DepartmentStoreRooftop_Text_18C72B +LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink:: @ 815A36E + message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike waitmessage - goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A:: @ 815A37A - msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7AF, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 +LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink:: @ 815A37A + msgbox LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney, MSGBOX_DEFAULT + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A388:: @ 815A388 +LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 815A388 msgbox Text_TheBagIsFull, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine end -LilycoveCity_DepartmentStoreRooftop_EventScript_15A396:: @ 815A396 +LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 815A396 hidemoneybox 0, 0 releaseall end diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc index 34f13b1c5..21ad9373f 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc @@ -1,33 +1,33 @@ -LilycoveCity_DepartmentStoreRooftop_Text_18C61F:: @ 818C61F +LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales:: @ 818C61F .string "Don't they have set dates for their\n" .string "clear-out sales?\p" .string "I watch TV, but they never show any\n" .string "commercials.$" -LilycoveCity_DepartmentStoreRooftop_Text_18C685:: @ 818C685 +LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale:: @ 818C685 .string "Yes! I've been waiting a long time for\n" .string "this clear-out sale.\p" .string "They have items that you can only get\n" .string "here. I'm going to load up, that I am!$" -LilycoveCity_DepartmentStoreRooftop_Text_18C70E:: @ 818C70E +LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty:: @ 818C70E .string "Ohh... I'm bone-dry thirsty!$" -LilycoveCity_DepartmentStoreRooftop_Text_18C72B:: @ 818C72B +LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike:: @ 818C72B .string "It's a VENDING MACHINE.\n" .string "Which drink would you like?$" -LilycoveCity_DepartmentStoreRooftop_Text_18C75F:: @ 818C75F +LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown:: @ 818C75F .string "Clang!\p" .string "A can of {STR_VAR_1} dropped down.$" -LilycoveCity_DepartmentStoreRooftop_Text_18C780:: @ 818C780 +LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown:: @ 818C780 .string "Clang!\p" .string "Score! An extra can of {STR_VAR_1}\n" .string "dropped down!$" -LilycoveCity_DepartmentStoreRooftop_Text_18C7AF:: @ 818C7AF +LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney:: @ 818C7AF .string "Not enough money...$" -LilycoveCity_DepartmentStoreRooftop_Text_18C7C3:: @ 818C7C3 +LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink:: @ 818C7C3 .string "Decided against buying a drink.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 9c9ecba78..bc7a26cbb 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_159D55", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_Greeter", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_159D5E", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_159ED7", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_PokefanF", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_159EE0", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_159EE9", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_PokefanM", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_159EF2", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_Azumarill", "flag": "0" } ], @@ -128,7 +128,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_159F05" + "script": "LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign" } ] } diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index db7c2363a..75b334c52 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -1,27 +1,27 @@ LilycoveCity_DepartmentStore_1F_MapScripts:: @ 8159D54 .byte 0 -LilycoveCity_DepartmentStore_1F_EventScript_159D55:: @ 8159D55 - msgbox LilycoveCity_DepartmentStore_1F_Text_18BFB5, MSGBOX_NPC +LilycoveCity_DepartmentStore_1F_EventScript_Greeter:: @ 8159D55 + msgbox LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC end -LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E +LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk:: @ 8159D5E lock faceplayer dotimebasedevents compare VAR_LOTTERY_PRIZE, 0 - goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_159EB1 - goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_159E4C - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO + goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier + goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow + msgbox LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain setflag FLAG_DAILY_PICKED_LOTTO_TICKET - message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 + message LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket waitmessage special RetrieveLotteryNumber copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait, MSGBOX_DEFAULT applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PC_ON @@ -33,112 +33,112 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8004, 0 - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoMatch incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY compare VAR_0x8006, 0 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E3A + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon compare VAR_0x8006, 1 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E43 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon bufferitemname 0, VAR_0x8005 compare VAR_0x8004, 1 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E78 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch compare VAR_0x8004, 2 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E81 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch compare VAR_0x8004, 3 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E8A + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch compare VAR_0x8004, 4 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E93 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FullMatch giveitem VAR_0x8005 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C - goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom + goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2 end -LilycoveCity_DepartmentStore_1F_EventScript_159E3A:: @ 8159E3A - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4D7D, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon:: @ 8159E3A + msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_159E43:: @ 8159E43 - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4DD1, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon:: @ 8159E43 + msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_159E4C:: @ 8159E4C - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4C6A, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow:: @ 8159E4C + msgbox LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStore_1F_EventScript_159E56:: @ 8159E56 - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4C85, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain:: @ 8159E56 + msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStore_1F_EventScript_159E60:: @ 8159E60 - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E27, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E +LilycoveCity_DepartmentStore_1F_EventScript_NoMatch:: @ 8159E60 + msgbox LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched, MSGBOX_DEFAULT + goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2 end -LilycoveCity_DepartmentStore_1F_EventScript_159E6E:: @ 8159E6E - msgbox LilycoveCity_DepartmentStore_1F_Text_1C501C, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2:: @ 8159E6E + msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStore_1F_EventScript_159E78:: @ 8159E78 - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E4F, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch:: @ 8159E78 + msgbox LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_159E81:: @ 8159E81 - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E92, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch:: @ 8159E81 + msgbox LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_159E8A:: @ 8159E8A - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4ED8, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch:: @ 8159E8A + msgbox LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4F1C, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_FullMatch:: @ 8159E93 + msgbox LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C +LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom:: @ 8159E9C copyvar VAR_LOTTERY_PRIZE, VAR_0x8005 - goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 + goto LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize end -LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4F77, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize:: @ 8159EA7 + msgbox LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier:: @ 8159EB1 + msgbox LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding, MSGBOX_DEFAULT giveitem VAR_LOTTERY_PRIZE compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize setvar VAR_LOTTERY_PRIZE, 0 release end -LilycoveCity_DepartmentStore_1F_EventScript_159ED7:: @ 8159ED7 - msgbox LilycoveCity_DepartmentStore_1F_Text_18BFDB, MSGBOX_NPC +LilycoveCity_DepartmentStore_1F_EventScript_PokefanF:: @ 8159ED7 + msgbox LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings, MSGBOX_NPC end -LilycoveCity_DepartmentStore_1F_EventScript_159EE0:: @ 8159EE0 - msgbox LilycoveCity_DepartmentStore_1F_Text_18C044, MSGBOX_NPC +LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl:: @ 8159EE0 + msgbox LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture, MSGBOX_NPC end -LilycoveCity_DepartmentStore_1F_EventScript_159EE9:: @ 8159EE9 - msgbox LilycoveCity_DepartmentStore_1F_Text_18C07A, MSGBOX_NPC +LilycoveCity_DepartmentStore_1F_EventScript_PokefanM:: @ 8159EE9 + msgbox LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill, MSGBOX_NPC end -LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 +LilycoveCity_DepartmentStore_1F_EventScript_Azumarill:: @ 8159EF2 lock faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStore_1F_Text_Azumarill, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_DepartmentStore_1F_EventScript_159F05:: @ 8159F05 - msgbox LilycoveCity_DepartmentStore_1F_Text_18C0D9, MSGBOX_SIGN +LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign:: @ 8159F05 + msgbox LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign, MSGBOX_SIGN end diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/text.inc b/data/maps/LilycoveCity_DepartmentStore_1F/text.inc index 8944b6911..5518043d7 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/text.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/text.inc @@ -1,23 +1,23 @@ -LilycoveCity_DepartmentStore_1F_Text_18BFB5:: @ 818BFB5 +LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore:: @ 818BFB5 .string "Welcome to LILYCOVE DEPARTMENT STORE.$" -LilycoveCity_DepartmentStore_1F_Text_18BFDB:: @ 818BFDB +LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings:: @ 818BFDB .string "Whenever I come to the DEPARTMENT\n" .string "STORE, I always end up buying all sorts\l" .string "of things because it's so fun.$" -LilycoveCity_DepartmentStore_1F_Text_18C044:: @ 818C044 +LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture:: @ 818C044 .string "Today, my mom is going to buy me some\n" .string "nice furniture.$" -LilycoveCity_DepartmentStore_1F_Text_18C07A:: @ 818C07A +LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill:: @ 818C07A .string "I'm buying something for my AZUMARILL\n" .string "as a reward for winning a CONTEST.$" -LilycoveCity_DepartmentStore_1F_Text_18C0C3:: @ 818C0C3 +LilycoveCity_DepartmentStore_1F_Text_Azumarill:: @ 818C0C3 .string "AZUMARILL: Maririroo!$" -LilycoveCity_DepartmentStore_1F_Text_18C0D9:: @ 818C0D9 +LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign:: @ 818C0D9 .string "1F: SERVICE COUNTER\n" .string " LOTTERY CORNER\p" .string "2F: TRAINER'S ZONE\p" diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index e796f31b5..48121a695 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F0F", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_Cook", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F18", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_PokefanF", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F21", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_Sailor", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F5E", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_159F2A", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index b83e23289..b23f7fcb8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -1,30 +1,30 @@ LilycoveCity_DepartmentStore_2F_MapScripts:: @ 8159F0E .byte 0 -LilycoveCity_DepartmentStore_2F_EventScript_159F0F:: @ 8159F0F - msgbox LilycoveCity_DepartmentStore_2F_Text_18C162, MSGBOX_NPC +LilycoveCity_DepartmentStore_2F_EventScript_Cook:: @ 8159F0F + msgbox LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly, MSGBOX_NPC end -LilycoveCity_DepartmentStore_2F_EventScript_159F18:: @ 8159F18 - msgbox LilycoveCity_DepartmentStore_2F_Text_18C195, MSGBOX_NPC +LilycoveCity_DepartmentStore_2F_EventScript_PokefanF:: @ 8159F18 + msgbox LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband, MSGBOX_NPC end -LilycoveCity_DepartmentStore_2F_EventScript_159F21:: @ 8159F21 - msgbox LilycoveCity_DepartmentStore_2F_Text_18C1D9, MSGBOX_NPC +LilycoveCity_DepartmentStore_2F_EventScript_Sailor:: @ 8159F21 + msgbox LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems, MSGBOX_NPC end -LilycoveCity_DepartmentStore_2F_EventScript_159F2A:: @ 8159F2A +LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft:: @ 8159F2A lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_2F_Items1 + pokemart LilycoveCity_DepartmentStore_2F_Pokemart1 msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_2F_Items1:: @ 8159F44 +LilycoveCity_DepartmentStore_2F_Pokemart1:: @ 8159F44 .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_ULTRA_BALL @@ -40,18 +40,18 @@ LilycoveCity_DepartmentStore_2F_Items1:: @ 8159F44 release end -LilycoveCity_DepartmentStore_2F_EventScript_159F5E:: @ 8159F5E +LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight:: @ 8159F5E lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_2F_Items2 + pokemart LilycoveCity_DepartmentStore_2F_Pokemart2 msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_2F_Items2:: @ 8159F78 +LilycoveCity_DepartmentStore_2F_Pokemart2:: @ 8159F78 .2byte ITEM_POTION .2byte ITEM_SUPER_POTION .2byte ITEM_HYPER_POTION diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/text.inc b/data/maps/LilycoveCity_DepartmentStore_2F/text.inc index 4e3f40a4a..6eb4aa7bc 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/text.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/text.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_2F_Text_18C162:: @ 818C162 +LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly:: @ 818C162 .string "Learn to use items properly.\n" .string "That's basic, really.$" -LilycoveCity_DepartmentStore_2F_Text_18C195:: @ 818C195 +LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband:: @ 818C195 .string "My husband is waiting at home.\n" .string "What would make a good gift for him?$" -LilycoveCity_DepartmentStore_2F_Text_18C1D9:: @ 818C1D9 +LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems:: @ 818C1D9 .string "I'm leaving on a long journey soon.\n" .string "I need to stock up on items.$" -UnknownString_818C21A: @ 818C21A +LilycoveCity_DepartmentStore_2F_Text_UnusedFloorInfo: @ 818C21A .string "FOR YOUR TRAVELING COMPANIONS\n" .string "2F: TRAINER'S ZONE$" diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index ca544982c..253086f96 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_159FE2", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_159FEB", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_PokefanM", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_159FF4", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_Woman", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_159F91", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_159FB8", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index d723531db..d5b6e4c9d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -1,18 +1,18 @@ LilycoveCity_DepartmentStore_3F_MapScripts:: @ 8159F90 .byte 0 -LilycoveCity_DepartmentStore_3F_EventScript_159F91:: @ 8159F91 +LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft:: @ 8159F91 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_3F_Items1 + pokemart LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_3F_Items1:: @ 8159FA8 +LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins:: @ 8159FA8 .2byte ITEM_PROTEIN .2byte ITEM_CALCIUM .2byte ITEM_IRON @@ -23,19 +23,19 @@ LilycoveCity_DepartmentStore_3F_Items1:: @ 8159FA8 release end -LilycoveCity_DepartmentStore_3F_EventScript_159FB8:: @ 8159FB8 +LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight:: @ 8159FB8 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_3F_Items2 + pokemart LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_3F_Items2:: @ 8159FD0 +LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters:: @ 8159FD0 .2byte ITEM_X_SPEED .2byte ITEM_X_SPECIAL .2byte ITEM_X_ATTACK @@ -47,14 +47,14 @@ LilycoveCity_DepartmentStore_3F_Items2:: @ 8159FD0 release end -LilycoveCity_DepartmentStore_3F_EventScript_159FE2:: @ 8159FE2 - msgbox LilycoveCity_DepartmentStore_3F_Text_18C24B, MSGBOX_NPC +LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM:: @ 8159FE2 + msgbox LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon, MSGBOX_NPC end -LilycoveCity_DepartmentStore_3F_EventScript_159FEB:: @ 8159FEB - msgbox LilycoveCity_DepartmentStore_3F_Text_18C2B5, MSGBOX_NPC +LilycoveCity_DepartmentStore_3F_EventScript_PokefanM:: @ 8159FEB + msgbox LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance, MSGBOX_NPC end -LilycoveCity_DepartmentStore_3F_EventScript_159FF4:: @ 8159FF4 - msgbox LilycoveCity_DepartmentStore_3F_Text_18C32E, MSGBOX_NPC +LilycoveCity_DepartmentStore_3F_EventScript_Woman:: @ 8159FF4 + msgbox LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon, MSGBOX_NPC end diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/text.inc b/data/maps/LilycoveCity_DepartmentStore_3F/text.inc index aefbec540..070e60b8e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/text.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/text.inc @@ -1,19 +1,19 @@ -LilycoveCity_DepartmentStore_3F_Text_18C24B:: @ 818C24B +LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon:: @ 818C24B .string "For quickly toughening up POKéMON,\n" .string "items are the best.\p" .string "PROTEIN boosts ATTACK, and CALCIUM\n" .string "raises SP. ATK.$" -LilycoveCity_DepartmentStore_3F_Text_18C2B5:: @ 818C2B5 +LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance:: @ 818C2B5 .string "I want my POKéMON to have more\n" .string "endurance.\p" .string "I'm trying to decide whether to raise\n" .string "DEFENSE with IRON, or SP. DEF with ZINC.$" -LilycoveCity_DepartmentStore_3F_Text_18C32E:: @ 818C32E +LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon:: @ 818C32E .string "I gave a CARBOS to my POKéMON and its\n" .string "SPEED went up.$" -UnknownString_818C363: @ 818C363 +LilycoveCity_DepartmentStore_3F_Text_UnusedFloorInfo: @ 818C363 .string "ESSENTIALS FOR UNBEATABLE TRAINERS\n" .string "3F: BATTLE COLLECTION$" diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index d2d619b0c..232ca96e1 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_159FFE", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_Gentleman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_15A007", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_15A010", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_Youngster", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_15A019", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_15A03C", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc index 33a536b85..4bcaa920a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -1,30 +1,30 @@ LilycoveCity_DepartmentStore_4F_MapScripts:: @ 8159FFD .byte 0 -LilycoveCity_DepartmentStore_4F_EventScript_159FFE:: @ 8159FFE - msgbox LilycoveCity_DepartmentStore_4F_Text_18C39C, MSGBOX_NPC +LilycoveCity_DepartmentStore_4F_EventScript_Gentleman:: @ 8159FFE + msgbox LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM, MSGBOX_NPC end -LilycoveCity_DepartmentStore_4F_EventScript_15A007:: @ 815A007 - msgbox LilycoveCity_DepartmentStore_4F_Text_18C41B, MSGBOX_NPC +LilycoveCity_DepartmentStore_4F_EventScript_Woman:: @ 815A007 + msgbox LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs, MSGBOX_NPC end -LilycoveCity_DepartmentStore_4F_EventScript_15A010:: @ 815A010 - msgbox LilycoveCity_DepartmentStore_4F_Text_18C481, MSGBOX_NPC +LilycoveCity_DepartmentStore_4F_EventScript_Youngster:: @ 815A010 + msgbox LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves, MSGBOX_NPC end -LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019 +LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft:: @ 815A019 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_4F_Items1 + pokemart LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_4F_Items1:: @ 815A030 +LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs:: @ 815A030 .2byte ITEM_TM38_FIRE_BLAST .2byte ITEM_TM25_THUNDER .2byte ITEM_TM14_BLIZZARD @@ -33,18 +33,18 @@ LilycoveCity_DepartmentStore_4F_Items1:: @ 815A030 release end -LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C +LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight:: @ 815A03C lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_4F_Items2 + pokemart LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_4F_Items2:: @ 815A054 +LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs:: @ 815A054 .2byte ITEM_TM17_PROTECT .2byte ITEM_TM20_SAFEGUARD .2byte ITEM_TM33_REFLECT diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/text.inc b/data/maps/LilycoveCity_DepartmentStore_4F/text.inc index edba21e33..318e3ba01 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/text.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/text.inc @@ -1,20 +1,20 @@ -LilycoveCity_DepartmentStore_4F_Text_18C39C:: @ 818C39C +LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM:: @ 818C39C .string "Hmm...\p" .string "An attacking move...\n" .string "Or a defensive move...\p" .string "It's no easy matter to decide which TM\n" .string "moves should be taught to POKéMON...$" -LilycoveCity_DepartmentStore_4F_Text_18C41B:: @ 818C41B +LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs:: @ 818C41B .string "There are so many different kinds of\n" .string "TM moves.\p" .string "A catalog I read said there are fifty\n" .string "different kinds.$" -LilycoveCity_DepartmentStore_4F_Text_18C481:: @ 818C481 +LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves:: @ 818C481 .string "I'd like to get all the different TMs,\n" .string "but a POKéMON learns only four moves.$" -UnknownString_818C4CE: @ 818C4CE +LilycoveCity_DepartmentStore_4F_Text_UnusedFloorInfo: @ 818C4CE .string "A SHORTCUT TO POKéMON LEAGUE\n" .string "4F: TM CORNER$" diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 0b4a3a949..0652cde42 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A136", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A124", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_PokefanF", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A061", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A094", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A0C2", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A0F2", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_15A12D", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index edb17848a..51731cdf8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -1,18 +1,18 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 815A060 .byte 0 -LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061 +LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft:: @ 815A061 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items1 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_StatBoostersAndStones msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_5F_Items1:: @ 815A078 +LilycoveCity_DepartmentStore_5F_Pokemart_StatBoostersAndStones:: @ 815A078 .2byte ITEM_X_DEFEND .2byte ITEM_X_SPEED .2byte ITEM_X_ACCURACY @@ -29,18 +29,18 @@ LilycoveCity_DepartmentStore_5F_Items1:: @ 815A078 release end -LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094 +LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft:: @ 815A094 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items2 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Treasures msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_5F_Items2:: @ 815A0AC +LilycoveCity_DepartmentStore_5F_Pokemart_Treasures:: @ 815A0AC .2byte 101 .2byte 102 .2byte ITEM_BIG_MUSHROOM @@ -54,18 +54,18 @@ LilycoveCity_DepartmentStore_5F_Items2:: @ 815A0AC release end -LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2 +LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight:: @ 815A0C2 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items3 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Vitamins msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_5F_Items3:: @ 815A0DC +LilycoveCity_DepartmentStore_5F_Pokemart_Vitamins:: @ 815A0DC .2byte ITEM_CARBOS .2byte ITEM_CALCIUM .2byte ITEM_RARE_CANDY @@ -79,18 +79,18 @@ LilycoveCity_DepartmentStore_5F_Items3:: @ 815A0DC release end -LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2 +LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight:: @ 815A0F2 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items4 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_VitaminsAndShards msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_5F_Items4:: @ 815A10C +LilycoveCity_DepartmentStore_5F_Pokemart_VitaminsAndShards:: @ 815A10C .2byte 59 .2byte 60 .2byte 61 @@ -105,14 +105,14 @@ LilycoveCity_DepartmentStore_5F_Items4:: @ 815A10C release end -LilycoveCity_DepartmentStore_5F_EventScript_15A124:: @ 815A124 - msgbox LilycoveCity_DepartmentStore_5F_Text_18C4F9, MSGBOX_NPC +LilycoveCity_DepartmentStore_5F_EventScript_PokefanF:: @ 815A124 + msgbox LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls, MSGBOX_NPC end -LilycoveCity_DepartmentStore_5F_EventScript_15A12D:: @ 815A12D - msgbox LilycoveCity_DepartmentStore_5F_Text_18C59F, MSGBOX_NPC +LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal:: @ 815A12D + msgbox LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere, MSGBOX_NPC end -LilycoveCity_DepartmentStore_5F_EventScript_15A136:: @ 815A136 - msgbox LilycoveCity_DepartmentStore_5F_Text_18C556, MSGBOX_NPC +LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl:: @ 815A136 + msgbox LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon, MSGBOX_NPC end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/text.inc b/data/maps/LilycoveCity_DepartmentStore_5F/text.inc index e1b953eec..72cf192f0 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/text.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/text.inc @@ -1,17 +1,17 @@ -LilycoveCity_DepartmentStore_5F_Text_18C4F9:: @ 818C4F9 +LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls:: @ 818C4F9 .string "This place is full of cute DOLLS.\p" .string "I should buy some for me, instead of\n" .string "just for my children.$" -LilycoveCity_DepartmentStore_5F_Text_18C556:: @ 818C556 +LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon:: @ 818C556 .string "I'm not big enough to raise POKéMON,\n" .string "so I'm getting a cute DOLL instead.$" -LilycoveCity_DepartmentStore_5F_Text_18C59F:: @ 818C59F +LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere:: @ 818C59F .string "They sell many cute MATS here.\p" .string "I wonder which one I should get?\n" .string "Maybe I'll buy them all...$" -UnknownString_818C5FA: @ 818C5FA +LilycoveCity_DepartmentStore_5F_Text_UnusedFloorInfo: @ 818C5FA .string "ADORABLE FRIENDS\n" .string "5F: POKé DOLL FLOOR$" diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 79429853c..3484f2f45 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_Harbor_EventScript_1598A2", + "script": "LilycoveCity_Harbor_EventScript_FerryAttendant", "flag": "FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_Harbor_EventScript_159A8D", + "script": "LilycoveCity_Harbor_EventScript_Sailor", "flag": "0" }, { diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 889722388..d4bca8e0d 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,114 +1,114 @@ LilycoveCity_Harbor_MapScripts:: @ 8159893 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_159899 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_OnTransition .byte 0 -LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 +LilycoveCity_Harbor_OnTransition:: @ 8159899 setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end -LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 +LilycoveCity_Harbor_EventScript_FerryAttendant:: @ 81598A2 lock faceplayer checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_Harbor_EventScript_1599EE - goto LilycoveCity_Harbor_EventScript_1598BA + goto_if_eq LilycoveCity_Harbor_EventScript_FerryAttendantLocationAndBoarding + goto LilycoveCity_Harbor_EventScript_FerryUnavailable end -LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD - msgbox LilycoveCity_Harbor_Text_18B306, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_FerryUnavailable:: @ 81598BA + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_NoFirstTimeEventTickets + msgbox LilycoveCity_Harbor_Text_FerryUnavailable, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD - msgbox LilycoveCity_Harbor_Text_18B36F, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_NoFirstTimeEventTickets:: @ 81598CD + msgbox LilycoveCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_Harbor_EventScript_159929 - message LilycoveCity_Harbor_Text_18B406 + goto_if_eq LilycoveCity_Harbor_EventScript_NoTicket + message LilycoveCity_Harbor_Text_FlashTicketWhereTo waitmessage - goto LilycoveCity_Harbor_EventScript_1598F1 + goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect end -LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1 +LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect:: @ 81598F1 multichoicedefault 18, 6, 56, 2, 0 switch VAR_RESULT - case 0, LilycoveCity_Harbor_EventScript_159933 - case 1, LilycoveCity_Harbor_EventScript_15995B - case 2, LilycoveCity_Harbor_EventScript_1599E4 - case 127, LilycoveCity_Harbor_EventScript_1599E4 + case 0, LilycoveCity_Harbor_EventScript_GoToSlateport + case 1, LilycoveCity_Harbor_EventScript_GoToBattleTower + case 2, LilycoveCity_Harbor_EventScript_ExitSailSelect + case 127, LilycoveCity_Harbor_EventScript_ExitSailSelect end -LilycoveCity_Harbor_EventScript_159929:: @ 8159929 - msgbox LilycoveCity_Harbor_Text_18B3A9, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_NoTicket:: @ 8159929 + msgbox LilycoveCity_Harbor_Text_NoTicket, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_EventScript_159933:: @ 8159933 - msgbox LilycoveCity_Harbor_Text_18B47D, MSGBOX_YESNO +LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 8159933 + msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LilycoveCity_Harbor_EventScript_15997E + goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind setvar VAR_PORTHOLE_STATE, 5 - call LilycoveCity_Harbor_EventScript_15998A + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end -LilycoveCity_Harbor_EventScript_15995B:: @ 815995B - msgbox LilycoveCity_Harbor_Text_18B499, MSGBOX_YESNO +LilycoveCity_Harbor_EventScript_GoToBattleTower:: @ 815995B + msgbox LilycoveCity_Harbor_Text_BattleTowerItIs, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LilycoveCity_Harbor_EventScript_15997E - call LilycoveCity_Harbor_EventScript_15998A + goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind + call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end -LilycoveCity_Harbor_EventScript_15997E:: @ 815997E - message LilycoveCity_Harbor_Text_18B4E2 +LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind:: @ 815997E + message LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo waitmessage - goto LilycoveCity_Harbor_EventScript_1598F1 + goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect end -LilycoveCity_Harbor_EventScript_15998A:: @ 815998A - msgbox LilycoveCity_Harbor_Text_18B4B3, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_BoardFerry:: @ 815998A + msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare VAR_FACING, 2 - call_if_eq LilycoveCity_Harbor_EventScript_1599D9 + call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth compare VAR_FACING, 4 - call_if_eq LilycoveCity_Harbor_EventScript_1599CE + call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 hideobjectat LOCALID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call Common_EventScript_FerryDepart return -LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE - applymovement LOCALID_PLAYER, LilycoveCity_Harbor_Movement_159A86 +LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast:: @ 81599CE + applymovement LOCALID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast waitmovement 0 return -LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9 - applymovement LOCALID_PLAYER, LilycoveCity_Harbor_Movement_159A89 +LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth:: @ 81599D9 + applymovement LOCALID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth waitmovement 0 return -LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 - msgbox LilycoveCity_Harbor_Text_18B45B, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_ExitSailSelect:: @ 81599E4 + msgbox LilycoveCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA - goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA - goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA - msgbox LilycoveCity_Harbor_Text_1C50F2, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_FerryAttendantLocationAndBoarding:: @ 81599EE + goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_FerryUnavailable + goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_FerryUnavailable + goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_FerryUnavailable + msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 @@ -119,16 +119,16 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE delay 30 applymovement 4, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_Harbor_Text_1C5120, MSGBOX_DEFAULT + msgbox EventTicket_Text_ShowEonTicket, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 removeobject 4 compare VAR_FACING, 2 - call_if_eq LilycoveCity_Harbor_EventScript_1599D9 + call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth compare VAR_FACING, 4 - call_if_eq LilycoveCity_Harbor_EventScript_1599CE + call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 hideobjectat LOCALID_PLAYER, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty @@ -139,28 +139,28 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE release end -LilycoveCity_Harbor_Movement_159A86:: @ 8159A86 +LilycoveCity_Harbor_Movement_PlayerBoardFerryEast:: @ 8159A86 walk_right walk_in_place_fastest_up step_end -LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 +LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth:: @ 8159A89 walk_up step_end -@ 8159A8B +LilycoveCity_Harbor_Movement_UnusedBoardFerry:: @ 8159A8B walk_up step_end -LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D +LilycoveCity_Harbor_EventScript_Sailor:: @ 8159A8D lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2 - msgbox LilycoveCity_Harbor_Text_18B504, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_SailorFerryAvailable + msgbox LilycoveCity_Harbor_Text_SailorFerryUnavailable, MSGBOX_DEFAULT release end -LilycoveCity_Harbor_EventScript_159AA2:: @ 8159AA2 - msgbox LilycoveCity_Harbor_Text_18B58E, MSGBOX_DEFAULT +LilycoveCity_Harbor_EventScript_SailorFerryAvailable:: @ 8159AA2 + msgbox LilycoveCity_Harbor_Text_SailorFerryAvailable, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_Harbor/text.inc b/data/maps/LilycoveCity_Harbor/text.inc index f6928d0e6..b26fd8e86 100644 --- a/data/maps/LilycoveCity_Harbor/text.inc +++ b/data/maps/LilycoveCity_Harbor/text.inc @@ -1,47 +1,47 @@ -LilycoveCity_Harbor_Text_18B306:: @ 818B306 +LilycoveCity_Harbor_Text_FerryUnavailable:: @ 818B306 .string "I beg your pardon?\n" .string "You're looking for a ship?\p" .string "I'm sorry, the ferry service isn't\n" .string "available at present...$" -LilycoveCity_Harbor_Text_18B36F:: @ 818B36F +LilycoveCity_Harbor_Text_MayISeeYourTicket:: @ 818B36F .string "Hello, are you here for the ferry?\n" .string "May I see your TICKET?$" -LilycoveCity_Harbor_Text_18B3A9:: @ 818B3A9 +LilycoveCity_Harbor_Text_NoTicket:: @ 818B3A9 .string "{PLAYER} doesn't have the TICKET...\p" .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" -LilycoveCity_Harbor_Text_18B406:: @ 818B406 +LilycoveCity_Harbor_Text_FlashTicketWhereTo:: @ 818B406 .string "{PLAYER} flashed the TICKET.\p" .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" -LilycoveCity_Harbor_Text_18B45B:: @ 818B45B +LilycoveCity_Harbor_Text_SailAnotherTime:: @ 818B45B .string "Please sail with us another time!$" -LilycoveCity_Harbor_Text_18B47D:: @ 818B47D +LilycoveCity_Harbor_Text_SlateportItIs:: @ 818B47D .string "SLATEPORT CITY it is, then!$" -LilycoveCity_Harbor_Text_18B499:: @ 818B499 +LilycoveCity_Harbor_Text_BattleTowerItIs:: @ 818B499 .string "BATTLE TOWER it is, then!$" -LilycoveCity_Harbor_Text_18B4B3:: @ 818B4B3 +LilycoveCity_Harbor_Text_PleaseBoard:: @ 818B4B3 .string "Please board the ferry and wait for\n" .string "departure.$" -LilycoveCity_Harbor_Text_18B4E2:: @ 818B4E2 +LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo:: @ 818B4E2 .string "Then, where would you like to go?$" -LilycoveCity_Harbor_Text_18B504:: @ 818B504 +LilycoveCity_Harbor_Text_SailorFerryUnavailable:: @ 818B504 .string "Until they finish making the ferry, we\n" .string "sailors have nothing to do...\p" .string "I wish they'd get a move on, the folks\n" .string "at the SHIPYARD in SLATEPORT.$" -LilycoveCity_Harbor_Text_18B58E:: @ 818B58E +LilycoveCity_Harbor_Text_SailorFerryAvailable:: @ 818B58E .string "The ferry S.S. TIDAL is finally in\n" .string "operation.\p" .string "The folks at the SHIPYARD in SLATEPORT\n" diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index edf2c7bc0..b26b3a600 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House1_EventScript_159B86", + "script": "LilycoveCity_House1_EventScript_ExpertM", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House1_EventScript_159B8F", + "script": "LilycoveCity_House1_EventScript_Kecleon", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc index 86b37ecd7..85f5ea765 100644 --- a/data/maps/LilycoveCity_House1/scripts.inc +++ b/data/maps/LilycoveCity_House1/scripts.inc @@ -1,16 +1,16 @@ LilycoveCity_House1_MapScripts:: @ 8159B85 .byte 0 -LilycoveCity_House1_EventScript_159B86:: @ 8159B86 - msgbox LilycoveCity_House1_Text_18B7B0, MSGBOX_NPC +LilycoveCity_House1_EventScript_ExpertM:: @ 8159B86 + msgbox LilycoveCity_House1_Text_PokemonPartnersNotTools, MSGBOX_NPC end -LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F +LilycoveCity_House1_EventScript_Kecleon:: @ 8159B8F lock faceplayer waitse playmoncry SPECIES_KECLEON, 0 - msgbox LilycoveCity_House1_Text_18B82B, MSGBOX_DEFAULT + msgbox LilycoveCity_House1_Text_Kecleon, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/LilycoveCity_House1/text.inc b/data/maps/LilycoveCity_House1/text.inc index 287aec75b..4968249fa 100644 --- a/data/maps/LilycoveCity_House1/text.inc +++ b/data/maps/LilycoveCity_House1/text.inc @@ -1,8 +1,8 @@ -LilycoveCity_House1_Text_18B7B0:: @ 818B7B0 +LilycoveCity_House1_Text_PokemonPartnersNotTools:: @ 818B7B0 .string "POKéMON are partners to people.\n" .string "They aren't our tools.\p" .string "Unfortunately, there are some people\n" .string "who fail to understand that...$" -LilycoveCity_House1_Text_18B82B:: @ 818B82B +LilycoveCity_House1_Text_Kecleon:: @ 818B82B .string "KECLEON: Ruroro?$" diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 6b4d59583..881cb9c18 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House2_EventScript_159BA3", + "script": "LilycoveCity_House2_EventScript_FatMan", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index ae37152fa..8c558598f 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -1,20 +1,20 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2 .byte 0 -LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 +LilycoveCity_House2_EventScript_FatMan:: @ 8159BA3 lock faceplayer - goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA - msgbox LilycoveCity_House2_Text_18B83C, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_ReceivedRest + msgbox LilycoveCity_House2_Text_NotAwakeYetHaveThis, MSGBOX_DEFAULT giveitem ITEM_TM44_REST compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM44 - msgbox LilycoveCity_House2_Text_18B883, MSGBOX_DEFAULT + msgbox LilycoveCity_House2_Text_SleepIsEssential, MSGBOX_DEFAULT release end -LilycoveCity_House2_EventScript_159BDA:: @ 8159BDA - msgbox LilycoveCity_House2_Text_18B883, MSGBOX_DEFAULT +LilycoveCity_House2_EventScript_ReceivedRest:: @ 8159BDA + msgbox LilycoveCity_House2_Text_SleepIsEssential, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_House2/text.inc b/data/maps/LilycoveCity_House2/text.inc index 3d7eefdaa..663e9d8c4 100644 --- a/data/maps/LilycoveCity_House2/text.inc +++ b/data/maps/LilycoveCity_House2/text.inc @@ -1,9 +1,9 @@ -LilycoveCity_House2_Text_18B83C:: @ 818B83C +LilycoveCity_House2_Text_NotAwakeYetHaveThis:: @ 818B83C .string "Huh? What? What's that?\p" .string "I'm not near awake yet...\n" .string "You can have this...$" -LilycoveCity_House2_Text_18B883:: @ 818B883 +LilycoveCity_House2_Text_SleepIsEssential:: @ 818B883 .string "Yawn...\p" .string "Sleep is essential for good health...\n" .string "Sleep and regain health...$" diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 4c03e0a4e..030625786 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_159CE5", + "script": "LilycoveCity_House3_EventScript_GameBoyKid4", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_159BF3", + "script": "LilycoveCity_House3_EventScript_PokefanF", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_159C7D", + "script": "LilycoveCity_House3_EventScript_GameBoyKid2", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_159CB1", + "script": "LilycoveCity_House3_EventScript_GameBoyKid3", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_159C49", + "script": "LilycoveCity_House3_EventScript_GameBoyKid1", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_159C32", + "script": "LilycoveCity_House3_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index a149f6891..ba5e34325 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -1,99 +1,99 @@ LilycoveCity_House3_MapScripts:: @ 8159BE4 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_159BEA + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_OnTransition .byte 0 -LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA +LilycoveCity_House3_OnTransition:: @ 8159BEA random 4 copyvar VAR_TEMP_1, VAR_RESULT end -LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 +LilycoveCity_House3_EventScript_PokefanF:: @ 8159BF3 lock faceplayer - msgbox LilycoveCity_House3_Text_18B8CC, MSGBOX_YESNO + msgbox LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LilycoveCity_House3_EventScript_159C1D - msgbox LilycoveCity_House3_Text_18BA2B, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_House3_EventScript_DeclinePokeblockLearn + msgbox LilycoveCity_House3_Text_ExplainPokeblocks, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D - msgbox LilycoveCity_House3_Text_18B9DC, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_DeclinePokeblockLearn:: @ 8159C1D + msgbox LilycoveCity_House3_Text_OhAreYouSure, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_House3_EventScript_159C32:: @ 8159C32 +LilycoveCity_House3_EventScript_Man:: @ 8159C32 lock faceplayer - msgbox LilycoveCity_House3_Text_18BD64, MSGBOX_DEFAULT + msgbox LilycoveCity_House3_Text_HappyToHaveQuadruplets, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_House3_EventScript_159C49:: @ 8159C49 +LilycoveCity_House3_EventScript_GameBoyKid1:: @ 8159C49 lock faceplayer switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_159D19 - case 1, LilycoveCity_House3_EventScript_159D23 - case 2, LilycoveCity_House3_EventScript_159D2D - case 3, LilycoveCity_House3_EventScript_159D37 + case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle + case 1, LilycoveCity_House3_EventScript_WereMixingRecords + case 2, LilycoveCity_House3_EventScript_WereBlendingBerries + case 3, LilycoveCity_House3_EventScript_WereDoingContest end -LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D +LilycoveCity_House3_EventScript_GameBoyKid2:: @ 8159C7D lock faceplayer switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_159D19 - case 1, LilycoveCity_House3_EventScript_159D23 - case 2, LilycoveCity_House3_EventScript_159D2D - case 3, LilycoveCity_House3_EventScript_159D37 + case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle + case 1, LilycoveCity_House3_EventScript_WereMixingRecords + case 2, LilycoveCity_House3_EventScript_WereBlendingBerries + case 3, LilycoveCity_House3_EventScript_WereDoingContest end -LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 +LilycoveCity_House3_EventScript_GameBoyKid3:: @ 8159CB1 lock faceplayer switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_159D19 - case 1, LilycoveCity_House3_EventScript_159D23 - case 2, LilycoveCity_House3_EventScript_159D2D - case 3, LilycoveCity_House3_EventScript_159D37 + case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle + case 1, LilycoveCity_House3_EventScript_WereMixingRecords + case 2, LilycoveCity_House3_EventScript_WereBlendingBerries + case 3, LilycoveCity_House3_EventScript_WereDoingContest end -LilycoveCity_House3_EventScript_159CE5:: @ 8159CE5 +LilycoveCity_House3_EventScript_GameBoyKid4:: @ 8159CE5 lock faceplayer switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_159D19 - case 1, LilycoveCity_House3_EventScript_159D23 - case 2, LilycoveCity_House3_EventScript_159D2D - case 3, LilycoveCity_House3_EventScript_159D37 + case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle + case 1, LilycoveCity_House3_EventScript_WereMixingRecords + case 2, LilycoveCity_House3_EventScript_WereBlendingBerries + case 3, LilycoveCity_House3_EventScript_WereDoingContest end -LilycoveCity_House3_EventScript_159D19:: @ 8159D19 - msgbox LilycoveCity_House3_Text_18BDDB, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_WereDoingMultiBattle:: @ 8159D19 + msgbox LilycoveCity_House3_Text_GoingToWinMultiBattles, MSGBOX_DEFAULT release end -LilycoveCity_House3_EventScript_159D23:: @ 8159D23 - msgbox LilycoveCity_House3_Text_18BE14, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_WereMixingRecords:: @ 8159D23 + msgbox LilycoveCity_House3_Text_LikeMixingAtRecordCorner, MSGBOX_DEFAULT release end -LilycoveCity_House3_EventScript_159D2D:: @ 8159D2D - msgbox LilycoveCity_House3_Text_18BE57, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_WereBlendingBerries:: @ 8159D2D + msgbox LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender, MSGBOX_DEFAULT release end -LilycoveCity_House3_EventScript_159D37:: @ 8159D37 - msgbox LilycoveCity_House3_Text_18BE8E, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_WereDoingContest:: @ 8159D37 + msgbox LilycoveCity_House3_Text_GoingToEnterContest, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_House3/text.inc b/data/maps/LilycoveCity_House3/text.inc index 37cff822b..261896f42 100644 --- a/data/maps/LilycoveCity_House3/text.inc +++ b/data/maps/LilycoveCity_House3/text.inc @@ -1,4 +1,4 @@ -LilycoveCity_House3_Text_18B8CC:: @ 818B8CC +LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks:: @ 818B8CC .string "Oh, my, my! Are you traveling alone?\n" .string "But you're so young! Good for you!\p" .string "I'm sure my kids could learn a thing\n" @@ -9,12 +9,12 @@ LilycoveCity_House3_Text_18B8CC:: @ 818B8CC .string "Would you like to learn from me, a\n" .string "master of {POKEBLOCK}S?$" -LilycoveCity_House3_Text_18B9DC:: @ 818B9DC +LilycoveCity_House3_Text_OhAreYouSure:: @ 818B9DC .string "Oh? Are you sure?\p" .string "You shouldn't always try to do\n" .string "everything by yourself, dear!$" -LilycoveCity_House3_Text_18BA2B:: @ 818BA2B +LilycoveCity_House3_Text_ExplainPokeblocks:: @ 818BA2B .string "Oh, good! You're a smart soul!\n" .string "This is a bit long, so listen up!\p" .string "Are you ready?\p" @@ -43,26 +43,26 @@ LilycoveCity_House3_Text_18BA2B:: @ 818BA2B .string "the world would be a happier place.\p" .string "Don't give up, dear!$" -LilycoveCity_House3_Text_18BD64:: @ 818BD64 +LilycoveCity_House3_Text_HappyToHaveQuadruplets:: @ 818BD64 .string "When my wife gave birth to quadruplets,\n" .string "you bet I was shocked.\p" .string "But, now, seeing them play together,\n" .string "it makes me happy.$" -LilycoveCity_House3_Text_18BDDB:: @ 818BDDB +LilycoveCity_House3_Text_GoingToWinMultiBattles:: @ 818BDDB .string "We're having MULTI BATTLES, but I know\n" .string "I'm going to win.$" -LilycoveCity_House3_Text_18BE14:: @ 818BE14 +LilycoveCity_House3_Text_LikeMixingAtRecordCorner:: @ 818BE14 .string "We like mixing stuff at the RECORD\n" .string "CORNER.\p" .string "But what gets mixed up?$" -LilycoveCity_House3_Text_18BE57:: @ 818BE57 +LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender:: @ 818BE57 .string "We're going to make super {POKEBLOCK}S\n" .string "with a BERRY BLENDER!$" -LilycoveCity_House3_Text_18BE8E:: @ 818BE8E +LilycoveCity_House3_Text_GoingToEnterContest:: @ 818BE8E .string "I want to brag about how tough my\n" .string "POKéMON is, so we're going to enter a\l" .string "CONTEST together.$" diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 337b0891d..11f63a71f 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House4_EventScript_159D42", + "script": "LilycoveCity_House4_EventScript_Man1", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House4_EventScript_159D4B", + "script": "LilycoveCity_House4_EventScript_Man2", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc index 4a1759b59..6b2b77d14 100644 --- a/data/maps/LilycoveCity_House4/scripts.inc +++ b/data/maps/LilycoveCity_House4/scripts.inc @@ -1,10 +1,10 @@ LilycoveCity_House4_MapScripts:: @ 8159D41 .byte 0 -LilycoveCity_House4_EventScript_159D42:: @ 8159D42 - msgbox LilycoveCity_House4_Text_18BEE8, MSGBOX_NPC +LilycoveCity_House4_EventScript_Man1:: @ 8159D42 + msgbox LilycoveCity_House4_Text_MysteriesAtBottomOfSea, MSGBOX_NPC end -LilycoveCity_House4_EventScript_159D4B:: @ 8159D4B - msgbox LilycoveCity_House4_Text_18BF4E, MSGBOX_NPC +LilycoveCity_House4_EventScript_Man2:: @ 8159D4B + msgbox LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis, MSGBOX_NPC end diff --git a/data/maps/LilycoveCity_House4/text.inc b/data/maps/LilycoveCity_House4/text.inc index 5e11c8ecb..294f0b2ae 100644 --- a/data/maps/LilycoveCity_House4/text.inc +++ b/data/maps/LilycoveCity_House4/text.inc @@ -1,9 +1,9 @@ -LilycoveCity_House4_Text_18BEE8:: @ 818BEE8 +LilycoveCity_House4_Text_MysteriesAtBottomOfSea:: @ 818BEE8 .string "This planet's biggest mysteries are\n" .string "at the bottom of the sea.\p" .string "Somebody said that, but I don't know...$" -LilycoveCity_House4_Text_18BF4E:: @ 818BF4E +LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis:: @ 818BF4E .string "There's a deep underwater trench\n" .string "between MOSSDEEP and SOOTOPOLIS.\p" .string "That's what someone told me, anyway.$" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index e79a9f865..7017ef80b 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15841C", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158425", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Curator", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158558", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158561", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15856A", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158573", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1", "flag": "0" }, { @@ -99,8 +99,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15857C", - "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" }, { "graphics_id": "OBJ_EVENT_GFX_ARTIST", @@ -112,8 +112,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15858E", - "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4" }, { "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", @@ -125,8 +125,8 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3", - "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, { "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", @@ -138,8 +138,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158585", - "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3" } ], "warp_events": [ @@ -173,7 +173,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158510" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting" }, { "type": "sign", @@ -181,7 +181,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158510" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting" }, { "type": "sign", @@ -189,7 +189,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158534" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting" }, { "type": "sign", @@ -197,7 +197,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158534" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting" }, { "type": "sign", @@ -205,7 +205,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158507" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting" }, { "type": "sign", @@ -213,7 +213,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158519" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting" }, { "type": "sign", @@ -221,7 +221,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158519" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting" }, { "type": "sign", @@ -229,7 +229,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15853D" + "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture" }, { "type": "sign", @@ -237,7 +237,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158507" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting" }, { "type": "sign", @@ -245,7 +245,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15852B" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting" }, { "type": "sign", @@ -253,7 +253,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15854F" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet" }, { "type": "sign", @@ -261,7 +261,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158522" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting" }, { "type": "sign", @@ -269,7 +269,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158522" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting" }, { "type": "sign", @@ -277,7 +277,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15854F" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet" }, { "type": "sign", @@ -285,7 +285,7 @@ "y": 11, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_158546" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture" }, { "type": "sign", @@ -293,7 +293,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15854F" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet" } ] } diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 6877d2bd7..38801a941 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -1,162 +1,161 @@ LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 815841B .byte 0 -LilycoveCity_LilycoveMuseum_1F_EventScript_15841C:: @ 815841C - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187348, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter:: @ 815841C + msgbox LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 +LilycoveCity_LilycoveMuseum_1F_EventScript_Curator:: @ 8158425 lockall applymovement 2, Common_Movement_FacePlayer - message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 + message LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings waitmessage multichoice 20, 8, 16, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet end -LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187459, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet:: @ 815844F + msgbox LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, MSGBOX_YESNO +LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings:: @ 8158458 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested compare VAR_RESULT, YES - goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings end -LilycoveCity_LilycoveMuseum_1F_EventScript_158477:: @ 8158477 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_1874F5, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested:: @ 8158477 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat, MSGBOX_SIGN releaseall end -LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, MSGBOX_SIGN - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC +LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: @ 8158481 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe, MSGBOX_SIGN + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs waitmovement 0 removeobject 2 switch VAR_FACING - case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD - case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2 - case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7 + case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth + case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest + case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast end -LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD +LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 81584BD lockall - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_158504 + applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end -LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 +LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 81584D2 lockall - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE + applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end -LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 +LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast:: @ 81584E7 lockall - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_158501 + applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end -LilycoveCity_LilycoveMuseum_1F_Movement_1584FC:: @ 81584FC +LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs:: @ 81584FC walk_up step_end -LilycoveCity_LilycoveMuseum_1F_Movement_1584FE:: @ 81584FE +LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest:: @ 81584FE walk_left walk_up step_end -LilycoveCity_LilycoveMuseum_1F_Movement_158501:: @ 8158501 +LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast:: @ 8158501 walk_right walk_up step_end -LilycoveCity_LilycoveMuseum_1F_Movement_158504:: @ 8158504 +LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth:: @ 8158504 walk_up walk_up step_end -LilycoveCity_LilycoveMuseum_1F_EventScript_158507:: @ 8158507 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting:: @ 8158507 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_158510:: @ 8158510 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875BE, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting:: @ 8158510 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_158519:: @ 8158519 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875F8, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting:: @ 8158519 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_158522:: @ 8158522 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187641, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting:: @ 8158522 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_15852B:: @ 815852B - msgbox LilycoveCity_LilycoveMuseum_1F_Text_1876A1, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting:: @ 815852B + msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_158534:: @ 8158534 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_18770C, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting:: @ 8158534 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_15853D:: @ 815853D -LilycoveCity_LilycoveMuseum_2F_EventScript_15853D:: @ 815853D - msgbox LilycoveCity_LilycoveMuseum_1F_Text_18775F, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture:: @ 815853D + msgbox LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_158546:: @ 8158546 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_1877A9, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture:: @ 8158546 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_15854F:: @ 815854F - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187810, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet:: @ 815854F + msgbox LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_158558:: @ 8158558 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_1878B7, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM:: @ 8158558 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_158561:: @ 8158561 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_18791D, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1:: @ 8158561 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_15856A:: @ 815856A - msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879BF, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy:: @ 815856A + msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_158573:: @ 8158573 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879E6, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1:: @ 8158573 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_15857C:: @ 815857C - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187A1A, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2:: @ 815857C + msgbox LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_158585:: @ 8158585 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187AA0, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM:: @ 8158585 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_15858E:: @ 815858E - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B04, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2:: @ 815858E + msgbox LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings, MSGBOX_NPC lockall applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3:: @ 81585A3 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B7F, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan:: @ 81585A3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination, MSGBOX_NPC end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc index 8924ca8f9..06932e878 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc @@ -1,10 +1,10 @@ -LilycoveCity_LilycoveMuseum_1F_Text_187348:: @ 8187348 +LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum:: @ 8187348 .string "Welcome to LILYCOVE MUSEUM.\p" .string "Please take the time to enjoy our\n" .string "collection of fantastic artwork\l" .string "featuring POKéMON.$" -LilycoveCity_LilycoveMuseum_1F_Text_1873B9:: @ 81873B9 +LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings:: @ 81873B9 .string "I'm the CURATOR of this MUSEUM of\n" .string "fine arts.\p" .string "It's heartening to see someone so\n" @@ -12,66 +12,66 @@ LilycoveCity_LilycoveMuseum_1F_Text_1873B9:: @ 81873B9 .string "Have you viewed our collection of\n" .string "paintings already?$" -LilycoveCity_LilycoveMuseum_1F_Text_187459:: @ 8187459 +LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime:: @ 8187459 .string "Ah, then let me not disturb you.\n" .string "Please, do take your time.$" -LilycoveCity_LilycoveMuseum_1F_Text_187495:: @ 8187495 +LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings:: @ 8187495 .string "Oh? I do believe that you seem to\n" .string "be a POKéMON TRAINER.\p" .string "Have you an interest in paintings,\n" .string "too?$" -LilycoveCity_LilycoveMuseum_1F_Text_1874F5:: @ 81874F5 +LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat:: @ 81874F5 .string "I see...\p" .string "I'm honored that you would visit\n" .string "us in spite of that.$" -LilycoveCity_LilycoveMuseum_1F_Text_187534:: @ 8187534 +LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe:: @ 8187534 .string "Ah, excellent!\n" .string "You do like paintings!\p" .string "Then, may I ask you to come with me?$" -LilycoveCity_LilycoveMuseum_1F_Text_18757F:: @ 818757F +LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting:: @ 818757F .string "It's a very old painting.\n" .string "The paint is peeling here and there.$" -LilycoveCity_LilycoveMuseum_1F_Text_1875BE:: @ 81875BE +LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery:: @ 81875BE .string "It's an odd landscape with bizarre\n" .string "and fantastic scenery.$" -LilycoveCity_LilycoveMuseum_1F_Text_1875F8:: @ 81875F8 +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman:: @ 81875F8 .string "It's a painting of a beautiful, smiling\n" .string "woman with a POKéMON on her lap.$" -LilycoveCity_LilycoveMuseum_1F_Text_187641:: @ 8187641 +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon:: @ 8187641 .string "It's a painting of a legendary POKéMON\n" .string "from long ago.\p" .string "The artist painted this from\n" .string "imagination.$" -LilycoveCity_LilycoveMuseum_1F_Text_1876A1:: @ 81876A1 +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon:: @ 81876A1 .string "It's a painting of GRASS POKéMON\n" .string "swaying in a breeze.\p" .string "They appear to be enjoying the wind's\n" .string "gentle caress.$" -LilycoveCity_LilycoveMuseum_1F_Text_18770C:: @ 818770C +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries:: @ 818770C .string "It's a delicious-looking painting\n" .string "of BERRIES.\p" .string "This painting could make you hungry!$" -LilycoveCity_LilycoveMuseum_1F_Text_18775F:: @ 818775F +LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica:: @ 818775F .string "It's a replica of a famous sculpture.\p" .string "It depicts an ancient BIRD POKéMON.$" -LilycoveCity_LilycoveMuseum_1F_Text_1877A9:: @ 81877A9 +LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone:: @ 81877A9 .string "It's a big POKé BALL carved from a\n" .string "black stone.\p" .string "It was apparently used in festivals\n" .string "in the olden days.$" -LilycoveCity_LilycoveMuseum_1F_Text_187810:: @ 8187810 +LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText:: @ 8187810 .string "It's a huge stone tablet inscribed\n" .string "with POKéMON and dense text in the\l" .string "small characters of an ancient,\l" @@ -81,47 +81,47 @@ UnknownString_818788B: @ 818788B .string "Hmmm...\n" .string "What works of great magnificence...$" -LilycoveCity_LilycoveMuseum_1F_Text_1878B7:: @ 81878B7 +LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts:: @ 81878B7 .string "Battling with POKéMON is fun,\n" .string "I'll grant you that.\p" .string "But one mustn't forget our love for\n" .string "the fine arts.$" -LilycoveCity_LilycoveMuseum_1F_Text_18791D:: @ 818791D +LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration:: @ 818791D .string "This ART MUSEUM... Well, you could\n" .string "see many fantastic paintings.\p" .string "And the CURATOR is a wonderful person.\p" .string "Among artists like myself, this MUSEUM\n" .string "is an inspiration.$" -LilycoveCity_LilycoveMuseum_1F_Text_1879BF:: @ 81879BF +LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty:: @ 81879BF .string "This lady is pretty!\n" .string "She's like Mommy!$" -LilycoveCity_LilycoveMuseum_1F_Text_1879E6:: @ 81879E6 +LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable:: @ 81879E6 .string "This POKéMON is adorable!\n" .string "Just like our little boy!$" -LilycoveCity_LilycoveMuseum_1F_Text_187A1A:: @ 8187A1A +LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings:: @ 8187A1A .string "I'd heard that this ART MUSEUM got\n" .string "in some new paintings.\p" .string "So, naturally I hurried over.\p" .string "Are the new paintings up on the\n" .string "second floor?$" -LilycoveCity_LilycoveMuseum_1F_Text_187AA0:: @ 8187AA0 +LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful:: @ 8187AA0 .string "Lately, the CURATOR has been\n" .string "unusually cheerful.\p" .string "I bet something good happened for him.\n" .string "Definitely.$" -LilycoveCity_LilycoveMuseum_1F_Text_187B04:: @ 8187B04 +LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings:: @ 8187B04 .string "I aim to see many great paintings\n" .string "here and learn from them.\p" .string "I have this dream of one day having\n" .string "my artwork exhibited here.$" -LilycoveCity_LilycoveMuseum_1F_Text_187B7F:: @ 8187B7F +LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination:: @ 8187B7F .string "The ART MUSEUM has become a favorite\n" .string "tourist destination.\p" .string "It's great for LILYCOVE...\n" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index d600ef74f..8afb010c6 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_Curator", "flag": "0" }, { @@ -34,8 +34,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_158805", - "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_Girl", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2" }, { "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", @@ -47,8 +47,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_15880E", - "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, { "graphics_id": "OBJ_EVENT_GFX_BOY_4", @@ -60,8 +60,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_158817", - "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" } ], "warp_events": [ @@ -81,7 +81,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_15879D" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting" }, { "type": "sign", @@ -89,7 +89,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_15879D" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting" }, { "type": "sign", @@ -97,7 +97,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting" }, { "type": "sign", @@ -105,7 +105,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting" }, { "type": "sign", @@ -113,7 +113,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting" }, { "type": "sign", @@ -121,7 +121,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting" }, { "type": "sign", @@ -129,7 +129,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting" }, { "type": "sign", @@ -137,7 +137,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting" }, { "type": "sign", @@ -145,7 +145,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting" }, { "type": "sign", @@ -153,7 +153,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting" }, { "type": "sign", @@ -161,7 +161,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_15853D" + "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture" }, { "type": "sign", @@ -169,7 +169,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_15853D" + "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture" } ] } diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index e2988e8a2..820b2f970 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -1,219 +1,219 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC - map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_158670 + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_OnFrame .byte 0 -LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 - goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD - goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 +LilycoveCity_LilycoveMuseum_2F_OnLoad:: @ 81585B7 + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 - goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158615 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 +LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting:: @ 81585C6 + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 - goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15862D - goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 +LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting:: @ 81585D5 + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 - goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158645 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 +LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting:: @ 81585E4 + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 - goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15865D +LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting:: @ 81585F3 + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD +LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting:: @ 81585FD setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, 1 setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615 +LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting:: @ 8158615 setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, 1 setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D +LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting:: @ 815862D setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, 1 setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645 +LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting:: @ 8158645 setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, 1 setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D +LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting:: @ 815865D setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, 1 setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, 1 end -LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 - map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A +LilycoveCity_LilycoveMuseum_2F_OnFrame:: @ 8158670 + map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall .2byte 0 -LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: @ 815867A lockall applymovement 1, Common_Movement_FacePlayer - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, MSGBOX_SIGN - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall, MSGBOX_SIGN + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, MSGBOX_SIGN + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall, MSGBOX_SIGN applymovement 1, Common_Movement_FacePlayer waitmovement 0 - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, MSGBOX_SIGN + msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 releaseall end -LilycoveCity_LilycoveMuseum_2F_Movement_1586D3:: @ 81586D3 +LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft:: @ 81586D3 walk_in_place_fastest_left step_end -LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 +LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall:: @ 81586D5 face_up delay_16 step_end -LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 +LilycoveCity_LilycoveMuseum_2F_EventScript_Curator:: @ 81586D8 lockall - goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793 + goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament specialvar VAR_0x8004, CountPlayerMuseumPaintings switch VAR_0x8004 - case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C - case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C - case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C - case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C - case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_158735 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F4E, MSGBOX_NPC + case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting + case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting + case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting + case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting + case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer + msgbox LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_15872C:: @ 815872C - msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F9D, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting:: @ 815872C + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 +LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: @ 8158735 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, MSGBOX_DEFAULT - goto LilycoveCity_LilycoveMuseum_2F_EventScript_15875C + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer, MSGBOX_DEFAULT + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall + msgbox LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests, MSGBOX_DEFAULT + goto LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament end -LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C +LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament:: @ 815875C applymovement 1, Common_Movement_FacePlayer - msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, MSGBOX_DEFAULT + msgbox LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude, MSGBOX_DEFAULT givedecoration DECOR_GLASS_ORNAMENT compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament setflag FLAG_RECEIVED_GLASS_ORNAMENT closemessage releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_158783:: @ 8158783 +LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament:: @ 8158783 call Common_EventScript_NoRoomForDecor - msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, MSGBOX_DEFAULT + msgbox LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou, MSGBOX_DEFAULT closemessage releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_188194, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament:: @ 8158793 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit, MSGBOX_NPC releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D +LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting:: @ 815879D lockall - goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15883C - msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, MSGBOX_SIGN + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 +LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting:: @ 81587B0 lockall - goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158858 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, MSGBOX_SIGN + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 +LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting:: @ 81587C3 lockall - goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158820 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, MSGBOX_SIGN + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 +LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting:: @ 81587D6 lockall - goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15882E - msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, MSGBOX_SIGN + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 +LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting:: @ 81587E9 lockall - goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15884A - msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, MSGBOX_SIGN + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame, MSGBOX_SIGN end @ 81587FC - msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_158805:: @ 8158805 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_188336, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_Girl:: @ 8158805 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_15880E:: @ 815880E - msgbox LilycoveCity_LilycoveMuseum_2F_Text_1883AB, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM:: @ 815880E + msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_188423, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 8158817 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 8158820 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen FADE_TO_BLACK showcontestwinner 9 releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E - msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 815882E + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen FADE_TO_BLACK showcontestwinner 10 releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C - msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 815883C + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen FADE_TO_BLACK showcontestwinner 11 releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A - msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 815884A + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen FADE_TO_BLACK showcontestwinner 12 releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 8158858 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen FADE_TO_BLACK showcontestwinner 13 releaseall diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc index 357eedb0a..e076dfc2d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc @@ -1,7 +1,7 @@ -LilycoveCity_LilycoveMuseum_2F_Text_187C42:: @ 8187C42 +LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall:: @ 8187C42 .string "This is our special exhibit hall.$" -LilycoveCity_LilycoveMuseum_2F_Text_187C64:: @ 8187C64 +LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall:: @ 8187C64 .string "As you can plainly see, there is not a\n" .string "single painting on exhibit.\p" .string "Here, I don't wish to exhibit works of\n" @@ -17,7 +17,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_187C64:: @ 8187C64 .string "POKéMON seemingly ready to spring\l" .string "forth into glorious life!$" -LilycoveCity_LilycoveMuseum_2F_Text_187E1D:: @ 8187E1D +LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit:: @ 8187E1D .string "I beg your pardon. I didn't intend\n" .string "to monopolize the conversation.\p" .string "Now, as you are young, and yet\n" @@ -29,23 +29,23 @@ LilycoveCity_LilycoveMuseum_2F_Text_187E1D:: @ 8187E1D .string "the artist's permission to exhibit\l" .string "it here?$" -LilycoveCity_LilycoveMuseum_2F_Text_187F4E:: @ 8187F4E +LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit:: @ 8187F4E .string "I wish to fill this exhibit hall with\n" .string "modern and vibrant paintings of\l" .string "POKéMON.$" -LilycoveCity_LilycoveMuseum_2F_Text_187F9D:: @ 8187F9D +LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting:: @ 8187F9D .string "Thanks to you, we've added a new\n" .string "painting to our collection!\p" .string "I've heard it depicts your POKéMON.\n" .string "Truly magnificent!\p" .string "Thank you so very, very much!$" -LilycoveCity_LilycoveMuseum_2F_Text_18802F:: @ 818802F +LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer:: @ 818802F .string "Ah! It's you!\n" .string "{PLAYER}!$" -LilycoveCity_LilycoveMuseum_2F_Text_188041:: @ 8188041 +LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests:: @ 8188041 .string "Isn't this marvelous?\n" .string "This collection of paintings!\p" .string "Each one of them flawless!\n" @@ -55,59 +55,59 @@ LilycoveCity_LilycoveMuseum_2F_Text_188041:: @ 8188041 .string "Sincerely, I thank you, {PLAYER}.\n" .string "This is my dream come true!$" -LilycoveCity_LilycoveMuseum_2F_Text_188120:: @ 8188120 +LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude:: @ 8188120 .string "This is merely a token of my gratitude.$" UnknownString_8188148: @ 8188148 .string "{PLAYER} received a GLASS ORNAMENT.$" -LilycoveCity_LilycoveMuseum_2F_Text_188166:: @ 8188166 +LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou:: @ 8188166 .string "I will keep this for you until we\n" .string "meet again.$" -LilycoveCity_LilycoveMuseum_2F_Text_188194:: @ 8188194 +LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit:: @ 8188194 .string "Ah, so good to see you, {PLAYER}!\p" .string "It's an honor to have you visit us\n" .string "on your busy journeys.\p" .string "Please, relax and do enjoy your\n" .string "visit with us.$" -LilycoveCity_LilycoveMuseum_2F_Text_188219:: @ 8188219 +LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame:: @ 8188219 .string "It's a picture frame with pink-colored\n" .string "adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_18824C:: @ 818824C +LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame:: @ 818824C .string "It's a picture frame with yellow-colored\n" .string "adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_188281:: @ 8188281 +LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame:: @ 8188281 .string "It's a picture frame with blue-colored\n" .string "adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_1882B4:: @ 81882B4 +LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame:: @ 81882B4 .string "It's a picture frame with red-colored\n" .string "adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_1882E6:: @ 81882E6 +LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame:: @ 81882E6 .string "It's a picture frame with green-colored\n" .string "adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_18831A:: @ 818831A +LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon:: @ 818831A .string "It's a painting of POKéMON.$" -LilycoveCity_LilycoveMuseum_2F_Text_188336:: @ 8188336 +LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe:: @ 8188336 .string "I've been away awhile, so the new\n" .string "paintings up here surprised me.\p" .string "I wish someone would paint my POKéMON\n" .string "this pretty.$" -LilycoveCity_LilycoveMuseum_2F_Text_1883AB:: @ 81883AB +LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing:: @ 81883AB .string "Well... So this is where they show the\n" .string "topical POKéMON paintings.\p" .string "I see, these new paintings are indeed\n" .string "rather amusing.$" -LilycoveCity_LilycoveMuseum_2F_Text_188423:: @ 8188423 +LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon:: @ 8188423 .string "Wow, is that right?\n" .string "These paintings are of your POKéMON.\p" .string "Isn't that just the ultimate joy for\n" diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index ac672ebd8..54d226847 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_MoveDeletersHouse_EventScript_159AAE", + "script": "LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 0c2b38dcf..3ecea6c71 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -1,63 +1,63 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD .byte 0 -LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE +LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter:: @ 8159AAE lockall applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO + msgbox LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove, MSGBOX_YESNO switch VAR_RESULT - case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE - case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + case YES, LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget + case NO, LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE - msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget:: @ 8159ADE + msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget, MSGBOX_DEFAULT special SelectMonForNPCTrade waitstate compare VAR_0x8004, 255 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain special IsSelectedMonEgg compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves special ScrSpecial_CountPokemonMoves compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 - msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove + msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK special SelectMove fadescreen FADE_FROM_BLACK compare VAR_0x8005, 4 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget special ScrSpecial_GetPokemonNicknameAndMoveName - msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO + msgbox LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO switch VAR_RESULT - case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53 - case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + case YES, LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove + case NO, LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 +LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove:: @ 8159B53 special DeleteMonMove playfanfare MUS_MOVE_DELETED waitfanfare - msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, MSGBOX_DEFAULT + msgbox LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64 +LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove:: @ 8159B64 special ScrSpecial_GetPokemonNicknameAndMoveName - msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, MSGBOX_DEFAULT + msgbox LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_159B71:: @ 8159B71 - msgbox LilycoveCity_MoveDeletersHouse_Text_18B78C, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves:: @ 8159B71 + msgbox LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_159B7B:: @ 8159B7B - msgbox LilycoveCity_MoveDeletersHouse_Text_18B757, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain:: @ 8159B7B + msgbox LilycoveCity_MoveDeletersHouse_Text_ComeAgain, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/text.inc b/data/maps/LilycoveCity_MoveDeletersHouse/text.inc index e1adbdbcb..e8a6737c5 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/text.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/text.inc @@ -1,32 +1,32 @@ -LilycoveCity_MoveDeletersHouse_Text_18B622:: @ 818B622 +LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove:: @ 818B622 .string "Uh...\n" .string "Oh, yes, I'm the MOVE DELETER.\p" .string "I can make POKéMON forget their moves.\p" .string "Would you like me to do that?$" -LilycoveCity_MoveDeletersHouse_Text_18B68C:: @ 818B68C +LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget:: @ 818B68C .string "Which POKéMON should forget a move?$" -LilycoveCity_MoveDeletersHouse_Text_18B6B0:: @ 818B6B0 +LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten:: @ 818B6B0 .string "Which move should be forgotten?$" -LilycoveCity_MoveDeletersHouse_Text_18B6D0:: @ 818B6D0 +LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove:: @ 818B6D0 .string "{STR_VAR_1} seems to know only one\n" .string "move...$" -LilycoveCity_MoveDeletersHouse_Text_18B6F2:: @ 818B6F2 +LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten:: @ 818B6F2 .string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n" .string "That move should be forgotten?$" -LilycoveCity_MoveDeletersHouse_Text_18B71E:: @ 818B71E +LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove:: @ 818B71E .string "It worked to perfection!\p" .string "{STR_VAR_1} has forgotten\n" .string "{STR_VAR_2} completely.$" -LilycoveCity_MoveDeletersHouse_Text_18B757:: @ 818B757 +LilycoveCity_MoveDeletersHouse_Text_ComeAgain:: @ 818B757 .string "Come again if there are other moves\n" .string "to be forgotten.$" -LilycoveCity_MoveDeletersHouse_Text_18B78C:: @ 818B78C +LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves:: @ 818B78C .string "What?\n" .string "No EGG should know any moves.$" diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 80127f2c8..f5f07fe61 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_159331", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_15933F", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_159348", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_Maniac", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 47466c925..6f9e9ffa9 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,12 +1,12 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_15932D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition .byte 0 -LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D +LilycoveCity_PokemonCenter_1F_OnTransition:: @ 815932D setrespawn HEAL_LOCATION_LILYCOVE_CITY end -LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 +LilycoveCity_PokemonCenter_1F_EventScript_Nurse:: @ 8159331 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -14,19 +14,19 @@ LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 release end -LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F - msgbox LilycoveCity_PokemonCenter_1F_Text_189FC9, MSGBOX_NPC +LilycoveCity_PokemonCenter_1F_EventScript_Boy:: @ 815933F + msgbox LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon, MSGBOX_NPC end -LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 +LilycoveCity_PokemonCenter_1F_EventScript_Maniac:: @ 8159348 lock faceplayer - goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_15935D - msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, MSGBOX_DEFAULT + goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone + msgbox LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_15935D:: @ 815935D - msgbox LilycoveCity_PokemonCenter_1F_Text_18A0A1, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone:: @ 815935D + msgbox LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/text.inc b/data/maps/LilycoveCity_PokemonCenter_1F/text.inc index 3c341b751..57f5feff6 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/text.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/text.inc @@ -1,15 +1,15 @@ -LilycoveCity_PokemonCenter_1F_Text_189FC9:: @ 8189FC9 +LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon:: @ 8189FC9 .string "I wonder how many kinds of POKéMON\n" .string "there are in the world?\p" .string "It'd be great to cross seas and\n" .string "trade POKéMON with people far away.$" -LilycoveCity_PokemonCenter_1F_Text_18A048:: @ 818A048 +LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels:: @ 818A048 .string "I've been hearing about some rotten\n" .string "scoundrels who steal POKéMON and rip\l" .string "off METEORITES.$" -LilycoveCity_PokemonCenter_1F_Text_18A0A1:: @ 818A0A1 +LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels:: @ 818A0A1 .string "Those rotten scoundrels who steal\n" .string "POKéMON and rip off METEORITES...\p" .string "I haven't seen them around recently.$" diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index ee98bc83a..48e4b7062 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6", + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Lass", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_15952F", + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Man", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_15961D", + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanM", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_159694", + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirl", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_15970B", + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoy", "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_15976D", + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Boy", "flag": "FLAG_HIDE_FANCLUB_BOY" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF", + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Woman", "flag": "FLAG_HIDE_FANCLUB_LADY" }, { @@ -112,7 +112,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_159831", + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertF", "flag": "FLAG_HIDE_FANCLUB_OLD_LADY" } ], diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index b1d123744..2793b4412 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -1,34 +1,34 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 815938A - map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_159395 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_159412 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_OnFrame + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_OnTransition .byte 0 -LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395 - map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F +LilycoveCity_PokemonTrainerFanClub_OnFrame:: @ 8159395 + map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans .2byte 0 -LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F +LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 815939F lockall applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1D6, MSGBOX_DEFAULT - applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402 - applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA + msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer, MSGBOX_DEFAULT + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer + applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, MSGBOX_DEFAULT - applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer waitmovement 0 setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2 releaseall end -LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA +LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 81593FA delay_8 walk_in_place_fastest_down walk_down @@ -38,7 +38,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA walk_left step_end -LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402 +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ 8159402 walk_fast_left walk_fast_left walk_fast_down @@ -47,12 +47,12 @@ LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402 walk_fast_down step_end -LilycoveCity_PokemonTrainerFanClub_Movement_159409:: @ 8159409 +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: @ 8159409 walk_down walk_in_place_fastest_right step_end -LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: @ 815940C jump_in_place_right walk_fast_up walk_fast_up @@ -60,377 +60,377 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C walk_in_place_fastest_down step_end -LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 +LilycoveCity_PokemonTrainerFanClub_OnTransition:: @ 8159412 compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SetFanMemberPositionsForFirstFanMeeting compare VAR_LILYCOVE_FAN_CLUB_STATE, 2 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions end -LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 +LilycoveCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 8159429 special UpdateMovedLilycoveFanClubMembers setvar VAR_0x8004, 8 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable setvar VAR_0x8004, 9 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable setvar VAR_0x8004, 10 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable setvar VAR_0x8004, 11 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable setvar VAR_0x8004, 12 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable setvar VAR_0x8004, 13 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable setvar VAR_0x8004, 14 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159505 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable setvar VAR_0x8004, 15 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15950D + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5 +LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 81594D5 setobjectxyperm 1, 7, 5 return -LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD:: @ 81594DD +LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 81594DD setobjectxyperm 3, 3, 4 return -LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5:: @ 81594E5 +LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 81594E5 setobjectxyperm 4, 7, 2 return -LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED:: @ 81594ED +LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 81594ED setobjectxyperm 5, 5, 5 return -LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5:: @ 81594F5 +LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 81594F5 setobjectxyperm 6, 5, 2 return -LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD:: @ 81594FD +LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 81594FD setobjectxyperm 2, 8, 4 return -LilycoveCity_PokemonTrainerFanClub_EventScript_159505:: @ 8159505 +LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 8159505 setobjectxyperm 7, 3, 3 return -LilycoveCity_PokemonTrainerFanClub_EventScript_15950D:: @ 815950D +LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 815950D setobjectxyperm 8, 8, 3 return -LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 - call LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD - call LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED - call LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 - call LilycoveCity_PokemonTrainerFanClub_EventScript_159505 - call LilycoveCity_PokemonTrainerFanClub_EventScript_15950D +LilycoveCity_PokemonTrainerFanClub_EventScript_SetFanMemberPositionsForFirstFanMeeting:: @ 8159515 + call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable + call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable + call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable + call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable + call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F +LilycoveCity_PokemonTrainerFanClub_EventScript_Man:: @ 815952F lock faceplayer setvar VAR_0x8004, 13 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayerNotChampion specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayersFan specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyNonFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainersPowerIsOutOfTheOrdinary, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E +LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayersFan:: @ 815956E specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YoureOneWeWantToWin, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159588:: @ 8159588 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A391, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyFan:: @ 8159588 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_OthersDontKnowYoureTheBest, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159592:: @ 8159592 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A48D, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyNonFan:: @ 8159592 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsBestNoOneWantsToListen, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A4EA, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayerNotChampion:: @ 815959C + msgbox LilycoveCity_PokemonTrainerFanClub_Text_HearingAboutToughNewTrainer, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 +LilycoveCity_PokemonTrainerFanClub_EventScript_Lass:: @ 81595A6 lock faceplayer setvar VAR_0x8004, 8 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayerNotChampion specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayersFan specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyNonFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_ICantHelpLikingBrawly, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 +LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayersFan:: @ 81595E5 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_ImPullingForYou, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF:: @ 81595FF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A5AC, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyFan:: @ 81595FF + msgbox LilycoveCity_PokemonTrainerFanClub_Text_BrawlyNoImYourFan, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159609:: @ 8159609 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A65B, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyNonFan:: @ 8159609 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_NobodyUnderstandsBrawly, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A6D4, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayerNotChampion:: @ 8159613 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_MyFavoriteTrainerIsBrawly, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D +LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanM:: @ 815961D lock faceplayer setvar VAR_0x8004, 9 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayerNotChampion specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayersFan specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyNonFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_LongWayToGoComparedToNorman, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C +LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayersFan:: @ 815965C specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouveSurpassedYourFather, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159676:: @ 8159676 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A789, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyFan:: @ 8159676 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YourFatherNeverGaveUpSoKeepOnBattling, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159680:: @ 8159680 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A8C4, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyNonFan:: @ 8159680 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouAndNormanAreDifferent, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A984, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayerNotChampion:: @ 815968A + msgbox LilycoveCity_PokemonTrainerFanClub_Text_WeDiscussStrongestTrainers, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 +LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 8159694 lock faceplayer setvar VAR_0x8004, 10 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_EveryoneThinksTrainerIsCool, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 +LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 81596D3 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWoweeItsPlayer, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED:: @ 81596ED - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA83, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 81596ED + msgbox LilycoveCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7:: @ 81596F7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB41, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 81596F7 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsReallyCoolItsJustMe, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ABAE, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 8159701 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_WishThereWasTrainerLikeThat, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B +LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoy:: @ 815970B lock faceplayer setvar VAR_0x8004, 11 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyPlayersFan specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyNonFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsWickedlyCool, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F +LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyPlayersFan:: @ 815973F specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_WantToBeStrongLikeYou, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159759:: @ 8159759 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC5E, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyFan:: @ 8159759 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyOneWhoCheersForYou, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD05, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyNonFan:: @ 8159763 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_NeverGoingToStopBeingTrainersFan, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D +LilycoveCity_PokemonTrainerFanClub_EventScript_Boy:: @ 815976D lock faceplayer setvar VAR_0x8004, 12 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_BoyPlayersFan specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyNonFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThinkTrainerIsNumberOne, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 +LilycoveCity_PokemonTrainerFanClub_EventScript_BoyPlayersFan:: @ 81597A1 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YoureAmazingAfterAll, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB:: @ 81597BB - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ADEF, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyFan:: @ 81597BB + msgbox LilycoveCity_PokemonTrainerFanClub_Text_ImInYourCorner, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AEF5, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyNonFan:: @ 81597C5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YoureMaybeStrongerThanTrainer, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF +LilycoveCity_PokemonTrainerFanClub_EventScript_Woman:: @ 81597CF lock faceplayer setvar VAR_0x8004, 14 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsStandout, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 +LilycoveCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 8159803 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouChangedMyMind, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15981D:: @ 815981D - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AFD0, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 815981D + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouBattleAttractivelyInToughSituation, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B0C8, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 8159827 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_NoOneCanKnockYouButTrainerStronger, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 +LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertF:: @ 8159831 lock faceplayer setvar VAR_0x8004, 15 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFPlayersFan specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyNonFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaventRealizedPotential, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 +LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFPlayersFan:: @ 8159865 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyFan + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_15987F:: @ 815987F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B181, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyFan:: @ 815987F + msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth, MSGBOX_DEFAULT release end -LilycoveCity_PokemonTrainerFanClub_EventScript_159889:: @ 8159889 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B24F, MSGBOX_DEFAULT +LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyNonFan:: @ 8159889 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_YourePowerfulButNotTrueStrength, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc index 4f8cf5789..2d5be41ec 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc @@ -1,8 +1,8 @@ -LilycoveCity_PokemonTrainerFanClub_Text_18A1D6:: @ 818A1D6 +LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer:: @ 818A1D6 .string "Oh, wow!\n" .string "It's {PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A1E8:: @ 818A1E8 +LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan:: @ 818A1E8 .string "I've heard the news!\n" .string "You're really strong, aren't you?\p" .string "We always argue about who is the\n" @@ -18,29 +18,29 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A1E8:: @ 818A1E8 .string "Remember, I'm cheering for you,\n" .string "{PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A36A:: @ 818A36A +LilycoveCity_PokemonTrainerFanClub_Text_YoureOneWeWantToWin:: @ 818A36A .string "Yo, {PLAYER}!\n" .string "You're the one we want to win!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A391:: @ 818A391 +LilycoveCity_PokemonTrainerFanClub_Text_OthersDontKnowYoureTheBest:: @ 818A391 .string "The others, they don't know that\n" .string "you're the best of the best!\p" .string "Isn't that right, {PLAYER}?\n" .string "Show them you've got guts!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A400:: @ 818A400 +LilycoveCity_PokemonTrainerFanClub_Text_TrainersPowerIsOutOfTheOrdinary:: @ 818A400 .string "I hate to say this, but the TRAINER\n" .string "everybody's talking about is\l" .string "{STR_VAR_1}, no question about it!\p" .string "That TRAINER's power...\n" .string "It's out of the ordinary.$" -LilycoveCity_PokemonTrainerFanClub_Text_18A48D:: @ 818A48D +LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsBestNoOneWantsToListen:: @ 818A48D .string "Darn it... I've been telling people\n" .string "that {STR_VAR_1} is the best now...\p" .string "But no one wants to listen...$" -LilycoveCity_PokemonTrainerFanClub_Text_18A4EA:: @ 818A4EA +LilycoveCity_PokemonTrainerFanClub_Text_HearingAboutToughNewTrainer:: @ 818A4EA .string "I've been hearing things about a\n" .string "tough new TRAINER.\p" .string "This TRAINER's supposed to be beating\n" @@ -48,13 +48,13 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A4EA:: @ 818A4EA .string "Do you know anything about this\n" .string "new TRAINER?$" -LilycoveCity_PokemonTrainerFanClub_Text_18A584:: @ 818A584 +LilycoveCity_PokemonTrainerFanClub_Text_ImPullingForYou:: @ 818A584 .string "Oh!\n" .string "{PLAYER}!\p" .string "Go for it!\n" .string "I'm pulling for you!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A5AC:: @ 818A5AC +LilycoveCity_PokemonTrainerFanClub_Text_BrawlyNoImYourFan:: @ 818A5AC .string "Sigh...\n" .string "BRAWLY...\p" .string "Oh, no! Wait!\n" @@ -63,36 +63,36 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A5AC:: @ 818A5AC .string "So make me proud!\n" .string "Go for it!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A629:: @ 818A629 +LilycoveCity_PokemonTrainerFanClub_Text_ICantHelpLikingBrawly:: @ 818A629 .string "I can't help it, I can only get to\n" .string "like BRAWLY...$" -LilycoveCity_PokemonTrainerFanClub_Text_18A65B:: @ 818A65B +LilycoveCity_PokemonTrainerFanClub_Text_NobodyUnderstandsBrawly:: @ 818A65B .string "Nobody understands the charm of\n" .string "BRAWLY...\p" .string "I don't care!\p" .string "Even if I'm the only one, I'm going\n" .string "to keep cheering for BRAWLY!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A6D4:: @ 818A6D4 +LilycoveCity_PokemonTrainerFanClub_Text_MyFavoriteTrainerIsBrawly:: @ 818A6D4 .string "Whatever anyone says, my favorite\n" .string "TRAINER is DEWFORD's GYM LEADER\l" .string "BRAWLY!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A71E:: @ 818A71E +LilycoveCity_PokemonTrainerFanClub_Text_YouveSurpassedYourFather:: @ 818A71E .string "You've surpassed your own father in\n" .string "every regard!\p" .string "I'm telling you, so there's no question\n" .string "about it at all!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A789:: @ 818A789 +LilycoveCity_PokemonTrainerFanClub_Text_YourFatherNeverGaveUpSoKeepOnBattling:: @ 818A789 .string "Even when things turned bleak, your\n" .string "father never gave up.\p" .string "This I know to be true.\p" .string "You never give up even if you lose!\n" .string "So keep on battling!$" -LilycoveCity_PokemonTrainerFanClub_Text_18A814:: @ 818A814 +LilycoveCity_PokemonTrainerFanClub_Text_LongWayToGoComparedToNorman:: @ 818A814 .string "NORMAN battled with more power,\n" .string "charisma, and showmanship than you.\p" .string "Even though people may say that\n" @@ -100,7 +100,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A814:: @ 818A814 .string "You've still got a long way to go\n" .string "compared to your father.$" -LilycoveCity_PokemonTrainerFanClub_Text_18A8C4:: @ 818A8C4 +LilycoveCity_PokemonTrainerFanClub_Text_YouAndNormanAreDifferent:: @ 818A8C4 .string "You're beginning to get the same\n" .string "air of awe NORMAN exudes.\p" .string "But there's something conclusively\n" @@ -108,7 +108,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A8C4:: @ 818A8C4 .string "I can't tell you what that is.\n" .string "You'll have to find it yourself.$" -LilycoveCity_PokemonTrainerFanClub_Text_18A984:: @ 818A984 +LilycoveCity_PokemonTrainerFanClub_Text_WeDiscussStrongestTrainers:: @ 818A984 .string "Everyone here, we're all huge fans\n" .string "of POKéMON battles.\p" .string "We discuss who we consider to be\n" @@ -116,12 +116,12 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A984:: @ 818A984 .string "If you were to become famous, we\n" .string "might even become your fans!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AA39:: @ 818AA39 +LilycoveCity_PokemonTrainerFanClub_Text_OhWoweeItsPlayer:: @ 818AA39 .string "Oh, woweee! It's {PLAYER}!\n" .string "For real, too!\p" .string "Please, shake my hand, shake my hand!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AA83:: @ 818AA83 +LilycoveCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: @ 818AA83 .string "I'll always cheer for you, {PLAYER}!\n" .string "Always, always!\p" .string "I don't want to see you lose ever,\n" @@ -129,60 +129,60 @@ LilycoveCity_PokemonTrainerFanClub_Text_18AA83:: @ 818AA83 .string "Because I know you're really, really\n" .string "strong, {PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AB0A:: @ 818AB0A +LilycoveCity_PokemonTrainerFanClub_Text_EveryoneThinksTrainerIsCool:: @ 818AB0A .string "{STR_VAR_1} is really cool...\p" .string "Everyone thinks so, right, right?$" -LilycoveCity_PokemonTrainerFanClub_Text_18AB41:: @ 818AB41 +LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsReallyCoolItsJustMe:: @ 818AB41 .string "{STR_VAR_1} really is cool, don't\n" .string "you think so?\p" .string "Even if it's just me, I'm going to keep\n" .string "cheering my favorite TRAINER.$" -LilycoveCity_PokemonTrainerFanClub_Text_18ABAE:: @ 818ABAE +LilycoveCity_PokemonTrainerFanClub_Text_WishThereWasTrainerLikeThat:: @ 818ABAE .string "My favorite TRAINER is...\p" .string "Cool...\p" .string "Strong...\p" .string "And really nice...\p" .string "I wish there was a TRAINER like that...$" -LilycoveCity_PokemonTrainerFanClub_Text_18AC15:: @ 818AC15 +LilycoveCity_PokemonTrainerFanClub_Text_WantToBeStrongLikeYou:: @ 818AC15 .string "Whoa! It's {PLAYER}!\n" .string "Wicked!\p" .string "When I grow up, I want to be strong\n" .string "like you, {PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AC5E:: @ 818AC5E +LilycoveCity_PokemonTrainerFanClub_Text_OnlyOneWhoCheersForYou:: @ 818AC5E .string "Even if I'm the only one...\p" .string "You'll always be the only one I\n" .string "cheer for, {PLAYER}!\p" .string "Because I believe in you, {PLAYER}!$" -LilycoveCity_PokemonTrainerFanClub_Text_18ACC7:: @ 818ACC7 +LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsWickedlyCool:: @ 818ACC7 .string "{STR_VAR_1} is so wickedly cool...\n" .string "I want to shake hands with my hero.$" -LilycoveCity_PokemonTrainerFanClub_Text_18AD05:: @ 818AD05 +LilycoveCity_PokemonTrainerFanClub_Text_NeverGoingToStopBeingTrainersFan:: @ 818AD05 .string "Even if I'm the only one...\p" .string "I'm never going to stop being\n" .string "{STR_VAR_1}'s fan!\p" .string "Because I've heard, {STR_VAR_1}\n" .string "never loses!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AD6D:: @ 818AD6D +LilycoveCity_PokemonTrainerFanClub_Text_YoureAmazingAfterAll:: @ 818AD6D .string "{PLAYER}!\n" .string "You are amazing after all!\p" .string "Ever since I set eyes on you, I knew\n" .string "that you were great.\p" .string "It looks like my eyes didn't deceive me.$" -LilycoveCity_PokemonTrainerFanClub_Text_18ADEF:: @ 818ADEF +LilycoveCity_PokemonTrainerFanClub_Text_ImInYourCorner:: @ 818ADEF .string "Who cares about the others.\n" .string "I'm in your corner!\p" .string "You don't need to worry. Just get\n" .string "out there and battle like always.$" -LilycoveCity_PokemonTrainerFanClub_Text_18AE63:: @ 818AE63 +LilycoveCity_PokemonTrainerFanClub_Text_ThinkTrainerIsNumberOne:: @ 818AE63 .string "You're a pretty decent TRAINER,\n" .string "I think.\p" .string "But I also think that {STR_VAR_1}\n" @@ -190,32 +190,32 @@ LilycoveCity_PokemonTrainerFanClub_Text_18AE63:: @ 818AE63 .string "That's just my opinion.\n" .string "Don't worry about it too much.$" -LilycoveCity_PokemonTrainerFanClub_Text_18AEF5:: @ 818AEF5 +LilycoveCity_PokemonTrainerFanClub_Text_YoureMaybeStrongerThanTrainer:: @ 818AEF5 .string "Wow, you really are strong.\n" .string "Maybe even stronger than {STR_VAR_1}.\p" .string "But {STR_VAR_1} needs me.\p" .string "If I don't cheer for {STR_VAR_1},\n" .string "who will?$" -LilycoveCity_PokemonTrainerFanClub_Text_18AF62:: @ 818AF62 +LilycoveCity_PokemonTrainerFanClub_Text_YouChangedMyMind:: @ 818AF62 .string "You've changed my mind!\n" .string "You are strong, aren't you?\p" .string "I'd like you to tell me how you managed\n" .string "to get so strong!$" -LilycoveCity_PokemonTrainerFanClub_Text_18AFD0:: @ 818AFD0 +LilycoveCity_PokemonTrainerFanClub_Text_YouBattleAttractivelyInToughSituation:: @ 818AFD0 .string "The tougher the situation, the more\n" .string "attractively you battle.\p" .string "I can't wait for your next battle!$" -LilycoveCity_PokemonTrainerFanClub_Text_18B030:: @ 818B030 +LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsStandout:: @ 818B030 .string "Among the recently hot TRAINERS,\n" .string "{STR_VAR_1} is the standout.\p" .string "That toughness, it's simply not normal.\p" .string "You're doing okay, but you're not in\n" .string "the same class as {STR_VAR_1}.$" -LilycoveCity_PokemonTrainerFanClub_Text_18B0C8:: @ 818B0C8 +LilycoveCity_PokemonTrainerFanClub_Text_NoOneCanKnockYouButTrainerStronger:: @ 818B0C8 .string "You are really popular...\p" .string "You're strong, and you're caring to\n" .string "POKéMON. No one can knock you.\p" @@ -223,23 +223,23 @@ LilycoveCity_PokemonTrainerFanClub_Text_18B0C8:: @ 818B0C8 .string "{STR_VAR_1} is definitely stronger!\n" .string "I'm positive!$" -LilycoveCity_PokemonTrainerFanClub_Text_18B16E:: @ 818B16E +LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive:: @ 818B16E .string "You...\p" .string "Impressive!$" -LilycoveCity_PokemonTrainerFanClub_Text_18B181:: @ 818B181 +LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth:: @ 818B181 .string "Your true worth, it is fine if only\n" .string "I recognized it.\p" .string "The others I doubt will understand\n" .string "the hidden power that beats within.$" -LilycoveCity_PokemonTrainerFanClub_Text_18B1FD:: @ 818B1FD +LilycoveCity_PokemonTrainerFanClub_Text_HaventRealizedPotential:: @ 818B1FD .string "Yes, I see strength in your eyes.\p" .string "But!\p" .string "You still haven't realized your\n" .string "potential.$" -LilycoveCity_PokemonTrainerFanClub_Text_18B24F:: @ 818B24F +LilycoveCity_PokemonTrainerFanClub_Text_YourePowerfulButNotTrueStrength:: @ 818B24F .string "It is true that you are tremendously\n" .string "powerful.\p" .string "But!\n" diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index db45539f6..6e667e66b 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -27,7 +27,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_14D6DF", + "script": "LittlerootTown_EventScript_Twin", "flag": "0" }, { @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_14D6CD", + "script": "LittlerootTown_EventScript_FatMan", "flag": "FLAG_HIDE_FAT_MAN_LITTLEROOT" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_14D6D6", + "script": "LittlerootTown_EventScript_Boy", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_EventScript_14DCE2", + "script": "LittlerootTown_EventScript_Mom", "flag": "FLAG_HIDE_MOM_LITTLEROOT" }, { @@ -127,7 +127,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_STATE", "var_value": "0", - "script": "LittlerootTown_EventScript_14D739" + "script": "LittlerootTown_EventScript_NeedPokemonTriggerLeft" }, { "type": "trigger", @@ -136,7 +136,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_STATE", "var_value": "0", - "script": "LittlerootTown_EventScript_14D797" + "script": "LittlerootTown_EventScript_NeedPokemonTriggerRight" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_STATE", "var_value": "1", - "script": "LittlerootTown_EventScript_14D7C7" + "script": "LittlerootTown_EventScript_GoSaveBirchTrigger" }, { "type": "trigger", @@ -154,7 +154,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_14D89E" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger4" }, { "type": "trigger", @@ -163,7 +163,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_14D8AA" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger5" }, { "type": "trigger", @@ -172,7 +172,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_14D886" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger2" }, { "type": "trigger", @@ -181,7 +181,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_14D892" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger3" }, { "type": "trigger", @@ -190,7 +190,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_14D860" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger0" }, { "type": "trigger", @@ -199,7 +199,7 @@ "elevation": 3, "var": "VAR_LITTLEROOT_STATE", "var_value": "3", - "script": "LittlerootTown_EventScript_14D873" + "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger1" } ], "bg_events": [ @@ -209,7 +209,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_14D7F6" + "script": "LittlerootTown_EventScript_TownSign" }, { "type": "sign", @@ -217,7 +217,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_14D7FF" + "script": "LittlerootTown_EventScript_BirchsLabSign" }, { "type": "sign", @@ -225,7 +225,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_14D808" + "script": "LittlerootTown_EventScript_BrendansHouseSign" }, { "type": "sign", @@ -233,7 +233,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_EventScript_14D834" + "script": "LittlerootTown_EventScript_MaysHouseSign" } ] } diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index a4faddb0c..80ad069a8 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -1,125 +1,125 @@ LittlerootTown_MapScripts:: @ 814D509 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_14D514 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_14D5D5 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_OnFrame .byte 0 -LittlerootTown_MapScript1_14D514:: @ 814D514 +LittlerootTown_OnTransition:: @ 814D514 setflag FLAG_VISITED_LITTLEROOT_TOWN compare VAR_LITTLEROOT_INTRO_STATE, 2 - call_if_eq LittlerootTown_EventScript_14D57B - call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583 + call_if_eq LittlerootTown_EventScript_MoveMomToMaysDoor + call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_SetTwinPos compare VAR_LITTLEROOT_STATE, 3 - call_if_eq LittlerootTown_EventScript_14D5A6 + call_if_eq LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos compare VAR_LITTLEROOT_HOUSES_STATE, 4 - call_if_eq LittlerootTown_EventScript_14D570 + call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 - call_if_eq LittlerootTown_EventScript_14D570 + call_if_eq LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent compare VAR_OLDALE_STATE, 1 - call_if_eq LittlerootTown_EventScript_14D567 + call_if_eq LittlerootTown_EventScript_MoveRivalFromOldale compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if_eq LittlerootTown_EventScript_14D563 + call_if_eq LittlerootTown_EventScript_SetRivalLeftForRoute103 end -LittlerootTown_EventScript_14D563:: @ 814D563 +LittlerootTown_EventScript_SetRivalLeftForRoute103:: @ 814D563 setflag FLAG_RIVAL_LEFT_FOR_ROUTE103 return -LittlerootTown_EventScript_14D567:: @ 814D567 +LittlerootTown_EventScript_MoveRivalFromOldale:: @ 814D567 setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_RIVAL_OLDALE_TOWN return -LittlerootTown_EventScript_14D570:: @ 814D570 +LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent:: @ 814D570 setvar VAR_LITTLEROOT_HOUSES_STATE, 5 setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 return -LittlerootTown_EventScript_14D57B:: @ 814D57B +LittlerootTown_EventScript_MoveMomToMaysDoor:: @ 814D57B setobjectxyperm 4, 14, 8 return -LittlerootTown_EventScript_14D583:: @ 814D583 +LittlerootTown_EventScript_SetTwinPos:: @ 814D583 compare VAR_LITTLEROOT_STATE, 0 - goto_if_eq LittlerootTown_EventScript_14D59A + goto_if_eq LittlerootTown_EventScript_SetTwinGuardingRoutePos setobjectxyperm 1, 10, 1 setobjectmovementtype 1, 7 return -LittlerootTown_EventScript_14D59A:: @ 814D59A +LittlerootTown_EventScript_SetTwinGuardingRoutePos:: @ 814D59A setobjectxyperm 1, 7, 2 setobjectmovementtype 1, 8 return -LittlerootTown_EventScript_14D5A6:: @ 814D5A6 +LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos:: @ 814D5A6 clearflag FLAG_HIDE_MOM_LITTLEROOT setobjectmovementtype 4, 8 checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_EventScript_14D5C5 + call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorMale compare VAR_RESULT, 1 - call_if_eq LittlerootTown_EventScript_14D5CD + call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorFemale return -LittlerootTown_EventScript_14D5C5:: @ 814D5C5 +LittlerootTown_EventScript_SetMomInFrontOfDoorMale:: @ 814D5C5 setobjectxyperm 4, 5, 9 return -LittlerootTown_EventScript_14D5CD:: @ 814D5CD +LittlerootTown_EventScript_SetMomInFrontOfDoorFemale:: @ 814D5CD setobjectxyperm 4, 14, 9 return -LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_14D5EF - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_14D60D - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_14D6C5 +LittlerootTown_OnFrame:: @ 814D5D5 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_StepOffTruckMale + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_StepOffTruckFemale + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_BeginDexUpgradeScene .2byte 0 -LittlerootTown_EventScript_14D5EF:: @ 814D5EF +LittlerootTown_EventScript_StepOffTruckMale:: @ 814D5EF lockall setvar VAR_0x8004, 5 setvar VAR_0x8005, 8 - call LittlerootTown_EventScript_14D62B + call LittlerootTown_EventScript_GoInsideWithMom setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end -LittlerootTown_EventScript_14D60D:: @ 814D60D +LittlerootTown_EventScript_StepOffTruckFemale:: @ 814D60D lockall setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 - call LittlerootTown_EventScript_14D62B + call LittlerootTown_EventScript_GoInsideWithMom setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end -LittlerootTown_EventScript_14D62B:: @ 814D62B +LittlerootTown_EventScript_GoInsideWithMom:: @ 814D62B delay 15 playse SE_LEDGE - applymovement LOCALID_PLAYER, LittlerootTown_Movement_14D6C0 + applymovement LOCALID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim addobject 4 - applymovement 4, LittlerootTown_Movement_14D6AC + applymovement 4, LittlerootTown_Movement_MomExitHouse waitmovement 0 closedoor VAR_0x8004, VAR_0x8005 waitdooranim delay 10 - applymovement 4, LittlerootTown_Movement_14D6AE + applymovement 4, LittlerootTown_Movement_MomApproachPlayerAtTruck waitmovement 0 - msgbox LittlerootTown_Text_16A7C9, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_OurNewHomeLetsGoInside, MSGBOX_DEFAULT closemessage - applymovement 4, LittlerootTown_Movement_14D6B1 - applymovement LOCALID_PLAYER, LittlerootTown_Movement_14D6B8 + applymovement 4, LittlerootTown_Movement_MomApproachDoor + applymovement LOCALID_PLAYER, LittlerootTown_Movement_PlayerApproachDoor waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim - applymovement 4, LittlerootTown_Movement_14D6B5 - applymovement LOCALID_PLAYER, LittlerootTown_Movement_14D6BD + applymovement 4, LittlerootTown_Movement_MomEnterHouse + applymovement LOCALID_PLAYER, LittlerootTown_Movement_PlayerEnterHouse waitmovement 0 setflag FLAG_HIDE_MOM_LITTLEROOT setvar VAR_LITTLEROOT_INTRO_STATE, 3 @@ -130,72 +130,72 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B clearflag FLAG_HIDE_MAP_NAME_POPUP return -LittlerootTown_Movement_14D6AC:: @ 814D6AC +LittlerootTown_Movement_MomExitHouse:: @ 814D6AC walk_down step_end -LittlerootTown_Movement_14D6AE:: @ 814D6AE +LittlerootTown_Movement_MomApproachPlayerAtTruck:: @ 814D6AE walk_down walk_in_place_fastest_left step_end -LittlerootTown_Movement_14D6B1:: @ 814D6B1 +LittlerootTown_Movement_MomApproachDoor:: @ 814D6B1 delay_16 delay_8 walk_up step_end -LittlerootTown_Movement_14D6B5:: @ 814D6B5 +LittlerootTown_Movement_MomEnterHouse:: @ 814D6B5 walk_up set_invisible step_end -LittlerootTown_Movement_14D6B8:: @ 814D6B8 +LittlerootTown_Movement_PlayerApproachDoor:: @ 814D6B8 delay_16 delay_8 walk_right walk_in_place_fastest_up step_end -LittlerootTown_Movement_14D6BD:: @ 814D6BD +LittlerootTown_Movement_PlayerEnterHouse:: @ 814D6BD walk_up walk_up step_end -LittlerootTown_Movement_14D6C0:: @ 814D6C0 +LittlerootTown_Movement_PlayerStepOffTruck:: @ 814D6C0 jump_right delay_16 delay_16 delay_16 step_end -LittlerootTown_EventScript_14D6C5:: @ 814D6C5 +LittlerootTown_EventScript_BeginDexUpgradeScene:: @ 814D6C5 lockall setvar VAR_LITTLEROOT_INTRO_STATE, 8 releaseall end -LittlerootTown_EventScript_14D6CD:: @ 814D6CD - msgbox LittlerootTown_Text_16AC00, MSGBOX_NPC +LittlerootTown_EventScript_FatMan:: @ 814D6CD + msgbox LittlerootTown_Text_CanUsePCToStoreItems, MSGBOX_NPC end -LittlerootTown_EventScript_14D6D6:: @ 814D6D6 - msgbox LittlerootTown_Text_16AC56, MSGBOX_NPC +LittlerootTown_EventScript_Boy:: @ 814D6D6 + msgbox LittlerootTown_Text_BirchSpendsDaysInLab, MSGBOX_NPC end -LittlerootTown_EventScript_14D6DF:: @ 814D6DF +LittlerootTown_EventScript_Twin:: @ 814D6DF lock faceplayer - goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F - goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722 + goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_YouSavedBirch compare VAR_LITTLEROOT_STATE, 0 - goto_if_ne LittlerootTown_EventScript_14D708 - msgbox LittlerootTown_Text_16ACEB, MSGBOX_DEFAULT + goto_if_ne LittlerootTown_EventScript_GoSaveBirch + msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT release end -LittlerootTown_EventScript_14D708:: @ 814D708 - msgbox LittlerootTown_Text_16AD82, MSGBOX_DEFAULT +LittlerootTown_EventScript_GoSaveBirch:: @ 814D708 + msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -203,38 +203,38 @@ LittlerootTown_EventScript_14D708:: @ 814D708 release end -LittlerootTown_EventScript_14D722:: @ 814D722 +LittlerootTown_EventScript_YouSavedBirch:: @ 814D722 special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_16ADF2, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_YouSavedBirch, MSGBOX_DEFAULT release end -LittlerootTown_EventScript_14D72F:: @ 814D72F - msgbox LittlerootTown_Text_16AE25, MSGBOX_DEFAULT +LittlerootTown_EventScript_GoodLuck:: @ 814D72F + msgbox LittlerootTown_Text_GoodLuckCatchingPokemon, MSGBOX_DEFAULT release end -LittlerootTown_EventScript_14D739:: @ 814D739 +LittlerootTown_EventScript_NeedPokemonTriggerLeft:: @ 814D739 lockall - applymovement 1, LittlerootTown_Movement_14D779 + applymovement 1, LittlerootTown_Movement_TwinApproachPlayerLeft waitmovement 0 - call LittlerootTown_EventScript_14D755 - applymovement 1, LittlerootTown_Movement_14D789 + call LittlerootTown_EventScript_DangerousWithoutPokemon + applymovement 1, LittlerootTown_Movement_TwinReturnLeft waitmovement 0 releaseall end -LittlerootTown_EventScript_14D755:: @ 814D755 - msgbox LittlerootTown_Text_16ACEB, MSGBOX_DEFAULT +LittlerootTown_EventScript_DangerousWithoutPokemon:: @ 814D755 + msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_14D787 - applymovement LOCALID_PLAYER, LittlerootTown_Movement_14D793 + applymovement 1, LittlerootTown_Movement_TwinPushPlayerFromRoute + applymovement LOCALID_PLAYER, LittlerootTown_Movement_PushPlayerBackFromRoute waitmovement 0 - msgbox LittlerootTown_Text_16AD3C, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_DangerousIfYouDontHavePokemon, MSGBOX_DEFAULT closemessage return -LittlerootTown_Movement_14D779:: @ 814D779 +LittlerootTown_Movement_TwinApproachPlayerLeft:: @ 814D779 face_right delay_8 disable_jump_landing_ground_effect @@ -250,11 +250,11 @@ LittlerootTown_Movement_14D779:: @ 814D779 face_down step_end -LittlerootTown_Movement_14D787:: @ 814D787 +LittlerootTown_Movement_TwinPushPlayerFromRoute:: @ 814D787 walk_down step_end -LittlerootTown_Movement_14D789:: @ 814D789 +LittlerootTown_Movement_TwinReturnLeft:: @ 814D789 walk_right walk_down walk_down @@ -266,23 +266,23 @@ LittlerootTown_Movement_14D789:: @ 814D789 walk_in_place_fastest_down step_end -LittlerootTown_Movement_14D793:: @ 814D793 +LittlerootTown_Movement_PushPlayerBackFromRoute:: @ 814D793 lock_facing_direction walk_down unlock_facing_direction step_end -LittlerootTown_EventScript_14D797:: @ 814D797 +LittlerootTown_EventScript_NeedPokemonTriggerRight:: @ 814D797 lockall - applymovement 1, LittlerootTown_Movement_14D7B3 + applymovement 1, LittlerootTown_Movement_TwinApproachPlayerRight waitmovement 0 - call LittlerootTown_EventScript_14D755 - applymovement 1, LittlerootTown_Movement_14D7C0 + call LittlerootTown_EventScript_DangerousWithoutPokemon + applymovement 1, LittlerootTown_Movement_TwinReturnRight waitmovement 0 releaseall end -LittlerootTown_Movement_14D7B3:: @ 814D7B3 +LittlerootTown_Movement_TwinApproachPlayerRight:: @ 814D7B3 face_right delay_8 disable_jump_landing_ground_effect @@ -297,7 +297,7 @@ LittlerootTown_Movement_14D7B3:: @ 814D7B3 face_down step_end -LittlerootTown_Movement_14D7C0:: @ 814D7C0 +LittlerootTown_Movement_TwinReturnRight:: @ 814D7C0 walk_left walk_down walk_left @@ -306,13 +306,13 @@ LittlerootTown_Movement_14D7C0:: @ 814D7C0 walk_in_place_fastest_down step_end -LittlerootTown_EventScript_14D7C7:: @ 814D7C7 +LittlerootTown_EventScript_GoSaveBirchTrigger:: @ 814D7C7 lockall applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_Text_16AD82, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -320,372 +320,372 @@ LittlerootTown_EventScript_14D7C7:: @ 814D7C7 releaseall end -LittlerootTown_EventScript_14D7F6:: @ 814D7F6 - msgbox LittlerootTown_Text_16AE50, MSGBOX_SIGN +LittlerootTown_EventScript_TownSign:: @ 814D7F6 + msgbox LittlerootTown_Text_TownSign, MSGBOX_SIGN end -LittlerootTown_EventScript_14D7FF:: @ 814D7FF - msgbox LittlerootTown_Text_16AE87, MSGBOX_SIGN +LittlerootTown_EventScript_BirchsLabSign:: @ 814D7FF + msgbox LittlerootTown_Text_ProfBirchsLab, MSGBOX_SIGN end -LittlerootTown_EventScript_14D808:: @ 814D808 +LittlerootTown_EventScript_BrendansHouseSign:: @ 814D808 lockall checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_EventScript_14D822 + call_if_eq LittlerootTown_EventScript_PlayersHouseSignMale compare VAR_RESULT, 1 - call_if_eq LittlerootTown_EventScript_14D82B + call_if_eq LittlerootTown_EventScript_BirchsHouseSignFemale releaseall end -LittlerootTown_EventScript_14D822:: @ 814D822 - msgbox LittlerootTown_Text_16AEA1, MSGBOX_DEFAULT +LittlerootTown_EventScript_PlayersHouseSignMale:: @ 814D822 + msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_14D82B:: @ 814D82B - msgbox LittlerootTown_Text_16AEAC, MSGBOX_DEFAULT +LittlerootTown_EventScript_BirchsHouseSignFemale:: @ 814D82B + msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_14D834:: @ 814D834 +LittlerootTown_EventScript_MaysHouseSign:: @ 814D834 lockall checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_EventScript_14D84E + call_if_eq LittlerootTown_EventScript_BirchsHouseSignMale compare VAR_RESULT, 1 - call_if_eq LittlerootTown_EventScript_14D857 + call_if_eq LittlerootTown_EventScript_PlayersHouseSignFemale releaseall end -LittlerootTown_EventScript_14D84E:: @ 814D84E - msgbox LittlerootTown_Text_16AEAC, MSGBOX_DEFAULT +LittlerootTown_EventScript_BirchsHouseSignMale:: @ 814D84E + msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_14D857:: @ 814D857 - msgbox LittlerootTown_Text_16AEA1, MSGBOX_DEFAULT +LittlerootTown_EventScript_PlayersHouseSignFemale:: @ 814D857 + msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT return -LittlerootTown_EventScript_14D860:: @ 814D860 +LittlerootTown_EventScript_GiveRunningShoesTrigger0:: @ 814D860 lockall setvar VAR_0x8008, 0 setobjectxy 4, 10, 9 - goto LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_14D873:: @ 814D873 +LittlerootTown_EventScript_GiveRunningShoesTrigger1:: @ 814D873 lockall setvar VAR_0x8008, 1 setobjectxy 4, 11, 9 - goto LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_14D886:: @ 814D886 +LittlerootTown_EventScript_GiveRunningShoesTrigger2:: @ 814D886 lockall setvar VAR_0x8008, 2 - goto LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_14D892:: @ 814D892 +LittlerootTown_EventScript_GiveRunningShoesTrigger3:: @ 814D892 lockall setvar VAR_0x8008, 3 - goto LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_14D89E:: @ 814D89E +LittlerootTown_EventScript_GiveRunningShoesTrigger4:: @ 814D89E lockall setvar VAR_0x8008, 4 - goto LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_14D8AA:: @ 814D8AA +LittlerootTown_EventScript_GiveRunningShoesTrigger5:: @ 814D8AA lockall setvar VAR_0x8008, 5 - goto LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_GiveRunningShoesTrigger end -LittlerootTown_EventScript_14D8B6:: @ 814D8B6 +LittlerootTown_EventScript_GiveRunningShoesTrigger:: @ 814D8B6 checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_EventScript_14D93C + call_if_eq LittlerootTown_EventScript_MomNoticePlayerMale compare VAR_RESULT, 1 - call_if_eq LittlerootTown_EventScript_14D947 + call_if_eq LittlerootTown_EventScript_MomNoticePlayerFemale checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_EventScript_14D926 + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale compare VAR_RESULT, 1 - call_if_eq LittlerootTown_EventScript_14D931 - msgbox LittlerootTown_Text_16A8EE, MSGBOX_DEFAULT + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale + msgbox LittlerootTown_Text_WaitPlayer, MSGBOX_DEFAULT closemessage checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_EventScript_14D952 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale compare VAR_RESULT, 1 - call_if_eq LittlerootTown_EventScript_14D995 - call LittlerootTown_EventScript_14DD38 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale + call LittlerootTown_EventScript_GiveRunningShoes checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_EventScript_14DAAA + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale compare VAR_RESULT, 1 - call_if_eq LittlerootTown_EventScript_14DAED - goto LittlerootTown_EventScript_14DD2B + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale + goto LittlerootTown_EventScript_SetReceivedRunningShoes end -LittlerootTown_EventScript_14D926:: @ 814D926 +LittlerootTown_EventScript_SetHomeDoorCoordsMale:: @ 814D926 setvar VAR_0x8009, 5 setvar VAR_0x800A, 8 return -LittlerootTown_EventScript_14D931:: @ 814D931 +LittlerootTown_EventScript_SetHomeDoorCoordsFemale:: @ 814D931 setvar VAR_0x8009, 14 setvar VAR_0x800A, 8 return -LittlerootTown_EventScript_14D93C:: @ 814D93C +LittlerootTown_EventScript_MomNoticePlayerMale:: @ 814D93C applymovement 4, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_EventScript_14D947:: @ 814D947 +LittlerootTown_EventScript_MomNoticePlayerFemale:: @ 814D947 applymovement 4, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_EventScript_14D952:: @ 814D952 +LittlerootTown_EventScript_MomApproachPlayerMale:: @ 814D952 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_14D9D8 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_14D9ED + call_if_eq LittlerootTown_EventScript_MomApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_14DA02 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_14DA17 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_14DA2C + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_14DA41 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale5 return -LittlerootTown_EventScript_14D995:: @ 814D995 +LittlerootTown_EventScript_MomApproachPlayerFemale:: @ 814D995 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_14D9D8 + call_if_eq LittlerootTown_EventScript_MomApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_14D9ED + call_if_eq LittlerootTown_EventScript_MomApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_14DA56 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_14DA6B + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_14DA80 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_14DA95 + call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale5 return -LittlerootTown_EventScript_14D9D8:: @ 814D9D8 +LittlerootTown_EventScript_MomApproachPlayer0:: @ 814D9D8 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DC76 + applymovement 4, LittlerootTown_Movement_MomApproachPlayer0 waitmovement 0 return -LittlerootTown_EventScript_14D9ED:: @ 814D9ED +LittlerootTown_EventScript_MomApproachPlayer1:: @ 814D9ED applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DC7D + applymovement 4, LittlerootTown_Movement_MomApproachPlayer1 waitmovement 0 return -LittlerootTown_EventScript_14DA02:: @ 814DA02 +LittlerootTown_EventScript_MomApproachPlayerMale2:: @ 814DA02 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DC84 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale2 waitmovement 0 return -LittlerootTown_EventScript_14DA17:: @ 814DA17 +LittlerootTown_EventScript_MomApproachPlayerMale3:: @ 814DA17 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DC89 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale3 waitmovement 0 return -LittlerootTown_EventScript_14DA2C:: @ 814DA2C +LittlerootTown_EventScript_MomApproachPlayerMale4:: @ 814DA2C applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DC8F + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale4 waitmovement 0 return -LittlerootTown_EventScript_14DA41:: @ 814DA41 +LittlerootTown_EventScript_MomApproachPlayerMale5:: @ 814DA41 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DC92 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale5 waitmovement 0 return -LittlerootTown_EventScript_14DA56:: @ 814DA56 +LittlerootTown_EventScript_MomApproachPlayerFemale2:: @ 814DA56 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DC96 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale2 waitmovement 0 return -LittlerootTown_EventScript_14DA6B:: @ 814DA6B +LittlerootTown_EventScript_MomApproachPlayerFemale3:: @ 814DA6B applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DC9A + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale3 waitmovement 0 return -LittlerootTown_EventScript_14DA80:: @ 814DA80 +LittlerootTown_EventScript_MomApproachPlayerFemale4:: @ 814DA80 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DC9D + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale4 waitmovement 0 return -LittlerootTown_EventScript_14DA95:: @ 814DA95 +LittlerootTown_EventScript_MomApproachPlayerFemale5:: @ 814DA95 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, LittlerootTown_Movement_14DCA3 + applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale5 waitmovement 0 return -LittlerootTown_EventScript_14DAAA:: @ 814DAAA +LittlerootTown_EventScript_MomReturnHomeMale:: @ 814DAAA compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_14DB30 + call_if_eq LittlerootTown_EventScript_MomReturnHome0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_14DB3B + call_if_eq LittlerootTown_EventScript_MomReturnHome1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_14DB46 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_14DB6C + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_14DB92 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_14DBB8 + call_if_eq LittlerootTown_EventScript_MomReturnHomeMale5 return -LittlerootTown_EventScript_14DAED:: @ 814DAED +LittlerootTown_EventScript_MomReturnHomeFemale:: @ 814DAED compare VAR_0x8008, 0 - call_if_eq LittlerootTown_EventScript_14DB30 + call_if_eq LittlerootTown_EventScript_MomReturnHome0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_EventScript_14DB3B + call_if_eq LittlerootTown_EventScript_MomReturnHome1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_EventScript_14DBDE + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale2 compare VAR_0x8008, 3 - call_if_eq LittlerootTown_EventScript_14DC04 + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale3 compare VAR_0x8008, 4 - call_if_eq LittlerootTown_EventScript_14DC2A + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale4 compare VAR_0x8008, 5 - call_if_eq LittlerootTown_EventScript_14DC50 + call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale5 return -LittlerootTown_EventScript_14DB30:: @ 814DB30 - applymovement 4, LittlerootTown_Movement_14DCA8 +LittlerootTown_EventScript_MomReturnHome0:: @ 814DB30 + applymovement 4, LittlerootTown_Movement_MomReturnHome0 waitmovement 0 return -LittlerootTown_EventScript_14DB3B:: @ 814DB3B - applymovement 4, LittlerootTown_Movement_14DCAE +LittlerootTown_EventScript_MomReturnHome1:: @ 814DB3B + applymovement 4, LittlerootTown_Movement_MomReturnHome1 waitmovement 0 return -LittlerootTown_EventScript_14DB46:: @ 814DB46 - applymovement 4, LittlerootTown_Movement_14DCB4 +LittlerootTown_EventScript_MomReturnHomeMale2:: @ 814DB46 + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale2 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_14DCE0 + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_14DB6C:: @ 814DB6C - applymovement 4, LittlerootTown_Movement_14DCBA +LittlerootTown_EventScript_MomReturnHomeMale3:: @ 814DB6C + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale3 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_14DCE0 + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_14DB92:: @ 814DB92 - applymovement 4, LittlerootTown_Movement_14DCC1 +LittlerootTown_EventScript_MomReturnHomeMale4:: @ 814DB92 + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale4 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_14DCE0 + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_14DBB8:: @ 814DBB8 - applymovement 4, LittlerootTown_Movement_14DCC5 +LittlerootTown_EventScript_MomReturnHomeMale5:: @ 814DBB8 + applymovement 4, LittlerootTown_Movement_MomReturnHomeMale5 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_14DCE0 + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_14DBDE:: @ 814DBDE - applymovement 4, LittlerootTown_Movement_14DCCA +LittlerootTown_EventScript_MomReturnHomeFemale2:: @ 814DBDE + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale2 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_14DCE0 + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_14DC04:: @ 814DC04 - applymovement 4, LittlerootTown_Movement_14DCCF +LittlerootTown_EventScript_MomReturnHomeFemale3:: @ 814DC04 + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale3 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_14DCE0 + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_14DC2A:: @ 814DC2A - applymovement 4, LittlerootTown_Movement_14DCD3 +LittlerootTown_EventScript_MomReturnHomeFemale4:: @ 814DC2A + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale4 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_14DCE0 + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_EventScript_14DC50:: @ 814DC50 - applymovement 4, LittlerootTown_Movement_14DCDA +LittlerootTown_EventScript_MomReturnHomeFemale5:: @ 814DC50 + applymovement 4, LittlerootTown_Movement_MomReturnHomeFemale5 waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_14DCE0 + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return -LittlerootTown_Movement_14DC76:: @ 814DC76 +LittlerootTown_Movement_MomApproachPlayer0:: @ 814DC76 walk_up walk_up walk_up @@ -694,7 +694,7 @@ LittlerootTown_Movement_14DC76:: @ 814DC76 walk_up step_end -LittlerootTown_Movement_14DC7D:: @ 814DC7D +LittlerootTown_Movement_MomApproachPlayer1:: @ 814DC7D walk_up walk_up walk_up @@ -703,14 +703,14 @@ LittlerootTown_Movement_14DC7D:: @ 814DC7D walk_up step_end -LittlerootTown_Movement_14DC84:: @ 814DC84 +LittlerootTown_Movement_MomApproachPlayerMale2:: @ 814DC84 walk_right walk_right walk_right walk_right step_end -LittlerootTown_Movement_14DC89:: @ 814DC89 +LittlerootTown_Movement_MomApproachPlayerMale3:: @ 814DC89 walk_right walk_right walk_right @@ -718,29 +718,29 @@ LittlerootTown_Movement_14DC89:: @ 814DC89 walk_right step_end -LittlerootTown_Movement_14DC8F:: @ 814DC8F +LittlerootTown_Movement_MomApproachPlayerMale4:: @ 814DC8F walk_right walk_right step_end -LittlerootTown_Movement_14DC92:: @ 814DC92 +LittlerootTown_Movement_MomApproachPlayerMale5:: @ 814DC92 walk_right walk_right walk_right step_end -LittlerootTown_Movement_14DC96:: @ 814DC96 +LittlerootTown_Movement_MomApproachPlayerFemale2:: @ 814DC96 walk_left walk_left walk_left step_end -LittlerootTown_Movement_14DC9A:: @ 814DC9A +LittlerootTown_Movement_MomApproachPlayerFemale3:: @ 814DC9A walk_left walk_left step_end -LittlerootTown_Movement_14DC9D:: @ 814DC9D +LittlerootTown_Movement_MomApproachPlayerFemale4:: @ 814DC9D walk_left walk_left walk_left @@ -748,14 +748,14 @@ LittlerootTown_Movement_14DC9D:: @ 814DC9D walk_left step_end -LittlerootTown_Movement_14DCA3:: @ 814DCA3 +LittlerootTown_Movement_MomApproachPlayerFemale5:: @ 814DCA3 walk_left walk_left walk_left walk_left step_end -LittlerootTown_Movement_14DCA8:: @ 814DCA8 +LittlerootTown_Movement_MomReturnHome0:: @ 814DCA8 walk_down walk_down walk_down @@ -763,7 +763,7 @@ LittlerootTown_Movement_14DCA8:: @ 814DCA8 walk_down step_end -LittlerootTown_Movement_14DCAE:: @ 814DCAE +LittlerootTown_Movement_MomReturnHome1:: @ 814DCAE walk_down walk_down walk_down @@ -771,7 +771,7 @@ LittlerootTown_Movement_14DCAE:: @ 814DCAE walk_down step_end -LittlerootTown_Movement_14DCB4:: @ 814DCB4 +LittlerootTown_Movement_MomReturnHomeMale2:: @ 814DCB4 walk_left walk_left walk_left @@ -779,7 +779,7 @@ LittlerootTown_Movement_14DCB4:: @ 814DCB4 walk_in_place_fastest_up step_end -LittlerootTown_Movement_14DCBA:: @ 814DCBA +LittlerootTown_Movement_MomReturnHomeMale3:: @ 814DCBA walk_left walk_left walk_left @@ -788,33 +788,33 @@ LittlerootTown_Movement_14DCBA:: @ 814DCBA walk_in_place_fastest_up step_end -LittlerootTown_Movement_14DCC1:: @ 814DCC1 +LittlerootTown_Movement_MomReturnHomeMale4:: @ 814DCC1 walk_left walk_left walk_in_place_fastest_up step_end -LittlerootTown_Movement_14DCC5:: @ 814DCC5 +LittlerootTown_Movement_MomReturnHomeMale5:: @ 814DCC5 walk_left walk_left walk_left walk_in_place_fastest_up step_end -LittlerootTown_Movement_14DCCA:: @ 814DCCA +LittlerootTown_Movement_MomReturnHomeFemale2:: @ 814DCCA walk_right walk_right walk_right walk_in_place_fastest_up step_end -LittlerootTown_Movement_14DCCF:: @ 814DCCF +LittlerootTown_Movement_MomReturnHomeFemale3:: @ 814DCCF walk_right walk_right walk_in_place_fastest_up step_end -LittlerootTown_Movement_14DCD3:: @ 814DCD3 +LittlerootTown_Movement_MomReturnHomeFemale4:: @ 814DCD3 walk_right walk_right walk_right @@ -823,7 +823,7 @@ LittlerootTown_Movement_14DCD3:: @ 814DCD3 walk_in_place_fastest_up step_end -LittlerootTown_Movement_14DCDA:: @ 814DCDA +LittlerootTown_Movement_MomReturnHomeFemale5:: @ 814DCDA walk_right walk_right walk_right @@ -831,47 +831,47 @@ LittlerootTown_Movement_14DCDA:: @ 814DCDA walk_in_place_fastest_up step_end -LittlerootTown_Movement_14DCE0:: @ 814DCE0 +LittlerootTown_Movement_MomExitThroughDoor:: @ 814DCE0 walk_up step_end -LittlerootTown_EventScript_14DCE2:: @ 814DCE2 +LittlerootTown_EventScript_Mom:: @ 814DCE2 lock faceplayer checkplayergender compare VAR_RESULT, 0 - call_if_eq LittlerootTown_EventScript_14D926 + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsMale compare VAR_RESULT, 1 - call_if_eq LittlerootTown_EventScript_14D931 - call LittlerootTown_EventScript_14DD38 + call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale + call LittlerootTown_EventScript_GiveRunningShoes applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement 4, LittlerootTown_Movement_14DCE0 + applymovement 4, LittlerootTown_Movement_MomExitThroughDoor waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim - goto LittlerootTown_EventScript_14DD2B + goto LittlerootTown_EventScript_SetReceivedRunningShoes end -LittlerootTown_EventScript_14DD2B:: @ 814DD2B +LittlerootTown_EventScript_SetReceivedRunningShoes:: @ 814DD2B removeobject 4 setflag FLAG_SYS_B_DASH setvar VAR_LITTLEROOT_STATE, 4 release end -LittlerootTown_EventScript_14DD38:: @ 814DD38 - msgbox LittlerootTown_Text_16A8FD, MSGBOX_DEFAULT +LittlerootTown_EventScript_GiveRunningShoes:: @ 814DD38 + msgbox LittlerootTown_Text_WearTheseRunningShoes, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_ITEM - message LittlerootTown_Text_16AA32 + message LittlerootTown_Text_SwitchShoesWithRunningShoes waitfanfare waitmessage setflag FLAG_RECEIVED_RUNNING_SHOES - msgbox LittlerootTown_Text_16AA5C, MSGBOX_DEFAULT - msgbox LittlerootTown_Text_16AB10, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_ExplainRunningShoes, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_ComeHomeIfAnythingHappens, MSGBOX_DEFAULT closemessage delay 30 return diff --git a/data/maps/LittlerootTown/text.inc b/data/maps/LittlerootTown/text.inc index b53db8317..284c86b5d 100644 --- a/data/maps/LittlerootTown/text.inc +++ b/data/maps/LittlerootTown/text.inc @@ -1,4 +1,4 @@ -LittlerootTown_Text_16A7C9:: @ 816A7C9 +LittlerootTown_Text_OurNewHomeLetsGoInside:: @ 816A7C9 .string "MOM: {PLAYER}, we're here, honey!\p" .string "It must be tiring riding with our things\n" .string "in the moving truck.\p" @@ -10,10 +10,10 @@ LittlerootTown_Text_16A7C9:: @ 816A7C9 .string "And, you get your own room, {PLAYER}!\n" .string "Let's go inside.$" -LittlerootTown_Text_16A8EE:: @ 816A8EE +LittlerootTown_Text_WaitPlayer:: @ 816A8EE .string "MOM: Wait, {PLAYER}!$" -LittlerootTown_Text_16A8FD:: @ 816A8FD +LittlerootTown_Text_WearTheseRunningShoes:: @ 816A8FD .string "MOM: {PLAYER}! {PLAYER}! Did you\n" .string "introduce yourself to PROF. BIRCH?\p" .string "Oh! What an adorable POKéMON!\n" @@ -24,11 +24,11 @@ LittlerootTown_Text_16A8FD:: @ 816A8FD .string "adventure, wear these RUNNING SHOES.\p" .string "They'll put a zip in your step!$" -LittlerootTown_Text_16AA32:: @ 816AA32 +LittlerootTown_Text_SwitchShoesWithRunningShoes:: @ 816AA32 .string "{PLAYER} switched shoes with the\n" .string "RUNNING SHOES.$" -LittlerootTown_Text_16AA5C:: @ 816AA5C +LittlerootTown_Text_ExplainRunningShoes:: @ 816AA5C .string "MOM: {PLAYER}, those shoes came with\n" .string "instructions.\p" .string "“Press the B Button while wearing these\n" @@ -36,7 +36,7 @@ LittlerootTown_Text_16AA5C:: @ 816AA5C .string "“Slip on these RUNNING SHOES and race\n" .string "in the great outdoors!”$" -LittlerootTown_Text_16AB10:: @ 816AB10 +LittlerootTown_Text_ComeHomeIfAnythingHappens:: @ 816AB10 .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" .string "To think that you have your very own\n" @@ -46,49 +46,49 @@ LittlerootTown_Text_16AB10:: @ 816AB10 .string "If anything happens, you can come home.\p" .string "Go on, go get them, honey!$" -LittlerootTown_Text_16AC00:: @ 816AC00 +LittlerootTown_Text_CanUsePCToStoreItems:: @ 816AC00 .string "If you use a PC, you can store items\n" .string "and POKéMON.\p" .string "The power of science is staggering!$" -LittlerootTown_Text_16AC56:: @ 816AC56 +LittlerootTown_Text_BirchSpendsDaysInLab:: @ 816AC56 .string "PROF. BIRCH spends days in his LAB\n" .string "studying, then he'll suddenly go out in\l" .string "the wild to do more research...\p" .string "When does PROF. BIRCH spend time\n" .string "at home?$" -LittlerootTown_Text_16ACEB:: @ 816ACEB +LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut:: @ 816ACEB .string "If you go in the tall grass at the sides\n" .string "of this road, wild POKéMON will appear.$" -LittlerootTown_Text_16AD3C:: @ 816AD3C +LittlerootTown_Text_DangerousIfYouDontHavePokemon:: @ 816AD3C .string "It's not safe to go out there if you\n" .string "don't have any POKéMON with you.$" -LittlerootTown_Text_16AD82:: @ 816AD82 +LittlerootTown_Text_CanYouGoSeeWhatsHappening:: @ 816AD82 .string "I can hear someone shouting down the\n" .string "road here.\p" .string "What should I do? What should we do?\n" .string "Somebody has to go help...$" -LittlerootTown_Text_16ADF2:: @ 816ADF2 +LittlerootTown_Text_YouSavedBirch:: @ 816ADF2 .string "Boy, am I glad you went and rescued\n" .string "the PROFESSOR.$" -LittlerootTown_Text_16AE25:: @ 816AE25 +LittlerootTown_Text_GoodLuckCatchingPokemon:: @ 816AE25 .string "Are you going to catch POKéMON?\n" .string "Good luck!$" -LittlerootTown_Text_16AE50:: @ 816AE50 +LittlerootTown_Text_TownSign:: @ 816AE50 .string "LITTLEROOT TOWN\n" .string "“A town that can't be shaded any hue.”$" -LittlerootTown_Text_16AE87:: @ 816AE87 +LittlerootTown_Text_ProfBirchsLab:: @ 816AE87 .string "PROF. BIRCH'S POKéMON LAB$" -LittlerootTown_Text_16AEA1:: @ 816AEA1 +LittlerootTown_Text_PlayersHouse:: @ 816AEA1 .string "{PLAYER}'s HOUSE$" -LittlerootTown_Text_16AEAC:: @ 816AEAC +LittlerootTown_Text_ProfBirchsHouse:: @ 816AEAC .string "PROF. BIRCH'S HOUSE$" 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 bba380f08..82934b1d2 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 LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_152720 - applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 + applymovement LOCALID_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 LOCALID_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 d6575ebc2..902fd781a 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 LOCALID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_15295E - applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E + applymovement LOCALID_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 LOCALID_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 b05a5f0b9..93ddbe707 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 LOCALID_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 LOCALID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_152D5B + applymovement LOCALID_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 LOCALID_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/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 1ae80fe0b..c16db02cc 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -42,7 +42,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_14C05A", + "script": "MauvilleCity_EventScript_Boy", "flag": "0" }, { @@ -55,7 +55,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_14C075", + "script": "MauvilleCity_EventScript_RichBoy", "flag": "0" }, { @@ -68,7 +68,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_14C063", + "script": "MauvilleCity_EventScript_Maniac", "flag": "0" }, { @@ -81,7 +81,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_14C06C", + "script": "MauvilleCity_EventScript_Woman", "flag": "0" }, { @@ -94,7 +94,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_14C0A2", + "script": "MauvilleCity_EventScript_SchoolKidM", "flag": "0" }, { @@ -107,7 +107,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_14C0F9", + "script": "MauvilleCity_EventScript_Wally", "flag": "FLAG_HIDE_WALLY_MAUVILLE" }, { @@ -120,7 +120,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_14C0C4", + "script": "MauvilleCity_EventScript_WallysUncle", "flag": "FLAG_HIDE_WALLY_FATHER_MAUVILLE" }, { @@ -133,7 +133,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_14C2F2", + "script": "MauvilleCity_EventScript_Wattson", "flag": "FLAG_HIDE_WATTSON_MAUVILLE" }, { @@ -146,8 +146,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_1B171E", - "flag": "FLAG_ITEM_MAUVILLE_1" + "script": "MauvilleCity_EventScript_ItemXSpeed", + "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED" } ], "warp_events": [ @@ -217,7 +217,7 @@ "y": 6, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_14C087" + "script": "MauvilleCity_EventScript_GymSign" }, { "type": "sign", @@ -249,7 +249,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_14C07E" + "script": "MauvilleCity_EventScript_CitySign" }, { "type": "sign", @@ -257,7 +257,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_14C090" + "script": "MauvilleCity_EventScript_BikeShopSign" }, { "type": "sign", @@ -265,7 +265,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_EventScript_14C099" + "script": "MauvilleCity_EventScript_GameCornerSign" } ] } diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 57738def2..2547534e5 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -1,94 +1,94 @@ MauvilleCity_MapScripts:: @ 814C032 - map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_14C038 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_OnTransition .byte 0 -MauvilleCity_MapScript1_14C038:: @ 814C038 +MauvilleCity_OnTransition:: @ 814C038 setflag FLAG_VISITED_MAUVILLE_CITY clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar VAR_MAUVILLE_GYM_STATE, 0 - call_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C053 + call_if_set FLAG_GOT_TM_THUNDERBOLT_FROM_WATTSON, MauvilleCity_EventScript_MoveWattsonBackToGym end -MauvilleCity_EventScript_14C053:: @ 814C053 +MauvilleCity_EventScript_MoveWattsonBackToGym:: @ 814C053 clearflag FLAG_HIDE_WATTSON_MAUVILLE_GYM setflag FLAG_HIDE_WATTSON_MAUVILLE return -MauvilleCity_EventScript_14C05A:: @ 814C05A - msgbox MauvilleCity_Text_1664DF, MSGBOX_NPC +MauvilleCity_EventScript_Boy:: @ 814C05A + msgbox MauvilleCity_Text_NurseHurtMonBackToHealth, MSGBOX_NPC end -MauvilleCity_EventScript_14C063:: @ 814C063 - msgbox MauvilleCity_Text_16655C, MSGBOX_NPC +MauvilleCity_EventScript_Maniac:: @ 814C063 + msgbox MauvilleCity_Text_AllSortsOfPeopleComeThrough, MSGBOX_NPC end -MauvilleCity_EventScript_14C06C:: @ 814C06C - msgbox MauvilleCity_Text_1665DB, MSGBOX_NPC +MauvilleCity_EventScript_Woman:: @ 814C06C + msgbox MauvilleCity_Text_RydelVeryGenerous, MSGBOX_NPC end -MauvilleCity_EventScript_14C075:: @ 814C075 - msgbox MauvilleCity_Text_16662A, MSGBOX_NPC +MauvilleCity_EventScript_RichBoy:: @ 814C075 + msgbox MauvilleCity_Text_PokemonCanJumpYouOnBike, MSGBOX_NPC end -MauvilleCity_EventScript_14C07E:: @ 814C07E - msgbox MauvilleCity_Text_166665, MSGBOX_SIGN +MauvilleCity_EventScript_CitySign:: @ 814C07E + msgbox MauvilleCity_Text_CitySign, MSGBOX_SIGN end -MauvilleCity_EventScript_14C087:: @ 814C087 - msgbox MauvilleCity_Text_166697, MSGBOX_SIGN +MauvilleCity_EventScript_GymSign:: @ 814C087 + msgbox MauvilleCity_Text_GymSign, MSGBOX_SIGN end -MauvilleCity_EventScript_14C090:: @ 814C090 - msgbox MauvilleCity_Text_1666E4, MSGBOX_SIGN +MauvilleCity_EventScript_BikeShopSign:: @ 814C090 + msgbox MauvilleCity_Text_BikeShopSign, MSGBOX_SIGN end -MauvilleCity_EventScript_14C099:: @ 814C099 - msgbox MauvilleCity_Text_16671C, MSGBOX_SIGN +MauvilleCity_EventScript_GameCornerSign:: @ 814C099 + msgbox MauvilleCity_Text_GameCornerSign, MSGBOX_SIGN end -MauvilleCity_EventScript_14C0A2:: @ 814C0A2 +MauvilleCity_EventScript_SchoolKidM:: @ 814C0A2 lock faceplayer - goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA - msgbox MauvilleCity_Text_16674A, MSGBOX_DEFAULT + goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_TVExplained + msgbox MauvilleCity_Text_ExplainTV, MSGBOX_DEFAULT setflag FLAG_TV_EXPLAINED release end -MauvilleCity_EventScript_14C0BA:: @ 814C0BA - msgbox MauvilleCity_Text_166879, MSGBOX_DEFAULT +MauvilleCity_EventScript_TVExplained:: @ 814C0BA + msgbox MauvilleCity_Text_BeenCheckingOutTV, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_14C0C4:: @ 814C0C4 +MauvilleCity_EventScript_WallysUncle:: @ 814C0C4 lock faceplayer - goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4 - msgbox MauvilleCity_Text_165B76, MSGBOX_DEFAULT + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_UncleAskPlayerToBattleWally + msgbox MauvilleCity_Text_UncleHesTooPeppy, MSGBOX_DEFAULT closemessage applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MauvilleCity_EventScript_14C0E4:: @ 814C0E4 - msgbox MauvilleCity_Text_165E45, MSGBOX_DEFAULT +MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 814C0E4 + msgbox MauvilleCity_Text_UncleCanYouBattleWally, MSGBOX_DEFAULT closemessage applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MauvilleCity_EventScript_14C0F9:: @ 814C0F9 +MauvilleCity_EventScript_Wally:: @ 814C0F9 lockall - goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MauvilleCity_Text_165BE3, MSGBOX_DEFAULT - msgbox MauvilleCity_Text_165C57, MSGBOX_DEFAULT - msgbox MauvilleCity_Text_165D01, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyWeCanBeatAnyone, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -96,60 +96,60 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 waitmovement 0 applymovement 6, Common_Movement_Delay48 waitmovement 0 - msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO - goto MauvilleCity_EventScript_14C154 + msgbox MauvilleCity_Text_WallyWillYouBattleMe, MSGBOX_YESNO + goto MauvilleCity_EventScript_BattleWallyPrompt end -MauvilleCity_EventScript_14C154:: @ 814C154 +MauvilleCity_EventScript_BattleWallyPrompt:: @ 814C154 compare VAR_RESULT, YES - call_if_eq MauvilleCity_EventScript_14C23C + call_if_eq MauvilleCity_EventScript_BattleWally compare VAR_RESULT, NO - goto_if_eq MauvilleCity_EventScript_14C285 + goto_if_eq MauvilleCity_EventScript_DeclineWallyBattle closemessage switch VAR_FACING - case 2, MauvilleCity_EventScript_14C187 - case 4, MauvilleCity_EventScript_14C1D9 + case 2, MauvilleCity_EventScript_WallyAndUncleExitNorth + case 4, MauvilleCity_EventScript_WallyAndUncleExitEast end -MauvilleCity_EventScript_14C187:: @ 814C187 - applymovement 6, MauvilleCity_Movement_14C2AA - applymovement 7, MauvilleCity_Movement_14C2CC +MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 814C187 + applymovement 6, MauvilleCity_Movement_WallyExitNorth1 + applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1 waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - applymovement 7, MauvilleCity_Movement_14C2D8 + applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement 6, MauvilleCity_Movement_14C2B6 - applymovement 7, MauvilleCity_Movement_14C2DF + applymovement 6, MauvilleCity_Movement_WallyExitNorth2 + applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2 waitmovement 0 - goto MauvilleCity_EventScript_14C22B + goto MauvilleCity_EventScript_DefeatedWally end -MauvilleCity_EventScript_14C1D9:: @ 814C1D9 - applymovement 6, MauvilleCity_Movement_14C2B0 - applymovement 7, MauvilleCity_Movement_14C2D2 +MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 814C1D9 + applymovement 6, MauvilleCity_Movement_WallyExitEast1 + applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1 waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - applymovement 7, MauvilleCity_Movement_14C2DC + applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerEast waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement 6, MauvilleCity_Movement_14C2C1 - applymovement 7, MauvilleCity_Movement_14C2E8 + applymovement 6, MauvilleCity_Movement_WallyExitEast2 + applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2 waitmovement 0 - goto MauvilleCity_EventScript_14C22B + goto MauvilleCity_EventScript_DefeatedWally end -MauvilleCity_EventScript_14C22B:: @ 814C22B +MauvilleCity_EventScript_DefeatedWally:: @ 814C22B removeobject 6 removeobject 7 clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE @@ -158,34 +158,34 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B releaseall end -MauvilleCity_EventScript_14C23C:: @ 814C23C - msgbox MauvilleCity_Text_165F0D, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_165F38 +MauvilleCity_EventScript_BattleWally:: @ 814C23C + msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_WallyDefeat applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MauvilleCity_Text_165F85, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox MauvilleCity_Text_165FB3, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MauvilleCity_Text_166050, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT return -MauvilleCity_EventScript_14C285:: @ 814C285 +MauvilleCity_EventScript_DeclineWallyBattle:: @ 814C285 setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE - msgbox MauvilleCity_Text_165DE8, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WallyMyUncleWontKnowImStrong, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_14C292:: @ 814C292 +MauvilleCity_EventScript_WallyRequestBattleAgain:: @ 814C292 applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO - goto MauvilleCity_EventScript_14C154 + msgbox MauvilleCity_Text_WallyPleaseBattleMe, MSGBOX_YESNO + goto MauvilleCity_EventScript_BattleWallyPrompt end -MauvilleCity_Movement_14C2AA:: @ 814C2AA +MauvilleCity_Movement_WallyExitNorth1:: @ 814C2AA walk_left walk_left walk_down @@ -193,7 +193,7 @@ MauvilleCity_Movement_14C2AA:: @ 814C2AA walk_left step_end -MauvilleCity_Movement_14C2B0:: @ 814C2B0 +MauvilleCity_Movement_WallyExitEast1:: @ 814C2B0 walk_down walk_down walk_left @@ -201,7 +201,7 @@ MauvilleCity_Movement_14C2B0:: @ 814C2B0 walk_left step_end -MauvilleCity_Movement_14C2B6:: @ 814C2B6 +MauvilleCity_Movement_WallyExitNorth2:: @ 814C2B6 delay_16 delay_16 walk_left @@ -214,7 +214,7 @@ MauvilleCity_Movement_14C2B6:: @ 814C2B6 walk_left step_end -MauvilleCity_Movement_14C2C1:: @ 814C2C1 +MauvilleCity_Movement_WallyExitEast2:: @ 814C2C1 delay_16 delay_16 walk_left @@ -227,7 +227,7 @@ MauvilleCity_Movement_14C2C1:: @ 814C2C1 walk_left step_end -MauvilleCity_Movement_14C2CC:: @ 814C2CC +MauvilleCity_Movement_WallysUncleExitNorth1:: @ 814C2CC walk_left walk_left walk_left @@ -235,7 +235,7 @@ MauvilleCity_Movement_14C2CC:: @ 814C2CC walk_down step_end -MauvilleCity_Movement_14C2D2:: @ 814C2D2 +MauvilleCity_Movement_WallysUncleExitEast1:: @ 814C2D2 walk_left walk_down walk_down @@ -243,18 +243,18 @@ MauvilleCity_Movement_14C2D2:: @ 814C2D2 walk_left step_end -MauvilleCity_Movement_14C2D8:: @ 814C2D8 +MauvilleCity_Movement_WallysUncleApproachPlayerNorth:: @ 814C2D8 walk_right walk_right walk_in_place_fastest_up step_end -MauvilleCity_Movement_14C2DC:: @ 814C2DC +MauvilleCity_Movement_WallysUncleApproachPlayerEast:: @ 814C2DC walk_right walk_up step_end -MauvilleCity_Movement_14C2DF:: @ 814C2DF +MauvilleCity_Movement_WallysUncleExitNorth2:: @ 814C2DF walk_left walk_left walk_left @@ -265,7 +265,7 @@ MauvilleCity_Movement_14C2DF:: @ 814C2DF walk_left step_end -MauvilleCity_Movement_14C2E8:: @ 814C2E8 +MauvilleCity_Movement_WallysUncleExitEast2:: @ 814C2E8 walk_down walk_left walk_left @@ -277,36 +277,36 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8 walk_left step_end -MauvilleCity_EventScript_14C2F2:: @ 814C2F2 +MauvilleCity_EventScript_Wattson:: @ 814C2F2 lock faceplayer - goto_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C368 + goto_if_set FLAG_GOT_TM_THUNDERBOLT_FROM_WATTSON, MauvilleCity_EventScript_ReceivedThunderbolt compare VAR_NEW_MAUVILLE_STATE, 2 - goto_if_eq MauvilleCity_EventScript_14C33C - goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332 - msgbox MauvilleCity_Text_1661C1, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_EventScript_CompletedNewMauville + goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_BegunNewMauville + msgbox MauvilleCity_Text_WattsonNeedFavorTakeKey, MSGBOX_DEFAULT giveitem ITEM_BASEMENT_KEY setflag FLAG_RECEIVED_BASEMENT_KEY - msgbox MauvilleCity_Text_166331, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_14C332:: @ 814C332 - msgbox MauvilleCity_Text_166331, MSGBOX_DEFAULT +MauvilleCity_EventScript_BegunNewMauville:: @ 814C332 + msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_14C33C:: @ 814C33C - msgbox MauvilleCity_Text_1663EB, MSGBOX_DEFAULT +MauvilleCity_EventScript_CompletedNewMauville:: @ 814C33C + msgbox MauvilleCity_Text_WattsonThanksTakeTM, MSGBOX_DEFAULT giveitem ITEM_TM24_THUNDERBOLT compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - setflag FLAG_RECEIVED_TM24 - msgbox MauvilleCity_Text_166488, MSGBOX_DEFAULT + setflag FLAG_GOT_TM_THUNDERBOLT_FROM_WATTSON + msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT release end -MauvilleCity_EventScript_14C368:: @ 814C368 - msgbox MauvilleCity_Text_166488, MSGBOX_DEFAULT +MauvilleCity_EventScript_ReceivedThunderbolt:: @ 814C368 + msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity/text.inc b/data/maps/MauvilleCity/text.inc index 8726ae206..020cc620c 100644 --- a/data/maps/MauvilleCity/text.inc +++ b/data/maps/MauvilleCity/text.inc @@ -1,27 +1,27 @@ -MauvilleCity_Text_165B76:: @ 8165B76 +MauvilleCity_Text_UncleHesTooPeppy:: @ 8165B76 .string "UNCLE: It's because of POKéMON that\n" .string "this boy's got more pep, I suppose...\l" .string "But he's become a bit too peppy...$" -MauvilleCity_Text_165BE3:: @ 8165BE3 +MauvilleCity_Text_WallyWantToChallengeGym:: @ 8165BE3 .string "WALLY: Aww, UNCLE, please?\p" .string "I want to challenge this GYM and see\n" .string "how much better I've become.\p" .string "Please? May I, please?$" -MauvilleCity_Text_165C57:: @ 8165C57 +MauvilleCity_Text_UncleYourePushingIt:: @ 8165C57 .string "UNCLE: Now hold on, WALLY.\p" .string "Since you started living with POKéMON,\n" .string "you have grown quite a lot stronger.\p" .string "But don't you think you're pushing it\n" .string "to suddenly challenge a GYM?$" -MauvilleCity_Text_165D01:: @ 8165D01 +MauvilleCity_Text_WallyWeCanBeatAnyone:: @ 8165D01 .string "WALLY: I'm not pushing it.\p" .string "If I combine forces with RALTS,\n" .string "we can beat anyone!$" -MauvilleCity_Text_165D50:: @ 8165D50 +MauvilleCity_Text_WallyWillYouBattleMe:: @ 8165D50 .string "WALLY: Oh! Hi, {PLAYER}!\p" .string "I've gotten a lot stronger since we\n" .string "met.\p" @@ -30,43 +30,43 @@ MauvilleCity_Text_165D50:: @ 8165D50 .string "{PLAYER}, please, will you have a\n" .string "battle with me?$" -MauvilleCity_Text_165DE8:: @ 8165DE8 +MauvilleCity_Text_WallyMyUncleWontKnowImStrong:: @ 8165DE8 .string "WALLY: Oh... If you won't battle me,\n" .string "{PLAYER}, my UNCLE won't know that I've\l" .string "become really strong.$" -MauvilleCity_Text_165E45:: @ 8165E45 +MauvilleCity_Text_UncleCanYouBattleWally:: @ 8165E45 .string "UNCLE: {PLAYER}{KUN}, was it?\n" .string "On WALLY's behalf, can I ask you to\l" .string "battle with him just this once?\p" .string "I don't think he's going to listen to\n" .string "any reason the way he is now.$" -MauvilleCity_Text_165EE2:: @ 8165EE2 +MauvilleCity_Text_WallyPleaseBattleMe:: @ 8165EE2 .string "WALLY: {PLAYER}, please!\n" .string "Battle with me, please.$" -MauvilleCity_Text_165F0D:: @ 8165F0D +MauvilleCity_Text_WallyHereICome:: @ 8165F0D .string "WALLY: {PLAYER}, thank you.\p" .string "Okay... Here I come!$" -MauvilleCity_Text_165F38:: @ 8165F38 +MauvilleCity_Text_WallyDefeat:: @ 8165F38 .string "WALLY: ... ... ... ... ... ... ...\p" .string "... ... ... ... ... ... ... ...\p" .string "I lost...$" -MauvilleCity_Text_165F85:: @ 8165F85 +MauvilleCity_Text_WallyIllGoBackToVerdanturf:: @ 8165F85 .string "WALLY: UNCLE...\n" .string "I'll go back to VERDANTURF...$" -MauvilleCity_Text_165FB3:: @ 8165FB3 +MauvilleCity_Text_ThankYouNotEnoughToBattle:: @ 8165FB3 .string "{PLAYER}, thank you.\n" .string "Being a TRAINER is tough, isn't it?\p" .string "It's not enough just to have POKéMON\n" .string "and make them battle. That isn't what\l" .string "being a real TRAINER is about.$" -MauvilleCity_Text_166050:: @ 8166050 +MauvilleCity_Text_UncleNoNeedToBeDown:: @ 8166050 .string "UNCLE: WALLY, there's no need to be so\n" .string "down on yourself.\p" .string "Why, what's keeping you from becoming\n" @@ -74,7 +74,7 @@ MauvilleCity_Text_166050:: @ 8166050 .string "Come on, let's go home.\n" .string "Everyone's waiting for you.$" -MauvilleCity_Text_1660FA:: @ 81660FA +MauvilleCity_Text_UncleVisitUsSometime:: @ 81660FA .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" .string "that you must be the TRAINER who kept\l" .string "an eye out for WALLY when he caught\l" @@ -83,7 +83,7 @@ MauvilleCity_Text_1660FA:: @ 81660FA .string "sometime?\l" .string "I'm sure WALLY would enjoy it.$" -MauvilleCity_Text_1661C1:: @ 81661C1 +MauvilleCity_Text_WattsonNeedFavorTakeKey:: @ 81661C1 .string "WATTSON: Oh, {PLAYER}{KUN}!\n" .string "You look like you have a lot of zip!\l" .string "That's a good thing, wahahahaha!\p" @@ -98,7 +98,7 @@ MauvilleCity_Text_1661C1:: @ 81661C1 .string "Here, this is the KEY to get into NEW\n" .string "MAUVILLE.$" -MauvilleCity_Text_166331:: @ 8166331 +MauvilleCity_Text_WattsonWontBeChallenge:: @ 8166331 .string "WATTSON: Don't you worry about it.\n" .string "It won't be a challenge to you.\p" .string "The entrance to NEW MAUVILLE is just\n" @@ -106,7 +106,7 @@ MauvilleCity_Text_166331:: @ 8166331 .string "That's it, then, you have my trust!\n" .string "Wahahahaha!$" -MauvilleCity_Text_1663EB:: @ 81663EB +MauvilleCity_Text_WattsonThanksTakeTM:: @ 81663EB .string "WATTSON: Wahahahaha!\p" .string "I knew it, {PLAYER}{KUN}! I knew I'd made\n" .string "the right choice asking you!\p" @@ -114,51 +114,51 @@ MauvilleCity_Text_1663EB:: @ 81663EB .string "THUNDERBOLT!\p" .string "Go on, you've earned it!$" -MauvilleCity_Text_166488:: @ 8166488 +MauvilleCity_Text_WattsonYoungTakeCharge:: @ 8166488 .string "WATTSON: Wahahahaha!\p" .string "It pleases me to no end to see the\n" .string "young step up and take charge!$" -MauvilleCity_Text_1664DF:: @ 81664DF +MauvilleCity_Text_NurseHurtMonBackToHealth:: @ 81664DF .string "You know, it's cool to have POKéMON\n" .string "battles and stuff...\p" .string "But if your POKéMON gets hurt, you\n" .string "have to nurse it back to health.$" -MauvilleCity_Text_16655C:: @ 816655C +MauvilleCity_Text_AllSortsOfPeopleComeThrough:: @ 816655C .string "The roads of this town stretch north\n" .string "and south, and east and west.\p" .string "Because of that, we get all sorts of\n" .string "people coming through.$" -MauvilleCity_Text_1665DB:: @ 81665DB +MauvilleCity_Text_RydelVeryGenerous:: @ 81665DB .string "Have you been to RYDEL'S CYCLES yet?\p" .string "RYDEL, the owner, is a very generous\n" .string "man.$" -MauvilleCity_Text_16662A:: @ 816662A +MauvilleCity_Text_PokemonCanJumpYouOnBike:: @ 816662A .string "Even if you're riding a BIKE, wild\n" .string "POKéMON could jump you.$" -MauvilleCity_Text_166665:: @ 8166665 +MauvilleCity_Text_CitySign:: @ 8166665 .string "MAUVILLE CITY\n" .string "“The bright and shiny city of fun!”$" -MauvilleCity_Text_166697:: @ 8166697 +MauvilleCity_Text_GymSign:: @ 8166697 .string "MAUVILLE CITY POKéMON GYM\n" .string "LEADER: WATTSON\l" .string "“The cheerfully electrifying man!”$" -MauvilleCity_Text_1666E4:: @ 81666E4 +MauvilleCity_Text_BikeShopSign:: @ 81666E4 .string "“Ride in gravel and shake up your\n" .string "soul!”\l" .string "RYDEL'S CYCLES$" -MauvilleCity_Text_16671C:: @ 816671C +MauvilleCity_Text_GameCornerSign:: @ 816671C .string "“The play spot for all!”\n" .string "MAUVILLE GAME CORNER$" -MauvilleCity_Text_16674A:: @ 816674A +MauvilleCity_Text_ExplainTV:: @ 816674A .string "Hi, do you check out TV at all?\p" .string "They've added a bunch of cool new\n" .string "shows recently.\p" @@ -170,5 +170,5 @@ MauvilleCity_Text_16674A:: @ 816674A .string "That's why I think you should check\n" .string "out TVs whenever you can.$" -MauvilleCity_Text_166879:: @ 8166879 +MauvilleCity_Text_BeenCheckingOutTV:: @ 8166879 .string "Hi, have you been checking out TVs?$" diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 4bdd84863..71d2eac96 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_BikeShop_EventScript_156796", + "script": "MauvilleCity_BikeShop_EventScript_Rydel", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_BikeShop_EventScript_15690B", + "script": "MauvilleCity_BikeShop_EventScript_Assistant", "flag": "0" } ], @@ -62,7 +62,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_BikeShop_EventScript_156914" + "script": "MauvilleCity_BikeShop_EventScript_MachBikeHandbook" }, { "type": "sign", @@ -70,7 +70,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_BikeShop_EventScript_156988" + "script": "MauvilleCity_BikeShop_EventScript_AcroBikeHandbook" } ] } diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 4dd54a000..c8a516ff5 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -1,182 +1,182 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795 .byte 0 -MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 +MauvilleCity_BikeShop_EventScript_Rydel:: @ 8156796 lock faceplayer - goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_15686E - goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_1567D1 - msgbox MauvilleCity_BikeShop_Text_180F9F, MSGBOX_DEFAULT - msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_AskSwitchBikes + goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_SkipGreeting + msgbox MauvilleCity_BikeShop_Text_RydelGreeting, MSGBOX_DEFAULT + msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq MauvilleCity_BikeShop_EventScript_156824 + goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar compare VAR_RESULT, NO - goto_if_eq MauvilleCity_BikeShop_EventScript_156817 + goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar end -MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 - msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO +MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 81567D1 + msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq MauvilleCity_BikeShop_EventScript_156824 + goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar compare VAR_RESULT, NO - goto_if_eq MauvilleCity_BikeShop_EventScript_156817 + goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar end -MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 - message MauvilleCity_BikeShop_Text_1810B1 +MauvilleCity_BikeShop_EventScript_ChooseBike:: @ 81567F0 + message MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne waitmessage multichoice 21, 8, 12, 1 switch VAR_RESULT - case 0, MauvilleCity_BikeShop_EventScript_15682D - case 1, MauvilleCity_BikeShop_EventScript_156847 + case 0, MauvilleCity_BikeShop_EventScript_GetMachBike + case 1, MauvilleCity_BikeShop_EventScript_GetAcroBike end -MauvilleCity_BikeShop_EventScript_156817:: @ 8156817 +MauvilleCity_BikeShop_EventScript_NotFar:: @ 8156817 setflag FLAG_DECLINED_BIKE - msgbox MauvilleCity_BikeShop_Text_181067, MSGBOX_DEFAULT + msgbox MauvilleCity_BikeShop_Text_GuessYouDontNeedBike, MSGBOX_DEFAULT release end -MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 +MauvilleCity_BikeShop_EventScript_YesFar:: @ 8156824 setflag FLAG_RECEIVED_BIKE - goto MauvilleCity_BikeShop_EventScript_1567F0 + goto MauvilleCity_BikeShop_EventScript_ChooseBike end -MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D - msgbox MauvilleCity_BikeShop_Text_181332, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_GetMachBike:: @ 815682D + msgbox MauvilleCity_BikeShop_Text_ChoseMachBike, MSGBOX_DEFAULT giveitem ITEM_MACH_BIKE - goto MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end -MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 - msgbox MauvilleCity_BikeShop_Text_18134A, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_GetAcroBike:: @ 8156847 + msgbox MauvilleCity_BikeShop_Text_ChoseAcroBike, MSGBOX_DEFAULT giveitem ITEM_ACRO_BIKE - goto MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end -MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 - msgbox MauvilleCity_BikeShop_Text_181362, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes:: @ 8156861 + msgbox MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes, MSGBOX_DEFAULT special SwapRegisteredBike release end -MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E - msgbox MauvilleCity_BikeShop_Text_1813A0, MSGBOX_YESNO +MauvilleCity_BikeShop_EventScript_AskSwitchBikes:: @ 815686E + msgbox MauvilleCity_BikeShop_Text_WantToSwitchBikes, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq MauvilleCity_BikeShop_EventScript_15688D + goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchBikes compare VAR_RESULT, NO - goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF + goto_if_eq MauvilleCity_BikeShop_EventScript_KeepBike end -MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D - msgbox MauvilleCity_BikeShop_Text_1813D4, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_SwitchBikes:: @ 815688D + msgbox MauvilleCity_BikeShop_Text_IllSwitchBikes, MSGBOX_DEFAULT checkitem ITEM_ACRO_BIKE, 1 compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 + goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchAcroForMach checkitem ITEM_MACH_BIKE, 1 compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA - msgbox MauvilleCity_BikeShop_Text_181498, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchMachForAcro + msgbox MauvilleCity_BikeShop_Text_OhYourBikeIsInPC, MSGBOX_DEFAULT release end -MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF - msgbox MauvilleCity_BikeShop_Text_181469, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_KeepBike:: @ 81568BF + msgbox MauvilleCity_BikeShop_Text_HappyYouLikeIt, MSGBOX_DEFAULT release end -MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 +MauvilleCity_BikeShop_EventScript_SwitchAcroForMach:: @ 81568C9 incrementgamestat GAME_STAT_TRADED_BIKES - msgbox MauvilleCity_BikeShop_Text_181439, MSGBOX_DEFAULT + msgbox MauvilleCity_BikeShop_Text_ExchangedAcroForMach, MSGBOX_DEFAULT removeitem ITEM_ACRO_BIKE giveitem ITEM_MACH_BIKE - goto MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end -MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA +MauvilleCity_BikeShop_EventScript_SwitchMachForAcro:: @ 81568EA incrementgamestat GAME_STAT_TRADED_BIKES - msgbox MauvilleCity_BikeShop_Text_181408, MSGBOX_DEFAULT + msgbox MauvilleCity_BikeShop_Text_ExchangedMachForAcro, MSGBOX_DEFAULT removeitem ITEM_MACH_BIKE giveitem ITEM_ACRO_BIKE - goto MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end -MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B - msgbox MauvilleCity_BikeShop_Text_181568, MSGBOX_NPC +MauvilleCity_BikeShop_EventScript_Assistant:: @ 815690B + msgbox MauvilleCity_BikeShop_Text_HandbooksAreInBack, MSGBOX_NPC end -MauvilleCity_BikeShop_EventScript_156914:: @ 8156914 - message MauvilleCity_BikeShop_Text_1815EA +MauvilleCity_BikeShop_EventScript_MachBikeHandbook:: @ 8156914 + message MauvilleCity_BikeShop_Text_MachHandbookWhichPage waitmessage - goto MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage end -MauvilleCity_BikeShop_EventScript_156920:: @ 8156920 +MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage:: @ 8156920 multichoice 0, 0, 43, 0 switch VAR_RESULT - case 0, MauvilleCity_BikeShop_EventScript_156962 - case 1, MauvilleCity_BikeShop_EventScript_15696E - case 2, MauvilleCity_BikeShop_EventScript_15697A - case 3, MauvilleCity_BikeShop_EventScript_156986 - case 127, MauvilleCity_BikeShop_EventScript_156986 + case 0, MauvilleCity_BikeShop_EventScript_HowToRide + case 1, MauvilleCity_BikeShop_EventScript_HowToTurn + case 2, MauvilleCity_BikeShop_EventScript_SandySlopes + case 3, MauvilleCity_BikeShop_EventScript_ExitMachHandbook + case 127, MauvilleCity_BikeShop_EventScript_ExitMachHandbook end -MauvilleCity_BikeShop_EventScript_156962:: @ 8156962 - message MauvilleCity_BikeShop_Text_18162C +MauvilleCity_BikeShop_EventScript_HowToRide:: @ 8156962 + message MauvilleCity_BikeShop_Text_HowToRideMachBike waitmessage - goto MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage end -MauvilleCity_BikeShop_EventScript_15696E:: @ 815696E - message MauvilleCity_BikeShop_Text_1816F5 +MauvilleCity_BikeShop_EventScript_HowToTurn:: @ 815696E + message MauvilleCity_BikeShop_Text_HowToTurnMachBike waitmessage - goto MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage end -MauvilleCity_BikeShop_EventScript_15697A:: @ 815697A - message MauvilleCity_BikeShop_Text_1817BF +MauvilleCity_BikeShop_EventScript_SandySlopes:: @ 815697A + message MauvilleCity_BikeShop_Text_SandySlopes waitmessage - goto MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage end -MauvilleCity_BikeShop_EventScript_156986:: @ 8156986 +MauvilleCity_BikeShop_EventScript_ExitMachHandbook:: @ 8156986 release end -MauvilleCity_BikeShop_EventScript_156988:: @ 8156988 - message MauvilleCity_BikeShop_Text_181892 +MauvilleCity_BikeShop_EventScript_AcroBikeHandbook:: @ 8156988 + message MauvilleCity_BikeShop_Text_AcroHandbookWhichPage waitmessage - goto MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage end -MauvilleCity_BikeShop_EventScript_156994:: @ 8156994 +MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage:: @ 8156994 multichoice 0, 0, 44, 0 switch VAR_RESULT - case 0, MauvilleCity_BikeShop_EventScript_1569D6 - case 1, MauvilleCity_BikeShop_EventScript_1569E2 - case 2, MauvilleCity_BikeShop_EventScript_1569EE - case 3, MauvilleCity_BikeShop_EventScript_1569FA - case 127, MauvilleCity_BikeShop_EventScript_1569FA + case 0, MauvilleCity_BikeShop_EventScript_Wheelies + case 1, MauvilleCity_BikeShop_EventScript_BunnyHops + case 2, MauvilleCity_BikeShop_EventScript_Jumps + case 3, MauvilleCity_BikeShop_EventScript_ExitAcroHandbook + case 127, MauvilleCity_BikeShop_EventScript_ExitAcroHandbook end -MauvilleCity_BikeShop_EventScript_1569D6:: @ 81569D6 - message MauvilleCity_BikeShop_Text_1818D4 +MauvilleCity_BikeShop_EventScript_Wheelies:: @ 81569D6 + message MauvilleCity_BikeShop_Text_Wheelies waitmessage - goto MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage end -MauvilleCity_BikeShop_EventScript_1569E2:: @ 81569E2 - message MauvilleCity_BikeShop_Text_18199A +MauvilleCity_BikeShop_EventScript_BunnyHops:: @ 81569E2 + message MauvilleCity_BikeShop_Text_BunnyHops waitmessage - goto MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage end -MauvilleCity_BikeShop_EventScript_1569EE:: @ 81569EE - message MauvilleCity_BikeShop_Text_181A3D +MauvilleCity_BikeShop_EventScript_Jumps:: @ 81569EE + message MauvilleCity_BikeShop_Text_Jumps waitmessage - goto MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage end -MauvilleCity_BikeShop_EventScript_1569FA:: @ 81569FA +MauvilleCity_BikeShop_EventScript_ExitAcroHandbook:: @ 81569FA release end diff --git a/data/maps/MauvilleCity_BikeShop/text.inc b/data/maps/MauvilleCity_BikeShop/text.inc index 3ca3def5c..d6652188e 100644 --- a/data/maps/MauvilleCity_BikeShop/text.inc +++ b/data/maps/MauvilleCity_BikeShop/text.inc @@ -1,20 +1,20 @@ -MauvilleCity_BikeShop_Text_180F9F:: @ 8180F9F +MauvilleCity_BikeShop_Text_RydelGreeting:: @ 8180F9F .string "Well, well, what have we here?\n" .string "A most energetic customer!\p" .string "Me? You may call me RYDEL.\n" .string "I'm the owner of this cycle shop.$" -MauvilleCity_BikeShop_Text_181016:: @ 8181016 +MauvilleCity_BikeShop_Text_DidYouComeFromFarAway:: @ 8181016 .string "RYDEL: Your RUNNING SHOES...\n" .string "They're awfully filthy.\p" .string "Did you come from far away?$" -MauvilleCity_BikeShop_Text_181067:: @ 8181067 +MauvilleCity_BikeShop_Text_GuessYouDontNeedBike:: @ 8181067 .string "RYDEL: Is that right?\p" .string "Then, I guess you have no need for\n" .string "any of my BIKES.$" -MauvilleCity_BikeShop_Text_1810B1:: @ 81810B1 +MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne:: @ 81810B1 .string "RYDEL: Hm, hm... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" .string "You're saying that you came all this\n" @@ -39,37 +39,37 @@ MauvilleCity_BikeShop_Text_1810B1:: @ 81810B1 .string "have whichever one you like!\p" .string "Which one will you choose?$" -MauvilleCity_BikeShop_Text_181332:: @ 8181332 +MauvilleCity_BikeShop_Text_ChoseMachBike:: @ 8181332 .string "{PLAYER} chose the MACH BIKE.$" -MauvilleCity_BikeShop_Text_18134A:: @ 818134A +MauvilleCity_BikeShop_Text_ChoseAcroBike:: @ 818134A .string "{PLAYER} chose the ACRO BIKE.$" -MauvilleCity_BikeShop_Text_181362:: @ 8181362 +MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes:: @ 8181362 .string "RYDEL: If you get the urge to switch\n" .string "BIKES, just come see me!$" -MauvilleCity_BikeShop_Text_1813A0:: @ 81813A0 +MauvilleCity_BikeShop_Text_WantToSwitchBikes:: @ 81813A0 .string "RYDEL: Oh? Were you thinking about\n" .string "switching BIKES?$" -MauvilleCity_BikeShop_Text_1813D4:: @ 81813D4 +MauvilleCity_BikeShop_Text_IllSwitchBikes:: @ 81813D4 .string "RYDEL: Okay, no problem!\n" .string "I'll switch BIKES for you!$" -MauvilleCity_BikeShop_Text_181408:: @ 8181408 +MauvilleCity_BikeShop_Text_ExchangedMachForAcro:: @ 8181408 .string "{PLAYER} got the MACH BIKE exchanged\n" .string "for an ACRO BIKE.$" -MauvilleCity_BikeShop_Text_181439:: @ 8181439 +MauvilleCity_BikeShop_Text_ExchangedAcroForMach:: @ 8181439 .string "{PLAYER} got the ACRO BIKE exchanged\n" .string "for a MACH BIKE.$" -MauvilleCity_BikeShop_Text_181469:: @ 8181469 +MauvilleCity_BikeShop_Text_HappyYouLikeIt:: @ 8181469 .string "RYDEL: Good, good!\n" .string "I'm happy that you like it!$" -MauvilleCity_BikeShop_Text_181498:: @ 8181498 +MauvilleCity_BikeShop_Text_OhYourBikeIsInPC:: @ 8181498 .string "Oh? What happened to that BIKE I\n" .string "gave you?\p" .string "Oh, I get it, you stored it using your PC.\p" @@ -78,18 +78,18 @@ MauvilleCity_BikeShop_Text_181498:: @ 8181498 .string "May the wind always be at your back\n" .string "on your adventure!$" -MauvilleCity_BikeShop_Text_181568:: @ 8181568 +MauvilleCity_BikeShop_Text_HandbooksAreInBack:: @ 8181568 .string "I'm learning about BIKES while\n" .string "I work here.\p" .string "If you need advice on how to ride your\n" .string "BIKE, there're a couple handbooks in\l" .string "the back.$" -MauvilleCity_BikeShop_Text_1815EA:: @ 81815EA +MauvilleCity_BikeShop_Text_MachHandbookWhichPage:: @ 81815EA .string "It's a handbook on the MACH BIKE.\p" .string "Which page do you want to read?$" -MauvilleCity_BikeShop_Text_18162C:: @ 818162C +MauvilleCity_BikeShop_Text_HowToRideMachBike:: @ 818162C .string "A BIKE moves in the direction that\n" .string "the + Control Pad is pressed.\p" .string "It will speed up once it gets rolling.\p" @@ -97,7 +97,7 @@ MauvilleCity_BikeShop_Text_18162C:: @ 818162C .string "The BIKE will slow to a stop.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_1816F5:: @ 81816F5 +MauvilleCity_BikeShop_Text_HowToTurnMachBike:: @ 81816F5 .string "A MACH BIKE is speedy, but it can't\n" .string "stop very quickly.\p" .string "It gets a little tricky to get around\n" @@ -106,7 +106,7 @@ MauvilleCity_BikeShop_Text_1816F5:: @ 81816F5 .string "before the corner and slow down.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_1817BF:: @ 81817BF +MauvilleCity_BikeShop_Text_SandySlopes:: @ 81817BF .string "There are small sandy slopes throughout\n" .string "the HOENN region.\p" .string "The loose, crumbly sand makes it\n" @@ -115,11 +115,11 @@ MauvilleCity_BikeShop_Text_1817BF:: @ 81817BF .string "zip up a sandy slope.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_181892:: @ 8181892 +MauvilleCity_BikeShop_Text_AcroHandbookWhichPage:: @ 8181892 .string "It's a handbook on the ACRO BIKE.\p" .string "Which page do you want to read?$" -MauvilleCity_BikeShop_Text_1818D4:: @ 81818D4 +MauvilleCity_BikeShop_Text_Wheelies:: @ 81818D4 .string "Press the B Button while riding, and the\n" .string "front wheel lifts up.\p" .string "You can zip around with the front\n" @@ -127,14 +127,14 @@ MauvilleCity_BikeShop_Text_1818D4:: @ 81818D4 .string "This technique is called a wheelie.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_18199A:: @ 818199A +MauvilleCity_BikeShop_Text_BunnyHops:: @ 818199A .string "Keeping the B Button pressed, your\n" .string "BIKE can hop on the spot.\p" .string "This technique is called a bunny hop.\p" .string "You can ride while hopping, too.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_181A3D:: @ 8181A3D +MauvilleCity_BikeShop_Text_Jumps:: @ 8181A3D .string "Press the B Button and the + Control\n" .string "Pad at the same time to jump.\p" .string "Press the + Control Pad to the side\n" diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 6d2338ee0..7ada9c1fe 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_156F84", + "script": "MauvilleCity_GameCorner_EventScript_Woman2", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_156F8D", + "script": "MauvilleCity_GameCorner_EventScript_Gentleman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_156A34", + "script": "MauvilleCity_GameCorner_EventScript_CoinsClerk", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_156B6C", + "script": "MauvilleCity_GameCorner_EventScript_PrizeCornerDolls", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_156F96", + "script": "MauvilleCity_GameCorner_EventScript_Girl", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_15707C", + "script": "MauvilleCity_GameCorner_EventScript_PokefanM", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_1570D8", + "script": "MauvilleCity_GameCorner_EventScript_OldMan", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_1570E8", + "script": "MauvilleCity_GameCorner_EventScript_Cook", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_156D1A", + "script": "MauvilleCity_GameCorner_EventScript_PrizeCornerTMs", "flag": "0" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_1570F8", + "script": "MauvilleCity_GameCorner_EventScript_Man", "flag": "0" }, { @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_157115", + "script": "MauvilleCity_GameCorner_EventScript_Maniac", "flag": "0" }, { @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_GameCorner_EventScript_157125", + "script": "MauvilleCity_GameCorner_EventScript_Woman", "flag": "0" } ], @@ -192,7 +192,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_157135" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine0" }, { "type": "sign", @@ -200,7 +200,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_157155" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine1" }, { "type": "sign", @@ -208,7 +208,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_157175" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine2" }, { "type": "sign", @@ -216,7 +216,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_157195" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine3" }, { "type": "sign", @@ -224,7 +224,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_1571B5" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine4" }, { "type": "sign", @@ -232,7 +232,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_1571D5" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine5" }, { "type": "sign", @@ -240,7 +240,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_1571F5" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine6" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_157215" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine7" }, { "type": "sign", @@ -256,7 +256,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", - "script": "MauvilleCity_GameCorner_EventScript_157235" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine8" }, { "type": "sign", @@ -264,7 +264,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_157255" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine9" }, { "type": "sign", @@ -272,7 +272,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_157275" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine10" }, { "type": "sign", @@ -280,7 +280,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", - "script": "MauvilleCity_GameCorner_EventScript_157295" + "script": "MauvilleCity_GameCorner_EventScript_SlotMachine11" }, { "type": "sign", diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index d852ef406..3296741d1 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -1,655 +1,655 @@ MauvilleCity_GameCorner_MapScripts:: @ 8156A33 .byte 0 -MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 +MauvilleCity_GameCorner_EventScript_CoinsClerk:: @ 8156A34 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_181C35, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 - message MauvilleCity_GameCorner_Text_181CB4 + goto_if_eq MauvilleCity_GameCorner_EventScript_NeedCoinCase + message MauvilleCity_GameCorner_Text_WereYouLookingForCoins waitmessage showmoneybox 0, 0 nop showcoinsbox 0, 5 - goto MauvilleCity_GameCorner_EventScript_156A60 + goto MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50 -MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 +MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50:: @ 8156A60 multichoicedefault 15, 0, 49, 0, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_156AAE - case 1, MauvilleCity_GameCorner_EventScript_156AF0 - goto MauvilleCity_GameCorner_EventScript_156B4C + case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins + case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins + goto MauvilleCity_GameCorner_EventScript_CancelBuyCoins end @ 8156A87 multichoicedefault 15, 0, 49, 1, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_156AAE - case 1, MauvilleCity_GameCorner_EventScript_156AF0 - goto MauvilleCity_GameCorner_EventScript_156B4C + case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins + case 1, MauvilleCity_GameCorner_EventScript_Buy500Coins + goto MauvilleCity_GameCorner_EventScript_CancelBuyCoins end -MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE +MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 8156AAE checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9950 - goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C + goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins checkmoney 1000, 0 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C + goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney addcoins 50 removemoney 1000, 0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 +MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 8156AF0 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9500 - goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C + goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins checkmoney 10000, 0 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C + goto_if_eq MauvilleCity_GameCorner_EventScript_NotEnoughMoney addcoins 500 removemoney 10000, 0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_156B32:: @ 8156B32 - msgbox MauvilleCity_GameCorner_Text_181C53, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NeedCoinCase:: @ 8156B32 + msgbox MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_156B3C:: @ 8156B3C - msgbox MauvilleCity_GameCorner_Text_181D28, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NotEnoughMoney:: @ 8156B3C + msgbox MauvilleCity_GameCorner_Text_DontHaveEnoughMoney, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_156B4C:: @ 8156B4C - msgbox MauvilleCity_GameCorner_Text_181D73, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_CancelBuyCoins:: @ 8156B4C + msgbox MauvilleCity_GameCorner_Text_DontNeedCoinsThen, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_156B5C:: @ 8156B5C - msgbox MauvilleCity_GameCorner_Text_181D57, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NoRoomForCoins:: @ 8156B5C + msgbox MauvilleCity_GameCorner_Text_CoinCaseIsFull, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 release end -MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C +MauvilleCity_GameCorner_EventScript_PrizeCornerDolls:: @ 8156B6C lock faceplayer - msgbox MauvilleCity_GameCorner_Text_181DE1, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 + goto_if_eq MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage release end -MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 - message MauvilleCity_GameCorner_Text_181E17 +MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage:: @ 8156B88 + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage showcoinsbox 0, 0 setvar VAR_TEMP_1, 0 - goto MauvilleCity_GameCorner_EventScript_156BA6 + goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize -MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B - message MauvilleCity_GameCorner_Text_181E17 +MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize:: @ 8156B9B + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage - goto MauvilleCity_GameCorner_EventScript_156BA6 + goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize -MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 +MauvilleCity_GameCorner_EventScript_ChooseDollPrize:: @ 8156BA6 multichoice 12, 0, 48, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_156BE2 - case 1, MauvilleCity_GameCorner_EventScript_156BF0 - case 2, MauvilleCity_GameCorner_EventScript_156BFE - case 3, MauvilleCity_GameCorner_EventScript_156D0D - goto MauvilleCity_GameCorner_EventScript_156D0D + case 0, MauvilleCity_GameCorner_EventScript_TreeckoDoll + case 1, MauvilleCity_GameCorner_EventScript_TorchicDoll + case 2, MauvilleCity_GameCorner_EventScript_MudkipDoll + case 3, MauvilleCity_GameCorner_EventScript_CancelDollSelect + goto MauvilleCity_GameCorner_EventScript_CancelDollSelect end -MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 +MauvilleCity_GameCorner_EventScript_TreeckoDoll:: @ 8156BE2 setvar VAR_TEMP_1, 1 bufferdecorationname 0, 88 - goto MauvilleCity_GameCorner_EventScript_156C0C + goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize -MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 +MauvilleCity_GameCorner_EventScript_TorchicDoll:: @ 8156BF0 setvar VAR_TEMP_1, 2 bufferdecorationname 0, 89 - goto MauvilleCity_GameCorner_EventScript_156C0C + goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize -MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE +MauvilleCity_GameCorner_EventScript_MudkipDoll:: @ 8156BFE setvar VAR_TEMP_1, 3 bufferdecorationname 0, 90 - goto MauvilleCity_GameCorner_EventScript_156C0C + goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize -MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C - msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO +MauvilleCity_GameCorner_EventScript_ConfirmDollPrize:: @ 8156C0C + msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsX, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D + goto_if_eq MauvilleCity_GameCorner_EventScript_CancelDollSelect switch VAR_TEMP_1 - case 1, MauvilleCity_GameCorner_EventScript_156C46 - case 2, MauvilleCity_GameCorner_EventScript_156C80 - case 3, MauvilleCity_GameCorner_EventScript_156CBA + case 1, MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll + case 2, MauvilleCity_GameCorner_EventScript_BuyTorchicDoll + case 3, MauvilleCity_GameCorner_EventScript_BuyMudkipDoll end -MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 +MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 8156C46 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll removecoins 1000 adddecoration DECOR_TREECKO_DOLL updatecoinsbox 0, 0 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156B9B + msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 +MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 8156C80 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll removecoins 1000 adddecoration DECOR_TORCHIC_DOLL updatecoinsbox 0, 0 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156B9B + msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA +MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 8156CBA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForDoll removecoins 1000 adddecoration DECOR_MUDKIP_DOLL updatecoinsbox 0, 0 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156B9B + msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_156CF4:: @ 8156CF4 - msgbox MauvilleCity_GameCorner_Text_181E76, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156B9B +MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll:: @ 8156CF4 + msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_156D02:: @ 8156D02 +MauvilleCity_GameCorner_EventScript_NoRoomForDoll:: @ 8156D02 call Common_EventScript_NoRoomForDecor - goto MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end -MauvilleCity_GameCorner_EventScript_156D0D:: @ 8156D0D - msgbox MauvilleCity_GameCorner_Text_181EC2, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_CancelDollSelect:: @ 8156D0D + msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end -MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A +MauvilleCity_GameCorner_EventScript_PrizeCornerTMs:: @ 8156D1A lock faceplayer - msgbox MauvilleCity_GameCorner_Text_181DE1, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 + goto_if_eq MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage release end -MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 - message MauvilleCity_GameCorner_Text_181E17 +MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage:: @ 8156D36 + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage showcoinsbox 0, 0 setvar VAR_TEMP_1, 0 - goto MauvilleCity_GameCorner_EventScript_156D54 + goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize -MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 - message MauvilleCity_GameCorner_Text_181E17 +MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize:: @ 8156D49 + message MauvilleCity_GameCorner_Text_WhichPrize waitmessage - goto MauvilleCity_GameCorner_EventScript_156D54 + goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize -MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 +MauvilleCity_GameCorner_EventScript_ChooseTMPrize:: @ 8156D54 multichoice 12, 0, 55, 0 switch VAR_RESULT - case 0, MauvilleCity_GameCorner_EventScript_156DA6 - case 1, MauvilleCity_GameCorner_EventScript_156DB4 - case 2, MauvilleCity_GameCorner_EventScript_156DC2 - case 3, MauvilleCity_GameCorner_EventScript_156DD0 - case 4, MauvilleCity_GameCorner_EventScript_156DDE - case 5, MauvilleCity_GameCorner_EventScript_156F77 - goto MauvilleCity_GameCorner_EventScript_156F77 + case 0, MauvilleCity_GameCorner_EventScript_TMDoubleTeam + case 1, MauvilleCity_GameCorner_EventScript_TMPsychic + case 2, MauvilleCity_GameCorner_EventScript_TMFlamethrower + case 3, MauvilleCity_GameCorner_EventScript_TMThunderbolt + case 4, MauvilleCity_GameCorner_EventScript_TMIceBeam + case 5, MauvilleCity_GameCorner_EventScript_CancelTMSelect + goto MauvilleCity_GameCorner_EventScript_CancelTMSelect end -MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 +MauvilleCity_GameCorner_EventScript_TMDoubleTeam:: @ 8156DA6 setvar VAR_TEMP_1, 1 bufferitemname 0, ITEM_TM32_DOUBLE_TEAM - goto MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 +MauvilleCity_GameCorner_EventScript_TMPsychic:: @ 8156DB4 setvar VAR_TEMP_1, 2 bufferitemname 0, ITEM_TM29_PSYCHIC - goto MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 +MauvilleCity_GameCorner_EventScript_TMFlamethrower:: @ 8156DC2 setvar VAR_TEMP_1, 3 bufferitemname 0, ITEM_TM35_FLAMETHROWER - goto MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 +MauvilleCity_GameCorner_EventScript_TMThunderbolt:: @ 8156DD0 setvar VAR_TEMP_1, 4 bufferitemname 0, ITEM_TM24_THUNDERBOLT - goto MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE +MauvilleCity_GameCorner_EventScript_TMIceBeam:: @ 8156DDE setvar VAR_TEMP_1, 5 bufferitemname 0, ITEM_TM13_ICE_BEAM - goto MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize -MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC - msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO +MauvilleCity_GameCorner_EventScript_ConfirmTMPrize:: @ 8156DEC + msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsX, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 + goto_if_eq MauvilleCity_GameCorner_EventScript_CancelTMSelect switch VAR_TEMP_1 - case 1, MauvilleCity_GameCorner_EventScript_156E3C - case 2, MauvilleCity_GameCorner_EventScript_156E76 - case 3, MauvilleCity_GameCorner_EventScript_156EB0 - case 4, MauvilleCity_GameCorner_EventScript_156EEA - case 5, MauvilleCity_GameCorner_EventScript_156F24 + case 1, MauvilleCity_GameCorner_EventScript_BuyTMDoubleTeam + case 2, MauvilleCity_GameCorner_EventScript_BuyTMPsychic + case 3, MauvilleCity_GameCorner_EventScript_BuyTMFlamethrower + case 4, MauvilleCity_GameCorner_EventScript_BuyTMThunderbolt + case 5, MauvilleCity_GameCorner_EventScript_BuyTMIceBeam end -MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C +MauvilleCity_GameCorner_EventScript_BuyTMDoubleTeam:: @ 8156E3C checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1500 - goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM32_DOUBLE_TEAM, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM removecoins 1500 additem ITEM_TM32_DOUBLE_TEAM updatecoinsbox 0, 0 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156D49 + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 +MauvilleCity_GameCorner_EventScript_BuyTMPsychic:: @ 8156E76 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 3500 - goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM29_PSYCHIC, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM removecoins 3500 additem ITEM_TM29_PSYCHIC updatecoinsbox 0, 0 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156D49 + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 +MauvilleCity_GameCorner_EventScript_BuyTMFlamethrower:: @ 8156EB0 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM35_FLAMETHROWER, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM removecoins 4000 additem ITEM_TM35_FLAMETHROWER updatecoinsbox 0, 0 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156D49 + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA +MauvilleCity_GameCorner_EventScript_BuyTMThunderbolt:: @ 8156EEA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM24_THUNDERBOLT, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM removecoins 4000 additem ITEM_TM24_THUNDERBOLT updatecoinsbox 0, 0 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156D49 + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 +MauvilleCity_GameCorner_EventScript_BuyTMIceBeam:: @ 8156F24 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM checkitemspace ITEM_TM13_ICE_BEAM, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForTM removecoins 4000 additem ITEM_TM13_ICE_BEAM updatecoinsbox 0, 0 playse SE_SHOP - msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156D49 + msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_156F5E:: @ 8156F5E - msgbox MauvilleCity_GameCorner_Text_181E76, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_156D49 +MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM:: @ 8156F5E + msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_156F6C:: @ 8156F6C +MauvilleCity_GameCorner_EventScript_NoRoomForTM:: @ 8156F6C call Common_EventScript_BagIsFull - goto MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end -MauvilleCity_GameCorner_EventScript_156F77:: @ 8156F77 - msgbox MauvilleCity_GameCorner_Text_181EC2, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_CancelTMSelect:: @ 8156F77 + msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end -MauvilleCity_GameCorner_EventScript_156F84:: @ 8156F84 - msgbox MauvilleCity_GameCorner_Text_1821C1, MSGBOX_NPC +MauvilleCity_GameCorner_EventScript_Woman2:: @ 8156F84 + msgbox MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay, MSGBOX_NPC end -MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D - msgbox MauvilleCity_GameCorner_Text_1821F3, MSGBOX_NPC +MauvilleCity_GameCorner_EventScript_Gentleman:: @ 8156F8D + msgbox MauvilleCity_GameCorner_Text_RouletteOnlyLuck, MSGBOX_NPC end -MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 +MauvilleCity_GameCorner_EventScript_Girl:: @ 8156F96 lock faceplayer - goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_157072 - msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll + msgbox MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MauvilleCity_GameCorner_EventScript_157068 + goto_if_eq MauvilleCity_GameCorner_EventScript_DeclineStarterDoll switch VAR_STARTER_MON - case 0, MauvilleCity_GameCorner_EventScript_156FDB - case 1, MauvilleCity_GameCorner_EventScript_157005 - case 2, MauvilleCity_GameCorner_EventScript_15702F + case 0, MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll + case 1, MauvilleCity_GameCorner_EventScript_GiveTorchicDoll + case 2, MauvilleCity_GameCorner_EventScript_GiveMudkipDoll end -MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB +MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll:: @ 8156FDB bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_157059 - msgbox MauvilleCity_GameCorner_Text_181F89, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll + msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT givedecoration DECOR_TREECKO_DOLL setflag FLAG_RECEIVED_STARTER_DOLL - goto MauvilleCity_GameCorner_EventScript_157072 + goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end -MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 +MauvilleCity_GameCorner_EventScript_GiveTorchicDoll:: @ 8157005 bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_157059 - msgbox MauvilleCity_GameCorner_Text_181F89, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll + msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT givedecoration DECOR_TORCHIC_DOLL setflag FLAG_RECEIVED_STARTER_DOLL - goto MauvilleCity_GameCorner_EventScript_157072 + goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end -MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F +MauvilleCity_GameCorner_EventScript_GiveMudkipDoll:: @ 815702F bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_157059 - msgbox MauvilleCity_GameCorner_Text_181F89, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll + msgbox MauvilleCity_GameCorner_Text_HereYouGo2, MSGBOX_DEFAULT givedecoration DECOR_MUDKIP_DOLL setflag FLAG_RECEIVED_STARTER_DOLL - goto MauvilleCity_GameCorner_EventScript_157072 + goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll end -MauvilleCity_GameCorner_EventScript_157059:: @ 8157059 +MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll:: @ 8157059 call Common_EventScript_NoRoomForDecor - msgbox MauvilleCity_GameCorner_Text_181F97, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_YouWantItButNotNow, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_157068:: @ 8157068 - msgbox MauvilleCity_GameCorner_Text_181FBC, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_DeclineStarterDoll:: @ 8157068 + msgbox MauvilleCity_GameCorner_Text_DontBeNegative, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_157072:: @ 8157072 - msgbox MauvilleCity_GameCorner_Text_181FE9, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll:: @ 8157072 + msgbox MauvilleCity_GameCorner_Text_CantWinJackpot, MSGBOX_DEFAULT release end -MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C +MauvilleCity_GameCorner_EventScript_PokefanM:: @ 815707C lock faceplayer checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_GameCorner_EventScript_15709C - msgbox MauvilleCity_GameCorner_Text_18201E, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_157108 + goto_if_eq MauvilleCity_GameCorner_EventScript_TryGive20Coins + msgbox MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C - goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_1570CA +MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 815709C + goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_PokefanMNormal checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 1 - goto_if_ge MauvilleCity_GameCorner_EventScript_1570CA + goto_if_ge MauvilleCity_GameCorner_EventScript_PokefanMNormal setflag FLAG_RECEIVED_20_COINS addcoins 20 - msgbox MauvilleCity_GameCorner_Text_18208E, MSGBOX_DEFAULT + msgbox MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins, MSGBOX_DEFAULT playse SE_SHOP - goto MauvilleCity_GameCorner_EventScript_1570CA + goto MauvilleCity_GameCorner_EventScript_PokefanMNormal end -MauvilleCity_GameCorner_EventScript_1570CA:: @ 81570CA - msgbox MauvilleCity_GameCorner_Text_1820DD, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_157108 +MauvilleCity_GameCorner_EventScript_PokefanMNormal:: @ 81570CA + msgbox MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_1570D8:: @ 81570D8 +MauvilleCity_GameCorner_EventScript_OldMan:: @ 81570D8 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_182120, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_157108 + msgbox MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_1570E8:: @ 81570E8 +MauvilleCity_GameCorner_EventScript_Cook:: @ 81570E8 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_18217C, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_157108 + msgbox MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 +MauvilleCity_GameCorner_EventScript_Man:: @ 81570F8 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_182241, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_157108 + msgbox MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 +MauvilleCity_GameCorner_EventScript_NPCReturnToSlots:: @ 8157108 closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MauvilleCity_GameCorner_EventScript_157115:: @ 8157115 +MauvilleCity_GameCorner_EventScript_Maniac:: @ 8157115 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_182272, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_157108 + msgbox MauvilleCity_GameCorner_Text_DifficultToStopOn7, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 +MauvilleCity_GameCorner_EventScript_Woman:: @ 8157125 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_1822F4, MSGBOX_DEFAULT - goto MauvilleCity_GameCorner_EventScript_157108 + msgbox MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo, MSGBOX_DEFAULT + goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots end -MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 +MauvilleCity_GameCorner_EventScript_SlotMachine0:: @ 8157135 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 +MauvilleCity_GameCorner_EventScript_SlotMachine1:: @ 8157155 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 1 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 +MauvilleCity_GameCorner_EventScript_SlotMachine2:: @ 8157175 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 2 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 +MauvilleCity_GameCorner_EventScript_SlotMachine3:: @ 8157195 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 3 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 +MauvilleCity_GameCorner_EventScript_SlotMachine4:: @ 81571B5 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 4 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 +MauvilleCity_GameCorner_EventScript_SlotMachine5:: @ 81571D5 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 5 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 +MauvilleCity_GameCorner_EventScript_SlotMachine6:: @ 81571F5 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 6 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 +MauvilleCity_GameCorner_EventScript_SlotMachine7:: @ 8157215 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 7 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 +MauvilleCity_GameCorner_EventScript_SlotMachine8:: @ 8157235 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 8 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 +MauvilleCity_GameCorner_EventScript_SlotMachine9:: @ 8157255 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 9 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 +MauvilleCity_GameCorner_EventScript_SlotMachine10:: @ 8157275 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 10 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 +MauvilleCity_GameCorner_EventScript_SlotMachine11:: @ 8157295 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 11 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_1572B5:: @ 81572B5 - msgbox MauvilleCity_GameCorner_Text_182420, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NoCoinCase:: @ 81572B5 + msgbox MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MauvilleCity_GameCorner/text.inc b/data/maps/MauvilleCity_GameCorner/text.inc index b439930dc..0cba39242 100644 --- a/data/maps/MauvilleCity_GameCorner/text.inc +++ b/data/maps/MauvilleCity_GameCorner/text.inc @@ -1,30 +1,30 @@ -MauvilleCity_GameCorner_Text_181C35:: @ 8181C35 +MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner:: @ 8181C35 .string "This is MAUVILLE GAME CORNER.$" -MauvilleCity_GameCorner_Text_181C53:: @ 8181C53 +MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins:: @ 8181C53 .string "Okay, you wanted some COINS for\n" .string "the games?\p" .string "But you don't have a COIN CASE for\n" .string "stowing the COINS.$" -MauvilleCity_GameCorner_Text_181CB4:: @ 8181CB4 +MauvilleCity_GameCorner_Text_WereYouLookingForCoins:: @ 8181CB4 .string "Were you looking for COINS?\p" .string "It's ¥1000 for 50 COINS.\n" .string "Would you like some?$" -MauvilleCity_GameCorner_Text_181CFE:: @ 8181CFE +MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins:: @ 8181CFE .string "Thank you very much!\n" .string "Here are your COINS!$" -MauvilleCity_GameCorner_Text_181D28:: @ 8181D28 +MauvilleCity_GameCorner_Text_DontHaveEnoughMoney:: @ 8181D28 .string "Um... You don't appear to have\n" .string "enough money...$" -MauvilleCity_GameCorner_Text_181D57:: @ 8181D57 +MauvilleCity_GameCorner_Text_CoinCaseIsFull:: @ 8181D57 .string "Oh?\n" .string "Your COIN CASE is full.$" -MauvilleCity_GameCorner_Text_181D73:: @ 8181D73 +MauvilleCity_GameCorner_Text_DontNeedCoinsThen:: @ 8181D73 .string "Oh... You don't need COINS, then?\n" .string "Good luck on your adventure!$" @@ -32,105 +32,105 @@ UnknownString_8181DB2: @ 8181DB2 .string "It's ¥1,000 for 50 COINS.\n" .string "Would you like some?$" -MauvilleCity_GameCorner_Text_181DE1:: @ 8181DE1 +MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes:: @ 8181DE1 .string "Welcome.\p" .string "You can exchange your COINS for\n" .string "prizes here.$" -MauvilleCity_GameCorner_Text_181E17:: @ 8181E17 +MauvilleCity_GameCorner_Text_WhichPrize:: @ 8181E17 .string "Which prize would you like?$" -MauvilleCity_GameCorner_Text_181E33:: @ 8181E33 +MauvilleCity_GameCorner_Text_SoYourChoiceIsX:: @ 8181E33 .string "So your choice is {STR_VAR_1}?$" -MauvilleCity_GameCorner_Text_181E49:: @ 8181E49 +MauvilleCity_GameCorner_Text_SendToYourHomePC:: @ 8181E49 .string "Thank you!\n" .string "We'll send it to your PC at home.$" -MauvilleCity_GameCorner_Text_181E76:: @ 8181E76 +MauvilleCity_GameCorner_Text_NotEnoughCoins:: @ 8181E76 .string "You don't have enough COINS.$" UnknownString_8181E93: @ 8181E93 .string "There isn't any room available for\n" .string "placing {STR_VAR_1}.$" -MauvilleCity_GameCorner_Text_181EC2:: @ 8181EC2 +MauvilleCity_GameCorner_Text_OhIsThatSo:: @ 8181EC2 .string "Oh, is that so? \n" .string "You need to save some COINS before\l" .string "coming back here.$" -MauvilleCity_GameCorner_Text_181F08:: @ 8181F08 +MauvilleCity_GameCorner_Text_HereYouGo:: @ 8181F08 .string "Here you go!$" UnknownString_8181F15: @ 8181F15 .string "Oh, you can't carry any more than that.$" -MauvilleCity_GameCorner_Text_181F3D:: @ 8181F3D +MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne:: @ 8181F3D .string "I made a mistake and got two of the\n" .string "same DOLLS.\p" .string "Would you like one of them?$" -MauvilleCity_GameCorner_Text_181F89:: @ 8181F89 +MauvilleCity_GameCorner_Text_HereYouGo2:: @ 8181F89 .string "There you go!$" -MauvilleCity_GameCorner_Text_181F97:: @ 8181F97 +MauvilleCity_GameCorner_Text_YouWantItButNotNow:: @ 8181F97 .string "Huh?\n" .string "You want it, but not right now?$" -MauvilleCity_GameCorner_Text_181FBC:: @ 8181FBC +MauvilleCity_GameCorner_Text_DontBeNegative:: @ 8181FBC .string "Oh, don't be so negative!\n" .string "You can have this!$" -MauvilleCity_GameCorner_Text_181FE9:: @ 8181FE9 +MauvilleCity_GameCorner_Text_CantWinJackpot:: @ 8181FE9 .string "There's a prize I want, but I can't win\n" .string "the jackpot.$" -MauvilleCity_GameCorner_Text_18201E:: @ 818201E +MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor:: @ 818201E .string "Hey, kid, if you want to play here,\n" .string "you need a COIN CASE.\p" .string "I think the young lady next door\n" .string "had one. Go see her!$" -MauvilleCity_GameCorner_Text_18208E:: @ 818208E +MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins:: @ 818208E .string "My luck can only last so long.\n" .string "This is too much for me.\l" .string "Here, take some COINS!$" -MauvilleCity_GameCorner_Text_1820DD:: @ 81820DD +MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone:: @ 81820DD .string "MAUVILLE has something for\n" .string "everyone.\p" .string "For me, it's the GAME CORNER.$" -MauvilleCity_GameCorner_Text_182120:: @ 8182120 +MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates:: @ 8182120 .string "The ROULETTE tables have different\n" .string "rates.\p" .string "Check your COINS if you're going to\n" .string "pick a table.$" -MauvilleCity_GameCorner_Text_18217C:: @ 818217C +MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime:: @ 818217C .string "It's easy to lose track of time in here. \n" .string "I should get back to work.$" -MauvilleCity_GameCorner_Text_1821C1:: @ 81821C1 +MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay:: @ 81821C1 .string "COINS are needed to play here in the\n" .string "GAME CORNER.$" -MauvilleCity_GameCorner_Text_1821F3:: @ 81821F3 +MauvilleCity_GameCorner_Text_RouletteOnlyLuck:: @ 81821F3 .string "This ROULETTE thing...\n" .string "It's rather demanding.\p" .string "Win or lose, it's only by luck.$" -MauvilleCity_GameCorner_Text_182241:: @ 8182241 +MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed:: @ 8182241 .string "Up to three COINS can be used to play\n" .string "the SLOTS.$" -MauvilleCity_GameCorner_Text_182272:: @ 8182272 +MauvilleCity_GameCorner_Text_DifficultToStopOn7:: @ 8182272 .string "It's very difficult to make it stop\n" .string "right on “7.”\p" .string "If it stops on “7” during the REEL TIME\n" .string "bonus game, you'll receive extra COINS.$" -MauvilleCity_GameCorner_Text_1822F4:: @ 81822F4 +MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo:: @ 81822F4 .string "Here's some information for you\n" .string "about the SLOTS.\p" .string "The more lightning bolts you stock, the\n" @@ -142,6 +142,6 @@ MauvilleCity_GameCorner_Text_1822F4:: @ 81822F4 .string "The big bonus is 660 COINS, but it's\n" .string "very difficult to get.$" -MauvilleCity_GameCorner_Text_182420:: @ 8182420 +MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase:: @ 8182420 .string "You can't play if you don't have a\n" .string "COIN CASE.$" diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 68b269842..00c53c32b 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Gym_EventScript_1565AB", + "script": "MauvilleCity_Gym_EventScript_Wattson", "flag": "FLAG_HIDE_WATTSON_MAUVILLE_GYM" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "MauvilleCity_Gym_EventScript_1566FD", + "script": "MauvilleCity_Gym_EventScript_Shawn", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "MauvilleCity_Gym_EventScript_15672B", + "script": "MauvilleCity_Gym_EventScript_Vivian", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "MauvilleCity_Gym_EventScript_156714", + "script": "MauvilleCity_Gym_EventScript_Ben", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "MauvilleCity_Gym_EventScript_1566E6", + "script": "MauvilleCity_Gym_EventScript_Kirk", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Gym_EventScript_156742", + "script": "MauvilleCity_Gym_EventScript_GymGuide", "flag": "0" } ], @@ -114,7 +114,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "MauvilleCity_Gym_EventScript_15664B" + "script": "MauvilleCity_Gym_EventScript_Switch1" }, { "type": "trigger", @@ -123,7 +123,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "MauvilleCity_Gym_EventScript_156670" + "script": "MauvilleCity_Gym_EventScript_Switch2" }, { "type": "trigger", @@ -132,7 +132,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "MauvilleCity_Gym_EventScript_156695" + "script": "MauvilleCity_Gym_EventScript_Switch3" } ], "bg_events": [ @@ -142,7 +142,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_Gym_EventScript_156761" + "script": "MauvilleCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -150,7 +150,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_Gym_EventScript_156771" + "script": "MauvilleCity_Gym_EventScript_RightGymStatue" } ] } diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 7afaafceb..9390400fc 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -1,21 +1,21 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 - map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_156456 + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_OnLoad .byte 0 -MauvilleCity_Gym_MapScript1_156456:: @ 8156456 - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1565A7 +MauvilleCity_Gym_OnLoad:: @ 8156456 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_DeactivatePuzzle switch VAR_MAUVILLE_GYM_STATE - case 0, MauvilleCity_Gym_EventScript_156491 - case 1, MauvilleCity_Gym_EventScript_15657D - case 2, MauvilleCity_Gym_EventScript_15658B - case 3, MauvilleCity_Gym_EventScript_156599 + case 0, MauvilleCity_Gym_EventScript_UpdateBarriers + case 1, MauvilleCity_Gym_EventScript_Switch1Pressed + case 2, MauvilleCity_Gym_EventScript_Switch2Pressed + case 3, MauvilleCity_Gym_EventScript_Switch3Pressed end -MauvilleCity_Gym_EventScript_156491:: @ 8156491 - goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_15649B +MauvilleCity_Gym_EventScript_UpdateBarriers:: @ 8156491 + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetAltBarriers end -MauvilleCity_Gym_EventScript_15649B:: @ 815649B +MauvilleCity_Gym_EventScript_SetAltBarriers:: @ 815649B setmetatile 4, 7, METATILE_MauvilleGym_GreenBeamH1_Off, 0 setmetatile 4, 8, METATILE_MauvilleGym_GreenBeamH3_Off, 0 setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH2_Off, 0 @@ -43,42 +43,42 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B setmetatile 5, 14, METATILE_MauvilleGym_GreenBeamH4_Off, 0 end -MauvilleCity_Gym_EventScript_15657D:: @ 815657D +MauvilleCity_Gym_EventScript_Switch1Pressed:: @ 815657D setvar VAR_0x8004, 0 special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_156491 + goto MauvilleCity_Gym_EventScript_UpdateBarriers end -MauvilleCity_Gym_EventScript_15658B:: @ 815658B +MauvilleCity_Gym_EventScript_Switch2Pressed:: @ 815658B setvar VAR_0x8004, 1 special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_156491 + goto MauvilleCity_Gym_EventScript_UpdateBarriers end -MauvilleCity_Gym_EventScript_156599:: @ 8156599 +MauvilleCity_Gym_EventScript_Switch3Pressed:: @ 8156599 setvar VAR_0x8004, 2 special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_156491 + goto MauvilleCity_Gym_EventScript_UpdateBarriers end -MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 +MauvilleCity_Gym_EventScript_DeactivatePuzzle:: @ 81565A7 special MauvilleGymSpecial3 end -MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB - trainerbattle_single TRAINER_WATTSON, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB, NO_MUSIC - goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D +MauvilleCity_Gym_EventScript_Wattson:: @ 81565AB + trainerbattle_single TRAINER_WATTSON, MauvilleCity_Gym_Text_WattsonIntro, MauvilleCity_Gym_Text_WattsonDefeat, MauvilleCity_Gym_EventScript_WattsonDefeated, NO_MUSIC + goto_if_unset FLAG_RECEIVED_TM_SHOCK_WAVE, MauvilleCity_Gym_EventScript_GiveShockWave compare VAR_NEW_MAUVILLE_STATE, 2 - goto_if_eq MauvilleCity_Gym_EventScript_156641 - msgbox MauvilleCity_Gym_Text_180EDB, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_Gym_EventScript_CompletedNewMauville + msgbox MauvilleCity_Gym_Text_WattsonPostBattle, MSGBOX_DEFAULT release end -MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB - message MauvilleCity_Gym_Text_180DAF +MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 81565DB + message MauvilleCity_Gym_Text_ReceivedDynamoBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox MauvilleCity_Gym_Text_180DDA, MSGBOX_DEFAULT + msgbox MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET addvar VAR_PETALBURG_GYM_STATE, 1 @@ -89,128 +89,128 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB special MauvilleGymSpecial3 special DrawWholeMapView playse SE_UNLOCK - goto MauvilleCity_Gym_EventScript_15661D + goto MauvilleCity_Gym_EventScript_GiveShockWave end -MauvilleCity_Gym_EventScript_15661D:: @ 815661D +MauvilleCity_Gym_EventScript_GiveShockWave:: @ 815661D giveitem ITEM_TM34_SHOCK_WAVE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox MauvilleCity_Gym_Text_180E76, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM34 + msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_SHOCK_WAVE release end -MauvilleCity_Gym_EventScript_156641:: @ 8156641 - msgbox MauvilleCity_Gym_Text_180F1D, MSGBOX_DEFAULT +MauvilleCity_Gym_EventScript_CompletedNewMauville:: @ 8156641 + msgbox MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor, MSGBOX_DEFAULT release end -MauvilleCity_Gym_EventScript_15664B:: @ 815664B +MauvilleCity_Gym_EventScript_Switch1:: @ 815664B lockall - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing compare VAR_MAUVILLE_GYM_STATE, 1 - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing setvar VAR_MAUVILLE_GYM_STATE, 1 setvar VAR_0x8004, 0 - goto MauvilleCity_Gym_EventScript_1566BA + goto MauvilleCity_Gym_EventScript_PressFloorSwitch end -MauvilleCity_Gym_EventScript_156670:: @ 8156670 +MauvilleCity_Gym_EventScript_Switch2:: @ 8156670 lockall - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing compare VAR_MAUVILLE_GYM_STATE, 2 - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing setvar VAR_MAUVILLE_GYM_STATE, 2 setvar VAR_0x8004, 1 - goto MauvilleCity_Gym_EventScript_1566BA + goto MauvilleCity_Gym_EventScript_PressFloorSwitch end -MauvilleCity_Gym_EventScript_156695:: @ 8156695 +MauvilleCity_Gym_EventScript_Switch3:: @ 8156695 lockall - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing compare VAR_MAUVILLE_GYM_STATE, 3 - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing setvar VAR_MAUVILLE_GYM_STATE, 3 setvar VAR_0x8004, 2 - goto MauvilleCity_Gym_EventScript_1566BA + goto MauvilleCity_Gym_EventScript_PressFloorSwitch end -MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA +MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 81566BA special MauvilleGymSpecial2 special MauvilleGymSpecial1 special DrawWholeMapView playse SE_UNLOCK - goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566E1 - goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566DC + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_ClearBarriersAltState + goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetBarriersAltState releaseall end -MauvilleCity_Gym_EventScript_1566DA:: @ 81566DA +MauvilleCity_Gym_EventScript_SwitchDoNothing:: @ 81566DA releaseall end -MauvilleCity_Gym_EventScript_1566DC:: @ 81566DC +MauvilleCity_Gym_EventScript_SetBarriersAltState:: @ 81566DC setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end -MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 +MauvilleCity_Gym_EventScript_ClearBarriersAltState:: @ 81566E1 clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end -MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6 - trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 - msgbox MauvilleCity_Gym_Text_1809D1, MSGBOX_AUTOCLOSE +MauvilleCity_Gym_EventScript_Kirk:: @ 81566E6 + trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_KirkIntro, MauvilleCity_Gym_Text_KirkDefeat + msgbox MauvilleCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD - trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 - msgbox MauvilleCity_Gym_Text_180A5E, MSGBOX_AUTOCLOSE +MauvilleCity_Gym_EventScript_Shawn:: @ 81566FD + trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_ShawnIntro, MauvilleCity_Gym_Text_ShawnDefeat + msgbox MauvilleCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_156714:: @ 8156714 - trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 - msgbox MauvilleCity_Gym_Text_180B1D, MSGBOX_AUTOCLOSE +MauvilleCity_Gym_EventScript_Ben:: @ 8156714 + trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_BenIntro, MauvilleCity_Gym_Text_BenDefeat + msgbox MauvilleCity_Gym_Text_BenPostBattle, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_15672B:: @ 815672B - trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 - msgbox MauvilleCity_Gym_Text_180BAE, MSGBOX_AUTOCLOSE +MauvilleCity_Gym_EventScript_Vivian:: @ 815672B + trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_VivianIntro, MauvilleCity_Gym_Text_VivianDefeat + msgbox MauvilleCity_Gym_Text_VivianPostBattle, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_156742:: @ 8156742 +MauvilleCity_Gym_EventScript_GymGuide:: @ 8156742 lock faceplayer - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_156757 - msgbox MauvilleCity_Gym_Text_180815, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_GymGuidePostVictory + msgbox MauvilleCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -MauvilleCity_Gym_EventScript_156757:: @ 8156757 - msgbox MauvilleCity_Gym_Text_18091D, MSGBOX_DEFAULT +MauvilleCity_Gym_EventScript_GymGuidePostVictory:: @ 8156757 + msgbox MauvilleCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -MauvilleCity_Gym_EventScript_156761:: @ 8156761 +MauvilleCity_Gym_EventScript_LeftGymStatue:: @ 8156761 lockall - goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 - goto MauvilleCity_Gym_EventScript_15678B + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified + goto MauvilleCity_Gym_EventScript_GymStatue end -MauvilleCity_Gym_EventScript_156771:: @ 8156771 +MauvilleCity_Gym_EventScript_RightGymStatue:: @ 8156771 lockall - goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 - goto MauvilleCity_Gym_EventScript_15678B + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified + goto MauvilleCity_Gym_EventScript_GymStatue end -MauvilleCity_Gym_EventScript_156781:: @ 8156781 - msgbox MauvilleCity_Gym_Text_180F64, MSGBOX_DEFAULT +MauvilleCity_Gym_EventScript_GymStatueCertified:: @ 8156781 + msgbox MauvilleCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -MauvilleCity_Gym_EventScript_15678B:: @ 815678B - msgbox MauvilleCity_Gym_Text_180F4A, MSGBOX_DEFAULT +MauvilleCity_Gym_EventScript_GymStatue:: @ 815678B + msgbox MauvilleCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MauvilleCity_Gym/text.inc b/data/maps/MauvilleCity_Gym/text.inc index fcc03dfa9..db7ee6ae5 100644 --- a/data/maps/MauvilleCity_Gym/text.inc +++ b/data/maps/MauvilleCity_Gym/text.inc @@ -1,4 +1,4 @@ -MauvilleCity_Gym_Text_180815:: @ 8180815 +MauvilleCity_Gym_Text_GymGuideAdvice:: @ 8180815 .string "Hey, how's it going, the CHAMPION-\n" .string "bound {PLAYER}?\p" .string "WATTSON, the LEADER of MAUVILLE\n" @@ -9,61 +9,61 @@ MauvilleCity_Gym_Text_180815:: @ 8180815 .string "all over his GYM! Eccentric!\p" .string "Hey, go for it!$" -MauvilleCity_Gym_Text_18091D:: @ 818091D +MauvilleCity_Gym_Text_GymGuidePostVictory:: @ 818091D .string "Whoa, you're electrifying!\n" .string "You've powered the door open!$" -MauvilleCity_Gym_Text_180956:: @ 8180956 +MauvilleCity_Gym_Text_KirkIntro:: @ 8180956 .string "My electric soul, it'll shatter your\n" .string "dreams whole, whoah-yeahah!$" -MauvilleCity_Gym_Text_180997:: @ 8180997 +MauvilleCity_Gym_Text_KirkDefeat:: @ 8180997 .string "That was plugged in, amped up,\n" .string "over-driven electric, man!$" -MauvilleCity_Gym_Text_1809D1:: @ 81809D1 +MauvilleCity_Gym_Text_KirkPostBattle:: @ 81809D1 .string "POKéMON and rock, it's all about heart,\n" .string "whoah yeah!$" -MauvilleCity_Gym_Text_180A05:: @ 8180A05 +MauvilleCity_Gym_Text_ShawnIntro:: @ 8180A05 .string "I trained under WATTSON!\n" .string "There ain't no way I'd lose easily!$" -MauvilleCity_Gym_Text_180A42:: @ 8180A42 +MauvilleCity_Gym_Text_ShawnDefeat:: @ 8180A42 .string "Unplugged and turned off...$" -MauvilleCity_Gym_Text_180A5E:: @ 8180A5E +MauvilleCity_Gym_Text_ShawnPostBattle:: @ 8180A5E .string "WATTSON, our GYM LEADER, has been\n" .string "around for a long, long time.\p" .string "He was battling even before your\n" .string "daddy was born, that tough coot.$" -MauvilleCity_Gym_Text_180AE0:: @ 8180AE0 +MauvilleCity_Gym_Text_BenIntro:: @ 8180AE0 .string "This GYM's got puzzles!\n" .string "Isn't it fun?$" -MauvilleCity_Gym_Text_180B06:: @ 8180B06 +MauvilleCity_Gym_Text_BenDefeat:: @ 8180B06 .string "It's no fun to lose...$" -MauvilleCity_Gym_Text_180B1D:: @ 8180B1D +MauvilleCity_Gym_Text_BenPostBattle:: @ 8180B1D .string "WATTSON says he likes setting up\n" .string "little traps with switches.$" -MauvilleCity_Gym_Text_180B5A:: @ 8180B5A +MauvilleCity_Gym_Text_VivianIntro:: @ 8180B5A .string "With my charm and my POKéMON's moves,\n" .string "you'll be shocked!$" -MauvilleCity_Gym_Text_180B93:: @ 8180B93 +MauvilleCity_Gym_Text_VivianDefeat:: @ 8180B93 .string "I'm shocked by your power!$" -MauvilleCity_Gym_Text_180BAE:: @ 8180BAE +MauvilleCity_Gym_Text_VivianPostBattle:: @ 8180BAE .string "I've heard that MAUVILLE was founded\n" .string "by WATTSON.\p" .string "He was a TRAINER long before we\n" .string "became TRAINERS.\l" .string "He must know all sorts of things!$" -MauvilleCity_Gym_Text_180C32:: @ 8180C32 +MauvilleCity_Gym_Text_WattsonIntro:: @ 8180C32 .string "I've given up on my plans to convert\n" .string "the city, I have.\p" .string "And so, I put my time into making\n" @@ -76,17 +76,17 @@ MauvilleCity_Gym_Text_180C32:: @ 8180C32 .string "Then, I, WATTSON, the LEADER of\n" .string "MAUVILLE GYM, shall electrify you!$" -MauvilleCity_Gym_Text_180D64:: @ 8180D64 +MauvilleCity_Gym_Text_WattsonDefeat:: @ 8180D64 .string "Wahahahah!\n" .string "Fine, I lost!\p" .string "You ended up giving me a thrill!\n" .string "Take this BADGE!$" -MauvilleCity_Gym_Text_180DAF:: @ 8180DAF +MauvilleCity_Gym_Text_ReceivedDynamoBadge:: @ 8180DAF .string "{PLAYER} received the DYNAMO BADGE\n" .string "from WATTSON.$" -MauvilleCity_Gym_Text_180DDA:: @ 8180DDA +MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis:: @ 8180DDA .string "With the DYNAMO BADGE, POKéMON can\n" .string "use ROCK SMASH out of battle.\p" .string "And, it will make your POKéMON a little\n" @@ -94,23 +94,23 @@ MauvilleCity_Gym_Text_180DDA:: @ 8180DDA .string "Hmm...\n" .string "You should take this, too!$" -MauvilleCity_Gym_Text_180E76:: @ 8180E76 +MauvilleCity_Gym_Text_ExplainShockWave:: @ 8180E76 .string "That TM34 there contains SHOCK WAVE.\p" .string "It's a trustworthy move that never\n" .string "misses! You can count on it!$" -MauvilleCity_Gym_Text_180EDB:: @ 8180EDB +MauvilleCity_Gym_Text_WattsonPostBattle:: @ 8180EDB .string "I swell with optimism, seeing a promising\n" .string "young TRAINER like you!$" -MauvilleCity_Gym_Text_180F1D:: @ 8180F1D +MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor:: @ 8180F1D .string "Wahahahah!\n" .string "Go forth and endeavor, youngster!$" -MauvilleCity_Gym_Text_180F4A:: @ 8180F4A +MauvilleCity_Gym_Text_GymStatue:: @ 8180F4A .string "MAUVILLE CITY POKéMON GYM$" -MauvilleCity_Gym_Text_180F64:: @ 8180F64 +MauvilleCity_Gym_Text_GymStatueCertified:: @ 8180F64 .string "MAUVILLE CITY POKéMON GYM\p" .string "WATTSON'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 5a3777124..ad18adda8 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_House1_EventScript_1569FD", + "script": "MauvilleCity_House1_EventScript_RockSmashHMMan", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index b49e103f3..a88dd2567 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -1,18 +1,18 @@ MauvilleCity_House1_MapScripts:: @ 81569FC .byte 0 -MauvilleCity_House1_EventScript_1569FD:: @ 81569FD +MauvilleCity_House1_EventScript_RockSmashHMMan:: @ 81569FD lock faceplayer - goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29 - msgbox MauvilleCity_House1_Text_181B1A, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_ReceivedRockSmash + msgbox MauvilleCity_House1_Text_TakeHMRockSmash, MSGBOX_DEFAULT giveitem ITEM_HM06_ROCK_SMASH setflag FLAG_RECEIVED_HM06 - msgbox MauvilleCity_House1_Text_181B64, MSGBOX_DEFAULT + msgbox MauvilleCity_House1_Text_ExplainRockSmash, MSGBOX_DEFAULT release end -MauvilleCity_House1_EventScript_156A29:: @ 8156A29 - msgbox MauvilleCity_House1_Text_181BF6, MSGBOX_DEFAULT +MauvilleCity_House1_EventScript_ReceivedRockSmash:: @ 8156A29 + msgbox MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_House1/text.inc b/data/maps/MauvilleCity_House1/text.inc index c5eec210e..6fba0191b 100644 --- a/data/maps/MauvilleCity_House1/text.inc +++ b/data/maps/MauvilleCity_House1/text.inc @@ -1,16 +1,16 @@ -MauvilleCity_House1_Text_181B1A:: @ 8181B1A +MauvilleCity_House1_Text_TakeHMRockSmash:: @ 8181B1A .string "Woohoo, your POKéMON look pretty\n" .string "strong.\p" .string "I like that!\n" .string "Here, take this HM!$" -MauvilleCity_House1_Text_181B64:: @ 8181B64 +MauvilleCity_House1_Text_ExplainRockSmash:: @ 8181B64 .string "That HM contains ROCK SMASH.\p" .string "If you come across large boulders\n" .string "that block your path...\p" .string "Well, use that HM move and smash\n" .string "it right out of your way!$" -MauvilleCity_House1_Text_181BF6:: @ 8181BF6 +MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock:: @ 8181BF6 .string "Oh, yes, if you smash a rock, a POKéMON\n" .string "could come flying out.$" diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 90621eedb..bfe6fa17b 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_House2_EventScript_1572C0", + "script": "MauvilleCity_House2_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 28b71f3ca..6298259c7 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -1,44 +1,44 @@ MauvilleCity_House2_MapScripts:: @ 81572BF .byte 0 -MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 +MauvilleCity_House2_EventScript_Woman:: @ 81572C0 lock faceplayer - goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_15733D - msgbox MauvilleCity_House2_Text_18244E, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_ReceivedCoinCase + msgbox MauvilleCity_House2_Text_BuyHarborMailAtSlateport, MSGBOX_DEFAULT checkitem ITEM_HARBOR_MAIL, 1 compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_House2_EventScript_1572E5 + goto_if_eq MauvilleCity_House2_EventScript_AskToTradeForHarborMail release end -MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 +MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 81572E5 playse SE_PIN applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 - msgbox MauvilleCity_House2_Text_1824D8, MSGBOX_YESNO + msgbox MauvilleCity_House2_Text_TradeHarborMailForCoinCase, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq MauvilleCity_House2_EventScript_15731B + goto_if_eq MauvilleCity_House2_EventScript_AcceptTrade compare VAR_RESULT, NO - goto_if_eq MauvilleCity_House2_EventScript_157347 + goto_if_eq MauvilleCity_House2_EventScript_DeclineTrade end -MauvilleCity_House2_EventScript_15731B:: @ 815731B - msgbox MauvilleCity_House2_Text_182515, MSGBOX_DEFAULT +MauvilleCity_House2_EventScript_AcceptTrade:: @ 815731B + msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT removeitem ITEM_HARBOR_MAIL giveitem ITEM_COIN_CASE setflag FLAG_RECEIVED_COIN_CASE - goto MauvilleCity_House2_EventScript_15733D + goto MauvilleCity_House2_EventScript_ReceivedCoinCase end -MauvilleCity_House2_EventScript_15733D:: @ 815733D - msgbox MauvilleCity_House2_Text_182549, MSGBOX_DEFAULT +MauvilleCity_House2_EventScript_ReceivedCoinCase:: @ 815733D + msgbox MauvilleCity_House2_Text_UseCoinCaseAtGameCorner, MSGBOX_DEFAULT release end -MauvilleCity_House2_EventScript_157347:: @ 8157347 - msgbox MauvilleCity_House2_Text_182578, MSGBOX_DEFAULT +MauvilleCity_House2_EventScript_DeclineTrade:: @ 8157347 + msgbox MauvilleCity_House2_Text_ThatsDisappointing, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_House2/text.inc b/data/maps/MauvilleCity_House2/text.inc index 8fa83f195..795edafd5 100644 --- a/data/maps/MauvilleCity_House2/text.inc +++ b/data/maps/MauvilleCity_House2/text.inc @@ -1,22 +1,22 @@ -MauvilleCity_House2_Text_18244E:: @ 818244E +MauvilleCity_House2_Text_BuyHarborMailAtSlateport:: @ 818244E .string "If I had a BIKE, it'd be easy to cycle to\n" .string "SLATEPORT for some shopping.\p" .string "I'd be able to buy HARBOR MAIL at the\n" .string "POKéMON MART in SLATEPORT...$" -MauvilleCity_House2_Text_1824D8:: @ 81824D8 +MauvilleCity_House2_Text_TradeHarborMailForCoinCase:: @ 81824D8 .string "Oh! You have HARBOR MAIL?\n" .string "Will you trade it for a COIN CASE?$" -MauvilleCity_House2_Text_182515:: @ 8182515 +MauvilleCity_House2_Text_IllTradeYouCoinCase:: @ 8182515 .string "Oh, I'm so happy!\n" .string "Okay, I'll trade you a COIN CASE!$" -MauvilleCity_House2_Text_182549:: @ 8182549 +MauvilleCity_House2_Text_UseCoinCaseAtGameCorner:: @ 8182549 .string "That COIN CASE can be used at the\n" .string "GAME CORNER.$" -MauvilleCity_House2_Text_182578:: @ 8182578 +MauvilleCity_House2_Text_ThatsDisappointing:: @ 8182578 .string "Oh, that's disappointing.\p" .string "A COIN CASE is needed for the\n" .string "GAME CORNER.$" diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 9712110ee..f09a5a5e4 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Mart_EventScript_1573BE", + "script": "MauvilleCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Mart_EventScript_1573F4", + "script": "MauvilleCity_Mart_EventScript_ExpertM", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Mart_EventScript_1573FD", + "script": "MauvilleCity_Mart_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index e2ed4c05e..5847a9f8a 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -1,18 +1,18 @@ MauvilleCity_Mart_MapScripts:: @ 81573BD .byte 0 -MauvilleCity_Mart_EventScript_1573BE:: @ 81573BE +MauvilleCity_Mart_EventScript_Clerk:: @ 81573BE lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart MauvilleCity_Mart_Items + pokemart MauvilleCity_Mart_Pokemart msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -MauvilleCity_Mart_Items:: @ 81573D8 +MauvilleCity_Mart_Pokemart:: @ 81573D8 .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION @@ -29,10 +29,10 @@ MauvilleCity_Mart_Items:: @ 81573D8 release end -MauvilleCity_Mart_EventScript_1573F4:: @ 81573F4 - msgbox MauvilleCity_Mart_Text_1827D3, MSGBOX_NPC +MauvilleCity_Mart_EventScript_ExpertM:: @ 81573F4 + msgbox MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats, MSGBOX_NPC end -MauvilleCity_Mart_EventScript_1573FD:: @ 81573FD - msgbox MauvilleCity_Mart_Text_18287F, MSGBOX_NPC +MauvilleCity_Mart_EventScript_Man:: @ 81573FD + msgbox MauvilleCity_Mart_Text_DecisionsDetermineBattle, MSGBOX_NPC end diff --git a/data/maps/MauvilleCity_Mart/text.inc b/data/maps/MauvilleCity_Mart/text.inc index c0809f74e..f9868d07b 100644 --- a/data/maps/MauvilleCity_Mart/text.inc +++ b/data/maps/MauvilleCity_Mart/text.inc @@ -1,4 +1,4 @@ -MauvilleCity_Mart_Text_1827D3:: @ 81827D3 +MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats:: @ 81827D3 .string "There are items that temporarily\n" .string "elevate the stats of POKéMON.\p" .string "The ones I know you use in battle\n" @@ -6,7 +6,7 @@ MauvilleCity_Mart_Text_1827D3:: @ 81827D3 .string "I do believe that there are others\n" .string "like them.$" -MauvilleCity_Mart_Text_18287F:: @ 818287F +MauvilleCity_Mart_Text_DecisionsDetermineBattle:: @ 818287F .string "Use a certain move, or use an item\n" .string "instead...\p" .string "The TRAINER's decisions determine how\n" diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index a001b82f8..1763d74df 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_157369", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_157377", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_Woman1", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_157380", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_Woman2", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_157389", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index e5cfd2fb2..716e8e4d1 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,18 +1,18 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 - map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_157357 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition .byte 0 -MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 +MauvilleCity_PokemonCenter_1F_OnTransition:: @ 8157357 setrespawn HEAL_LOCATION_MAUVILLE_CITY call Common_EventScript_UpdateBrineyLocation - goto MauvilleCity_PokemonCenter_1F_EventScript_157365 + goto MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx end -MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 - special sub_80F83D0 +MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx:: @ 8157365 + special SetMauvilleOldManObjEventGfx end -MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 +MauvilleCity_PokemonCenter_1F_EventScript_Nurse:: @ 8157369 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -20,14 +20,14 @@ MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 release end -MauvilleCity_PokemonCenter_1F_EventScript_157377:: @ 8157377 - msgbox MauvilleCity_PokemonCenter_1F_Text_1825BD, MSGBOX_NPC +MauvilleCity_PokemonCenter_1F_EventScript_Woman1:: @ 8157377 + msgbox MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings, MSGBOX_NPC end -MauvilleCity_PokemonCenter_1F_EventScript_157380:: @ 8157380 - msgbox MauvilleCity_PokemonCenter_1F_Text_182622, MSGBOX_NPC +MauvilleCity_PokemonCenter_1F_EventScript_Woman2:: @ 8157380 + msgbox MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner, MSGBOX_NPC end -MauvilleCity_PokemonCenter_1F_EventScript_157389:: @ 8157389 - msgbox MauvilleCity_PokemonCenter_1F_Text_1826A6, MSGBOX_NPC +MauvilleCity_PokemonCenter_1F_EventScript_Youngster:: @ 8157389 + msgbox MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun, MSGBOX_NPC end diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/text.inc b/data/maps/MauvilleCity_PokemonCenter_1F/text.inc index 46cb85033..eea760798 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/text.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/text.inc @@ -1,17 +1,17 @@ -MauvilleCity_PokemonCenter_1F_Text_1825BD:: @ 81825BD +MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings:: @ 81825BD .string "That man over there, he says weird\n" .string "things!\p" .string "He's funny in a weird way.\n" .string "I doubt I'll forget about him!$" -MauvilleCity_PokemonCenter_1F_Text_182622:: @ 8182622 +MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner:: @ 8182622 .string "When I accessed the RECORD CORNER,\n" .string "the data for what's hot in DEWFORD\l" .string "got updated.\p" .string "Now that bit of data is the same\n" .string "as my friend's!$" -MauvilleCity_PokemonCenter_1F_Text_1826A6:: @ 81826A6 +MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun:: @ 81826A6 .string "A RECORD CORNER opened upstairs in\n" .string "the POKéMON CENTER.\p" .string "I don't know what it's about, but it\n" diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 52e07cd71..daf8eb9ae 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -197,7 +197,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MeteorFalls_1F_1R_EventScript_14E842" + "script": "FallarborTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 575512d60..de3bd4d7b 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -89,7 +89,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MeteorFalls_1F_2R_EventScript_14E842" + "script": "FallarborTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 04d06b3a0..2f894c670 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_14CFB7", + "script": "MossdeepCity_EventScript_Sailor", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_14CFC9", + "script": "MossdeepCity_EventScript_ExpertM", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_14CFAE", + "script": "MossdeepCity_EventScript_PokefanF", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_14CFC0", + "script": "MossdeepCity_EventScript_NinjaBoy", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_14CFD2", + "script": "MossdeepCity_EventScript_Girl", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_14D011", + "script": "MossdeepCity_EventScript_Man", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_14CFDB", + "script": "MossdeepCity_EventScript_Woman", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_14D027", + "script": "MossdeepCity_EventScript_KingsRockBoy", "flag": "0" } ], @@ -225,7 +225,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_EventScript_14D008" + "script": "MossdeepCity_EventScript_VisitedMossdeep" }, { "type": "trigger", @@ -234,7 +234,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_EventScript_14D008" + "script": "MossdeepCity_EventScript_VisitedMossdeep" }, { "type": "trigger", @@ -243,7 +243,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_EventScript_14D008" + "script": "MossdeepCity_EventScript_VisitedMossdeep" }, { "type": "trigger", @@ -252,7 +252,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_EventScript_14D008" + "script": "MossdeepCity_EventScript_VisitedMossdeep" } ], "bg_events": [ @@ -262,7 +262,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_EventScript_14CFF6" + "script": "MossdeepCity_EventScript_CitySign" }, { "type": "sign", @@ -270,7 +270,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_EventScript_14CFED" + "script": "MossdeepCity_EventScript_GymSign" }, { "type": "sign", @@ -294,7 +294,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_EventScript_14CFFF" + "script": "MossdeepCity_EventScript_SpaceCenterSign" }, { "type": "sign", @@ -318,7 +318,7 @@ "y": 21, "elevation": 7, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_EventScript_14CFE4" + "script": "MossdeepCity_EventScript_WhiteRock" } ] } diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 470c95630..1b455788d 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,8 +1,8 @@ MossdeepCity_MapScripts:: @ 814CF92 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_14CF98 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_OnTransition .byte 0 -MossdeepCity_MapScript1_14CF98:: @ 814CF98 +MossdeepCity_OnTransition:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 @@ -10,68 +10,68 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather end -MossdeepCity_EventScript_14CFAE:: @ 814CFAE - msgbox MossdeepCity_Text_169266, MSGBOX_NPC +MossdeepCity_EventScript_PokefanF:: @ 814CFAE + msgbox MossdeepCity_Text_SpaceCenterLaunchingRockets, MSGBOX_NPC end -MossdeepCity_EventScript_14CFB7:: @ 814CFB7 - msgbox MossdeepCity_Text_1692A1, MSGBOX_NPC +MossdeepCity_EventScript_Sailor:: @ 814CFB7 + msgbox MossdeepCity_Text_WailmerDisappeared, MSGBOX_NPC end -MossdeepCity_EventScript_14CFC0:: @ 814CFC0 - msgbox MossdeepCity_Text_1691F2, MSGBOX_NPC +MossdeepCity_EventScript_NinjaBoy:: @ 814CFC0 + msgbox MossdeepCity_Text_WailmerWatching, MSGBOX_NPC end -MossdeepCity_EventScript_14CFC9:: @ 814CFC9 - msgbox MossdeepCity_Text_169370, MSGBOX_NPC +MossdeepCity_EventScript_ExpertM:: @ 814CFC9 + msgbox MossdeepCity_Text_LifeNeedsSeaToLive, MSGBOX_NPC end -MossdeepCity_EventScript_14CFD2:: @ 814CFD2 - msgbox MossdeepCity_Text_169314, MSGBOX_NPC +MossdeepCity_EventScript_Girl:: @ 814CFD2 + msgbox MossdeepCity_Text_NiceIfWorldCoveredByFlowers, MSGBOX_NPC end -MossdeepCity_EventScript_14CFDB:: @ 814CFDB - msgbox MossdeepCity_Text_1694DA, MSGBOX_NPC +MossdeepCity_EventScript_Woman:: @ 814CFDB + msgbox MossdeepCity_Text_SpecialSpaceCenterRock, MSGBOX_NPC end -MossdeepCity_EventScript_14CFE4:: @ 814CFE4 - msgbox MossdeepCity_Text_1695D3, MSGBOX_SIGN +MossdeepCity_EventScript_WhiteRock:: @ 814CFE4 + msgbox MossdeepCity_Text_ItsAWhiteRock, MSGBOX_SIGN end -MossdeepCity_EventScript_14CFED:: @ 814CFED - msgbox MossdeepCity_Text_1695E6, MSGBOX_SIGN +MossdeepCity_EventScript_GymSign:: @ 814CFED + msgbox MossdeepCity_Text_GymSign, MSGBOX_SIGN end -MossdeepCity_EventScript_14CFF6:: @ 814CFF6 - msgbox MossdeepCity_Text_16962F, MSGBOX_SIGN +MossdeepCity_EventScript_CitySign:: @ 814CFF6 + msgbox MossdeepCity_Text_CitySign, MSGBOX_SIGN end -MossdeepCity_EventScript_14CFFF:: @ 814CFFF - msgbox MossdeepCity_Text_16965C, MSGBOX_SIGN +MossdeepCity_EventScript_SpaceCenterSign:: @ 814CFFF + msgbox MossdeepCity_Text_SpaceCenterSign, MSGBOX_SIGN end -MossdeepCity_EventScript_14D008:: @ 814D008 +MossdeepCity_EventScript_VisitedMossdeep:: @ 814D008 setflag FLAG_VISITED_MOSSDEEP_CITY setvar VAR_TEMP_1, 1 end -MossdeepCity_EventScript_14D011:: @ 814D011 +MossdeepCity_EventScript_Man:: @ 814D011 lock faceplayer - msgbox MossdeepCity_Text_16944E, MSGBOX_DEFAULT + msgbox MossdeepCity_Text_SurfExhilarating, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_EventScript_14D027:: @ 814D027 +MossdeepCity_EventScript_KingsRockBoy:: @ 814D027 lock faceplayer - goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_14D069 - msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_ReceivedKingsRock + msgbox MossdeepCity_Text_WantKingsRockStevenGaveMe, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MossdeepCity_EventScript_14D073 - msgbox MossdeepCity_Text_169117, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_EventScript_DeclineKingsRock + msgbox MossdeepCity_Text_YouCanKeepIt, MSGBOX_DEFAULT giveitem ITEM_KINGS_ROCK compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -79,12 +79,12 @@ MossdeepCity_EventScript_14D027:: @ 814D027 release end -MossdeepCity_EventScript_14D069:: @ 814D069 - msgbox MossdeepCity_Text_16916F, MSGBOX_DEFAULT +MossdeepCity_EventScript_ReceivedKingsRock:: @ 814D069 + msgbox MossdeepCity_Text_CollectingRocks, MSGBOX_DEFAULT release end -MossdeepCity_EventScript_14D073:: @ 814D073 - msgbox MossdeepCity_Text_1691A7, MSGBOX_DEFAULT +MossdeepCity_EventScript_DeclineKingsRock:: @ 814D073 + msgbox MossdeepCity_Text_WhatToDoWithWeirdRock, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity/text.inc b/data/maps/MossdeepCity/text.inc index 842c2c6fe..3254a49ba 100644 --- a/data/maps/MossdeepCity/text.inc +++ b/data/maps/MossdeepCity/text.inc @@ -1,24 +1,24 @@ -MossdeepCity_Text_1690A9:: @ 81690A9 +MossdeepCity_Text_WantKingsRockStevenGaveMe:: @ 81690A9 .string "I got this from STEVEN, but I don't\n" .string "know what it's good for.\p" .string "I think it's called KING'S ROCK.\n" .string "Do you want it?$" -MossdeepCity_Text_169117:: @ 8169117 +MossdeepCity_Text_YouCanKeepIt:: @ 8169117 .string "Why would you want it?\n" .string "You're weird.\p" .string "You can keep it, but keep it a secret\n" .string "from STEVEN.$" -MossdeepCity_Text_16916F:: @ 816916F +MossdeepCity_Text_CollectingRocks:: @ 816916F .string "Is it really that fun collecting\n" .string "rocks? I don't get it.$" -MossdeepCity_Text_1691A7:: @ 81691A7 +MossdeepCity_Text_WhatToDoWithWeirdRock:: @ 81691A7 .string "Yeah, you think so, too! What are you\n" .string "supposed to do with some weird rock?$" -MossdeepCity_Text_1691F2:: @ 81691F2 +MossdeepCity_Text_WailmerWatching:: @ 81691F2 .string "Around MOSSDEEP, you can see wild\n" .string "WAILMER.\p" .string "It's called, uh...\n" @@ -26,22 +26,22 @@ MossdeepCity_Text_1691F2:: @ 81691F2 .string "WAI, WAI, WAI...\p" .string "WAILMER watching!$" -MossdeepCity_Text_169266:: @ 8169266 +MossdeepCity_Text_SpaceCenterLaunchingRockets:: @ 8169266 .string "The island's SPACE CENTER has been\n" .string "launching huge rockets.$" -MossdeepCity_Text_1692A1:: @ 81692A1 +MossdeepCity_Text_WailmerDisappeared:: @ 81692A1 .string "I'd heard from my mates in LILYCOVE\n" .string "that the herd of WAILMER has\l" .string "disappeared.\p" .string "What went down over there, I wonder?$" -MossdeepCity_Text_169314:: @ 8169314 +MossdeepCity_Text_NiceIfWorldCoveredByFlowers:: @ 8169314 .string "Wouldn't it be nice?\p" .string "If the whole world was covered in\n" .string "plants and flowers like this island?$" -MossdeepCity_Text_169370:: @ 8169370 +MossdeepCity_Text_LifeNeedsSeaToLive:: @ 8169370 .string "All life needs the sea to live, even\n" .string "though it makes its home on the land.\p" .string "Life, having run its course, becomes\n" @@ -50,14 +50,14 @@ MossdeepCity_Text_169370:: @ 8169370 .string "the land.\p" .string "Yes, like the very shoreline here.$" -MossdeepCity_Text_16944E:: @ 816944E +MossdeepCity_Text_SurfExhilarating:: @ 816944E .string "A voyage on a ship is fine.\p" .string "But crossing the sea with POKéMON\n" .string "using SURF...\p" .string "Now that's an exhilarating trip!\n" .string "Wouldn't you agree, youngster?$" -MossdeepCity_Text_1694DA:: @ 81694DA +MossdeepCity_Text_SpecialSpaceCenterRock:: @ 81694DA .string "This rock has a special meaning to\n" .string "the people at the SPACE CENTER.\p" .string "They put it here as their wish for\n" @@ -67,18 +67,18 @@ MossdeepCity_Text_1694DA:: @ 81694DA .string "I use a wish tag to make it happen.\n" .string "That's what I do.$" -MossdeepCity_Text_1695D3:: @ 81695D3 +MossdeepCity_Text_ItsAWhiteRock:: @ 81695D3 .string "It's a white rock.$" -MossdeepCity_Text_1695E6:: @ 81695E6 +MossdeepCity_Text_GymSign:: @ 81695E6 .string "MOSSDEEP CITY POKéMON GYM\n" .string "LEADERS: LIZA & TATE\p" .string "“The mystic combination!”$" -MossdeepCity_Text_16962F:: @ 816962F +MossdeepCity_Text_CitySign:: @ 816962F .string "MOSSDEEP CITY\n" .string "“Our slogan: Cherish POKéMON!”$" -MossdeepCity_Text_16965C:: @ 816965C +MossdeepCity_Text_SpaceCenterSign:: @ 816965C .string "MOSSDEEP SPACE CENTER\n" .string "“The closest place to space.”$" diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index 24fc876ee..b4e93cf16 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -1,10 +1,10 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_15AC62 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_GameCorner_1F_MapScript1_15AC84 - map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_15ACBB + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_GameCorner_1F_MapScript1_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript1_OnFrame .byte 0 -MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 +MossdeepCity_GameCorner_1F_MapScript1_OnLoad:: @ 815AC62 special ValidateEReaderTrainer compare VAR_RESULT, 1 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC71 @@ -15,7 +15,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 setmetatile 3, 1, METATILE_GenericBuilding_Doorway_ClosedBottom, 1 return -MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 +MossdeepCity_GameCorner_1F_MapScript1_OnTransition:: @ 815AC84 special ValidateEReaderTrainer compare VAR_RESULT, 0 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC9E @@ -34,7 +34,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF setobjectmovementtype 1, 10 return -MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB +MossdeepCity_GameCorner_1F_MapScript1_OnFrame:: @ 815ACBB map_script_2 VAR_GAME_CORNER_STATE, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5 map_script_2 VAR_GAME_CORNER_STATE, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5 map_script_2 VAR_GAME_CORNER_STATE, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5 @@ -61,15 +61,15 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 end MossdeepCity_GameCorner_1F_EventScript_15AD22:: @ 815AD22 - msgbox MossdeepCity_GameCorner_1F_Text_18E80E, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_B1F_Text_BattleWon, MSGBOX_DEFAULT return MossdeepCity_GameCorner_1F_EventScript_15AD2B:: @ 815AD2B - msgbox MossdeepCity_GameCorner_1F_Text_18E859, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_B1F_Text_BattleLost, MSGBOX_DEFAULT return MossdeepCity_GameCorner_1F_EventScript_15AD34:: @ 815AD34 - msgbox MossdeepCity_GameCorner_1F_Text_18E7B1, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_B1F_Text_BattleTie, MSGBOX_DEFAULT return MossdeepCity_GameCorner_1F_Movement_15AD3D:: @ 815AD3D @@ -86,20 +86,20 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 faceplayer compare VAR_TEMP_1, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 - msgbox MossdeepCity_GameCorner_1F_Text_18E59A, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_B1F_Text_OldManGreeting, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special BufferEReaderTrainerName - msgbox MossdeepCity_GameCorner_1F_Text_18E650, MSGBOX_YESNO + msgbox MossdeepCity_GameCorner_B1F_Text_ChallengeVisitingTrainer, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 - msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO + msgbox MossdeepCity_GameCorner_B1F_Text_SaveYourProgress, MSGBOX_YESNO compare VAR_RESULT, NO call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty @@ -109,7 +109,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 erasebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree - msgbox MossdeepCity_GameCorner_1F_Text_18E777, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_B1F_Text_HopeToSeeAGoodMatch, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04 @@ -124,12 +124,12 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8 special LoadPlayerParty - msgbox MossdeepCity_GameCorner_1F_Text_18E698, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_B1F_Text_YouWontBattle, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5 - msgbox MossdeepCity_GameCorner_1F_Text_18E6DA, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_B1F_Text_KeepItToA3On3, MSGBOX_DEFAULT fadescreen FADE_TO_BLACK special sub_80C5568 waitstate @@ -182,5 +182,5 @@ MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49 step_end MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C - msgbox MossdeepCity_GameCorner_1F_Text_18E631, MSGBOX_SIGN + msgbox MossdeepCity_GameCorner_B1F_Text_DoorIsLocked, MSGBOX_SIGN end diff --git a/data/maps/MossdeepCity_GameCorner_1F/text.inc b/data/maps/MossdeepCity_GameCorner_1F/text.inc index 1b8c9e550..e40793002 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/text.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/text.inc @@ -1,43 +1,43 @@ -MossdeepCity_GameCorner_1F_Text_18E59A:: @ 818E59A +MossdeepCity_GameCorner_B1F_Text_OldManGreeting:: @ 818E59A .string "When I was young, I traveled the world\n" .string "as a POKéMON TRAINER.\p" .string "Now that I've become an old buzzard,\n" .string "my only amusement is watching young\l" .string "TRAINERS battle.$" -MossdeepCity_GameCorner_1F_Text_18E631:: @ 818E631 +MossdeepCity_GameCorner_B1F_Text_DoorIsLocked:: @ 818E631 .string "The door appears to be locked.$" -MossdeepCity_GameCorner_1F_Text_18E650:: @ 818E650 +MossdeepCity_GameCorner_B1F_Text_ChallengeVisitingTrainer:: @ 818E650 .string "A TRAINER named {STR_VAR_1} is\n" .string "visiting my home.\p" .string "Would you like to challenge\n" .string "{STR_VAR_1}?$" -MossdeepCity_GameCorner_1F_Text_18E698:: @ 818E698 +MossdeepCity_GameCorner_B1F_Text_YouWontBattle:: @ 818E698 .string "You won't battle? I'm disappointed\n" .string "that I can't see you battle...$" -MossdeepCity_GameCorner_1F_Text_18E6DA:: @ 818E6DA +MossdeepCity_GameCorner_B1F_Text_KeepItToA3On3:: @ 818E6DA .string "Oh, good, good!\p" .string "But my house isn't all that sturdy.\p" .string "Could I ask you to keep it down to\n" .string "a 3-on-3 match?$" -MossdeepCity_GameCorner_1F_Text_18E741:: @ 818E741 +MossdeepCity_GameCorner_B1F_Text_SaveYourProgress:: @ 818E741 .string "Before you two battle, you should\n" .string "save your progress.$" -MossdeepCity_GameCorner_1F_Text_18E777:: @ 818E777 +MossdeepCity_GameCorner_B1F_Text_HopeToSeeAGoodMatch:: @ 818E777 .string "I hope to see a good match!$" UnknownString_818E793: @ 818E793 .string "{STR_VAR_1}$" -MossdeepCity_GameCorner_B1F_Text_18E796:: @ 818E796 +MossdeepCity_GameCorner_B1F_Text_MatchEndedUpDraw:: @ 818E796 .string "The match ended up a draw.$" -MossdeepCity_GameCorner_1F_Text_18E7B1:: @ 818E7B1 +MossdeepCity_GameCorner_B1F_Text_BattleTie:: @ 818E7B1 .string "So, it became a standoff.\p" .string "It was a brilliant match in which\n" .string "neither side conceded a step!$" @@ -45,7 +45,7 @@ MossdeepCity_GameCorner_1F_Text_18E7B1:: @ 818E7B1 UnknownString_818E80B: @ 818E80B .string "{STR_VAR_1}$" -MossdeepCity_GameCorner_1F_Text_18E80E:: @ 818E80E +MossdeepCity_GameCorner_B1F_Text_BattleWon:: @ 818E80E .string "That was superlative!\p" .string "Why, it was like seeing myself in my\n" .string "youth again!$" @@ -53,7 +53,7 @@ MossdeepCity_GameCorner_1F_Text_18E80E:: @ 818E80E UnknownString_818E856: @ 818E856 .string "{STR_VAR_1}$" -MossdeepCity_GameCorner_1F_Text_18E859:: @ 818E859 +MossdeepCity_GameCorner_B1F_Text_BattleLost:: @ 818E859 .string "Ah, too bad for you!\p" .string "But it was a good match.\n" .string "I hope you can win next time.$" diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc index 5cc777ec4..4cfc6f470 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc @@ -1,13 +1,13 @@ MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_GameCorner_B1F_MapScript1_15AE60 - map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_B1F_MapScript2_15AE64 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_GameCorner_B1F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_B1F_OnFrame .byte 0 -MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 +MossdeepCity_GameCorner_B1F_OnTransition:: @ 815AE60 special SetEReaderTrainerGfxId end -MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 +MossdeepCity_GameCorner_B1F_OnFrame:: @ 815AE64 map_script_2 VAR_TEMP_1, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E .2byte 0 @@ -41,7 +41,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5 setvar VAR_GAME_CORNER_STATE, 3 - msgbox MossdeepCity_GameCorner_B1F_Text_18E796, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_B1F_Text_MatchEndedUpDraw, MSGBOX_DEFAULT return MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 2f7428e54..9c4bfe8cc 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Gym_EventScript_15A56B", + "script": "MossdeepCity_Gym_EventScript_TateAndLiza", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_15A74E", + "script": "MossdeepCity_Gym_EventScript_Preston", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_15A77C", + "script": "MossdeepCity_Gym_EventScript_Fritz", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_15A7C1", + "script": "MossdeepCity_Gym_EventScript_Maura", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_15A7AA", + "script": "MossdeepCity_Gym_EventScript_Samantha", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_15A765", + "script": "MossdeepCity_Gym_EventScript_Virgil", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "MossdeepCity_Gym_EventScript_15A793", + "script": "MossdeepCity_Gym_EventScript_Hannah", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Gym_EventScript_15A7D8", + "script": "MossdeepCity_Gym_EventScript_GymGuide", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Gym_EventScript_15A56B", + "script": "MossdeepCity_Gym_EventScript_TateAndLiza", "flag": "0" } ], @@ -153,7 +153,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_15A742" + "script": "MossdeepCity_Gym_EventScript_WarpToEntrance" } ], "bg_events": [ @@ -163,7 +163,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_Gym_EventScript_15A5EA" + "script": "MossdeepCity_Gym_EventScript_Switch1" }, { "type": "sign", @@ -171,7 +171,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_Gym_EventScript_15A646" + "script": "MossdeepCity_Gym_EventScript_Switch2" }, { "type": "sign", @@ -179,7 +179,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_Gym_EventScript_15A69A" + "script": "MossdeepCity_Gym_EventScript_Switch3" }, { "type": "sign", @@ -187,7 +187,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_Gym_EventScript_15A6EE" + "script": "MossdeepCity_Gym_EventScript_Switch4" }, { "type": "sign", @@ -195,7 +195,7 @@ "y": 27, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_Gym_EventScript_15A7FA" + "script": "MossdeepCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -203,7 +203,7 @@ "y": 27, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_Gym_EventScript_15A80A" + "script": "MossdeepCity_Gym_EventScript_RightGymStatue" } ] } diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index a1befaefa..8a9c3e882 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,61 +1,61 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_15A4D9 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_OnLoad .byte 0 -MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A510 - goto MossdeepCity_Gym_EventScript_15A4E8 +MossdeepCity_Gym_OnLoad:: @ 815A4D9 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_SetSwitch1Metatiles + goto MossdeepCity_Gym_EventScript_CheckSwitch2 end -MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A528 - goto MossdeepCity_Gym_EventScript_15A4F7 +MossdeepCity_Gym_EventScript_CheckSwitch2:: @ 815A4E8 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_SetSwitch2Metatiles + goto MossdeepCity_Gym_EventScript_CheckSwitch3 end -MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A540 - goto MossdeepCity_Gym_EventScript_15A506 +MossdeepCity_Gym_EventScript_CheckSwitch3:: @ 815A4F7 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_SetSwitch3Metatiles + goto MossdeepCity_Gym_EventScript_CheckSwitch4 end -MossdeepCity_Gym_EventScript_15A506:: @ 815A506 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A558 +MossdeepCity_Gym_EventScript_CheckSwitch4:: @ 815A506 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_SetSwitch4Metatiles end -MossdeepCity_Gym_EventScript_15A510:: @ 815A510 +MossdeepCity_Gym_EventScript_SetSwitch1Metatiles:: @ 815A510 setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 2, 7, METATILE_MossdeepGym_Switch_Down, 1 - goto MossdeepCity_Gym_EventScript_15A4E8 + goto MossdeepCity_Gym_EventScript_CheckSwitch2 end -MossdeepCity_Gym_EventScript_15A528:: @ 815A528 +MossdeepCity_Gym_EventScript_SetSwitch2Metatiles:: @ 815A528 setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 8, 10, METATILE_MossdeepGym_Switch_Down, 1 - goto MossdeepCity_Gym_EventScript_15A4F7 + goto MossdeepCity_Gym_EventScript_CheckSwitch3 end -MossdeepCity_Gym_EventScript_15A540:: @ 815A540 +MossdeepCity_Gym_EventScript_SetSwitch3Metatiles:: @ 815A540 setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Left, 0 setmetatile 17, 15, METATILE_MossdeepGym_Switch_Down, 1 - goto MossdeepCity_Gym_EventScript_15A506 + goto MossdeepCity_Gym_EventScript_CheckSwitch4 end -MossdeepCity_Gym_EventScript_15A558:: @ 815A558 +MossdeepCity_Gym_EventScript_SetSwitch4Metatiles:: @ 815A558 setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Up, 0 setmetatile 5, 24, METATILE_MossdeepGym_Switch_Down, 1 end -MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B - trainerbattle_double TRAINER_TATE_AND_LIZA, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594, NO_MUSIC - goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 - msgbox MossdeepCity_Gym_Text_18D273, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_TateAndLiza:: @ 815A56B + trainerbattle_double TRAINER_TATE_AND_LIZA, MossdeepCity_Gym_Text_TateAndLizaIntro, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC + goto_if_unset FLAG_RECEIVED_TM_CALM_MIND, MossdeepCity_Gym_EventScript_GiveCalmMind2 + msgbox MossdeepCity_Gym_Text_TateAndLizaPostBattle, MSGBOX_DEFAULT release end -MossdeepCity_Gym_EventScript_15A594:: @ 815A594 - message MossdeepCity_Gym_Text_18D0F9 +MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 815A594 + message MossdeepCity_Gym_Text_ReceivedMindBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox MossdeepCity_Gym_Text_18D128, MSGBOX_DEFAULT + msgbox MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD @@ -63,177 +63,177 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setvar VAR_0x8008, 7 call Common_EventScript_SetGymTrainers clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - goto MossdeepCity_Gym_EventScript_15A5C6 + goto MossdeepCity_Gym_EventScript_GiveCalmMind2 end -MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 +MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 815A5C6 giveitem ITEM_TM04_CALM_MIND compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox MossdeepCity_Gym_Text_18D1CF, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM04 + msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_CALM_MIND release end -MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA +MossdeepCity_Gym_EventScript_Switch1:: @ 815A5EA lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_ClearSwitch1 setflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 + applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 2, 7, METATILE_MossdeepGym_Switch_Down, 1 - goto MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_15A619:: @ 815A619 +MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 815A619 special DrawWholeMapView playse SE_CLICK releaseall end -MossdeepCity_Gym_EventScript_15A621:: @ 815A621 +MossdeepCity_Gym_EventScript_ClearSwitch1:: @ 815A621 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 + applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Left, 0 setmetatile 2, 7, METATILE_MossdeepGym_Switch_Up, 1 - goto MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_15A646:: @ 815A646 +MossdeepCity_Gym_EventScript_Switch2:: @ 815A646 lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_ClearSwitch2 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 + applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 8, 10, METATILE_MossdeepGym_Switch_Down, 1 - goto MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_15A675:: @ 815A675 +MossdeepCity_Gym_EventScript_ClearSwitch2:: @ 815A675 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 + applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Down, 0 setmetatile 8, 10, METATILE_MossdeepGym_Switch_Up, 1 - goto MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A +MossdeepCity_Gym_EventScript_Switch3:: @ 815A69A lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_ClearSwitch3 setflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 + applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Left, 0 setmetatile 17, 15, METATILE_MossdeepGym_Switch_Down, 1 - goto MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 +MossdeepCity_Gym_EventScript_ClearSwitch3:: @ 815A6C9 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 + applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 17, 15, METATILE_MossdeepGym_Switch_Up, 1 - goto MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE +MossdeepCity_Gym_EventScript_Switch4:: @ 815A6EE lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_ClearSwitch4 setflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 + applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Up, 0 setmetatile 5, 24, METATILE_MossdeepGym_Switch_Down, 1 - goto MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D +MossdeepCity_Gym_EventScript_ClearSwitch4:: @ 815A71D clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_15A7F7 + applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Right, 0 setmetatile 5, 24, METATILE_MossdeepGym_Switch_Up, 1 - goto MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_15A742:: @ 815A742 +MossdeepCity_Gym_EventScript_WarpToEntrance:: @ 815A742 lockall warpteleport MAP_MOSSDEEP_CITY_GYM, 255, 14, 29 waitstate releaseall end -MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E - trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA - msgbox MossdeepCity_Gym_Text_18C9E1, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Preston:: @ 815A74E + trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonIntro, MossdeepCity_Gym_Text_PrestonDefeat + msgbox MossdeepCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_15A765:: @ 815A765 - trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 - msgbox MossdeepCity_Gym_Text_18CA48, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Virgil:: @ 815A765 + trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilIntro, MossdeepCity_Gym_Text_VirgilDefeat + msgbox MossdeepCity_Gym_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C - trainerbattle_single TRAINER_FRITZ, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 - msgbox MossdeepCity_Gym_Text_18CB77, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Fritz:: @ 815A77C + trainerbattle_single TRAINER_FRITZ, MossdeepCity_Gym_Text_FritzIntro, MossdeepCity_Gym_Text_FritzDefeat + msgbox MossdeepCity_Gym_Text_FritzPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_15A793:: @ 815A793 - trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 - msgbox MossdeepCity_Gym_Text_18CC9B, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Hannah:: @ 815A793 + trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahIntro, MossdeepCity_Gym_Text_HannahDefeat + msgbox MossdeepCity_Gym_Text_HannahPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA - trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 - msgbox MossdeepCity_Gym_Text_18CD73, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Samantha:: @ 815A7AA + trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaIntro, MossdeepCity_Gym_Text_SamanthaDefeat + msgbox MossdeepCity_Gym_Text_SamanthaPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 - trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 - msgbox MossdeepCity_Gym_Text_18CE6C, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Maura:: @ 815A7C1 + trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraIntro, MossdeepCity_Gym_Text_MauraDefeat + msgbox MossdeepCity_Gym_Text_MauraPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 +MossdeepCity_Gym_EventScript_GymGuide:: @ 815A7D8 lock faceplayer - goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_15A7ED - msgbox MossdeepCity_Gym_Text_18C7E3, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_GymGuidePostVictory + msgbox MossdeepCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -MossdeepCity_Gym_EventScript_15A7ED:: @ 815A7ED - msgbox MossdeepCity_Gym_Text_18C938, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_GymGuidePostVictory:: @ 815A7ED + msgbox MossdeepCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 +MossdeepCity_Gym_Movement_WaitAfterSwitchUse:: @ 815A7F7 delay_16 delay_16 step_end -MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA +MossdeepCity_Gym_EventScript_LeftGymStatue:: @ 815A7FA lockall - goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A - goto MossdeepCity_Gym_EventScript_15A824 + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified + goto MossdeepCity_Gym_EventScript_GymStatue end -MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A +MossdeepCity_Gym_EventScript_RightGymStatue:: @ 815A80A lockall - goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A - goto MossdeepCity_Gym_EventScript_15A824 + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified + goto MossdeepCity_Gym_EventScript_GymStatue end -MossdeepCity_Gym_EventScript_15A81A:: @ 815A81A - msgbox MossdeepCity_Gym_Text_18D424, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_GymStatueCertified:: @ 815A81A + msgbox MossdeepCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -MossdeepCity_Gym_EventScript_15A824:: @ 815A824 - msgbox MossdeepCity_Gym_Text_18D40A, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_GymStatue:: @ 815A824 + msgbox MossdeepCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MossdeepCity_Gym/text.inc b/data/maps/MossdeepCity_Gym/text.inc index e50c93e12..10274e4e7 100644 --- a/data/maps/MossdeepCity_Gym/text.inc +++ b/data/maps/MossdeepCity_Gym/text.inc @@ -1,4 +1,4 @@ -MossdeepCity_Gym_Text_18C7E3:: @ 818C7E3 +MossdeepCity_Gym_Text_GymGuideAdvice:: @ 818C7E3 .string "Yo, how's it going, CHAMPION-bound\n" .string "{PLAYER}?\p" .string "The GYM LEADERS here use PSYCHIC-type\n" @@ -12,45 +12,45 @@ MossdeepCity_Gym_Text_18C7E3:: @ 818C7E3 .string "them how tight you are with your\l" .string "POKéMON. Go for it!$" -MossdeepCity_Gym_Text_18C938:: @ 818C938 +MossdeepCity_Gym_Text_GymGuidePostVictory:: @ 818C938 .string "Wow, you're astounding!\n" .string "You're one great TRAINER!$" -MossdeepCity_Gym_Text_18C96A:: @ 818C96A +MossdeepCity_Gym_Text_PrestonIntro:: @ 818C96A .string "Battles hinge on the strength of your\n" .string "spirit! The weak-spirited will never win!$" -MossdeepCity_Gym_Text_18C9BA:: @ 818C9BA +MossdeepCity_Gym_Text_PrestonDefeat:: @ 818C9BA .string "I lost! I must temper my spirit again!$" -MossdeepCity_Gym_Text_18C9E1:: @ 818C9E1 +MossdeepCity_Gym_Text_PrestonPostBattle:: @ 818C9E1 .string "The indecisive lose.\n" .string "That's my warning to you.$" -MossdeepCity_Gym_Text_18CA10:: @ 818CA10 +MossdeepCity_Gym_Text_VirgilIntro:: @ 818CA10 .string "Let me see your talent!$" -MossdeepCity_Gym_Text_18CA28:: @ 818CA28 +MossdeepCity_Gym_Text_VirgilDefeat:: @ 818CA28 .string "You possess spectacular talent!$" -MossdeepCity_Gym_Text_18CA48:: @ 818CA48 +MossdeepCity_Gym_Text_VirgilPostBattle:: @ 818CA48 .string "If there are prodigies in the world,\n" .string "then our GYM LEADERS are them!\p" .string "However, you may be even more talented\n" .string "than them...$" -MossdeepCity_Gym_Text_18CAC0:: @ 818CAC0 +MossdeepCity_Gym_Text_FritzIntro:: @ 818CAC0 .string "Fufufufu... Watch me levitate a POKé\n" .string "BALL telekinetically!\p" .string "Wrooooooooaaaar!\n" .string "... ... ... ... ... ... ...\p" .string "Sometimes, I'm out of sync...$" -MossdeepCity_Gym_Text_18CB46:: @ 818CB46 +MossdeepCity_Gym_Text_FritzDefeat:: @ 818CB46 .string "My POKéMON battling skills are out\n" .string "of sync, too!$" -MossdeepCity_Gym_Text_18CB77:: @ 818CB77 +MossdeepCity_Gym_Text_FritzPostBattle:: @ 818CB77 .string "A POKé BALL was too heavy to lift\n" .string "psychically. But this dust bunny...\p" .string "Whoooooooooooooooh!\n" @@ -58,53 +58,53 @@ MossdeepCity_Gym_Text_18CB77:: @ 818CB77 .string "No, I'm not cheating!\n" .string "I didn't blow on it! Honestly!$" -MossdeepCity_Gym_Text_18CC1E:: @ 818CC1E +MossdeepCity_Gym_Text_HannahIntro:: @ 818CC1E .string "When you lose to me, don't be too hard\n" .string "on yourself.\p" .string "It's not that you're weak - I'm just\n" .string "too strong!$" -MossdeepCity_Gym_Text_18CC83:: @ 818CC83 +MossdeepCity_Gym_Text_HannahDefeat:: @ 818CC83 .string "You're just too strong!$" -MossdeepCity_Gym_Text_18CC9B:: @ 818CC9B +MossdeepCity_Gym_Text_HannahPostBattle:: @ 818CC9B .string "I'm not going to get down on myself for\n" .string "losing. I just need to train harder.\p" .string "Positive thinking - that's my strong\n" .string "point!$" -MossdeepCity_Gym_Text_18CD14:: @ 818CD14 +MossdeepCity_Gym_Text_SamanthaIntro:: @ 818CD14 .string "I see it...\n" .string "I see your future...\p" .string "If you can beat me, I will tell you\n" .string "your future!$" -MossdeepCity_Gym_Text_18CD66:: @ 818CD66 +MossdeepCity_Gym_Text_SamanthaDefeat:: @ 818CD66 .string "I surrender!$" -MossdeepCity_Gym_Text_18CD73:: @ 818CD73 +MossdeepCity_Gym_Text_SamanthaPostBattle:: @ 818CD73 .string "You will wage a terrifically intense\n" .string "battle with our GYM LEADERS...\p" .string "The result...\n" .string "You won't hear it from me!$" -MossdeepCity_Gym_Text_18CDE0:: @ 818CDE0 +MossdeepCity_Gym_Text_MauraIntro:: @ 818CDE0 .string "The roads you have traveled...\n" .string "What you have experienced...\p" .string "Come at me with everything you've\n" .string "learned!$" -MossdeepCity_Gym_Text_18CE47:: @ 818CE47 +MossdeepCity_Gym_Text_MauraDefeat:: @ 818CE47 .string "You've traveled a path of greatness!$" -MossdeepCity_Gym_Text_18CE6C:: @ 818CE6C +MossdeepCity_Gym_Text_MauraPostBattle:: @ 818CE6C .string "A bright future awaits those who have\n" .string "worked diligently.\p" .string "For those who lazed idly, there is\n" .string "only despair at the end.\p" .string "What goes around comes around...$" -MossdeepCity_Gym_Text_18CF02:: @ 818CF02 +MossdeepCity_Gym_Text_TateAndLizaIntro:: @ 818CF02 .string "TATE: Hehehe... Were you surprised?\p" .string "LIZA: Fufufu... Were you surprised?\p" .string "TATE: That there are two GYM LEADERS?\n" @@ -118,24 +118,24 @@ MossdeepCity_Gym_Text_18CF02:: @ 818CF02 .string "TATE: This combination of ours...\n" .string "LIZA: Can you beat it?$" -MossdeepCity_Gym_Text_18D077:: @ 818D077 +MossdeepCity_Gym_Text_TateAndLizaDefeat:: @ 818D077 .string "TATE: What?! Our combination...\n" .string "LIZA: Was shattered!\p" .string "TATE: It can't be helped. You've won...\n" .string "LIZA: So, in recognition, take this.$" -MossdeepCity_Gym_Text_18D0F9:: @ 818D0F9 +MossdeepCity_Gym_Text_ReceivedMindBadge:: @ 818D0F9 .string "{PLAYER} received the MIND BADGE\n" .string "from LIZA and TATE.$" -MossdeepCity_Gym_Text_18D128:: @ 818D128 +MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis:: @ 818D128 .string "TATE: The MIND BADGE enhances the\n" .string "SP. ATK and SP. DEF of POKéMON.\p" .string "LIZA: It also lets you use the HM move\n" .string "DIVE outside of battle.\p" .string "TATE: You should also take this, too.$" -MossdeepCity_Gym_Text_18D1CF:: @ 818D1CF +MossdeepCity_Gym_Text_ExplainCalmMind:: @ 818D1CF .string "TATE: That TM04 contains...\n" .string "LIZA: CALM MIND!\p" .string "TATE: It raises SP. ATK and...\n" @@ -143,14 +143,14 @@ MossdeepCity_Gym_Text_18D1CF:: @ 818D1CF .string "TATE: It's a move that's perfect...\n" .string "LIZA: For PSYCHIC POKéMON!$" -MossdeepCity_Gym_Text_18D273:: @ 818D273 +MossdeepCity_Gym_Text_TateAndLizaPostBattle:: @ 818D273 .string "TATE: Looks like the bond between you\n" .string "and your POKéMON is far stronger than\l" .string "the bond that we share as twins.\p" .string "LIZA: You will become even stronger!\n" .string "We've battled you, so we know.$" -MossdeepCity_Gym_Text_18D324:: @ 818D324 +MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons:: @ 818D324 .string "TATE: Hehehe... Were you surprised?\p" .string "LIZA: That there are two GYM LEADERS?\p" .string "TATE: Oops, you have only one...\n" @@ -159,10 +159,10 @@ MossdeepCity_Gym_Text_18D324:: @ 818D324 .string "LIZA: If you want to challenge us,\n" .string "bring some more POKéMON.$" -MossdeepCity_Gym_Text_18D40A:: @ 818D40A +MossdeepCity_Gym_Text_GymStatue:: @ 818D40A .string "MOSSDEEP CITY POKéMON GYM$" -MossdeepCity_Gym_Text_18D424:: @ 818D424 +MossdeepCity_Gym_Text_GymStatueCertified:: @ 818D424 .string "MOSSDEEP CITY POKéMON GYM\p" .string "LIZA AND TATE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index c765a04b6..a2abcb7dd 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House1_EventScript_15A82F", + "script": "MossdeepCity_House1_EventScript_BlackBelt", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House1_EventScript_15A85F", + "script": "MossdeepCity_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc index 585120fea..c1cd59633 100644 --- a/data/maps/MossdeepCity_House1/scripts.inc +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -1,23 +1,23 @@ MossdeepCity_House1_MapScripts:: @ 815A82E .byte 0 -MossdeepCity_House1_EventScript_15A82F:: @ 815A82F +MossdeepCity_House1_EventScript_BlackBelt:: @ 815A82F lock faceplayer bufferleadmonspeciesname 0 - msgbox MossdeepCity_House1_Text_18D465, MSGBOX_DEFAULT + msgbox MossdeepCity_House1_Text_HmmYourPokemon, MSGBOX_DEFAULT specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_House1_EventScript_15A855 - msgbox MossdeepCity_House1_Text_18D475, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_House1_EventScript_NeutralNature + msgbox MossdeepCity_House1_Text_ItLikesXPokeblocks, MSGBOX_DEFAULT release end -MossdeepCity_House1_EventScript_15A855:: @ 815A855 - msgbox MossdeepCity_House1_Text_18D4C0, MSGBOX_DEFAULT +MossdeepCity_House1_EventScript_NeutralNature:: @ 815A855 + msgbox MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks, MSGBOX_DEFAULT release end -MossdeepCity_House1_EventScript_15A85F:: @ 815A85F - msgbox MossdeepCity_House1_Text_18D4F1, MSGBOX_NPC +MossdeepCity_House1_EventScript_Woman:: @ 815A85F + msgbox MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes, MSGBOX_NPC end diff --git a/data/maps/MossdeepCity_House1/text.inc b/data/maps/MossdeepCity_House1/text.inc index ee5cb3fa8..38814b50f 100644 --- a/data/maps/MossdeepCity_House1/text.inc +++ b/data/maps/MossdeepCity_House1/text.inc @@ -1,17 +1,17 @@ -MossdeepCity_House1_Text_18D465:: @ 818D465 +MossdeepCity_House1_Text_HmmYourPokemon:: @ 818D465 .string "Hmm!\n" .string "Your {STR_VAR_1}...$" -MossdeepCity_House1_Text_18D475:: @ 818D475 +MossdeepCity_House1_Text_ItLikesXPokeblocks:: @ 818D475 .string "It likes {STR_VAR_1}S,\n" .string "doesn't it?\p" .string "No, I'm positive of it! It definitely\n" .string "likes {STR_VAR_1}S!$" -MossdeepCity_House1_Text_18D4C0:: @ 818D4C0 +MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks:: @ 818D4C0 .string "It doesn't appear to like or dislike\n" .string "any {POKEBLOCK}S.$" -MossdeepCity_House1_Text_18D4F1:: @ 818D4F1 +MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes:: @ 818D4F1 .string "My husband can tell what kind of\n" .string "{POKEBLOCK}S a POKéMON likes at a glance.$" diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 873f9f4d0..0658e24a3 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House2_EventScript_15A869", + "script": "MossdeepCity_House2_EventScript_Man", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House2_EventScript_15A872", + "script": "MossdeepCity_House2_EventScript_Twin", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House2_EventScript_15A87B", + "script": "MossdeepCity_House2_EventScript_Wingull", "flag": "FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE" } ], diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index c88f644d8..3a2c93fa4 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -1,43 +1,43 @@ MossdeepCity_House2_MapScripts:: @ 815A868 .byte 0 -MossdeepCity_House2_EventScript_15A869:: @ 815A869 - msgbox MossdeepCity_House2_Text_18D536, MSGBOX_NPC +MossdeepCity_House2_EventScript_Man:: @ 815A869 + msgbox MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree, MSGBOX_NPC end -MossdeepCity_House2_EventScript_15A872:: @ 815A872 - msgbox MossdeepCity_House2_Text_18D596, MSGBOX_NPC +MossdeepCity_House2_EventScript_Twin:: @ 815A872 + msgbox MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth, MSGBOX_NPC end -MossdeepCity_House2_EventScript_15A87B:: @ 815A87B +MossdeepCity_House2_EventScript_Wingull:: @ 815A87B lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox MossdeepCity_House2_Text_18D61E, MSGBOX_DEFAULT + msgbox MossdeepCity_House2_Text_Wingull, MSGBOX_DEFAULT waitmoncry closemessage setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE compare VAR_FACING, 2 - call_if_eq MossdeepCity_House2_EventScript_15A8AE + call_if_eq MossdeepCity_House2_EventScript_WingullExitNorth compare VAR_FACING, 3 - call_if_eq MossdeepCity_House2_EventScript_15A8B9 + call_if_eq MossdeepCity_House2_EventScript_WingullExitWest removeobject 3 release end -MossdeepCity_House2_EventScript_15A8AE:: @ 815A8AE - applymovement 3, MossdeepCity_House2_Movement_15A8C4 +MossdeepCity_House2_EventScript_WingullExitNorth:: @ 815A8AE + applymovement 3, MossdeepCity_House2_Movement_WingullExitNorth waitmovement 0 return -MossdeepCity_House2_EventScript_15A8B9:: @ 815A8B9 - applymovement 3, MossdeepCity_House2_Movement_15A8CB +MossdeepCity_House2_EventScript_WingullExitWest:: @ 815A8B9 + applymovement 3, MossdeepCity_House2_Movement_WingullExitEast waitmovement 0 return -MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4 +MossdeepCity_House2_Movement_WingullExitNorth:: @ 815A8C4 walk_fast_right walk_fast_down walk_fast_down @@ -46,7 +46,7 @@ MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4 delay_8 step_end -MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB +MossdeepCity_House2_Movement_WingullExitEast:: @ 815A8CB walk_fast_down walk_fast_down walk_fast_down diff --git a/data/maps/MossdeepCity_House2/text.inc b/data/maps/MossdeepCity_House2/text.inc index d3995ec61..3a1263811 100644 --- a/data/maps/MossdeepCity_House2/text.inc +++ b/data/maps/MossdeepCity_House2/text.inc @@ -1,14 +1,14 @@ -MossdeepCity_House2_Text_18D536:: @ 818D536 +MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree:: @ 818D536 .string "My little sister exchanges MAIL with\n" .string "her boyfriend in FORTREE.\p" .string "I don't envy her one bit at all.$" -MossdeepCity_House2_Text_18D596:: @ 818D596 +MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth:: @ 818D596 .string "Even though I can't see my friend in\n" .string "FORTREE, my POKéMON carries MAIL back\l" .string "and forth for us.\p" .string "I'm not lonesome, even though we're\n" .string "apart.$" -MossdeepCity_House2_Text_18D61E:: @ 818D61E +MossdeepCity_House2_Text_Wingull:: @ 818D61E .string "WINGULL: Pihyoh!$" diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index ac2093600..0a7288a2b 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House3_EventScript_15A972", + "script": "MossdeepCity_House3_EventScript_SuperRodFisherman", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index 68e3e28b2..e3fd48e4f 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -1,26 +1,26 @@ MossdeepCity_House3_MapScripts:: @ 815A971 .byte 0 -MossdeepCity_House3_EventScript_15A972:: @ 815A972 +MossdeepCity_House3_EventScript_SuperRodFisherman:: @ 815A972 lock faceplayer - goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_15A9B1 - msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_ReceivedSuperRod + msgbox MossdeepCity_House3_Text_YouWantSuperRod, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MossdeepCity_House3_EventScript_15A9BB - msgbox MossdeepCity_House3_Text_18D9A9, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_House3_EventScript_DeclineSuperRod + msgbox MossdeepCity_House3_Text_SuperRodIsSuper, MSGBOX_DEFAULT giveitem ITEM_SUPER_ROD setflag FLAG_RECEIVED_SUPER_ROD - msgbox MossdeepCity_House3_Text_18D9E3, MSGBOX_DEFAULT + msgbox MossdeepCity_House3_Text_TryDroppingRodInWater, MSGBOX_DEFAULT release end -MossdeepCity_House3_EventScript_15A9B1:: @ 815A9B1 - msgbox MossdeepCity_House3_Text_18DA44, MSGBOX_DEFAULT +MossdeepCity_House3_EventScript_ReceivedSuperRod:: @ 815A9B1 + msgbox MossdeepCity_House3_Text_GoAfterSeafloorPokemon, MSGBOX_DEFAULT release end -MossdeepCity_House3_EventScript_15A9BB:: @ 815A9BB - msgbox MossdeepCity_House3_Text_18DA26, MSGBOX_DEFAULT +MossdeepCity_House3_EventScript_DeclineSuperRod:: @ 815A9BB + msgbox MossdeepCity_House3_Text_DontYouLikeToFish, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_House3/text.inc b/data/maps/MossdeepCity_House3/text.inc index 7c4026279..52e55d82d 100644 --- a/data/maps/MossdeepCity_House3/text.inc +++ b/data/maps/MossdeepCity_House3/text.inc @@ -1,4 +1,4 @@ -MossdeepCity_House3_Text_18D909:: @ 818D909 +MossdeepCity_House3_Text_YouWantSuperRod:: @ 818D909 .string "Hey there, TRAINER!\n" .string "A SUPER ROD really is super!\p" .string "Say all you want, but this baby can\n" @@ -6,18 +6,18 @@ MossdeepCity_House3_Text_18D909:: @ 818D909 .string "What do you think?\n" .string "You want it, don't you?$" -MossdeepCity_House3_Text_18D9A9:: @ 818D9A9 +MossdeepCity_House3_Text_SuperRodIsSuper:: @ 818D9A9 .string "You bet, you bet!\n" .string "After all, a SUPER ROD is really super!$" -MossdeepCity_House3_Text_18D9E3:: @ 818D9E3 +MossdeepCity_House3_Text_TryDroppingRodInWater:: @ 818D9E3 .string "If there's any water, try dropping in\n" .string "your ROD and see what bites!$" -MossdeepCity_House3_Text_18DA26:: @ 818DA26 +MossdeepCity_House3_Text_DontYouLikeToFish:: @ 818DA26 .string "Hunh?\n" .string "Don't you like to fish?$" -MossdeepCity_House3_Text_18DA44:: @ 818DA44 +MossdeepCity_House3_Text_GoAfterSeafloorPokemon:: @ 818DA44 .string "Go after the seafloor POKéMON with\n" .string "your SUPER ROD.$" diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 29b9913f8..749cb3329 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House4_EventScript_15AB31", + "script": "MossdeepCity_House4_EventScript_Woman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House4_EventScript_15AB50", + "script": "MossdeepCity_House4_EventScript_NinjaBoy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_House4_EventScript_15AB77", + "script": "MossdeepCity_House4_EventScript_Delcatty", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index 42acadb4a..3087ac045 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -1,41 +1,41 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 .byte 0 -MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 +MossdeepCity_House4_EventScript_Woman:: @ 815AB31 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_15AB46 - msgbox MossdeepCity_House4_Text_18E0E3, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_CanBattleAtSecretBases + msgbox MossdeepCity_House4_Text_BrotherLikesToFindBases, MSGBOX_DEFAULT release end -MossdeepCity_House4_EventScript_15AB46:: @ 815AB46 - msgbox MossdeepCity_House4_Text_18E125, MSGBOX_DEFAULT +MossdeepCity_House4_EventScript_CanBattleAtSecretBases:: @ 815AB46 + msgbox MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle, MSGBOX_DEFAULT release end -MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 +MossdeepCity_House4_EventScript_NinjaBoy:: @ 815AB50 lock faceplayer special CheckPlayerHasSecretBase compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_House4_EventScript_15AB6D + goto_if_eq MossdeepCity_House4_EventScript_NoSecretBase special GetSecretBaseNearbyMapName - msgbox MossdeepCity_House4_Text_18E17E, MSGBOX_DEFAULT + msgbox MossdeepCity_House4_Text_YouMadeSecretBaseNearX, MSGBOX_DEFAULT release end -MossdeepCity_House4_EventScript_15AB6D:: @ 815AB6D - msgbox MossdeepCity_House4_Text_18E1A7, MSGBOX_DEFAULT +MossdeepCity_House4_EventScript_NoSecretBase:: @ 815AB6D + msgbox MossdeepCity_House4_Text_MakeSecretBase, MSGBOX_DEFAULT release end -MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 +MossdeepCity_House4_EventScript_Delcatty:: @ 815AB77 lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox MossdeepCity_House4_Text_18E1E1, MSGBOX_DEFAULT + msgbox MossdeepCity_House4_Text_Delcatty, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/MossdeepCity_House4/text.inc b/data/maps/MossdeepCity_House4/text.inc index 474b7e35f..4160095e7 100644 --- a/data/maps/MossdeepCity_House4/text.inc +++ b/data/maps/MossdeepCity_House4/text.inc @@ -1,19 +1,19 @@ -MossdeepCity_House4_Text_18E0E3:: @ 818E0E3 +MossdeepCity_House4_Text_BrotherLikesToFindBases:: @ 818E0E3 .string "My little brother says he likes to go\n" .string "find people's SECRET BASES.$" -MossdeepCity_House4_Text_18E125:: @ 818E125 +MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle:: @ 818E125 .string "My little brother says he likes to\n" .string "visit people's SECRET BASES and have\l" .string "POKéMON battles.$" -MossdeepCity_House4_Text_18E17E:: @ 818E17E +MossdeepCity_House4_Text_YouMadeSecretBaseNearX:: @ 818E17E .string "Was it you who made a SECRET BASE in\n" .string "{STR_VAR_1}?$" -MossdeepCity_House4_Text_18E1A7:: @ 818E1A7 +MossdeepCity_House4_Text_MakeSecretBase:: @ 818E1A7 .string "You should make a SECRET BASE\n" .string "somewhere. I'll go find it!$" -MossdeepCity_House4_Text_18E1E1:: @ 818E1E1 +MossdeepCity_House4_Text_Delcatty:: @ 818E1E1 .string "DELCATTY: Miyaan?$" diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 33d40ec36..cf21a1f59 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Mart_EventScript_15A926", + "script": "MossdeepCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Mart_EventScript_15A956", + "script": "MossdeepCity_Mart_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Mart_EventScript_15A95F", + "script": "MossdeepCity_Mart_EventScript_Boy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Mart_EventScript_15A968", + "script": "MossdeepCity_Mart_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index 5e28e192d..bf906ad09 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -1,18 +1,18 @@ MossdeepCity_Mart_MapScripts:: @ 815A925 .byte 0 -MossdeepCity_Mart_EventScript_15A926:: @ 815A926 +MossdeepCity_Mart_EventScript_Clerk:: @ 815A926 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart MossdeepCity_Mart_Items + pokemart MossdeepCity_Mart_Pokemart msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -MossdeepCity_Mart_Items:: @ 815A940 +MossdeepCity_Mart_Pokemart:: @ 815A940 .2byte ITEM_ULTRA_BALL .2byte ITEM_NET_BALL .2byte ITEM_DIVE_BALL @@ -26,14 +26,14 @@ MossdeepCity_Mart_Items:: @ 815A940 release end -MossdeepCity_Mart_EventScript_15A956:: @ 815A956 - msgbox MossdeepCity_Mart_Text_18D758, MSGBOX_NPC +MossdeepCity_Mart_EventScript_Woman:: @ 815A956 + msgbox MossdeepCity_Mart_Text_ReviveIsFantastic, MSGBOX_NPC end -MossdeepCity_Mart_EventScript_15A95F:: @ 815A95F - msgbox MossdeepCity_Mart_Text_18D7E7, MSGBOX_NPC +MossdeepCity_Mart_EventScript_Boy:: @ 815A95F + msgbox MossdeepCity_Mart_Text_MaxRepelLastsLongest, MSGBOX_NPC end -MossdeepCity_Mart_EventScript_15A968:: @ 815A968 - msgbox MossdeepCity_Mart_Text_18D841, MSGBOX_NPC +MossdeepCity_Mart_EventScript_Sailor:: @ 815A968 + msgbox MossdeepCity_Mart_Text_NetAndDiveBallsRare, MSGBOX_NPC end diff --git a/data/maps/MossdeepCity_Mart/text.inc b/data/maps/MossdeepCity_Mart/text.inc index ec627681b..322d9faaf 100644 --- a/data/maps/MossdeepCity_Mart/text.inc +++ b/data/maps/MossdeepCity_Mart/text.inc @@ -1,16 +1,16 @@ -MossdeepCity_Mart_Text_18D758:: @ 818D758 +MossdeepCity_Mart_Text_ReviveIsFantastic:: @ 818D758 .string "REVIVE is fantastic!\p" .string "Give it to a fainted POKéMON, and the\n" .string "POKéMON will arise.\p" .string "But be careful, REVIVE doesn't restore\n" .string "the used-up PP of moves.$" -MossdeepCity_Mart_Text_18D7E7:: @ 818D7E7 +MossdeepCity_Mart_Text_MaxRepelLastsLongest:: @ 818D7E7 .string "MAX REPEL keeps all weak POKéMON away.\p" .string "Out of all the REPEL sprays, it lasts\n" .string "the longest.$" -MossdeepCity_Mart_Text_18D841:: @ 818D841 +MossdeepCity_Mart_Text_NetAndDiveBallsRare:: @ 818D841 .string "The NET and DIVE BALLS are rare POKé\n" .string "BALLS that are only made in MOSSDEEP.\p" .string "A NET BALL is effective against\n" diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 1d881c91f..480030e6e 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_1F_EventScript_15A8DA", + "script": "MossdeepCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_1F_EventScript_15A8E8", + "script": "MossdeepCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_1F_EventScript_15A8F1", + "script": "MossdeepCity_PokemonCenter_1F_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index c0655f948..ee8bcd23a 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,12 +1,12 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition .byte 0 -MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 +MossdeepCity_PokemonCenter_1F_OnTransition:: @ 815A8D6 setrespawn HEAL_LOCATION_MOSSDEEP_CITY end -MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA +MossdeepCity_PokemonCenter_1F_EventScript_Nurse:: @ 815A8DA setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -14,10 +14,10 @@ MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA release end -MossdeepCity_PokemonCenter_1F_EventScript_15A8E8:: @ 815A8E8 - msgbox MossdeepCity_PokemonCenter_1F_Text_18D62F, MSGBOX_NPC +MossdeepCity_PokemonCenter_1F_EventScript_Woman:: @ 815A8E8 + msgbox MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable, MSGBOX_NPC end -MossdeepCity_PokemonCenter_1F_EventScript_15A8F1:: @ 815A8F1 - msgbox MossdeepCity_PokemonCenter_1F_Text_18D69A, MSGBOX_NPC +MossdeepCity_PokemonCenter_1F_EventScript_Girl:: @ 815A8F1 + msgbox MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves, MSGBOX_NPC end diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/text.inc b/data/maps/MossdeepCity_PokemonCenter_1F/text.inc index 5f345613e..25a4898e3 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/text.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -MossdeepCity_PokemonCenter_1F_Text_18D62F:: @ 818D62F +MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable:: @ 818D62F .string "The GYM LEADERS in this town are a\n" .string "formidable duo.\p" .string "Their combination attacks are, like,\n" .string "excellent and wow!$" -MossdeepCity_PokemonCenter_1F_Text_18D69A:: @ 818D69A +MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves:: @ 818D69A .string "Depending on the special abilities of\n" .string "POKéMON, some moves might change\l" .string "or not work at all.$" diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 2aac43f67..6de0ac460 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_15AB8B", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_15ABCC", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Scientist", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_15ABD5", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_15AC1F", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_OldMan", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_15AC16", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 02e1a8660..ec3efb0d0 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,60 +1,60 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 815AB8A .byte 0 -MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B +MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter:: @ 815AB8B lock faceplayer dotimebasedevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 - call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15ABBA + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet compare VAR_RESULT, 1 - call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_15ABBA:: @ 815ABBA - msgbox MossdeepCity_SpaceCenter_1F_Text_18E1F3, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet:: @ 815ABBA + msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_15ABC3:: @ 815ABC3 - msgbox MossdeepCity_SpaceCenter_1F_Text_18E214, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber:: @ 815ABC3 + msgbox MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC - msgbox MossdeepCity_SpaceCenter_1F_Text_18E251, MSGBOX_NPC +MossdeepCity_SpaceCenter_1F_EventScript_Scientist:: @ 815ABCC + msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection, MSGBOX_NPC end -MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 +MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan:: @ 815ABD5 lock faceplayer - goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_15AC0C - msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone + msgbox MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt, MSGBOX_DEFAULT giveitem ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP - msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_15AC0C:: @ 815AC0C - msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone:: @ 815AC0C + msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_15AC16:: @ 815AC16 - msgbox MossdeepCity_SpaceCenter_1F_Text_18E3E5, MSGBOX_NPC +MossdeepCity_SpaceCenter_1F_EventScript_Woman:: @ 815AC16 + msgbox MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace, MSGBOX_NPC end -MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F +MossdeepCity_SpaceCenter_1F_EventScript_OldMan:: @ 815AC1F lock faceplayer - msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/text.inc b/data/maps/MossdeepCity_SpaceCenter_1F/text.inc index f2c4996af..a775c8fc9 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/text.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/text.inc @@ -1,11 +1,11 @@ -MossdeepCity_SpaceCenter_1F_Text_18E1F3:: @ 818E1F3 +MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent:: @ 818E1F3 .string "The rocket's launch is imminent!$" -MossdeepCity_SpaceCenter_1F_Text_18E214:: @ 818E214 +MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber:: @ 818E214 .string "The rocket launched safely!\n" .string "That's successful launch no. {STR_VAR_1}!$" -MossdeepCity_SpaceCenter_1F_Text_18E251:: @ 818E251 +MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection:: @ 818E251 .string "A rocket launch demands perfection.\n" .string "Not even a 1% margin of error is allowed.\p" .string "Even if it's 99% okay, the whole thing\n" @@ -13,21 +13,21 @@ MossdeepCity_SpaceCenter_1F_Text_18E251:: @ 818E251 .string "Despite that, we never stop trying.\n" .string "Why? It's a dream that never ends.$" -MossdeepCity_SpaceCenter_1F_Text_18E335:: @ 818E335 +MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt:: @ 818E335 .string "I was taking a stroll down the beach\n" .string "when I found this.\p" .string "It's not anything I need, so you can\n" .string "have it.$" -MossdeepCity_SpaceCenter_1F_Text_18E39B:: @ 818E39B +MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers:: @ 818E39B .string "The HOENN region has been famous for \n" .string "its meteor showers for a long time.$" -MossdeepCity_SpaceCenter_1F_Text_18E3E5:: @ 818E3E5 +MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace:: @ 818E3E5 .string "Some people claim that POKéMON came\n" .string "from space. Could it be true?$" -MossdeepCity_SpaceCenter_1F_Text_18E427:: @ 818E427 +MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind:: @ 818E427 .string "A giant chunk of metal bursts through\n" .string "the skies and flies into space...\p" .string "It boggles my mind!$" diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 264b28b9b..65a4045d2 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_15AC49", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_RichBoy", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_15AC40", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Gentleman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_15AC37", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Scientist", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 65b82ad02..bd602f71f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -1,14 +1,14 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 815AC36 .byte 0 -MossdeepCity_SpaceCenter_2F_EventScript_15AC37:: @ 815AC37 - msgbox MossdeepCity_SpaceCenter_2F_Text_18E483, MSGBOX_NPC +MossdeepCity_SpaceCenter_2F_EventScript_Scientist:: @ 815AC37 + msgbox MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets, MSGBOX_NPC end -MossdeepCity_SpaceCenter_2F_EventScript_15AC40:: @ 815AC40 - msgbox MossdeepCity_SpaceCenter_2F_Text_18E4EE, MSGBOX_NPC +MossdeepCity_SpaceCenter_2F_EventScript_Gentleman:: @ 815AC40 + msgbox MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut, MSGBOX_NPC end -MossdeepCity_SpaceCenter_2F_EventScript_15AC49:: @ 815AC49 - msgbox MossdeepCity_SpaceCenter_2F_Text_18E564, MSGBOX_NPC +MossdeepCity_SpaceCenter_2F_EventScript_RichBoy:: @ 815AC49 + msgbox MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace, MSGBOX_NPC end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/text.inc b/data/maps/MossdeepCity_SpaceCenter_2F/text.inc index 032c8494a..6562735e6 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/text.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/text.inc @@ -1,15 +1,15 @@ -MossdeepCity_SpaceCenter_2F_Text_18E483:: @ 818E483 +MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets:: @ 818E483 .string "MOSSDEEP has mainly sunny weather,\n" .string "and its winds are stable.\p" .string "It's an ideal location for launching\n" .string "rockets.$" -MossdeepCity_SpaceCenter_2F_Text_18E4EE:: @ 818E4EE +MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut:: @ 818E4EE .string "If only I was a little younger, I would\n" .string "have liked being an astronaut...\p" .string "No... It's not too late!\n" .string "I can and will try!$" -MossdeepCity_SpaceCenter_2F_Text_18E564:: @ 818E564 +MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace:: @ 818E564 .string "I wish ordinary people could go into\n" .string "space one day...$" diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index 142009fcf..c59e40be4 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_StevensHouse_EventScript_15AAF9", + "script": "MossdeepCity_StevensHouse_EventScript_Steven", "flag": "FLAG_HIDE_STEVEN_STEVENS_HOUSE" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_StevensHouse_EventScript_15AA7C", + "script": "MossdeepCity_StevensHouse_EventScript_BeldumPokeball", "flag": "FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_StevensHouse_EventScript_15AB20", + "script": "MossdeepCity_StevensHouse_EventScript_DiveItemBall", "flag": "FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_StevensHouse_EventScript_15AB02", + "script": "MossdeepCity_StevensHouse_EventScript_Letter", "flag": "FLAG_HIDE_STEVENS_LETTER" } ], @@ -88,7 +88,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_StevensHouse_EventScript_15AAF0" + "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -96,7 +96,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_StevensHouse_EventScript_15AAF0" + "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -104,7 +104,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_StevensHouse_EventScript_15AAF0" + "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -112,7 +112,7 @@ "y": 6, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_StevensHouse_EventScript_15AAF0" + "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" } ] } diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index bc3c6b2f9..0369afa3c 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -1,32 +1,32 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_15A9D5 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_15A9E9 - map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_15AA01 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_OnFrame .byte 0 -MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF +MossdeepCity_StevensHouse_OnLoad:: @ 815A9D5 + call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_HideStevensNote end -MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF +MossdeepCity_StevensHouse_EventScript_HideStevensNote:: @ 815A9DF setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, 1 return -MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 +MossdeepCity_StevensHouse_OnTransition:: @ 815A9E9 compare VAR_STEVENS_HOUSE_STATE, 1 - call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5 + call_if_eq MossdeepCity_StevensHouse_EventScript_SetStevenPos end -MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 +MossdeepCity_StevensHouse_EventScript_SetStevenPos:: @ 815A9F5 setobjectxyperm 1, 6, 5 setobjectmovementtype 1, 7 return -MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 - map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_15AA0B +MossdeepCity_StevensHouse_OnFrame:: @ 815AA01 + map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_StevenGivesDive .2byte 0 -MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B +MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: @ 815AA0B lockall applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -35,22 +35,22 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E + applymovement 1, MossdeepCity_StevensHouse_Movement_StevenApproachPlayer waitmovement 0 - msgbox MossdeepCity_StevensHouse_Text_18DA77, MSGBOX_DEFAULT + msgbox MossdeepCity_StevensHouse_Text_YouveEarnedHMDive, MSGBOX_DEFAULT giveitem ITEM_HM08_DIVE setflag FLAG_RECEIVED_HM08 setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER - msgbox MossdeepCity_StevensHouse_Text_18DB22, MSGBOX_DEFAULT + msgbox MossdeepCity_StevensHouse_Text_ExplainDive, MSGBOX_DEFAULT closemessage delay 20 - applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76 + applymovement 1, MossdeepCity_StevensHouse_Movement_StevenReturn waitmovement 0 setvar VAR_STEVENS_HOUSE_STATE, 1 releaseall end -MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E +MossdeepCity_StevensHouse_Movement_StevenApproachPlayer:: @ 815AA6E walk_left walk_left walk_left @@ -60,7 +60,7 @@ MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E walk_in_place_fastest_down step_end -MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 +MossdeepCity_StevensHouse_Movement_StevenReturn:: @ 815AA76 walk_up walk_right walk_right @@ -68,23 +68,23 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 walk_in_place_fastest_up step_end -MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C +MossdeepCity_StevensHouse_EventScript_BeldumPokeball:: @ 815AA7C lockall - msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO + msgbox MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 + goto_if_eq MossdeepCity_StevensHouse_EventScript_LeaveBeldum getpartysize compare VAR_RESULT, 6 - goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC + goto_if_eq MossdeepCity_StevensHouse_EventScript_GiveBeldum copyvar VAR_0x8004, VAR_RESULT removeobject 2 playfanfare MUS_OBTAIN_ITEM - message MossdeepCity_StevensHouse_Text_18DD61 + message MossdeepCity_StevensHouse_Text_ObtainedBeldum waitfanfare waitmessage givemon SPECIES_BELDUM, 5, ITEM_NONE bufferspeciesname 1, SPECIES_BELDUM - msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO + msgbox gText_NicknameReceivedPokemon, MSGBOX_YESNO compare VAR_RESULT, YES call_if_eq Common_EventScript_NameReceivedPartyMon setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE @@ -92,37 +92,37 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C releaseall end -MossdeepCity_StevensHouse_EventScript_15AADC:: @ 815AADC - msgbox MossdeepCity_StevensHouse_Text_18DD77, MSGBOX_DEFAULT +MossdeepCity_StevensHouse_EventScript_GiveBeldum:: @ 815AADC + msgbox MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon, MSGBOX_DEFAULT releaseall end -MossdeepCity_StevensHouse_EventScript_15AAE6:: @ 815AAE6 - msgbox MossdeepCity_StevensHouse_Text_18DD9E, MSGBOX_DEFAULT +MossdeepCity_StevensHouse_EventScript_LeaveBeldum:: @ 815AAE6 + msgbox MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas, MSGBOX_DEFAULT releaseall end -MossdeepCity_StevensHouse_EventScript_15AAF0:: @ 815AAF0 - msgbox MossdeepCity_StevensHouse_Text_18E0A3, MSGBOX_SIGN +MossdeepCity_StevensHouse_EventScript_RockDisplay:: @ 815AAF0 + msgbox MossdeepCity_StevensHouse_Text_CollectionOfRareRocks, MSGBOX_SIGN end -MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 - msgbox MossdeepCity_StevensHouse_Text_18DC25, MSGBOX_NPC +MossdeepCity_StevensHouse_EventScript_Steven:: @ 815AAF9 + msgbox MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis, MSGBOX_NPC end -MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 +MossdeepCity_StevensHouse_EventScript_Letter:: @ 815AB02 lockall - goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16 - msgbox MossdeepCity_StevensHouse_Text_18DF1A, MSGBOX_DEFAULT + goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_LetterWithoutDive + msgbox MossdeepCity_StevensHouse_Text_LetterFromStevenWithDive, MSGBOX_DEFAULT releaseall end -MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 - msgbox MossdeepCity_StevensHouse_Text_18DDC2, MSGBOX_DEFAULT +MossdeepCity_StevensHouse_EventScript_LetterWithoutDive:: @ 815AB16 + msgbox MossdeepCity_StevensHouse_Text_LetterFromSteven, MSGBOX_DEFAULT releaseall end -MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 +MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 815AB20 finditem ITEM_HM08_DIVE setflag FLAG_RECEIVED_HM08 end diff --git a/data/maps/MossdeepCity_StevensHouse/text.inc b/data/maps/MossdeepCity_StevensHouse/text.inc index d1f483c20..2c7f30b7d 100644 --- a/data/maps/MossdeepCity_StevensHouse/text.inc +++ b/data/maps/MossdeepCity_StevensHouse/text.inc @@ -1,4 +1,4 @@ -MossdeepCity_StevensHouse_Text_18DA77:: @ 818DA77 +MossdeepCity_StevensHouse_Text_YouveEarnedHMDive:: @ 818DA77 .string "STEVEN: {PLAYER}{KUN}?\p" .string "Yes, this is my place. It's a little\n" .string "embarrassing how empty it is here.\p" @@ -6,7 +6,7 @@ MossdeepCity_StevensHouse_Text_18DA77:: @ 818DA77 .string "It contains DIVE.\n" .string "I've already taught my POKéMON.$" -MossdeepCity_StevensHouse_Text_18DB22:: @ 818DB22 +MossdeepCity_StevensHouse_Text_ExplainDive:: @ 818DB22 .string "STEVEN: While you're using SURF, you\n" .string "should notice dark patches of water.\p" .string "Use DIVE if you come to deep water\n" @@ -16,7 +16,7 @@ MossdeepCity_StevensHouse_Text_18DB22:: @ 818DB22 .string "In some places, it won't be possible\n" .string "for you to surface, though.$" -MossdeepCity_StevensHouse_Text_18DC25:: @ 818DC25 +MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis:: @ 818DC25 .string "STEVEN: Apparently, there's an\n" .string "underwater cavern between\l" .string "MOSSDEEP and SOOTOPOLIS.\p" @@ -26,23 +26,23 @@ MossdeepCity_StevensHouse_Text_18DC25:: @ 818DC25 .string "There might be some rare stones down\n" .string "there... I should go for a DIVE...$" -MossdeepCity_StevensHouse_Text_18DD12:: @ 818DD12 +MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum:: @ 818DD12 .string "{PLAYER} checked the POKé BALL.\p" .string "It contained the POKéMON\n" .string "BELDUM.\p" .string "Take the POKé BALL?$" -MossdeepCity_StevensHouse_Text_18DD61:: @ 818DD61 +MossdeepCity_StevensHouse_Text_ObtainedBeldum:: @ 818DD61 .string "{PLAYER} obtained a BELDUM.$" -MossdeepCity_StevensHouse_Text_18DD77:: @ 818DD77 +MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon:: @ 818DD77 .string "There is no space for another POKéMON.$" -MossdeepCity_StevensHouse_Text_18DD9E:: @ 818DD9E +MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas:: @ 818DD9E .string "{PLAYER} left the POKé BALL where\n" .string "it was.$" -MossdeepCity_StevensHouse_Text_18DDC2:: @ 818DDC2 +MossdeepCity_StevensHouse_Text_LetterFromSteven:: @ 818DDC2 .string "It's a letter.\p" .string "... ... ... ... ... ...\p" .string "To {PLAYER}{KUN}...\p" @@ -59,7 +59,7 @@ MossdeepCity_StevensHouse_Text_18DDC2:: @ 818DDC2 .string "May our paths cross some day.\p" .string "STEVEN STONE$" -MossdeepCity_StevensHouse_Text_18DF1A:: @ 818DF1A +MossdeepCity_StevensHouse_Text_LetterFromStevenWithDive:: @ 818DF1A .string "It's a letter.\p" .string "... ... ... ... ... ...\p" .string "To {PLAYER}{KUN}...\p" @@ -78,6 +78,6 @@ MossdeepCity_StevensHouse_Text_18DF1A:: @ 818DF1A .string "May our paths cross some day.\p" .string "STEVEN STONE$" -MossdeepCity_StevensHouse_Text_18E0A3:: @ 818E0A3 +MossdeepCity_StevensHouse_Text_CollectionOfRareRocks:: @ 818E0A3 .string "It's a collection of rare rocks and\n" .string "stones assembled by STEVEN.$" diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index beb50b6e5..4bf6273dc 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_14DDB3", + "script": "OldaleTown_EventScript_Girl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_14DDBC", + "script": "OldaleTown_EventScript_MartEmployee", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_14DEDF", + "script": "OldaleTown_EventScript_FootprintsMan", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_14DF30", + "script": "OldaleTown_EventScript_Rival", "flag": "FLAG_HIDE_RIVAL_OLDALE_TOWN" } ], @@ -118,7 +118,7 @@ "elevation": 3, "var": "VAR_ROUTE102_ACCESSIBLE", "var_value": "0", - "script": "OldaleTown_EventScript_14DEFF" + "script": "OldaleTown_EventScript_BlockedPath" }, { "type": "trigger", @@ -127,7 +127,7 @@ "elevation": 3, "var": "VAR_OLDALE_STATE", "var_value": "1", - "script": "OldaleTown_EventScript_14DF41" + "script": "OldaleTown_EventScript_RivalTrigger1" }, { "type": "trigger", @@ -136,7 +136,7 @@ "elevation": 3, "var": "VAR_OLDALE_STATE", "var_value": "1", - "script": "OldaleTown_EventScript_14DF5C" + "script": "OldaleTown_EventScript_RivalTrigger2" }, { "type": "trigger", @@ -145,7 +145,7 @@ "elevation": 3, "var": "VAR_OLDALE_STATE", "var_value": "1", - "script": "OldaleTown_EventScript_14DF77" + "script": "OldaleTown_EventScript_RivalTrigger3" } ], "bg_events": [ @@ -155,7 +155,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "OldaleTown_EventScript_14DDAA" + "script": "OldaleTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 6b3e86f6a..8e994c721 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -1,96 +1,96 @@ OldaleTown_MapScripts:: @ 814DD62 - map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_14DD68 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_OnTransition .byte 0 -OldaleTown_MapScript1_14DD68:: @ 814DD68 +OldaleTown_OnTransition:: @ 814DD68 call Common_EventScript_SetupRivalGfxId setflag FLAG_VISITED_OLDALE_TOWN - call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92 - call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E - call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C + call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_BlockWestEntrance + call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_MoveMartEmployee + call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_SetOldaleState end -OldaleTown_EventScript_14DD8C:: @ 814DD8C +OldaleTown_EventScript_SetOldaleState:: @ 814DD8C setvar VAR_ROUTE102_ACCESSIBLE, 1 return -OldaleTown_EventScript_14DD92:: @ 814DD92 +OldaleTown_EventScript_BlockWestEntrance:: @ 814DD92 setobjectxyperm 3, 1, 11 setobjectmovementtype 3, 9 return -OldaleTown_EventScript_14DD9E:: @ 814DD9E +OldaleTown_EventScript_MoveMartEmployee:: @ 814DD9E setobjectxyperm 2, 13, 14 setobjectmovementtype 2, 8 return -OldaleTown_EventScript_14DDAA:: @ 814DDAA - msgbox OldaleTown_Text_16B20E, MSGBOX_SIGN +OldaleTown_EventScript_TownSign:: @ 814DDAA + msgbox OldaleTown_Text_TownSign, MSGBOX_SIGN end -OldaleTown_EventScript_14DDB3:: @ 814DDB3 - msgbox OldaleTown_Text_16AEC0, MSGBOX_NPC +OldaleTown_EventScript_Girl:: @ 814DDB3 + msgbox OldaleTown_Text_SavingMyProgress, MSGBOX_NPC end -OldaleTown_EventScript_14DDBC:: @ 814DDBC +OldaleTown_EventScript_MartEmployee:: @ 814DDBC lock faceplayer - goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79 - goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79 + goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion + goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_ExplainPotion setflag FLAG_TEMP_1 playbgm MUS_FOLLOW_ME, FALSE - msgbox OldaleTown_Text_16AEF2, MSGBOX_DEFAULT + msgbox OldaleTown_Text_IWorkAtPokemonMart, MSGBOX_DEFAULT closemessage switch VAR_FACING - case 1, OldaleTown_EventScript_14DE07 - case 2, OldaleTown_EventScript_14DE1E - case 4, OldaleTown_EventScript_14DE35 + case 1, OldaleTown_EventScript_GoToMartSouth + case 2, OldaleTown_EventScript_GoToMartNorth + case 4, OldaleTown_EventScript_GoToMartEast end -OldaleTown_EventScript_14DE07:: @ 814DE07 - applymovement 2, OldaleTown_Movement_14DE97 - applymovement LOCALID_PLAYER, OldaleTown_Movement_14DEC1 +OldaleTown_EventScript_GoToMartSouth:: @ 814DE07 + applymovement 2, OldaleTown_Movement_EmployeeSouth + applymovement LOCALID_PLAYER, OldaleTown_Movement_PlayerSouth waitmovement 0 - goto OldaleTown_EventScript_14DE4C + goto OldaleTown_EventScript_ExplainPokemonMart end -OldaleTown_EventScript_14DE1E:: @ 814DE1E - applymovement 2, OldaleTown_Movement_14DEA2 - applymovement LOCALID_PLAYER, OldaleTown_Movement_14DECB +OldaleTown_EventScript_GoToMartNorth:: @ 814DE1E + applymovement 2, OldaleTown_Movement_EmployeeNorth + applymovement LOCALID_PLAYER, OldaleTown_Movement_PlayerNorth waitmovement 0 - goto OldaleTown_EventScript_14DE4C + goto OldaleTown_EventScript_ExplainPokemonMart end -OldaleTown_EventScript_14DE35:: @ 814DE35 - applymovement LOCALID_PLAYER, OldaleTown_Movement_14DEB9 - applymovement 2, OldaleTown_Movement_14DE8E +OldaleTown_EventScript_GoToMartEast:: @ 814DE35 + applymovement LOCALID_PLAYER, OldaleTown_Movement_PlayerEast + applymovement 2, OldaleTown_Movement_EmployeeEast waitmovement 0 - goto OldaleTown_EventScript_14DE4C + goto OldaleTown_EventScript_ExplainPokemonMart end -OldaleTown_EventScript_14DE4C:: @ 814DE4C - msgbox OldaleTown_Text_16AF2F, MSGBOX_DEFAULT +OldaleTown_EventScript_ExplainPokemonMart:: @ 814DE4C + msgbox OldaleTown_Text_ThisIsAPokemonMart, MSGBOX_DEFAULT giveitem ITEM_POTION compare VAR_RESULT, 0 - goto_if_eq OldaleTown_EventScript_14DE83 - msgbox OldaleTown_Text_16AFE1, MSGBOX_DEFAULT + goto_if_eq OldaleTown_EventScript_BagIsFull + msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT setflag FLAG_RECEIVED_POTION_OLDALE fadedefaultbgm release end -OldaleTown_EventScript_14DE79:: @ 814DE79 - msgbox OldaleTown_Text_16AFE1, MSGBOX_DEFAULT +OldaleTown_EventScript_ExplainPotion:: @ 814DE79 + msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT release end -OldaleTown_EventScript_14DE83:: @ 814DE83 +OldaleTown_EventScript_BagIsFull:: @ 814DE83 msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT fadedefaultbgm release end -OldaleTown_Movement_14DE8E:: @ 814DE8E +OldaleTown_Movement_EmployeeEast:: @ 814DE8E walk_up walk_up walk_up @@ -101,7 +101,7 @@ OldaleTown_Movement_14DE8E:: @ 814DE8E walk_in_place_fastest_down step_end -OldaleTown_Movement_14DE97:: @ 814DE97 +OldaleTown_Movement_EmployeeSouth:: @ 814DE97 walk_left walk_up walk_up @@ -114,7 +114,7 @@ OldaleTown_Movement_14DE97:: @ 814DE97 walk_in_place_fastest_down step_end -OldaleTown_Movement_14DEA2:: @ 814DEA2 +OldaleTown_Movement_EmployeeNorth:: @ 814DEA2 walk_up walk_up walk_up @@ -141,7 +141,7 @@ OldaleTown_Movement_14DEA2:: @ 814DEA2 walk_in_place_fastest_down step_end -OldaleTown_Movement_14DEB9:: @ 814DEB9 +OldaleTown_Movement_PlayerEast:: @ 814DEB9 walk_right walk_up walk_up @@ -151,7 +151,7 @@ OldaleTown_Movement_14DEB9:: @ 814DEB9 walk_up step_end -OldaleTown_Movement_14DEC1:: @ 814DEC1 +OldaleTown_Movement_PlayerSouth:: @ 814DEC1 delay_16 delay_16 delay_16 @@ -163,7 +163,7 @@ OldaleTown_Movement_14DEC1:: @ 814DEC1 walk_up step_end -OldaleTown_Movement_14DECB:: @ 814DECB +OldaleTown_Movement_PlayerNorth:: @ 814DECB walk_up walk_up walk_up @@ -187,89 +187,89 @@ OldaleTown_Movement_14DECB:: @ 814DECB walk_up step_end -OldaleTown_EventScript_14DEDF:: @ 814DEDF +OldaleTown_EventScript_FootprintsMan:: @ 814DEDF lock faceplayer - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26 - msgbox OldaleTown_Text_16B0CC, MSGBOX_DEFAULT + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_NotBlockingPath + msgbox OldaleTown_Text_DiscoveredFootprints, MSGBOX_DEFAULT closemessage applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end -OldaleTown_EventScript_14DEFF:: @ 814DEFF +OldaleTown_EventScript_BlockedPath:: @ 814DEFF lockall - applymovement LOCALID_PLAYER, OldaleTown_Movement_14DFEC - applymovement 3, OldaleTown_Movement_14DFEF + applymovement LOCALID_PLAYER, OldaleTown_Movement_PlayerStepBack + applymovement 3, OldaleTown_Movement_BackUp waitmovement 0 - msgbox OldaleTown_Text_16B045, MSGBOX_DEFAULT + msgbox OldaleTown_Text_WaitDontComeInHere, MSGBOX_DEFAULT closemessage - applymovement 3, OldaleTown_Movement_14DFF5 + applymovement 3, OldaleTown_Movement_ReturnToOriginalPosition waitmovement 0 releaseall end -OldaleTown_EventScript_14DF26:: @ 814DF26 - msgbox OldaleTown_Text_16B12A, MSGBOX_DEFAULT +OldaleTown_EventScript_NotBlockingPath:: @ 814DF26 + msgbox OldaleTown_Text_FinishedSketchingFootprints, MSGBOX_DEFAULT release end -OldaleTown_EventScript_14DF30:: @ 814DF30 +OldaleTown_EventScript_Rival:: @ 814DF30 lockall applymovement 4, Common_Movement_FacePlayer waitmovement 0 - goto OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_14DF41:: @ 814DF41 +OldaleTown_EventScript_RivalTrigger1:: @ 814DF41 lockall - applymovement 4, OldaleTown_Movement_14DFDE + applymovement 4, OldaleTown_Movement_RivalApproachPlayer1 waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - goto OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_14DF5C:: @ 814DF5C +OldaleTown_EventScript_RivalTrigger2:: @ 814DF5C lockall - applymovement 4, OldaleTown_Movement_14DFE1 + applymovement 4, OldaleTown_Movement_RivalApproachPlayer2 waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - goto OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_14DF77:: @ 814DF77 +OldaleTown_EventScript_RivalTrigger3:: @ 814DF77 lockall - applymovement 4, OldaleTown_Movement_14DFE3 + applymovement 4, OldaleTown_Movement_RivalApproachPlayer3 waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - goto OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_14DF92:: @ 814DF92 +OldaleTown_EventScript_ShowRivalMessage:: @ 814DF92 checkplayergender compare VAR_RESULT, 0 - goto_if_eq OldaleTown_EventScript_14DFAA + goto_if_eq OldaleTown_EventScript_ShowMayMessage compare VAR_RESULT, 1 - goto_if_eq OldaleTown_EventScript_14DFB8 + goto_if_eq OldaleTown_EventScript_ShowBrendanMessage end -OldaleTown_EventScript_14DFAA:: @ 814DFAA - msgbox OldaleTown_Text_16B196, MSGBOX_DEFAULT - goto OldaleTown_EventScript_14DFC6 +OldaleTown_EventScript_ShowMayMessage:: @ 814DFAA + msgbox OldaleTown_Text_MayLetsGoBack, MSGBOX_DEFAULT + goto OldaleTown_EventScript_RivalFinish end -OldaleTown_EventScript_14DFB8:: @ 814DFB8 - msgbox OldaleTown_Text_16B1BE, MSGBOX_DEFAULT - goto OldaleTown_EventScript_14DFC6 +OldaleTown_EventScript_ShowBrendanMessage:: @ 814DFB8 + msgbox OldaleTown_Text_BrendanLetsGoBack, MSGBOX_DEFAULT + goto OldaleTown_EventScript_RivalFinish end -OldaleTown_EventScript_14DFC6:: @ 814DFC6 +OldaleTown_EventScript_RivalFinish:: @ 814DFC6 closemessage - applymovement 4, OldaleTown_Movement_14DFE5 + applymovement 4, OldaleTown_Movement_RivalExit waitmovement 0 removeobject 4 setvar VAR_OLDALE_STATE, 2 @@ -277,20 +277,20 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 releaseall end -OldaleTown_Movement_14DFDE:: @ 814DFDE +OldaleTown_Movement_RivalApproachPlayer1:: @ 814DFDE walk_left walk_left step_end -OldaleTown_Movement_14DFE1:: @ 814DFE1 +OldaleTown_Movement_RivalApproachPlayer2:: @ 814DFE1 walk_left step_end -OldaleTown_Movement_14DFE3:: @ 814DFE3 +OldaleTown_Movement_RivalApproachPlayer3:: @ 814DFE3 face_left step_end -OldaleTown_Movement_14DFE5:: @ 814DFE5 +OldaleTown_Movement_RivalExit:: @ 814DFE5 walk_down walk_down walk_down @@ -299,12 +299,12 @@ OldaleTown_Movement_14DFE5:: @ 814DFE5 walk_down step_end -OldaleTown_Movement_14DFEC:: @ 814DFEC +OldaleTown_Movement_PlayerStepBack:: @ 814DFEC delay_8 walk_right step_end -OldaleTown_Movement_14DFEF:: @ 814DFEF +OldaleTown_Movement_BackUp:: @ 814DFEF walk_fast_up walk_in_place_fastest_left lock_facing_direction @@ -312,7 +312,7 @@ OldaleTown_Movement_14DFEF:: @ 814DFEF unlock_facing_direction step_end -OldaleTown_Movement_14DFF5:: @ 814DFF5 +OldaleTown_Movement_ReturnToOriginalPosition:: @ 814DFF5 walk_down walk_left step_end diff --git a/data/maps/OldaleTown/text.inc b/data/maps/OldaleTown/text.inc index 0f90eaac3..fb405e128 100644 --- a/data/maps/OldaleTown/text.inc +++ b/data/maps/OldaleTown/text.inc @@ -1,13 +1,13 @@ -OldaleTown_Text_16AEC0:: @ 816AEC0 +OldaleTown_Text_SavingMyProgress:: @ 816AEC0 .string "I want to take a rest, so I'm saving my\n" .string "progress.$" -OldaleTown_Text_16AEF2:: @ 816AEF2 +OldaleTown_Text_IWorkAtPokemonMart:: @ 816AEF2 .string "Hi!\n" .string "I work at a POKéMON MART.\p" .string "Can I get you to come with me?$" -OldaleTown_Text_16AF2F:: @ 816AF2F +OldaleTown_Text_ThisIsAPokemonMart:: @ 816AF2F .string "This is a POKéMON MART.\n" .string "Just look for our blue roof.\p" .string "We sell a variety of goods including\n" @@ -15,12 +15,12 @@ OldaleTown_Text_16AF2F:: @ 816AF2F .string "Here, I'd like you to have this as a\n" .string "promotional item.$" -OldaleTown_Text_16AFE1:: @ 816AFE1 +OldaleTown_Text_PotionExplanation:: @ 816AFE1 .string "A POTION can be used anytime, so it's\n" .string "even more useful than a POKéMON CENTER\l" .string "in certain situations.$" -OldaleTown_Text_16B045:: @ 816B045 +OldaleTown_Text_WaitDontComeInHere:: @ 816B045 .string "Aaaaah! Wait!\n" .string "Please don't come in here.\p" .string "I just discovered the footprints of\n" @@ -28,28 +28,28 @@ OldaleTown_Text_16B045:: @ 816B045 .string "Wait until I finish sketching\n" .string "them, okay?$" -OldaleTown_Text_16B0CC:: @ 816B0CC +OldaleTown_Text_DiscoveredFootprints:: @ 816B0CC .string "I just discovered the footprints of\n" .string "a rare POKéMON!\p" .string "Wait until I finish sketching\n" .string "them, okay?$" -OldaleTown_Text_16B12A:: @ 816B12A +OldaleTown_Text_FinishedSketchingFootprints:: @ 816B12A .string "I finished sketching the footprints of\n" .string "a rare POKéMON.\p" .string "But it turns out they were only my\n" .string "own footprints...$" -OldaleTown_Text_16B196:: @ 816B196 +OldaleTown_Text_MayLetsGoBack:: @ 816B196 .string "MAY: {PLAYER}{KUN}!\n" .string "Over here!\l" .string "Let's hurry home!$" -OldaleTown_Text_16B1BE:: @ 816B1BE +OldaleTown_Text_BrendanLetsGoBack:: @ 816B1BE .string "BRENDAN: I'm heading back to my dad's\n" .string "LAB now.\l" .string "{PLAYER}, you should hustle back, too.$" -OldaleTown_Text_16B20E:: @ 816B20E +OldaleTown_Text_TownSign:: @ 816B20E .string "OLDALE TOWN\n" .string "“Where things start off scarce.”$" diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index a78bdef82..f20ad3a7e 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_House1_EventScript_152EEC", + "script": "OldaleTown_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc index 96cc583a5..695b915d1 100644 --- a/data/maps/OldaleTown_House1/scripts.inc +++ b/data/maps/OldaleTown_House1/scripts.inc @@ -1,6 +1,6 @@ OldaleTown_House1_MapScripts:: @ 8152EEB .byte 0 -OldaleTown_House1_EventScript_152EEC:: @ 8152EEC - msgbox OldaleTown_House1_Text_17476D, MSGBOX_NPC +OldaleTown_House1_EventScript_Woman:: @ 8152EEC + msgbox OldaleTown_House1_Text_LeftPokemonGoesOutFirst, MSGBOX_NPC end diff --git a/data/maps/OldaleTown_House1/text.inc b/data/maps/OldaleTown_House1/text.inc index 943003b97..2c12e5d18 100644 --- a/data/maps/OldaleTown_House1/text.inc +++ b/data/maps/OldaleTown_House1/text.inc @@ -1,4 +1,4 @@ -OldaleTown_House1_Text_17476D:: @ 817476D +OldaleTown_House1_Text_LeftPokemonGoesOutFirst:: @ 817476D .string "When a POKéMON battle starts, the one\n" .string "at the left of the list goes out first.\p" .string "So, when you get more POKéMON in your\n" diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index f3be0dab0..edbc661a9 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_House2_EventScript_152EF6", + "script": "OldaleTown_House2_EventScript_Woman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_House2_EventScript_152EFF", + "script": "OldaleTown_House2_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc index a8679e59f..85c4a3928 100644 --- a/data/maps/OldaleTown_House2/scripts.inc +++ b/data/maps/OldaleTown_House2/scripts.inc @@ -1,10 +1,10 @@ OldaleTown_House2_MapScripts:: @ 8152EF5 .byte 0 -OldaleTown_House2_EventScript_152EF6:: @ 8152EF6 - msgbox OldaleTown_House2_Text_174838, MSGBOX_NPC +OldaleTown_House2_EventScript_Woman:: @ 8152EF6 + msgbox OldaleTown_House2_Text_PokemonLevelUp, MSGBOX_NPC end -OldaleTown_House2_EventScript_152EFF:: @ 8152EFF - msgbox OldaleTown_House2_Text_17487B, MSGBOX_NPC +OldaleTown_House2_EventScript_Man:: @ 8152EFF + msgbox OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon, MSGBOX_NPC end diff --git a/data/maps/OldaleTown_House2/text.inc b/data/maps/OldaleTown_House2/text.inc index f4da1846f..401509253 100644 --- a/data/maps/OldaleTown_House2/text.inc +++ b/data/maps/OldaleTown_House2/text.inc @@ -1,8 +1,8 @@ -OldaleTown_House2_Text_174838:: @ 8174838 +OldaleTown_House2_Text_PokemonLevelUp:: @ 8174838 .string "When POKéMON battle, they eventually\n" .string "level up and become stronger.$" -OldaleTown_House2_Text_17487B:: @ 817487B +OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon:: @ 817487B .string "If the POKéMON with you become\n" .string "stronger, you'll be able to go farther\l" .string "away from here.$" diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index 9059379fb..f7ec18d48 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_Mart_EventScript_152F79", + "script": "OldaleTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_Mart_EventScript_152FC6", + "script": "OldaleTown_Mart_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_Mart_EventScript_152FE5", + "script": "OldaleTown_Mart_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index 4edec1843..cf4f4eccd 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -1,19 +1,19 @@ OldaleTown_Mart_MapScripts:: @ 8152F78 .byte 0 -OldaleTown_Mart_EventScript_152F79:: @ 8152F79 +OldaleTown_Mart_EventScript_Clerk:: @ 8152F79 lock faceplayer message Text_HowMayIServeYou waitmessage - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FA8 - pokemart OldaleTown_Mart_Items1 + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_ExpandedItems + pokemart OldaleTown_Mart_Pokemart_Basic msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -OldaleTown_Mart_Items1:: @ 8152F9C +OldaleTown_Mart_Pokemart_Basic:: @ 8152F9C .2byte ITEM_POTION .2byte ITEM_ANTIDOTE .2byte ITEM_PARALYZE_HEAL @@ -22,14 +22,14 @@ OldaleTown_Mart_Items1:: @ 8152F9C release end -OldaleTown_Mart_EventScript_152FA8:: @ 8152FA8 - pokemart OldaleTown_Mart_Items2 +OldaleTown_Mart_ExpandedItems:: @ 8152FA8 + pokemart OldaleTown_Mart_Pokemart_Expanded msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -OldaleTown_Mart_Items2:: @ 8152FB8 +OldaleTown_Mart_Pokemart_Expanded:: @ 8152FB8 .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE @@ -39,19 +39,19 @@ OldaleTown_Mart_Items2:: @ 8152FB8 release end -OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 +OldaleTown_Mart_EventScript_Woman:: @ 8152FC6 lock faceplayer - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FDB - msgbox OldaleTown_Mart_Text_174A8A, MSGBOX_DEFAULT + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_PokeBallsInStock + msgbox OldaleTown_Mart_Text_PokeBallsAreSoldOut, MSGBOX_DEFAULT release end -OldaleTown_Mart_EventScript_152FDB:: @ 8152FDB - msgbox OldaleTown_Mart_Text_174ACB, MSGBOX_DEFAULT +OldaleTown_Mart_EventScript_PokeBallsInStock:: @ 8152FDB + msgbox OldaleTown_Mart_Text_ImGoingToBuyPokeBalls, MSGBOX_DEFAULT release end -OldaleTown_Mart_EventScript_152FE5:: @ 8152FE5 - msgbox OldaleTown_Mart_Text_174B10, MSGBOX_NPC +OldaleTown_Mart_EventScript_Boy:: @ 8152FE5 + msgbox OldaleTown_Mart_Text_RestoreHPWithPotion, MSGBOX_NPC end diff --git a/data/maps/OldaleTown_Mart/text.inc b/data/maps/OldaleTown_Mart/text.inc index f3164c1f7..8ab6bfdec 100644 --- a/data/maps/OldaleTown_Mart/text.inc +++ b/data/maps/OldaleTown_Mart/text.inc @@ -1,12 +1,12 @@ -OldaleTown_Mart_Text_174A8A:: @ 8174A8A +OldaleTown_Mart_Text_PokeBallsAreSoldOut:: @ 8174A8A .string "The clerk says they're all sold out.\n" .string "I can't buy any POKé BALLS.$" -OldaleTown_Mart_Text_174ACB:: @ 8174ACB +OldaleTown_Mart_Text_ImGoingToBuyPokeBalls:: @ 8174ACB .string "I'm going to buy a bunch of POKé BALLS\n" .string "and catch a bunch of POKéMON!$" -OldaleTown_Mart_Text_174B10:: @ 8174B10 +OldaleTown_Mart_Text_RestoreHPWithPotion:: @ 8174B10 .string "If a POKéMON gets hurt and loses its HP\n" .string "and faints, it won't be able to battle.\p" .string "To prevent your POKéMON from fainting,\n" diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index b893adf35..348384b86 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_152F17", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_152F25", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_152F2E", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_152F37", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index c91239d86..17c6862a0 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,13 +1,13 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 - map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_152F0E + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition .byte 0 -OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E +OldaleTown_PokemonCenter_1F_OnTransition:: @ 8152F0E setrespawn HEAL_LOCATION_OLDALE_TOWN call Common_EventScript_UpdateBrineyLocation end -OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 +OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 8152F17 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,23 +15,23 @@ OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 release end -OldaleTown_PokemonCenter_1F_EventScript_152F25:: @ 8152F25 - msgbox OldaleTown_PokemonCenter_1F_Text_1748D1, MSGBOX_NPC +OldaleTown_PokemonCenter_1F_EventScript_Gentleman:: @ 8152F25 + msgbox OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC, MSGBOX_NPC end -OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E - msgbox OldaleTown_PokemonCenter_1F_Text_174945, MSGBOX_NPC +OldaleTown_PokemonCenter_1F_EventScript_Boy:: @ 8152F2E + msgbox OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat, MSGBOX_NPC end -OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 +OldaleTown_PokemonCenter_1F_EventScript_Girl:: @ 8152F37 lock faceplayer - goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_152F4C - msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable + msgbox OldaleTown_PokemonCenter_1F_Text_CableClubNotAvailable, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_1F_EventScript_152F4C:: @ 8152F4C - msgbox OldaleTown_PokemonCenter_1F_Text_174A2E, MSGBOX_DEFAULT +OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable:: @ 8152F4C + msgbox OldaleTown_PokemonCenter_1F_Text_TradedInCableClub, MSGBOX_DEFAULT release end diff --git a/data/maps/OldaleTown_PokemonCenter_1F/text.inc b/data/maps/OldaleTown_PokemonCenter_1F/text.inc index 59c037f9e..86599f88a 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/text.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/text.inc @@ -1,22 +1,22 @@ -OldaleTown_PokemonCenter_1F_Text_1748D1:: @ 81748D1 +OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC:: @ 81748D1 .string "That PC in the corner there is\n" .string "for any POKéMON TRAINER to use.\p" .string "Naturally, that means you're welcome\n" .string "to use it, too.$" -OldaleTown_PokemonCenter_1F_Text_174945:: @ 8174945 +OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat:: @ 8174945 .string "POKéMON CENTERS are great!\p" .string "You can use their services as much\n" .string "as you like, and it's all for free.\l" .string "You never have to worry!$" -OldaleTown_PokemonCenter_1F_Text_1749C0:: @ 81749C0 +OldaleTown_PokemonCenter_1F_Text_CableClubNotAvailable:: @ 81749C0 .string "The POKéMON CABLE CLUB on the second\n" .string "floor was built recently.\p" .string "But they say they're still making\n" .string "adjustments.$" -OldaleTown_PokemonCenter_1F_Text_174A2E:: @ 8174A2E +OldaleTown_PokemonCenter_1F_Text_TradedInCableClub:: @ 8174A2E .string "The POKéMON CABLE CLUB on the second\n" .string "floor was built recently.\p" .string "I traded POKéMON right away.$" diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 538f74e87..b8ba6e5f6 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -32,7 +32,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_14E909", + "script": "PacifidlogTown_EventScript_Girl", "flag": "0" }, { @@ -45,7 +45,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_14E912", + "script": "PacifidlogTown_EventScript_Fisherman", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_14E900", + "script": "PacifidlogTown_EventScript_NinjaBoy", "flag": "0" } ], @@ -122,7 +122,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PacifidlogTown_EventScript_14E91B" + "script": "PacifidlogTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 4c77ce15b..03f41b4ca 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,28 +1,28 @@ PacifidlogTown_MapScripts:: @ 814E8EE - map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_14E8F9 - map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_14E8FD + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_OnTransition + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_OnResume .byte 0 -PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9 +PacifidlogTown_OnTransition:: @ 814E8F9 setflag FLAG_VISITED_PACIFIDLOG_TOWN end -PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD +PacifidlogTown_OnResume:: @ 814E8FD setstepcallback 3 end -PacifidlogTown_EventScript_14E900:: @ 814E900 - msgbox PacifidlogTown_Text_16D04A, MSGBOX_NPC +PacifidlogTown_EventScript_NinjaBoy:: @ 814E900 + msgbox PacifidlogTown_Text_NeatHousesOnWater, MSGBOX_NPC end -PacifidlogTown_EventScript_14E909:: @ 814E909 - msgbox PacifidlogTown_Text_16CFC5, MSGBOX_NPC +PacifidlogTown_EventScript_Girl:: @ 814E909 + msgbox PacifidlogTown_Text_FastRunningCurrent, MSGBOX_NPC end -PacifidlogTown_EventScript_14E912:: @ 814E912 - msgbox PacifidlogTown_Text_16D08A, MSGBOX_NPC +PacifidlogTown_EventScript_Fisherman:: @ 814E912 + msgbox PacifidlogTown_Text_FishAndDiveLifestyle, MSGBOX_NPC end -PacifidlogTown_EventScript_14E91B:: @ 814E91B - msgbox PacifidlogTown_Text_16D0CE, MSGBOX_SIGN +PacifidlogTown_EventScript_TownSign:: @ 814E91B + msgbox PacifidlogTown_Text_TownSign, MSGBOX_SIGN end diff --git a/data/maps/PacifidlogTown/text.inc b/data/maps/PacifidlogTown/text.inc index 938f766d6..e590e4606 100644 --- a/data/maps/PacifidlogTown/text.inc +++ b/data/maps/PacifidlogTown/text.inc @@ -1,19 +1,19 @@ -PacifidlogTown_Text_16CFC5:: @ 816CFC5 +PacifidlogTown_Text_FastRunningCurrent:: @ 816CFC5 .string "The sea between PACIFIDLOG and\n" .string "SLATEPORT has a fast-running tide.\p" .string "If you decide to SURF, you could end\n" .string "up swept away somewhere else.$" -PacifidlogTown_Text_16D04A:: @ 816D04A +PacifidlogTown_Text_NeatHousesOnWater:: @ 816D04A .string "See, isn't it neat?\n" .string "These houses are on water!\p" .string "I was born here!$" -PacifidlogTown_Text_16D08A:: @ 816D08A +PacifidlogTown_Text_FishAndDiveLifestyle:: @ 816D08A .string "The folks of PACIFIDLOG all fish and\n" .string "dive as part of the lifestyle.$" -PacifidlogTown_Text_16D0CE:: @ 816D0CE +PacifidlogTown_Text_TownSign:: @ 816D0CE .string "PACIFIDLOG TOWN\p" .string "“Where the morning sun smiles upon\n" .string "the waters.”$" diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index b532592b2..f0e8951de 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House1_EventScript_154155", + "script": "PacifidlogTown_House1_EventScript_Man", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House1_EventScript_15415E", + "script": "PacifidlogTown_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc index eb0d30057..9c8e45a20 100644 --- a/data/maps/PacifidlogTown_House1/scripts.inc +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -1,10 +1,10 @@ PacifidlogTown_House1_MapScripts:: @ 8154154 .byte 0 -PacifidlogTown_House1_EventScript_154155:: @ 8154155 - msgbox PacifidlogTown_House1_Text_178F9F, MSGBOX_NPC +PacifidlogTown_House1_EventScript_Man:: @ 8154155 + msgbox PacifidlogTown_House1_Text_RegiStory, MSGBOX_NPC end -PacifidlogTown_House1_EventScript_15415E:: @ 815415E - msgbox PacifidlogTown_House1_Text_17906A, MSGBOX_NPC +PacifidlogTown_House1_EventScript_Woman:: @ 815415E + msgbox PacifidlogTown_House1_Text_SixDotsOpenThreeDoors, MSGBOX_NPC end diff --git a/data/maps/PacifidlogTown_House1/text.inc b/data/maps/PacifidlogTown_House1/text.inc index 09b57731b..9fb1ec66d 100644 --- a/data/maps/PacifidlogTown_House1/text.inc +++ b/data/maps/PacifidlogTown_House1/text.inc @@ -1,4 +1,4 @@ -PacifidlogTown_House1_Text_178F9F:: @ 8178F9F +PacifidlogTown_House1_Text_RegiStory:: @ 8178F9F .string "In the HOENN region, there are three\n" .string "POKéMON that represent the power of\l" .string "rock, ice, and steel.\p" @@ -7,7 +7,7 @@ PacifidlogTown_House1_Text_178F9F:: @ 8178F9F .string "That's the story I heard when I was\n" .string "just a little kid.$" -PacifidlogTown_House1_Text_17906A:: @ 817906A +PacifidlogTown_House1_Text_SixDotsOpenThreeDoors:: @ 817906A .string "“Six dots open three doors.”\p" .string "Grandpa used to say that, but I don't\n" .string "know what he meant.$" diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index a8e8c8cf9..f923707e1 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_154168", + "script": "PacifidlogTown_House2_EventScript_FanClubYoungerBrother", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_154267", + "script": "PacifidlogTown_House2_EventScript_HappyAzurill", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_154282", + "script": "PacifidlogTown_House2_EventScript_UnhappyAzurill", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 8e20d83a6..f1ef4aead 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -1,96 +1,96 @@ PacifidlogTown_House2_MapScripts:: @ 8154167 .byte 0 -PacifidlogTown_House2_EventScript_154168:: @ 8154168 +PacifidlogTown_House2_EventScript_FanClubYoungerBrother:: @ 8154168 lock faceplayer dotimebasedevents - call PacifidlogTown_House2_EventScript_1541B4 - goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_154254 - call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541CE - call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541D7 + call PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag + goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_ComeBackInXDays + call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_MonAssessment + call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_FirstMonAssessment setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if_ge PacifidlogTown_House2_EventScript_1541EC + goto_if_ge PacifidlogTown_House2_EventScript_GiveReturn specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 - goto_if_ge PacifidlogTown_House2_EventScript_15421B - goto PacifidlogTown_House2_EventScript_154225 + goto_if_ge PacifidlogTown_House2_EventScript_PutInEffort + goto PacifidlogTown_House2_EventScript_GiveFrustration end -PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 +PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag:: @ 81541B4 goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_Return specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 - call_if_eq PacifidlogTown_House2_EventScript_1541E8 + call_if_eq PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM return -PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE - msgbox PacifidlogTown_House2_Text_179155, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_MonAssessment:: @ 81541CE + msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT return -PacifidlogTown_House2_EventScript_1541D7:: @ 81541D7 - msgbox PacifidlogTown_House2_Text_1790C1, MSGBOX_DEFAULT - msgbox PacifidlogTown_House2_Text_179155, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_FirstMonAssessment:: @ 81541D7 + msgbox PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT return -PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 +PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM:: @ 81541E8 clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK return -PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC - msgbox PacifidlogTown_House2_Text_179169, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_GiveReturn:: @ 81541EC + msgbox PacifidlogTown_House2_Text_AdoringPokemonTakeThis, MSGBOX_DEFAULT giveitem ITEM_TM27_RETURN compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_179283, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_15421B:: @ 815421B - msgbox PacifidlogTown_House2_Text_1791CA, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_PutInEffort:: @ 815421B + msgbox PacifidlogTown_House2_Text_PutInSomeMoreEffort, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_154225:: @ 8154225 - msgbox PacifidlogTown_House2_Text_17922D, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_GiveFrustration:: @ 8154225 + msgbox PacifidlogTown_House2_Text_ViciousPokemonTakeThis, MSGBOX_DEFAULT giveitem ITEM_TM21_FRUSTRATION compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_179283, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_154254:: @ 8154254 +PacifidlogTown_House2_EventScript_ComeBackInXDays:: @ 8154254 specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, VAR_RESULT - msgbox PacifidlogTown_House2_Text_1792F2, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_GetGoodTMInXDays, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_154267:: @ 8154267 +PacifidlogTown_House2_EventScript_HappyAzurill:: @ 8154267 lock faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox PacifidlogTown_House2_Text_17938B, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_Rurii, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_17939B, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_VeryFriendlyWithTrainer, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_154282:: @ 8154282 +PacifidlogTown_House2_EventScript_UnhappyAzurill:: @ 8154282 lock faceplayer waitse playmoncry SPECIES_AZURILL, 2 - msgbox PacifidlogTown_House2_Text_1793CC, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_Rururi, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_1793DD, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown_House2/text.inc b/data/maps/PacifidlogTown_House2/text.inc index 6fdad7512..5c3225633 100644 --- a/data/maps/PacifidlogTown_House2/text.inc +++ b/data/maps/PacifidlogTown_House2/text.inc @@ -1,4 +1,4 @@ -PacifidlogTown_House2_Text_1790C1:: @ 81790C1 +PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation:: @ 81790C1 .string "Er-hem!\p" .string "I am the POKéMON FAN CLUB's most\n" .string "important person, the CHAIRMAN's\l" @@ -6,49 +6,49 @@ PacifidlogTown_House2_Text_1790C1:: @ 81790C1 .string "I'm here enjoying my vacation with\n" .string "POKéMON, yes, indeed.$" -PacifidlogTown_House2_Text_179155:: @ 8179155 +PacifidlogTown_House2_Text_AhYourPokemon:: @ 8179155 .string "Ah!\n" .string "Your POKéMON...$" -PacifidlogTown_House2_Text_179169:: @ 8179169 +PacifidlogTown_House2_Text_AdoringPokemonTakeThis:: @ 8179169 .string "It clearly likes you very much.\p" .string "A POKéMON that adoring and adorable\n" .string "deserves a TM like this, no?$" -PacifidlogTown_House2_Text_1791CA:: @ 81791CA +PacifidlogTown_House2_Text_PutInSomeMoreEffort:: @ 81791CA .string "Hmm...\n" .string "It's not bad, but it's also not good.\p" .string "You, as the TRAINER, need to put in\n" .string "some more effort.$" -PacifidlogTown_House2_Text_17922D:: @ 817922D +PacifidlogTown_House2_Text_ViciousPokemonTakeThis:: @ 817922D .string "It has a vicious look to it.\p" .string "A frightening POKéMON like that\n" .string "deserves a TM like this.$" -PacifidlogTown_House2_Text_179283:: @ 8179283 +PacifidlogTown_House2_Text_ExplainReturnFrustration:: @ 8179283 .string "If a POKéMON likes you a lot, RETURN's\n" .string "power is enhanced.\p" .string "If it doesn't like you, FRUSTRATION's\n" .string "power goes up.$" -PacifidlogTown_House2_Text_1792F2:: @ 81792F2 +PacifidlogTown_House2_Text_GetGoodTMInXDays:: @ 81792F2 .string "Oh, yes. In about {STR_VAR_1} or so days,\n" .string "I should be getting a good TM or two.\p" .string "You should come see me then.\n" .string "I'll give you a TM that's suitable for\l" .string "your POKéMON.$" -PacifidlogTown_House2_Text_17938B:: @ 817938B +PacifidlogTown_House2_Text_Rurii:: @ 817938B .string "AZURILL: Rurii.$" -PacifidlogTown_House2_Text_17939B:: @ 817939B +PacifidlogTown_House2_Text_VeryFriendlyWithTrainer:: @ 817939B .string "It appears to be very friendly with the\n" .string "TRAINER.$" -PacifidlogTown_House2_Text_1793CC:: @ 81793CC +PacifidlogTown_House2_Text_Rururi:: @ 81793CC .string "AZURILL: Rururi!$" -PacifidlogTown_House2_Text_1793DD:: @ 81793DD +PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch:: @ 81793DD .string "It doesn't appear to like the TRAINER\n" .string "very much.$" diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index f623d5dc9..a50e74265 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House3_EventScript_154342", + "script": "PacifidlogTown_House3_EventScript_Girl", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House3_EventScript_15429E", + "script": "PacifidlogTown_House3_EventScript_Trader", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index fdb64f50a..c2398630f 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -1,54 +1,54 @@ PacifidlogTown_House3_MapScripts:: @ 815429D .byte 0 -PacifidlogTown_House3_EventScript_15429E:: @ 815429E +PacifidlogTown_House3_EventScript_Trader:: @ 815429E lock faceplayer - goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_154338 + goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_TradeCompleted setvar VAR_0x8008, 2 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox PacifidlogTown_House3_Text_17940E, MSGBOX_YESNO + msgbox PacifidlogTown_House3_Text_WillingToTradeIt, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq PacifidlogTown_House3_EventScript_154320 + goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade special SelectMonForNPCTrade waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq PacifidlogTown_House3_EventScript_154320 + goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne PacifidlogTown_House3_EventScript_15432A + goto_if_ne PacifidlogTown_House3_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_1794C4, MSGBOX_DEFAULT + msgbox PacifidlogTown_House3_Text_MonIsSoFluffy, MSGBOX_DEFAULT setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release end -PacifidlogTown_House3_EventScript_154320:: @ 8154320 - msgbox PacifidlogTown_House3_Text_1794ED, MSGBOX_DEFAULT +PacifidlogTown_House3_EventScript_DeclineTrade:: @ 8154320 + msgbox PacifidlogTown_House3_Text_ImDisappointed, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_15432A:: @ 815432A +PacifidlogTown_House3_EventScript_NotRequestedMon:: @ 815432A bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_1794DF, MSGBOX_DEFAULT + msgbox PacifidlogTown_House3_Text_ThatsNoMon, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_154338:: @ 8154338 - msgbox PacifidlogTown_House3_Text_17950A, MSGBOX_DEFAULT +PacifidlogTown_House3_EventScript_TradeCompleted:: @ 8154338 + msgbox PacifidlogTown_House3_Text_NowWereFriends, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_154342:: @ 8154342 - msgbox PacifidlogTown_House3_Text_179541, MSGBOX_NPC +PacifidlogTown_House3_EventScript_Girl:: @ 8154342 + msgbox PacifidlogTown_House3_Text_IsThatAPokedex, MSGBOX_NPC end diff --git a/data/maps/PacifidlogTown_House3/text.inc b/data/maps/PacifidlogTown_House3/text.inc index ff99c46b5..00864e252 100644 --- a/data/maps/PacifidlogTown_House3/text.inc +++ b/data/maps/PacifidlogTown_House3/text.inc @@ -1,4 +1,4 @@ -PacifidlogTown_House3_Text_17940E:: @ 817940E +PacifidlogTown_House3_Text_WillingToTradeIt:: @ 817940E .string "Hello, TRAINER. Would you do me a favor\n" .string "and trade POKéMON with me?\p" .string "Living in PACIFIDLOG, I can only catch\n" @@ -6,21 +6,21 @@ PacifidlogTown_House3_Text_17940E:: @ 817940E .string "{STR_VAR_1}? Do you have one?\n" .string "I'll trade you my {STR_VAR_2} for it.$" -PacifidlogTown_House3_Text_1794C4:: @ 81794C4 +PacifidlogTown_House3_Text_MonIsSoFluffy:: @ 81794C4 .string "Wow!\n" .string "This {STR_VAR_1} is so fluffy!$" -PacifidlogTown_House3_Text_1794DF:: @ 81794DF +PacifidlogTown_House3_Text_ThatsNoMon:: @ 81794DF .string "That's no {STR_VAR_1}.$" -PacifidlogTown_House3_Text_1794ED:: @ 81794ED +PacifidlogTown_House3_Text_ImDisappointed:: @ 81794ED .string "I'm a little disappointed...$" -PacifidlogTown_House3_Text_17950A:: @ 817950A +PacifidlogTown_House3_Text_NowWereFriends:: @ 817950A .string "Since we traded, you and me,\n" .string "we're friends, aren't we?$" -PacifidlogTown_House3_Text_179541:: @ 8179541 +PacifidlogTown_House3_Text_IsThatAPokedex:: @ 8179541 .string "Is that a POKéDEX?\p" .string "Did you get to meet a lot of different\n" .string "POKéMON?\p" diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index c0e12107f..32147e567 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_154355", + "script": "PacifidlogTown_House4_EventScript_Woman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_15434C", + "script": "PacifidlogTown_House4_EventScript_LittleGirl", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_15435E", + "script": "PacifidlogTown_House4_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index f8e0d6e26..452c096b3 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -1,30 +1,30 @@ PacifidlogTown_House4_MapScripts:: @ 815434B .byte 0 -PacifidlogTown_House4_EventScript_15434C:: @ 815434C - msgbox PacifidlogTown_House4_Text_17961F, MSGBOX_NPC +PacifidlogTown_House4_EventScript_LittleGirl:: @ 815434C + msgbox PacifidlogTown_House4_Text_SkyPokemon, MSGBOX_NPC end -PacifidlogTown_House4_EventScript_154355:: @ 8154355 - msgbox PacifidlogTown_House4_Text_17959B, MSGBOX_NPC +PacifidlogTown_House4_EventScript_Woman:: @ 8154355 + msgbox PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon, MSGBOX_NPC end -PacifidlogTown_House4_EventScript_15435E:: @ 815435E +PacifidlogTown_House4_EventScript_Boy:: @ 815435E lock faceplayer - msgbox PacifidlogTown_House4_Text_17963D, MSGBOX_YESNO + msgbox PacifidlogTown_House4_Text_WhereDidYouComeFrom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PacifidlogTown_House4_EventScript_15437F + goto_if_eq PacifidlogTown_House4_EventScript_Yes compare VAR_RESULT, NO - goto_if_eq PacifidlogTown_House4_EventScript_154389 + goto_if_eq PacifidlogTown_House4_EventScript_No end -PacifidlogTown_House4_EventScript_15437F:: @ 815437F - msgbox PacifidlogTown_House4_Text_179656, MSGBOX_DEFAULT +PacifidlogTown_House4_EventScript_Yes:: @ 815437F + msgbox PacifidlogTown_House4_Text_YesTown, MSGBOX_DEFAULT release end -PacifidlogTown_House4_EventScript_154389:: @ 8154389 - msgbox PacifidlogTown_House4_Text_17968C, MSGBOX_DEFAULT +PacifidlogTown_House4_EventScript_No:: @ 8154389 + msgbox PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown_House4/text.inc b/data/maps/PacifidlogTown_House4/text.inc index 5308d9e9f..2dc3fdaad 100644 --- a/data/maps/PacifidlogTown_House4/text.inc +++ b/data/maps/PacifidlogTown_House4/text.inc @@ -1,22 +1,22 @@ -PacifidlogTown_House4_Text_17959B:: @ 817959B +PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon:: @ 817959B .string "People were saying they saw a POKéMON\n" .string "FLYING high above HOENN.\p" .string "Is it FLYING around all the time?\n" .string "Doesn't it need to rest somewhere?$" -PacifidlogTown_House4_Text_17961F:: @ 817961F +PacifidlogTown_House4_Text_SkyPokemon:: @ 817961F .string "A sky POKéMON!\n" .string "A sky POKéMON!$" -PacifidlogTown_House4_Text_17963D:: @ 817963D +PacifidlogTown_House4_Text_WhereDidYouComeFrom:: @ 817963D .string "Where did you come from?$" -PacifidlogTown_House4_Text_179656:: @ 8179656 +PacifidlogTown_House4_Text_YesTown:: @ 8179656 .string "Yes?\n" .string "YES TOWN?\p" .string "I've never heard of a place like that.$" -PacifidlogTown_House4_Text_17968C:: @ 817968C +PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere:: @ 817968C .string "No? That doesn't make any sense.\n" .string "You have to come from somewhere.\p" .string "Oh! Wait! You're not going to say you\n" diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index f6f4f6a5b..1030832d4 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House5_EventScript_154394", + "script": "PacifidlogTown_House5_EventScript_MirageIslandWatcher", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House5_EventScript_1543BA", + "script": "PacifidlogTown_House5_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index 2219e51b8..0d497bdf4 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -1,21 +1,21 @@ PacifidlogTown_House5_MapScripts:: @ 8154393 .byte 0 -PacifidlogTown_House5_EventScript_154394:: @ 8154394 +PacifidlogTown_House5_EventScript_MirageIslandWatcher:: @ 8154394 lock faceplayer specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 - goto_if_eq PacifidlogTown_House5_EventScript_1543B0 - msgbox PacifidlogTown_House5_Text_179718, MSGBOX_DEFAULT + goto_if_eq PacifidlogTown_House5_EventScript_MirageIslandPresent + msgbox PacifidlogTown_House5_Text_CantSeeMirageIslandToday, MSGBOX_DEFAULT release end -PacifidlogTown_House5_EventScript_1543B0:: @ 81543B0 - msgbox PacifidlogTown_House5_Text_17973B, MSGBOX_DEFAULT +PacifidlogTown_House5_EventScript_MirageIslandPresent:: @ 81543B0 + msgbox PacifidlogTown_House5_Text_CanSeeMirageIslandToday, MSGBOX_DEFAULT release end -PacifidlogTown_House5_EventScript_1543BA:: @ 81543BA - msgbox PacifidlogTown_House5_Text_179765, MSGBOX_NPC +PacifidlogTown_House5_EventScript_Gentleman:: @ 81543BA + msgbox PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather, MSGBOX_NPC end diff --git a/data/maps/PacifidlogTown_House5/text.inc b/data/maps/PacifidlogTown_House5/text.inc index 354b39cb3..95a6dd141 100644 --- a/data/maps/PacifidlogTown_House5/text.inc +++ b/data/maps/PacifidlogTown_House5/text.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House5_Text_179718:: @ 8179718 +PacifidlogTown_House5_Text_CantSeeMirageIslandToday:: @ 8179718 .string "I can't see MIRAGE ISLAND today...$" -PacifidlogTown_House5_Text_17973B:: @ 817973B +PacifidlogTown_House5_Text_CanSeeMirageIslandToday:: @ 817973B .string "Oh! Oh my!\n" .string "I can see MIRAGE ISLAND today!$" -PacifidlogTown_House5_Text_179765:: @ 8179765 +PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather:: @ 8179765 .string "MIRAGE ISLAND...\p" .string "It must become visible and invisible\n" .string "depending on the weather conditions\l" diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 29c845248..5a0516060 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_153F18", + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_154129", + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_OldMan", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_154117", + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Girl", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_154120", + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 287349c78..7d787764e 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF - map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_154105 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition .byte 0 -PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 +PacifidlogTown_PokemonCenter_1F_OnTransition:: @ 8154105 setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN end @@ -14,14 +14,14 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 release end -PacifidlogTown_PokemonCenter_1F_EventScript_154117:: @ 8154117 - msgbox PacifidlogTown_PokemonCenter_1F_Text_178E47, MSGBOX_NPC +PacifidlogTown_PokemonCenter_1F_EventScript_Girl:: @ 8154117 + msgbox PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard, MSGBOX_NPC end -PacifidlogTown_PokemonCenter_1F_EventScript_154120:: @ 8154120 - msgbox PacifidlogTown_PokemonCenter_1F_Text_178E79, MSGBOX_NPC +PacifidlogTown_PokemonCenter_1F_EventScript_Woman:: @ 8154120 + msgbox PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola, MSGBOX_NPC end -PacifidlogTown_PokemonCenter_1F_EventScript_154129:: @ 8154129 - msgbox PacifidlogTown_PokemonCenter_1F_Text_178ED9, MSGBOX_NPC +PacifidlogTown_PokemonCenter_1F_EventScript_OldMan:: @ 8154129 + msgbox PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats, MSGBOX_NPC end diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc index 549b5b6e0..bbdaed8f4 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc @@ -1,13 +1,13 @@ -PacifidlogTown_PokemonCenter_1F_Text_178E47:: @ 8178E47 +PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard:: @ 8178E47 .string "What color is your TRAINER'S CARD?\n" .string "Mine's copper!$" -PacifidlogTown_PokemonCenter_1F_Text_178E79:: @ 8178E79 +PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola:: @ 8178E79 .string "PACIFIDLOG TOWN floats on top of\n" .string "a colony of CORSOLA.\p" .string "If I told you that, would you believe me?$" -PacifidlogTown_PokemonCenter_1F_Text_178ED9:: @ 8178ED9 +PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats:: @ 8178ED9 .string "The ancestors of the people in\n" .string "PACIFIDLOG were said to have been\l" .string "born on boats and then lived and died \l" diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index adfdee269..60b0466c7 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -32,7 +32,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_14B7C3", + "script": "PetalburgCity_EventScript_WallysMom", "flag": "FLAG_HIDE_WALLY_MOM_PETALBURG_1" }, { @@ -58,7 +58,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_14B7AC", + "script": "PetalburgCity_EventScript_Boy", "flag": "0" }, { @@ -71,7 +71,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_14B824", + "script": "PetalburgCity_EventScript_Gentleman", "flag": "0" }, { @@ -110,8 +110,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_1B1704", - "flag": "FLAG_ITEM_PETALBURG_1" + "script": "PetalburgCity_EventScript_ItemMaxRevive", + "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE" }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", @@ -136,7 +136,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_14BA2D", + "script": "PetalburgCity_EventScript_GymBoy", "flag": "0" } ], @@ -192,7 +192,7 @@ "elevation": 3, "var": "VAR_PETALBURG_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_14B836" + "script": "PetalburgCity_EventScript_ShowGymToPlayer0" }, { "type": "trigger", @@ -201,7 +201,7 @@ "elevation": 3, "var": "VAR_PETALBURG_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_14B842" + "script": "PetalburgCity_EventScript_ShowGymToPlayer1" }, { "type": "trigger", @@ -210,7 +210,7 @@ "elevation": 3, "var": "VAR_PETALBURG_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_14B84E" + "script": "PetalburgCity_EventScript_ShowGymToPlayer2" }, { "type": "trigger", @@ -219,7 +219,7 @@ "elevation": 3, "var": "VAR_PETALBURG_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_14B85A" + "script": "PetalburgCity_EventScript_ShowGymToPlayer3" } ], "bg_events": [ @@ -229,7 +229,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_EventScript_14B812" + "script": "PetalburgCity_EventScript_GymSign" }, { "type": "sign", @@ -253,7 +253,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_EventScript_14B81B" + "script": "PetalburgCity_EventScript_CitySign" }, { "type": "sign", @@ -277,7 +277,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_EventScript_14B82D" + "script": "PetalburgCity_EventScript_WallyHouseSign" }, { "type": "hidden_item", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index d07c85290..b2b89901b 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,44 +1,44 @@ PetalburgCity_MapScripts:: @ 814B70C - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_14B717 - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_14B73D + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_OnFrame .byte 0 -PetalburgCity_MapScript1_14B717:: @ 814B717 +PetalburgCity_OnTransition:: @ 814B717 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_PETALBURG_STATE, 0 - call_if_eq PetalburgCity_EventScript_14B731 + call_if_eq PetalburgCity_EventScript_MoveGymBoyToWestEntrance compare VAR_PETALBURG_STATE, 2 - call_if_eq PetalburgCity_EventScript_14B739 + call_if_eq PetalburgCity_EventScript_DisableMapMusic end -PetalburgCity_EventScript_14B731:: @ 814B731 +PetalburgCity_EventScript_MoveGymBoyToWestEntrance:: @ 814B731 setobjectxyperm 9, 5, 11 return -PetalburgCity_EventScript_14B739:: @ 814B739 +PetalburgCity_EventScript_DisableMapMusic:: @ 814B739 savebgm MUS_FOLLOW_ME return -PetalburgCity_MapScript2_14B73D:: @ 814B73D - map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_14B747 +PetalburgCity_OnFrame:: @ 814B73D + map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_WallyTutorial .2byte 0 -PetalburgCity_EventScript_14B747:: @ 814B747 +PetalburgCity_EventScript_WallyTutorial:: @ 814B747 lockall setflag FLAG_HIDE_MAP_NAME_POPUP special SavePlayerParty special PutZigzagoonInPlayerParty - applymovement 2, PetalburgCity_Movement_14B7ED - applymovement LOCALID_PLAYER, PetalburgCity_Movement_14B7CC + applymovement 2, PetalburgCity_Movement_WallyTutorialWally + applymovement LOCALID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer waitmovement 0 - msgbox PetalburgCity_Text_16D361, MSGBOX_DEFAULT + msgbox Route102_Text_WatchMeCatchPokemon, MSGBOX_DEFAULT special ScrSpecial_StartWallyTutorialBattle waitstate - msgbox PetalburgCity_Text_16D3DE, MSGBOX_DEFAULT + msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT applymovement 2, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY @ Local id and map num were swapped here (0, 0, 2 vs 2, 0, 0). Fixed to waitmovement 2, MAP_PETALBURG_CITY in Emerald waitmovement 0, MAP_MAUVILLE_CITY - msgbox PetalburgCity_Text_16D408, MSGBOX_DEFAULT + msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_PETALBURG_STATE, 3 @@ -51,21 +51,21 @@ PetalburgCity_EventScript_14B747:: @ 814B747 releaseall end -PetalburgCity_EventScript_14B7AC:: @ 814B7AC +PetalburgCity_EventScript_Boy:: @ 814B7AC lock faceplayer - msgbox PetalburgCity_Text_164490, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT closemessage applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end -PetalburgCity_EventScript_14B7C3:: @ 814B7C3 - msgbox PetalburgCity_Text_16433E, MSGBOX_NPC +PetalburgCity_EventScript_WallysMom:: @ 814B7C3 + msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC end -PetalburgCity_Movement_14B7CC:: @ 814B7CC +PetalburgCity_Movement_WallyTutorialPlayer:: @ 814B7CC delay_8 walk_down walk_down @@ -100,7 +100,7 @@ PetalburgCity_Movement_14B7CC:: @ 814B7CC walk_in_place_fastest_right step_end -PetalburgCity_Movement_14B7ED:: @ 814B7ED +PetalburgCity_Movement_WallyTutorialWally:: @ 814B7ED delay_8 walk_down walk_down @@ -139,47 +139,47 @@ PetalburgCity_Movement_14B7ED:: @ 814B7ED walk_in_place_fastest_right step_end -PetalburgCity_EventScript_14B812:: @ 814B812 - msgbox PetalburgCity_Text_1645BB, MSGBOX_SIGN +PetalburgCity_EventScript_GymSign:: @ 814B812 + msgbox PetalburgCity_Text_GymSign, MSGBOX_SIGN end -PetalburgCity_EventScript_14B81B:: @ 814B81B - msgbox PetalburgCity_Text_164602, MSGBOX_SIGN +PetalburgCity_EventScript_CitySign:: @ 814B81B + msgbox PetalburgCity_Text_CitySign, MSGBOX_SIGN end -PetalburgCity_EventScript_14B824:: @ 814B824 - msgbox PetalburgCity_Text_16453F, MSGBOX_NPC +PetalburgCity_EventScript_Gentleman:: @ 814B824 + msgbox PetalburgCity_Text_FullPartyExplanation, MSGBOX_NPC end -PetalburgCity_EventScript_14B82D:: @ 814B82D - msgbox PetalburgCity_Text_164634, MSGBOX_SIGN +PetalburgCity_EventScript_WallyHouseSign:: @ 814B82D + msgbox PetalburgCity_Text_WallyHouseSign, MSGBOX_SIGN end -PetalburgCity_EventScript_14B836:: @ 814B836 +PetalburgCity_EventScript_ShowGymToPlayer0:: @ 814B836 lockall setvar VAR_0x8008, 0 - goto PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_14B842:: @ 814B842 +PetalburgCity_EventScript_ShowGymToPlayer1:: @ 814B842 lockall setvar VAR_0x8008, 1 - goto PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_14B84E:: @ 814B84E +PetalburgCity_EventScript_ShowGymToPlayer2:: @ 814B84E lockall setvar VAR_0x8008, 2 - goto PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_14B85A:: @ 814B85A +PetalburgCity_EventScript_ShowGymToPlayer3:: @ 814B85A lockall setvar VAR_0x8008, 3 - goto PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_14B866:: @ 814B866 +PetalburgCity_EventScript_ShowGymToPlayer:: @ 814B866 applymovement 9, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_FOLLOW_ME, FALSE @@ -189,82 +189,82 @@ PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 - call_if_eq PetalburgCity_EventScript_14B91B + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_EventScript_14B930 + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq PetalburgCity_EventScript_14B93B + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer2 compare VAR_0x8008, 3 - call_if_eq PetalburgCity_EventScript_14B950 - msgbox PetalburgCity_Text_16438A, MSGBOX_DEFAULT + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer3 + msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq PetalburgCity_EventScript_14B965 + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_EventScript_14B977 + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym1 compare VAR_0x8008, 2 - call_if_eq PetalburgCity_EventScript_14B989 + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym2 compare VAR_0x8008, 3 - call_if_eq PetalburgCity_EventScript_14B99B - msgbox PetalburgCity_Text_164426, MSGBOX_DEFAULT + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3 + msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT applymovement 9, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox PetalburgCity_Text_164449, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_14B9F4 + applymovement 9, PetalburgCity_Movement_BoyWalkAway waitmovement 0 fadedefaultbgm releaseall end -PetalburgCity_EventScript_14B91B:: @ 814B91B - applymovement 9, PetalburgCity_Movement_14B9B1 +PetalburgCity_EventScript_BoyApproachPlayer0:: @ 814B91B + applymovement 9, PetalburgCity_Movement_BoyApproachPlayer0 waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_EventScript_14B930:: @ 814B930 - applymovement 9, PetalburgCity_Movement_14B9B6 +PetalburgCity_EventScript_BoyApproachPlayer1:: @ 814B930 + applymovement 9, PetalburgCity_Movement_BoyApproachPlayer1 waitmovement 0 return -PetalburgCity_EventScript_14B93B:: @ 814B93B - applymovement 9, PetalburgCity_Movement_14B9B9 +PetalburgCity_EventScript_BoyApproachPlayer2:: @ 814B93B + applymovement 9, PetalburgCity_Movement_BoyApproachPlayer2 waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_EventScript_14B950:: @ 814B950 - applymovement 9, PetalburgCity_Movement_14B9BE +PetalburgCity_EventScript_BoyApproachPlayer3:: @ 814B950 + applymovement 9, PetalburgCity_Movement_BoyApproachPlayer3 waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_EventScript_14B965:: @ 814B965 - applymovement 9, PetalburgCity_Movement_14B9C4 - applymovement LOCALID_PLAYER, PetalburgCity_Movement_14BA01 +PetalburgCity_EventScript_LeadPlayerToGym0:: @ 814B965 + applymovement 9, PetalburgCity_Movement_BoyWalkToGym0 + applymovement LOCALID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0 waitmovement 0 return -PetalburgCity_EventScript_14B977:: @ 814B977 - applymovement 9, PetalburgCity_Movement_14B9CF - applymovement LOCALID_PLAYER, PetalburgCity_Movement_14BA0B +PetalburgCity_EventScript_LeadPlayerToGym1:: @ 814B977 + applymovement 9, PetalburgCity_Movement_BoyWalkToGym1 + applymovement LOCALID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1 waitmovement 0 return -PetalburgCity_EventScript_14B989:: @ 814B989 - applymovement 9, PetalburgCity_Movement_14B9DD - applymovement LOCALID_PLAYER, PetalburgCity_Movement_14BA18 +PetalburgCity_EventScript_LeadPlayerToGym2:: @ 814B989 + applymovement 9, PetalburgCity_Movement_BoyWalkToGym2 + applymovement LOCALID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2 waitmovement 0 return -PetalburgCity_EventScript_14B99B:: @ 814B99B - applymovement 9, PetalburgCity_Movement_14B9E8 - applymovement LOCALID_PLAYER, PetalburgCity_Movement_14BA22 +PetalburgCity_EventScript_LeadPlayerToGym3:: @ 814B99B + applymovement 9, PetalburgCity_Movement_BoyWalkToGym3 + applymovement LOCALID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3 waitmovement 0 return @@ -274,26 +274,26 @@ PetalburgCity_EventScript_14B99B:: @ 814B99B delay_16 step_end -PetalburgCity_Movement_14B9B1:: @ 814B9B1 +PetalburgCity_Movement_BoyApproachPlayer0:: @ 814B9B1 walk_right walk_right walk_right walk_in_place_fastest_up step_end -PetalburgCity_Movement_14B9B6:: @ 814B9B6 +PetalburgCity_Movement_BoyApproachPlayer1:: @ 814B9B6 walk_right walk_right step_end -PetalburgCity_Movement_14B9B9:: @ 814B9B9 +PetalburgCity_Movement_BoyApproachPlayer2:: @ 814B9B9 walk_right walk_right walk_right walk_in_place_fastest_down step_end -PetalburgCity_Movement_14B9BE:: @ 814B9BE +PetalburgCity_Movement_BoyApproachPlayer3:: @ 814B9BE walk_down walk_right walk_right @@ -301,7 +301,7 @@ PetalburgCity_Movement_14B9BE:: @ 814B9BE walk_in_place_fastest_down step_end -PetalburgCity_Movement_14B9C4:: @ 814B9C4 +PetalburgCity_Movement_BoyWalkToGym0:: @ 814B9C4 walk_right walk_right walk_right @@ -314,7 +314,7 @@ PetalburgCity_Movement_14B9C4:: @ 814B9C4 walk_in_place_fastest_up step_end -PetalburgCity_Movement_14B9CF:: @ 814B9CF +PetalburgCity_Movement_BoyWalkToGym1:: @ 814B9CF walk_down walk_right walk_right @@ -330,7 +330,7 @@ PetalburgCity_Movement_14B9CF:: @ 814B9CF walk_in_place_fastest_up step_end -PetalburgCity_Movement_14B9DD:: @ 814B9DD +PetalburgCity_Movement_BoyWalkToGym2:: @ 814B9DD walk_right walk_right walk_right @@ -343,7 +343,7 @@ PetalburgCity_Movement_14B9DD:: @ 814B9DD walk_in_place_fastest_up step_end -PetalburgCity_Movement_14B9E8:: @ 814B9E8 +PetalburgCity_Movement_BoyWalkToGym3:: @ 814B9E8 walk_right walk_right walk_right @@ -357,7 +357,7 @@ PetalburgCity_Movement_14B9E8:: @ 814B9E8 walk_in_place_fastest_up step_end -PetalburgCity_Movement_14B9F4:: @ 814B9F4 +PetalburgCity_Movement_BoyWalkAway:: @ 814B9F4 walk_down walk_left walk_left @@ -372,7 +372,7 @@ PetalburgCity_Movement_14B9F4:: @ 814B9F4 walk_left step_end -PetalburgCity_Movement_14BA01:: @ 814BA01 +PetalburgCity_Movement_PlayerWalkToGym0:: @ 814BA01 walk_down walk_right walk_right @@ -384,7 +384,7 @@ PetalburgCity_Movement_14BA01:: @ 814BA01 walk_up step_end -PetalburgCity_Movement_14BA0B:: @ 814BA0B +PetalburgCity_Movement_PlayerWalkToGym1:: @ 814BA0B delay_16 delay_16 walk_down @@ -399,7 +399,7 @@ PetalburgCity_Movement_14BA0B:: @ 814BA0B walk_up step_end -PetalburgCity_Movement_14BA18:: @ 814BA18 +PetalburgCity_Movement_PlayerWalkToGym2:: @ 814BA18 walk_up walk_right walk_right @@ -411,7 +411,7 @@ PetalburgCity_Movement_14BA18:: @ 814BA18 walk_up step_end -PetalburgCity_Movement_14BA22:: @ 814BA22 +PetalburgCity_Movement_PlayerWalkToGym3:: @ 814BA22 walk_up walk_right walk_right @@ -424,6 +424,6 @@ PetalburgCity_Movement_14BA22:: @ 814BA22 walk_up step_end -PetalburgCity_EventScript_14BA2D:: @ 814BA2D - msgbox PetalburgCity_Text_16438A, MSGBOX_NPC +PetalburgCity_EventScript_GymBoy:: @ 814BA2D + msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_NPC end diff --git a/data/maps/PetalburgCity/text.inc b/data/maps/PetalburgCity/text.inc index 90d61741c..8430051a4 100644 --- a/data/maps/PetalburgCity/text.inc +++ b/data/maps/PetalburgCity/text.inc @@ -1,9 +1,9 @@ -PetalburgCity_Text_16433E:: @ 816433E +PetalburgCity_Text_WhereIsWally:: @ 816433E .string "Where has our WALLY gone?\p" .string "We have to leave for VERDANTURF TOWN\n" .string "very soon...$" -PetalburgCity_Text_16438A:: @ 816438A +PetalburgCity_Text_AreYouRookieTrainer:: @ 816438A .string "Hiya! Are you maybe...\n" .string "A rookie TRAINER?\p" .string "Do you know what POKéMON TRAINERS\n" @@ -11,34 +11,34 @@ PetalburgCity_Text_16438A:: @ 816438A .string "They first check what kind of GYM\n" .string "is in the town.$" -PetalburgCity_Text_164426:: @ 8164426 +PetalburgCity_Text_ThisIsPetalburgGym:: @ 8164426 .string "See? This is PETALBURG CITY's GYM.$" -PetalburgCity_Text_164449:: @ 8164449 +PetalburgCity_Text_ThisIsGymSign:: @ 8164449 .string "This is the GYM's sign. Look for it\n" .string "whenever you're looking for a GYM.$" -PetalburgCity_Text_164490:: @ 8164490 +PetalburgCity_Text_WaterReflection:: @ 8164490 .string "My face is reflected in the water.\p" .string "It's a shining grin full of hope...\p" .string "Or it could be a look of somber silence\n" .string "struggling with fear...\p" .string "What do you see reflected in your face?$" -PetalburgCity_Text_16453F:: @ 816453F +PetalburgCity_Text_FullPartyExplanation:: @ 816453F .string "Let's say you have six POKéMON.\n" .string "If you catch another one...\p" .string "It is automatically sent to a STORAGE\n" .string "BOX over a PC connection.$" -PetalburgCity_Text_1645BB:: @ 81645BB +PetalburgCity_Text_GymSign:: @ 81645BB .string "PETALBURG CITY POKéMON GYM\n" .string "LEADER: NORMAN\l" .string "“A man in pursuit of power!”$" -PetalburgCity_Text_164602:: @ 8164602 +PetalburgCity_Text_CitySign:: @ 8164602 .string "PETALBURG CITY\n" .string "“Where people mingle with nature.”$" -PetalburgCity_Text_164634:: @ 8164634 +PetalburgCity_Text_WallyHouseSign:: @ 8164634 .string "WALLY'S HOUSE$" diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 520e1ffbe..1d60c98e7 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_1545B9", + "script": "PetalburgCity_Gym_EventScript_Norman", "flag": "FLAG_HIDE_NORMAN_PETALBURG_GYM" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_154EE6", + "script": "PetalburgCity_Gym_EventScript_Mary", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_154DF6", + "script": "PetalburgCity_Gym_EventScript_Randall", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_154E32", + "script": "PetalburgCity_Gym_EventScript_Parker", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_154F22", + "script": "PetalburgCity_Gym_EventScript_Lori", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_154E6E", + "script": "PetalburgCity_Gym_EventScript_George", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_154F5E", + "script": "PetalburgCity_Gym_EventScript_Jody", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_154EAA", + "script": "PetalburgCity_Gym_EventScript_Berke", "flag": "0" }, { @@ -125,7 +125,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_15518B", + "script": "PetalburgCity_Gym_EventScript_GymGuide", "flag": "FLAG_HIDE_PETALBURG_GYM_GUIDE" }, { @@ -418,7 +418,7 @@ "y": 105, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154B73" + "script": "PetalburgCity_Gym_EventScript_SpeedRoomDoor" }, { "type": "sign", @@ -426,7 +426,7 @@ "y": 105, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154BC3" + "script": "PetalburgCity_Gym_EventScript_AccuracyRoomDoor" }, { "type": "sign", @@ -434,7 +434,7 @@ "y": 79, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154BF8" + "script": "PetalburgCity_Gym_EventScript_ZeroReductionRoomDoor" }, { "type": "sign", @@ -442,7 +442,7 @@ "y": 79, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154C2B" + "script": "PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor" }, { "type": "sign", @@ -450,7 +450,7 @@ "y": 92, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154C5E" + "script": "PetalburgCity_Gym_EventScript_RightDefenseRoomDoor" }, { "type": "sign", @@ -458,7 +458,7 @@ "y": 92, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154C91" + "script": "PetalburgCity_Gym_EventScript_RecoveryRoomDoor" }, { "type": "sign", @@ -466,7 +466,7 @@ "y": 40, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154CC4" + "script": "PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor" }, { "type": "sign", @@ -474,7 +474,7 @@ "y": 53, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154CF7" + "script": "PetalburgCity_Gym_EventScript_RightStrengthRoomDoor" }, { "type": "sign", @@ -482,7 +482,7 @@ "y": 53, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154D2A" + "script": "PetalburgCity_Gym_EventScript_LeftOHKORoomDoor" }, { "type": "sign", @@ -490,7 +490,7 @@ "y": 66, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154D5D" + "script": "PetalburgCity_Gym_EventScript_RightOHKORoomDoor" }, { "type": "sign", @@ -498,7 +498,7 @@ "y": 14, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154D90" + "script": "PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor" }, { "type": "sign", @@ -506,7 +506,7 @@ "y": 27, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_154DC3" + "script": "PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor" }, { "type": "sign", @@ -514,7 +514,7 @@ "y": 110, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_Gym_EventScript_1551AA" + "script": "PetalburgCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -522,7 +522,7 @@ "y": 110, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_Gym_EventScript_1551BA" + "script": "PetalburgCity_Gym_EventScript_RightGymStatue" } ] } diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 4c936bd41..7525ee403 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,42 +1,42 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 - map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_15448C - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_15451B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_154553 - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_154562 + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_OnFrame .byte 0 -PetalburgCity_Gym_MapScript1_15448C:: @ 815448C +PetalburgCity_Gym_OnLoad:: @ 815448C compare VAR_PETALBURG_GYM_STATE, 6 - goto_if_eq PetalburgCity_Gym_EventScript_1544A3 + goto_if_eq PetalburgCity_Gym_EventScript_OpenUnlockedDoors compare VAR_PETALBURG_GYM_STATE, 7 - call_if_ge PetalburgCity_Gym_EventScript_1544ED + call_if_ge PetalburgCity_Gym_EventScript_UnlockAllDoors end -PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 +PetalburgCity_Gym_EventScript_OpenUnlockedDoors:: @ 81544A3 setvar VAR_0x8005, 1 - call PetalburgCity_Gym_EventScript_154F9A - call_if_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB - call_if_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC - call_if_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154FFD - call_if_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_15501E - call_if_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_15503F - call_if_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_155060 - call_if_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_155081 + call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors + call_if_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors + call_if_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors + call_if_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors + call_if_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors + call_if_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors + call_if_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors + call_if_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_OpenOHKORoomDoors end -PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED +PetalburgCity_Gym_EventScript_UnlockAllDoors:: @ 81544ED setvar VAR_0x8005, 1 - call PetalburgCity_Gym_EventScript_154F9A - call PetalburgCity_Gym_EventScript_154FBB - call PetalburgCity_Gym_EventScript_154FDC - call PetalburgCity_Gym_EventScript_154FFD - call PetalburgCity_Gym_EventScript_15501E - call PetalburgCity_Gym_EventScript_15503F - call PetalburgCity_Gym_EventScript_155060 - call PetalburgCity_Gym_EventScript_155081 + call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors + call PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors + call PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors + call PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors + call PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors + call PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors + call PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors + call PetalburgCity_Gym_EventScript_OpenOHKORoomDoors return -PetalburgCity_Gym_MapScript1_15451B:: @ 815451B +PetalburgCity_Gym_OnTransition:: @ 815451B compare VAR_PETALBURG_GYM_STATE, 1 call_if_eq PetalburgCity_Gym_EventScript_15453B compare VAR_PETALBURG_GYM_STATE, 6 @@ -56,25 +56,25 @@ PetalburgCity_Gym_EventScript_15454B:: @ 815454B setobjectxyperm 1, 4, 107 return -PetalburgCity_Gym_MapScript2_154553:: @ 8154553 - map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15455D +PetalburgCity_Gym_OnWarp:: @ 8154553 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_TurnPlayerNorth .2byte 0 -PetalburgCity_Gym_EventScript_15455D:: @ 815455D +PetalburgCity_Gym_EventScript_TurnPlayerNorth:: @ 815455D turnobject LOCALID_PLAYER, 2 end -PetalburgCity_Gym_MapScript2_154562:: @ 8154562 - map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15456C +PetalburgCity_Gym_OnFrame:: @ 8154562 + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial .2byte 0 -PetalburgCity_Gym_EventScript_15456C:: @ 815456C +PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 815456C lockall - msgbox PetalburgCity_Gym_Text_17A196, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_17A1B0, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_1545B4 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitGym waitmovement 0 playse SE_EXIT removeobject 10 @@ -82,120 +82,120 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C delay 30 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgCity_Gym_Text_17A2A4, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 releaseall end -PetalburgCity_Gym_Movement_1545B4:: @ 81545B4 +PetalburgCity_Gym_Movement_WallyExitGym:: @ 81545B4 walk_down walk_down walk_down delay_16 step_end -PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 +PetalburgCity_Gym_EventScript_Norman:: @ 81545B9 lock faceplayer switch VAR_PETALBURG_GYM_STATE - case 2, PetalburgCity_Gym_EventScript_154907 - case 3, PetalburgCity_Gym_EventScript_154911 - case 4, PetalburgCity_Gym_EventScript_15491B - case 5, PetalburgCity_Gym_EventScript_154925 - case 6, PetalburgCity_Gym_EventScript_1549D6 - case 7, PetalburgCity_Gym_EventScript_15493D - msgbox PetalburgCity_Gym_Text_179DF6, MSGBOX_DEFAULT + case 2, PetalburgCity_Gym_EventScript_NormanNoBadges + case 3, PetalburgCity_Gym_EventScript_NormanOneBadge + case 4, PetalburgCity_Gym_EventScript_NormanTwoBadges + case 5, PetalburgCity_Gym_EventScript_NormanThreeBadges + case 6, PetalburgCity_Gym_EventScript_NormanBattle + case 7, PetalburgCity_Gym_EventScript_NormanPostBattle + msgbox PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon, MSGBOX_DEFAULT closemessage switch VAR_FACING - case 1, PetalburgCity_Gym_EventScript_15463D - case 2, PetalburgCity_Gym_EventScript_154648 - case 3, PetalburgCity_Gym_EventScript_154653 - case 4, PetalburgCity_Gym_EventScript_15465E + case 1, PetalburgCity_Gym_EventScript_BeginWallyTutorialSouth + case 2, PetalburgCity_Gym_EventScript_BeginWallyTutorialNorth + case 3, PetalburgCity_Gym_EventScript_BeginWallyTutorialWest + case 4, PetalburgCity_Gym_EventScript_BeginWallyTutorialEast end -PetalburgCity_Gym_EventScript_15463D:: @ 815463D +PetalburgCity_Gym_EventScript_BeginWallyTutorialSouth:: @ 815463D setvar VAR_0x8008, 0 - goto PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_154648:: @ 8154648 +PetalburgCity_Gym_EventScript_BeginWallyTutorialNorth:: @ 8154648 setvar VAR_0x8008, 1 - goto PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_154653:: @ 8154653 +PetalburgCity_Gym_EventScript_BeginWallyTutorialWest:: @ 8154653 setvar VAR_0x8008, 2 - goto PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_15465E:: @ 815465E +PetalburgCity_Gym_EventScript_BeginWallyTutorialEast:: @ 815465E setvar VAR_0x8008, 3 - goto PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_154669:: @ 8154669 +PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8154669 addobject 10 playse SE_DOOR compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_1547EE + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveSouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_154800 + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_15481C + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveWestEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_15481C - msgbox PetalburgCity_Gym_Text_179F07, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_179F37, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_179F70, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_17A03A, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveWestEast + msgbox PetalburgCity_Gym_Text_WallyIdLikeAPokemon, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadOhYoureWallyRight, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadHmISee, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_154884 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_15488F + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_1548A1 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_1548B3 - msgbox PetalburgCity_Gym_Text_17A04A, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerEast + msgbox PetalburgCity_Gym_Text_DadPlayerGoWithWally, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_1548C5 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallySouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_1548D0 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallyNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_1548DB + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallyWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_1548E6 - msgbox PetalburgCity_Gym_Text_17A0A8, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_17A0EB, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_17A156, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallyEast + msgbox PetalburgCity_Gym_Text_IllLoanYouMyZigzagoon, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyThankYouAndDadGivesPokeBall, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyOhWowThankYou, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_15492F + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorSouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_154930 + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_15493B + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_15493C + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorEast compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_WallyFacePlayer compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_1548FC + call_if_eq PetalburgCity_Gym_EventScript_WallyFaceDown compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_WallyFacePlayer compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_1548F1 - msgbox PetalburgCity_Gym_Text_17A171, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallyFacePlayer + msgbox PetalburgCity_Gym_Text_WouldYouReallyComeWithMe, MSGBOX_DEFAULT closemessage setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_FOLLOW_ME, FALSE compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_154835 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallySouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_15484E + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_154860 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_154872 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyEast removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 setvar VAR_PETALBURG_GYM_STATE, 1 @@ -209,170 +209,170 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 release end -PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE +PetalburgCity_Gym_EventScript_WallyArriveSouth:: @ 81547EE applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_154B27 + applymovement 10, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return -PetalburgCity_Gym_EventScript_154800:: @ 8154800 - applymovement 10, PetalburgCity_Gym_Movement_154B1D +PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8154800 + applymovement 10, PetalburgCity_Gym_Movement_WallyArriveNorth waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_15481C:: @ 815481C +PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 815481C applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_154B27 + applymovement 10, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return -PetalburgCity_Gym_EventScript_154835:: @ 8154835 +PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8154835 applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_154B3E - applymovement LOCALID_PLAYER, PetalburgCity_Gym_Movement_154B4D + applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest + applymovement LOCALID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth waitmovement 0 return -PetalburgCity_Gym_EventScript_15484E:: @ 815484E - applymovement 10, PetalburgCity_Gym_Movement_154B2E - applymovement LOCALID_PLAYER, PetalburgCity_Gym_Movement_154B45 +PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth:: @ 815484E + applymovement 10, PetalburgCity_Gym_Movement_WallyExitNorth + applymovement LOCALID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth waitmovement 0 return -PetalburgCity_Gym_EventScript_154860:: @ 8154860 - applymovement 10, PetalburgCity_Gym_Movement_154B3E - applymovement LOCALID_PLAYER, PetalburgCity_Gym_Movement_154B57 +PetalburgCity_Gym_EventScript_ExitGymWithWallyWest:: @ 8154860 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest + applymovement LOCALID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest waitmovement 0 return -PetalburgCity_Gym_EventScript_154872:: @ 8154872 - applymovement 10, PetalburgCity_Gym_Movement_154B36 - applymovement LOCALID_PLAYER, PetalburgCity_Gym_Movement_154B5F +PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: @ 8154872 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitEast + applymovement LOCALID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast waitmovement 0 return -PetalburgCity_Gym_EventScript_154884:: @ 8154884 +PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8154884 applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_15488F:: @ 815488F +PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @ 815488F applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1 +PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: @ 81548A1 applymovement 1, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3 +PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: @ 81548B3 applymovement 1, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5 +PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: @ 81548C5 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0 +PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: @ 81548D0 applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB +PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: @ 81548DB applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6 +PetalburgCity_Gym_EventScript_NormanAddressWallyEast:: @ 81548E6 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1 +PetalburgCity_Gym_EventScript_WallyFacePlayer:: @ 81548F1 applymovement 10, Common_Movement_FacePlayer waitmovement 0 return -PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC +PetalburgCity_Gym_EventScript_WallyFaceDown:: @ 81548FC applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_154907:: @ 8154907 - msgbox PetalburgCity_Gym_Text_17A41E, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanNoBadges:: @ 8154907 + msgbox PetalburgCity_Gym_Text_NormanGoToRustboro, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_154911:: @ 8154911 - msgbox PetalburgCity_Gym_Text_17A518, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanOneBadge:: @ 8154911 + msgbox PetalburgCity_Gym_Text_NormanGoToDewford, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_15491B:: @ 815491B - msgbox PetalburgCity_Gym_Text_17A5F3, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanTwoBadges:: @ 815491B + msgbox PetalburgCity_Gym_Text_YouHaveGottenStronger, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_154925:: @ 8154925 - msgbox PetalburgCity_Gym_Text_17A5F3, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanThreeBadges:: @ 8154925 + msgbox PetalburgCity_Gym_Text_YouHaveGottenStronger, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_15492F:: @ 815492F +PetalburgCity_Gym_EventScript_NormanFaceDoorSouth:: @ 815492F return -PetalburgCity_Gym_EventScript_154930:: @ 8154930 +PetalburgCity_Gym_EventScript_NormanFaceDoorNorth:: @ 8154930 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_15493B:: @ 815493B +PetalburgCity_Gym_EventScript_NormanFaceDoorWest:: @ 815493B return -PetalburgCity_Gym_EventScript_15493C:: @ 815493C +PetalburgCity_Gym_EventScript_NormanFaceDoorEast:: @ 815493C return -PetalburgCity_Gym_EventScript_15493D:: @ 815493D - call PetalburgCity_Gym_EventScript_154969 +PetalburgCity_Gym_EventScript_NormanPostBattle:: @ 815493D + call PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_1549B8 - goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C - goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69 - msgbox PetalburgCity_Gym_Text_17AA6B, MSGBOX_DEFAULT + goto_if_eq PetalburgCity_Gym_EventScript_GiveEnigmaBerry + goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_GiveFacade2 + goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_NoAmountOfTrainingIsEnough + msgbox PetalburgCity_Gym_Text_DadGoingToKeepTraining, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_154969:: @ 8154969 +PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry:: @ 8154969 specialvar VAR_RESULT, IsEnigmaBerryValid compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry checkitem ITEM_ENIGMA_BERRY, 1 compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry checkpcitem ITEM_ENIGMA_BERRY, 1 compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry compare VAR_ENIGMA_BERRY_AVAILABLE, 0 - goto_if_eq PetalburgCity_Gym_EventScript_1549B2 - msgbox PetalburgCity_Gym_Text_1C5570, MSGBOX_DEFAULT + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry + msgbox PetalburgCity_Gym_Text_GiveEnigmaBerry, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return -PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 +PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry:: @ 81549B2 setvar VAR_RESULT, 0 return -PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 +PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 81549B8 giveitem ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -380,13 +380,13 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 release end -PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 - msgbox PetalburgCity_Gym_Text_17A653, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_NORMAN, PetalburgCity_Gym_Text_17A77A - message PetalburgCity_Gym_Text_17A7DD +PetalburgCity_Gym_EventScript_NormanBattle:: @ 81549D6 + msgbox PetalburgCity_Gym_Text_NormanIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_NORMAN, PetalburgCity_Gym_Text_NormanDefeat + message PetalburgCity_Gym_Text_ReceivedBalanceBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox PetalburgCity_Gym_Text_17A805, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET @@ -396,18 +396,18 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 setvar VAR_0x8008, 5 call Common_EventScript_SetGymTrainers clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL - call PetalburgCity_Gym_EventScript_1544ED + call PetalburgCity_Gym_EventScript_UnlockAllDoors special DrawWholeMapView - goto PetalburgCity_Gym_EventScript_154A2C + goto PetalburgCity_Gym_EventScript_GiveFacade2 end -PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C +PetalburgCity_Gym_EventScript_GiveFacade2:: @ 8154A2C giveitem ITEM_TM42_FACADE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM42 - msgbox PetalburgCity_Gym_Text_17A8CF, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_17A976, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadHappyAndSad, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if_eq PetalburgCity_Gym_EventScript_154ABC @@ -426,7 +426,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C call_if_eq PetalburgCity_Gym_EventScript_154AFE compare VAR_FACING, 4 call_if_eq PetalburgCity_Gym_EventScript_154B09 - msgbox PetalburgCity_Gym_Text_17A9F6, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallysParentsHaveGiftForYou, MSGBOX_DEFAULT release end @@ -481,7 +481,7 @@ PetalburgCity_Gym_EventScript_154B09:: @ 8154B09 walk_in_place_fastest_down step_end -PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D +PetalburgCity_Gym_Movement_WallyArriveNorth:: @ 8154B1D delay_16 walk_up delay_16 @@ -493,7 +493,7 @@ PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D walk_in_place_fastest_left step_end -PetalburgCity_Gym_Movement_154B27:: @ 8154B27 +PetalburgCity_Gym_Movement_WallyArrive:: @ 8154B27 delay_16 walk_up delay_16 @@ -502,7 +502,7 @@ PetalburgCity_Gym_Movement_154B27:: @ 8154B27 walk_up step_end -PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E +PetalburgCity_Gym_Movement_WallyExitNorth:: @ 8154B2E walk_down walk_down walk_down @@ -512,7 +512,7 @@ PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E walk_in_place_down step_end -PetalburgCity_Gym_Movement_154B36:: @ 8154B36 +PetalburgCity_Gym_Movement_WallyExitEast:: @ 8154B36 walk_down walk_down walk_right @@ -522,7 +522,7 @@ PetalburgCity_Gym_Movement_154B36:: @ 8154B36 walk_in_place_down step_end -PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E +PetalburgCity_Gym_Movement_WallyExitSouthWest:: @ 8154B3E walk_down walk_down walk_down @@ -531,7 +531,7 @@ PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E walk_in_place_down step_end -PetalburgCity_Gym_Movement_154B45:: @ 8154B45 +PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth:: @ 8154B45 delay_16 delay_16 delay_16 @@ -541,7 +541,7 @@ PetalburgCity_Gym_Movement_154B45:: @ 8154B45 delay_8 step_end -PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D +PetalburgCity_Gym_Movement_PlayerExitWithWallySouth:: @ 8154B4D delay_16 delay_16 walk_right @@ -553,7 +553,7 @@ PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D delay_8 step_end -PetalburgCity_Gym_Movement_154B57:: @ 8154B57 +PetalburgCity_Gym_Movement_PlayerExitWithWallyWest:: @ 8154B57 delay_16 delay_16 walk_down @@ -563,7 +563,7 @@ PetalburgCity_Gym_Movement_154B57:: @ 8154B57 delay_8 step_end -PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F +PetalburgCity_Gym_Movement_PlayerExitWithWallyEast:: @ 8154B5F walk_in_place_fastest_down delay_16 delay_16 @@ -575,25 +575,25 @@ PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F delay_8 step_end -PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 - msgbox PetalburgCity_Gym_Text_17AB17, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NoAmountOfTrainingIsEnough:: @ 8154B69 + msgbox PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 +PetalburgCity_Gym_EventScript_SpeedRoomDoor:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 - msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterSpeedRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 +PetalburgCity_Gym_EventScript_EnterRoom:: @ 8154BA8 closemessage delay 30 warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 @@ -601,427 +601,427 @@ PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 releaseall end -PetalburgCity_Gym_EventScript_154BB7:: @ 8154BB7 +PetalburgCity_Gym_EventScript_DontEnterRoom:: @ 8154BB7 releaseall end -PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 - msgbox PetalburgCity_Gym_Text_17B844, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_DoorLocked:: @ 8154BB9 + msgbox PetalburgCity_Gym_Text_DoorAppearsLocked, MSGBOX_DEFAULT releaseall end -PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 +PetalburgCity_Gym_EventScript_AccuracyRoomDoor:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 - msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterAccuracyRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 +PetalburgCity_Gym_EventScript_ZeroReductionRoomDoor:: @ 8154BF8 lockall - goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 - msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterZeroReductionRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B +PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 8154C2B lockall - goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E +PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8154C5E lockall - goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 +PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8154C91 lockall - goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 - msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterRecoveryRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 +PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8154CC4 lockall - goto_if_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 +PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 8154CF7 lockall - goto_if_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A +PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 8154D2A lockall - goto_if_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D +PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8154D5D lockall - goto_if_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 +PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8154D90 lockall - goto_if_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 +PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8154DC3 lockall - goto_if_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, NO - goto_if_eq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 - trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 - msgbox PetalburgCity_Gym_Text_17AE30, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Randall:: @ 8154DF6 + trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallIntro, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_RandallPostBadge + msgbox PetalburgCity_Gym_Text_RandallPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A +PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors:: @ 8154E1A setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_154FBB + call PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 - msgbox PetalburgCity_Gym_Text_17AEBB, MSGBOX_NPC +PetalburgCity_Gym_EventScript_RandallPostBadge:: @ 8154E29 + msgbox PetalburgCity_Gym_Text_RandallPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 - trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 - msgbox PetalburgCity_Gym_Text_17AFD3, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Parker:: @ 8154E32 + trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerIntro, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_ParkerPostBadge + msgbox PetalburgCity_Gym_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_154E56:: @ 8154E56 +PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors:: @ 8154E56 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_154FFD + call PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 - msgbox PetalburgCity_Gym_Text_17B016, MSGBOX_NPC +PetalburgCity_Gym_EventScript_ParkerPostBadge:: @ 8154E65 + msgbox PetalburgCity_Gym_Text_ParkerPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E - trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 - msgbox PetalburgCity_Gym_Text_17B12C, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_George:: @ 8154E6E + trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgeIntro, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GeorgePostBadge + msgbox PetalburgCity_Gym_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_154E92:: @ 8154E92 +PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors:: @ 8154E92 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_15503F + call PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 - msgbox PetalburgCity_Gym_Text_17B1F4, MSGBOX_NPC +PetalburgCity_Gym_EventScript_GeorgePostBadge:: @ 8154EA1 + msgbox PetalburgCity_Gym_Text_GeorgePostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA - trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD - msgbox PetalburgCity_Gym_Text_17B2E4, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Berke:: @ 8154EAA + trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkeIntro, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_BerkePostBadge + msgbox PetalburgCity_Gym_Text_BerkePostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE +PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors:: @ 8154ECE setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_155081 + call PetalburgCity_Gym_EventScript_OpenOHKORoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD - msgbox PetalburgCity_Gym_Text_17B39B, MSGBOX_NPC +PetalburgCity_Gym_EventScript_BerkePostBadge:: @ 8154EDD + msgbox PetalburgCity_Gym_Text_BerkePostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 - trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 - msgbox PetalburgCity_Gym_Text_17B46F, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Mary:: @ 8154EE6 + trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryIntro, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_MaryPostBadge + msgbox PetalburgCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A +PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors:: @ 8154F0A setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_154FDC + call PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 - msgbox PetalburgCity_Gym_Text_17B521, MSGBOX_NPC +PetalburgCity_Gym_EventScript_MaryPostBadge:: @ 8154F19 + msgbox PetalburgCity_Gym_Text_MaryPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 - trainerbattle_single TRAINER_LORI, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 - msgbox PetalburgCity_Gym_Text_17B5EA, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Lori:: @ 8154F22 + trainerbattle_single TRAINER_LORI, PetalburgCity_Gym_Text_LoriIntro, PetalburgCity_Gym_Text_LoriDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_LoriPostBadge + msgbox PetalburgCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_154F46:: @ 8154F46 +PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors:: @ 8154F46 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_15501E + call PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 - msgbox PetalburgCity_Gym_Text_17B6B5, MSGBOX_NPC +PetalburgCity_Gym_EventScript_LoriPostBadge:: @ 8154F55 + msgbox PetalburgCity_Gym_Text_LoriPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E - trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 - msgbox PetalburgCity_Gym_Text_17B749, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Jody:: @ 8154F5E + trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyIntro, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_JodyPostBadge + msgbox PetalburgCity_Gym_Text_JodiPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_154F82:: @ 8154F82 +PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors:: @ 8154F82 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_155060 + call PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 - msgbox PetalburgCity_Gym_Text_17B7C0, MSGBOX_NPC +PetalburgCity_Gym_EventScript_JodyPostBadge:: @ 8154F91 + msgbox PetalburgCity_Gym_Text_JodiPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A +PetalburgCity_Gym_EventScript_OpenGymEntranceDoors:: @ 8154F9A setvar VAR_0x8004, 1 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_155187 - call PetalburgCity_Gym_EventScript_1550A2 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB +PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors:: @ 8154FBB setvar VAR_0x8004, 2 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_155187 - call PetalburgCity_Gym_EventScript_1550C7 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC +PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors:: @ 8154FDC setvar VAR_0x8004, 3 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_155187 - call PetalburgCity_Gym_EventScript_1550EC + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD +PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors:: @ 8154FFD setvar VAR_0x8004, 4 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_155187 - call PetalburgCity_Gym_EventScript_155111 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_15501E:: @ 815501E +PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors:: @ 815501E setvar VAR_0x8004, 5 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_155187 - call PetalburgCity_Gym_EventScript_155124 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_15503F:: @ 815503F +PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors:: @ 815503F setvar VAR_0x8004, 6 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_155187 - call PetalburgCity_Gym_EventScript_155149 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_155060:: @ 8155060 +PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors:: @ 8155060 setvar VAR_0x8004, 7 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_155187 - call PetalburgCity_Gym_EventScript_15515C + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_155081:: @ 8155081 +PetalburgCity_Gym_EventScript_OpenOHKORoomDoors:: @ 8155081 setvar VAR_0x8004, 8 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_155187 - call PetalburgCity_Gym_EventScript_15516F + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles return -PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2 +PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles:: @ 81550A2 setmetatile 6, 85, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 85, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 98, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 98, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7 +PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles:: @ 81550C7 setmetatile 6, 46, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 46, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC +PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles:: @ 81550EC setmetatile 6, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 72, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 72, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_155111:: @ 8155111 +PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles:: @ 8155111 setmetatile 1, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_155124:: @ 8155124 +PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles:: @ 8155124 setmetatile 6, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_155149:: @ 8155149 +PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles:: @ 8155149 setmetatile 6, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_15515C:: @ 815515C +PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles:: @ 815515C setmetatile 1, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_15516F:: @ 815516F +PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles:: @ 815516F setmetatile 6, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_155182:: @ 8155182 +PetalburgCity_Gym_EventScript_SlideOpenRoomDoors:: @ 8155182 special PetalburgGymSlideOpenDoors waitstate return -PetalburgCity_Gym_EventScript_155187:: @ 8155187 +PetalburgCity_Gym_EventScript_UnlockRoomDoors:: @ 8155187 special PetalburgGymOpenDoorsInstantly return -PetalburgCity_Gym_EventScript_15518B:: @ 815518B +PetalburgCity_Gym_EventScript_GymGuide:: @ 815518B lock faceplayer - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0 - msgbox PetalburgCity_Gym_Text_17AB96, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GymGuidePostVictory + msgbox PetalburgCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 - msgbox PetalburgCity_Gym_Text_17AD49, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_GymGuidePostVictory:: @ 81551A0 + msgbox PetalburgCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA +PetalburgCity_Gym_EventScript_LeftGymStatue:: @ 81551AA lockall - goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA - goto PetalburgCity_Gym_EventScript_1551D4 + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_GymStatueCertified + goto PetalburgCity_Gym_EventScript_GymStatue end -PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA +PetalburgCity_Gym_EventScript_RightGymStatue:: @ 81551BA lockall - goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA - goto PetalburgCity_Gym_EventScript_1551D4 + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_GymStatueCertified + goto PetalburgCity_Gym_EventScript_GymStatue end -PetalburgCity_Gym_EventScript_1551CA:: @ 81551CA - msgbox PetalburgCity_Gym_Text_17BAC0, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_GymStatueCertified:: @ 81551CA + msgbox PetalburgCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -PetalburgCity_Gym_EventScript_1551D4:: @ 81551D4 - msgbox PetalburgCity_Gym_Text_17BAA5, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_GymStatue:: @ 81551D4 + msgbox PetalburgCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/PetalburgCity_Gym/text.inc b/data/maps/PetalburgCity_Gym/text.inc index 435ddc924..145c111ad 100644 --- a/data/maps/PetalburgCity_Gym/text.inc +++ b/data/maps/PetalburgCity_Gym/text.inc @@ -1,4 +1,4 @@ -PetalburgCity_Gym_Text_179DF6:: @ 8179DF6 +PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon:: @ 8179DF6 .string "DAD: Hm?\p" .string "Well, if it isn't {PLAYER}!\n" .string "So you're all finished moving in?\p" @@ -11,15 +11,15 @@ PetalburgCity_Gym_Text_179DF6:: @ 8179DF6 .string "That's great news!\n" .string "I'll be looking forward to it!$" -PetalburgCity_Gym_Text_179F07:: @ 8179F07 +PetalburgCity_Gym_Text_WallyIdLikeAPokemon:: @ 8179F07 .string "Um... I... I'd like to get a\n" .string "POKéMON, please...$" -PetalburgCity_Gym_Text_179F37:: @ 8179F37 +PetalburgCity_Gym_Text_DadOhYoureWallyRight:: @ 8179F37 .string "DAD: Hm? You're... Uh... Oh, right.\n" .string "You're WALLY, right?$" -PetalburgCity_Gym_Text_179F70:: @ 8179F70 +PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon:: @ 8179F70 .string "WALLY: I'm going to go stay with my\n" .string "relatives in VERDANTURF TOWN.\p" .string "I thought I would be lonely by myself,\n" @@ -27,38 +27,38 @@ PetalburgCity_Gym_Text_179F70:: @ 8179F70 .string "But I've never caught a POKéMON before.\n" .string "I don't know how...$" -PetalburgCity_Gym_Text_17A03A:: @ 817A03A +PetalburgCity_Gym_Text_DadHmISee:: @ 817A03A .string "DAD: Hm. I see.$" -PetalburgCity_Gym_Text_17A04A:: @ 817A04A +PetalburgCity_Gym_Text_DadPlayerGoWithWally:: @ 817A04A .string "DAD: {PLAYER}, you heard that,\n" .string "right?\p" .string "Go with WALLY and make sure that he\n" .string "safely catches a POKéMON.$" -PetalburgCity_Gym_Text_17A0A8:: @ 817A0A8 +PetalburgCity_Gym_Text_IllLoanYouMyZigzagoon:: @ 817A0A8 .string "WALLY, here, I'll loan you my POKéMON.\p" .string "WALLY received a ZIGZAGOON!$" -PetalburgCity_Gym_Text_17A0EB:: @ 817A0EB +PetalburgCity_Gym_Text_WallyThankYouAndDadGivesPokeBall:: @ 817A0EB .string "WALLY: Oh, wow!\n" .string "A POKéMON!\p" .string "DAD: Hm. I'll give you a POKé BALL, too.\n" .string "Go for it!\p" .string "WALLY received a POKé BALL!$" -PetalburgCity_Gym_Text_17A156:: @ 817A156 +PetalburgCity_Gym_Text_WallyOhWowThankYou:: @ 817A156 .string "WALLY: Oh, wow!\n" .string "Thank you!$" -PetalburgCity_Gym_Text_17A171:: @ 817A171 +PetalburgCity_Gym_Text_WouldYouReallyComeWithMe:: @ 817A171 .string "{PLAYER}... Would you really come\n" .string "with me?$" -PetalburgCity_Gym_Text_17A196:: @ 817A196 +PetalburgCity_Gym_Text_DadSoDidItWorkOut:: @ 817A196 .string "DAD: So, did it work out?$" -PetalburgCity_Gym_Text_17A1B0:: @ 817A1B0 +PetalburgCity_Gym_Text_WallyThankYouBye:: @ 817A1B0 .string "WALLY: Thank you, yes, it did.\n" .string "Here's your POKéMON back.\p" .string "{PLAYER}, thank you for coming along\n" @@ -71,7 +71,7 @@ PetalburgCity_Gym_Text_17A1B0:: @ 817A1B0 .string "have to go!\p" .string "Bye, {PLAYER}!$" -PetalburgCity_Gym_Text_17A2A4:: @ 817A2A4 +PetalburgCity_Gym_Text_DadGoCollectBadges:: @ 817A2A4 .string "DAD: Now...\p" .string "{PLAYER}, if you want to become a\n" .string "strong TRAINER, here's my advice.\p" @@ -88,7 +88,7 @@ PetalburgCity_Gym_Text_17A2A4:: @ 817A2A4 .string "But that's only after you become\n" .string "stronger, {PLAYER}.$" -PetalburgCity_Gym_Text_17A41E:: @ 817A41E +PetalburgCity_Gym_Text_NormanGoToRustboro:: @ 817A41E .string "DAD: Hm? Aren't you going to the\n" .string "POKéMON GYM in RUSTBORO CITY?\p" .string "There's no challenge for me to\n" @@ -98,7 +98,7 @@ PetalburgCity_Gym_Text_17A41E:: @ 817A41E .string "I'll battle you, {PLAYER}, when you\n" .string "can show me four GYM BADGES, okay?$" -PetalburgCity_Gym_Text_17A518:: @ 817A518 +PetalburgCity_Gym_Text_NormanGoToDewford:: @ 817A518 .string "DAD: I see... So, you've beaten the\n" .string "GYM LEADER in RUSTBORO CITY.\p" .string "But there are many more TRAINERS\n" @@ -107,13 +107,13 @@ PetalburgCity_Gym_Text_17A518:: @ 817A518 .string "GYM LEADER named BRAWLY.\p" .string "You should go challenge him.$" -PetalburgCity_Gym_Text_17A5F3:: @ 817A5F3 +PetalburgCity_Gym_Text_YouHaveGottenStronger:: @ 817A5F3 .string "DAD: Hm... {PLAYER}, you have gotten\n" .string "stronger.\p" .string "I can tell by the number of BADGES\n" .string "that you've earned.$" -PetalburgCity_Gym_Text_17A653:: @ 817A653 +PetalburgCity_Gym_Text_NormanIntro:: @ 817A653 .string "DAD: Hm...\n" .string "So, you did get four GYM BADGES.\p" .string "Fine, as I promised, we will have a\n" @@ -127,7 +127,7 @@ PetalburgCity_Gym_Text_17A653:: @ 817A653 .string "{PLAYER}, you'd better give it your\n" .string "best shot, too!$" -PetalburgCity_Gym_Text_17A77A:: @ 817A77A +PetalburgCity_Gym_Text_NormanDefeat:: @ 817A77A .string "...\p" .string "I... I can't...\p" .string "I can't believe it. {PLAYER}...\p" @@ -135,11 +135,11 @@ PetalburgCity_Gym_Text_17A77A:: @ 817A77A .string "But, rules are rules!\n" .string "Here, take this.$" -PetalburgCity_Gym_Text_17A7DD:: @ 817A7DD +PetalburgCity_Gym_Text_ReceivedBalanceBadge:: @ 817A7DD .string "{PLAYER} received the BALANCE BADGE\n" .string "from DAD!$" -PetalburgCity_Gym_Text_17A805:: @ 817A805 +PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis:: @ 817A805 .string "DAD: With that BADGE, the DEFENSE\n" .string "of all your POKéMON will increase.\p" .string "POKéMON that know the HM move SURF\n" @@ -147,7 +147,7 @@ PetalburgCity_Gym_Text_17A805:: @ 817A805 .string "This is my gift to you. {PLAYER}, I'm\n" .string "sure you can use it correctly.$" -PetalburgCity_Gym_Text_17A8CF:: @ 817A8CF +PetalburgCity_Gym_Text_ExplainFacade:: @ 817A8CF .string "DAD: TM42 contains FACADE.\p" .string "It doubles the power of moves if\n" .string "the POKéMON is poisoned, paralyzed,\l" @@ -155,20 +155,20 @@ PetalburgCity_Gym_Text_17A8CF:: @ 817A8CF .string "It might be able to turn a bad\n" .string "situation into an advantage.$" -PetalburgCity_Gym_Text_17A976:: @ 817A976 +PetalburgCity_Gym_Text_DadHappyAndSad:: @ 817A976 .string "DAD: As the GYM LEADER, I can't\n" .string "express how upset I am...\p" .string "But as a father, it makes me both\n" .string "happy and a little sad. It's odd...$" -PetalburgCity_Gym_Text_17A9F6:: @ 817A9F6 +PetalburgCity_Gym_Text_WallysParentsHaveGiftForYou:: @ 817A9F6 .string "DAD: Oh, yes...\p" .string "WALLY's parents came calling\n" .string "earlier.\p" .string "They said that they had something\n" .string "they wanted to give you, {PLAYER}.$" -PetalburgCity_Gym_Text_17AA6B:: @ 817AA6B +PetalburgCity_Gym_Text_DadGoingToKeepTraining:: @ 817AA6B .string "DAD: {PLAYER}, you should go visit\n" .string "your mother every so often.\p" .string "I'm going to stay here and redouble\n" @@ -176,13 +176,13 @@ PetalburgCity_Gym_Text_17AA6B:: @ 817AA6B .string "It would bother me as a TRAINER to\n" .string "not avenge my loss to you, {PLAYER}!$" -PetalburgCity_Gym_Text_17AB17:: @ 817AB17 +PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough:: @ 817AB17 .string "DAD: {PLAYER}, how are things going?\p" .string "The world of POKéMON is deep.\p" .string "I honestly think that no amount of\n" .string "training would ever be enough.$" -PetalburgCity_Gym_Text_17AB96:: @ 817AB96 +PetalburgCity_Gym_Text_GymGuideAdvice:: @ 817AB96 .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "The doors in this GYM open when you\n" @@ -200,22 +200,22 @@ PetalburgCity_Gym_Text_17AB96:: @ 817AB96 .string "Once you've chosen the door...\n" .string "Well, hey, go for it!$" -PetalburgCity_Gym_Text_17AD49:: @ 817AD49 +PetalburgCity_Gym_Text_GymGuidePostVictory:: @ 817AD49 .string "{PLAYER}! Whoa! You've overcome even\n" .string "your own father!\p" .string "Like, whoa!\n" .string "What a stunning turn of events!$" -PetalburgCity_Gym_Text_17ADA5:: @ 817ADA5 +PetalburgCity_Gym_Text_RandallIntro:: @ 817ADA5 .string "The ability to attack before the\n" .string "opponent...\p" .string "Just that alone puts me at a great\n" .string "advantage, don't you agree?$" -PetalburgCity_Gym_Text_17AE11:: @ 817AE11 +PetalburgCity_Gym_Text_RandallDefeat:: @ 817AE11 .string "That was a magnificent battle!$" -PetalburgCity_Gym_Text_17AE30:: @ 817AE30 +PetalburgCity_Gym_Text_RandallPostBattle:: @ 817AE30 .string "Go on to the next room where a new\n" .string "challenge awaits you.\p" .string "At the left is the ZERO REDUCTION\n" @@ -223,30 +223,30 @@ PetalburgCity_Gym_Text_17AE30:: @ 817AE30 .string "The right door leads to the DEFENSE\n" .string "ROOM.$" -PetalburgCity_Gym_Text_17AEBB:: @ 817AEBB +PetalburgCity_Gym_Text_RandallPostBadge:: @ 817AEBB .string "Whomever you beat, and whomever you\n" .string "may lose to, you never shirk from\l" .string "training yourself and your POKéMON.\p" .string "That's what I think being a\n" .string "GYM LEADER is all about.$" -PetalburgCity_Gym_Text_17AF5A:: @ 817AF5A +PetalburgCity_Gym_Text_ParkerIntro:: @ 817AF5A .string "Don't waste your time trying to\n" .string "lower my POKéMON's abilities!$" -PetalburgCity_Gym_Text_17AF98:: @ 817AF98 +PetalburgCity_Gym_Text_ParkerDefeat:: @ 817AF98 .string "My POKéMON's abilities weren't\n" .string "harmed, but I still lost...$" -PetalburgCity_Gym_Text_17AFD3:: @ 817AFD3 +PetalburgCity_Gym_Text_ParkerPostBattle:: @ 817AFD3 .string "The next room is the STRENGTH ROOM.\n" .string "Can you withstand brute force?$" -PetalburgCity_Gym_Text_17B016:: @ 817B016 +PetalburgCity_Gym_Text_ParkerPostBadge:: @ 817B016 .string "After you beat our LEADER, the\n" .string "training has become a lot tougher.$" -PetalburgCity_Gym_Text_17B058:: @ 817B058 +PetalburgCity_Gym_Text_GeorgeIntro:: @ 817B058 .string "Just when you think you're going to\n" .string "win, your opponent restores HP...\p" .string "Can you just imagine how awful that\n" @@ -254,11 +254,11 @@ PetalburgCity_Gym_Text_17B058:: @ 817B058 .string "I'll show you exactly how awful it\n" .string "feels!$" -PetalburgCity_Gym_Text_17B0F7:: @ 817B0F7 +PetalburgCity_Gym_Text_GeorgeDefeat:: @ 817B0F7 .string "I couldn't restore HP enough...\n" .string "What ATTACK power...$" -PetalburgCity_Gym_Text_17B12C:: @ 817B12C +PetalburgCity_Gym_Text_GeorgePostBattle:: @ 817B12C .string "I should have expected no less from\n" .string "our LEADER's kid.\p" .string "No, wait! A TRAINER's abilities are\n" @@ -267,21 +267,21 @@ PetalburgCity_Gym_Text_17B12C:: @ 817B12C .string "weren't enough.\p" .string "Go on! The ONE-HIT KO ROOM is next.$" -PetalburgCity_Gym_Text_17B1F4:: @ 817B1F4 +PetalburgCity_Gym_Text_GeorgePostBadge:: @ 817B1F4 .string "I'm going to keep training at GYMS.\n" .string "One day, I'll become a LEADER.$" -PetalburgCity_Gym_Text_17B237:: @ 817B237 +PetalburgCity_Gym_Text_BerkeIntro:: @ 817B237 .string "I'm not going to take it easy just\n" .string "because you're our LEADER's kid.\p" .string "I'll show you how horrid it is for\n" .string "a POKéMON to take a critical hit!$" -PetalburgCity_Gym_Text_17B2C0:: @ 817B2C0 +PetalburgCity_Gym_Text_BerkeDefeat:: @ 817B2C0 .string "Your power...\n" .string "You're the real deal.$" -PetalburgCity_Gym_Text_17B2E4:: @ 817B2E4 +PetalburgCity_Gym_Text_BerkePostBattle:: @ 817B2E4 .string "Your father really is strong. He's\n" .string "a TRAINER worth my respect.\p" .string "And, I sense the same glow coming\n" @@ -289,21 +289,21 @@ PetalburgCity_Gym_Text_17B2E4:: @ 817B2E4 .string "I hope that you'll stage a terrific\n" .string "battle with your father!$" -PetalburgCity_Gym_Text_17B39B:: @ 817B39B +PetalburgCity_Gym_Text_BerkePostBadge:: @ 817B39B .string "Since your dad became the LEADER,\n" .string "the TRAINERS of PETALBURG CITY have\l" .string "become a lot tougher.$" -PetalburgCity_Gym_Text_17B3F7:: @ 817B3F7 +PetalburgCity_Gym_Text_MaryIntro:: @ 817B3F7 .string "Giggle...\n" .string "This is the ACCURACY ROOM.\p" .string "It's pretty nasty when every attack\n" .string "lands without fail.$" -PetalburgCity_Gym_Text_17B454:: @ 817B454 +PetalburgCity_Gym_Text_MaryDefeat:: @ 817B454 .string "You were a cut above me...$" -PetalburgCity_Gym_Text_17B46F:: @ 817B46F +PetalburgCity_Gym_Text_MaryPostBattle:: @ 817B46F .string "There are some even stronger\n" .string "TRAINERS waiting for you.\p" .string "The left is the DEFENSE ROOM, and\n" @@ -311,20 +311,20 @@ PetalburgCity_Gym_Text_17B46F:: @ 817B46F .string "Your POKéMON's ATTACK power will be\n" .string "on trial either way.$" -PetalburgCity_Gym_Text_17B521:: @ 817B521 +PetalburgCity_Gym_Text_MaryPostBadge:: @ 817B521 .string "Do you know what we're trying to\n" .string "achieve as TRAINERS?\p" .string "We're striving to become soul mates\n" .string "with our POKéMON.$" -PetalburgCity_Gym_Text_17B58D:: @ 817B58D +PetalburgCity_Gym_Text_LoriIntro:: @ 817B58D .string "The higher the DEFENSE, the more\n" .string "reckless I can be in attack.$" -PetalburgCity_Gym_Text_17B5CB:: @ 817B5CB +PetalburgCity_Gym_Text_LoriDefeat:: @ 817B5CB .string "Our defenses weren't enough...$" -PetalburgCity_Gym_Text_17B5EA:: @ 817B5EA +PetalburgCity_Gym_Text_LoriPostBattle:: @ 817B5EA .string "I think you've taught me a valuable\n" .string "lesson here.\p" .string "Now, go on! The left door goes to\n" @@ -334,36 +334,36 @@ PetalburgCity_Gym_Text_17B5EA:: @ 817B5EA .string "Both of them have TRAINERS who are\n" .string "offensively skilled.$" -PetalburgCity_Gym_Text_17B6B5:: @ 817B6B5 +PetalburgCity_Gym_Text_LoriPostBadge:: @ 817B6B5 .string "Hi! Have you tried using SURF?$" -PetalburgCity_Gym_Text_17B6D4:: @ 817B6D4 +PetalburgCity_Gym_Text_JodyIntro:: @ 817B6D4 .string "Our GYM LEADER told us to go all out\n" .string "and beat you.\p" .string "Even if you happen to be the\n" .string "LEADER's kid!$" -PetalburgCity_Gym_Text_17B732:: @ 817B732 +PetalburgCity_Gym_Text_JodyDefeat:: @ 817B732 .string "But... I went all out!$" -PetalburgCity_Gym_Text_17B749:: @ 817B749 +PetalburgCity_Gym_Text_JodiPostBattle:: @ 817B749 .string "The way you use your POKéMON...\n" .string "It's like your father's style.\p" .string "Go on through! The GYM LEADER, your\n" .string "father, is waiting!$" -PetalburgCity_Gym_Text_17B7C0:: @ 817B7C0 +PetalburgCity_Gym_Text_JodiPostBadge:: @ 817B7C0 .string "Sure, it's fine to make your POKéMON\n" .string "stronger.\p" .string "But what decides the winner?\p" .string "Why, it's the feelings TRAINERS have for\n" .string "their POKéMON.$" -PetalburgCity_Gym_Text_17B844:: @ 817B844 +PetalburgCity_Gym_Text_DoorAppearsLocked:: @ 817B844 .string "This door appears to be locked\n" .string "right now...$" -PetalburgCity_Gym_Text_17B870:: @ 817B870 +PetalburgCity_Gym_Text_EnterSpeedRoom:: @ 817B870 .string "“SPEED ROOM,” the sign says.\p" .string "Do you want to go through?$" @@ -371,41 +371,41 @@ UnknownString_817B8A8: @ 817B8A8 .string "This door appears to be locked\n" .string "right now...$" -PetalburgCity_Gym_Text_17B8D4:: @ 817B8D4 +PetalburgCity_Gym_Text_EnterAccuracyRoom:: @ 817B8D4 .string "“ACCURACY ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_17B90F:: @ 817B90F +PetalburgCity_Gym_Text_EnterZeroReductionRoom:: @ 817B90F .string "“ZERO REDUCTION ROOM,” the sign\n" .string "says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_17B950:: @ 817B950 +PetalburgCity_Gym_Text_EnterDefenseRoom:: @ 817B950 .string "“DEFENSE ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_17B98A:: @ 817B98A +PetalburgCity_Gym_Text_EnterRecoveryRoom:: @ 817B98A .string "“RECOVERY ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_17B9C5:: @ 817B9C5 +PetalburgCity_Gym_Text_EnterStrengthRoom:: @ 817B9C5 .string "“STRENGTH ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_17BA00:: @ 817BA00 +PetalburgCity_Gym_Text_EnterOHKORoom:: @ 817BA00 .string "“ONE-HIT KO ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_17BA3D:: @ 817BA3D +PetalburgCity_Gym_Text_EnterGymLeadersRoom:: @ 817BA3D .string "“GYM LEADER'S ROOM\p" .string "“See for yourself what POKéMON await\n" .string "you!” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_17BAA5:: @ 817BAA5 +PetalburgCity_Gym_Text_GymStatue:: @ 817BAA5 .string "PETALBURG CITY POKéMON GYM$" -PetalburgCity_Gym_Text_17BAC0:: @ 817BAC0 +PetalburgCity_Gym_Text_GymStatueCertified:: @ 817BAC0 .string "PETALBURG CITY POKéMON GYM\p" .string "NORMAN'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index ba92f045a..8631e37ce 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House1_EventScript_1551E8", + "script": "PetalburgCity_House1_EventScript_Woman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House1_EventScript_1551DF", + "script": "PetalburgCity_House1_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc index f398a86bc..04c995e34 100644 --- a/data/maps/PetalburgCity_House1/scripts.inc +++ b/data/maps/PetalburgCity_House1/scripts.inc @@ -1,10 +1,10 @@ PetalburgCity_House1_MapScripts:: @ 81551DE .byte 0 -PetalburgCity_House1_EventScript_1551DF:: @ 81551DF - msgbox PetalburgCity_House1_Text_17BAFB, MSGBOX_NPC +PetalburgCity_House1_EventScript_Man:: @ 81551DF + msgbox PetalburgCity_House1_Text_TravelingIsWonderful, MSGBOX_NPC end -PetalburgCity_House1_EventScript_1551E8:: @ 81551E8 - msgbox PetalburgCity_House1_Text_17BB4A, MSGBOX_NPC +PetalburgCity_House1_EventScript_Woman:: @ 81551E8 + msgbox PetalburgCity_House1_Text_GoOnAdventure, MSGBOX_NPC end diff --git a/data/maps/PetalburgCity_House1/text.inc b/data/maps/PetalburgCity_House1/text.inc index d41fadd1f..3d3ed75d7 100644 --- a/data/maps/PetalburgCity_House1/text.inc +++ b/data/maps/PetalburgCity_House1/text.inc @@ -1,9 +1,9 @@ -PetalburgCity_House1_Text_17BAFB:: @ 817BAFB +PetalburgCity_House1_Text_TravelingIsWonderful:: @ 817BAFB .string "Traveling is wonderful!\p" .string "When I was young, I roamed the seas\n" .string "and the mountains!$" -PetalburgCity_House1_Text_17BB4A:: @ 817BB4A +PetalburgCity_House1_Text_GoOnAdventure:: @ 817BB4A .string "Sigh...\p" .string "I wish I could go on an adventure\n" .string "with some POKéMON...\p" diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 442f63825..3677a2e58 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House2_EventScript_1551F2", + "script": "PetalburgCity_House2_EventScript_Woman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House2_EventScript_1551FB", + "script": "PetalburgCity_House2_EventScript_SchoolKid", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc index a526b9d1d..5bdcc8994 100644 --- a/data/maps/PetalburgCity_House2/scripts.inc +++ b/data/maps/PetalburgCity_House2/scripts.inc @@ -1,10 +1,10 @@ PetalburgCity_House2_MapScripts:: @ 81551F1 .byte 0 -PetalburgCity_House2_EventScript_1551F2:: @ 81551F2 - msgbox PetalburgCity_House2_Text_17BC4F, MSGBOX_NPC +PetalburgCity_House2_EventScript_Woman:: @ 81551F2 + msgbox PetalburgCity_House2_Text_NormanBecameGymLeader, MSGBOX_NPC end -PetalburgCity_House2_EventScript_1551FB:: @ 81551FB - msgbox PetalburgCity_House2_Text_17BCB1, MSGBOX_NPC +PetalburgCity_House2_EventScript_SchoolKid:: @ 81551FB + msgbox PetalburgCity_House2_Text_BattledNormanOnce, MSGBOX_NPC end diff --git a/data/maps/PetalburgCity_House2/text.inc b/data/maps/PetalburgCity_House2/text.inc index 26cf2f941..a3d3df11e 100644 --- a/data/maps/PetalburgCity_House2/text.inc +++ b/data/maps/PetalburgCity_House2/text.inc @@ -1,10 +1,10 @@ -PetalburgCity_House2_Text_17BC4F:: @ 817BC4F +PetalburgCity_House2_Text_NormanBecameGymLeader:: @ 817BC4F .string "NORMAN became our town's new GYM\n" .string "LEADER.\p" .string "I think he called his family over from\n" .string "the JOHTO region.$" -PetalburgCity_House2_Text_17BCB1:: @ 817BCB1 +PetalburgCity_House2_Text_BattledNormanOnce:: @ 817BCB1 .string "I battled NORMAN once, but, whew,\n" .string "he was way too strong.\p" .string "How would I put it?\p" diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index 76ab187b1..de72c2748 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_1552B0", + "script": "PetalburgCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_15532C", + "script": "PetalburgCity_Mart_EventScript_Man", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_155323", + "script": "PetalburgCity_Mart_EventScript_Boy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_15531A", + "script": "PetalburgCity_Mart_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 094c2a252..7f19aadf9 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -1,19 +1,19 @@ PetalburgCity_Mart_MapScripts:: @ 81552AF .byte 0 -PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 +PetalburgCity_Mart_EventScript_Clerk:: @ 81552B0 lock faceplayer message Text_HowMayIServeYou waitmessage - goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_1552EA - pokemart PetalburgCity_Mart_Items1 + goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_ExpandedItems + pokemart PetalburgCity_Mart_Pokemart_Basic msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -PetalburgCity_Mart_Items1:: @ 81552D0 +PetalburgCity_Mart_Pokemart_Basic:: @ 81552D0 .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE @@ -29,14 +29,14 @@ PetalburgCity_Mart_Items1:: @ 81552D0 release end -PetalburgCity_Mart_EventScript_1552EA:: @ 81552EA - pokemart PetalburgCity_Mart_Items2 +PetalburgCity_Mart_EventScript_ExpandedItems:: @ 81552EA + pokemart PetalburgCity_Mart_Pokemart_Expanded msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -PetalburgCity_Mart_Items2:: @ 81552FC +PetalburgCity_Mart_Pokemart_Expanded:: @ 81552FC .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_POTION @@ -54,14 +54,14 @@ PetalburgCity_Mart_Items2:: @ 81552FC release end -PetalburgCity_Mart_EventScript_15531A:: @ 815531A - msgbox PetalburgCity_Mart_Text_17BFFD, MSGBOX_NPC +PetalburgCity_Mart_EventScript_Woman:: @ 815531A + msgbox PetalburgCity_Mart_Text_WeakWillGrowStronger, MSGBOX_NPC end -PetalburgCity_Mart_EventScript_155323:: @ 8155323 - msgbox PetalburgCity_Mart_Text_17C06C, MSGBOX_NPC +PetalburgCity_Mart_EventScript_Boy:: @ 8155323 + msgbox PetalburgCity_Mart_Text_RepelIsUseful, MSGBOX_NPC end -PetalburgCity_Mart_EventScript_15532C:: @ 815532C - msgbox PetalburgCity_Mart_Text_17C0BC, MSGBOX_NPC +PetalburgCity_Mart_EventScript_Man:: @ 815532C + msgbox PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou, MSGBOX_NPC end diff --git a/data/maps/PetalburgCity_Mart/text.inc b/data/maps/PetalburgCity_Mart/text.inc index f1e7205df..a6a0c2d65 100644 --- a/data/maps/PetalburgCity_Mart/text.inc +++ b/data/maps/PetalburgCity_Mart/text.inc @@ -1,15 +1,15 @@ -PetalburgCity_Mart_Text_17BFFD:: @ 817BFFD +PetalburgCity_Mart_Text_WeakWillGrowStronger:: @ 817BFFD .string "Even if a POKéMON is weak now,\n" .string "it will grow stronger.\p" .string "The most important thing is love!\n" .string "Love for your POKéMON!$" -PetalburgCity_Mart_Text_17C06C:: @ 817C06C +PetalburgCity_Mart_Text_RepelIsUseful:: @ 817C06C .string "Do you use REPEL?\n" .string "It keeps POKéMON away, so it's\l" .string "useful when you're in a hurry.$" -PetalburgCity_Mart_Text_17C0BC:: @ 817C0BC +PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou:: @ 817C0BC .string "Do you have any ANTIDOTES with\n" .string "you?\p" .string "If you walk around with a poisoned\n" diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index f30ef3895..bfa78a2ca 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_155213", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_155221", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_FatMan", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_15522A", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_155233", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 4edcb9555..0db976b49 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,13 +1,13 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_15520A + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition .byte 0 -PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A +PetalburgCity_PokemonCenter_1F_OnTransition:: @ 815520A setrespawn HEAL_LOCATION_PETALBURG_CITY call Common_EventScript_UpdateBrineyLocation end -PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 +PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: @ 8155213 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,42 +15,42 @@ PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 release end -PetalburgCity_PokemonCenter_1F_EventScript_155221:: @ 8155221 - msgbox PetalburgCity_PokemonCenter_1F_Text_17BD30, MSGBOX_NPC +PetalburgCity_PokemonCenter_1F_EventScript_FatMan:: @ 8155221 + msgbox PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem, MSGBOX_NPC end -PetalburgCity_PokemonCenter_1F_EventScript_15522A:: @ 815522A - msgbox PetalburgCity_PokemonCenter_1F_Text_17BD92, MSGBOX_NPC +PetalburgCity_PokemonCenter_1F_EventScript_Youngster:: @ 815522A + msgbox PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP, MSGBOX_NPC end -PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 +PetalburgCity_PokemonCenter_1F_EventScript_Woman:: @ 8155233 lock faceplayer - msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, MSGBOX_DEFAULT + msgbox PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon, MSGBOX_DEFAULT specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayStarterTypeInfo release end -PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F +PetalburgCity_PokemonCenter_1F_EventScript_SayStarterTypeInfo:: @ 815524F compare VAR_STARTER_MON, 0 - call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155272 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayTreeckoType compare VAR_STARTER_MON, 1 - call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15527B + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayTorchicType compare VAR_STARTER_MON, 2 - call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155284 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayMudkipType release end -PetalburgCity_PokemonCenter_1F_EventScript_155272:: @ 8155272 - msgbox PetalburgCity_PokemonCenter_1F_Text_17BE6C, MSGBOX_DEFAULT +PetalburgCity_PokemonCenter_1F_EventScript_SayTreeckoType:: @ 8155272 + msgbox PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType, MSGBOX_DEFAULT return -PetalburgCity_PokemonCenter_1F_EventScript_15527B:: @ 815527B - msgbox PetalburgCity_PokemonCenter_1F_Text_17BEF1, MSGBOX_DEFAULT +PetalburgCity_PokemonCenter_1F_EventScript_SayTorchicType:: @ 815527B + msgbox PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType, MSGBOX_DEFAULT return -PetalburgCity_PokemonCenter_1F_EventScript_155284:: @ 8155284 - msgbox PetalburgCity_PokemonCenter_1F_Text_17BF73, MSGBOX_DEFAULT +PetalburgCity_PokemonCenter_1F_EventScript_SayMudkipType:: @ 8155284 + msgbox PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType, MSGBOX_DEFAULT return diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/text.inc b/data/maps/PetalburgCity_PokemonCenter_1F/text.inc index d25e3dfb7..7bc87fce7 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/text.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/text.inc @@ -1,21 +1,21 @@ -PetalburgCity_PokemonCenter_1F_Text_17BD30:: @ 817BD30 +PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem:: @ 817BD30 .string "That PC-based POKéMON storage\n" .string "system...\p" .string "Whoever made it must be some kind\n" .string "of a scientific wizard!$" -PetalburgCity_PokemonCenter_1F_Text_17BD92:: @ 817BD92 +PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP:: @ 817BD92 .string "When my POKéMON ate an\n" .string "ORAN BERRY, it regained HP!$" -PetalburgCity_PokemonCenter_1F_Text_17BDC5:: @ 817BDC5 +PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon:: @ 817BDC5 .string "There are many types of POKéMON.\p" .string "All types have their strengths and\n" .string "weaknesses against other types.\p" .string "Depending on the types of POKéMON,\n" .string "a battle could be easy or hard.$" -PetalburgCity_PokemonCenter_1F_Text_17BE6C:: @ 817BE6C +PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType:: @ 817BE6C .string "For example, your TREECKO is a\n" .string "GRASS type.\p" .string "It's strong against the WATER and\n" @@ -23,7 +23,7 @@ PetalburgCity_PokemonCenter_1F_Text_17BE6C:: @ 817BE6C .string "But, it's weak against FIRE-type\n" .string "POKéMON.$" -PetalburgCity_PokemonCenter_1F_Text_17BEF1:: @ 817BEF1 +PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType:: @ 817BEF1 .string "For example, your TORCHIC is a\n" .string "FIRE type.\p" .string "It's strong against the GRASS and\n" @@ -31,7 +31,7 @@ PetalburgCity_PokemonCenter_1F_Text_17BEF1:: @ 817BEF1 .string "But, it's weak against WATER-type\n" .string "POKéMON.$" -PetalburgCity_PokemonCenter_1F_Text_17BF73:: @ 817BF73 +PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType:: @ 817BF73 .string "For example, your MUDKIP is a\n" .string "WATER type.\p" .string "It's strong against the FIRE type.\p" diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index ba9caddf0..1937a8beb 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_WallysHouse_EventScript_1543C4", + "script": "PetalburgCity_WallysHouse_EventScript_WallysDad", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_WallysHouse_EventScript_154445", + "script": "PetalburgCity_WallysHouse_EventScript_WallysMom", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index cfc7c0e80..08cc35044 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -1,61 +1,61 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3 .byte 0 -PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 +PetalburgCity_WallysHouse_EventScript_WallysDad:: @ 81543C4 lock faceplayer - goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_1543F7 - goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154427 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154406 - goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_15443B - msgbox PetalburgCity_WallysHouse_Text_179805, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_GiveHMSurfAfterVictoryRoad + goto_if_set FLAG_RECEIVED_HM_SURF, PetalburgCity_WallysHouse_EventScript_ReceievedHMSurf + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_GiveHMSurf + goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_PlayedWithWally + msgbox PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally, MSGBOX_DEFAULT setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end -PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 - goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154431 - goto PetalburgCity_WallysHouse_EventScript_154406 +PetalburgCity_WallysHouse_EventScript_GiveHMSurfAfterVictoryRoad:: @ 81543F7 + goto_if_set FLAG_RECEIVED_HM_SURF, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad + goto PetalburgCity_WallysHouse_EventScript_GiveHMSurf end -PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 - msgbox PetalburgCity_WallysHouse_Text_179996, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_GiveHMSurf:: @ 8154406 + msgbox PetalburgCity_WallysHouse_Text_WallyHasBecomeHealthy, MSGBOX_DEFAULT giveitem ITEM_HM03_SURF - setflag FLAG_RECEIVED_HM03 - msgbox PetalburgCity_WallysHouse_Text_179B14, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_HM_SURF + msgbox PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_154427:: @ 8154427 - msgbox PetalburgCity_WallysHouse_Text_179B5B, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_ReceievedHMSurf:: @ 8154427 + msgbox PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_154431:: @ 8154431 - msgbox PetalburgCity_WallysHouse_Text_179B92, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad:: @ 8154431 + msgbox PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B - msgbox PetalburgCity_WallysHouse_Text_179975, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_PlayedWithWally:: @ 815443B + msgbox PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 +PetalburgCity_WallysHouse_EventScript_WallysMom:: @ 8154445 lock faceplayer - goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_15446D - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154463 - msgbox PetalburgCity_WallysHouse_Text_179C2C, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM_SURF, PetalburgCity_WallysHouse_EventScript_ReceivedHMSurf + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_HusbandHasGiftForYou + msgbox PetalburgCity_WallysHouse_Text_WallyWasReallyHappy, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_154463:: @ 8154463 - msgbox PetalburgCity_WallysHouse_Text_179CA1, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_HusbandHasGiftForYou:: @ 8154463 + msgbox PetalburgCity_WallysHouse_Text_HusbandHasSomethingForYou, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_15446D:: @ 815446D - msgbox PetalburgCity_WallysHouse_Text_179D12, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_ReceivedHMSurf:: @ 815446D + msgbox PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgCity_WallysHouse/text.inc b/data/maps/PetalburgCity_WallysHouse/text.inc index 1c3ef3829..56f19251b 100644 --- a/data/maps/PetalburgCity_WallysHouse/text.inc +++ b/data/maps/PetalburgCity_WallysHouse/text.inc @@ -1,4 +1,4 @@ -PetalburgCity_WallysHouse_Text_179805:: @ 8179805 +PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally:: @ 8179805 .string "You're...\n" .string "Ah, you must be {PLAYER}{KUN}, right?\p" .string "Thank you for playing with WALLY a\n" @@ -14,10 +14,10 @@ PetalburgCity_WallysHouse_Text_179805:: @ 8179805 .string "I wonder where he could have\n" .string "gotten by now?$" -PetalburgCity_WallysHouse_Text_179975:: @ 8179975 +PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing:: @ 8179975 .string "I wonder how our WALLY is doing?$" -PetalburgCity_WallysHouse_Text_179996:: @ 8179996 +PetalburgCity_WallysHouse_Text_WallyHasBecomeHealthy:: @ 8179996 .string "Hi there, {PLAYER}{KUN}!\p" .string "Our WALLY's become very healthy\n" .string "since he went to VERDANTURF TOWN.\p" @@ -33,15 +33,15 @@ PetalburgCity_WallysHouse_Text_179996:: @ 8179996 .string "This isn't a bribe or anything, but\n" .string "I'd really like you to have this.$" -PetalburgCity_WallysHouse_Text_179B14:: @ 8179B14 +PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces:: @ 8179B14 .string "If your POKéMON can SURF, you'll be\n" .string "able to go to all sorts of places.$" -PetalburgCity_WallysHouse_Text_179B5B:: @ 8179B5B +PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon:: @ 8179B5B .string "WALLY's coming home soon.\n" .string "I'm looking forward to that.$" -PetalburgCity_WallysHouse_Text_179B92:: @ 8179B92 +PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity:: @ 8179B92 .string "Oh? You met WALLY in EVER GRANDE\n" .string "CITY?\p" .string "Oh, {PLAYER}{KUN}, don't be silly.\p" @@ -49,19 +49,19 @@ PetalburgCity_WallysHouse_Text_179B92:: @ 8179B92 .string "can't go somewhere far away like\l" .string "that all by himself.$" -PetalburgCity_WallysHouse_Text_179C2C:: @ 8179C2C +PetalburgCity_WallysHouse_Text_WallyWasReallyHappy:: @ 8179C2C .string "WALLY was really happy when he told\n" .string "us that he caught a POKéMON.\p" .string "It's been ages since I've seen him\n" .string "smile like that.$" -PetalburgCity_WallysHouse_Text_179CA1:: @ 8179CA1 +PetalburgCity_WallysHouse_Text_HusbandHasSomethingForYou:: @ 8179CA1 .string "Oh, hello, {PLAYER}! We've got\n" .string "something we want you to have.\p" .string "My husband has it, so please have a\n" .string "word with him, dear.$" -PetalburgCity_WallysHouse_Text_179D12:: @ 8179D12 +PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling:: @ 8179D12 .string "I want you to keep this a secret\n" .string "from my husband...\p" .string "But our WALLY left VERDANTURF TOWN\n" diff --git a/data/maps/Route102/text.inc b/data/maps/Route102/text.inc index 52cab9554..3e45b26db 100644 --- a/data/maps/Route102/text.inc +++ b/data/maps/Route102/text.inc @@ -1,4 +1,4 @@ -PetalburgCity_Text_16D361:: @ 816D361 +Route102_Text_WatchMeCatchPokemon:: @ 816D361 .string "WALLY: {PLAYER}...\n" .string "POKéMON hide in tall grass like this,\l" .string "don't they?\p" @@ -6,11 +6,11 @@ PetalburgCity_Text_16D361:: @ 816D361 .string "catch one properly.\p" .string "...Whoa!$" -PetalburgCity_Text_16D3DE:: @ 816D3DE +Route102_Text_WallyIDidIt:: @ 816D3DE .string "WALLY: I did it... It's my...\n" .string "My POKéMON!$" -PetalburgCity_Text_16D408:: @ 816D408 +Route102_Text_LetsGoBack:: @ 816D408 .string "{PLAYER}, thank you!\n" .string "Let's go back to the GYM!$" diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 39b551bb2..11d96a3af 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -158,12 +158,12 @@ Route104_EventScript_14EFD5:: @ 814EFD5 end Route104_EventScript_14F08B:: @ 814F08B - msgbox Route104_Text_16B347, MSGBOX_DEFAULT + msgbox Route104_Text_LandedInDewfordDeliverLetter, MSGBOX_DEFAULT releaseall end Route104_EventScript_14F095:: @ 814F095 - msgbox Route104_Text_16B4B5, MSGBOX_DEFAULT + msgbox Route104_Text_BrineyLandedInDewford, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 7bb35c95c..17ccd6fe7 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -52,7 +52,7 @@ Route109_EventScript_14F548:: @ 814F548 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 hideobjectat 1, MAP_ROUTE109 - msgbox Route109_Text_16B4B5, MSGBOX_DEFAULT + msgbox Route109_Text_BrineyLandedInDewford, MSGBOX_DEFAULT closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority LOCALID_PLAYER, MAP_ROUTE109 diff --git a/data/maps/Route109/text.inc b/data/maps/Route109/text.inc index b7d452a81..6f1bc7db3 100644 --- a/data/maps/Route109/text.inc +++ b/data/maps/Route109/text.inc @@ -1,4 +1,4 @@ -DewfordTown_Text_16E080:: @ 816E080 +DewfordTown_Text_BrineyLandedInSlateportDeliverGoods:: @ 816E080 .string "MR. BRINEY: Ahoy!\n" .string "We've made land in SLATEPORT!\p" .string "I suppose you're going to visit CAPT.\n" @@ -19,7 +19,7 @@ Route109_Text_16E1B1:: @ 816E1B1 .string "MR. BRINEY: Then you go on and deliver\n" .string "the DEVON GOODS. I'll be waiting.$" -DewfordTown_Text_16E1FA:: @ 816E1FA +DewfordTown_Text_BrineyLandedInSlateport:: @ 816E1FA .string "MR. BRINEY: Ahoy! We've made land in\n" .string "SLATEPORT!\p" .string "You just go on and tell me whenever\n" diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index fa2fa8f67..80c642275 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -1,7 +1,7 @@ Route110_TrickHouseCorridor_MapScripts:: @ 8161CEC - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_161CF2 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_OnTransition .byte 0 -Route110_TrickHouseCorridor_MapScript1_161CF2:: @ 8161CF2 +Route110_TrickHouseCorridor_OnTransition:: @ 8161CF2 setvar VAR_TRICK_HOUSE_STATE, 1 end diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 5630028fa..044be832a 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -21,8 +21,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHouseEnd_EventScript_16199E", - "flag": "FLAG_HIDE_TRICKMASTER_END" + "script": "Route110_TrickHouseEnd_EventScript_TrickMaster", + "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN" } ], "warp_events": [ @@ -49,7 +49,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHouseEnd_EventScript_161CA0" + "script": "Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger" } ], "bg_events": [ diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 80dd2c603..3927b5f70 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,170 +1,170 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 - map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_16194B - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_161957 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_16197C - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_161965 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_OnWarp .byte 0 -Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B +Route110_TrickHouseEnd_OnResume:: @ 816194B compare VAR_TEMP_1, 1 - call_if_eq Route110_TrickHouseEnd_EventScript_161994 + call_if_eq Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile end -Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 +Route110_TrickHouseEnd_OnTransition:: @ 8161957 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 special SetTrickHouseEndRoomFlag end -Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 - map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_16196F +Route110_TrickHouseEnd_OnWarp:: @ 8161965 + map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_SetTrickMasterPos .2byte 0 -Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F +Route110_TrickHouseEnd_EventScript_SetTrickMasterPos:: @ 816196F addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END turnobject 1, 4 end -Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C - map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_161986 +Route110_TrickHouseEnd_OnFrame:: @ 816197C + map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_CloseDoor .2byte 0 -Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 +Route110_TrickHouseEnd_EventScript_CloseDoor:: @ 8161986 setvar VAR_TEMP_1, 1 - call Route110_TrickHouseEnd_EventScript_161994 + call Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile special DrawWholeMapView end -Route110_TrickHouseEnd_EventScript_161994:: @ 8161994 +Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile:: @ 8161994 setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, 1 return -Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E +Route110_TrickHouseEnd_EventScript_TrickMaster:: @ 816199E lock faceplayer - msgbox Route110_TrickHouseEnd_Text_19C281, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouveMadeItToMe, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 switch VAR_TRICK_HOUSE_ROOMS_COMPLETED - case 0, Route110_TrickHouseEnd_EventScript_161A0B - case 1, Route110_TrickHouseEnd_EventScript_161A47 - case 2, Route110_TrickHouseEnd_EventScript_161A83 - case 3, Route110_TrickHouseEnd_EventScript_161ABF - case 4, Route110_TrickHouseEnd_EventScript_161AFB - case 5, Route110_TrickHouseEnd_EventScript_161B37 - case 6, Route110_TrickHouseEnd_EventScript_161B73 - case 7, Route110_TrickHouseEnd_EventScript_161BAF + case 0, Route110_TrickHouseEnd_EventScript_CompletedPuzzle1 + case 1, Route110_TrickHouseEnd_EventScript_CompletedPuzzle2 + case 2, Route110_TrickHouseEnd_EventScript_CompletedPuzzle3 + case 3, Route110_TrickHouseEnd_EventScript_CompletedPuzzle4 + case 4, Route110_TrickHouseEnd_EventScript_CompletedPuzzle5 + case 5, Route110_TrickHouseEnd_EventScript_CompletedPuzzle6 + case 6, Route110_TrickHouseEnd_EventScript_CompletedPuzzle7 + case 7, Route110_TrickHouseEnd_EventScript_CompletedPuzzle8 end -Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B - msgbox Route110_TrickHouseEnd_Text_19C2B2, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle1:: @ 8161A0B + msgbox Route110_TrickHouseEnd_Text_AllNightToPlantTrees, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem ITEM_RARE_CANDY compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_161C4E - msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_161C2E + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 - msgbox Route110_TrickHouseEnd_Text_19C333, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle2:: @ 8161A47 + msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMaze, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem ITEM_TIMER_BALL compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_161C4E - msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_161C2E + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 +Route110_TrickHouseEnd_EventScript_CompletedPuzzle3:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C3A7, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem ITEM_HARD_STONE compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_161C4E - msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_161C2E + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF - msgbox Route110_TrickHouseEnd_Text_19C41F, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle4:: @ 8161ABF + msgbox Route110_TrickHouseEnd_Text_AllNightToShoveBoulders, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem ITEM_SMOKE_BALL compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_161C4E - msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_161C2E + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB - msgbox Route110_TrickHouseEnd_Text_19C491, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle5:: @ 8161AFB + msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem ITEM_TM12_TAUNT compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_161C4E - msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_161C2E + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 - msgbox Route110_TrickHouseEnd_Text_19C515, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle6:: @ 8161B37 + msgbox Route110_TrickHouseEnd_Text_AllNightToInstallDoors, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem ITEM_MAGNET compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_161C4E - msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_161C2E + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 - msgbox Route110_TrickHouseEnd_Text_19C567, MSGBOX_DEFAULT - msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle7:: @ 8161B73 + msgbox Route110_TrickHouseEnd_Text_AllNightSettingUpArrows, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem ITEM_PP_MAX compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_161C4E - msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT + call_if_eq Route110_TrickHouseEnd_EventScript_BagFull + msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT closemessage - call Route110_TrickHouseEnd_EventScript_161C2E + call Route110_TrickHouseEnd_EventScript_TrickMasterExit release end -Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF - msgbox Route110_TrickHouseEnd_Text_19C5AF, MSGBOX_DEFAULT +Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: @ 8161BAF + msgbox Route110_TrickHouseEnd_Text_AllNightPolishingFloors, MSGBOX_DEFAULT closemessage compare VAR_FACING, 1 - call_if_eq Route110_TrickHouseEnd_EventScript_161C74 + call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth compare VAR_FACING, 2 - call_if_eq Route110_TrickHouseEnd_EventScript_161C7F + call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth compare VAR_FACING, 3 - call_if_eq Route110_TrickHouseEnd_EventScript_161C8A + call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest compare VAR_FACING, 4 - call_if_eq Route110_TrickHouseEnd_EventScript_161C95 + call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast delay 30 - msgbox Route110_TrickHouseEnd_Text_19C602, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FacePlayer waitmovement 0 delay 30 - msgbox Route110_TrickHouseEnd_Text_19C691, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_DefeatedMeTakeTent, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 .ifdef SAPPHIRE givedecoration DECOR_BLUE_TENT @@ -172,80 +172,80 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF givedecoration DECOR_RED_TENT .endc compare VAR_RESULT, 0 - call_if_eq Route110_TrickHouseEnd_EventScript_161C61 - msgbox Route110_TrickHouseEnd_Text_19C85C, MSGBOX_DEFAULT - call Route110_TrickHouseEnd_EventScript_161C2E + call_if_eq Route110_TrickHouseEnd_EventScript_NoRoomForTent + msgbox Route110_TrickHouseEnd_Text_LeavingOnJourney, MSGBOX_DEFAULT + call Route110_TrickHouseEnd_EventScript_TrickMasterExit special ResetTrickHouseEndRoomFlag release end -Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E - applymovement 1, Route110_TrickHouseEnd_Movement_161315 +Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 8161C2E + applymovement 1, Route110_TrickHouseEnd_Movement_TrickMasterSpin waitmovement 0 playse SE_M_EXPLOSION - applymovement 1, Route110_TrickHouseEnd_Movement_16131E + applymovement 1, Route110_TrickHouseEnd_Movement_TrickMasterJumpAway waitmovement 0 removeobject 1 addvar VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 return -Route110_TrickHouseEnd_EventScript_161C4E:: @ 8161C4E +Route110_TrickHouseEnd_EventScript_BagFull:: @ 8161C4E call Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEnd_Text_19C92E, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_NoRoomForThis, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return -Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61 +Route110_TrickHouseEnd_EventScript_NoRoomForTent:: @ 8161C61 call Common_EventScript_NoRoomForDecor - msgbox Route110_TrickHouseEnd_Text_19C7D7, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_NoRoomInPC, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return -Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74 +Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth:: @ 8161C74 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -Route110_TrickHouseEnd_EventScript_161C7F:: @ 8161C7F +Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth:: @ 8161C7F applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -Route110_TrickHouseEnd_EventScript_161C8A:: @ 8161C8A +Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest:: @ 8161C8A applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 +Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast:: @ 8161C95 applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 +Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 8161CA0 lockall turnobject 1, 3 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark waitmovement 0 delay 20 - applymovement 1, Route110_TrickHouseEnd_Movement_161CEA + applymovement 1, Route110_TrickHouseEnd_Movement_TrickMasterSurprise waitmovement 0 playse SE_M_EXPLOSION applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox Route110_TrickHouseEnd_Text_19CA8B, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, Route110_TrickHouseEnd_Movement_161CE8 + applymovement LOCALID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom waitmovement 0 delay 4 turnobject 1, 4 releaseall end -Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8 +Route110_TrickHouseEnd_Movement_KeepPlayerInRoom:: @ 8161CE8 walk_down step_end -Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA +Route110_TrickHouseEnd_Movement_TrickMasterSurprise:: @ 8161CEA jump_in_place_left step_end diff --git a/data/maps/Route110_TrickHouseEnd/text.inc b/data/maps/Route110_TrickHouseEnd/text.inc index 7ef97af7b..9b33cc2c5 100644 --- a/data/maps/Route110_TrickHouseEnd/text.inc +++ b/data/maps/Route110_TrickHouseEnd/text.inc @@ -1,15 +1,15 @@ -Route110_TrickHouseEnd_Text_19C281:: @ 819C281 +Route110_TrickHouseEnd_Text_YouveMadeItToMe:: @ 819C281 .string "Aak!\n" .string "You've made it to me?\l" .string "Hmmm... You're sharp!$" -Route110_TrickHouseEnd_Text_19C2B2:: @ 819C2B2 +Route110_TrickHouseEnd_Text_AllNightToPlantTrees:: @ 819C2B2 .string "It took me all night to plant all those\n" .string "trees...\p" .string "You're almost my equal in greatness by\n" .string "one, two, three, four, five, six places!$" -Route110_TrickHouseEnd_Text_19C333:: @ 819C333 +Route110_TrickHouseEnd_Text_AllNightToMakeMaze:: @ 819C333 .string "It took me all night to make the maze...\p" .string "You're almost my equal in greatness by\n" .string "one, two, three, four, five places!$" @@ -20,40 +20,40 @@ Route110_TrickHouseEnd_Text_19C3A7:: @ 819C3A7 .string "You're almost my equal in greatness by\n" .string "one, two, three, four places!$" -Route110_TrickHouseEnd_Text_19C41F:: @ 819C41F +Route110_TrickHouseEnd_Text_AllNightToShoveBoulders:: @ 819C41F .string "It took me all night to shove in those\n" .string "boulders...\p" .string "You're almost my equal in greatness by\n" .string "one, two, three places!$" -Route110_TrickHouseEnd_Text_19C491:: @ 819C491 +Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls:: @ 819C491 .string "It took me all night to make MECHADOLLS\n" .string "and another to think up the quiz...\p" .string "You're almost my equal in greatness by\n" .string "one, two places!$" -Route110_TrickHouseEnd_Text_19C515:: @ 819C515 +Route110_TrickHouseEnd_Text_AllNightToInstallDoors:: @ 819C515 .string "It took me all night to install\n" .string "the doors...\p" .string "You're almost my equal in greatness!$" -Route110_TrickHouseEnd_Text_19C567:: @ 819C567 +Route110_TrickHouseEnd_Text_AllNightSettingUpArrows:: @ 819C567 .string "It took me all night setting up arrows...\p" .string "You're my equal in greatness!$" -Route110_TrickHouseEnd_Text_19C5AF:: @ 819C5AF +Route110_TrickHouseEnd_Text_AllNightPolishingFloors:: @ 819C5AF .string "It took me all night polishing floors...\p" .string "You're above me in greatness!\n" .string "Possibly...$" -Route110_TrickHouseEnd_Text_19C602:: @ 819C602 +Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry:: @ 819C602 .string "Wh-what should I do?\n" .string "My fountain of ideas for tricks has\l" .string "run dry...\p" .string "Perhaps it is time I toured the country\n" .string "on a quest to devise new tricks...$" -Route110_TrickHouseEnd_Text_19C691:: @ 819C691 +Route110_TrickHouseEnd_Text_DefeatedMeTakeTent:: @ 819C691 .string "I hate to admit defeat, but you have\n" .string "bested me!\p" .string "Still, you must have been reeled in by\n" @@ -66,13 +66,13 @@ Route110_TrickHouseEnd_Text_19C691:: @ 819C691 .string "that is myself, I demand that you take\l" .string "this keepsake!$" -Route110_TrickHouseEnd_Text_19C7D7:: @ 819C7D7 +Route110_TrickHouseEnd_Text_NoRoomInPC:: @ 819C7D7 .string "What? No room in your PC?\n" .string "What am I to make of that?\p" .string "I wish I could say that, but I am much\n" .string "too kind and caring, so come back later!$" -Route110_TrickHouseEnd_Text_19C85C:: @ 819C85C +Route110_TrickHouseEnd_Text_LeavingOnJourney:: @ 819C85C .string "... ... ... ... ... ...\p" .string "I am leaving on a journey of discovery.\n" .string "A quest in search of new tricks.\p" @@ -80,17 +80,17 @@ Route110_TrickHouseEnd_Text_19C85C:: @ 819C85C .string "entertain me again.\p" .string "And now, farewell!$" -Route110_TrickHouseEnd_Text_19C90B:: @ 819C90B +Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward:: @ 819C90B .string "Fine!\n" .string "You have earned this reward!$" -Route110_TrickHouseEnd_Text_19C92E:: @ 819C92E +Route110_TrickHouseEnd_Text_NoRoomForThis:: @ 819C92E .string "What? Have you no room for this?\n" .string "What manner of items do you carry?\p" .string "But fine, since you've reached me,\n" .string "your reward will be with me till later.$" -Route110_TrickHouseEnd_Text_19C9BD:: @ 819C9BD +Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou:: @ 819C9BD .string "Scrub that smug smirk from your face!\n" .string "It's much too early to think you've won!\p" .string "I'll make new tricks to stump you, I will.\n" @@ -98,7 +98,7 @@ Route110_TrickHouseEnd_Text_19C9BD:: @ 819C9BD .string "Come back for the next exciting\n" .string "installment!$" -Route110_TrickHouseEnd_Text_19CA8B:: @ 819CA8B +Route110_TrickHouseEnd_Text_YoureIgnoringMe:: @ 819CA8B .string "Now, now! You're ignoring me now?\n" .string "Now that, I consider heartbreaking!$" diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 206b63c78..0f5842c06 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHouseEntrance_EventScript_16121A", + "script": "Route110_TrickHouseEntrance_EventScript_TrickMaster", "flag": "FLAG_HIDE_TRICKMASTER_ENTRANCE" } ], @@ -56,7 +56,7 @@ "elevation": 3, "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE", "var_value": "0", - "script": "Route110_TrickHouseEntrance_EventScript_1618B0" + "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding" }, { "type": "trigger", @@ -65,7 +65,7 @@ "elevation": 3, "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE", "var_value": "0", - "script": "Route110_TrickHouseEntrance_EventScript_1618B0" + "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE", "var_value": "0", - "script": "Route110_TrickHouseEntrance_EventScript_1618B0" + "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE", "var_value": "0", - "script": "Route110_TrickHouseEntrance_EventScript_1618B0" + "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding" } ], "bg_events": [ @@ -93,7 +93,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route110_TrickHouseEntrance_EventScript_16158A" + "script": "Route110_TrickHouseEntrance_EventScript_Door" } ] } diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 588ba7756..b5e3e2323 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -1,220 +1,220 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_160F3B - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_1611CD - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_1610B2 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_OnWarp .byte 0 -Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B +Route110_TrickHouseEntrance_OnTransition:: @ 8160F3B setflag FLAG_LANDMARK_TRICK_HOUSE compare VAR_TRICK_HOUSE_STATE, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE + goto_if_eq Route110_TrickHouseEntrance_EventScript_EnterFromCorridor compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 + goto_if_eq Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E + goto_if_eq Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 - call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 - call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 - case 0, Route110_TrickHouseEntrance_EventScript_16109A - case 1, Route110_TrickHouseEntrance_EventScript_1610A0 - case 3, Route110_TrickHouseEntrance_EventScript_1610A6 - case 4, Route110_TrickHouseEntrance_EventScript_1610AC + case 0, Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger + case 1, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1 + case 3, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2 + case 4, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3 end -Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 +Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward:: @ 8160FB2 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 - goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 + goto_if_eq Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 end -Route110_TrickHouseEntrance_EventScript_160FC8:: @ 8160FC8 +Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward:: @ 8160FC8 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6 end -Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE +Route110_TrickHouseEntrance_EventScript_EnterFromCorridor:: @ 8160FCE setvar VAR_TRICK_HOUSE_STATE, 0 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end -Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE +Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle:: @ 8160FDE setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if_eq Route110_TrickHouseEntrance_EventScript_16103C + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if_eq Route110_TrickHouseEntrance_EventScript_161046 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 - call_if_eq Route110_TrickHouseEntrance_EventScript_161050 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 - call_if_eq Route110_TrickHouseEntrance_EventScript_16105A + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 - call_if_eq Route110_TrickHouseEntrance_EventScript_161064 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 - call_if_eq Route110_TrickHouseEntrance_EventScript_16106E + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 - call_if_eq Route110_TrickHouseEntrance_EventScript_161078 + call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 - call_if_eq Route110_TrickHouseEntrance_EventScript_161082 + call_if_eq Route110_TrickHouseEntrance_EventScript_FinishedPuzzles return -Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088 +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2:: @ 816103C + call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088 +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3:: @ 8161046 + call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088 +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4:: @ 8161050 + call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088 +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5:: @ 816105A + call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088 +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6:: @ 8161064 + call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088 +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7:: @ 816106E + call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088 +Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8:: @ 8161078 + call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle return -Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 +Route110_TrickHouseEntrance_EventScript_FinishedPuzzles:: @ 8161082 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4 return -Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088 +Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle:: @ 8161088 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 return -Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E +Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor:: @ 816108E setobjectxyperm 1, 5, 2 setobjectmovementtype 1, 4 end -Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A +Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger:: @ 816109A setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0 end -Route110_TrickHouseEntrance_EventScript_1610A0:: @ 81610A0 +Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1:: @ 81610A0 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end -Route110_TrickHouseEntrance_EventScript_1610A6:: @ 81610A6 +Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2:: @ 81610A6 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end -Route110_TrickHouseEntrance_EventScript_1610AC:: @ 81610AC +Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3:: @ 81610AC setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end -Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1610F4 - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_161105 - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_1611AF - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_1611AF - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_1611BE +Route110_TrickHouseEntrance_OnWarp:: @ 81610B2 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_TrickMasterFound + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor .2byte 0 -Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 +Route110_TrickHouseEntrance_EventScript_TrickMasterFound:: @ 81610F4 addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 turnobject LOCALID_PLAYER, 3 end -Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 +Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot:: @ 8161105 addobject 1 hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE switch VAR_TRICK_HOUSE_ROOMS_COMPLETED - case 0, Route110_TrickHouseEntrance_EventScript_16116B - case 1, Route110_TrickHouseEntrance_EventScript_161173 - case 2, Route110_TrickHouseEntrance_EventScript_161193 - case 3, Route110_TrickHouseEntrance_EventScript_161183 - case 4, Route110_TrickHouseEntrance_EventScript_16118B - case 5, Route110_TrickHouseEntrance_EventScript_16117B - case 6, Route110_TrickHouseEntrance_EventScript_16119B - case 7, Route110_TrickHouseEntrance_EventScript_1611A3 + case 0, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1 + case 1, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2 + case 2, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3 + case 3, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4 + case 4, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5 + case 5, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6 + case 6, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7 + case 7, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8 end -Route110_TrickHouseEntrance_EventScript_16116B:: @ 816116B +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1:: @ 816116B setobjectxy 1, 6, 3 end -Route110_TrickHouseEntrance_EventScript_161173:: @ 8161173 +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2:: @ 8161173 setobjectxy 1, 11, 5 end -Route110_TrickHouseEntrance_EventScript_16117B:: @ 816117B +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6:: @ 816117B setobjectxy 1, 11, 1 end -Route110_TrickHouseEntrance_EventScript_161183:: @ 8161183 +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4:: @ 8161183 setobjectxy 1, 3, 1 end -Route110_TrickHouseEntrance_EventScript_16118B:: @ 816118B +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5:: @ 816118B setobjectxy 1, 0, 5 end -Route110_TrickHouseEntrance_EventScript_161193:: @ 8161193 +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3:: @ 8161193 setobjectxy 1, 9, 1 end -Route110_TrickHouseEntrance_EventScript_16119B:: @ 816119B +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7:: @ 816119B setobjectxy 1, 8, 1 end -Route110_TrickHouseEntrance_EventScript_1611A3:: @ 81611A3 +Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8:: @ 81611A3 setobjectxy 1, 4, 4 end -Route110_TrickHouseEntrance_EventScript_1611AB:: @ 81611AB +Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster:: @ 81611AB removeobject 1 end -Route110_TrickHouseEntrance_EventScript_1611AF:: @ 81611AF +Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor:: @ 81611AF addobject 1 setobjectxy 1, 5, 2 turnobject 1, 2 end -Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE +Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor:: @ 81611BE addobject 1 setobjectxy 1, 5, 2 turnobject 1, 1 end -Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD - map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1611D7 +Route110_TrickHouseEntrance_OnFrame:: @ 81611CD + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_BeginChallenge .2byte 0 -Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 +Route110_TrickHouseEntrance_EventScript_BeginChallenge:: @ 81611D7 lockall delay 20 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_161327 - msgbox Route110_TrickHouseEntrance_Text_19BD82, MSGBOX_DEFAULT + call_if_eq Route110_TrickHouseEntrance_EventScript_MeetTrickMaster + msgbox Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse, MSGBOX_DEFAULT closemessage delay 20 - applymovement 1, Route110_TrickHouseEntrance_Movement_161315 + applymovement 1, Route110_TrickHouseEntrance_Movement_TrickMasterSpin waitmovement 0 playse SE_M_EXPLOSION - applymovement 1, Route110_TrickHouseEntrance_Movement_16131E + applymovement 1, Route110_TrickHouseEntrance_Movement_TrickMasterJumpAway waitmovement 0 removeobject 1 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1 @@ -222,41 +222,41 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 releaseall end -@ 8161218 +Route110_TrickHouseEntrance_EventScript_UnusedRelease:: @ 8161218 releaseall end -Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A +Route110_TrickHouseEntrance_EventScript_TrickMaster:: @ 816121A lockall switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 - case 0, Route110_TrickHouseEntrance_EventScript_16124D - case 2, Route110_TrickHouseEntrance_EventScript_16136E - case 3, Route110_TrickHouseEntrance_EventScript_161330 - case 6, Route110_TrickHouseEntrance_EventScript_161518 + case 0, Route110_TrickHouseEntrance_EventScript_FoundTrickMaster + case 2, Route110_TrickHouseEntrance_EventScript_GiveReward + case 3, Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle + case 6, Route110_TrickHouseEntrance_EventScript_MechadollReward end -Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D +Route110_TrickHouseEntrance_EventScript_FoundTrickMaster:: @ 816124D playse SE_PIN applymovement LOCALID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6 + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBehindTree compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInDresser compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 - call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8 + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 - call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1 + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInPlanter compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 - call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInCupboard compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 - call_if_eq Route110_TrickHouseEntrance_EventScript_161303 + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBehindWindow compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 - call_if_eq Route110_TrickHouseEntrance_EventScript_16130C + call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion closemessage setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 @@ -264,40 +264,40 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D releaseall end -Route110_TrickHouseEntrance_EventScript_1612CD:: @ 81612CD - msgbox Route110_TrickHouseEntrance_Text_19BA6E, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk:: @ 81612CD + msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_1612D6:: @ 81612D6 - msgbox Route110_TrickHouseEntrance_Text_19BAC0, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBehindTree:: @ 81612D6 + msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindTree, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_1612DF:: @ 81612DF - msgbox Route110_TrickHouseEntrance_Text_19BB11, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundInDresser:: @ 81612DF + msgbox Route110_TrickHouseEntrance_Text_ConcealedInDresser, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_1612E8:: @ 81612E8 - msgbox Route110_TrickHouseEntrance_Text_19BB61, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow:: @ 81612E8 + msgbox Route110_TrickHouseEntrance_Text_ConealedBeyondWindow, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_1612F1:: @ 81612F1 - msgbox Route110_TrickHouseEntrance_Text_19BBB4, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundInPlanter:: @ 81612F1 + msgbox Route110_TrickHouseEntrance_Text_ConcealedInPlanter, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_1612FA:: @ 81612FA - msgbox Route110_TrickHouseEntrance_Text_19BC04, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundInCupboard:: @ 81612FA + msgbox Route110_TrickHouseEntrance_Text_ConcealedInCupboard, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_161303:: @ 8161303 - msgbox Route110_TrickHouseEntrance_Text_19BC55, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBehindWindow:: @ 8161303 + msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindWindow, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C - msgbox Route110_TrickHouseEntrance_Text_19BCA8, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion:: @ 816130C + msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion, MSGBOX_DEFAULT return -Route110_TrickHouseEnd_Movement_161315:: @ 8161315 -Route110_TrickHouseEntrance_Movement_161315:: @ 8161315 +Route110_TrickHouseEnd_Movement_TrickMasterSpin:: @ 8161315 +Route110_TrickHouseEntrance_Movement_TrickMasterSpin:: @ 8161315 face_up delay_4 face_left @@ -308,8 +308,8 @@ Route110_TrickHouseEntrance_Movement_161315:: @ 8161315 delay_4 step_end -Route110_TrickHouseEnd_Movement_16131E:: @ 816131E -Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E +Route110_TrickHouseEnd_Movement_TrickMasterJumpAway:: @ 816131E +Route110_TrickHouseEntrance_Movement_TrickMasterJumpAway:: @ 816131E face_up disable_anim slide_up @@ -320,12 +320,12 @@ Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E slide_up step_end -Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 - msgbox Route110_TrickHouseEntrance_Text_19BCFD, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_MeetTrickMaster:: @ 8161327 + msgbox Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster, MSGBOX_DEFAULT return -Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 - msgbox Route110_TrickHouseEntrance_Text_19BF19, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle:: @ 8161330 + msgbox Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FacePlayer waitmovement 0 @@ -334,103 +334,103 @@ Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_19BFAB, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges, MSGBOX_DEFAULT applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E +Route110_TrickHouseEntrance_EventScript_GiveReward:: @ 816136E applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_19C07E, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward, MSGBOX_DEFAULT compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 - goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 - goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 - goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward end -Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE +Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 81613CE giveitem ITEM_RARE_CANDY compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, 0 call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA +Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 81613FA giveitem ITEM_TIMER_BALL compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, 0 call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 +Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8161426 giveitem ITEM_HARD_STONE compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, 0 call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 +Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8161452 giveitem ITEM_SMOKE_BALL compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, 0 call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E +Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 816147E giveitem ITEM_TM12_TAUNT compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, 0 call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA +Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 81614AA giveitem ITEM_MAGNET compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, 0 call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 +Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: @ 81614D6 giveitem ITEM_PP_MAX compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward compare VAR_RESULT, 0 call_if_eq Common_EventScript_BagIsFull - msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502 +Route110_TrickHouseEntrance_EventScript_GotReward:: @ 8161502 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 applymovement 1, Common_Movement_WalkInPlaceFastestUp @@ -438,32 +438,32 @@ Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502 releaseall end -Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 +Route110_TrickHouseEntrance_EventScript_MechadollReward:: @ 8161518 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_19C128, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_MechadollWhichTent, MSGBOX_DEFAULT .ifdef SAPPHIRE givedecoration DECOR_BLUE_TENT .else givedecoration DECOR_RED_TENT .endif compare VAR_RESULT, 1 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 + goto_if_eq Route110_TrickHouseEntrance_EventScript_ReceivedTent compare VAR_RESULT, 0 call_if_eq Common_EventScript_NoRoomForDecor - msgbox Route110_TrickHouseEntrance_Text_19C18D, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_PCFullAgain, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 - msgbox Route110_TrickHouseEntrance_Text_19C17E, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 8161551 + msgbox Route110_TrickHouseEntrance_Text_ThenFarewell, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_16309F waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_161315 + applymovement 1, Route110_TrickHouseEntrance_Movement_TrickMasterSpin waitmovement 0 playse SE_M_EXPLOSION - applymovement 1, Route110_TrickHouseEntrance_Movement_16131E + applymovement 1, Route110_TrickHouseEntrance_Movement_TrickMasterJumpAway waitmovement 0 removeobject 1 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 @@ -471,132 +471,132 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 releaseall end -Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A +Route110_TrickHouseEntrance_EventScript_Door:: @ 816158A lockall switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 - case 0, Route110_TrickHouseEntrance_EventScript_1615BD - case 1, Route110_TrickHouseEntrance_EventScript_1615C7 - case 4, Route110_TrickHouseEntrance_EventScript_1616B8 - case 5, Route110_TrickHouseEntrance_EventScript_1616C2 + case 0, Route110_TrickHouseEntrance_EventScript_ItsAScroll + case 1, Route110_TrickHouseEntrance_EventScript_GoInHolePrompt + case 4, Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote + case 5, Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage end -Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD - msgbox Route110_TrickHouseEntrance_Text_19BE6E, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_ItsAScroll:: @ 81615BD + msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 - msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO +Route110_TrickHouseEntrance_EventScript_GoInHolePrompt:: @ 81615C7 + msgbox Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll, MSGBOX_YESNO closemessage compare VAR_RESULT, YES - goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD + goto_if_eq Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom releaseall end -Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom:: @ 81615DD setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 special DrawWholeMapView delay 20 applymovement LOCALID_PLAYER, Common_Movement_WalkUp waitmovement 0 - applymovement LOCALID_PLAYER, Route110_TrickHouseEntrance_Movement_16165E + applymovement LOCALID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom waitmovement 0 switch VAR_TRICK_HOUSE_ROOMS_COMPLETED - case 0, Route110_TrickHouseEntrance_EventScript_161660 - case 1, Route110_TrickHouseEntrance_EventScript_16166B - case 2, Route110_TrickHouseEntrance_EventScript_161676 - case 3, Route110_TrickHouseEntrance_EventScript_161681 - case 4, Route110_TrickHouseEntrance_EventScript_16168C - case 5, Route110_TrickHouseEntrance_EventScript_161697 - case 6, Route110_TrickHouseEntrance_EventScript_1616A2 - case 7, Route110_TrickHouseEntrance_EventScript_1616AD + case 0, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1 + case 1, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2 + case 2, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3 + case 3, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4 + case 4, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5 + case 5, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6 + case 6, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7 + case 7, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8 end -Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E +Route110_TrickHouseEntrance_Movement_EnterRoom:: @ 816165E set_invisible step_end -Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1:: @ 8161660 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2:: @ 816166B warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3:: @ 8161676 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4:: @ 8161681 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5:: @ 816168C warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6:: @ 8161697 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2 +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7:: @ 81616A2 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD +Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8:: @ 81616AD warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 waitstate releaseall end -Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 - msgbox Route110_TrickHouseEntrance_Text_19BEB3, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote:: @ 81616B8 + msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 +Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage:: @ 81616C2 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 - goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 - msgbox Route110_TrickHouseEntrance_Text_19BE6E, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2 + msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7 - msgbox Route110_TrickHouseEntrance_Text_19BEB3, MSGBOX_DEFAULT +Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2:: @ 81616D7 + msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT releaseall end -gUnknown_081616E1:: @ 81616E1 +Route110_TrickHousePuzzle_EventScript_Door:: @ 81616E1 lockall switch VAR_TRICK_HOUSE_ROOMS_COMPLETED - case 0, Route110_TrickHouseEntrance_EventScript_161740 - case 1, Route110_TrickHouseEntrance_EventScript_161769 - case 2, Route110_TrickHouseEntrance_EventScript_161792 - case 3, Route110_TrickHouseEntrance_EventScript_1617BB - case 4, Route110_TrickHouseEntrance_EventScript_1617E4 - case 5, Route110_TrickHouseEntrance_EventScript_16180D - case 6, Route110_TrickHouseEntrance_EventScript_161836 - case 7, Route110_TrickHouseEntrance_EventScript_16185F + case 0, Route110_TrickHousePuzzle1_EventScript_Door + case 1, Route110_TrickHousePuzzle2_EventScript_Door + case 2, Route110_TrickHousePuzzle3_EventScript_Door + case 3, Route110_TrickHousePuzzle4_EventScript_Door + case 4, Route110_TrickHousePuzzle5_EventScript_Door + case 5, Route110_TrickHousePuzzle6_EventScript_Door + case 6, Route110_TrickHousePuzzle7_EventScript_Door + case 7, Route110_TrickHousePuzzle8_EventScript_Door end -Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 +Route110_TrickHousePuzzle1_EventScript_Door:: @ 8161740 compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked msgbox UnknownString_819CAD1, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 @@ -605,10 +605,10 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 releaseall end -Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 +Route110_TrickHousePuzzle2_EventScript_Door:: @ 8161769 compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 - msgbox UnknownString_819CCCB, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -616,10 +616,10 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 releaseall end -Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 +Route110_TrickHousePuzzle3_EventScript_Door:: @ 8161792 compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 - msgbox UnknownString_819CEF9, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -627,10 +627,10 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 releaseall end -Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB +Route110_TrickHousePuzzle4_EventScript_Door:: @ 81617BB compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 - msgbox UnknownString_819D164, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -638,10 +638,10 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB releaseall end -Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 +Route110_TrickHousePuzzle5_EventScript_Door:: @ 81617E4 compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 - msgbox UnknownString_819D3A5, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -649,10 +649,10 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 releaseall end -Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D +Route110_TrickHousePuzzle6_EventScript_Door:: @ 816180D compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 - msgbox UnknownString_819DC0A, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -660,10 +660,10 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D releaseall end -Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 +Route110_TrickHousePuzzle7_EventScript_Door:: @ 8161836 compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 - msgbox UnknownString_819DE8D, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -671,10 +671,10 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 releaseall end -Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F +Route110_TrickHousePuzzle8_EventScript_Door:: @ 816185F compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 - goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 - msgbox UnknownString_819E0FF, MSGBOX_DEFAULT + goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked + msgbox Route110_TrickHousePuzzle7_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT playse SE_PIN setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 @@ -682,74 +682,74 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F releaseall end -Route110_TrickHouseEntrance_EventScript_161888:: @ 8161888 - msgbox UnknownString_819C21F, MSGBOX_DEFAULT +Route110_TrickHousePuzzle_EventScript_DoorLocked:: @ 8161888 + msgbox Route110_TrickHousePuzzle_Text_DoorLockedWriteSecretCodeHere, MSGBOX_DEFAULT releaseall end -Route110_TrickHousePuzzle1_EventScript_161892:: @ 8161892 -Route110_TrickHousePuzzle2_EventScript_161892:: @ 8161892 -Route110_TrickHousePuzzle3_EventScript_161892:: @ 8161892 -Route110_TrickHousePuzzle4_EventScript_161892:: @ 8161892 -Route110_TrickHousePuzzle5_EventScript_161892:: @ 8161892 -Route110_TrickHousePuzzle6_EventScript_161892:: @ 8161892 -Route110_TrickHousePuzzle7_EventScript_161892:: @ 8161892 -Route110_TrickHousePuzzle8_EventScript_161892:: @ 8161892 - msgbox Route110_TrickHousePuzzle1_Text_19C1FF, MSGBOX_DEFAULT +Route110_TrickHousePuzzle1_EventScript_ReadScrollAgain:: @ 8161892 +Route110_TrickHousePuzzle2_EventScript_ReadScrollAgain:: @ 8161892 +Route110_TrickHousePuzzle3_EventScript_ReadScrollAgain:: @ 8161892 +Route110_TrickHousePuzzle4_EventScript_ReadScrollAgain:: @ 8161892 +Route110_TrickHousePuzzle5_EventScript_ReadScrollAgain:: @ 8161892 +Route110_TrickHousePuzzle6_EventScript_ReadScrollAgain:: @ 8161892 +Route110_TrickHousePuzzle7_EventScript_ReadScrollAgain:: @ 8161892 +Route110_TrickHousePuzzle8_EventScript_ReadScrollAgain:: @ 8161892 + msgbox Route110_TrickHousePuzzle1_Text_SecretCodeOnIt, MSGBOX_DEFAULT releaseall end -Route110_TrickHousePuzzle1_EventScript_16189C:: @ 816189C -Route110_TrickHousePuzzle2_EventScript_16189C:: @ 816189C -Route110_TrickHousePuzzle3_EventScript_16189C:: @ 816189C -Route110_TrickHousePuzzle4_EventScript_16189C:: @ 816189C -Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C -Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C -Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C -Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C +Route110_TrickHousePuzzle1_EventScript_FoundScroll:: @ 816189C +Route110_TrickHousePuzzle2_EventScript_FoundScroll:: @ 816189C +Route110_TrickHousePuzzle3_EventScript_FoundScroll:: @ 816189C +Route110_TrickHousePuzzle4_EventScript_FoundScroll:: @ 816189C +Route110_TrickHousePuzzle5_EventScript_FoundScroll:: @ 816189C +Route110_TrickHousePuzzle6_EventScript_FoundScroll:: @ 816189C +Route110_TrickHousePuzzle7_EventScript_FoundScroll:: @ 816189C +Route110_TrickHousePuzzle8_EventScript_FoundScroll:: @ 816189C playfanfare MUS_OBTAIN_ITEM - message Route110_TrickHousePuzzle1_Text_19C1B8 + message Route110_TrickHousePuzzle1_Text_FoundAScroll waitfanfare waitmessage - msgbox Route110_TrickHousePuzzle1_Text_19C1CB, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle1_Text_MemorizedTheCode, MSGBOX_DEFAULT releaseall end -Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 +Route110_TrickHouseEntrance_EventScript_TrickMasterHiding:: @ 81618B0 lockall - msgbox Route110_TrickHouseEntrance_Text_19BA56, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEntrance_Text_YoureBeingWatched, MSGBOX_DEFAULT releaseall compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1 + call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6 + call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if_eq Route110_TrickHouseEntrance_EventScript_16190B + call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end -Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 +Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1:: @ 81618E1 setvar VAR_0x8004, 6 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 - call Route110_TrickHouseEntrance_EventScript_161920 + call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle return -Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6 +Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2:: @ 81618F6 setvar VAR_0x8004, 11 setvar VAR_0x8005, 5 setvar VAR_0x8006, 0 - call Route110_TrickHouseEntrance_EventScript_161920 + call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle return -Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B +Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3:: @ 816190B setvar VAR_0x8004, 9 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 - call Route110_TrickHouseEntrance_EventScript_161920 + call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle return -Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 +Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle:: @ 8161920 setfieldeffectargument 0, 32772 setfieldeffectargument 1, 32773 setfieldeffectargument 2, 32774 diff --git a/data/maps/Route110_TrickHouseEntrance/text.inc b/data/maps/Route110_TrickHouseEntrance/text.inc index ea9de51e2..1b687cbae 100644 --- a/data/maps/Route110_TrickHouseEntrance/text.inc +++ b/data/maps/Route110_TrickHouseEntrance/text.inc @@ -1,47 +1,47 @@ -Route110_TrickHouseEntrance_Text_19BA56:: @ 819BA56 +Route110_TrickHouseEntrance_Text_YoureBeingWatched:: @ 819BA56 .string "You're being watched...$" -Route110_TrickHouseEntrance_Text_19BA6E:: @ 819BA6E +Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk:: @ 819BA6E .string "Hah? Grrr...\p" .string "How did you know I concealed myself\n" .string "beneath this desk? You're sharp!$" -Route110_TrickHouseEntrance_Text_19BAC0:: @ 819BAC0 +Route110_TrickHouseEntrance_Text_ConcealedBehindTree:: @ 819BAC0 .string "Hah? Grrr...\p" .string "How did you know I concealed myself\n" .string "behind this tree? You're sharp!$" -Route110_TrickHouseEntrance_Text_19BB11:: @ 819BB11 +Route110_TrickHouseEntrance_Text_ConcealedInDresser:: @ 819BB11 .string "Hah? Grrr...\p" .string "How did you know I concealed myself\n" .string "in this dresser? You're sharp!$" -Route110_TrickHouseEntrance_Text_19BB61:: @ 819BB61 +Route110_TrickHouseEntrance_Text_ConealedBeyondWindow:: @ 819BB61 .string "Hah? Grrr...\p" .string "How did you know I concealed myself\n" .string "beyond this window? You're sharp!$" -Route110_TrickHouseEntrance_Text_19BBB4:: @ 819BBB4 +Route110_TrickHouseEntrance_Text_ConcealedInPlanter:: @ 819BBB4 .string "Hah? Grrr...\p" .string "How did you know I concealed myself\n" .string "in this planter? You're sharp!$" -Route110_TrickHouseEntrance_Text_19BC04:: @ 819BC04 +Route110_TrickHouseEntrance_Text_ConcealedInCupboard:: @ 819BC04 .string "Hah? Grrr...\p" .string "How did you know I concealed myself\n" .string "in this cupboard? You're sharp!$" -Route110_TrickHouseEntrance_Text_19BC55:: @ 819BC55 +Route110_TrickHouseEntrance_Text_ConcealedBehindWindow:: @ 819BC55 .string "Hah? Grrr...\p" .string "How did you know I concealed myself\n" .string "behind this window? You're sharp!$" -Route110_TrickHouseEntrance_Text_19BCA8:: @ 819BCA8 +Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion:: @ 819BCA8 .string "Hah? Grrr...\p" .string "How did you know I concealed myself\n" .string "beneath this cushion? You're sharp!$" -Route110_TrickHouseEntrance_Text_19BCFD:: @ 819BCFD +Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster:: @ 819BCFD .string "Behold!\p" .string "For I am the greatest living mystery\n" .string "of a man in all of HOENN!\l" @@ -49,7 +49,7 @@ Route110_TrickHouseEntrance_Text_19BCFD:: @ 819BCFD .string "The TRICK MASTER!\n" .string "Wahahaha! Glad to meet you!$" -Route110_TrickHouseEntrance_Text_19BD82:: @ 819BD82 +Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse:: @ 819BD82 .string "You, you've come to challenge my\n" .string "TRICK HOUSE, haven't you?\p" .string "That's why you're here, isn't it?\n" @@ -59,25 +59,25 @@ Route110_TrickHouseEntrance_Text_19BD82:: @ 819BD82 .string "and let your challenge commence!\p" .string "I shall be waiting in the back!$" -Route110_TrickHouseEntrance_Text_19BE6E:: @ 819BE6E +Route110_TrickHouseEntrance_Text_ItsAScroll:: @ 819BE6E .string "It's a scroll.$" -Route110_TrickHouseEntrance_Text_19BE7D:: @ 819BE7D +Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll:: @ 819BE7D .string "There is a big hole behind the scroll!\p" .string "Want to go in?$" -Route110_TrickHouseEntrance_Text_19BEB3:: @ 819BEB3 +Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote:: @ 819BEB3 .string "There is a note affixed to the scroll...\p" .string "“I am leaving on a journey.\n" .string "Don't look for me. TRICK MASTER”$" -Route110_TrickHouseEntrance_Text_19BF19:: @ 819BF19 +Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick:: @ 819BF19 .string "For the next time, I'll use this trick,\n" .string "and that scheme, and those ruses...\p" .string "Mufufufu... If I may say so, it's\n" .string "brilliantly difficult, even for me!$" -Route110_TrickHouseEntrance_Text_19BFAB:: @ 819BFAB +Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges:: @ 819BFAB .string "Hah? What?!\n" .string "Oh, it's you!\p" .string "I'm in the midst of devising new tricky\n" @@ -87,25 +87,25 @@ Route110_TrickHouseEntrance_Text_19BFAB:: @ 819BFAB .string "You wouldn't begrudge me that?\l" .string "Come back in a little while!$" -Route110_TrickHouseEntrance_Text_19C07E:: @ 819C07E +Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward:: @ 819C07E .string "Ah, it's you! You're here to accept the\n" .string "reward from before, isn't that right?\l" .string "Yes, right I am!\p" .string "Here!\n" .string "I'll give it to you now!$" -Route110_TrickHouseEntrance_Text_19C0FC:: @ 819C0FC +Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward:: @ 819C0FC .string "Hah?\n" .string "Did you not come to claim your reward?$" -Route110_TrickHouseEntrance_Text_19C128:: @ 819C128 +Route110_TrickHouseEntrance_Text_MechadollWhichTent:: @ 819C128 .string "MECHADOLL 5 I AM!\n" .string "IF REWARD IS NOT TAKEN BY YOU,\l" .string "THEN TRICK MASTER YOU CANNOT FOLLOW.$" -Route110_TrickHouseEntrance_Text_19C17E:: @ 819C17E +Route110_TrickHouseEntrance_Text_ThenFarewell:: @ 819C17E .string "THEN FAREWELL.$" -Route110_TrickHouseEntrance_Text_19C18D:: @ 819C18D +Route110_TrickHouseEntrance_Text_PCFullAgain:: @ 819C18D .string "YOUR PC STATUS: FULL AGAIN.\n" .string "MEAN, YOU ARE.$" diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index ec182dfad..3929a4c2d 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", - "script": "Route110_TrickHousePuzzle1_EventScript_161D31", + "script": "Route110_TrickHousePuzzle1_EventScript_Sally", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle1_EventScript_161D48", + "script": "Route110_TrickHousePuzzle1_EventScript_Eddie", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_TrickHousePuzzle1_EventScript_161D5F", + "script": "Route110_TrickHousePuzzle1_EventScript_Robin", "flag": "0" }, { @@ -242,8 +242,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_1B1A51", - "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1" + "script": "Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL" }, { "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", @@ -290,7 +290,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle1_EventScript_161D14" + "script": "Route110_TrickHousePuzzle1_EventScript_Scroll" } ] } diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index 55b35f0bd..d24e6fa6d 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -1,39 +1,39 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 - map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_161CFE + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_OnLoad .byte 0 -Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE +Route110_TrickHousePuzzle1_OnLoad:: @ 8161CFE compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 - goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A + goto_if_eq Route110_TrickHousePuzzle1_EventScript_OpenDoor end -Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A +Route110_TrickHousePuzzle1_EventScript_OpenDoor:: @ 8161D0A setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0 end -Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 +Route110_TrickHousePuzzle1_EventScript_Scroll:: @ 8161D14 lockall compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 - goto Route110_TrickHousePuzzle1_EventScript_161892 + goto_if_eq Route110_TrickHousePuzzle1_EventScript_ReadScroll + goto Route110_TrickHousePuzzle1_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 +Route110_TrickHousePuzzle1_EventScript_ReadScroll:: @ 8161D26 setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1 - goto Route110_TrickHousePuzzle1_EventScript_16189C + goto Route110_TrickHousePuzzle1_EventScript_FoundScroll end -Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 - trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 - msgbox Route110_TrickHousePuzzle1_Text_19CBAB, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle1_EventScript_Sally:: @ 8161D31 + trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_SallyIntro, Route110_TrickHousePuzzle1_Text_SallyDefeat + msgbox Route110_TrickHousePuzzle1_Text_SallyPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48 - trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 - msgbox Route110_TrickHousePuzzle1_Text_19CC1B, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle1_EventScript_Eddie:: @ 8161D48 + trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_EddieIntro, Route110_TrickHousePuzzle1_Text_EddieDefeat + msgbox Route110_TrickHousePuzzle1_Text_EddiePostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F - trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 - msgbox Route110_TrickHousePuzzle1_Text_19CCAA, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle1_EventScript_Robin:: @ 8161D5F + trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_RobinIntro, Route110_TrickHousePuzzle1_Text_RobinDefeat + msgbox Route110_TrickHousePuzzle1_Text_RobinPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle1/text.inc b/data/maps/Route110_TrickHousePuzzle1/text.inc index d1b9926f2..401217632 100644 --- a/data/maps/Route110_TrickHousePuzzle1/text.inc +++ b/data/maps/Route110_TrickHousePuzzle1/text.inc @@ -1,36 +1,36 @@ -Route110_TrickHousePuzzle1_Text_19CB4F:: @ 819CB4F +Route110_TrickHousePuzzle1_Text_SallyIntro:: @ 819CB4F .string "I'll hack and slash my way to victory\n" .string "with the CUT we just learned!$" -Route110_TrickHousePuzzle1_Text_19CB93:: @ 819CB93 +Route110_TrickHousePuzzle1_Text_SallyDefeat:: @ 819CB93 .string "Why are you so serious?$" -Route110_TrickHousePuzzle1_Text_19CBAB:: @ 819CBAB +Route110_TrickHousePuzzle1_Text_SallyPostBattle:: @ 819CBAB .string "I never get tired of hacking\n" .string "and slashing!$" -Route110_TrickHousePuzzle1_Text_19CBD6:: @ 819CBD6 +Route110_TrickHousePuzzle1_Text_EddieIntro:: @ 819CBD6 .string "I wandered into this weird house\n" .string "by accident...$" -Route110_TrickHousePuzzle1_Text_19CC06:: @ 819CC06 +Route110_TrickHousePuzzle1_Text_EddieDefeat:: @ 819CC06 .string "And now I've lost...$" -Route110_TrickHousePuzzle1_Text_19CC1B:: @ 819CC1B +Route110_TrickHousePuzzle1_Text_EddiePostBattle:: @ 819CC1B .string "I lost my way, I lost a battle, and I'm\n" .string "even more lost... I can't get out...$" -Route110_TrickHousePuzzle1_Text_19CC68:: @ 819CC68 +Route110_TrickHousePuzzle1_Text_RobinIntro:: @ 819CC68 .string "Just who is the TRICK MASTER?$" -Route110_TrickHousePuzzle1_Text_19CC86:: @ 819CC86 +Route110_TrickHousePuzzle1_Text_RobinDefeat:: @ 819CC86 .string "I lost while I was lost in thought!$" -Route110_TrickHousePuzzle1_Text_19CCAA:: @ 819CCAA +Route110_TrickHousePuzzle1_Text_RobinPostBattle:: @ 819CCAA .string "You're strong!\n" .string "Just who are you?$" -UnknownString_819CCCB: @ 819CCCB +Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened: @ 819CCCB .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is smart.”\n" diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 3dfd3e78a..ca5aedf95 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle2_EventScript_161E78", + "script": "Route110_TrickHousePuzzle2_EventScript_Ted", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle2_EventScript_161E8F", + "script": "Route110_TrickHousePuzzle2_EventScript_Paul", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_TrickHousePuzzle2_EventScript_161EA6", + "script": "Route110_TrickHousePuzzle2_EventScript_Georgia", "flag": "0" }, { @@ -60,8 +60,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_1B1A6B", - "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2" + "script": "Route110_TrickHousePuzzle2_EventScript_ItemWaveMail", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL" }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", @@ -73,8 +73,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_1B1A5E", - "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1" + "script": "Route110_TrickHousePuzzle2_EventScript_ItemHarborMail", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL" } ], "warp_events": [ @@ -108,7 +108,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_161DE0" + "script": "Route110_TrickHousePuzzle2_EventScript_Button1" }, { "type": "trigger", @@ -117,7 +117,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_161DF3" + "script": "Route110_TrickHousePuzzle2_EventScript_Button2" }, { "type": "trigger", @@ -126,7 +126,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_161E06" + "script": "Route110_TrickHousePuzzle2_EventScript_Button3" }, { "type": "trigger", @@ -135,7 +135,7 @@ "elevation": 0, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle2_EventScript_161E19" + "script": "Route110_TrickHousePuzzle2_EventScript_Button4" } ], "bg_events": [ @@ -145,7 +145,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle2_EventScript_161DC3" + "script": "Route110_TrickHousePuzzle2_EventScript_Scroll" } ] } diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index f5d694114..a4ce51a38 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -1,105 +1,105 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 - map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_161D81 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_161DAE + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_OnTransition .byte 0 -Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 +Route110_TrickHousePuzzle2_OnResume:: @ 8161D81 compare VAR_TEMP_1, 1 - call_if_eq Route110_TrickHousePuzzle2_EventScript_161E2C + call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton1 compare VAR_TEMP_2, 1 - call_if_eq Route110_TrickHousePuzzle2_EventScript_161E3F + call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton2 compare VAR_TEMP_3, 1 - call_if_eq Route110_TrickHousePuzzle2_EventScript_161E52 + call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton3 compare VAR_TEMP_4, 1 - call_if_eq Route110_TrickHousePuzzle2_EventScript_161E65 + call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton4 end -Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE +Route110_TrickHousePuzzle2_OnTransition:: @ 8161DAE setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 setvar VAR_TEMP_4, 0 end -Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 +Route110_TrickHousePuzzle2_EventScript_Scroll:: @ 8161DC3 lockall compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 - goto Route110_TrickHousePuzzle2_EventScript_161892 + goto_if_eq Route110_TrickHousePuzzle2_EventScript_ReadScroll + goto Route110_TrickHousePuzzle2_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 +Route110_TrickHousePuzzle2_EventScript_ReadScroll:: @ 8161DD5 setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1 - goto Route110_TrickHousePuzzle2_EventScript_16189C + goto Route110_TrickHousePuzzle2_EventScript_FoundScroll end -Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 +Route110_TrickHousePuzzle2_EventScript_Button1:: @ 8161DE0 lockall setvar VAR_TEMP_1, 1 playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_161E2C + call Route110_TrickHousePuzzle2_EventScript_PressButton1 special DrawWholeMapView releaseall end -Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 +Route110_TrickHousePuzzle2_EventScript_Button2:: @ 8161DF3 lockall setvar VAR_TEMP_2, 1 playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_161E3F + call Route110_TrickHousePuzzle2_EventScript_PressButton2 special DrawWholeMapView releaseall end -Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 +Route110_TrickHousePuzzle2_EventScript_Button3:: @ 8161E06 lockall setvar VAR_TEMP_3, 1 playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_161E52 + call Route110_TrickHousePuzzle2_EventScript_PressButton3 special DrawWholeMapView releaseall end -Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 +Route110_TrickHousePuzzle2_EventScript_Button4:: @ 8161E19 lockall setvar VAR_TEMP_4, 1 playse SE_PIN - call Route110_TrickHousePuzzle2_EventScript_161E65 + call Route110_TrickHousePuzzle2_EventScript_PressButton4 special DrawWholeMapView releaseall end -Route110_TrickHousePuzzle2_EventScript_161E2C:: @ 8161E2C +Route110_TrickHousePuzzle2_EventScript_PressButton1:: @ 8161E2C setmetatile 14, 21, METATILE_TrickHousePuzzle_Button_Pressed, 0 setmetatile 1, 12, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return -Route110_TrickHousePuzzle2_EventScript_161E3F:: @ 8161E3F +Route110_TrickHousePuzzle2_EventScript_PressButton2:: @ 8161E3F setmetatile 8, 17, METATILE_TrickHousePuzzle_Button_Pressed, 0 setmetatile 12, 13, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return -Route110_TrickHousePuzzle2_EventScript_161E52:: @ 8161E52 +Route110_TrickHousePuzzle2_EventScript_PressButton3:: @ 8161E52 setmetatile 4, 10, METATILE_TrickHousePuzzle_Button_Pressed, 0 setmetatile 8, 4, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return -Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 +Route110_TrickHousePuzzle2_EventScript_PressButton4:: @ 8161E65 setmetatile 5, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0 setmetatile 12, 5, METATILE_TrickHousePuzzle_Door_Shuttered, 0 return -Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 - trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 - msgbox Route110_TrickHousePuzzle2_Text_19CD91, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle2_EventScript_Ted:: @ 8161E78 + trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_TedIntro, Route110_TrickHousePuzzle2_Text_TedDefeat + msgbox Route110_TrickHousePuzzle2_Text_TedPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F - trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 - msgbox Route110_TrickHousePuzzle2_Text_19CE0D, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle2_EventScript_Paul:: @ 8161E8F + trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_PaulIntro, Route110_TrickHousePuzzle2_Text_PaulDefeat + msgbox Route110_TrickHousePuzzle2_Text_PaulPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 - trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 - msgbox Route110_TrickHousePuzzle2_Text_19CEB8, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle2_EventScript_Georgia:: @ 8161EA6 + trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_GeorgiaIntro, Route110_TrickHousePuzzle2_Text_GeorgiaDefeat + msgbox Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle2/text.inc b/data/maps/Route110_TrickHousePuzzle2/text.inc index 58cd1ea58..edc443309 100644 --- a/data/maps/Route110_TrickHousePuzzle2/text.inc +++ b/data/maps/Route110_TrickHousePuzzle2/text.inc @@ -1,37 +1,37 @@ -Route110_TrickHousePuzzle2_Text_19CD46:: @ 819CD46 +Route110_TrickHousePuzzle2_Text_TedIntro:: @ 819CD46 .string "Which switch closes which hole?$" -Route110_TrickHousePuzzle2_Text_19CD66:: @ 819CD66 +Route110_TrickHousePuzzle2_Text_TedDefeat:: @ 819CD66 .string "After that battle, I'm even more\n" .string "confused!$" -Route110_TrickHousePuzzle2_Text_19CD91:: @ 819CD91 +Route110_TrickHousePuzzle2_Text_TedPostBattle:: @ 819CD91 .string "Can I get you to push all the buttons\n" .string "for me?$" -Route110_TrickHousePuzzle2_Text_19CDBF:: @ 819CDBF +Route110_TrickHousePuzzle2_Text_PaulIntro:: @ 819CDBF .string "Oh! You're on your second TRICK HOUSE\n" .string "challenge!$" -Route110_TrickHousePuzzle2_Text_19CDF0:: @ 819CDF0 +Route110_TrickHousePuzzle2_Text_PaulDefeat:: @ 819CDF0 .string "You're good at battling too?$" -Route110_TrickHousePuzzle2_Text_19CE0D:: @ 819CE0D +Route110_TrickHousePuzzle2_Text_PaulPostBattle:: @ 819CE0D .string "The TRICK MASTER rigged all the tricks\n" .string "in this house all by himself.$" -Route110_TrickHousePuzzle2_Text_19CE52:: @ 819CE52 +Route110_TrickHousePuzzle2_Text_GeorgiaIntro:: @ 819CE52 .string "I want to make my own GYM one day.\n" .string "So, I'm studying how to set traps.$" -Route110_TrickHousePuzzle2_Text_19CE98:: @ 819CE98 +Route110_TrickHousePuzzle2_Text_GeorgiaDefeat:: @ 819CE98 .string "I didn't study battling enough!$" -Route110_TrickHousePuzzle2_Text_19CEB8:: @ 819CEB8 +Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle:: @ 819CEB8 .string "You're strong, aren't you?\n" .string "Maybe even enough to be a GYM LEADER!$" -UnknownString_819CEF9: @ 819CEF9 +Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened: @ 819CEF9 .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is coveted.”\n" diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 3dc8c746c..e8b22ea02 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle3_EventScript_162708", + "script": "Route110_TrickHousePuzzle3_EventScript_Justin", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle3_EventScript_16271F", + "script": "Route110_TrickHousePuzzle3_EventScript_Martha", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle3_EventScript_162736", + "script": "Route110_TrickHousePuzzle3_EventScript_Alan", "flag": "0" }, { @@ -112,8 +112,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_1B1A85", - "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2" + "script": "Route110_TrickHousePuzzle3_EventScript_ItemWoodMail", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL" }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", @@ -125,8 +125,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_1B1A78", - "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1" + "script": "Route110_TrickHousePuzzle3_EventScript_ItemShadowMail", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL" }, { "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", @@ -186,7 +186,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_1625AB" + "script": "Route110_TrickHousePuzzle3_EventScript_Button1" }, { "type": "trigger", @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_1625B7" + "script": "Route110_TrickHousePuzzle3_EventScript_Button2" }, { "type": "trigger", @@ -204,7 +204,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_1625C3" + "script": "Route110_TrickHousePuzzle3_EventScript_Button3" }, { "type": "trigger", @@ -213,7 +213,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_1625CF" + "script": "Route110_TrickHousePuzzle3_EventScript_Button4" }, { "type": "trigger", @@ -222,7 +222,7 @@ "elevation": 3, "var": "VAR_TEMP_5", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_1625DB" + "script": "Route110_TrickHousePuzzle3_EventScript_Button5" }, { "type": "trigger", @@ -231,7 +231,7 @@ "elevation": 3, "var": "VAR_TEMP_6", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_1625E7" + "script": "Route110_TrickHousePuzzle3_EventScript_Button6" }, { "type": "trigger", @@ -240,7 +240,7 @@ "elevation": 3, "var": "VAR_TEMP_7", "var_value": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_1625F3" + "script": "Route110_TrickHousePuzzle3_EventScript_Button7" } ], "bg_events": [ @@ -250,7 +250,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle3_EventScript_1626EB" + "script": "Route110_TrickHousePuzzle3_EventScript_Scroll" } ] } diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 869bb29f4..91a528223 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -1,17 +1,17 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD - map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_161EC8 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_161EE4 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_OnTransition .byte 0 -Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 - call Route110_TrickHousePuzzle3_EventScript_161F12 +Route110_TrickHousePuzzle3_OnResume:: @ 8161EC8 + call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles compare VAR_TEMP_9, 0 - call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0 compare VAR_TEMP_9, 1 - call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState1 end -Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 +Route110_TrickHousePuzzle3_OnTransition:: @ 8161EE4 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -23,7 +23,7 @@ Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 setvar VAR_TEMP_9, 0 end -Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 +Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles:: @ 8161F12 setmetatile 5, 20, METATILE_TrickHousePuzzle_Button_Up, 0 setmetatile 4, 12, METATILE_TrickHousePuzzle_Button_Up, 0 setmetatile 11, 10, METATILE_TrickHousePuzzle_Button_Up, 0 @@ -32,50 +32,50 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmetatile 1, 3, METATILE_TrickHousePuzzle_Button_Up, 0 setmetatile 10, 2, METATILE_TrickHousePuzzle_Button_Up, 0 compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle3_EventScript_161F9F + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle3_EventScript_161FA9 + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle3_EventScript_161FB3 + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle3_EventScript_161FBD + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle3_EventScript_161FC7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton5Metatile compare VAR_TEMP_8, 6 - call_if_eq Route110_TrickHousePuzzle3_EventScript_161FD1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton6Metatile compare VAR_TEMP_8, 7 - call_if_eq Route110_TrickHousePuzzle3_EventScript_161FDB + call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton7Metatile return -Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F +Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile:: @ 8161F9F setmetatile 5, 20, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_161FA9:: @ 8161FA9 +Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile:: @ 8161FA9 setmetatile 4, 12, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_161FB3:: @ 8161FB3 +Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile:: @ 8161FB3 setmetatile 11, 10, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_161FBD:: @ 8161FBD +Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile:: @ 8161FBD setmetatile 3, 8, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_161FC7:: @ 8161FC7 +Route110_TrickHousePuzzle3_EventScript_PressedButton5Metatile:: @ 8161FC7 setmetatile 13, 7, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_161FD1:: @ 8161FD1 +Route110_TrickHousePuzzle3_EventScript_PressedButton6Metatile:: @ 8161FD1 setmetatile 1, 3, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_161FDB:: @ 8161FDB +Route110_TrickHousePuzzle3_EventScript_PressedButton7Metatile:: @ 8161FDB setmetatile 10, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0 return -Route110_TrickHousePuzzle3_EventScript_161FE5:: @ 8161FE5 +Route110_TrickHousePuzzle3_EventScript_SetDoorsState0:: @ 8161FE5 setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0 setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0 setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0 @@ -160,7 +160,7 @@ Route110_TrickHousePuzzle3_EventScript_161FE5:: @ 8161FE5 setmetatile 12, 17, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1 return -Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 +Route110_TrickHousePuzzle3_EventScript_SetDoorsState1:: @ 81622C8 setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0 setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0 setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1 @@ -245,56 +245,56 @@ Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 setmetatile 12, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0 return -Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB +Route110_TrickHousePuzzle3_EventScript_Button1:: @ 81625AB lockall setvar VAR_TEMP_8, 1 - goto Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_1625B7:: @ 81625B7 +Route110_TrickHousePuzzle3_EventScript_Button2:: @ 81625B7 lockall setvar VAR_TEMP_8, 2 - goto Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_1625C3:: @ 81625C3 +Route110_TrickHousePuzzle3_EventScript_Button3:: @ 81625C3 lockall setvar VAR_TEMP_8, 3 - goto Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_1625CF:: @ 81625CF +Route110_TrickHousePuzzle3_EventScript_Button4:: @ 81625CF lockall setvar VAR_TEMP_8, 4 - goto Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_1625DB:: @ 81625DB +Route110_TrickHousePuzzle3_EventScript_Button5:: @ 81625DB lockall setvar VAR_TEMP_8, 5 - goto Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_1625E7:: @ 81625E7 +Route110_TrickHousePuzzle3_EventScript_Button6:: @ 81625E7 lockall setvar VAR_TEMP_8, 6 - goto Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 +Route110_TrickHousePuzzle3_EventScript_Button7:: @ 81625F3 lockall setvar VAR_TEMP_8, 7 - goto Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_PressButton end -Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF - call Route110_TrickHousePuzzle3_EventScript_162612 +Route110_TrickHousePuzzle3_EventScript_PressButton:: @ 81625FF + call Route110_TrickHousePuzzle3_EventScript_SetButton playse SE_PIN - call Route110_TrickHousePuzzle3_EventScript_161F12 - goto Route110_TrickHousePuzzle3_EventScript_1626AD + call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles + goto Route110_TrickHousePuzzle3_EventScript_AlternateDoors end -Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 +Route110_TrickHousePuzzle3_EventScript_SetButton:: @ 8162612 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -303,94 +303,94 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar VAR_TEMP_6, 0 setvar VAR_TEMP_7, 0 compare VAR_TEMP_8, 1 - call_if_eq Route110_TrickHousePuzzle3_EventScript_162683 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton1 compare VAR_TEMP_8, 2 - call_if_eq Route110_TrickHousePuzzle3_EventScript_162689 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton2 compare VAR_TEMP_8, 3 - call_if_eq Route110_TrickHousePuzzle3_EventScript_16268F + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton3 compare VAR_TEMP_8, 4 - call_if_eq Route110_TrickHousePuzzle3_EventScript_162695 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton4 compare VAR_TEMP_8, 5 - call_if_eq Route110_TrickHousePuzzle3_EventScript_16269B + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton5 compare VAR_TEMP_8, 6 - call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton6 compare VAR_TEMP_8, 7 - call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton7 return -Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 +Route110_TrickHousePuzzle3_EventScript_SetButton1:: @ 8162683 setvar VAR_TEMP_1, 1 return -Route110_TrickHousePuzzle3_EventScript_162689:: @ 8162689 +Route110_TrickHousePuzzle3_EventScript_SetButton2:: @ 8162689 setvar VAR_TEMP_2, 1 return -Route110_TrickHousePuzzle3_EventScript_16268F:: @ 816268F +Route110_TrickHousePuzzle3_EventScript_SetButton3:: @ 816268F setvar VAR_TEMP_3, 1 return -Route110_TrickHousePuzzle3_EventScript_162695:: @ 8162695 +Route110_TrickHousePuzzle3_EventScript_SetButton4:: @ 8162695 setvar VAR_TEMP_4, 1 return -Route110_TrickHousePuzzle3_EventScript_16269B:: @ 816269B +Route110_TrickHousePuzzle3_EventScript_SetButton5:: @ 816269B setvar VAR_TEMP_5, 1 return -Route110_TrickHousePuzzle3_EventScript_1626A1:: @ 81626A1 +Route110_TrickHousePuzzle3_EventScript_SetButton6:: @ 81626A1 setvar VAR_TEMP_6, 1 return -Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 +Route110_TrickHousePuzzle3_EventScript_SetButton7:: @ 81626A7 setvar VAR_TEMP_7, 1 return -Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD +Route110_TrickHousePuzzle3_EventScript_AlternateDoors:: @ 81626AD compare VAR_TEMP_9, 1 - call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0 compare VAR_TEMP_9, 0 - call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState1 special DrawWholeMapView compare VAR_TEMP_9, 1 - goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD + goto_if_eq Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState compare VAR_TEMP_9, 0 - goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_SetAltDoorState end -Route110_TrickHousePuzzle3_EventScript_1626DD:: @ 81626DD +Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState:: @ 81626DD setvar VAR_TEMP_9, 0 releaseall end -Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 +Route110_TrickHousePuzzle3_EventScript_SetAltDoorState:: @ 81626E4 setvar VAR_TEMP_9, 1 releaseall end -Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB +Route110_TrickHousePuzzle3_EventScript_Scroll:: @ 81626EB lockall compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD - goto Route110_TrickHousePuzzle3_EventScript_161892 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_ReadScroll + goto Route110_TrickHousePuzzle3_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD +Route110_TrickHousePuzzle3_EventScript_ReadScroll:: @ 81626FD setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1 - goto Route110_TrickHousePuzzle3_EventScript_16189C + goto Route110_TrickHousePuzzle3_EventScript_FoundScroll end -Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 - trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D - msgbox Route110_TrickHousePuzzle3_Text_19CFE6, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle3_EventScript_Justin:: @ 8162708 + trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_JustinIntro, Route110_TrickHousePuzzle3_Text_JustinDefeat + msgbox Route110_TrickHousePuzzle3_Text_JustinPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle3_EventScript_16271F:: @ 816271F - trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 - msgbox Route110_TrickHousePuzzle3_Text_19D07A, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle3_EventScript_Martha:: @ 816271F + trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_MarthaIntro, Route110_TrickHousePuzzle3_Text_MarthaDefeat + msgbox Route110_TrickHousePuzzle3_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736 - trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 - msgbox Route110_TrickHousePuzzle3_Text_19D110, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle3_EventScript_Alan:: @ 8162736 + trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_AlanIntro, Route110_TrickHousePuzzle3_Text_AlanDefeat + msgbox Route110_TrickHousePuzzle3_Text_AlanPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle3/text.inc b/data/maps/Route110_TrickHousePuzzle3/text.inc index 914257f46..575e8f1bc 100644 --- a/data/maps/Route110_TrickHousePuzzle3/text.inc +++ b/data/maps/Route110_TrickHousePuzzle3/text.inc @@ -1,39 +1,39 @@ -Route110_TrickHousePuzzle3_Text_19CF76:: @ 819CF76 +Route110_TrickHousePuzzle3_Text_JustinIntro:: @ 819CF76 .string "I keep coming back to this same place!$" -Route110_TrickHousePuzzle3_Text_19CF9D:: @ 819CF9D +Route110_TrickHousePuzzle3_Text_JustinDefeat:: @ 819CF9D .string "I'm already having trouble, and then\n" .string "you have to beat me? It's not fair!$" -Route110_TrickHousePuzzle3_Text_19CFE6:: @ 819CFE6 +Route110_TrickHousePuzzle3_Text_JustinPostBattle:: @ 819CFE6 .string "It's full of doors here!\n" .string "It's too small and dark in here! Help!$" -Route110_TrickHousePuzzle3_Text_19D026:: @ 819D026 +Route110_TrickHousePuzzle3_Text_MarthaIntro:: @ 819D026 .string "I don't know what's going on here.\n" .string "I'm starting to feel sad...$" -Route110_TrickHousePuzzle3_Text_19D065:: @ 819D065 +Route110_TrickHousePuzzle3_Text_MarthaDefeat:: @ 819D065 .string "You... You're awful!$" -Route110_TrickHousePuzzle3_Text_19D07A:: @ 819D07A +Route110_TrickHousePuzzle3_Text_MarthaPostBattle:: @ 819D07A .string "I know I'm weak!\n" .string "And, I have no sense of direction!$" -Route110_TrickHousePuzzle3_Text_19D0AE:: @ 819D0AE +Route110_TrickHousePuzzle3_Text_AlanIntro:: @ 819D0AE .string "I don't get it. What would anyone want\n" .string "with a house this bizarre?$" -Route110_TrickHousePuzzle3_Text_19D0F0:: @ 819D0F0 +Route110_TrickHousePuzzle3_Text_AlanDefeat:: @ 819D0F0 .string "I don't get it.\n" .string "How did I lose?$" -Route110_TrickHousePuzzle3_Text_19D110:: @ 819D110 +Route110_TrickHousePuzzle3_Text_AlanPostBattle:: @ 819D110 .string "I don't get it.\n" .string "How many traps are in this house?\p" .string "You may be the one to solve that.$" -UnknownString_819D164: @ 819D164 +Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened: @ 819D164 .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is cool.”\n" diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 847933ea0..1fe3d1290 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle4_EventScript_16276B", + "script": "Route110_TrickHousePuzzle4_EventScript_Cora", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle4_EventScript_162799", + "script": "Route110_TrickHousePuzzle4_EventScript_Jill", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle4_EventScript_162782", + "script": "Route110_TrickHousePuzzle4_EventScript_Yuji", "flag": "0" }, { @@ -60,8 +60,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_1B1A92", - "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1" + "script": "Route110_TrickHousePuzzle4_EventScript_ItemMechMail", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL" }, { "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", @@ -238,7 +238,7 @@ "y": 5, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle4_EventScript_16274E" + "script": "Route110_TrickHousePuzzle4_EventScript_Scroll" } ] } diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index fdf7d6b1a..44865cdd0 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -1,29 +1,29 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D .byte 0 -Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E +Route110_TrickHousePuzzle4_EventScript_Scroll:: @ 816274E lockall compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 - goto Route110_TrickHousePuzzle4_EventScript_161892 + goto_if_eq Route110_TrickHousePuzzle4_EventScript_ReadScroll + goto Route110_TrickHousePuzzle4_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 +Route110_TrickHousePuzzle4_EventScript_ReadScroll:: @ 8162760 setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1 - goto Route110_TrickHousePuzzle4_EventScript_16189C + goto Route110_TrickHousePuzzle4_EventScript_FoundScroll end -Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B - trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F - msgbox Route110_TrickHousePuzzle4_Text_19D253, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle4_EventScript_Cora:: @ 816276B + trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_CoraIntro, Route110_TrickHousePuzzle4_Text_CoraDefeat + msgbox Route110_TrickHousePuzzle4_Text_CoraPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle4_EventScript_162782:: @ 8162782 - trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 - msgbox Route110_TrickHousePuzzle4_Text_19D306, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle4_EventScript_Yuji:: @ 8162782 + trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_YujiIntro, Route110_TrickHousePuzzle4_Text_YujiDefeat + msgbox Route110_TrickHousePuzzle4_Text_YujiPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799 - trainerbattle_single TRAINER_JILL, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 - msgbox Route110_TrickHousePuzzle4_Text_19D386, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle4_EventScript_Jill:: @ 8162799 + trainerbattle_single TRAINER_JILL, Route110_TrickHousePuzzle4_Text_JillIntro, Route110_TrickHousePuzzle4_Text_JillDefeat + msgbox Route110_TrickHousePuzzle4_Text_JillPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle4/text.inc b/data/maps/Route110_TrickHousePuzzle4/text.inc index 23f0001a1..3a4172af5 100644 --- a/data/maps/Route110_TrickHousePuzzle4/text.inc +++ b/data/maps/Route110_TrickHousePuzzle4/text.inc @@ -1,38 +1,38 @@ -Route110_TrickHousePuzzle4_Text_19D1DE:: @ 819D1DE +Route110_TrickHousePuzzle4_Text_CoraIntro:: @ 819D1DE .string "It's too much bother to think this out.\n" .string "I only wanted to battle!$" -Route110_TrickHousePuzzle4_Text_19D21F:: @ 819D21F +Route110_TrickHousePuzzle4_Text_CoraDefeat:: @ 819D21F .string "Even though I lost, I still like battling\n" .string "the best!$" -Route110_TrickHousePuzzle4_Text_19D253:: @ 819D253 +Route110_TrickHousePuzzle4_Text_CoraPostBattle:: @ 819D253 .string "Wouldn't you agree? You would go\n" .string "anywhere if TRAINERS were there.$" -Route110_TrickHousePuzzle4_Text_19D295:: @ 819D295 +Route110_TrickHousePuzzle4_Text_YujiIntro:: @ 819D295 .string "Heh! Boulders like this, I can brush\n" .string "aside with one finger!$" -Route110_TrickHousePuzzle4_Text_19D2D1:: @ 819D2D1 +Route110_TrickHousePuzzle4_Text_YujiDefeat:: @ 819D2D1 .string "I can push boulders, but I can't solve\n" .string "the puzzle...$" -Route110_TrickHousePuzzle4_Text_19D306:: @ 819D306 +Route110_TrickHousePuzzle4_Text_YujiPostBattle:: @ 819D306 .string "It's not good enough to be brawny...\n" .string "You have to use your head. Be brainy!$" -Route110_TrickHousePuzzle4_Text_19D351:: @ 819D351 +Route110_TrickHousePuzzle4_Text_JillIntro:: @ 819D351 .string "The TRICK HOUSE is getting trickier,\n" .string "isn't it?$" -Route110_TrickHousePuzzle4_Text_19D380:: @ 819D380 +Route110_TrickHousePuzzle4_Text_JillDefeat:: @ 819D380 .string "Aaak!$" -Route110_TrickHousePuzzle4_Text_19D386:: @ 819D386 +Route110_TrickHousePuzzle4_Text_JillPostBattle:: @ 819D386 .string "Has anyone made it to the end?$" -UnknownString_819D3A5: @ 819D3A5 +Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened: @ 819D3A5 .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is a genius.”\n" diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index d01bd4f5a..c2eb9fad7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_1627F2", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_162813", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_162834", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_162855", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_162876", + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5", "flag": "0" } ], @@ -108,7 +108,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_162897" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0" }, { "type": "trigger", @@ -117,7 +117,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_1628A3" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1" }, { "type": "trigger", @@ -126,7 +126,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_1628AF" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2" }, { "type": "trigger", @@ -135,7 +135,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_1628BB" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3" }, { "type": "trigger", @@ -144,7 +144,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_1628C7" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0" }, { "type": "trigger", @@ -153,7 +153,7 @@ "elevation": 3, "var": "VAR_TEMP_2", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_1628D3" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1" }, { "type": "trigger", @@ -162,7 +162,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_1628DF" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0" }, { "type": "trigger", @@ -171,7 +171,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_1628EB" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1" }, { "type": "trigger", @@ -180,7 +180,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_1628F7" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2" }, { "type": "trigger", @@ -189,7 +189,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_162903" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0" }, { "type": "trigger", @@ -198,7 +198,7 @@ "elevation": 3, "var": "VAR_TEMP_4", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_16290F" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1" }, { "type": "trigger", @@ -207,7 +207,7 @@ "elevation": 3, "var": "VAR_TEMP_5", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_16291B" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0" }, { "type": "trigger", @@ -216,7 +216,7 @@ "elevation": 3, "var": "VAR_TEMP_5", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_162927" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger1" }, { "type": "trigger", @@ -225,7 +225,7 @@ "elevation": 3, "var": "VAR_TEMP_5", "var_value": "0", - "script": "Route110_TrickHousePuzzle5_EventScript_162933" + "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger2" } ], "bg_events": [ @@ -235,7 +235,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle5_EventScript_1627D5" + "script": "Route110_TrickHousePuzzle5_EventScript_Scroll" } ] } diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 903ccc999..6d9165535 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_1627B6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_OnTransition .byte 0 -Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 +Route110_TrickHousePuzzle5_OnTransition:: @ 81627B6 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -11,153 +11,153 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 setvar VAR_TEMP_8, 0 end -Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 +Route110_TrickHousePuzzle5_EventScript_Scroll:: @ 81627D5 lockall compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 - goto Route110_TrickHousePuzzle5_EventScript_161892 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_ReadScroll + goto Route110_TrickHousePuzzle5_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 +Route110_TrickHousePuzzle5_EventScript_ReadScroll:: @ 81627E7 setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1 - goto Route110_TrickHousePuzzle5_EventScript_16189C + goto Route110_TrickHousePuzzle5_EventScript_FoundScroll end -Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1:: @ 81627F2 lockall applymovement 1, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_1, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2:: @ 8162813 lockall applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_2, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_1629B3 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3:: @ 8162834 lockall applymovement 3, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_3, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4:: @ 8162855 lockall applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_4, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_162A9B + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5:: @ 8162876 lockall applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_5, 1 - goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate end -Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0:: @ 8162897 lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3 +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1:: @ 81628A3 lockall setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2:: @ 81628AF lockall setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3:: @ 81628BB lockall setvar VAR_TEMP_9, 3 - goto Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate end -Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0:: @ 81628C7 lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_1629B3 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1:: @ 81628D3 lockall setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_1629B3 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate end -Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0:: @ 81628DF lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1:: @ 81628EB lockall setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2:: @ 81628F7 lockall setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate end -Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903 +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0:: @ 8162903 lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_162A9B + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1:: @ 816290F lockall setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_162A9B + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate end -Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0:: @ 816291B lockall setvar VAR_TEMP_9, 0 - goto Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate end -Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger1:: @ 8162927 lockall setvar VAR_TEMP_9, 1 - goto Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate end -Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger2:: @ 8162933 lockall setvar VAR_TEMP_9, 2 - goto Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate end -Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate:: @ 816293F setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 playse SE_PIN @@ -171,15 +171,15 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 - msgbox Route110_TrickHousePuzzle5_Text_19D423, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162B83 - case 1, Route110_TrickHousePuzzle5_EventScript_162BA6 - case 2, Route110_TrickHousePuzzle5_EventScript_162BC9 + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3 end -Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate:: @ 81629B3 setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 playse SE_PIN @@ -193,15 +193,15 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 compare VAR_TEMP_9, 3 call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B - msgbox Route110_TrickHousePuzzle5_Text_19D636, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162BEC - case 1, Route110_TrickHousePuzzle5_EventScript_162C0F - case 2, Route110_TrickHousePuzzle5_EventScript_162C32 + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3 end -Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate:: @ 8162A27 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 playse SE_PIN @@ -215,15 +215,15 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 - msgbox Route110_TrickHousePuzzle5_Text_19D7D3, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162C55 - case 1, Route110_TrickHousePuzzle5_EventScript_162C78 - case 2, Route110_TrickHousePuzzle5_EventScript_162C9B + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3 end -Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate:: @ 8162A9B setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 playse SE_PIN @@ -237,15 +237,15 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 - msgbox Route110_TrickHousePuzzle5_Text_19D93D, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162CBE - case 1, Route110_TrickHousePuzzle5_EventScript_162CE1 - case 2, Route110_TrickHousePuzzle5_EventScript_162D04 + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3 end -Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate:: @ 8162B0F setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 playse SE_PIN @@ -259,161 +259,161 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 compare VAR_TEMP_9, 3 call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B - msgbox Route110_TrickHousePuzzle5_Text_19DA9A, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162D27 - case 1, Route110_TrickHousePuzzle5_EventScript_162D4A - case 2, Route110_TrickHousePuzzle5_EventScript_162D6D + case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1 + case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2 + case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3 end -Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83 - msgbox Route110_TrickHousePuzzle5_Text_19D4AE, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1:: @ 8162B83 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1, MSGBOX_DEFAULT multichoice 0, 0, 25, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6 - msgbox Route110_TrickHousePuzzle5_Text_19D501, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2:: @ 8162BA6 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2, MSGBOX_DEFAULT multichoice 0, 0, 26, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9 - msgbox Route110_TrickHousePuzzle5_Text_19D553, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3:: @ 8162BC9 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3, MSGBOX_DEFAULT multichoice 0, 0, 27, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC - msgbox Route110_TrickHousePuzzle5_Text_19D68E, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1:: @ 8162BEC + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1, MSGBOX_DEFAULT multichoice 0, 0, 28, 1 switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F - msgbox Route110_TrickHousePuzzle5_Text_19D6EC, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2:: @ 8162C0F + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2, MSGBOX_DEFAULT multichoice 0, 0, 29, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32 - msgbox Route110_TrickHousePuzzle5_Text_19D745, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3:: @ 8162C32 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3, MSGBOX_DEFAULT multichoice 0, 0, 30, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55 - msgbox Route110_TrickHousePuzzle5_Text_19D81B, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1:: @ 8162C55 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1, MSGBOX_DEFAULT multichoice 0, 0, 31, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78 - msgbox Route110_TrickHousePuzzle5_Text_19D865, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2:: @ 8162C78 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2, MSGBOX_DEFAULT multichoice 0, 0, 32, 1 switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B - msgbox Route110_TrickHousePuzzle5_Text_19D8BA, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3:: @ 8162C9B + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3, MSGBOX_DEFAULT multichoice 0, 0, 33, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE - msgbox Route110_TrickHousePuzzle5_Text_19D987, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1:: @ 8162CBE + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1, MSGBOX_DEFAULT multichoice 0, 0, 34, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1 - msgbox Route110_TrickHousePuzzle5_Text_19D9DC, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2:: @ 8162CE1 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2, MSGBOX_DEFAULT multichoice 0, 0, 35, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04 - msgbox Route110_TrickHousePuzzle5_Text_19DA1D, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3:: @ 8162D04 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3, MSGBOX_DEFAULT multichoice 0, 0, 36, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27 - msgbox Route110_TrickHousePuzzle5_Text_19DAEF, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1:: @ 8162D27 + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1, MSGBOX_DEFAULT multichoice 0, 0, 37, 1 switch VAR_RESULT - case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A - msgbox Route110_TrickHousePuzzle5_Text_19DB43, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2:: @ 8162D4A + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2, MSGBOX_DEFAULT multichoice 0, 0, 38, 1 switch VAR_RESULT - case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D - msgbox Route110_TrickHousePuzzle5_Text_19DB97, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 8162D6D + msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3, MSGBOX_DEFAULT multichoice 0, 0, 39, 1 switch VAR_RESULT - case 2, Route110_TrickHousePuzzle5_EventScript_162DDF - goto Route110_TrickHousePuzzle5_EventScript_162D90 + case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer + goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer end -Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 +Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 8162D90 waitse playse SE_FAILURE - msgbox Route110_TrickHousePuzzle5_Text_19D5CF, MSGBOX_DEFAULT - applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F - applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F - applymovement 3, Route110_TrickHousePuzzle5_Movement_16309F - applymovement 4, Route110_TrickHousePuzzle5_Movement_16309F - applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F - msgbox Route110_TrickHousePuzzle5_Text_19D5ED, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_DisappointmentError, MSGBOX_DEFAULT + applymovement 1, Route110_TrickHousePuzzle5_Movement_MechadollShake + applymovement 2, Route110_TrickHousePuzzle5_Movement_MechadollShake + applymovement 3, Route110_TrickHousePuzzle5_Movement_MechadollShake + applymovement 4, Route110_TrickHousePuzzle5_Movement_MechadollShake + applymovement 5, Route110_TrickHousePuzzle5_Movement_MechadollShake + msgbox Route110_TrickHousePuzzle5_Text_Wahahahaha, MSGBOX_DEFAULT waitmovement 0 closemessage - msgbox Route110_TrickHousePuzzle5_Text_19D615, MSGBOX_DEFAULT + msgbox Route110_TrickHousePuzzle5_Text_WaitForNextChallenge, MSGBOX_DEFAULT closemessage warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end -Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF +Route110_TrickHousePuzzle5_EventScript_CorrectAnswer:: @ 8162DDF waitse playse SE_SUCCESS - goto Route110_TrickHousePuzzle5_EventScript_162DE9 + goto Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough end -Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 - msgbox Route110_TrickHousePuzzle5_Text_19D599, MSGBOX_DEFAULT +Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough:: @ 8162DE9 + msgbox Route110_TrickHousePuzzle5_Text_CorrectGoThrough1, MSGBOX_DEFAULT releaseall end @@ -676,7 +676,7 @@ Route110_TrickHousePuzzle5_Movement_16309B:: @ 816309B step_end Route110_TrickHouseEntrance_Movement_16309F:: @ 816309F -Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F +Route110_TrickHousePuzzle5_Movement_MechadollShake:: @ 816309F face_left delay_2 face_right diff --git a/data/maps/Route110_TrickHousePuzzle5/text.inc b/data/maps/Route110_TrickHousePuzzle5/text.inc index 9470e4d7f..9e01acec5 100644 --- a/data/maps/Route110_TrickHousePuzzle5/text.inc +++ b/data/maps/Route110_TrickHousePuzzle5/text.inc @@ -1,139 +1,139 @@ -Route110_TrickHousePuzzle5_Text_19D423:: @ 819D423 +Route110_TrickHousePuzzle5_Text_Mechadoll1Intro:: @ 819D423 .string "CLICKETY-CLACK...\n" .string "MECHADOLL 1 AM I!\p" .string "IF YOU ANSWER QUIZZES CORRECTLY,\n" .string "THEN YOU WILL GO TO MECHADOLL 5.\l" .string "THEN YOU CAN OBTAIN THE SECRET CODE.$" -Route110_TrickHousePuzzle5_Text_19D4AE:: @ 819D4AE +Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1:: @ 819D4AE .string "MECHADOLL 1 QUIZ.\p" .string "One of these POKéMON is not found\n" .string "on ROUTE 103. Which one is it?$" -Route110_TrickHousePuzzle5_Text_19D501:: @ 819D501 +Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2:: @ 819D501 .string "MECHADOLL 1 QUIZ.\p" .string "One of these POKéMON is not of the\n" .string "GRASS type. Which one is it?$" -Route110_TrickHousePuzzle5_Text_19D553:: @ 819D553 +Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3:: @ 819D553 .string "MECHADOLL 1 QUIZ.\p" .string "One of these POKéMON uses SCRATCH.\n" .string "Which one is it?$" -Route110_TrickHousePuzzle5_Text_19D599:: @ 819D599 +Route110_TrickHousePuzzle5_Text_CorrectGoThrough1:: @ 819D599 .string "CONGRATULATIONS. CORRECT YOU ARE.\n" .string "GO THROUGH. PLEASE.$" -Route110_TrickHousePuzzle5_Text_19D5CF:: @ 819D5CF +Route110_TrickHousePuzzle5_Text_DisappointmentError:: @ 819D5CF .string "BZZZT. DISAPPOINTMENT.\n" .string "ERROR.$" -Route110_TrickHousePuzzle5_Text_19D5ED:: @ 819D5ED +Route110_TrickHousePuzzle5_Text_Wahahahaha:: @ 819D5ED .string "WAHAHAHAHA! WAHAHAHAHA!\n" .string "CLICKETY-CLACK!$" -Route110_TrickHousePuzzle5_Text_19D615:: @ 819D615 +Route110_TrickHousePuzzle5_Text_WaitForNextChallenge:: @ 819D615 .string "YOUR NEXT CHALLENGE WE WAIT FOR.$" -Route110_TrickHousePuzzle5_Text_19D636:: @ 819D636 +Route110_TrickHousePuzzle5_Text_Mechadoll2Intro:: @ 819D636 .string "CLICKETY-CLACK...\n" .string "MECHADOLL 2 AM I!\p" .string "MECHADOLL 1'S QUIZ DIFFICULTY LEVEL\n" .string "IS SET TOO LOW.$" -Route110_TrickHousePuzzle5_Text_19D68E:: @ 819D68E +Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1:: @ 819D68E .string "MECHADOLL 2 QUIZ.\p" .string "In PROF. BIRCH's bag, there were three\n" .string "POKéMON. Which one was at the right?$" -Route110_TrickHousePuzzle5_Text_19D6EC:: @ 819D6EC +Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2:: @ 819D6EC .string "MECHADOLL 2 QUIZ.\p" .string "Which POKéMON was offered for a trade\n" .string "at the POKéMON TRAINER'S SCHOOL?$" -Route110_TrickHousePuzzle5_Text_19D745:: @ 819D745 +Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3:: @ 819D745 .string "MECHADOLL 2 QUIZ.\p" .string "The DEVON RESEARCHER was looking for\n" .string "what POKéMON in PETALBURG WOODS?$" -UnknownString_819D79D: @ 819D79D +Route110_TrickHousePuzzle5_Text_CorrectGoThrough2: @ 819D79D .string "CONGRATULATIONS. CORRECT YOU ARE.\n" .string "GO THROUGH. PLEASE.$" -Route110_TrickHousePuzzle5_Text_19D7D3:: @ 819D7D3 +Route110_TrickHousePuzzle5_Text_Mechadoll3Intro:: @ 819D7D3 .string "CLICKETY-CLACK...\n" .string "MECHADOLL 3 AM I!\p" .string "MATTERS OF MONEY ARE MY SOLE FOCUS.$" -Route110_TrickHousePuzzle5_Text_19D81B:: @ 819D81B +Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1:: @ 819D81B .string "MECHADOLL 3 QUIZ.\p" .string "Which costs more?\n" .string "Three POKé BALLS or one SUPER POTION?$" -Route110_TrickHousePuzzle5_Text_19D865:: @ 819D865 +Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2:: @ 819D865 .string "MECHADOLL 3 QUIZ.\p" .string "Sell one ESCAPE ROPE and buy\n" .string "one ANTIDOTE. How much money remains?$" -Route110_TrickHousePuzzle5_Text_19D8BA:: @ 819D8BA +Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3:: @ 819D8BA .string "MECHADOLL 3 QUIZ.\p" .string "Do one FULL HEAL and GREAT BALL\n" .string "cost more than one REVIVE?$" -UnknownString_819D907: @ 819D907 +Route110_TrickHousePuzzle5_Text_CorrectGoThrough3: @ 819D907 .string "CONGRATULATIONS. CORRECT YOU ARE.\n" .string "GO THROUGH. PLEASE.$" -Route110_TrickHousePuzzle5_Text_19D93D:: @ 819D93D +Route110_TrickHousePuzzle5_Text_Mechadoll4Intro:: @ 819D93D .string "CLICKETY-CLACK...\n" .string "MECHADOLL 4 THAT IS ME!\p" .string "MY QUIZ IS AN OBJECT OF BEAUTY.$" -Route110_TrickHousePuzzle5_Text_19D987:: @ 819D987 +Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1:: @ 819D987 .string "MECHADOLL 4 QUIZ.\p" .string "RUSTBORO GYM LEADER ROXANNE used a\n" .string "GEODUDE. Was it male or female?$" -Route110_TrickHousePuzzle5_Text_19D9DC:: @ 819D9DC +Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2:: @ 819D9DC .string "MECHADOLL 4 QUIZ.\p" .string "In DEWFORD HALL, were there more men\n" .string "or women?$" -Route110_TrickHousePuzzle5_Text_19DA1D:: @ 819DA1D +Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3:: @ 819DA1D .string "MECHADOLL 4 QUIZ.\p" .string "The first TRAINER in DEWFORD GYM was\n" .string "male or female?$" -UnknownString_819DA64: @ 819DA64 +Route110_TrickHousePuzzle5_Text_CorrectGoThrough4: @ 819DA64 .string "CONGRATULATIONS. CORRECT YOU ARE.\n" .string "GO THROUGH. PLEASE.$" -Route110_TrickHousePuzzle5_Text_19DA9A:: @ 819DA9A +Route110_TrickHousePuzzle5_Text_Mechadoll5Intro:: @ 819DA9A .string "CLICKETY-CLACK...\n" .string "MECHADOLL 5 AM I!\p" .string "THE MASTER'S BEST AND PROUDEST\n" .string "ACHIEVEMENT AM I.$" -Route110_TrickHousePuzzle5_Text_19DAEF:: @ 819DAEF +Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1:: @ 819DAEF .string "MECHADOLL 5 QUIZ.\p" .string "How many BIKES does RYDEL have on\n" .string "display outside his cycle shop?$" -Route110_TrickHousePuzzle5_Text_19DB43:: @ 819DB43 +Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2:: @ 819DB43 .string "MECHADOLL 5 QUIZ.\p" .string "How many people give you BERRIES at the\n" .string "PRETTY PETAL flower shop?$" -Route110_TrickHousePuzzle5_Text_19DB97:: @ 819DB97 +Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3:: @ 819DB97 .string "MECHADOLL 5 QUIZ.\p" .string "How many signs are there in\n" .string "LILYCOVE CITY?$" -UnknownString_819DBD4: @ 819DBD4 +Route110_TrickHousePuzzle5_Text_CorrectGoThrough5: @ 819DBD4 .string "CONGRATULATIONS. CORRECT YOU ARE.\n" .string "GO THROUGH. PLEASE.$" -UnknownString_819DC0A: @ 819DC0A +Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened: @ 819DC0A .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is my life.”\n" diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index 37dae5595..df9f0d32b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle6_EventScript_163107", + "script": "Route110_TrickHousePuzzle6_EventScript_Sophia", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle6_EventScript_16311E", + "script": "Route110_TrickHousePuzzle6_EventScript_Benny", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", - "script": "Route110_TrickHousePuzzle6_EventScript_163135", + "script": "Route110_TrickHousePuzzle6_EventScript_Sebastian", "flag": "0" }, { @@ -60,8 +60,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle6_EventScript_1B1A9F", - "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1" + "script": "Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL" } ], "warp_events": [ @@ -95,7 +95,7 @@ "y": 9, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle6_EventScript_1630EA" + "script": "Route110_TrickHousePuzzle6_EventScript_Scroll" } ] } diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 46b2f0f5a..cb7838480 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -1,43 +1,43 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 81630CD - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_1630D8 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_1630DC + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_OnWarp .byte 0 -Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8 +Route110_TrickHousePuzzle6_OnTransition:: @ 81630D8 special RotatingGate_InitPuzzle end -Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC - map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 +Route110_TrickHousePuzzle6_OnWarp:: @ 81630DC + map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_InitPuzzle .2byte 0 -Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 +Route110_TrickHousePuzzle6_EventScript_InitPuzzle:: @ 81630E6 special RotatingGate_InitPuzzleAndGraphics end -Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA +Route110_TrickHousePuzzle6_EventScript_Scroll:: @ 81630EA lockall compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 - goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC - goto Route110_TrickHousePuzzle6_EventScript_161892 + goto_if_eq Route110_TrickHousePuzzle6_EventScript_ReadScroll + goto Route110_TrickHousePuzzle6_EventScript_ReadScrollAgain end -Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC +Route110_TrickHousePuzzle6_EventScript_ReadScroll:: @ 81630FC setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1 - goto Route110_TrickHousePuzzle6_EventScript_16189C + goto Route110_TrickHousePuzzle6_EventScript_FoundScroll end -Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 - trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 - msgbox Route110_TrickHousePuzzle6_Text_19DCE7, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle6_EventScript_Sophia:: @ 8163107 + trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_SophiaIntro, Route110_TrickHousePuzzle6_Text_SophiaDefeat + msgbox Route110_TrickHousePuzzle6_Text_SophiaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E - trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 - msgbox Route110_TrickHousePuzzle6_Text_19DD96, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle6_EventScript_Benny:: @ 816311E + trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_BennyIntro, Route110_TrickHousePuzzle6_Text_BennyDefeat + msgbox Route110_TrickHousePuzzle6_Text_BennyPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135 - trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE - msgbox Route110_TrickHousePuzzle6_Text_19DE44, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle6_EventScript_Sebastian:: @ 8163135 + trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_SebastianIntro, Route110_TrickHousePuzzle6_Text_SebastianDefeat + msgbox Route110_TrickHousePuzzle6_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle6/text.inc b/data/maps/Route110_TrickHousePuzzle6/text.inc index 17e1fe5e8..11fe53364 100644 --- a/data/maps/Route110_TrickHousePuzzle6/text.inc +++ b/data/maps/Route110_TrickHousePuzzle6/text.inc @@ -1,40 +1,40 @@ -Route110_TrickHousePuzzle6_Text_19DC87:: @ 819DC87 +Route110_TrickHousePuzzle6_Text_SophiaIntro:: @ 819DC87 .string "When I heard there was a strange\n" .string "house, I had to check it out.$" -Route110_TrickHousePuzzle6_Text_19DCC6:: @ 819DCC6 +Route110_TrickHousePuzzle6_Text_SophiaDefeat:: @ 819DCC6 .string "I've discovered a tough TRAINER!$" -Route110_TrickHousePuzzle6_Text_19DCE7:: @ 819DCE7 +Route110_TrickHousePuzzle6_Text_SophiaPostBattle:: @ 819DCE7 .string "I'm sure having a good time checking\n" .string "this place out.\p" .string "It's a challenge I've found worth\n" .string "repeating!$" -Route110_TrickHousePuzzle6_Text_19DD49:: @ 819DD49 +Route110_TrickHousePuzzle6_Text_BennyIntro:: @ 819DD49 .string "Maybe I could get my BIRD POKéMON\n" .string "to fly over the wall...$" -Route110_TrickHousePuzzle6_Text_19DD83:: @ 819DD83 +Route110_TrickHousePuzzle6_Text_BennyDefeat:: @ 819DD83 .string "Gwaaah! I blew it!$" -Route110_TrickHousePuzzle6_Text_19DD96:: @ 819DD96 +Route110_TrickHousePuzzle6_Text_BennyPostBattle:: @ 819DD96 .string "Ehehehe... I guess I lost because I\n" .string "was trying to cheat.$" -Route110_TrickHousePuzzle6_Text_19DDCF:: @ 819DDCF +Route110_TrickHousePuzzle6_Text_SebastianIntro:: @ 819DDCF .string "I'm getting dizzy from these rotating\n" .string "doors...$" -Route110_TrickHousePuzzle6_Text_19DDFE:: @ 819DDFE +Route110_TrickHousePuzzle6_Text_SebastianDefeat:: @ 819DDFE .string "Everything's spinning around and\n" .string "around. I can't take this anymore...$" -Route110_TrickHousePuzzle6_Text_19DE44:: @ 819DE44 +Route110_TrickHousePuzzle6_Text_SebastianPostBattle:: @ 819DE44 .string "You don't seem to be affected at all.\n" .string "Or do you have your poker face on?$" -UnknownString_819DE8D: @ 819DE8D +Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened: @ 819DE8D .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER is huggable.”\n" diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 3bd58c92a..57dfc6c48 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle7_EventScript_1633D6", + "script": "Route110_TrickHousePuzzle7_EventScript_Joshua", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle7_EventScript_163404", + "script": "Route110_TrickHousePuzzle7_EventScript_Alexis", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle7_EventScript_1633ED", + "script": "Route110_TrickHousePuzzle7_EventScript_Patricia", "flag": "0" }, { @@ -60,8 +60,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle7_EventScript_1B1AAC", - "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1" + "script": "Route110_TrickHousePuzzle7_EventScript_ItemTropicMail", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL" } ], "warp_events": [ @@ -113,7 +113,7 @@ "y": 16, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle7_EventScript_1632B9" + "script": "Route110_TrickHousePuzzle7_EventScript_Switch1" }, { "type": "sign", @@ -121,7 +121,7 @@ "y": 10, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle7_EventScript_163317" + "script": "Route110_TrickHousePuzzle7_EventScript_Switch3" }, { "type": "sign", @@ -129,7 +129,7 @@ "y": 11, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle7_EventScript_1632E8" + "script": "Route110_TrickHousePuzzle7_EventScript_Switch2" }, { "type": "sign", @@ -137,7 +137,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle7_EventScript_163346" + "script": "Route110_TrickHousePuzzle7_EventScript_Switch4" }, { "type": "sign", @@ -145,7 +145,7 @@ "y": 5, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle7_EventScript_163375" + "script": "Route110_TrickHousePuzzle7_EventScript_Switch5" } ] } diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 8491b5220..28fd2f608 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -1,75 +1,75 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 816314C - map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_163161 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_163253 - map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_16326F - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_16327B + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_OnTransition + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_OnFrame .byte 0 -Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 - call Route110_TrickHousePuzzle7_EventScript_163167 +Route110_TrickHousePuzzle7_OnResume:: @ 8163161 + call Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles end -Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 +Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles:: @ 8163167 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn return -Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 +Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn:: @ 8163195 setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0 setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_1631A8:: @ 81631A8 +Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn:: @ 81631A8 setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0 setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_1631BB:: @ 81631BB +Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn:: @ 81631BB setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0 setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_1631CE:: @ 81631CE +Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn:: @ 81631CE setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0 setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_1631E1:: @ 81631E1 +Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn:: @ 81631E1 setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0 setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1 return -Route110_TrickHousePuzzle7_EventScript_1631F4:: @ 81631F4 +Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff:: @ 81631F4 setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0 setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1 return -Route110_TrickHousePuzzle7_EventScript_163207:: @ 8163207 +Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff:: @ 8163207 setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0 setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1 return -Route110_TrickHousePuzzle7_EventScript_16321A:: @ 816321A +Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff:: @ 816321A setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0 setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1 return -Route110_TrickHousePuzzle7_EventScript_16322D:: @ 816322D +Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff:: @ 816322D setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0 setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1 return -Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 +Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff:: @ 8163240 setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0 setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1 return -Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 +Route110_TrickHousePuzzle7_OnTransition:: @ 8163253 compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E + goto_if_eq Route110_TrickHousePuzzle7_EventScript_TeleportedTransition clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 @@ -77,19 +77,19 @@ Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 end -Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E +Route110_TrickHousePuzzle7_EventScript_TeleportedTransition:: @ 816326E end -Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F +Route110_TrickHousePuzzle7_OnLoad:: @ 816326F compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 - call_if_eq Route110_TrickHousePuzzle7_EventScript_163167 + call_if_eq Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles end -Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B - map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_163285 +Route110_TrickHousePuzzle7_OnFrame:: @ 816327B + map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_ClearState2 .2byte 0 -Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 +Route110_TrickHousePuzzle7_EventScript_ClearState2:: @ 8163285 setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0 end @@ -97,12 +97,12 @@ Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D - goto Route110_TrickHousePuzzle7_EventScript_161892 + goto Route110_TrickHousePuzzle7_EventScript_ReadScrollAgain end Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1 - goto Route110_TrickHousePuzzle7_EventScript_16189C + goto Route110_TrickHousePuzzle7_EventScript_FoundScroll end Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 @@ -113,122 +113,122 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 releaseall end -Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 +Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 81632B9 lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1631F4 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff special DrawWholeMapView playse SE_CLICK - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A4 - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A9 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off end -Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 +Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 81632E8 lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_163207 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff special DrawWholeMapView playse SE_CLICK - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633AE - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633B3 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off end -Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 +Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 8163317 lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_16321A + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff special DrawWholeMapView playse SE_CLICK - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633B8 - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633BD + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off end -Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 +Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 8163346 lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_16322D + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff special DrawWholeMapView playse SE_CLICK - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C2 - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C7 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off end -Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 +Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 8163375 lockall delay 32 - call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 - call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_163240 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff special DrawWholeMapView playse SE_CLICK - goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633CC - goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633D1 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5On + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off end -Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 +Route110_TrickHousePuzzle7_EventScript_SetSwitch1On:: @ 81633A4 setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633A9:: @ 81633A9 +Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off:: @ 81633A9 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633AE:: @ 81633AE +Route110_TrickHousePuzzle7_EventScript_SetSwitch2On:: @ 81633AE setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633B3:: @ 81633B3 +Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off:: @ 81633B3 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633B8:: @ 81633B8 +Route110_TrickHousePuzzle7_EventScript_SetSwitch3On:: @ 81633B8 setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633BD:: @ 81633BD +Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off:: @ 81633BD clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633C2:: @ 81633C2 +Route110_TrickHousePuzzle7_EventScript_SetSwitch4On:: @ 81633C2 setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633C7:: @ 81633C7 +Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off:: @ 81633C7 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633CC:: @ 81633CC +Route110_TrickHousePuzzle7_EventScript_SetSwitch5On:: @ 81633CC setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 +Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off:: @ 81633D1 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end -Route110_TrickHousePuzzle7_EventScript_1633D6:: @ 81633D6 - trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B - msgbox Route110_TrickHousePuzzle7_Text_19DF7E, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle7_EventScript_Joshua:: @ 81633D6 + trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_JoshuaIntro, Route110_TrickHousePuzzle7_Text_JoshuaDefeat + msgbox Route110_TrickHousePuzzle7_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle7_EventScript_1633ED:: @ 81633ED - trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 - msgbox Route110_TrickHousePuzzle7_Text_19E00F, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle7_EventScript_Patricia:: @ 81633ED + trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_PatriciaIntro, Route110_TrickHousePuzzle7_Text_PatriciaDefeat + msgbox Route110_TrickHousePuzzle7_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404 - trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 - msgbox Route110_TrickHousePuzzle7_Text_19E0B2, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle7_EventScript_Alexis:: @ 8163404 + trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_AlexisIntro, Route110_TrickHousePuzzle7_Text_AlexisDefeat + msgbox Route110_TrickHousePuzzle7_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle7/text.inc b/data/maps/Route110_TrickHousePuzzle7/text.inc index 7026737b9..3abea2136 100644 --- a/data/maps/Route110_TrickHousePuzzle7/text.inc +++ b/data/maps/Route110_TrickHousePuzzle7/text.inc @@ -1,40 +1,40 @@ -Route110_TrickHousePuzzle7_Text_19DF0B:: @ 819DF0B +Route110_TrickHousePuzzle7_Text_JoshuaIntro:: @ 819DF0B .string "The TRICK MASTER always vanishes\n" .string "like smoke. How does he do it?$" -Route110_TrickHousePuzzle7_Text_19DF4B:: @ 819DF4B +Route110_TrickHousePuzzle7_Text_JoshuaDefeat:: @ 819DF4B .string "Aiyeeeh! You're much too strong!\n" .string "How do you do it?$" -Route110_TrickHousePuzzle7_Text_19DF7E:: @ 819DF7E +Route110_TrickHousePuzzle7_Text_JoshuaPostBattle:: @ 819DF7E .string "I wish I could appear and disappear as\n" .string "if I were smoke, too.$" -Route110_TrickHousePuzzle7_Text_19DFBB:: @ 819DFBB +Route110_TrickHousePuzzle7_Text_PatriciaIntro:: @ 819DFBB .string "Going around the same spot...\n" .string "It begets ill fortune...$" -Route110_TrickHousePuzzle7_Text_19DFF2:: @ 819DFF2 +Route110_TrickHousePuzzle7_Text_PatriciaDefeat:: @ 819DFF2 .string "Defeated!\n" .string "It's a bad sign...$" -Route110_TrickHousePuzzle7_Text_19E00F:: @ 819E00F +Route110_TrickHousePuzzle7_Text_PatriciaPostBattle:: @ 819E00F .string "I've circled the same spot over ten\n" .string "times now... It's ill fortune...$" -Route110_TrickHousePuzzle7_Text_19E054:: @ 819E054 +Route110_TrickHousePuzzle7_Text_AlexisIntro:: @ 819E054 .string "Whoever wins will get through here\n" .string "first. That's the feeling I get.$" -Route110_TrickHousePuzzle7_Text_19E098:: @ 819E098 +Route110_TrickHousePuzzle7_Text_AlexisDefeat:: @ 819E098 .string "Oh!\n" .string "Well, go ahead, then!$" -Route110_TrickHousePuzzle7_Text_19E0B2:: @ 819E0B2 +Route110_TrickHousePuzzle7_Text_AlexisPostBattle:: @ 819E0B2 .string "You're solving all the puzzles in the\n" .string "TRICK HOUSE. That's the feeling I get.$" -UnknownString_819E0FF: @ 819E0FF +Route110_TrickHousePuzzle7_Text_WroteSecretCodeLockOpened: @ 819E0FF .string "{PLAYER} wrote down the secret code\n" .string "on the door.\p" .string "“TRICK MASTER I love.”\n" diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 6b48e62d8..3f42fed9a 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle8_EventScript_163439", + "script": "Route110_TrickHousePuzzle8_EventScript_Vincent", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_TrickHousePuzzle8_EventScript_163467", + "script": "Route110_TrickHousePuzzle8_EventScript_Leroy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_TrickHousePuzzle8_EventScript_163450", + "script": "Route110_TrickHousePuzzle8_EventScript_Elaine", "flag": "0" }, { @@ -60,8 +60,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle8_EventScript_1B1AB9", - "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1" + "script": "Route110_TrickHousePuzzle8_EventScript_ItemBeadMail", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL" } ], "warp_events": [ @@ -95,7 +95,7 @@ "y": 11, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_TrickHousePuzzle8_EventScript_16341C" + "script": "Route110_TrickHousePuzzle8_EventScript_Scroll" } ] } diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index fd8dbfb85..bf988a28c 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -1,29 +1,29 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B .byte 0 -Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C +Route110_TrickHousePuzzle8_EventScript_Scroll:: @ 816341C lockall compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E - goto Route110_TrickHousePuzzle8_EventScript_161892 + goto Route110_TrickHousePuzzle8_EventScript_ReadScrollAgain end Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1 - goto Route110_TrickHousePuzzle8_EventScript_16189C + goto Route110_TrickHousePuzzle8_EventScript_FoundScroll end -Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 - trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 - msgbox Route110_TrickHousePuzzle8_Text_19E1C5, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle8_EventScript_Vincent:: @ 8163439 + trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_VincentIntro, Route110_TrickHousePuzzle8_Text_VincentDefeat + msgbox Route110_TrickHousePuzzle8_Text_VincentPostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle8_EventScript_163450:: @ 8163450 - trainerbattle_single TRAINER_ELAINE, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C - msgbox Route110_TrickHousePuzzle8_Text_19E24C, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle8_EventScript_Elaine:: @ 8163450 + trainerbattle_single TRAINER_ELAINE, Route110_TrickHousePuzzle8_Text_ElaineIntro, Route110_TrickHousePuzzle8_Text_ElaineDefeat + msgbox Route110_TrickHousePuzzle8_Text_ElainePostBattle, MSGBOX_AUTOCLOSE end -Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467 - trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 - msgbox Route110_TrickHousePuzzle8_Text_19E2EE, MSGBOX_AUTOCLOSE +Route110_TrickHousePuzzle8_EventScript_Leroy:: @ 8163467 + trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_LeroyIntro, Route110_TrickHousePuzzle8_Text_LeroyDefeat + msgbox Route110_TrickHousePuzzle8_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle8/text.inc b/data/maps/Route110_TrickHousePuzzle8/text.inc index ec388c94d..26466d93b 100644 --- a/data/maps/Route110_TrickHousePuzzle8/text.inc +++ b/data/maps/Route110_TrickHousePuzzle8/text.inc @@ -1,34 +1,34 @@ -Route110_TrickHousePuzzle8_Text_19E178:: @ 819E178 +Route110_TrickHousePuzzle8_Text_VincentIntro:: @ 819E178 .string "Not many TRAINERS have made it\n" .string "this far.$" -Route110_TrickHousePuzzle8_Text_19E1A1:: @ 819E1A1 +Route110_TrickHousePuzzle8_Text_VincentDefeat:: @ 819E1A1 .string "That must mean you're tough, too...$" -Route110_TrickHousePuzzle8_Text_19E1C5:: @ 819E1C5 +Route110_TrickHousePuzzle8_Text_VincentPostBattle:: @ 819E1C5 .string "You've beaten the POKéMON LEAGUE\n" .string "CHAMPION? That's too much!$" -Route110_TrickHousePuzzle8_Text_19E201:: @ 819E201 +Route110_TrickHousePuzzle8_Text_ElaineIntro:: @ 819E201 .string "Consider yourself lucky to be\n" .string "battling me!$" -Route110_TrickHousePuzzle8_Text_19E22C:: @ 819E22C +Route110_TrickHousePuzzle8_Text_ElaineDefeat:: @ 819E22C .string "This isn't right!\n" .string "I can't lose!$" -Route110_TrickHousePuzzle8_Text_19E24C:: @ 819E24C +Route110_TrickHousePuzzle8_Text_ElainePostBattle:: @ 819E24C .string "It's a miracle that you beat me.\n" .string "You can brag about it.$" -Route110_TrickHousePuzzle8_Text_19E284:: @ 819E284 +Route110_TrickHousePuzzle8_Text_LeroyIntro:: @ 819E284 .string "You've been slugging through the TRICK\n" .string "HOUSE challenge, too.$" -Route110_TrickHousePuzzle8_Text_19E2C1:: @ 819E2C1 +Route110_TrickHousePuzzle8_Text_LeroyDefeat:: @ 819E2C1 .string "I see...\n" .string "You possess an extraordinary style.$" -Route110_TrickHousePuzzle8_Text_19E2EE:: @ 819E2EE +Route110_TrickHousePuzzle8_Text_LeroyPostBattle:: @ 819E2EE .string "Seeing someone like you should please\n" .string "the TRICK MASTER.$" diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 171cd7a48..b43ccee73 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C3B1", + "script": "RustboroCity_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C386", + "script": "RustboroCity_EventScript_FatMan", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C401", + "script": "RustboroCity_EventScript_NinjaBoy", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C3F8", + "script": "RustboroCity_EventScript_Twin", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C3D9", + "script": "RustboroCity_EventScript_Boy2", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C3BA", + "script": "RustboroCity_EventScript_Man1", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C449", + "script": "RustboroCity_EventScript_LittleBoy", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C45F", + "script": "RustboroCity_EventScript_LittleGirl", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C5FF", + "script": "RustboroCity_EventScript_DevonEmployee1", "flag": "FLAG_HIDE_DEVON_RUSTBORO" }, { @@ -167,7 +167,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C3A5", + "script": "RustboroCity_EventScript_DevonEmployee2", "flag": "0" }, { @@ -180,8 +180,8 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_1B172B", - "flag": "FLAG_ITEM_RUSTBORO_1" + "script": "RustboroCity_EventScript_ItemXDefend", + "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND" }, { "graphics_id": "OBJ_EVENT_GFX_MAN_5", @@ -193,7 +193,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C475", + "script": "RustboroCity_EventScript_Man2", "flag": "0" }, { @@ -206,7 +206,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_EventScript_14C8DA", + "script": "RustboroCity_EventScript_RivalEncounter", "flag": "FLAG_HIDE_RIVAL_RUSTBORO" } ], @@ -304,7 +304,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_14C481" + "script": "RustboroCity_EventScript_StolenGoodsTrigger0" }, { "type": "trigger", @@ -313,7 +313,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_14C498" + "script": "RustboroCity_EventScript_StolenGoodsTrigger1" }, { "type": "trigger", @@ -322,7 +322,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_14C4AF" + "script": "RustboroCity_EventScript_StolenGoodsTrigger2" }, { "type": "trigger", @@ -331,7 +331,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_14C4C6" + "script": "RustboroCity_EventScript_StolenGoodsTrigger3" }, { "type": "trigger", @@ -340,7 +340,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "1", - "script": "RustboroCity_EventScript_14C4DD" + "script": "RustboroCity_EventScript_StolenGoodsTrigger4" }, { "type": "trigger", @@ -349,7 +349,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_14C620" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger0" }, { "type": "trigger", @@ -358,7 +358,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_14C62C" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger1" }, { "type": "trigger", @@ -367,7 +367,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_14C638" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger2" }, { "type": "trigger", @@ -376,7 +376,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "2", - "script": "RustboroCity_EventScript_14C644" + "script": "RustboroCity_EventScript_HelpGetGoodsTrigger3" }, { "type": "trigger", @@ -385,7 +385,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_14C74D" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger0" }, { "type": "trigger", @@ -394,7 +394,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_14C759" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger1" }, { "type": "trigger", @@ -403,7 +403,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_14C765" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger2" }, { "type": "trigger", @@ -412,7 +412,7 @@ "elevation": 3, "var": "VAR_RUSTBORO_STATE", "var_value": "4", - "script": "RustboroCity_EventScript_14C771" + "script": "RustboroCity_EventScript_ReturnGoodsTrigger3" } ], "bg_events": [ @@ -422,7 +422,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_14C41C" + "script": "RustboroCity_EventScript_GymSign" }, { "type": "sign", @@ -430,7 +430,7 @@ "y": 35, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_14C437" + "script": "RustboroCity_EventScript_TrainersSchoolSign" }, { "type": "sign", @@ -454,7 +454,7 @@ "y": 49, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_14C42E" + "script": "RustboroCity_EventScript_CitySign" }, { "type": "sign", @@ -478,7 +478,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_14C413" + "script": "RustboroCity_EventScript_DevonCorpSign" }, { "type": "sign", @@ -486,7 +486,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_14C40A" + "script": "RustboroCity_EventScript_TunnelSign" }, { "type": "sign", @@ -494,7 +494,7 @@ "y": 38, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_EventScript_14C440" + "script": "RustboroCity_EventScript_CuttersHouseSign" } ] } diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 52a835f2d..593c29a24 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,177 +1,177 @@ RustboroCity_MapScripts:: @ 814C372 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_14C378 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition .byte 0 -RustboroCity_MapScript1_14C378:: @ 814C378 +RustboroCity_OnTransition:: @ 814C378 setflag FLAG_VISITED_RUSTBORO_CITY call Common_EventScript_SetupEvilTeamGfxIds call Common_EventScript_SetupRivalGfxId end -RustboroCity_EventScript_14C386:: @ 814C386 +RustboroCity_EventScript_FatMan:: @ 814C386 lock faceplayer - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B - msgbox RustboroCity_Text_16689D, MSGBOX_DEFAULT + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_FatManSawGrunt + msgbox RustboroCity_Text_WeShortenItToDevon, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C39B:: @ 814C39B - msgbox RustboroCity_Text_16690C, MSGBOX_DEFAULT +RustboroCity_EventScript_FatManSawGrunt:: @ 814C39B + msgbox RustboroCity_Text_SneakyLookingManWentAroundCorner, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C3A5:: @ 814C3A5 +RustboroCity_EventScript_DevonEmployee2:: @ 814C3A5 lock faceplayer - msgbox RustboroCity_Text_166A67, MSGBOX_DEFAULT + msgbox RustboroCity_Text_YoureNewAroundHere, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C3B1:: @ 814C3B1 - msgbox RustboroCity_Text_166AE0, MSGBOX_NPC +RustboroCity_EventScript_Woman:: @ 814C3B1 + msgbox RustboroCity_Text_GymLeaderIsntEasyWithFire, MSGBOX_NPC end -RustboroCity_EventScript_14C3BA:: @ 814C3BA +RustboroCity_EventScript_Man1:: @ 814C3BA lock faceplayer - goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF - msgbox RustboroCity_Text_16696D, MSGBOX_DEFAULT + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_Man1HaveBadge + msgbox RustboroCity_Text_HaveYouChallengedGym, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C3CF:: @ 814C3CF - msgbox RustboroCity_Text_1669FE, MSGBOX_DEFAULT +RustboroCity_EventScript_Man1HaveBadge:: @ 814C3CF + msgbox RustboroCity_Text_HeyThatsRustborosGymBadge, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C3D9:: @ 814C3D9 +RustboroCity_EventScript_Boy2:: @ 814C3D9 lock faceplayer - goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE - msgbox RustboroCity_Text_166B86, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_Boy2BrineyLeftTunnel + msgbox RustboroCity_Text_MrBrineyWalksInTheTunnel, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C3EE:: @ 814C3EE - msgbox RustboroCity_Text_166BEF, MSGBOX_DEFAULT +RustboroCity_EventScript_Boy2BrineyLeftTunnel:: @ 814C3EE + msgbox RustboroCity_Text_MrBrineyLovesPeeko, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C3F8:: @ 814C3F8 - msgbox RustboroCity_Text_166C98, MSGBOX_NPC +RustboroCity_EventScript_Twin:: @ 814C3F8 + msgbox RustboroCity_Text_WowYouHavePokemon, MSGBOX_NPC end -RustboroCity_EventScript_14C401:: @ 814C401 - msgbox RustboroCity_Text_166CFA, MSGBOX_SIGN +RustboroCity_EventScript_NinjaBoy:: @ 814C401 + msgbox RustboroCity_Text_CatchRarePokemonIfIGoToSchool, MSGBOX_SIGN end -RustboroCity_EventScript_14C40A:: @ 814C40A - msgbox RustboroCity_Text_167374, MSGBOX_SIGN +RustboroCity_EventScript_TunnelSign:: @ 814C40A + msgbox RustboroCity_Text_TunnelNearingCompletion, MSGBOX_SIGN end -RustboroCity_EventScript_14C413:: @ 814C413 - msgbox RustboroCity_Text_1673FA, MSGBOX_SIGN +RustboroCity_EventScript_DevonCorpSign:: @ 814C413 + msgbox RustboroCity_Text_DevonCorpSign, MSGBOX_SIGN end -RustboroCity_EventScript_14C41C:: @ 814C41C - msgbox RustboroCity_Text_167439, MSGBOX_SIGN +RustboroCity_EventScript_GymSign:: @ 814C41C + msgbox RustboroCity_Text_GymSign, MSGBOX_SIGN end @ 814C425 - msgbox RustboroCity_Text_167485, MSGBOX_SIGN + msgbox RustboroCity_Text_DevonCorpBranchOfficeSign, MSGBOX_SIGN end -RustboroCity_EventScript_14C42E:: @ 814C42E - msgbox RustboroCity_Text_1674DD, MSGBOX_SIGN +RustboroCity_EventScript_CitySign:: @ 814C42E + msgbox RustboroCity_Text_CitySign, MSGBOX_SIGN end -RustboroCity_EventScript_14C437:: @ 814C437 - msgbox RustboroCity_Text_167525, MSGBOX_SIGN +RustboroCity_EventScript_TrainersSchoolSign:: @ 814C437 + msgbox RustboroCity_Text_TrainersSchoolSign, MSGBOX_SIGN end -RustboroCity_EventScript_14C440:: @ 814C440 - msgbox RustboroCity_Text_167568, MSGBOX_SIGN +RustboroCity_EventScript_CuttersHouseSign:: @ 814C440 + msgbox RustboroCity_Text_CuttersHouse, MSGBOX_SIGN end -RustboroCity_EventScript_14C449:: @ 814C449 +RustboroCity_EventScript_LittleBoy:: @ 814C449 lock faceplayer - msgbox RustboroCity_Text_166D59, MSGBOX_DEFAULT + msgbox RustboroCity_Text_PokemonCanChangeLookFromExp, MSGBOX_DEFAULT applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_EventScript_14C45F:: @ 814C45F +RustboroCity_EventScript_LittleGirl:: @ 814C45F lock faceplayer - msgbox RustboroCity_Text_166DB0, MSGBOX_DEFAULT + msgbox RustboroCity_Text_PokemonChangeShape, MSGBOX_DEFAULT applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_EventScript_14C475:: @ 814C475 +RustboroCity_EventScript_Man2:: @ 814C475 lock faceplayer - msgbox RustboroCity_Text_166DEE, MSGBOX_DEFAULT + msgbox RustboroCity_Text_TradePokemonGrowFast, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C481:: @ 814C481 +RustboroCity_EventScript_StolenGoodsTrigger0:: @ 814C481 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 setvar VAR_0x8004, 0 - goto RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_14C498:: @ 814C498 +RustboroCity_EventScript_StolenGoodsTrigger1:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 setvar VAR_0x8004, 1 - goto RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_14C4AF:: @ 814C4AF +RustboroCity_EventScript_StolenGoodsTrigger2:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 setvar VAR_0x8004, 2 - goto RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_14C4C6:: @ 814C4C6 +RustboroCity_EventScript_StolenGoodsTrigger3:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 setvar VAR_0x8004, 3 - goto RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_14C4DD:: @ 814C4DD +RustboroCity_EventScript_StolenGoodsTrigger4:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 setvar VAR_0x8004, 4 - goto RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_StolenGoodsScene end -RustboroCity_EventScript_14C4F4:: @ 814C4F4 - msgbox RustboroCity_Text_166E65, MSGBOX_DEFAULT +RustboroCity_EventScript_StolenGoodsScene:: @ 814C4F4 + msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT closemessage addobject 10 addobject 9 - applymovement 10, RustboroCity_Movement_14C5C2 + applymovement 10, RustboroCity_Movement_GruntEscape waitmovement 0 removeobject 10 - applymovement 9, RustboroCity_Movement_14C5D3 + applymovement 9, RustboroCity_Movement_EmployeeChaseGrunt1 waitmovement 0 - msgbox RustboroCity_Text_166E7E, MSGBOX_DEFAULT + msgbox RustboroCity_Text_WaitDontTakeMyGoods, MSGBOX_DEFAULT closemessage - applymovement 9, RustboroCity_Movement_14C5DB + applymovement 9, RustboroCity_Movement_EmployeeChaseGrunt2 waitmovement 0 removeobject 9 setobjectxyperm 9, 30, 10 @@ -189,35 +189,35 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 end @ 814C55D - msgbox RustboroCity_Text_166F6B, MSGBOX_DEFAULT + msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT return @ 814C566 - msgbox RustboroCity_Text_166FB4, MSGBOX_DEFAULT + msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT return @ 814C56F - applymovement 9, RustboroCity_Movement_14C5E3 + applymovement 9, RustboroCity_Movement_EmployeeApproachUp waitmovement 0 return @ 814C57A - applymovement 9, RustboroCity_Movement_14C5E7 + applymovement 9, RustboroCity_Movement_EmployeeApproachLeft waitmovement 0 return @ 814C585 - applymovement 9, RustboroCity_Movement_14C5EC + applymovement 9, RustboroCity_Movement_EmployeeApproachRight waitmovement 0 return @ 814C590 - applymovement 9, RustboroCity_Movement_14C5F1 + applymovement 9, RustboroCity_Movement_EmployeeApproachDown waitmovement 0 return @ 814C59B - applymovement 9, RustboroCity_Movement_14C5F7 + applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerFar waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 @@ -243,7 +243,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 walk_fast_up step_end -RustboroCity_Movement_14C5C2:: @ 814C5C2 +RustboroCity_Movement_GruntEscape:: @ 814C5C2 walk_fastest_right walk_fastest_right walk_fast_right @@ -262,7 +262,7 @@ RustboroCity_Movement_14C5C2:: @ 814C5C2 walk_fast_up step_end -RustboroCity_Movement_14C5D3:: @ 814C5D3 +RustboroCity_Movement_EmployeeChaseGrunt1:: @ 814C5D3 walk_right walk_right walk_right @@ -272,7 +272,7 @@ RustboroCity_Movement_14C5D3:: @ 814C5D3 walk_in_place_fastest_up step_end -RustboroCity_Movement_14C5DB:: @ 814C5DB +RustboroCity_Movement_EmployeeChaseGrunt2:: @ 814C5DB walk_up walk_up walk_up @@ -282,27 +282,27 @@ RustboroCity_Movement_14C5DB:: @ 814C5DB walk_up step_end -RustboroCity_Movement_14C5E3:: @ 814C5E3 +RustboroCity_Movement_EmployeeApproachUp:: @ 814C5E3 walk_down walk_right walk_right step_end -RustboroCity_Movement_14C5E7:: @ 814C5E7 +RustboroCity_Movement_EmployeeApproachLeft:: @ 814C5E7 walk_down walk_down walk_right walk_right step_end -RustboroCity_Movement_14C5EC:: @ 814C5EC +RustboroCity_Movement_EmployeeApproachRight:: @ 814C5EC walk_down walk_down walk_right walk_right step_end -RustboroCity_Movement_14C5F1:: @ 814C5F1 +RustboroCity_Movement_EmployeeApproachDown:: @ 814C5F1 walk_down walk_down walk_down @@ -310,7 +310,7 @@ RustboroCity_Movement_14C5F1:: @ 814C5F1 walk_right step_end -RustboroCity_Movement_14C5F7:: @ 814C5F7 +RustboroCity_Movement_EmployeeApproachPlayerFar:: @ 814C5F7 walk_down walk_down walk_down @@ -320,61 +320,61 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 walk_in_place_fastest_down step_end -RustboroCity_EventScript_14C5FF:: @ 814C5FF +RustboroCity_EventScript_DevonEmployee1:: @ 814C5FF lock faceplayer - goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614 - msgbox RustboroCity_Text_166F6B, MSGBOX_DEFAULT + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_ReturnGoodsSpokeToEmployee + msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C614:: @ 814C614 +RustboroCity_EventScript_ReturnGoodsSpokeToEmployee:: @ 814C614 waitse setvar VAR_TEMP_1, 4 - goto RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_14C620:: @ 814C620 +RustboroCity_EventScript_HelpGetGoodsTrigger0:: @ 814C620 lockall setvar VAR_TEMP_1, 0 - goto RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_14C62C:: @ 814C62C +RustboroCity_EventScript_HelpGetGoodsTrigger1:: @ 814C62C lockall setvar VAR_TEMP_1, 1 - goto RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_14C638:: @ 814C638 +RustboroCity_EventScript_HelpGetGoodsTrigger2:: @ 814C638 lockall setvar VAR_TEMP_1, 2 - goto RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_14C644:: @ 814C644 +RustboroCity_EventScript_HelpGetGoodsTrigger3:: @ 814C644 lockall setvar VAR_TEMP_1, 3 - goto RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_EmployeeAskToGetGoods end -RustboroCity_EventScript_14C650:: @ 814C650 +RustboroCity_EventScript_EmployeeAskToGetGoods:: @ 814C650 compare VAR_TEMP_1, 0 - call_if_eq RustboroCity_EventScript_14C691 + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp1 compare VAR_TEMP_1, 1 - call_if_eq RustboroCity_EventScript_14C6BD + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerLeft1 compare VAR_TEMP_1, 2 - call_if_eq RustboroCity_EventScript_14C6E9 + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerDown1 compare VAR_TEMP_1, 3 - call_if_eq RustboroCity_EventScript_14C715 + call_if_eq RustboroCity_EventScript_EmployeeApproachPlayerDown1 setflag FLAG_UNKNOWN_9F setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 - msgbox RustboroCity_Text_166EA5, MSGBOX_DEFAULT + msgbox RustboroCity_Text_HelpMeIWasRobbed, MSGBOX_DEFAULT releaseall end -RustboroCity_EventScript_14C691:: @ 814C691 +RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 814C691 applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN @@ -386,7 +386,7 @@ RustboroCity_EventScript_14C691:: @ 814C691 waitmovement 0 return -RustboroCity_EventScript_14C6BD:: @ 814C6BD +RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 814C6BD applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN @@ -398,7 +398,7 @@ RustboroCity_EventScript_14C6BD:: @ 814C6BD waitmovement 0 return -RustboroCity_EventScript_14C6E9:: @ 814C6E9 +RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 814C6E9 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -410,7 +410,7 @@ RustboroCity_EventScript_14C6E9:: @ 814C6E9 waitmovement 0 return -RustboroCity_EventScript_14C715:: @ 814C715 +RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 814C715 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -418,56 +418,56 @@ RustboroCity_EventScript_14C715:: @ 814C715 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 9, RustboroCity_Movement_14C74B + applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -RustboroCity_Movement_14C74B:: @ 814C74B +RustboroCity_Movement_EmployeeApproachPlayerDown:: @ 814C74B walk_down step_end -RustboroCity_EventScript_14C74D:: @ 814C74D +RustboroCity_EventScript_ReturnGoodsTrigger0:: @ 814C74D lockall setvar VAR_TEMP_1, 0 - goto RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_14C759:: @ 814C759 +RustboroCity_EventScript_ReturnGoodsTrigger1:: @ 814C759 lockall setvar VAR_TEMP_1, 1 - goto RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_14C765:: @ 814C765 +RustboroCity_EventScript_ReturnGoodsTrigger2:: @ 814C765 lockall setvar VAR_TEMP_1, 2 - goto RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_14C771:: @ 814C771 +RustboroCity_EventScript_ReturnGoodsTrigger3:: @ 814C771 lockall setvar VAR_TEMP_1, 3 - goto RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_ReturnGoods end -RustboroCity_EventScript_14C77D:: @ 814C77D +RustboroCity_EventScript_ReturnGoods:: @ 814C77D compare VAR_TEMP_1, 0 - call_if_eq RustboroCity_EventScript_14C7FE + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp2 compare VAR_TEMP_1, 1 - call_if_eq RustboroCity_EventScript_14C82A + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerLeft2 compare VAR_TEMP_1, 2 - call_if_eq RustboroCity_EventScript_14C856 + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerDown2 compare VAR_TEMP_1, 3 - call_if_eq RustboroCity_EventScript_14C882 + call_if_eq RustboroCity_EventScript_EmployeeApproachPlayerDown2 compare VAR_TEMP_1, 4 - call_if_eq RustboroCity_EventScript_14C8B8 - msgbox RustboroCity_Text_166FB4, MSGBOX_DEFAULT + call_if_eq RustboroCity_EventScript_EmployeeFacePlayerRight + msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT giveitem ITEM_GREAT_BALL compare VAR_RESULT, 0 - call_if_eq RustboroCity_EventScript_14C7F5 - msgbox RustboroCity_Text_16707F, MSGBOX_DEFAULT + call_if_eq RustboroCity_EventScript_BagFull + msgbox RustboroCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_DEVON_RUSTBORO @@ -478,11 +478,11 @@ RustboroCity_EventScript_14C77D:: @ 814C77D releaseall end -RustboroCity_EventScript_14C7F5:: @ 814C7F5 - msgbox RustboroCity_Text_16704C, MSGBOX_DEFAULT +RustboroCity_EventScript_BagFull:: @ 814C7F5 + msgbox RustboroCity_Text_YoureLoadedWithItems, MSGBOX_DEFAULT return -RustboroCity_EventScript_14C7FE:: @ 814C7FE +RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 814C7FE applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN @@ -494,7 +494,7 @@ RustboroCity_EventScript_14C7FE:: @ 814C7FE waitmovement 0 return -RustboroCity_EventScript_14C82A:: @ 814C82A +RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 814C82A applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN @@ -506,7 +506,7 @@ RustboroCity_EventScript_14C82A:: @ 814C82A waitmovement 0 return -RustboroCity_EventScript_14C856:: @ 814C856 +RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 814C856 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -518,7 +518,7 @@ RustboroCity_EventScript_14C856:: @ 814C856 waitmovement 0 return -RustboroCity_EventScript_14C882:: @ 814C882 +RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 814C882 applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN @@ -526,13 +526,13 @@ RustboroCity_EventScript_14C882:: @ 814C882 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 9, RustboroCity_Movement_14C74B + applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -RustboroCity_EventScript_14C8B8:: @ 814C8B8 +RustboroCity_EventScript_EmployeeFacePlayerRight:: @ 814C8B8 applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN @@ -542,43 +542,43 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8 waitmovement 0 return -RustboroCity_EventScript_14C8DA:: @ 814C8DA +RustboroCity_EventScript_RivalEncounter:: @ 814C8DA lock faceplayer - goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917 + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_BrineyHint checkplayergender compare VAR_RESULT, 0 - goto_if_eq RustboroCity_EventScript_14C8FD + goto_if_eq RustboroCity_EventScript_MayHiHowsPokedexComing compare VAR_RESULT, 1 - goto_if_eq RustboroCity_EventScript_14C90A + goto_if_eq RustboroCity_EventScript_BrendanHiHowsPokedexComing end -RustboroCity_EventScript_14C8FD:: @ 814C8FD +RustboroCity_EventScript_MayHiHowsPokedexComing:: @ 814C8FD setflag FLAG_MET_RIVAL_RUSTBORO - msgbox RustboroCity_Text_1670A7, MSGBOX_DEFAULT + msgbox RustboroCity_Text_MayHiHowsPokedexComing, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C90A:: @ 814C90A +RustboroCity_EventScript_BrendanHiHowsPokedexComing:: @ 814C90A setflag FLAG_MET_RIVAL_RUSTBORO - msgbox RustboroCity_Text_167213, MSGBOX_DEFAULT + msgbox RustboroCity_Text_BrendanHiHowsPokedexComing, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C917:: @ 814C917 +RustboroCity_EventScript_BrineyHint:: @ 814C917 checkplayergender compare VAR_RESULT, 0 - goto_if_eq RustboroCity_EventScript_14C92F + goto_if_eq RustboroCity_EventScript_MayBrineyHint compare VAR_RESULT, 1 - goto_if_eq RustboroCity_EventScript_14C939 + goto_if_eq RustboroCity_EventScript_BrendanBrineyHint end -RustboroCity_EventScript_14C92F:: @ 814C92F - msgbox RustboroCity_Text_16713C, MSGBOX_DEFAULT +RustboroCity_EventScript_MayBrineyHint:: @ 814C92F + msgbox RustboroCity_Text_MayMrBrineyHint, MSGBOX_DEFAULT release end -RustboroCity_EventScript_14C939:: @ 814C939 - msgbox RustboroCity_Text_1672B8, MSGBOX_DEFAULT +RustboroCity_EventScript_BrendanBrineyHint:: @ 814C939 + msgbox RustboroCity_Text_BrendanMrBrineyHint, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity/text.inc b/data/maps/RustboroCity/text.inc index 5c339576c..ca628b1a1 100644 --- a/data/maps/RustboroCity/text.inc +++ b/data/maps/RustboroCity/text.inc @@ -1,46 +1,46 @@ -RustboroCity_Text_16689D:: @ 816689D +RustboroCity_Text_WeShortenItToDevon:: @ 816689D .string "The DEVON CORPORATION...\n" .string "We all just shorten it to DEVON.\p" .string "That company makes all sorts of\n" .string "convenient products.$" -RustboroCity_Text_16690C:: @ 816690C +RustboroCity_Text_SneakyLookingManWentAroundCorner:: @ 816690C .string "Hm? A sneaky-looking man?\p" .string "Come to think of it, yes, a shady-\n" .string "looking guy went around the corner.$" -RustboroCity_Text_16696D:: @ 816696D +RustboroCity_Text_HaveYouChallengedGym:: @ 816696D .string "Have you taken the POKéMON GYM\n" .string "challenge?\p" .string "When you get that shiny GYM BADGE\n" .string "in hand, I guess TRAINERS begin to\l" .string "realize what is required of them.$" -RustboroCity_Text_1669FE:: @ 81669FE +RustboroCity_Text_HeyThatsRustborosGymBadge:: @ 81669FE .string "Hey, that's RUSTBORO's GYM BADGE!\p" .string "Out of all the POKéMON GYM BADGES,\n" .string "RUSTBORO's is the coolest, I'd say.$" -RustboroCity_Text_166A67:: @ 8166A67 +RustboroCity_Text_YoureNewAroundHere:: @ 8166A67 .string "Oh? Who might you be?\n" .string "You're a new face around these parts.\p" .string "Have you just transferred into the\n" .string "POKéMON TRAINER'S SCHOOL?$" -RustboroCity_Text_166AE0:: @ 8166AE0 +RustboroCity_Text_GymLeaderIsntEasyWithFire:: @ 8166AE0 .string "I challenged the GYM LEADER, but...\p" .string "It's not going to be easy winning with\n" .string "my FIRE-type POKéMON...\p" .string "FIRE-type POKéMON don't match up\n" .string "well against ROCK-type POKéMON...$" -RustboroCity_Text_166B86:: @ 8166B86 +RustboroCity_Text_MrBrineyWalksInTheTunnel:: @ 8166B86 .string "The old sailor MR. BRINEY lives in a\n" .string "cottage by the sea.\p" .string "He goes for walks in the tunnel every\n" .string "so often.$" -RustboroCity_Text_166BEF:: @ 8166BEF +RustboroCity_Text_MrBrineyLovesPeeko:: @ 8166BEF .string "The old sailor MR. BRINEY lives in a\n" .string "cottage by the sea.\p" .string "He said he was going shopping in\n" @@ -48,39 +48,39 @@ RustboroCity_Text_166BEF:: @ 8166BEF .string "That old seadog, he must really love\n" .string "that PEEKO.$" -RustboroCity_Text_166C98:: @ 8166C98 +RustboroCity_Text_WowYouHavePokemon:: @ 8166C98 .string "Wow, you have POKéMON with you, too.\p" .string "When I get bigger, I'm going to go\n" .string "places with POKéMON, too.$" -RustboroCity_Text_166CFA:: @ 8166CFA +RustboroCity_Text_CatchRarePokemonIfIGoToSchool:: @ 8166CFA .string "POKéMON TRAINER'S SCHOOL!\p" .string "If I go to this school, will I be able\n" .string "to catch rare POKéMON easily?$" -RustboroCity_Text_166D59:: @ 8166D59 +RustboroCity_Text_PokemonCanChangeLookFromExp:: @ 8166D59 .string "If a POKéMON gains experience in\n" .string "battles, it can sometimes change in\l" .string "the way it looks.$" -RustboroCity_Text_166DB0:: @ 8166DB0 +RustboroCity_Text_PokemonChangeShape:: @ 8166DB0 .string "A POKéMON changes shape?\n" .string "If one did that, I would be shocked!$" -RustboroCity_Text_166DEE:: @ 8166DEE +RustboroCity_Text_TradePokemonGrowFast:: @ 8166DEE .string "A POKéMON you get in a trade from\n" .string "someone grows fast.\p" .string "But if you don't have certain GYM\n" .string "BADGES, it may not obey you...$" -RustboroCity_Text_166E65:: @ 8166E65 +RustboroCity_Text_OutOfTheWay:: @ 8166E65 .string "Get out! Out of the way!$" -RustboroCity_Text_166E7E:: @ 8166E7E +RustboroCity_Text_WaitDontTakeMyGoods:: @ 8166E7E .string "Wait! Pleeeaaase!\p" .string "Don't take my GOODS!$" -RustboroCity_Text_166EA5:: @ 8166EA5 +RustboroCity_Text_HelpMeIWasRobbed:: @ 8166EA5 .string "Oh, it's you!\p" .string "You're that fantastic TRAINER who\n" .string "helped me in PETALBURG WOODS!\p" @@ -89,11 +89,11 @@ RustboroCity_Text_166EA5:: @ 8166EA5 .string "If I don't...\n" .string "I'm going to be in serious trouble.$" -RustboroCity_Text_166F6B:: @ 8166F6B +RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel:: @ 8166F6B .string "That shady character, I think he took\n" .string "off towards the tunnel over there.$" -RustboroCity_Text_166FB4:: @ 8166FB4 +RustboroCity_Text_YouGotItThankYou:: @ 8166FB4 .string "Oh! How did it go?\n" .string "The DEVON GOODS?\p" .string "You did!\n" @@ -102,22 +102,22 @@ RustboroCity_Text_166FB4:: @ 8166FB4 .string "I know! As my thanks, I'll give you\n" .string "another GREAT BALL!$" -RustboroCity_Text_16704C:: @ 816704C +RustboroCity_Text_YoureLoadedWithItems:: @ 816704C .string "Your BAG's full.\n" .string "I can't give you this GREAT BALL.$" -RustboroCity_Text_16707F:: @ 816707F +RustboroCity_Text_PleaseComeWithMe:: @ 816707F .string "Excuse me, please!\n" .string "Please come with me!$" -RustboroCity_Text_1670A7:: @ 81670A7 +RustboroCity_Text_MayHiHowsPokedexComing:: @ 81670A7 .string "MAY: Oh, hi, {PLAYER}{KUN}!\n" .string "How's your POKéDEX coming along?\p" .string "Mine's looking pretty decent.\p" .string "I caught POKéMON in PETALBURG WOODS\n" .string "until I ran out of POKé BALLS.$" -RustboroCity_Text_16713C:: @ 816713C +RustboroCity_Text_MayMrBrineyHint:: @ 816713C .string "MAY: Oh, by the way, I passed MR. BRINEY\n" .string "in PETALBURG WOODS.\p" .string "I guess he's on his way home to his\n" @@ -126,7 +126,7 @@ RustboroCity_Text_16713C:: @ 816713C .string "might not know this, but MR. BRINEY\l" .string "was once a revered seafarer.$" -RustboroCity_Text_167213:: @ 8167213 +RustboroCity_Text_BrendanHiHowsPokedexComing:: @ 8167213 .string "BRENDAN: {PLAYER}, how's your POKéDEX?\n" .string "Have you filled in any pages yet?\p" .string "Mine rules.\p" @@ -134,7 +134,7 @@ RustboroCity_Text_167213:: @ 8167213 .string "in PETALBURG WOODS until I ran out\l" .string "of POKé BALLS.$" -RustboroCity_Text_1672B8:: @ 81672B8 +RustboroCity_Text_BrendanMrBrineyHint:: @ 81672B8 .string "BRENDAN: By the way, I walked by MR.\n" .string "BRINEY in PETALBURG WOODS.\p" .string "I bet he was on his way home to his\n" @@ -142,37 +142,37 @@ RustboroCity_Text_1672B8:: @ 81672B8 .string "I bet you didn't know this, but he's\n" .string "always got a POKéMON with him.$" -RustboroCity_Text_167374:: @ 8167374 +RustboroCity_Text_TunnelNearingCompletion:: @ 8167374 .string "“Timesaving tunnel nearing\n" .string "completion!”\p" .string "...Is what it says on the sign, but\n" .string "there's also a big “X” splashed\l" .string "across it in red paint...$" -RustboroCity_Text_1673FA:: @ 81673FA +RustboroCity_Text_DevonCorpSign:: @ 81673FA .string "DEVON CORPORATION\p" .string "“For all your living needs, we make\n" .string "it all.”$" -RustboroCity_Text_167439:: @ 8167439 +RustboroCity_Text_GymSign:: @ 8167439 .string "RUSTBORO CITY POKéMON GYM\n" .string "LEADER: ROXANNE\p" .string "“The ROCK-loving honors student!”$" -RustboroCity_Text_167485: @ 8167485 +RustboroCity_Text_DevonCorpBranchOfficeSign: @ 8167485 .string "DEVON CORP. BRANCH OFFICE\p" .string "“Access limited to DEVON employees\n" .string "and authorized personnel.”$" -RustboroCity_Text_1674DD:: @ 81674DD +RustboroCity_Text_CitySign:: @ 81674DD .string "RUSTBORO CITY\p" .string "“The city probing the integration of\n" .string "nature and science.”$" -RustboroCity_Text_167525:: @ 8167525 +RustboroCity_Text_TrainersSchoolSign:: @ 8167525 .string "POKéMON TRAINER'S SCHOOL\p" .string "“We'll teach you anything about\n" .string "POKéMON!”$" -RustboroCity_Text_167568:: @ 8167568 +RustboroCity_Text_CuttersHouse:: @ 8167568 .string "CUTTER'S HOUSE$" diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index d36aa2fff..6c6ddb3da 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_CuttersHouse_EventScript_157D27", + "script": "RustboroCity_CuttersHouse_EventScript_Cutter", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_CuttersHouse_EventScript_157D5D", + "script": "RustboroCity_CuttersHouse_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index 21f797dab..7e8539333 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -1,22 +1,22 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 .byte 0 -RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 +RustboroCity_CuttersHouse_EventScript_Cutter:: @ 8157D27 lock faceplayer - goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53 - msgbox RustboroCity_CuttersHouse_Text_18509C, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_ExplainCut + msgbox RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse, MSGBOX_DEFAULT giveitem ITEM_HM01_CUT setflag FLAG_RECEIVED_HM01 - msgbox RustboroCity_CuttersHouse_Text_1851C9, MSGBOX_DEFAULT + msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT release end -RustboroCity_CuttersHouse_EventScript_157D53:: @ 8157D53 - msgbox RustboroCity_CuttersHouse_Text_1851C9, MSGBOX_DEFAULT +RustboroCity_CuttersHouse_EventScript_ExplainCut:: @ 8157D53 + msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT release end -RustboroCity_CuttersHouse_EventScript_157D5D:: @ 8157D5D - msgbox RustboroCity_CuttersHouse_Text_1852B3, MSGBOX_NPC +RustboroCity_CuttersHouse_EventScript_Lass:: @ 8157D5D + msgbox RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_CuttersHouse/text.inc b/data/maps/RustboroCity_CuttersHouse/text.inc index 83841e60f..ee673aef3 100644 --- a/data/maps/RustboroCity_CuttersHouse/text.inc +++ b/data/maps/RustboroCity_CuttersHouse/text.inc @@ -1,4 +1,4 @@ -RustboroCity_CuttersHouse_Text_18509C:: @ 818509C +RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse:: @ 818509C .string "That determined expression...\n" .string "That limber way you move...\l" .string "And your well-trained POKéMON...\p" @@ -10,7 +10,7 @@ RustboroCity_CuttersHouse_Text_18509C:: @ 818509C .string "No need to be modest or shy.\n" .string "Go on, take it!$" -RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 +RustboroCity_CuttersHouse_Text_ExplainCut:: @ 81851C9 .string "That HM, it's CUT.\p" .string "An HM move is one that can be used\n" .string "by POKéMON out of a battle.\p" @@ -20,7 +20,7 @@ RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 .string "And, unlike a TM, an HM doesn't break\n" .string "after one use.$" -RustboroCity_CuttersHouse_Text_1852B3:: @ 81852B3 +RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees:: @ 81852B3 .string "When they were expanding the city of\n" .string "RUSTBORO, my dad helped out.\p" .string "He made his POKéMON use CUT to clear\n" diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index bd5fa23d1..e98ca0f0f 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_1F_EventScript_157422", + "script": "RustboroCity_DevonCorp_1F_EventScript_Employee", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_1F_EventScript_157454", + "script": "RustboroCity_DevonCorp_1F_EventScript_StairGuard", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_1F_EventScript_15748F", + "script": "RustboroCity_DevonCorp_1F_EventScript_Greeter", "flag": "0" } ], diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 36712d5f7..346bb04d9 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -1,71 +1,71 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_15740C + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_OnTransition .byte 0 -RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C - call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157416 +RustboroCity_DevonCorp_1F_OnTransition:: @ 815740C + call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_BlockStairs end -RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 +RustboroCity_DevonCorp_1F_EventScript_BlockStairs:: @ 8157416 setobjectxyperm 2, 14, 2 setobjectmovementtype 2, 8 return -RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 +RustboroCity_DevonCorp_1F_EventScript_Employee:: @ 8157422 lock faceplayer - goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15744A - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157440 - msgbox RustboroCity_DevonCorp_1F_Text_1829A4, MSGBOX_DEFAULT + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright + msgbox RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_157440:: @ 8157440 - msgbox RustboroCity_DevonCorp_1F_Text_182A19, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright:: @ 8157440 + msgbox RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A - msgbox RustboroCity_DevonCorp_1F_Text_182AB3, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered:: @ 815744A + msgbox RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 +RustboroCity_DevonCorp_1F_EventScript_StairGuard:: @ 8157454 lock faceplayer - goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15747B - goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157485 - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157485 - msgbox RustboroCity_DevonCorp_1F_Text_182AF0, MSGBOX_DEFAULT + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GotRobbed + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_GotRobbed + msgbox RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_15747B:: @ 815747B - msgbox RustboroCity_DevonCorp_1F_Text_182B5A, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome:: @ 815747B + msgbox RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 - msgbox RustboroCity_DevonCorp_1F_Text_182B2D, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_GotRobbed:: @ 8157485 + msgbox RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F +RustboroCity_DevonCorp_1F_EventScript_Greeter:: @ 815748F lock faceplayer - goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574B6 - goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574C0 - goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_1574C0 - msgbox RustboroCity_DevonCorp_1F_Text_1828EE, MSGBOX_DEFAULT + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed + msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_1574B6:: @ 81574B6 - msgbox RustboroCity_DevonCorp_1F_Text_1828EE, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp:: @ 81574B6 + msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_1F_EventScript_1574C0:: @ 81574C0 - msgbox RustboroCity_DevonCorp_1F_Text_18295E, MSGBOX_DEFAULT +RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed:: @ 81574C0 + msgbox RustboroCity_DevonCorp_1F_Text_StaffGotRobbed, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_1F/text.inc b/data/maps/RustboroCity_DevonCorp_1F/text.inc index 006024633..6e175847a 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/text.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/text.inc @@ -1,38 +1,38 @@ -RustboroCity_DevonCorp_1F_Text_1828EE:: @ 81828EE +RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp:: @ 81828EE .string "Hello and welcome to the DEVON\n" .string "CORPORATION.\p" .string "We're proud producers of items and\n" .string "medicine that enhance your life.$" -RustboroCity_DevonCorp_1F_Text_18295E:: @ 818295E +RustboroCity_DevonCorp_1F_Text_StaffGotRobbed:: @ 818295E .string "One of our research staff stupidly\n" .string "got robbed of an important parcel.$" -RustboroCity_DevonCorp_1F_Text_1829A4:: @ 81829A4 +RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct:: @ 81829A4 .string "Hey, those RUNNING SHOES!\n" .string "They're one of our products!\p" .string "It makes me happy when I see someone\n" .string "using something we made.$" -RustboroCity_DevonCorp_1F_Text_182A19:: @ 8182A19 +RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright:: @ 8182A19 .string "That stolen parcel...\p" .string "Well, sure it's important, but it's not\n" .string "anything that anyone can use.\p" .string "In my estimation, that robber must not\n" .string "have been very bright.$" -RustboroCity_DevonCorp_1F_Text_182AB3:: @ 8182AB3 +RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered:: @ 8182AB3 .string "It sounds like they've recovered\n" .string "the ripped-off DEVON GOODS.$" -RustboroCity_DevonCorp_1F_Text_182AF0:: @ 8182AF0 +RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter:: @ 8182AF0 .string "I'm sorry, only authorized people\n" .string "are allowed to enter here.$" -RustboroCity_DevonCorp_1F_Text_182B2D:: @ 8182B2D +RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed:: @ 8182B2D .string "It's beyond stupid.\n" .string "How could we get robbed?$" -RustboroCity_DevonCorp_1F_Text_182B5A:: @ 8182B5A +RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere:: @ 8182B5A .string "Hi, there!\n" .string "You're always welcome here!$" diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index d31a1181c..028db3565 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_1574E2", + "script": "RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_1574F9", + "script": "RustboroCity_DevonCorp_2F_EventScript_BallScientist", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_157523", + "script": "RustboroCity_DevonCorp_2F_EventScript_PokenavScientist", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 10, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_15754D", + "script": "RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_2F_EventScript_157564", + "script": "RustboroCity_DevonCorp_2F_EventScript_FossilScientist", "flag": "0" } ], diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 5974adb69..be2154e04 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -1,175 +1,175 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_1574D0 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_OnTransition .byte 0 -RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 +RustboroCity_DevonCorp_2F_OnTransition:: @ 81574D0 compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady end -RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC +RustboroCity_DevonCorp_2F_EventScript_SetFossilReady:: @ 81574DC setvar VAR_FOSSIL_RESURRECTION_STATE, 2 return -RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 +RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist:: @ 81574E2 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC - msgbox RustboroCity_DevonCorp_2F_Text_182B81, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + msgbox RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 +RustboroCity_DevonCorp_2F_EventScript_BallScientist:: @ 81574F9 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC - goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519 - msgbox RustboroCity_DevonCorp_2F_Text_182BD8, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls + msgbox RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 - msgbox RustboroCity_DevonCorp_2F_Text_182C25, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls:: @ 8157519 + msgbox RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 +RustboroCity_DevonCorp_2F_EventScript_PokenavScientist:: @ 8157523 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC - goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543 - msgbox RustboroCity_DevonCorp_2F_Text_182D2A, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_HasPokenav + msgbox RustboroCity_DevonCorp_2F_Text_IMadePokenav, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 - msgbox RustboroCity_DevonCorp_2F_Text_182D7E, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_HasPokenav:: @ 8157543 + msgbox RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D +RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist:: @ 815754D lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC - msgbox RustboroCity_DevonCorp_2F_Text_182E6B, MSGBOX_DEFAULT + call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady + msgbox RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 +RustboroCity_DevonCorp_2F_EventScript_FossilScientist:: @ 8157564 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 2 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_FossilMonReady compare VAR_FOSSIL_RESURRECTION_STATE, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 - msgbox RustboroCity_DevonCorp_2F_Text_182ED5, MSGBOX_DEFAULT + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_StillRegenerating + msgbox RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil release end -RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 +RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: @ 81575A6 closemessage playse SE_PIN applymovement 5, Common_Movement_ExclamationMark waitmovement 0 applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil bufferitemname 0, ITEM_ROOT_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_183023, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT removeitem ITEM_ROOT_FOSSIL setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 1 release end -RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE +RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil:: @ 81575EE closemessage playse SE_PIN applymovement 5, Common_Movement_ExclamationMark waitmovement 0 applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil bufferitemname 0, ITEM_CLAW_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_183023, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT removeitem ITEM_CLAW_FOSSIL setvar VAR_FOSSIL_RESURRECTION_STATE, 1 setvar VAR_WHICH_FOSSIL_REVIVED, 2 release end -RustboroCity_DevonCorp_2F_EventScript_157636:: @ 8157636 - msgbox RustboroCity_DevonCorp_2F_Text_182FD7, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil:: @ 8157636 + msgbox RustboroCity_DevonCorp_2F_Text_OhIsThatSo, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 - msgbox RustboroCity_DevonCorp_2F_Text_183072, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_StillRegenerating:: @ 8157640 + msgbox RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A +RustboroCity_DevonCorp_2F_EventScript_FossilMonReady:: @ 815764A compare VAR_WHICH_FOSSIL_REVIVED, 1 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_LileepReady compare VAR_WHICH_FOSSIL_REVIVED, 2 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_AnorithReady end -RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 +RustboroCity_DevonCorp_2F_EventScript_LileepReady:: @ 8157661 bufferspeciesname 1, SPECIES_LILEEP - msgbox RustboroCity_DevonCorp_2F_Text_183124, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT getpartysize compare VAR_RESULT, 6 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TooManyPokemon copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare MUS_OBTAIN_ITEM - message RustboroCity_DevonCorp_2F_Text_18319E + message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitfanfare waitmessage givemon SPECIES_LILEEP, 20, ITEM_NONE - msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + msgbox gText_NicknameReceivedPokemon, MSGBOX_YESNO compare VAR_RESULT, YES call_if_eq Common_EventScript_NameReceivedPartyMon release end -RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 +RustboroCity_DevonCorp_2F_EventScript_AnorithReady:: @ 81576B4 bufferspeciesname 1, SPECIES_ANORITH - msgbox RustboroCity_DevonCorp_2F_Text_183124, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT getpartysize compare VAR_RESULT, 6 - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_TooManyPokemon copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare MUS_OBTAIN_ITEM - message RustboroCity_DevonCorp_2F_Text_18319E + message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitfanfare waitmessage givemon SPECIES_ANORITH, 20, ITEM_NONE - msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + msgbox gText_NicknameReceivedPokemon, MSGBOX_YESNO compare VAR_RESULT, YES call_if_eq Common_EventScript_NameReceivedPartyMon release end -RustboroCity_DevonCorp_2F_EventScript_157707:: @ 8157707 - msgbox RustboroCity_DevonCorp_2F_Text_1831C8, MSGBOX_DEFAULT +RustboroCity_DevonCorp_2F_EventScript_TooManyPokemon:: @ 8157707 + msgbox RustboroCity_DevonCorp_2F_Text_TooManyPokemon, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_2F/text.inc b/data/maps/RustboroCity_DevonCorp_2F/text.inc index 9275589ea..ef462eeab 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/text.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/text.inc @@ -1,14 +1,14 @@ -RustboroCity_DevonCorp_2F_Text_182B81:: @ 8182B81 +RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon:: @ 8182B81 .string "We're developing a device for talking\n" .string "with POKéMON.\p" .string "But we haven't had much success...$" -RustboroCity_DevonCorp_2F_Text_182BD8:: @ 8182BD8 +RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls:: @ 8182BD8 .string "I'm developing new kinds of\n" .string "POKé BALLS...\p" .string "But I haven't made much headway...$" -RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 +RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls:: @ 8182C25 .string "We finally made new kinds of POKé BALLS!\p" .string "The REPEAT BALL makes it easier to\n" .string "catch POKéMON you'd caught before.\p" @@ -18,12 +18,12 @@ RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 .string "DEVON CORPORATION.\p" .string "Please give them a try!$" -RustboroCity_DevonCorp_2F_Text_182D2A:: @ 8182D2A +RustboroCity_DevonCorp_2F_Text_IMadePokenav:: @ 8182D2A .string "I made the POKéNAV!\p" .string "As an engineer, I feel blessed to have\n" .string "made something so great!$" -RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E +RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav:: @ 8182D7E .string "Oh, wow!\n" .string "That's a POKéNAV!\p" .string "It came about as a result of our\n" @@ -34,18 +34,18 @@ RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E .string "No, no. I think you'll find out just by\n" .string "trying the POKéNAV out.$" -RustboroCity_DevonCorp_2F_Text_182E6B:: @ 8182E6B +RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams:: @ 8182E6B .string "I'm trying to develop a device that\n" .string "visually reproduces the dreams of\l" .string "POKéMON...\p" .string "But it's not going well.$" -RustboroCity_DevonCorp_2F_Text_182ED5:: @ 8182ED5 +RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils:: @ 8182ED5 .string "I've been trying to develop a device\n" .string "that resurrects POKéMON from fossils...\p" .string "And, it's working!$" -RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 +RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife:: @ 8182F35 .string "Wait! That thing you have there...\n" .string "Is that a POKéMON fossil?\p" .string "Would you like to bring that POKéMON\n" @@ -53,18 +53,18 @@ RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 .string "I can with my newly developed\n" .string "FOSSIL REGENERATOR.$" -RustboroCity_DevonCorp_2F_Text_182FD7:: @ 8182FD7 +RustboroCity_DevonCorp_2F_Text_OhIsThatSo:: @ 8182FD7 .string "Oh, is that so?\p" .string "DEVON's technological expertise\n" .string "is outstanding, I tell you.$" -RustboroCity_DevonCorp_2F_Text_183023:: @ 8183023 +RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher:: @ 8183023 .string "Excellent!\n" .string "Let's do this right away.\p" .string "{PLAYER} handed the {STR_VAR_1} to\n" .string "the DEVON RESEARCHER.$" -RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 +RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime:: @ 8183072 .string "The FOSSIL REGENERATOR, which I made,\n" .string "is incredible.\p" .string "But it has one drawback - it takes\n" @@ -72,17 +72,17 @@ RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 .string "So, uh... How about you go for a stroll\n" .string "and look around for a while?$" -RustboroCity_DevonCorp_2F_Text_183124:: @ 8183124 +RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife:: @ 8183124 .string "Thanks for waiting!\p" .string "Your fossilized POKéMON has been\n" .string "brought back to life!\p" .string "The fossil was an ancient POKéMON.\n" .string "{STR_VAR_2}, it was!$" -RustboroCity_DevonCorp_2F_Text_18319E:: @ 818319E +RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher:: @ 818319E .string "{PLAYER} received {STR_VAR_2} from\n" .string "the DEVON RESEARCHER.$" -RustboroCity_DevonCorp_2F_Text_1831C8:: @ 81831C8 +RustboroCity_DevonCorp_2F_Text_TooManyPokemon:: @ 81831C8 .string "Uh-oh, you've got too many POKéMON.\n" .string "You have no room for this one.$" diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 0c6770b93..aa1d0704a 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_3F_EventScript_15783B", + "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_3F_EventScript_1578B0", + "script": "RustboroCity_DevonCorp_3F_EventScript_Employee", "flag": "FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_DevonCorp_3F_EventScript_15783B", + "script": "RustboroCity_DevonCorp_3F_EventScript_MrStone", "flag": "0" } ], @@ -68,7 +68,7 @@ "y": 5, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_DevonCorp_3F_EventScript_1578CF" + "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay" }, { "type": "sign", @@ -76,7 +76,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_DevonCorp_3F_EventScript_1578CF" + "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay" } ] } diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 5427d753c..81f0f7a87 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,62 +1,62 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_157721 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157739 - map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157748 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_OnFrame .byte 0 -RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 +RustboroCity_DevonCorp_3F_OnTransition:: @ 8157721 compare VAR_DEVON_CORP_3F_STATE, 0 - call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D + call_if_eq RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos end -RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D +RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos:: @ 815772D setobjectxyperm 2, 3, 2 setobjectmovementtype 2, 9 return -RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 - map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743 +RustboroCity_DevonCorp_3F_OnWarp:: @ 8157739 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast .2byte 0 -RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 +RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast:: @ 8157743 turnobject LOCALID_PLAYER, 4 end -RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 - map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752 +RustboroCity_DevonCorp_3F_OnFrame:: @ 8157748 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_MeetPresident .2byte 0 -RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 +RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 8157752 lockall - msgbox RustboroCity_DevonCorp_3F_Text_18374C, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere, MSGBOX_DEFAULT closemessage - applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen waitmovement 0 delay 80 - applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E + applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_183903, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT closemessage playbgm MUS_FOLLOW_ME, FALSE - applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 - applymovement LOCALID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157827 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident + applymovement LOCALID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_18394A, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_PleaseGoAhead, MSGBOX_DEFAULT closemessage fadedefaultbgm - applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812 - applymovement LOCALID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157835 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk + applymovement LOCALID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_18320B, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT giveitem ITEM_LETTER - msgbox RustboroCity_DevonCorp_3F_Text_18337E, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_ITEM - message RustboroCity_DevonCorp_3F_Text_183422 + message RustboroCity_DevonCorp_3F_Text_ReceivedPokenav waitfanfare waitmessage setflag FLAG_SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV - msgbox RustboroCity_DevonCorp_3F_Text_183439, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenav, MSGBOX_DEFAULT setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL @@ -75,7 +75,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 walk_in_place_fastest_left step_end -RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 +RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident:: @ 8157803 walk_right walk_right walk_right @@ -92,12 +92,12 @@ RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 walk_in_place_fastest_left step_end -RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812 +RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk:: @ 8157812 delay_16 walk_in_place_fastest_down step_end -RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 +RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen:: @ 8157815 walk_right walk_right walk_right @@ -108,7 +108,7 @@ RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 walk_right step_end -RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E +RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer:: @ 815781E walk_left walk_left walk_left @@ -119,7 +119,7 @@ RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E walk_left step_end -RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 +RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident:: @ 8157827 walk_right walk_right walk_right @@ -135,7 +135,7 @@ RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 walk_right step_end -RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 +RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk:: @ 8157835 delay_16 delay_16 walk_down @@ -143,52 +143,52 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 walk_in_place_fastest_right step_end -RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B +RustboroCity_DevonCorp_3F_EventScript_MrStone:: @ 815783B lock faceplayer - goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B - goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864 - msgbox RustboroCity_DevonCorp_3F_Text_18351E, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_GiveExpShare + msgbox RustboroCity_DevonCorp_3F_Text_CountingOnYou, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 - msgbox RustboroCity_DevonCorp_3F_Text_18353E, MSGBOX_DEFAULT +RustboroCity_DevonCorp_3F_EventScript_GiveExpShare:: @ 8157864 + msgbox RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter, MSGBOX_DEFAULT giveitem ITEM_EXP_SHARE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE - msgbox RustboroCity_DevonCorp_3F_Text_1835B3, MSGBOX_DEFAULT + msgbox RustboroCity_DevonCorp_3F_Text_ExplainExpShare, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B - msgbox RustboroCity_DevonCorp_3F_Text_18368D, MSGBOX_DEFAULT +RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor:: @ 815789B + msgbox RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 +RustboroCity_DevonCorp_3F_EventScript_Employee:: @ 81578B0 lock faceplayer - goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5 - msgbox RustboroCity_DevonCorp_3F_Text_18395C, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls + msgbox RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5 - msgbox RustboroCity_DevonCorp_3F_Text_1839A3, MSGBOX_DEFAULT +RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls:: @ 81578C5 + msgbox RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular, MSGBOX_DEFAULT release end -RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF - msgbox RustboroCity_DevonCorp_3F_Text_183A04, MSGBOX_SIGN +RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay:: @ 81578CF + msgbox RustboroCity_DevonCorp_3F_Text_RareRocksDisplay, MSGBOX_SIGN end diff --git a/data/maps/RustboroCity_DevonCorp_3F/text.inc b/data/maps/RustboroCity_DevonCorp_3F/text.inc index 62ff47e8f..f10b8bf47 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/text.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B +RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor:: @ 818320B .string "I'm MR. STONE, the PRESIDENT of\n" .string "the DEVON CORPORATION.\p" .string "I'd just got word about you!\p" @@ -13,17 +13,17 @@ RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B .string "I was hoping that you'd deliver a LETTER\n" .string "to STEVEN in DEWFORD.$" -RustboroCity_DevonCorp_3F_Text_18337E:: @ 818337E +RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis:: @ 818337E .string "MR. STONE: Now, you should know that\n" .string "I am a great PRESIDENT.\p" .string "So, I'd never be so cheap as to ask\n" .string "a favor for nothing in return.\p" .string "That's why I want you to have this!$" -RustboroCity_DevonCorp_3F_Text_183422:: @ 8183422 +RustboroCity_DevonCorp_3F_Text_ReceivedPokenav:: @ 8183422 .string "{PLAYER} received a POKéNAV.$" -RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 +RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenav:: @ 8183439 .string "MR. STONE: That device...\p" .string "It's a POKéMON NAVIGATOR, or POKéNAV\n" .string "for short.\p" @@ -33,16 +33,16 @@ RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 .string "You can check the locations of\n" .string "DEWFORD and SLATEPORT easily!$" -RustboroCity_DevonCorp_3F_Text_18351E:: @ 818351E +RustboroCity_DevonCorp_3F_Text_CountingOnYou:: @ 818351E .string "MR. STONE: I'm counting on you!$" -RustboroCity_DevonCorp_3F_Text_18353E:: @ 818353E +RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter:: @ 818353E .string "MR. STONE: You delivered my LETTER?\n" .string "Thank you kindly!\p" .string "This is my way of thanking you.\n" .string "It should help you, a TRAINER.$" -RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 +RustboroCity_DevonCorp_3F_Text_ExplainExpShare:: @ 81835B3 .string "MR. STONE: A POKéMON holding that\n" .string "EXP. SHARE will be given some of the\l" .string "EXP Points from battle.\p" @@ -51,7 +51,7 @@ RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 .string "I would say EXP. SHARE is quite useful\n" .string "for raising weak POKéMON.$" -RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D +RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends:: @ 818368D .string "MR. STONE: Since my youth, I've immersed\n" .string "myself in work.\p" .string "Consequently, I'm not familiar with\n" @@ -59,7 +59,7 @@ RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D .string "But do young people all want to be\n" .string "TRAINERS in the POKéMON LEAGUE?$" -RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C +RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere:: @ 818374C .string "This is the DEVON CORPORATION's\n" .string "third floor.\p" .string "Our PRESIDENT's OFFICE is on this floor.\p" @@ -76,23 +76,23 @@ RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C .string "Oh, that's right.\n" .string "Could you wait here a second?$" -RustboroCity_DevonCorp_3F_Text_183903:: @ 8183903 +RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe:: @ 8183903 .string "Our PRESIDENT would like to have\n" .string "a word with you.\p" .string "Please come with me.$" -RustboroCity_DevonCorp_3F_Text_18394A:: @ 818394A +RustboroCity_DevonCorp_3F_Text_PleaseGoAhead:: @ 818394A .string "Please, go ahead.$" -RustboroCity_DevonCorp_3F_Text_18395C:: @ 818395C +RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard:: @ 818395C .string "If you visit the SHIPYARD in SLATEPORT,\n" .string "you should go see CAPT. STERN.$" -RustboroCity_DevonCorp_3F_Text_1839A3:: @ 81839A3 +RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular:: @ 81839A3 .string "DEVON's new products, the REPEAT BALL\n" .string "and TIMER BALL, have become hugely\l" .string "popular among TRAINERS.$" -RustboroCity_DevonCorp_3F_Text_183A04:: @ 8183A04 +RustboroCity_DevonCorp_3F_Text_RareRocksDisplay:: @ 8183A04 .string "It's a collection of rare rocks and\n" .string "stones assembled by the PRESIDENT.$" diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index d1d353ee6..710a37624 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_1F_EventScript_157C60", + "script": "RustboroCity_Flat1_1F_EventScript_Man", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_1F_EventScript_157C69", + "script": "RustboroCity_Flat1_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc index b8d4118d4..0d342678c 100644 --- a/data/maps/RustboroCity_Flat1_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc @@ -1,10 +1,10 @@ RustboroCity_Flat1_1F_MapScripts:: @ 8157C5F .byte 0 -RustboroCity_Flat1_1F_EventScript_157C60:: @ 8157C60 - msgbox RustboroCity_Flat1_1F_Text_184DB4, MSGBOX_NPC +RustboroCity_Flat1_1F_EventScript_Man:: @ 8157C60 + msgbox RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility, MSGBOX_NPC end -RustboroCity_Flat1_1F_EventScript_157C69:: @ 8157C69 - msgbox RustboroCity_Flat1_1F_Text_184DE9, MSGBOX_NPC +RustboroCity_Flat1_1F_EventScript_Woman:: @ 8157C69 + msgbox RustboroCity_Flat1_1F_Text_PokemonStrange, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_Flat1_1F/text.inc b/data/maps/RustboroCity_Flat1_1F/text.inc index 4721931e4..750e148a0 100644 --- a/data/maps/RustboroCity_Flat1_1F/text.inc +++ b/data/maps/RustboroCity_Flat1_1F/text.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat1_1F_Text_184DB4:: @ 8184DB4 +RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility:: @ 8184DB4 .string "Every POKéMON has a special ability\n" .string "that it can use.$" -RustboroCity_Flat1_1F_Text_184DE9:: @ 8184DE9 +RustboroCity_Flat1_1F_Text_PokemonStrange:: @ 8184DE9 .string "POKéMON are such strange creatures.$" diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 35cf1e601..2e5590474 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat1_2F_EventScript_157C73", + "script": "RustboroCity_Flat1_2F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index ddd48ddf7..5efc1d582 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_2F_MapScripts:: @ 8157C72 .byte 0 -RustboroCity_Flat1_2F_EventScript_157C73:: @ 8157C73 - msgbox RustboroCity_Flat1_2F_Text_184E0D, MSGBOX_NPC +RustboroCity_Flat1_2F_EventScript_Woman:: @ 8157C73 + msgbox RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_Flat1_2F/text.inc b/data/maps/RustboroCity_Flat1_2F/text.inc index c5e25e295..c1874acec 100644 --- a/data/maps/RustboroCity_Flat1_2F/text.inc +++ b/data/maps/RustboroCity_Flat1_2F/text.inc @@ -1,4 +1,4 @@ -RustboroCity_Flat1_2F_Text_184E0D:: @ 8184E0D +RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard:: @ 8184E0D .string "Oh, it's so hard every day...\p" .string "What's hard?\n" .string "You need to ask?\p" diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 629cf109d..315d7c617 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_1F_EventScript_157D83", + "script": "RustboroCity_Flat2_1F_EventScript_Skitty", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_1F_EventScript_157D7A", + "script": "RustboroCity_Flat2_1F_EventScript_OldWoman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc index 521d4d803..f05c4819f 100644 --- a/data/maps/RustboroCity_Flat2_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -1,16 +1,16 @@ RustboroCity_Flat2_1F_MapScripts:: @ 8157D79 .byte 0 -RustboroCity_Flat2_1F_EventScript_157D7A:: @ 8157D7A - msgbox RustboroCity_Flat2_1F_Text_1853DD, MSGBOX_NPC +RustboroCity_Flat2_1F_EventScript_OldWoman:: @ 8157D7A + msgbox RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere, MSGBOX_NPC end -RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 +RustboroCity_Flat2_1F_EventScript_Skitty:: @ 8157D83 lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox RustboroCity_Flat2_1F_Text_185410, MSGBOX_DEFAULT + msgbox RustboroCity_Flat2_1F_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/RustboroCity_Flat2_1F/text.inc b/data/maps/RustboroCity_Flat2_1F/text.inc index 55d550274..6480ae815 100644 --- a/data/maps/RustboroCity_Flat2_1F/text.inc +++ b/data/maps/RustboroCity_Flat2_1F/text.inc @@ -1,6 +1,6 @@ -RustboroCity_Flat2_1F_Text_1853DD:: @ 81853DD +RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere:: @ 81853DD .string "DEVON CORPORATION's workers live in\n" .string "this building.$" -RustboroCity_Flat2_1F_Text_185410:: @ 8185410 +RustboroCity_Flat2_1F_Text_Skitty:: @ 8185410 .string "SKITTY: Gyaaaah!$" diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index e45d94263..5f4a3a751 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_2F_EventScript_157D97", + "script": "RustboroCity_Flat2_2F_EventScript_OldMan", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_2F_EventScript_157DA0", + "script": "RustboroCity_Flat2_2F_EventScript_NinjaBoy", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index 223438560..4c9e3c10e 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -1,15 +1,15 @@ RustboroCity_Flat2_2F_MapScripts:: @ 8157D96 .byte 0 -RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97 - msgbox RustboroCity_Flat2_2F_Text_185421, MSGBOX_NPC +RustboroCity_Flat2_2F_EventScript_OldMan:: @ 8157D97 + msgbox RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays, MSGBOX_NPC end -RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 +RustboroCity_Flat2_2F_EventScript_NinjaBoy:: @ 8157DA0 lock faceplayer - goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF - msgbox RustboroCity_Flat2_2F_Text_185461, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_GavePremierBall + msgbox RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt, MSGBOX_DEFAULT giveitem ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -17,7 +17,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 release end -RustboroCity_Flat2_2F_EventScript_157DCF:: @ 8157DCF - msgbox RustboroCity_Flat2_2F_Text_1854C4, MSGBOX_DEFAULT +RustboroCity_Flat2_2F_EventScript_GavePremierBall:: @ 8157DCF + msgbox RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_Flat2_2F/text.inc b/data/maps/RustboroCity_Flat2_2F/text.inc index 204709e2d..7f3f9004f 100644 --- a/data/maps/RustboroCity_Flat2_2F/text.inc +++ b/data/maps/RustboroCity_Flat2_2F/text.inc @@ -1,13 +1,13 @@ -RustboroCity_Flat2_2F_Text_185421:: @ 8185421 +RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays:: @ 8185421 .string "Way back in the old days, DEVON was just\n" .string "a teeny, tiny company.$" -RustboroCity_Flat2_2F_Text_185461:: @ 8185461 +RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt:: @ 8185461 .string "My daddy's working at the CORPORATION.\p" .string "My daddy made this!\n" .string "But I can't use it, so you can have it.$" -RustboroCity_Flat2_2F_Text_1854C4:: @ 81854C4 +RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo:: @ 81854C4 .string "My daddy's working at the CORPORATION.\p" .string "When I grow up, I'm going to work for\n" .string "DEVON, too.$" diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 11c07f7b0..5686ece38 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_3F_EventScript_157DDA", + "script": "RustboroCity_Flat2_3F_EventScript_DevonEmployee", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Flat2_3F_EventScript_157DE3", + "script": "RustboroCity_Flat2_3F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc index fe3949181..6ebcbcbc4 100644 --- a/data/maps/RustboroCity_Flat2_3F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -1,10 +1,10 @@ RustboroCity_Flat2_3F_MapScripts:: @ 8157DD9 .byte 0 -RustboroCity_Flat2_3F_EventScript_157DDA:: @ 8157DDA - msgbox RustboroCity_Flat2_3F_Text_18551D, MSGBOX_NPC +RustboroCity_Flat2_3F_EventScript_DevonEmployee:: @ 8157DDA + msgbox RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones, MSGBOX_NPC end -RustboroCity_Flat2_3F_EventScript_157DE3:: @ 8157DE3 - msgbox RustboroCity_Flat2_3F_Text_18554D, MSGBOX_NPC +RustboroCity_Flat2_3F_EventScript_Woman:: @ 8157DE3 + msgbox RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_Flat2_3F/text.inc b/data/maps/RustboroCity_Flat2_3F/text.inc index 51af78c77..2e357049d 100644 --- a/data/maps/RustboroCity_Flat2_3F/text.inc +++ b/data/maps/RustboroCity_Flat2_3F/text.inc @@ -1,7 +1,7 @@ -RustboroCity_Flat2_3F_Text_18551D:: @ 818551D +RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones:: @ 818551D .string "DEVON's PRESIDENT likes to collect\n" .string "rare stones.$" -RustboroCity_Flat2_3F_Text_18554D:: @ 818554D +RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones:: @ 818554D .string "I think the PRESIDENT's son also\n" .string "collects rare stones.$" diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 17d8503f4..8bc359ba3 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Gym_EventScript_1578D9", + "script": "RustboroCity_Gym_EventScript_Roxanne", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "RustboroCity_Gym_EventScript_157960", + "script": "RustboroCity_Gym_EventScript_Josh", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "RustboroCity_Gym_EventScript_157977", + "script": "RustboroCity_Gym_EventScript_Tommy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Gym_EventScript_15798E", + "script": "RustboroCity_Gym_EventScript_GymGuide", "flag": "0" } ], @@ -88,7 +88,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_Gym_EventScript_1579AD" + "script": "RustboroCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -96,7 +96,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_Gym_EventScript_1579BD" + "script": "RustboroCity_Gym_EventScript_RightGymStatue" } ] } diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 831613f71..47535e2aa 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -1,18 +1,18 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 .byte 0 -RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 - trainerbattle_single TRAINER_ROXANNE, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE, NO_MUSIC - goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C - msgbox RustboroCity_Gym_Text_184252, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_Roxanne:: @ 81578D9 + trainerbattle_single TRAINER_ROXANNE, RustboroCity_Gym_Text_RoxanneIntro, RustboroCity_Gym_Text_RoxanneDefeat, RustboroCity_Gym_EventScript_RoxanneDefeated, NO_MUSIC + goto_if_unset FLAG_RECEIVED_TM_ROCK_TOMB, RustboroCity_Gym_EventScript_GiveRockTomb + msgbox RustboroCity_Gym_Text_RoxannePostBattle, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_1578FE:: @ 81578FE - message RustboroCity_Gym_Text_1840AB +RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 81578FE + message RustboroCity_Gym_Text_ReceivedStoneBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox RustboroCity_Gym_Text_1840D5, MSGBOX_DEFAULT + msgbox RustboroCity_Gym_Text_StoneBadgeInfoTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET setvar VAR_RUSTBORO_STATE, 1 @@ -21,59 +21,59 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE call Common_EventScript_SetGymTrainers compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq Common_EventScript_ReadyPetalburgGymForBattle - goto RustboroCity_Gym_EventScript_15793C + goto RustboroCity_Gym_EventScript_GiveRockTomb end -RustboroCity_Gym_EventScript_15793C:: @ 815793C +RustboroCity_Gym_EventScript_GiveRockTomb:: @ 815793C giveitem ITEM_TM39_ROCK_TOMB compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - setflag FLAG_RECEIVED_TM39 - msgbox RustboroCity_Gym_Text_184170, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_ROCK_TOMB + msgbox RustboroCity_Gym_Text_ExplainRockTomb, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_157960:: @ 8157960 - trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD - msgbox RustboroCity_Gym_Text_183DF9, MSGBOX_AUTOCLOSE +RustboroCity_Gym_EventScript_Josh:: @ 8157960 + trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_JoshIntro, RustboroCity_Gym_Text_JoshDefeat + msgbox RustboroCity_Gym_Text_JoshPostBattle, MSGBOX_AUTOCLOSE end -RustboroCity_Gym_EventScript_157977:: @ 8157977 - trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 - msgbox RustboroCity_Gym_Text_183E98, MSGBOX_AUTOCLOSE +RustboroCity_Gym_EventScript_Tommy:: @ 8157977 + trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_TommyIntro, RustboroCity_Gym_Text_TommyDefeat + msgbox RustboroCity_Gym_Text_TommyPostBattle, MSGBOX_AUTOCLOSE end -RustboroCity_Gym_EventScript_15798E:: @ 815798E +RustboroCity_Gym_EventScript_GymGuide:: @ 815798E lock faceplayer - goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_1579A3 - msgbox RustboroCity_Gym_Text_183A4B, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_GymGuidePostVictory + msgbox RustboroCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 - msgbox RustboroCity_Gym_Text_183C90, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_GymGuidePostVictory:: @ 81579A3 + msgbox RustboroCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_1579AD:: @ 81579AD +RustboroCity_Gym_EventScript_LeftGymStatue:: @ 81579AD lockall - goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD - goto RustboroCity_Gym_EventScript_1579D7 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified + goto RustboroCity_Gym_EventScript_GymStatue end -RustboroCity_Gym_EventScript_1579BD:: @ 81579BD +RustboroCity_Gym_EventScript_RightGymStatue:: @ 81579BD lockall - goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD - goto RustboroCity_Gym_EventScript_1579D7 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified + goto RustboroCity_Gym_EventScript_GymStatue end -RustboroCity_Gym_EventScript_1579CD:: @ 81579CD - msgbox RustboroCity_Gym_Text_1842E6, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_GymStatueCertified:: @ 81579CD + msgbox RustboroCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -RustboroCity_Gym_EventScript_1579D7:: @ 81579D7 - msgbox RustboroCity_Gym_Text_1842CC, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_GymStatue:: @ 81579D7 + msgbox RustboroCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/RustboroCity_Gym/text.inc b/data/maps/RustboroCity_Gym/text.inc index c52b79e2b..66c6256a5 100644 --- a/data/maps/RustboroCity_Gym/text.inc +++ b/data/maps/RustboroCity_Gym/text.inc @@ -1,4 +1,4 @@ -RustboroCity_Gym_Text_183A4B:: @ 8183A4B +RustboroCity_Gym_Text_GymGuideAdvice:: @ 8183A4B .string "Yo, how's it going?\p" .string "Listen, my friend!\n" .string "Would you like to become the CHAMPION?\p" @@ -20,7 +20,7 @@ RustboroCity_Gym_Text_183A4B:: @ 8183A4B .string "the GYM LEADER.\p" .string "Well, go for it!$" -RustboroCity_Gym_Text_183C90:: @ 8183C90 +RustboroCity_Gym_Text_GymGuidePostVictory:: @ 8183C90 .string "Whoa! What a breathtaking victory!\n" .string "My cheering must've worked!\p" .string "Great!\n" @@ -32,30 +32,30 @@ RustboroCity_Gym_Text_183C90:: @ 8183C90 .string "the stairs to the CHAMPIONSHIP!\p" .string "That's got to feel awesome!$" -RustboroCity_Gym_Text_183D99:: @ 8183D99 +RustboroCity_Gym_Text_JoshIntro:: @ 8183D99 .string "Don't take us GYM TRAINERS lightly!\n" .string "I'll show you why we're better!$" -RustboroCity_Gym_Text_183DDD:: @ 8183DDD +RustboroCity_Gym_Text_JoshDefeat:: @ 8183DDD .string "You were too good for me...$" -RustboroCity_Gym_Text_183DF9:: @ 8183DF9 +RustboroCity_Gym_Text_JoshPostBattle:: @ 8183DF9 .string "You haven't seen anything of the ROCK\n" .string "type's terrifying power!$" -RustboroCity_Gym_Text_183E38:: @ 8183E38 +RustboroCity_Gym_Text_TommyIntro:: @ 8183E38 .string "If you can't beat me, you won't stand\n" .string "a chance against ROXANNE!$" -RustboroCity_Gym_Text_183E78:: @ 8183E78 +RustboroCity_Gym_Text_TommyDefeat:: @ 8183E78 .string "Wow! You've got some potential!$" -RustboroCity_Gym_Text_183E98:: @ 8183E98 +RustboroCity_Gym_Text_TommyPostBattle:: @ 8183E98 .string "ROXANNE is stronger than me by\n" .string "several times.\p" .string "You'd better be on your guard!$" -RustboroCity_Gym_Text_183EE5:: @ 8183EE5 +RustboroCity_Gym_Text_RoxanneIntro:: @ 8183EE5 .string "Hello, I am ROXANNE, the RUSTBORO\n" .string "POKéMON GYM LEADER.\p" .string "I became a GYM LEADER so that I may\n" @@ -64,7 +64,7 @@ RustboroCity_Gym_Text_183EE5:: @ 8183EE5 .string "Would you kindly demonstrate how you\n" .string "battle, and with which POKéMON?$" -RustboroCity_Gym_Text_183FC4:: @ 8183FC4 +RustboroCity_Gym_Text_RoxanneDefeat:: @ 8183FC4 .string "So...\n" .string "I lost...\p" .string "It seems that I still have much more\n" @@ -76,18 +76,18 @@ RustboroCity_Gym_Text_183FC4:: @ 8183FC4 .string "Please accept the official POKéMON\n" .string "LEAGUE STONE BADGE.$" -RustboroCity_Gym_Text_1840AB:: @ 81840AB +RustboroCity_Gym_Text_ReceivedStoneBadge:: @ 81840AB .string "{PLAYER} received the STONE BADGE\n" .string "from ROXANNE.$" -RustboroCity_Gym_Text_1840D5:: @ 81840D5 +RustboroCity_Gym_Text_StoneBadgeInfoTakeThis:: @ 81840D5 .string "The STONE BADGE heightens the ATTACK\n" .string "power of your POKéMON.\p" .string "It also enables them to use the HM move\n" .string "CUT outside of battle.\p" .string "Please take this with you, too.$" -RustboroCity_Gym_Text_184170:: @ 8184170 +RustboroCity_Gym_Text_ExplainRockTomb:: @ 8184170 .string "That TM39 contains ROCK TOMB.\p" .string "It not only inflicts damage by dropping\n" .string "rocks, it also lowers SPEED.\p" @@ -96,16 +96,16 @@ RustboroCity_Gym_Text_184170:: @ 8184170 .string "Remember, a TM can be used only once,\n" .string "so think before you use it.$" -RustboroCity_Gym_Text_184252:: @ 8184252 +RustboroCity_Gym_Text_RoxannePostBattle:: @ 8184252 .string "Since you are so strong, you should\n" .string "challenge other GYM LEADERS.\p" .string "By battling many TRAINERS, you should\n" .string "learn many things.$" -RustboroCity_Gym_Text_1842CC:: @ 81842CC +RustboroCity_Gym_Text_GymStatue:: @ 81842CC .string "RUSTBORO CITY POKéMON GYM$" -RustboroCity_Gym_Text_1842E6:: @ 81842E6 +RustboroCity_Gym_Text_GymStatueCertified:: @ 81842E6 .string "RUSTBORO CITY POKéMON GYM\p" .string "ROXANNE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 842e4d181..7ddf0d934 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House1_EventScript_157C7D", + "script": "RustboroCity_House1_EventScript_Trader", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House1_EventScript_157D1D", + "script": "RustboroCity_House1_EventScript_Hiker", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index ee7399bcb..86724922b 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -1,53 +1,53 @@ RustboroCity_House1_MapScripts:: @ 8157C7C .byte 0 -RustboroCity_House1_EventScript_157C7D:: @ 8157C7D +RustboroCity_House1_EventScript_Trader:: @ 8157C7D lock faceplayer - goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_157D13 + goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_TradeCompleted setvar VAR_0x8008, 0 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox RustboroCity_House1_Text_184EBA, MSGBOX_YESNO + msgbox RustboroCity_House1_Text_IllTradeIfYouWant, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq RustboroCity_House1_EventScript_157CFB + goto_if_eq RustboroCity_House1_EventScript_DeclineTrade special SelectMonForNPCTrade waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq RustboroCity_House1_EventScript_157CFB + goto_if_eq RustboroCity_House1_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne RustboroCity_House1_EventScript_157D05 + goto_if_ne RustboroCity_House1_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate - msgbox RustboroCity_House1_Text_184F6B, MSGBOX_DEFAULT + msgbox RustboroCity_House1_Text_PleaseBeGoodToMyPokemon, MSGBOX_DEFAULT setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED release end -RustboroCity_House1_EventScript_157CFB:: @ 8157CFB - msgbox RustboroCity_House1_Text_184FC1, MSGBOX_DEFAULT +RustboroCity_House1_EventScript_DeclineTrade:: @ 8157CFB + msgbox RustboroCity_House1_Text_AwwItsAGoodMon, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_157D05:: @ 8157D05 +RustboroCity_House1_EventScript_NotRequestedMon:: @ 8157D05 bufferspeciesname 0, VAR_0x8009 - msgbox RustboroCity_House1_Text_184F8F, MSGBOX_DEFAULT + msgbox RustboroCity_House1_Text_ThatIsNoMon, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_157D13:: @ 8157D13 - msgbox RustboroCity_House1_Text_184FDD, MSGBOX_DEFAULT +RustboroCity_House1_EventScript_TradeCompleted:: @ 8157D13 + msgbox RustboroCity_House1_Text_WontYouGetCurious, MSGBOX_DEFAULT release end -RustboroCity_House1_EventScript_157D1D:: @ 8157D1D - msgbox RustboroCity_House1_Text_185020, MSGBOX_NPC +RustboroCity_House1_EventScript_Hiker:: @ 8157D1D + msgbox RustboroCity_House1_Text_AllSortsOfPlaces, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_House1/text.inc b/data/maps/RustboroCity_House1/text.inc index 4af3c1f97..28ba7c825 100644 --- a/data/maps/RustboroCity_House1/text.inc +++ b/data/maps/RustboroCity_House1/text.inc @@ -1,4 +1,4 @@ -RustboroCity_House1_Text_184EBA:: @ 8184EBA +RustboroCity_House1_Text_IllTradeIfYouWant:: @ 8184EBA .string "Do you nickname your POKéMON?\n" .string "I gave a cool name to mine.\p" .string "But when I call my POKéMON by that\n" @@ -6,21 +6,21 @@ RustboroCity_House1_Text_184EBA:: @ 8184EBA .string "If it's okay with you, want to trade\n" .string "your {STR_VAR_1} for my {STR_VAR_2}?$" -RustboroCity_House1_Text_184F6B:: @ 8184F6B +RustboroCity_House1_Text_PleaseBeGoodToMyPokemon:: @ 8184F6B .string "Eheheheh, ooh, this is so exciting!$" -RustboroCity_House1_Text_184F8F:: @ 8184F8F +RustboroCity_House1_Text_ThatIsNoMon:: @ 8184F8F .string "But that's no {STR_VAR_1}.\n" .string "Tch, that's so disappointing...$" -RustboroCity_House1_Text_184FC1:: @ 8184FC1 +RustboroCity_House1_Text_AwwItsAGoodMon:: @ 8184FC1 .string "Aww, it's a good POKéMON...$" -RustboroCity_House1_Text_184FDD:: @ 8184FDD +RustboroCity_House1_Text_WontYouGetCurious:: @ 8184FDD .string "Don't you get curious about what other\n" .string "people named their POKéMON?$" -RustboroCity_House1_Text_185020:: @ 8185020 +RustboroCity_House1_Text_AllSortsOfPlaces:: @ 8185020 .string "In all sorts of places, there are all\n" .string "sorts of POKéMON and people.\p" .string "I find that fascinating, so I go to all\n" diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 68ca73c41..f88846f3a 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House2_EventScript_157D67", + "script": "RustboroCity_House2_EventScript_PokefanF", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House2_EventScript_157D70", + "script": "RustboroCity_House2_EventScript_LittleGirl", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc index 08cb32333..69d35b7d3 100644 --- a/data/maps/RustboroCity_House2/scripts.inc +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -1,10 +1,10 @@ RustboroCity_House2_MapScripts:: @ 8157D66 .byte 0 -RustboroCity_House2_EventScript_157D67:: @ 8157D67 - msgbox RustboroCity_House2_Text_18532D, MSGBOX_NPC +RustboroCity_House2_EventScript_PokefanF:: @ 8157D67 + msgbox RustboroCity_House2_Text_TrainerSchoolExcellent, MSGBOX_NPC end -RustboroCity_House2_EventScript_157D70:: @ 8157D70 - msgbox RustboroCity_House2_Text_185388, MSGBOX_NPC +RustboroCity_House2_EventScript_LittleGirl:: @ 8157D70 + msgbox RustboroCity_House2_Text_RoxanneKnowsALot, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_House2/text.inc b/data/maps/RustboroCity_House2/text.inc index e3438cc57..db5baffcf 100644 --- a/data/maps/RustboroCity_House2/text.inc +++ b/data/maps/RustboroCity_House2/text.inc @@ -1,9 +1,9 @@ -RustboroCity_House2_Text_18532D:: @ 818532D +RustboroCity_House2_Text_TrainerSchoolExcellent:: @ 818532D .string "The TRAINER'S SCHOOL is excellent.\p" .string "If you study there, you could even\n" .string "become a GYM LEADER.$" -RustboroCity_House2_Text_185388:: @ 8185388 +RustboroCity_House2_Text_RoxanneKnowsALot:: @ 8185388 .string "ROXANNE, the GYM LEADER, really knows\n" .string "a lot about POKéMON.\p" .string "She's really strong, too!$" diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 5912ec64b..223ec1f81 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_157DED", + "script": "RustboroCity_House3_EventScript_OldMan", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_157DF6", + "script": "RustboroCity_House3_EventScript_OldWoman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_House3_EventScript_157DFF", + "script": "RustboroCity_House3_EventScript_Pekachu", "flag": "0" } ], diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc index e29414f1d..2801d8788 100644 --- a/data/maps/RustboroCity_House3/scripts.inc +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -1,20 +1,20 @@ RustboroCity_House3_MapScripts:: @ 8157DEC .byte 0 -RustboroCity_House3_EventScript_157DED:: @ 8157DED - msgbox RustboroCity_House3_Text_185584, MSGBOX_NPC +RustboroCity_House3_EventScript_OldMan:: @ 8157DED + msgbox RustboroCity_House3_Text_IGivePerfectlySuitedNicknames, MSGBOX_NPC end -RustboroCity_House3_EventScript_157DF6:: @ 8157DF6 - msgbox RustboroCity_House3_Text_1855FA, MSGBOX_NPC +RustboroCity_House3_EventScript_OldWoman:: @ 8157DF6 + msgbox RustboroCity_House3_Text_NamingPikachuPekachu, MSGBOX_NPC end -RustboroCity_House3_EventScript_157DFF:: @ 8157DFF +RustboroCity_House3_EventScript_Pekachu:: @ 8157DFF lock faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox RustboroCity_House3_Text_18567D, MSGBOX_DEFAULT + msgbox RustboroCity_House3_Text_Pekachu, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/RustboroCity_House3/text.inc b/data/maps/RustboroCity_House3/text.inc index 5fdc12a06..82280e03e 100644 --- a/data/maps/RustboroCity_House3/text.inc +++ b/data/maps/RustboroCity_House3/text.inc @@ -1,14 +1,14 @@ -RustboroCity_House3_Text_185584:: @ 8185584 +RustboroCity_House3_Text_IGivePerfectlySuitedNicknames:: @ 8185584 .string "For my own POKéMON, I give them\n" .string "perfectly suited nicknames!\p" .string "It's my expression of, uh...\n" .string "originality, yes, that's it!$" -RustboroCity_House3_Text_1855FA:: @ 81855FA +RustboroCity_House3_Text_NamingPikachuPekachu:: @ 81855FA .string "But giving the name PEKACHU to a\n" .string "PIKACHU? It seems pointless.\p" .string "I suppose it is good to use a name\n" .string "that's easy to understand, but...$" -RustboroCity_House3_Text_18567D:: @ 818567D +RustboroCity_House3_Text_Pekachu:: @ 818567D .string "PEKACHU: Peka!$" diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 5dda4a123..ed3587e80 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_157BD4", + "script": "RustboroCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_157C4D", + "script": "RustboroCity_Mart_EventScript_Boy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_157C44", + "script": "RustboroCity_Mart_EventScript_PokefanF", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Mart_EventScript_157C56", + "script": "RustboroCity_Mart_EventScript_BugCatcher", "flag": "0" } ], diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index c47b1ee3f..fc640a2ac 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -1,23 +1,23 @@ RustboroCity_Mart_MapScripts:: @ 8157BD3 .byte 0 -RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 +RustboroCity_Mart_EventScript_Clerk:: @ 8157BD4 lock faceplayer message Text_HowMayIServeYou waitmessage - goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157BEF - goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157C18 + goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartBasic + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartExpanded end -RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF - pokemart RustboroCity_Mart_Items1 +RustboroCity_Mart_EventScript_PokemartBasic:: @ 8157BEF + pokemart RustboroCity_Mart_Pokemart_Basic msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -RustboroCity_Mart_Items1:: @ 8157C00 +RustboroCity_Mart_Pokemart_Basic:: @ 8157C00 .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_SUPER_POTION @@ -32,14 +32,14 @@ RustboroCity_Mart_Items1:: @ 8157C00 release end -RustboroCity_Mart_EventScript_157C18:: @ 8157C18 - pokemart RustboroCity_Mart_Items2 +RustboroCity_Mart_EventScript_PokemartExpanded:: @ 8157C18 + pokemart RustboroCity_Mart_Pokemart_Expanded msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -RustboroCity_Mart_Items2:: @ 8157C28 +RustboroCity_Mart_Pokemart_Expanded:: @ 8157C28 .2byte ITEM_POKE_BALL .2byte ITEM_TIMER_BALL .2byte ITEM_REPEAT_BALL @@ -56,14 +56,14 @@ RustboroCity_Mart_Items2:: @ 8157C28 release end -RustboroCity_Mart_EventScript_157C44:: @ 8157C44 - msgbox RustboroCity_Mart_Text_184C76, MSGBOX_NPC +RustboroCity_Mart_EventScript_PokefanF:: @ 8157C44 + msgbox RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish, MSGBOX_NPC end -RustboroCity_Mart_EventScript_157C4D:: @ 8157C4D - msgbox RustboroCity_Mart_Text_184CD8, MSGBOX_NPC +RustboroCity_Mart_EventScript_Boy:: @ 8157C4D + msgbox RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead, MSGBOX_NPC end -RustboroCity_Mart_EventScript_157C56:: @ 8157C56 - msgbox RustboroCity_Mart_Text_184D43, MSGBOX_NPC +RustboroCity_Mart_EventScript_BugCatcher:: @ 8157C56 + msgbox RustboroCity_Mart_Text_GettingEscapeRopeJustInCase, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_Mart/text.inc b/data/maps/RustboroCity_Mart/text.inc index 60b08f34e..75e5ba0f9 100644 --- a/data/maps/RustboroCity_Mart/text.inc +++ b/data/maps/RustboroCity_Mart/text.inc @@ -1,16 +1,16 @@ -RustboroCity_Mart_Text_184C76:: @ 8184C76 +RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish:: @ 8184C76 .string "I'm buying some PARLYZ HEALS and\n" .string "ANTIDOTES.\p" .string "Just in case I run into SHROOMISH\n" .string "in PETALBURG WOODS.$" -RustboroCity_Mart_Text_184CD8:: @ 8184CD8 +RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead:: @ 8184CD8 .string "My POKéMON evolved.\n" .string "It has a lot of HP now.\p" .string "I should buy SUPER POTIONS for it\n" .string "instead of ordinary POTIONS.$" -RustboroCity_Mart_Text_184D43:: @ 8184D43 +RustboroCity_Mart_Text_GettingEscapeRopeJustInCase:: @ 8184D43 .string "I'm getting an ESCAPE ROPE just in\n" .string "case I get lost in a cave.\p" .string "I just need to use it to get back to the\n" diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index 7b83c797a..be2833053 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_157B88", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_157B96", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_157B9F", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_1F_EventScript_157BA8", + "script": "RustboroCity_PokemonCenter_1F_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 83766d86e..75f1e6395 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,13 +1,13 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_157B7F + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition .byte 0 -RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F +RustboroCity_PokemonCenter_1F_OnTransition:: @ 8157B7F setrespawn HEAL_LOCATION_RUSTBORO_CITY call Common_EventScript_UpdateBrineyLocation end -RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 +RustboroCity_PokemonCenter_1F_EventScript_Nurse:: @ 8157B88 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,14 +15,14 @@ RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 release end -RustboroCity_PokemonCenter_1F_EventScript_157B96:: @ 8157B96 - msgbox RustboroCity_PokemonCenter_1F_Text_184B37, MSGBOX_NPC +RustboroCity_PokemonCenter_1F_EventScript_Man:: @ 8157B96 + msgbox RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities, MSGBOX_NPC end -RustboroCity_PokemonCenter_1F_EventScript_157B9F:: @ 8157B9F - msgbox RustboroCity_PokemonCenter_1F_Text_184BAB, MSGBOX_NPC +RustboroCity_PokemonCenter_1F_EventScript_Boy:: @ 8157B9F + msgbox RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon, MSGBOX_NPC end -RustboroCity_PokemonCenter_1F_EventScript_157BA8:: @ 8157BA8 - msgbox RustboroCity_PokemonCenter_1F_Text_184C19, MSGBOX_NPC +RustboroCity_PokemonCenter_1F_EventScript_Girl:: @ 8157BA8 + msgbox RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor, MSGBOX_NPC end diff --git a/data/maps/RustboroCity_PokemonCenter_1F/text.inc b/data/maps/RustboroCity_PokemonCenter_1F/text.inc index 658b4b183..436113508 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/text.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/text.inc @@ -1,16 +1,16 @@ -RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37 +RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities:: @ 8184B37 .string "My POKéMON has a NAIVE nature, and my\n" .string "friend's has a JOLLY nature.\p" .string "It's fascinating how POKéMON have\n" .string "personalities!$" -RustboroCity_PokemonCenter_1F_Text_184BAB:: @ 8184BAB +RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon:: @ 8184BAB .string "Just like people, there are male and\n" .string "female POKéMON.\p" .string "But no one seems to have any idea how\n" .string "they're different.$" -RustboroCity_PokemonCenter_1F_Text_184C19:: @ 8184C19 +RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor:: @ 8184C19 .string "The man next door gave me an HM!\p" .string "I used it to teach my POKéMON how to\n" .string "CUT down skinny trees.$" diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index bbc72beb1..3e7491ad6 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157A98", + "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid1", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157AA1", + "script": "RustboroCity_PokemonSchool_EventScript_GameboyKid2", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157AAA", + "script": "RustboroCity_PokemonSchool_EventScript_RichBoy", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157AB3", + "script": "RustboroCity_PokemonSchool_EventScript_Lass", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157ABC", + "script": "RustboroCity_PokemonSchool_EventScript_SchoolKidM", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonSchool_EventScript_157ACE", + "script": "RustboroCity_PokemonSchool_EventScript_Teacher", "flag": "0" } ], @@ -114,7 +114,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_1579E2" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -122,7 +122,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_1579E2" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -130,7 +130,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_1579E2" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -138,7 +138,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_1579E2" + "script": "RustboroCity_PokemonSchool_EventScript_Blackboard" }, { "type": "sign", @@ -146,7 +146,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "RustboroCity_PokemonSchool_EventScript_157AC5" + "script": "RustboroCity_PokemonSchool_EventScript_StudentNotebook" } ] } diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index dd266e21f..45757af1a 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -1,88 +1,88 @@ RustboroCity_PokemonSchool_MapScripts:: @ 81579E1 .byte 0 -RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2 +RustboroCity_PokemonSchool_EventScript_Blackboard:: @ 81579E2 lockall - msgbox RustboroCity_PokemonSchool_Text_184321, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 + msgbox RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 - message RustboroCity_PokemonSchool_Text_184368 +RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic:: @ 81579F1 + message RustboroCity_PokemonSchool_Text_ReadWhichTopic waitmessage multichoicegrid 8, 1, 13, 3, 0 switch VAR_RESULT - case 0, RustboroCity_PokemonSchool_EventScript_157A50 - case 1, RustboroCity_PokemonSchool_EventScript_157A5E - case 2, RustboroCity_PokemonSchool_EventScript_157A6C - case 3, RustboroCity_PokemonSchool_EventScript_157A7A - case 4, RustboroCity_PokemonSchool_EventScript_157A88 - case 5, RustboroCity_PokemonSchool_EventScript_157A96 - case 127, RustboroCity_PokemonSchool_EventScript_157A96 + case 0, RustboroCity_PokemonSchool_EventScript_Poison + case 1, RustboroCity_PokemonSchool_EventScript_Paralysis + case 2, RustboroCity_PokemonSchool_EventScript_Sleep + case 3, RustboroCity_PokemonSchool_EventScript_Burn + case 4, RustboroCity_PokemonSchool_EventScript_Freeze + case 5, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect + case 127, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect end -RustboroCity_PokemonSchool_EventScript_157A50:: @ 8157A50 - msgbox RustboroCity_PokemonSchool_Text_184389, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Poison:: @ 8157A50 + msgbox RustboroCity_PokemonSchool_Text_ExplainPoison, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A5E:: @ 8157A5E - msgbox RustboroCity_PokemonSchool_Text_184447, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Paralysis:: @ 8157A5E + msgbox RustboroCity_PokemonSchool_Text_ExplainParalysis, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A6C:: @ 8157A6C - msgbox RustboroCity_PokemonSchool_Text_1844EC, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Sleep:: @ 8157A6C + msgbox RustboroCity_PokemonSchool_Text_ExplainSleep, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A7A:: @ 8157A7A - msgbox RustboroCity_PokemonSchool_Text_1845A5, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Burn:: @ 8157A7A + msgbox RustboroCity_PokemonSchool_Text_ExplainBurn, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A88:: @ 8157A88 - msgbox RustboroCity_PokemonSchool_Text_184627, MSGBOX_DEFAULT - goto RustboroCity_PokemonSchool_EventScript_1579F1 +RustboroCity_PokemonSchool_EventScript_Freeze:: @ 8157A88 + msgbox RustboroCity_PokemonSchool_Text_ExplainFreeze, MSGBOX_DEFAULT + goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic end -RustboroCity_PokemonSchool_EventScript_157A96:: @ 8157A96 +RustboroCity_PokemonSchool_EventScript_ExitTopicSelect:: @ 8157A96 releaseall end -RustboroCity_PokemonSchool_EventScript_157A98:: @ 8157A98 - msgbox RustboroCity_PokemonSchool_Text_18480E, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_GameboyKid1:: @ 8157A98 + msgbox RustboroCity_PokemonSchool_Text_TradingRightNow, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157AA1:: @ 8157AA1 - msgbox RustboroCity_PokemonSchool_Text_18483C, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_GameboyKid2:: @ 8157AA1 + msgbox RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157AAA:: @ 8157AAA - msgbox RustboroCity_PokemonSchool_Text_184873, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_RichBoy:: @ 8157AAA + msgbox RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157AB3:: @ 8157AB3 - msgbox RustboroCity_PokemonSchool_Text_1848D8, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_Lass:: @ 8157AB3 + msgbox RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157ABC:: @ 8157ABC - msgbox RustboroCity_PokemonSchool_Text_184988, MSGBOX_NPC +RustboroCity_PokemonSchool_EventScript_SchoolKidM:: @ 8157ABC + msgbox RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry, MSGBOX_NPC end -RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 - msgbox RustboroCity_PokemonSchool_Text_184A17, MSGBOX_SIGN +RustboroCity_PokemonSchool_EventScript_StudentNotebook:: @ 8157AC5 + msgbox RustboroCity_PokemonSchool_Text_StudentsNotes, MSGBOX_SIGN end -RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE +RustboroCity_PokemonSchool_EventScript_Teacher:: @ 8157ACE lock faceplayer - goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34 + goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_GaveQuickClaw compare VAR_FACING, 4 - call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E + call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast compare VAR_FACING, 3 - call_if_eq RustboroCity_PokemonSchool_EventScript_157B29 - msgbox RustboroCity_PokemonSchool_Text_1846A2, MSGBOX_DEFAULT + call_if_eq RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest + msgbox RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw, MSGBOX_DEFAULT giveitem ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -93,25 +93,25 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE release end -RustboroCity_PokemonSchool_EventScript_157B1E:: @ 8157B1E - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60 +RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast:: @ 8157B1E + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast waitmovement 0 return -RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49 +RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest:: @ 8157B29 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest waitmovement 0 return -RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 - msgbox RustboroCity_PokemonSchool_Text_184737, MSGBOX_DEFAULT +RustboroCity_PokemonSchool_EventScript_GaveQuickClaw:: @ 8157B34 + msgbox RustboroCity_PokemonSchool_Text_ExplainQuickClaw, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 release end -RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49 +RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest:: @ 8157B49 walk_left walk_down walk_down @@ -136,7 +136,7 @@ RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49 walk_right step_end -RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 +RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast:: @ 8157B60 walk_right walk_right walk_down diff --git a/data/maps/RustboroCity_PokemonSchool/text.inc b/data/maps/RustboroCity_PokemonSchool/text.inc index 28620fae2..d804a1bd9 100644 --- a/data/maps/RustboroCity_PokemonSchool/text.inc +++ b/data/maps/RustboroCity_PokemonSchool/text.inc @@ -1,11 +1,11 @@ -RustboroCity_PokemonSchool_Text_184321:: @ 8184321 +RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges:: @ 8184321 .string "The blackboard lists status changes\n" .string "that may affect POKéMON in battle.$" -RustboroCity_PokemonSchool_Text_184368:: @ 8184368 +RustboroCity_PokemonSchool_Text_ReadWhichTopic:: @ 8184368 .string "Which topic do you want to read?$" -RustboroCity_PokemonSchool_Text_184389:: @ 8184389 +RustboroCity_PokemonSchool_Text_ExplainPoison:: @ 8184389 .string "If a POKéMON is poisoned, it will\n" .string "steadily lose HP.\p" .string "The effects of poison remain after\n" @@ -14,7 +14,7 @@ RustboroCity_PokemonSchool_Text_184389:: @ 8184389 .string "while it is traveling.\p" .string "Heal a poisoning using an ANTIDOTE.$" -RustboroCity_PokemonSchool_Text_184447:: @ 8184447 +RustboroCity_PokemonSchool_Text_ExplainParalysis:: @ 8184447 .string "If a POKéMON becomes paralyzed,\n" .string "its SPEED drops.\p" .string "It may also not be able to move while\n" @@ -22,7 +22,7 @@ RustboroCity_PokemonSchool_Text_184447:: @ 8184447 .string "Paralysis remains after battle.\n" .string "Cure it using a PARLYZ HEAL.$" -RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC +RustboroCity_PokemonSchool_Text_ExplainSleep:: @ 81844EC .string "If a POKéMON falls asleep, it will be\n" .string "unable to attack.\p" .string "A POKéMON may wake up on its own,\n" @@ -30,26 +30,26 @@ RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC .string "it will stay asleep.\p" .string "Wake it up using an AWAKENING.$" -RustboroCity_PokemonSchool_Text_1845A5:: @ 81845A5 +RustboroCity_PokemonSchool_Text_ExplainBurn:: @ 81845A5 .string "A burn reduces ATTACK power, and it\n" .string "steadily reduces the victim's HP.\p" .string "A burn lingers after battle.\n" .string "Cure a burn using a BURN HEAL.$" -RustboroCity_PokemonSchool_Text_184627:: @ 8184627 +RustboroCity_PokemonSchool_Text_ExplainFreeze:: @ 8184627 .string "If a POKéMON is frozen, it becomes\n" .string "completely helpless.\p" .string "It will remain frozen after battle.\n" .string "Thaw it out using an ICE HEAL.$" -RustboroCity_PokemonSchool_Text_1846A2:: @ 81846A2 +RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw:: @ 81846A2 .string "Students who don't study get a little\n" .string "taste of my QUICK CLAW.\p" .string "Whether or not you are a good student \n" .string "will be evident from the way you use\l" .string "this item.$" -RustboroCity_PokemonSchool_Text_184737:: @ 8184737 +RustboroCity_PokemonSchool_Text_ExplainQuickClaw:: @ 8184737 .string "A POKéMON holding the QUICK CLAW will\n" .string "occasionally speed up and get to move\l" .string "before its opponent.\p" @@ -58,20 +58,20 @@ RustboroCity_PokemonSchool_Text_184737:: @ 8184737 .string "Just those alone will give you many\n" .string "topics to study!$" -RustboroCity_PokemonSchool_Text_18480E:: @ 818480E +RustboroCity_PokemonSchool_Text_TradingRightNow:: @ 818480E .string "I'm trading POKéMON with my friend\n" .string "right now.$" -RustboroCity_PokemonSchool_Text_18483C:: @ 818483C +RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot:: @ 818483C .string "I always wanted a SEEDOT, and\n" .string "I'm finally getting one!$" -RustboroCity_PokemonSchool_Text_184873:: @ 8184873 +RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems:: @ 8184873 .string "POKéMON can hold items, but they\n" .string "don't know what to do with man-made\l" .string "items like POTION and ANTIDOTE.$" -RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 +RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself:: @ 81848D8 .string "You know how some POKéMON moves can\n" .string "confuse a POKéMON?\p" .string "A confused POKéMON will sometimes\n" @@ -79,7 +79,7 @@ RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 .string "But once it leaves battle, it will\n" .string "return to normal.$" -RustboroCity_PokemonSchool_Text_184988:: @ 8184988 +RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry:: @ 8184988 .string "A POKéMON holding a BERRY will heal\n" .string "itself...\p" .string "There are many kinds of items that\n" @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_Text_184988:: @ 8184988 .string "Boy, it sure is hard taking notes\n" .string "down...$" -RustboroCity_PokemonSchool_Text_184A17:: @ 8184A17 +RustboroCity_PokemonSchool_Text_StudentsNotes:: @ 8184A17 .string "It's this student's notebook...\p" .string "POKéMON are to be caught using\n" .string "POKé BALLS.\p" diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index d50e0f89e..17b4a254d 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BBD6", + "script": "SlateportCity_EventScript_FatMan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BBF3", + "script": "SlateportCity_EventScript_Man1", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BBB5", + "script": "SlateportCity_EventScript_RichBoy", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BC14", + "script": "SlateportCity_EventScript_Woman1", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BD3A", + "script": "SlateportCity_EventScript_EvilTeamGrunt1", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BB3F", + "script": "SlateportCity_EventScript_Cook", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BB60", + "script": "SlateportCity_EventScript_OldWoman", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BB81", + "script": "SlateportCity_EventScript_Girl", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14C017", + "script": "SlateportCity_EventScript_Ty", "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" }, { @@ -154,7 +154,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14C020", + "script": "SlateportCity_EventScript_Gabby", "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" }, { @@ -167,7 +167,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BEBC", + "script": "SlateportCity_EventScript_CaptStern", "flag": "FLAG_HIDE_STERN_SLATEPORT" }, { @@ -180,7 +180,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BCE2", + "script": "SlateportCity_EventScript_Sailor1", "flag": "0" }, { @@ -193,7 +193,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BCEB", + "script": "SlateportCity_EventScript_Sailor2", "flag": "0" }, { @@ -206,7 +206,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BCF4", + "script": "SlateportCity_EventScript_PokefanF", "flag": "0" }, { @@ -219,7 +219,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BCFD", + "script": "SlateportCity_EventScript_Man2", "flag": "0" }, { @@ -232,7 +232,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BD06", + "script": "SlateportCity_EventScript_SchoolKid", "flag": "0" }, { @@ -245,7 +245,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BCB8", + "script": "SlateportCity_EventScript_Maniac", "flag": "0" }, { @@ -258,7 +258,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BCD9", + "script": "SlateportCity_EventScript_Woman2", "flag": "0" }, { @@ -271,7 +271,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BD51", + "script": "SlateportCity_EventScript_EvilTeamGrunt2", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { @@ -284,7 +284,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BD68", + "script": "SlateportCity_EventScript_EvilTeamGrunt3", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { @@ -297,7 +297,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BE20", + "script": "SlateportCity_EventScript_DecorClerk", "flag": "0" }, { @@ -310,7 +310,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BDF2", + "script": "SlateportCity_EventScript_DollClerk", "flag": "0" }, { @@ -323,7 +323,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14C029", + "script": "SlateportCity_EventScript_Man3", "flag": "0" }, { @@ -336,7 +336,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BAE0", + "script": "SlateportCity_EventScript_EffortRibbonWoman", "flag": "0" }, { @@ -349,7 +349,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BE9A", + "script": "SlateportCity_EventScript_PowerTMClerk", "flag": "FLAG_HIDE_TM_SALESMAN_SLATEPORT" }, { @@ -362,7 +362,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BAB6", + "script": "SlateportCity_EventScript_EnergyGuru", "flag": "0" }, { @@ -375,7 +375,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BD7F", + "script": "SlateportCity_EventScript_EvilTeamGrunt4", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { @@ -388,7 +388,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BD96", + "script": "SlateportCity_EventScript_EvilTeamGrunt5", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { @@ -401,7 +401,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BDAD", + "script": "SlateportCity_EventScript_EvilTeamGrunt6", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { @@ -414,7 +414,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BDC4", + "script": "SlateportCity_EventScript_EvilTeamGrunt7", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { @@ -427,7 +427,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_EventScript_14BDDB", + "script": "SlateportCity_EventScript_EvilTeamGrunt8", "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" } ], @@ -518,7 +518,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_14BCAF" + "script": "SlateportCity_EventScript_NameRatersHouseSign" }, { "type": "sign", @@ -550,7 +550,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_14BC91" + "script": "SlateportCity_EventScript_HarborSign" }, { "type": "sign", @@ -566,7 +566,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_14BC88" + "script": "SlateportCity_EventScript_MarketSign" }, { "type": "sign", @@ -574,7 +574,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_14BC76" + "script": "SlateportCity_EventScript_OceanicMuseumSign" }, { "type": "sign", @@ -582,7 +582,7 @@ "y": 22, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_14BC7F" + "script": "SlateportCity_EventScript_CitySign" }, { "type": "sign", @@ -590,7 +590,7 @@ "y": 26, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_14BC6D" + "script": "SlateportCity_EventScript_PokemonFanClubSign" }, { "type": "sign", @@ -598,7 +598,7 @@ "y": 13, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_14BC33" + "script": "SlateportCity_EventScript_ContestHallSign" }, { "type": "sign", @@ -606,7 +606,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_EventScript_14BC3C" + "script": "SlateportCity_EventScript_SternsShipyardSign" } ] } diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 9a5cb47cb..8cd8abaf7 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,8 +1,8 @@ SlateportCity_MapScripts:: @ 814BA36 - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_14BA3C + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition .byte 0 -SlateportCity_MapScript1_14BA3C:: @ 814BA3C +SlateportCity_OnTransition:: @ 814BA3C .ifdef SAPPHIRE setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_AQUA_MEMBER_F setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M @@ -11,18 +11,18 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M .endif setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 - call SlateportCity_EventScript_14BA5C + call SlateportCity_EventScript_EnterSlateport compare VAR_SLATEPORT_STATE, 1 - call_if_eq SlateportCity_EventScript_14BA68 + call_if_eq SlateportCity_EventScript_MovePeopleForSternInterview end -SlateportCity_EventScript_14BA5C:: @ 814BA5C +SlateportCity_EventScript_EnterSlateport:: @ 814BA5C setflag FLAG_VISITED_SLATEPORT_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return -SlateportCity_EventScript_14BA68:: @ 814BA68 +SlateportCity_EventScript_MovePeopleForSternInterview:: @ 814BA68 setobjectxyperm 11, 28, 13 setobjectxyperm 7, 25, 13 setobjectxyperm 3, 25, 14 @@ -39,18 +39,18 @@ SlateportCity_EventScript_14BA68:: @ 814BA68 setobjectmovementtype 2, 9 return -SlateportCity_EventScript_14BAB6:: @ 814BAB6 +SlateportCity_EventScript_EnergyGuru:: @ 814BAB6 lock faceplayer - message SlateportCity_Text_164642 + message SlateportCity_Text_EnergyGuruSellWhatYouNeed waitmessage - pokemart SlateportCity_Items1 + pokemart SlateportCity_Pokemart_EnergyGuru msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -SlateportCity_Items1:: @ 814BAD0 +SlateportCity_Pokemart_EnergyGuru:: @ 814BAD0 .2byte ITEM_PROTEIN .2byte ITEM_IRON .2byte ITEM_CARBOS @@ -61,335 +61,335 @@ SlateportCity_Items1:: @ 814BAD0 release end -SlateportCity_EventScript_14BAE0:: @ 814BAE0 +SlateportCity_EventScript_EffortRibbonWoman:: @ 814BAE0 lock faceplayer bufferleadmonspeciesname 0 - msgbox SlateportCity_Text_164682, MSGBOX_DEFAULT + msgbox SlateportCity_Text_OhYourPokemon, MSGBOX_DEFAULT specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 - call_if_eq SlateportCity_EventScript_14BB35 + call_if_eq SlateportCity_EventScript_MonHasEffortRibbon specialvar VAR_RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 - call_if_eq SlateportCity_EventScript_14BB2B - msgbox SlateportCity_Text_164691, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_MonEVsNotMaxed + msgbox SlateportCity_Text_PleaseGiveItThisEffortRibbon, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_ITEM - message SlateportCity_Text_1646DD + message SlateportCity_Text_ReceivedEffortRibbon waitfanfare waitmessage - msgbox SlateportCity_Text_1646FC, MSGBOX_DEFAULT + msgbox SlateportCity_Text_PutEffortRibbonOnMon, MSGBOX_DEFAULT special GivLeadMonEffortRibbon release end -SlateportCity_EventScript_14BB2B:: @ 814BB2B - msgbox SlateportCity_Text_16471C, MSGBOX_DEFAULT +SlateportCity_EventScript_MonEVsNotMaxed:: @ 814BB2B + msgbox SlateportCity_Text_GoForItLittleHarder, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BB35:: @ 814BB35 - msgbox SlateportCity_Text_164775, MSGBOX_DEFAULT +SlateportCity_EventScript_MonHasEffortRibbon:: @ 814BB35 + msgbox SlateportCity_Text_EffortRibbonLooksGoodOnIt, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BB3F:: @ 814BB3F +SlateportCity_EventScript_Cook:: @ 814BB3F lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if_eq SlateportCity_EventScript_14BB56 - msgbox SlateportCity_Text_164814, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_CookSternInterview + msgbox SlateportCity_Text_SeaweedFullOfLife, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BB56:: @ 814BB56 - msgbox SlateportCity_Text_165376, MSGBOX_DEFAULT +SlateportCity_EventScript_CookSternInterview:: @ 814BB56 + msgbox SlateportCity_Text_CaptainComeBackWithBigFish, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BB60:: @ 814BB60 +SlateportCity_EventScript_OldWoman:: @ 814BB60 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if_eq SlateportCity_EventScript_14BB77 - msgbox SlateportCity_Text_1648A0, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_OldWomanSternInterview + msgbox SlateportCity_Text_HowTownIsBornAndGrows, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BB77:: @ 814BB77 - msgbox SlateportCity_Text_165222, MSGBOX_DEFAULT +SlateportCity_EventScript_OldWomanSternInterview:: @ 814BB77 + msgbox SlateportCity_Text_CaptSternBeingInterviewed, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BB81:: @ 814BB81 +SlateportCity_EventScript_Girl:: @ 814BB81 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if_eq SlateportCity_EventScript_14BBA1 - goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB - msgbox SlateportCity_Text_164937, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_GirlSternInterview + goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_GirlSecretBase + msgbox SlateportCity_Text_SlateportWonderfulPlace, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BBA1:: @ 814BBA1 - msgbox SlateportCity_Text_1652A0, MSGBOX_DEFAULT +SlateportCity_EventScript_GirlSternInterview:: @ 814BBA1 + msgbox SlateportCity_Text_InterviewerSoCool, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BBAB:: @ 814BBAB - msgbox SlateportCity_Text_164995, MSGBOX_DEFAULT +SlateportCity_EventScript_GirlSecretBase:: @ 814BBAB + msgbox SlateportCity_Text_BuyBricksSoDecorWontGetDirty, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BBB5:: @ 814BBB5 +SlateportCity_EventScript_RichBoy:: @ 814BBB5 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if_eq SlateportCity_EventScript_14BBCC - msgbox SlateportCity_Text_164A30, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_RichBoySternInterview + msgbox SlateportCity_Text_GoingToCompeteInPokemonContest, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BBCC:: @ 814BBCC - msgbox SlateportCity_Text_16530A, MSGBOX_DEFAULT +SlateportCity_EventScript_RichBoySternInterview:: @ 814BBCC + msgbox SlateportCity_Text_SternSaysDiscoveredSomething, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BBD6:: @ 814BBD6 +SlateportCity_EventScript_FatMan:: @ 814BBD6 compare VAR_SLATEPORT_STATE, 1 - goto_if_eq SlateportCity_EventScript_14BBEA - msgbox SlateportCity_Text_164AA9, MSGBOX_NPC + goto_if_eq SlateportCity_EventScript_FatManSternInterview + msgbox SlateportCity_Text_BushedHikingFromMauville, MSGBOX_NPC end -SlateportCity_EventScript_14BBEA:: @ 814BBEA - msgbox SlateportCity_Text_1653D1, MSGBOX_SIGN +SlateportCity_EventScript_FatManSternInterview:: @ 814BBEA + msgbox SlateportCity_Text_AmIOnTV, MSGBOX_SIGN end -SlateportCity_EventScript_14BBF3:: @ 814BBF3 +SlateportCity_EventScript_Man1:: @ 814BBF3 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if_eq SlateportCity_EventScript_14BC0A - msgbox SlateportCity_Text_164B34, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_Man1SternInterview + msgbox SlateportCity_Text_EveryoneCallsHimCaptStern, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BC0A:: @ 814BC0A - msgbox SlateportCity_Text_1653F4, MSGBOX_DEFAULT +SlateportCity_EventScript_Man1SternInterview:: @ 814BC0A + msgbox SlateportCity_Text_CaptainsACelebrity, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BC14:: @ 814BC14 +SlateportCity_EventScript_Woman1:: @ 814BC14 lock faceplayer - goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29 - msgbox SlateportCity_Text_164BBF, MSGBOX_DEFAULT + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_Woman1EvilTeamGone + msgbox SlateportCity_Text_WhatsLongLineOverThere, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BC29:: @ 814BC29 - msgbox SlateportCity_Text_164BEA, MSGBOX_DEFAULT +SlateportCity_EventScript_Woman1EvilTeamGone:: @ 814BC29 + msgbox SlateportCity_Text_VisitedMuseumOften, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BC33:: @ 814BC33 - msgbox SlateportCity_Text_165856, MSGBOX_SIGN +SlateportCity_EventScript_ContestHallSign:: @ 814BC33 + msgbox SlateportCity_Text_ContestHallSign, MSGBOX_SIGN end -SlateportCity_EventScript_14BC3C:: @ 814BC3C +SlateportCity_EventScript_SternsShipyardSign:: @ 814BC3C lockall - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63 - goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59 - msgbox SlateportCity_Text_1658A0, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_SternsShipyardFerryComplete + goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_SternsShipyardNearsCompletion + msgbox SlateportCity_Text_SternsShipyardWantedSign, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_14BC59:: @ 814BC59 - msgbox SlateportCity_Text_1658E8, MSGBOX_DEFAULT +SlateportCity_EventScript_SternsShipyardNearsCompletion:: @ 814BC59 + msgbox SlateportCity_Text_SternsShipyardNearsCompletion, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_14BC63:: @ 814BC63 - msgbox SlateportCity_Text_165952, MSGBOX_DEFAULT +SlateportCity_EventScript_SternsShipyardFerryComplete:: @ 814BC63 + msgbox SlateportCity_Text_SternsShipyardFerryComplete, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_14BC6D:: @ 814BC6D - msgbox SlateportCity_Text_1659B3, MSGBOX_SIGN +SlateportCity_EventScript_PokemonFanClubSign:: @ 814BC6D + msgbox SlateportCity_Text_PokemonFanClubSign, MSGBOX_SIGN end -SlateportCity_EventScript_14BC76:: @ 814BC76 - msgbox SlateportCity_Text_1659E3, MSGBOX_SIGN +SlateportCity_EventScript_OceanicMuseumSign:: @ 814BC76 + msgbox SlateportCity_Text_OceanicMuseumSign, MSGBOX_SIGN end -SlateportCity_EventScript_14BC7F:: @ 814BC7F - msgbox SlateportCity_Text_165A17, MSGBOX_SIGN +SlateportCity_EventScript_CitySign:: @ 814BC7F + msgbox SlateportCity_Text_CitySign, MSGBOX_SIGN end -SlateportCity_EventScript_14BC88:: @ 814BC88 - msgbox SlateportCity_Text_165A57, MSGBOX_SIGN +SlateportCity_EventScript_MarketSign:: @ 814BC88 + msgbox SlateportCity_Text_MarketSign, MSGBOX_SIGN end -SlateportCity_EventScript_14BC91:: @ 814BC91 +SlateportCity_EventScript_HarborSign:: @ 814BC91 lockall - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5 - msgbox SlateportCity_Text_165A8B, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_HarborSignFerryComplete + msgbox SlateportCity_Text_HarborFerryUnderConstruction, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_14BCA5:: @ 814BCA5 - msgbox SlateportCity_Text_165B02, MSGBOX_DEFAULT +SlateportCity_EventScript_HarborSignFerryComplete:: @ 814BCA5 + msgbox SlateportCity_Text_HarborSign, MSGBOX_DEFAULT releaseall end -SlateportCity_EventScript_14BCAF:: @ 814BCAF - msgbox SlateportCity_Text_165B48, MSGBOX_SIGN +SlateportCity_EventScript_NameRatersHouseSign:: @ 814BCAF + msgbox SlateportCity_Text_NameRatersHouseSign, MSGBOX_SIGN end -SlateportCity_EventScript_14BCB8:: @ 814BCB8 +SlateportCity_EventScript_Maniac:: @ 814BCB8 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if_eq SlateportCity_EventScript_14BCCF - msgbox SlateportCity_Text_164F9E, MSGBOX_DEFAULT + call_if_eq SlateportCity_EventScript_ManiacSternInterview + msgbox SlateportCity_Text_GetNameRaterToHelpYou, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BCCF:: @ 814BCCF - msgbox SlateportCity_Text_164F9E, MSGBOX_DEFAULT +SlateportCity_EventScript_ManiacSternInterview:: @ 814BCCF + msgbox SlateportCity_Text_GetNameRaterToHelpYou, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BCD9:: @ 814BCD9 - msgbox SlateportCity_Text_164FFC, MSGBOX_NPC +SlateportCity_EventScript_Woman2:: @ 814BCD9 + msgbox SlateportCity_Text_CantChangeTradeMonName, MSGBOX_NPC end -SlateportCity_EventScript_14BCE2:: @ 814BCE2 - msgbox SlateportCity_Text_164E85, MSGBOX_NPC +SlateportCity_EventScript_Sailor1:: @ 814BCE2 + msgbox SlateportCity_Text_SeaIsSoWet, MSGBOX_NPC end -SlateportCity_EventScript_14BCEB:: @ 814BCEB - msgbox SlateportCity_Text_164EDB, MSGBOX_NPC +SlateportCity_EventScript_Sailor2:: @ 814BCEB + msgbox SlateportCity_Text_SinkOldBoats, MSGBOX_NPC end -SlateportCity_EventScript_14BCF4:: @ 814BCF4 - msgbox SlateportCity_Text_164F62, MSGBOX_NPC +SlateportCity_EventScript_PokefanF:: @ 814BCF4 + msgbox SlateportCity_Text_BuyTooMuch, MSGBOX_NPC end -SlateportCity_EventScript_14BCFD:: @ 814BCFD - msgbox SlateportCity_Text_16507C, MSGBOX_NPC +SlateportCity_EventScript_Man2:: @ 814BCFD + msgbox SlateportCity_Text_ContestHallBuiltRecently, MSGBOX_NPC end -SlateportCity_EventScript_14BD06:: @ 814BD06 +SlateportCity_EventScript_SchoolKid:: @ 814BD06 lock faceplayer - msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO + msgbox SlateportCity_Text_DoYouKnowAboutBerryBlender, MSGBOX_YESNO compare VAR_RESULT, YES - call_if_eq SlateportCity_EventScript_14BD28 + call_if_eq SlateportCity_EventScript_ExplainBerryBlender compare VAR_RESULT, NO - call_if_eq SlateportCity_EventScript_14BD31 + call_if_eq SlateportCity_EventScript_ExplainPokeblock release end -SlateportCity_EventScript_14BD28:: @ 814BD28 - msgbox SlateportCity_Text_16511E, MSGBOX_DEFAULT +SlateportCity_EventScript_ExplainBerryBlender:: @ 814BD28 + msgbox SlateportCity_Text_FasterSpinBetterPokeblocks, MSGBOX_DEFAULT return -SlateportCity_EventScript_14BD31:: @ 814BD31 - msgbox SlateportCity_Text_1651A1, MSGBOX_DEFAULT +SlateportCity_EventScript_ExplainPokeblock:: @ 814BD31 + msgbox SlateportCity_Text_ExplainBerryBlender, MSGBOX_DEFAULT return -SlateportCity_EventScript_14BD3A:: @ 814BD3A +SlateportCity_EventScript_EvilTeamGrunt1:: @ 814BD3A lock faceplayer - msgbox SlateportCity_Text_164C64, MSGBOX_DEFAULT + msgbox SlateportCity_Text_QuitPushing, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_14BD51:: @ 814BD51 +SlateportCity_EventScript_EvilTeamGrunt2:: @ 814BD51 lock faceplayer - msgbox SlateportCity_Text_164C9F, MSGBOX_DEFAULT + msgbox SlateportCity_Text_EvilTeamHasPolicy, MSGBOX_DEFAULT closemessage applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_14BD68:: @ 814BD68 +SlateportCity_EventScript_EvilTeamGrunt3:: @ 814BD68 lock faceplayer - msgbox SlateportCity_Text_164CE8, MSGBOX_DEFAULT + msgbox SlateportCity_Text_BossIsBrilliant, MSGBOX_DEFAULT closemessage applymovement 20, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_14BD7F:: @ 814BD7F +SlateportCity_EventScript_EvilTeamGrunt4:: @ 814BD7F lock faceplayer - msgbox SlateportCity_Text_164D2B, MSGBOX_DEFAULT + msgbox SlateportCity_Text_WhatsNewSchemeIWonder, MSGBOX_DEFAULT closemessage applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_14BD96:: @ 814BD96 +SlateportCity_EventScript_EvilTeamGrunt5:: @ 814BD96 lock faceplayer - msgbox SlateportCity_Text_164D92, MSGBOX_DEFAULT + msgbox SlateportCity_Text_ShouldTakeItAll, MSGBOX_DEFAULT closemessage applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_14BDAD:: @ 814BDAD +SlateportCity_EventScript_EvilTeamGrunt6:: @ 814BDAD lock faceplayer - msgbox SlateportCity_Text_164DD5, MSGBOX_DEFAULT + msgbox SlateportCity_Text_DontButtIn, MSGBOX_DEFAULT closemessage applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_14BDC4:: @ 814BDC4 +SlateportCity_EventScript_EvilTeamGrunt7:: @ 814BDC4 lock faceplayer - msgbox SlateportCity_Text_164DF4, MSGBOX_DEFAULT + msgbox SlateportCity_Text_RemindsMeOfLongLineForGames, MSGBOX_DEFAULT closemessage applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_14BDDB:: @ 814BDDB +SlateportCity_EventScript_EvilTeamGrunt8:: @ 814BDDB lock faceplayer - msgbox SlateportCity_Text_164E46, MSGBOX_DEFAULT + msgbox SlateportCity_Text_WhyAreWeLiningUp, MSGBOX_DEFAULT closemessage applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_EventScript_14BDF2:: @ 814BDF2 +SlateportCity_EventScript_DollClerk:: @ 814BDF2 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration SlateportCity_Decorations1 + pokemartdecoration SlateportCity_PokemartDecor1_Dolls msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -SlateportCity_Decorations1:: @ 814BE0C +SlateportCity_PokemartDecor1_Dolls:: @ 814BE0C .2byte DECOR_AZURILL_DOLL .2byte DECOR_MARILL_DOLL .2byte DECOR_SKITTY_DOLL @@ -397,24 +397,24 @@ SlateportCity_Decorations1:: @ 814BE0C release end -SlateportCity_EventScript_14BE16:: @ 814BE16 - msgbox SlateportCity_Text_1A116E, MSGBOX_DEFAULT +SlateportCity_EventScript_ComeBackWithSecretPower:: @ 814BE16 + msgbox gText_ComeBackWithSecretPower, MSGBOX_DEFAULT release end -SlateportCity_EventScript_14BE20:: @ 814BE20 +SlateportCity_EventScript_DecorClerk:: @ 814BE20 lock faceplayer - goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_ComeBackWithSecretPower message Text_HowMayIServeYou waitmessage - pokemartdecoration SlateportCity_Decorations2 + pokemartdecoration SlateportCity_PokemartDecor1 msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -SlateportCity_Decorations2:: @ 814BE40 +SlateportCity_PokemartDecor1:: @ 814BE40 .2byte DECOR_RED_BRICK .2byte DECOR_BLUE_BRICK .2byte DECOR_YELLOW_BRICK @@ -436,16 +436,16 @@ SlateportCity_Decorations2:: @ 814BE40 @ 814BE60 lock faceplayer - goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_ComeBackWithSecretPower message Text_HowMayIServeYou waitmessage - pokemartdecoration SlateportCity_Decorations3 + pokemartdecoration SlateportCity_PokemartDecor2 msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -SlateportCity_Decorations3:: @ 814BE80 +SlateportCity_PokemartDecor2:: @ 814BE80 .2byte DECOR_MUD_BALL .2byte DECOR_SLIDE .2byte DECOR_FENCE_LENGTH @@ -461,28 +461,28 @@ SlateportCity_Decorations3:: @ 814BE80 release end -SlateportCity_EventScript_14BE9A:: @ 814BE9A +SlateportCity_EventScript_PowerTMClerk:: @ 814BE9A lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart SlateportCity_Items2 + pokemart SlateportCity_Pokemart_PowerTMs msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -SlateportCity_Items2:: @ 814BEB4 +SlateportCity_Pokemart_PowerTMs:: @ 814BEB4 .2byte ITEM_TM10_HIDDEN_POWER .2byte ITEM_TM43_SECRET_POWER .2byte ITEM_NONE release end -SlateportCity_EventScript_14BEBC:: @ 814BEBC +SlateportCity_EventScript_CaptStern:: @ 814BEBC lockall - msgbox SlateportCity_Text_165498, MSGBOX_DEFAULT - msgbox SlateportCity_Text_1654E0, MSGBOX_DEFAULT + msgbox SlateportCity_Text_SternMoveAheadWithExploration, MSGBOX_DEFAULT + msgbox SlateportCity_Text_GabbyWonderfulThanksForInterview, MSGBOX_DEFAULT closemessage applymovement 10, Common_Movement_WalkInPlaceFastestRight waitmovement 0 @@ -490,40 +490,40 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 - applymovement 11, SlateportCity_Movement_14C000 - applymovement LOCALID_PLAYER, SlateportCity_Movement_14C00E - applymovement 10, SlateportCity_Movement_14BFDD - applymovement 9, SlateportCity_Movement_14BFEA + applymovement 11, SlateportCity_Movement_SternWatchGabbyAndTyExit + applymovement LOCALID_PLAYER, SlateportCity_Movement_PlayerFaceStern + applymovement 10, SlateportCity_Movement_GabbyExit + applymovement 9, SlateportCity_Movement_TyExit waitmovement 0 removeobject 10 removeobject 9 - msgbox SlateportCity_Text_16558D, MSGBOX_DEFAULT + msgbox SlateportCity_Text_SternWhewFirstInterview, MSGBOX_DEFAULT applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SlateportCity_Text_1655E7, MSGBOX_DEFAULT + msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT playbgm MUS_EVIL_TEAM, FALSE - msgbox SlateportCity_Text_1656BC, MSGBOX_DEFAULT + msgbox SlateportCity_Text_EvilTeamWillAssumeControlOfSubmarine, MSGBOX_DEFAULT applymovement 6, Common_Movement_WalkInPlaceFastestLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft - applymovement 7, SlateportCity_Movement_14BFCD + applymovement 7, SlateportCity_Movement_OldWomanConcern applymovement 3, Common_Movement_QuestionMark - applymovement 2, SlateportCity_Movement_14BFD5 + applymovement 2, SlateportCity_Movement_ManConcern waitmovement 0 applymovement 11, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox SlateportCity_Text_16578F, MSGBOX_DEFAULT + msgbox SlateportCity_Text_SternWhatWasAllThat, MSGBOX_DEFAULT playse SE_PIN applymovement 11, Common_Movement_ExclamationMark waitmovement 0 applymovement 11, Common_Movement_Delay48 waitmovement 0 - msgbox SlateportCity_Text_1657FA, MSGBOX_DEFAULT + msgbox SlateportCity_Text_FromHarborTryingToTakeSub, MSGBOX_DEFAULT applymovement 11, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_Text_16583A, MSGBOX_DEFAULT + msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage - applymovement 11, SlateportCity_Movement_14BFFB - applymovement LOCALID_PLAYER, SlateportCity_Movement_14C008 + applymovement 11, SlateportCity_Movement_SternEnterHarbor + applymovement LOCALID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor waitmovement 0 removeobject 11 clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR @@ -536,7 +536,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC releaseall end -SlateportCity_Movement_14BFCD:: @ 814BFCD +SlateportCity_Movement_OldWomanConcern:: @ 814BFCD delay_16 delay_16 emote_question_mark @@ -546,7 +546,7 @@ SlateportCity_Movement_14BFCD:: @ 814BFCD walk_in_place_fastest_left step_end -SlateportCity_Movement_14BFD5:: @ 814BFD5 +SlateportCity_Movement_ManConcern:: @ 814BFD5 emote_question_mark walk_in_place_fastest_up delay_16 @@ -556,7 +556,7 @@ SlateportCity_Movement_14BFD5:: @ 814BFD5 walk_in_place_fastest_left step_end -SlateportCity_Movement_14BFDD:: @ 814BFDD +SlateportCity_Movement_GabbyExit:: @ 814BFDD delay_16 walk_left walk_left @@ -571,7 +571,7 @@ SlateportCity_Movement_14BFDD:: @ 814BFDD walk_left step_end -SlateportCity_Movement_14BFEA:: @ 814BFEA +SlateportCity_Movement_TyExit:: @ 814BFEA walk_down walk_left walk_left @@ -587,19 +587,19 @@ SlateportCity_Movement_14BFEA:: @ 814BFEA walk_left step_end -@ 814BFF8 +SlateportCity_Movement_Unused:: @ 814BFF8 walk_down walk_in_place_fastest_up step_end -SlateportCity_Movement_14BFFB:: @ 814BFFB +SlateportCity_Movement_SternEnterHarbor:: @ 814BFFB walk_right walk_up walk_up set_invisible step_end -SlateportCity_Movement_14C000:: @ 814C000 +SlateportCity_Movement_SternWatchGabbyAndTyExit:: @ 814C000 delay_16 delay_16 delay_16 @@ -609,7 +609,7 @@ SlateportCity_Movement_14C000:: @ 814C000 walk_left step_end -SlateportCity_Movement_14C008:: @ 814C008 +SlateportCity_Movement_PlayerEnterHarbor:: @ 814C008 walk_in_place_fastest_right delay_16 delay_16 @@ -617,7 +617,7 @@ SlateportCity_Movement_14C008:: @ 814C008 walk_up step_end -SlateportCity_Movement_14C00E:: @ 814C00E +SlateportCity_Movement_PlayerFaceStern:: @ 814C00E delay_16 delay_16 delay_16 @@ -628,14 +628,14 @@ SlateportCity_Movement_14C00E:: @ 814C00E walk_in_place_fastest_down step_end -SlateportCity_EventScript_14C017:: @ 814C017 - msgbox SlateportCity_Text_165425, MSGBOX_SIGN +SlateportCity_EventScript_Ty:: @ 814C017 + msgbox SlateportCity_Text_BigSmileForCamera, MSGBOX_SIGN end -SlateportCity_EventScript_14C020:: @ 814C020 - msgbox SlateportCity_Text_165458, MSGBOX_SIGN +SlateportCity_EventScript_Gabby:: @ 814C020 + msgbox SlateportCity_Text_MostInvaluableExperience, MSGBOX_SIGN end -SlateportCity_EventScript_14C029:: @ 814C029 - msgbox SlateportCity_Text_1647A7, MSGBOX_NPC +SlateportCity_EventScript_Man3:: @ 814C029 + msgbox SlateportCity_Text_WonderIfLighthouseStartlesPokemon, MSGBOX_NPC end diff --git a/data/maps/SlateportCity/text.inc b/data/maps/SlateportCity/text.inc index 4b907c032..ad604ae68 100644 --- a/data/maps/SlateportCity/text.inc +++ b/data/maps/SlateportCity/text.inc @@ -1,234 +1,234 @@ -SlateportCity_Text_164642:: @ 8164642 +SlateportCity_Text_EnergyGuruSellWhatYouNeed:: @ 8164642 .string "I'm the ENERGY GURU!\n" .string "I'll go for it and sell you what you need!$" -SlateportCity_Text_164682:: @ 8164682 +SlateportCity_Text_OhYourPokemon:: @ 8164682 .string "Oh?\n" .string "Your {STR_VAR_1}...$" -SlateportCity_Text_164691:: @ 8164691 +SlateportCity_Text_PleaseGiveItThisEffortRibbon:: @ 8164691 .string "Went for it stupendously!\p" .string "As its reward, please give it this\n" .string "EFFORT RIBBON.$" -SlateportCity_Text_1646DD:: @ 81646DD +SlateportCity_Text_ReceivedEffortRibbon:: @ 81646DD .string "{PLAYER} received the EFFORT RIBBON.$" -SlateportCity_Text_1646FC:: @ 81646FC +SlateportCity_Text_PutEffortRibbonOnMon:: @ 81646FC .string "{PLAYER} put the EFFORT RIBBON\n" .string "on {STR_VAR_1}.$" -SlateportCity_Text_16471C:: @ 816471C +SlateportCity_Text_GoForItLittleHarder:: @ 816471C .string "You have to go for it a little harder.\p" .string "If you do, I'll give your POKéMON\n" .string "something nice.$" -SlateportCity_Text_164775:: @ 8164775 +SlateportCity_Text_EffortRibbonLooksGoodOnIt:: @ 8164775 .string "Oh! Your {STR_VAR_1}, that EFFORT\n" .string "RIBBON looks good on it!$" -SlateportCity_Text_1647A7:: @ 81647A7 +SlateportCity_Text_WonderIfLighthouseStartlesPokemon:: @ 81647A7 .string "The light of the lighthouse reaches\n" .string "dozens of miles away.\p" .string "I wonder if it doesn't startle POKéMON\n" .string "in the sea.$" -SlateportCity_Text_164814:: @ 8164814 +SlateportCity_Text_SeaweedFullOfLife:: @ 8164814 .string "Ooh, look at this!\p" .string "The seaweed you can get around these\n" .string "parts is fresh and full of life.\p" .string "Why, it looks like it can even rear up\n" .string "and attack!$" -SlateportCity_Text_1648A0:: @ 81648A0 +SlateportCity_Text_HowTownIsBornAndGrows:: @ 81648A0 .string "Where the water is clean, the fruits\n" .string "of bountiful harvest gather.\p" .string "And where people gather, a market\n" .string "soon starts.\p" .string "That is how a town is born and grows.$" -SlateportCity_Text_164937:: @ 8164937 +SlateportCity_Text_SlateportWonderfulPlace:: @ 8164937 .string "Shopping where you can breathe the\n" .string "scent of the ocean...\p" .string "SLATEPORT is such a wonderful place!$" -SlateportCity_Text_164995:: @ 8164995 +SlateportCity_Text_BuyBricksSoDecorWontGetDirty:: @ 8164995 .string "If you put DOLLS or CUSHIONS on the\n" .string "floor, they'll get dirty.\p" .string "I'm going to buy some BRICKS so my\n" .string "DOLLS and CUSHIONS won't get dirty\l" .string "when I leave them out.$" -SlateportCity_Text_164A30:: @ 8164A30 +SlateportCity_Text_GoingToCompeteInPokemonContest:: @ 8164A30 .string "Yeah! I've waited so long for this!\n" .string "POKéMON CONTESTS!\l" .string "I'm going to enter!\p" .string "But before I do, I have to catch some\n" .string "POKéMON!$" -SlateportCity_Text_164AA9:: @ 8164AA9 +SlateportCity_Text_BushedHikingFromMauville:: @ 8164AA9 .string "Whew... I'm just bushed...\p" .string "I hiked over from MAUVILLE CITY.\n" .string "But, boy, this city's huge.\p" .string "If I'd known this, I would've ridden\n" .string "my BIKE here.$" -SlateportCity_Text_164B34:: @ 8164B34 +SlateportCity_Text_EveryoneCallsHimCaptStern:: @ 8164B34 .string "STERN, the fellow who built the\n" .string "MUSEUM, also happens to be the leader\l" .string "of an undersea exploration team.\p" .string "So, everyone calls him CAPT. STERN.$" -SlateportCity_Text_164BBF:: @ 8164BBF +SlateportCity_Text_WhatsLongLineOverThere:: @ 8164BBF .string "What is that over there?\n" .string "That long line...$" -SlateportCity_Text_164BEA:: @ 8164BEA +SlateportCity_Text_VisitedMuseumOften:: @ 8164BEA .string "When I was a child, I visited the\n" .string "MUSEUM often.\p" .string "I used to dream about the mysteries of\n" .string "the sea after seeing the exhibits.$" -SlateportCity_Text_164C64:: @ 8164C64 +SlateportCity_Text_QuitPushing:: @ 8164C64 .string "Hey, there! Quit pushing!\n" .string "This is the line, can't you see?$" -SlateportCity_Text_164C9F:: @ 8164C9F +SlateportCity_Text_EvilTeamHasPolicy:: @ 8164C9F .string "TEAM {EVIL_TEAM} has a policy of\n" .string "assembling and dispersing at the\l" .string "operation site.$" -SlateportCity_Text_164CE8:: @ 8164CE8 +SlateportCity_Text_BossIsBrilliant:: @ 8164CE8 .string "Our BOSS is brilliant.\p" .string "What would he want to do with a\n" .string "MUSEUM now?$" -SlateportCity_Text_164D2B:: @ 8164D2B +SlateportCity_Text_WhatsNewSchemeIWonder:: @ 8164D2B .string "What's the new scheme, I wonder?\p" .string "Our BOSS is scary when he's mad, so\n" .string "I'd better not screw things up...$" -SlateportCity_Text_164D92:: @ 8164D92 +SlateportCity_Text_ShouldTakeItAll:: @ 8164D92 .string "If there's something we need in the\n" .string "MUSEUM, we should take it all!$" -SlateportCity_Text_164DD5:: @ 8164DD5 +SlateportCity_Text_DontButtIn:: @ 8164DD5 .string "Hey, you there!\n" .string "Don't butt in!$" -SlateportCity_Text_164DF4:: @ 8164DF4 +SlateportCity_Text_RemindsMeOfLongLineForGames:: @ 8164DF4 .string "A long line, huh?\p" .string "It reminds me of the times I lined up to\n" .string "buy smash-hit games...$" -SlateportCity_Text_164E46:: @ 8164E46 +SlateportCity_Text_WhyAreWeLiningUp:: @ 8164E46 .string "Why are we even lining up and paying?\n" .string "We should just march in!$" -SlateportCity_Text_164E85:: @ 8164E85 +SlateportCity_Text_SeaIsSoWet:: @ 8164E85 .string "The sea is just so vast...\p" .string "Could the sea have been made by the\n" .string "tears shed by POKéMON?$" -SlateportCity_Text_164EDB:: @ 8164EDB +SlateportCity_Text_SinkOldBoats:: @ 8164EDB .string "Do you know what they do with old\n" .string "ships that become too creaky to sail?\p" .string "They sink them in the sea so they\n" .string "become habitats for POKéMON.$" -SlateportCity_Text_164F62:: @ 8164F62 +SlateportCity_Text_BuyTooMuch:: @ 8164F62 .string "Whenever I visit here, I get carried\n" .string "away and buy too much.$" -SlateportCity_Text_164F9E:: @ 8164F9E +SlateportCity_Text_GetNameRaterToHelpYou:: @ 8164F9E .string "If you want to change your POKéMON's\n" .string "nickname, you'll have to get the NAME\l" .string "RATER to help you.$" -SlateportCity_Text_164FFC:: @ 8164FFC +SlateportCity_Text_CantChangeTradeMonName:: @ 8164FFC .string "Any POKéMON you get in a trade, you\n" .string "can't change its nickname.\p" .string "The original TRAINER's love for that\n" .string "POKéMON is in the nickname.$" -SlateportCity_Text_16507C:: @ 816507C +SlateportCity_Text_ContestHallBuiltRecently:: @ 816507C .string "A POKéMON CONTEST HALL opened in\n" .string "SLATEPORT recently.\p" .string "I plan on entering after I improve the\n" .string "condition of my POKéMON.$" -SlateportCity_Text_1650F1:: @ 81650F1 +SlateportCity_Text_DoYouKnowAboutBerryBlender:: @ 81650F1 .string "Do you know about the machine\n" .string "BERRY BLENDER?$" -SlateportCity_Text_16511E:: @ 816511E +SlateportCity_Text_FasterSpinBetterPokeblocks:: @ 816511E .string "People have to work together to get it\n" .string "to spin faster.\p" .string "The faster you can make it spin, the\n" .string "better {POKEBLOCK}S you can get, I've heard.$" -SlateportCity_Text_1651A1:: @ 81651A1 +SlateportCity_Text_ExplainBerryBlender:: @ 81651A1 .string "It's used for making a kind of candy\n" .string "called a {POKEBLOCK}.\p" .string "If you give a good {POKEBLOCK} to a POKéMON,\n" .string "its condition will improve by a lot.$" -SlateportCity_Text_165222:: @ 8165222 +SlateportCity_Text_CaptSternBeingInterviewed:: @ 8165222 .string "I was hoping that it was a famous star\n" .string "so I could get an autograph.\p" .string "But who's that being interviewed?\n" .string "Isn't that CAPT. STERN?$" -SlateportCity_Text_1652A0:: @ 81652A0 +SlateportCity_Text_InterviewerSoCool:: @ 81652A0 .string "That lady interviewer is so cool and\n" .string "pretty.\p" .string "When I grow up, I'm going to be an\n" .string "international journalist!$" -SlateportCity_Text_16530A:: @ 816530A +SlateportCity_Text_SternSaysDiscoveredSomething:: @ 816530A .string "CAPT. STERN says they discovered\n" .string "something at the bottom of the sea.\p" .string "I wonder what it is?\n" .string "What could it be?$" -SlateportCity_Text_165376:: @ 8165376 +SlateportCity_Text_CaptainComeBackWithBigFish:: @ 8165376 .string "What's going on here?\p" .string "Did the good CAPTAIN come back with\n" .string "a big fish from the ocean floor?$" -SlateportCity_Text_1653D1:: @ 81653D1 +SlateportCity_Text_AmIOnTV:: @ 81653D1 .string "Hey! Are you watching?\n" .string "Am I on TV?$" -SlateportCity_Text_1653F4:: @ 81653F4 +SlateportCity_Text_CaptainsACelebrity:: @ 81653F4 .string "A TV interview! Here!\n" .string "The CAPTAIN's a celebrity!$" -SlateportCity_Text_165425:: @ 8165425 +SlateportCity_Text_BigSmileForCamera:: @ 8165425 .string "TY: Okay, CAPT. STERN, a big smile\n" .string "for the camera!$" -SlateportCity_Text_165458:: @ 8165458 +SlateportCity_Text_MostInvaluableExperience:: @ 8165458 .string "GABBY: I see, I see. You've had a most\n" .string "invaluable experience...$" -SlateportCity_Text_165498:: @ 8165498 +SlateportCity_Text_SternMoveAheadWithExploration:: @ 8165498 .string "CAPT. STERN: Yes, indeed. We intend to\n" .string "move ahead with our exploration.$" -SlateportCity_Text_1654E0:: @ 81654E0 +SlateportCity_Text_GabbyWonderfulThanksForInterview:: @ 81654E0 .string "GABBY: That's wonderful, CAPT. STERN!\n" .string "Thank you for taking the time from\l" .string "your busy schedule to talk to us.\p" .string "We hope we can interview you again\n" .string "with news of more discoveries!$" -SlateportCity_Text_16558D:: @ 816558D +SlateportCity_Text_SternWhewFirstInterview:: @ 816558D .string "CAPT. STERN: Whew...\p" .string "That was my first time to be filmed for\n" .string "TV. That was nerve wracking.$" -SlateportCity_Text_1655E7:: @ 81655E7 +SlateportCity_Text_OhPlayerWeMadeDiscovery:: @ 81655E7 .string "Oh! {PLAYER}{KUN}!\n" .string "You're looking great!\p" .string "We made a huge discovery on our last\n" @@ -238,7 +238,7 @@ SlateportCity_Text_1655E7:: @ 81655E7 .string "We think it's the habitat of a POKéMON\n" .string "that's said to have been long extinct.$" -SlateportCity_Text_1656BC:: @ 81656BC +SlateportCity_Text_EvilTeamWillAssumeControlOfSubmarine:: @ 81656BC .string "Fufufu...\n" .string "CAPT. STERN, I presume.\p" .string "We of TEAM {EVIL_TEAM} will assume\n" @@ -249,73 +249,73 @@ SlateportCity_Text_1656BC:: @ 81656BC .string "Just watch and learn what TEAM\l" .string "{EVIL_TEAM} has planned!$" -SlateportCity_Text_16578F:: @ 816578F +SlateportCity_Text_SternWhatWasAllThat:: @ 816578F .string "CAPT. STERN: What was that all about?\p" .string "It sounded like someone using a\n" .string "megaphone...\p" .string "Where did it come from?$" -SlateportCity_Text_1657FA:: @ 81657FA +SlateportCity_Text_FromHarborTryingToTakeSub:: @ 81657FA .string "It's from the HARBOR!\p" .string "The submarine!\n" .string "They're trying to take it!$" -SlateportCity_Text_16583A:: @ 816583A +SlateportCity_Text_PleaseComeWithMe:: @ 816583A .string "{PLAYER}{KUN}!\n" .string "Please, come with me!$" -SlateportCity_Text_165856:: @ 8165856 +SlateportCity_Text_ContestHallSign:: @ 8165856 .string "POKéMON CONTESTS\n" .string "HYPER RANK REGISTRATION\l" .string "“Let it burn! POKéMON TRAINERS!”$" -SlateportCity_Text_1658A0:: @ 81658A0 +SlateportCity_Text_SternsShipyardWantedSign:: @ 81658A0 .string "STERN'S SHIPYARD\p" .string "“Wanted: A sailor capable of sailing\n" .string "in all currents.”$" -SlateportCity_Text_1658E8:: @ 81658E8 +SlateportCity_Text_SternsShipyardNearsCompletion:: @ 81658E8 .string "STERN'S SHIPYARD\p" .string "“The ferry S.S. TIDAL nears\n" .string "completion for serving the ports of\l" .string "SLATEPORT and LILYCOVE.”$" -SlateportCity_Text_165952:: @ 8165952 +SlateportCity_Text_SternsShipyardFerryComplete:: @ 8165952 .string "STERN'S SHIPYARD\p" .string "“Boarding of the SLATEPORT-LILYCOVE\n" .string "ferry S.S. TIDAL is handled at the\l" .string "HARBOR.”$" -SlateportCity_Text_1659B3:: @ 81659B3 +SlateportCity_Text_PokemonFanClubSign:: @ 81659B3 .string "POKéMON FAN CLUB\n" .string "“Calling all fans of POKéMON!”$" -SlateportCity_Text_1659E3:: @ 81659E3 +SlateportCity_Text_OceanicMuseumSign:: @ 81659E3 .string "“The endless sea sustains\n" .string "all life.”\p" .string "OCEANIC MUSEUM$" -SlateportCity_Text_165A17:: @ 8165A17 +SlateportCity_Text_CitySign:: @ 8165A17 .string "SLATEPORT CITY\p" .string "“The port where people and POKéMON\n" .string "cross paths.”$" -SlateportCity_Text_165A57:: @ 8165A57 +SlateportCity_Text_MarketSign:: @ 8165A57 .string "SLATEPORT MARKET\n" .string "“Unique items found nowhere else!”$" -SlateportCity_Text_165A8B:: @ 8165A8B +SlateportCity_Text_HarborFerryUnderConstruction:: @ 8165A8B .string "SLATEPORT HARBOR\p" .string "“The ferry S.S. TIDAL is under\n" .string "construction in the SHIPYARD.\p" .string "“Service is scheduled to begin\n" .string "shortly.”$" -SlateportCity_Text_165B02:: @ 8165B02 +SlateportCity_Text_HarborSign:: @ 8165B02 .string "SLATEPORT HARBOR\p" .string "“Enjoy a delightful cruise on the\n" .string "ferry S.S. TIDAL.”$" -SlateportCity_Text_165B48:: @ 8165B48 +SlateportCity_Text_NameRatersHouseSign:: @ 8165B48 .string "NAME RATER'S HOUSE\n" .string "“POKéMON nicknames rated.”$" diff --git a/data/maps/SlateportCity_ContestLobby/map.json b/data/maps/SlateportCity_ContestLobby/map.json index 6789ad846..0bc4e78f2 100644 --- a/data/maps/SlateportCity_ContestLobby/map.json +++ b/data/maps/SlateportCity_ContestLobby/map.json @@ -21,7 +21,7 @@ "movement_range_y": 3, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_ContestLobby_EventScript_15541D", + "script": "SlateportCity_ContestLobby_EventScript_ContestReceptionist", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_ContestLobby_EventScript_1B7795", + "script": "SlateportCity_ContestLobby_EventScript_MasterM", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_ContestLobby_EventScript_1554DE", + "script": "SlateportCity_ContestLobby_EventScript_Man", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_ContestLobby_EventScript_1554E7", + "script": "SlateportCity_ContestLobby_EventScript_Girl", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_ContestLobby_EventScript_1AE0B6", + "script": "SlateportCity_ContestLobby_EventScript_Reporter", "flag": "FLAG_HIDE_CONTEST_REPORTER_SLATEPORT" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_ContestLobby_EventScript_155536", + "script": "SlateportCity_ContestLobby_EventScript_Boy", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_ContestLobby_EventScript_1554F9", + "script": "SlateportCity_ContestLobby_EventScript_LittleGirl", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_ContestLobby_EventScript_1554F0", + "script": "SlateportCity_ContestLobby_EventScript_Woman", "flag": "0" } ], @@ -147,7 +147,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_ContestLobby_EventScript_1B7829" + "script": "SlateportCity_ContestLobby_EventScript_BerryBlender0" }, { "type": "sign", @@ -155,7 +155,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_ContestLobby_EventScript_1B761E" + "script": "SlateportCity_ContestLobby_EventScript_BerryBlender1" }, { "type": "sign", diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index f25956b68..2b60b9372 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -1,12 +1,12 @@ SlateportCity_ContestLobby_MapScripts:: @ 8155411 - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_ContestLobby_MapScript1_155417 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_ContestLobby_MapScript1_OnTransition .byte 0 -SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 +SlateportCity_ContestLobby_MapScript1_OnTransition:: @ 8155417 call SlateportCity_ContestLobby_EventScript_1AE188 end -SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D +SlateportCity_ContestLobby_EventScript_ContestReceptionist:: @ 815541D setvar VAR_0x800B, 7 setvar VAR_CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 @@ -87,31 +87,31 @@ SlateportCity_ContestLobby_Movement_1554DC:: @ 81554DC walk_in_place_fastest_right step_end -SlateportCity_ContestLobby_EventScript_1554DE:: @ 81554DE - msgbox SlateportCity_ContestLobby_Text_17C937, MSGBOX_NPC +SlateportCity_ContestLobby_EventScript_Man:: @ 81554DE + msgbox SlateportCity_ContestLobby_Text_WantToRaiseUltimateMon, MSGBOX_NPC end -SlateportCity_ContestLobby_EventScript_1554E7:: @ 81554E7 - msgbox SlateportCity_ContestLobby_Text_17C9D5, MSGBOX_NPC +SlateportCity_ContestLobby_EventScript_Girl:: @ 81554E7 + msgbox SlateportCity_ContestLobby_Text_DoYourFriendsHaveBerries, MSGBOX_NPC end -SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 - msgbox SlateportCity_ContestLobby_Text_17CAEC, MSGBOX_NPC +SlateportCity_ContestLobby_EventScript_Woman:: @ 81554F0 + msgbox SlateportCity_ContestLobby_Text_ContestWinnerPostersOnWall, MSGBOX_NPC end -SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 +SlateportCity_ContestLobby_EventScript_LittleGirl:: @ 81554F9 lockall - goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526 + goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_HavePokeblockCase applymovement 7, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_ContestLobby_Text_17CA67, MSGBOX_DEFAULT + msgbox SlateportCity_ContestLobby_Text_YouCanHavePokeblockCase, MSGBOX_DEFAULT giveitem ITEM_POKEBLOCK_CASE setflag FLAG_RECEIVED_POKEBLOCK_CASE releaseall end -SlateportCity_ContestLobby_EventScript_155526:: @ 8155526 - msgbox SlateportCity_ContestLobby_Text_17CA88, MSGBOX_NPC +SlateportCity_ContestLobby_EventScript_HavePokeblockCase:: @ 8155526 + msgbox SlateportCity_ContestLobby_Text_PutPokeblocksInThere, MSGBOX_NPC end SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F @@ -121,8 +121,8 @@ SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F releaseall end -SlateportCity_ContestLobby_EventScript_155536:: @ 8155536 - msgbox SlateportCity_ContestLobby_Text_1B7225, MSGBOX_NPC +SlateportCity_ContestLobby_EventScript_Boy:: @ 8155536 + msgbox SlateportCity_ContestLobby_Text_LetsGetBlendingAlready, MSGBOX_NPC end @ 815553F diff --git a/data/maps/SlateportCity_ContestLobby/text.inc b/data/maps/SlateportCity_ContestLobby/text.inc index 4af4c4c67..31a1edf66 100644 --- a/data/maps/SlateportCity_ContestLobby/text.inc +++ b/data/maps/SlateportCity_ContestLobby/text.inc @@ -1,26 +1,26 @@ -SlateportCity_ContestLobby_Text_17C937:: @ 817C937 +SlateportCity_ContestLobby_Text_WantToRaiseUltimateMon:: @ 817C937 .string "I want to raise a POKéMON that's\n" .string "the ultimate in “great” for both\l" .string "battles and CONTESTS.\p" .string "It's vexing, trying to figure out\n" .string "which moves I should make it learn.$" -SlateportCity_ContestLobby_Text_17C9D5:: @ 817C9D5 +SlateportCity_ContestLobby_Text_DoYourFriendsHaveBerries:: @ 817C9D5 .string "Do any of your friends have any\n" .string "BERRIES?\p" .string "You can use that BERRY BLENDER and\n" .string "make {POKEBLOCK}S with your friends!\p" .string "You should try it - it's a lot of fun!$" -SlateportCity_ContestLobby_Text_17CA67:: @ 817CA67 +SlateportCity_ContestLobby_Text_YouCanHavePokeblockCase:: @ 817CA67 .string "I have two, so you can have one!$" -SlateportCity_ContestLobby_Text_17CA88:: @ 817CA88 +SlateportCity_ContestLobby_Text_PutPokeblocksInThere:: @ 817CA88 .string "Make {POKEBLOCK}S and put them in there.\p" .string "When you make a {POKEBLOCK}, everyone\n" .string "has to put in a different BERRY.$" -SlateportCity_ContestLobby_Text_17CAEC:: @ 817CAEC +SlateportCity_ContestLobby_Text_ContestWinnerPostersOnWall:: @ 817CAEC .string "If you win a CONTEST, they put up a\n" .string "poster of your POKéMON on the wall.\p" .string "It will have a portrait of your\n" diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 9099c9fa3..614ce6d44 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Harbor_EventScript_1560C4", + "script": "SlateportCity_Harbor_EventScript_FerryAttendant", "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Harbor_EventScript_1561FF", + "script": "SlateportCity_Harbor_EventScript_Sailor", "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Harbor_EventScript_156208", + "script": "SlateportCity_Harbor_EventScript_FatMan", "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Harbor_EventScript_156211", + "script": "SlateportCity_Harbor_EventScript_CaptStern", "flag": "FLAG_HIDE_STERN_SLATEPORT_HARBOR" }, { @@ -154,7 +154,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", - "script": "SlateportCity_Harbor_EventScript_155F9B" + "script": "SlateportCity_Harbor_EventScript_EvilTeamEscapeTrigger0" }, { "type": "trigger", @@ -163,7 +163,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", - "script": "SlateportCity_Harbor_EventScript_155FA7" + "script": "SlateportCity_Harbor_EventScript_EvilTeamEscapeTrigger1" }, { "type": "trigger", @@ -172,7 +172,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", - "script": "SlateportCity_Harbor_EventScript_155FB3" + "script": "SlateportCity_Harbor_EventScript_EvilTeamEscapeTrigger2" }, { "type": "trigger", @@ -181,7 +181,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_HARBOR_STATE", "var_value": "1", - "script": "SlateportCity_Harbor_EventScript_155FBF" + "script": "SlateportCity_Harbor_EventScript_EvilTeamEscapeTrigger3" } ], "bg_events": [] diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 99f376b15..0d5ef6ce6 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,76 +1,76 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_155F63 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_OnTransition .byte 0 -SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 +SlateportCity_Harbor_OnTransition:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_SLATEPORT_HARBOR_STATE, 1 - call_if_eq SlateportCity_Harbor_EventScript_155F89 - call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85 + call_if_eq SlateportCity_Harbor_EventScript_ReadyEvilTeamEscapeScene + call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_ShowSSTidal end -SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 +SlateportCity_Harbor_EventScript_ShowSSTidal:: @ 8155F85 clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR return -SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 +SlateportCity_Harbor_EventScript_ReadyEvilTeamEscapeScene:: @ 8155F89 savebgm MUS_EVIL_TEAM setobjectxyperm 4, 12, 13 setobjectmovementtype 4, 9 setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR return -SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B +SlateportCity_Harbor_EventScript_EvilTeamEscapeTrigger0:: @ 8155F9B lockall setvar VAR_0x8008, 0 - goto SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_EvilTeamEscapeScene end -SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 +SlateportCity_Harbor_EventScript_EvilTeamEscapeTrigger1:: @ 8155FA7 lockall setvar VAR_0x8008, 1 - goto SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_EvilTeamEscapeScene end -SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 +SlateportCity_Harbor_EventScript_EvilTeamEscapeTrigger2:: @ 8155FB3 lockall setvar VAR_0x8008, 2 - goto SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_EvilTeamEscapeScene end -SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF +SlateportCity_Harbor_EventScript_EvilTeamEscapeTrigger3:: @ 8155FBF lockall setvar VAR_0x8008, 3 - applymovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_1560C2 + applymovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp waitmovement 0 - goto SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_EvilTeamEscapeScene end -SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 +SlateportCity_Harbor_EventScript_EvilTeamEscapeScene:: @ 8155FD5 applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SlateportCity_Harbor_Text_17FD7D, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_YouAgainHideoutInLilycove, MSGBOX_DEFAULT closemessage - applymovement 6, SlateportCity_Harbor_Movement_15609B - applymovement 7, SlateportCity_Harbor_Movement_15609B - applymovement 8, SlateportCity_Harbor_Movement_1560A5 + applymovement 6, SlateportCity_Harbor_Movement_EvilTeamBoardSub + applymovement 7, SlateportCity_Harbor_Movement_EvilTeamBoardSub + applymovement 8, SlateportCity_Harbor_Movement_SubmarineExit waitmovement 0 removeobject 6 removeobject 7 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 compare VAR_0x8008, 0 - call_if_eq SlateportCity_Harbor_EventScript_15605C + call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq SlateportCity_Harbor_EventScript_156071 + call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq SlateportCity_Harbor_EventScript_156086 + call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer compare VAR_0x8008, 3 - call_if_eq SlateportCity_Harbor_EventScript_156086 - msgbox SlateportCity_Harbor_Text_17FE60, MSGBOX_DEFAULT + call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer + msgbox SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT @@ -79,28 +79,28 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 releaseall end -SlateportCity_Harbor_EventScript_15605C:: @ 815605C - applymovement 4, SlateportCity_Harbor_Movement_1560B3 +SlateportCity_Harbor_EventScript_SternApproachPlayer0:: @ 815605C + applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer0 waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -SlateportCity_Harbor_EventScript_156071:: @ 8156071 - applymovement 4, SlateportCity_Harbor_Movement_1560B9 +SlateportCity_Harbor_EventScript_SternApproachPlayer1:: @ 8156071 + applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer1 waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -SlateportCity_Harbor_EventScript_156086:: @ 8156086 - applymovement 4, SlateportCity_Harbor_Movement_1560BE +SlateportCity_Harbor_EventScript_SternApproachPlayer:: @ 8156086 + applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer waitmovement 0 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -SlateportCity_Harbor_Movement_15609B:: @ 815609B +SlateportCity_Harbor_Movement_EvilTeamBoardSub:: @ 815609B delay_16 delay_16 jump_up @@ -114,7 +114,7 @@ SlateportCity_Harbor_Movement_15609B:: @ 815609B set_invisible step_end -SlateportCity_Harbor_Movement_1560A5:: @ 81560A5 +SlateportCity_Harbor_Movement_SubmarineExit:: @ 81560A5 delay_16 delay_16 delay_16 @@ -130,7 +130,7 @@ SlateportCity_Harbor_Movement_1560A5:: @ 81560A5 walk_fast_right step_end -SlateportCity_Harbor_Movement_1560B3:: @ 81560B3 +SlateportCity_Harbor_Movement_SternApproachPlayer0:: @ 81560B3 walk_left walk_left walk_left @@ -138,232 +138,232 @@ SlateportCity_Harbor_Movement_1560B3:: @ 81560B3 walk_up step_end -SlateportCity_Harbor_Movement_1560B9:: @ 81560B9 +SlateportCity_Harbor_Movement_SternApproachPlayer1:: @ 81560B9 walk_left walk_left walk_up walk_left step_end -SlateportCity_Harbor_Movement_1560BE:: @ 81560BE +SlateportCity_Harbor_Movement_SternApproachPlayer:: @ 81560BE walk_left walk_left walk_left step_end -SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 +SlateportCity_Harbor_Movement_PlayerWalkUp:: @ 81560C2 walk_up step_end -SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 +SlateportCity_Harbor_EventScript_FerryAttendant:: @ 81560C4 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9 - msgbox SlateportCity_Harbor_Text_17FA0A, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_AskForTicket + msgbox SlateportCity_Harbor_Text_FerryServiceUnavailable, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 - msgbox SlateportCity_Harbor_Text_17FA73, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_AskForTicket:: @ 81560D9 + msgbox SlateportCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_156135 - message SlateportCity_Harbor_Text_17FB0A + goto_if_eq SlateportCity_Harbor_EventScript_NoTicket + message SlateportCity_Harbor_Text_FlashedTicketWhereTo waitmessage - goto SlateportCity_Harbor_EventScript_1560FD + goto SlateportCity_Harbor_EventScript_ChooseDestination end -SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD +SlateportCity_Harbor_EventScript_ChooseDestination:: @ 81560FD multichoicedefault 18, 6, 52, 2, 0 switch VAR_RESULT - case 0, SlateportCity_Harbor_EventScript_15613F - case 1, SlateportCity_Harbor_EventScript_156167 - case 2, SlateportCity_Harbor_EventScript_1561DA - case 127, SlateportCity_Harbor_EventScript_1561DA + case 0, SlateportCity_Harbor_EventScript_Lilycove + case 1, SlateportCity_Harbor_EventScript_BattleTower + case 2, SlateportCity_Harbor_EventScript_CancelDestinationSelect + case 127, SlateportCity_Harbor_EventScript_CancelDestinationSelect end -SlateportCity_Harbor_EventScript_156135:: @ 8156135 - msgbox SlateportCity_Harbor_Text_17FAAD, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_NoTicket:: @ 8156135 + msgbox SlateportCity_Harbor_Text_YouMustHaveTicket, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_15613F:: @ 815613F - msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO +SlateportCity_Harbor_EventScript_Lilycove:: @ 815613F + msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq SlateportCity_Harbor_EventScript_15618A + goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination setvar VAR_PORTHOLE_STATE, 1 - call SlateportCity_Harbor_EventScript_156196 + call SlateportCity_Harbor_EventScript_BoardFerry warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end -SlateportCity_Harbor_EventScript_156167:: @ 8156167 - msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO +SlateportCity_Harbor_EventScript_BattleTower:: @ 8156167 + msgbox SlateportCity_Harbor_Text_BattleTowerItIs, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq SlateportCity_Harbor_EventScript_15618A - call SlateportCity_Harbor_EventScript_156196 + goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination + call SlateportCity_Harbor_EventScript_BoardFerry warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end -SlateportCity_Harbor_EventScript_15618A:: @ 815618A - message SlateportCity_Harbor_Text_17FBE5 +SlateportCity_Harbor_EventScript_ChooseNewDestination:: @ 815618A + message SlateportCity_Harbor_Text_WhereWouldYouLikeToGo waitmessage - goto SlateportCity_Harbor_EventScript_1560FD + goto SlateportCity_Harbor_EventScript_ChooseDestination end -SlateportCity_Harbor_EventScript_156196:: @ 8156196 - msgbox SlateportCity_Harbor_Text_17FBB6, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_BoardFerry:: @ 8156196 + msgbox SlateportCity_Harbor_Text_PleaseBoardFerry, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare VAR_FACING, 2 - call_if_eq SlateportCity_Harbor_EventScript_1561EF + call_if_eq SlateportCity_Harbor_EventScript_BoardFerryNorth compare VAR_FACING, 4 - call_if_eq SlateportCity_Harbor_EventScript_1561E4 + call_if_eq SlateportCity_Harbor_EventScript_BoardFerryEast delay 30 hideobjectat LOCALID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call Common_EventScript_FerryDepart return -SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA - msgbox SlateportCity_Harbor_Text_17FB5F, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_CancelDestinationSelect:: @ 81561DA + msgbox SlateportCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4 - applymovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_1561FA +SlateportCity_Harbor_EventScript_BoardFerryEast:: @ 81561E4 + applymovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast waitmovement 0 return -SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF - applymovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_1561FD +SlateportCity_Harbor_EventScript_BoardFerryNorth:: @ 81561EF + applymovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth waitmovement 0 return -SlateportCity_Harbor_Movement_1561FA:: @ 81561FA +SlateportCity_Harbor_Movement_BoardFerryEast:: @ 81561FA walk_right walk_in_place_fastest_up step_end -SlateportCity_Harbor_Movement_1561FD:: @ 81561FD +SlateportCity_Harbor_Movement_BoardFerryNorth:: @ 81561FD walk_up step_end -SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF - msgbox SlateportCity_Harbor_Text_17FC07, MSGBOX_NPC +SlateportCity_Harbor_EventScript_Sailor:: @ 81561FF + msgbox SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday, MSGBOX_NPC end -SlateportCity_Harbor_EventScript_156208:: @ 8156208 - msgbox SlateportCity_Harbor_Text_17FC7C, MSGBOX_NPC +SlateportCity_Harbor_EventScript_FatMan:: @ 8156208 + msgbox SlateportCity_Harbor_Text_SubTooSmallForMe, MSGBOX_NPC end -SlateportCity_Harbor_EventScript_156211:: @ 8156211 +SlateportCity_Harbor_EventScript_CaptStern:: @ 8156211 lock faceplayer - goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F - goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265 - goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258 + goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment + goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_NeedDive + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_EvilTeamLeftNeedDive compare VAR_SLATEPORT_HARBOR_STATE, 2 - goto_if_eq SlateportCity_Harbor_EventScript_15624E - msgbox SlateportCity_Harbor_Text_17FD1C, MSGBOX_DEFAULT + goto_if_eq SlateportCity_Harbor_EventScript_WhyStealSubmarine + msgbox SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_Harbor_EventScript_15624E:: @ 815624E - msgbox SlateportCity_Harbor_Text_17FE60, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_WhyStealSubmarine:: @ 815624E + msgbox SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_156258:: @ 8156258 +SlateportCity_Harbor_EventScript_EvilTeamLeftNeedDive:: @ 8156258 setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE - msgbox SlateportCity_Harbor_Text_17FF35, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_EvilTeamLeftNeedDive, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_156265:: @ 8156265 - msgbox SlateportCity_Harbor_Text_1800A0, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_NeedDive:: @ 8156265 + msgbox SlateportCity_Harbor_Text_NeedDiveToCatchSub, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_15626F:: @ 815626F +SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment:: @ 815626F compare VAR_TEMP_1, 1 - goto_if_eq SlateportCity_Harbor_EventScript_156380 + goto_if_eq SlateportCity_Harbor_EventScript_TradedScanner checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 - goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D - msgbox SlateportCity_Harbor_Text_18017B, MSGBOX_DEFAULT + goto_if_eq SlateportCity_Harbor_EventScript_AskToTradeScanner + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_FerryFinished + msgbox SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_15629D:: @ 815629D - msgbox SlateportCity_Harbor_Text_1801EA, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_FerryFinished:: @ 815629D + msgbox SlateportCity_Harbor_Text_FinishedMakingFerry, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7 - message SlateportCity_Harbor_Text_18028B +SlateportCity_Harbor_EventScript_AskToTradeScanner:: @ 81562A7 + message SlateportCity_Harbor_Text_WouldYouTradeScanner waitmessage - goto SlateportCity_Harbor_EventScript_1562B3 + goto SlateportCity_Harbor_EventScript_ChooseScannerTrade end -SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 +SlateportCity_Harbor_EventScript_ChooseScannerTrade:: @ 81562B3 multichoice 0, 0, 46, 0 switch VAR_RESULT - case 0, SlateportCity_Harbor_EventScript_1562EA - case 1, SlateportCity_Harbor_EventScript_15632A - case 2, SlateportCity_Harbor_EventScript_15636A - case 127, SlateportCity_Harbor_EventScript_15636A + case 0, SlateportCity_Harbor_EventScript_DeepSeaTooth + case 1, SlateportCity_Harbor_EventScript_DeepSeaScale + case 2, SlateportCity_Harbor_EventScript_DeclineTrade + case 127, SlateportCity_Harbor_EventScript_DeclineTrade end -SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA - msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO +SlateportCity_Harbor_EventScript_DeepSeaTooth:: @ 81562EA + msgbox SlateportCity_Harbor_Text_TradeForDeepSeaTooth, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq SlateportCity_Harbor_EventScript_156374 + goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade giveitem ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull removeitem ITEM_SCANNER - msgbox SlateportCity_Harbor_Text_18046B, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER - goto SlateportCity_Harbor_EventScript_156380 + goto SlateportCity_Harbor_EventScript_TradedScanner end -SlateportCity_Harbor_EventScript_15632A:: @ 815632A - msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO +SlateportCity_Harbor_EventScript_DeepSeaScale:: @ 815632A + msgbox SlateportCity_Harbor_Text_TradeForDeepSeaScale, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq SlateportCity_Harbor_EventScript_156374 + goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade giveitem ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull removeitem ITEM_SCANNER - msgbox SlateportCity_Harbor_Text_18046B, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER - goto SlateportCity_Harbor_EventScript_156380 + goto SlateportCity_Harbor_EventScript_TradedScanner end -SlateportCity_Harbor_EventScript_15636A:: @ 815636A - msgbox SlateportCity_Harbor_Text_180360, MSGBOX_DEFAULT +SlateportCity_Harbor_EventScript_DeclineTrade:: @ 815636A + msgbox SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow, MSGBOX_DEFAULT release end -SlateportCity_Harbor_EventScript_156374:: @ 8156374 - message SlateportCity_Harbor_Text_180447 +SlateportCity_Harbor_EventScript_ChooseDifferentTrade:: @ 8156374 + message SlateportCity_Harbor_Text_WhichOneDoYouWant waitmessage - goto SlateportCity_Harbor_EventScript_1562B3 + goto SlateportCity_Harbor_EventScript_ChooseScannerTrade end -SlateportCity_Harbor_EventScript_156380:: @ 8156380 +SlateportCity_Harbor_EventScript_TradedScanner:: @ 8156380 setvar VAR_TEMP_1, 1 - msgbox SlateportCity_Harbor_Text_180491, MSGBOX_DEFAULT + msgbox SlateportCity_Harbor_Text_ThisWillHelpResearch, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_Harbor/text.inc b/data/maps/SlateportCity_Harbor/text.inc index d808e641b..c2efbed9c 100644 --- a/data/maps/SlateportCity_Harbor/text.inc +++ b/data/maps/SlateportCity_Harbor/text.inc @@ -1,59 +1,59 @@ -SlateportCity_Harbor_Text_17FA0A:: @ 817FA0A +SlateportCity_Harbor_Text_FerryServiceUnavailable:: @ 817FA0A .string "I beg your pardon?\n" .string "You're looking for a ship?\p" .string "I'm sorry, the ferry service isn't\n" .string "available at present...$" -SlateportCity_Harbor_Text_17FA73:: @ 817FA73 +SlateportCity_Harbor_Text_MayISeeYourTicket:: @ 817FA73 .string "Hello, are you here for the ferry?\n" .string "May I see your TICKET?$" -SlateportCity_Harbor_Text_17FAAD:: @ 817FAAD +SlateportCity_Harbor_Text_YouMustHaveTicket:: @ 817FAAD .string "{PLAYER} doesn't have the TICKET...\p" .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" -SlateportCity_Harbor_Text_17FB0A:: @ 817FB0A +SlateportCity_Harbor_Text_FlashedTicketWhereTo:: @ 817FB0A .string "{PLAYER} flashed the TICKET.\p" .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" -SlateportCity_Harbor_Text_17FB5F:: @ 817FB5F +SlateportCity_Harbor_Text_SailAnotherTime:: @ 817FB5F .string "Please sail with us another time!$" -SlateportCity_Harbor_Text_17FB81:: @ 817FB81 +SlateportCity_Harbor_Text_LilycoveItIs:: @ 817FB81 .string "LILYCOVE CITY it is, then!$" -SlateportCity_Harbor_Text_17FB9C:: @ 817FB9C +SlateportCity_Harbor_Text_BattleTowerItIs:: @ 817FB9C .string "BATTLE TOWER it is, then!$" -SlateportCity_Harbor_Text_17FBB6:: @ 817FBB6 +SlateportCity_Harbor_Text_PleaseBoardFerry:: @ 817FBB6 .string "Please board the ferry and wait for\n" .string "departure.$" -SlateportCity_Harbor_Text_17FBE5:: @ 817FBE5 +SlateportCity_Harbor_Text_WhereWouldYouLikeToGo:: @ 817FBE5 .string "Then, where would you like to go?$" -SlateportCity_Harbor_Text_17FC07:: @ 817FC07 +SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday:: @ 817FC07 .string "A journey to the bottom of the sea...\n" .string "I wonder what it'd be like?\p" .string "I'd love to go deep underwater like\n" .string "that some day.$" -SlateportCity_Harbor_Text_17FC7C:: @ 817FC7C +SlateportCity_Harbor_Text_SubTooSmallForMe:: @ 817FC7C .string "I wanted to go with CAPT. STERN on\n" .string "the ocean floor exploration.\p" .string "But the sub's too small for me.\p" .string "If I squeezed in, there wouldn't be\n" .string "any room for the CAPTAIN...$" -SlateportCity_Harbor_Text_17FD1C:: @ 817FD1C +SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum:: @ 817FD1C .string "CAPT. STERN: Those thugs...\p" .string "They're the same lot who tried to rob\n" .string "the DEVON GOODS at the MUSEUM.$" -SlateportCity_Harbor_Text_17FD7D:: @ 817FD7D +SlateportCity_Harbor_Text_YouAgainHideoutInLilycove:: @ 817FD7D .string "{EVIL_LEADER}: Fwahahaha...\n" .string "I commiserate with you!\p" .string "All that effort you spent following\n" @@ -64,7 +64,7 @@ SlateportCity_Harbor_Text_17FD7D:: @ 817FD7D .string "HIDEOUT in LILYCOVE CITY?\p" .string "Fwahahahaha...$" -SlateportCity_Harbor_Text_17FE60:: @ 817FE60 +SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine:: @ 817FE60 .string "CAPT. STERN: Why...\p" .string "Why would TEAM {EVIL_TEAM} steal my\n" .string "SUBMARINE EXPLORER 1?\p" @@ -73,7 +73,7 @@ SlateportCity_Harbor_Text_17FE60:: @ 817FE60 .string "But even if I were to chase them,\n" .string "I don't stand a chance against them...$" -SlateportCity_Harbor_Text_17FF35:: @ 817FF35 +SlateportCity_Harbor_Text_EvilTeamLeftNeedDive:: @ 817FF35 .string "CAPT. STERN: Oh, {PLAYER}{KUN}...\p" .string "Okay... So TEAM {EVIL_TEAM} left before you\n" .string "could stop them...\p" @@ -88,7 +88,7 @@ SlateportCity_Harbor_Text_17FF35:: @ 817FF35 .string "A lot of divers live out there, so\n" .string "someone might teach you...$" -SlateportCity_Harbor_Text_1800A0:: @ 81800A0 +SlateportCity_Harbor_Text_NeedDiveToCatchSub:: @ 81800A0 .string "CAPT. STERN: Trying to catch a\n" .string "submarine... It's impossible.\p" .string "You would need a POKéMON that knows\n" @@ -98,13 +98,13 @@ SlateportCity_Harbor_Text_1800A0:: @ 81800A0 .string "A lot of divers live out there, so\n" .string "someone might teach you...$" -SlateportCity_Harbor_Text_18017B:: @ 818017B +SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry:: @ 818017B .string "CAPT. STERN: Oh, yes.\n" .string "MR. BRINEY came to our SHIPYARD.\p" .string "It won't be long now before we finish\n" .string "making the ferry!$" -SlateportCity_Harbor_Text_1801EA:: @ 81801EA +SlateportCity_Harbor_Text_FinishedMakingFerry:: @ 81801EA .string "CAPT. STERN: {PLAYER}{KUN}!\p" .string "We finally finished making the ferry\n" .string "S.S. TIDAL!\p" @@ -112,7 +112,7 @@ SlateportCity_Harbor_Text_1801EA:: @ 81801EA .string "friend MR. BRINEY.\p" .string "Please go for a short cruise on it!$" -SlateportCity_Harbor_Text_18028B:: @ 818028B +SlateportCity_Harbor_Text_WouldYouTradeScanner:: @ 818028B .string "CAPT. STERN: Oh?\n" .string "{PLAYER}{KUN}, that item you have...\p" .string "That's a SCANNER! That would sure\n" @@ -122,27 +122,27 @@ SlateportCity_Harbor_Text_18028B:: @ 818028B .string "Like say a DEEPSEATOOTH or a\n" .string "DEEPSEASCALE that I have?$" -SlateportCity_Harbor_Text_180360:: @ 8180360 +SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow:: @ 8180360 .string "CAPT. STERN: Are you certain?\n" .string "It's useless to you, {PLAYER}{KUN}...\p" .string "Well, okay, then. If you want to trade\n" .string "your SCANNER, let me know.$" -SlateportCity_Harbor_Text_1803DD:: @ 81803DD +SlateportCity_Harbor_Text_TradeForDeepSeaTooth:: @ 81803DD .string "CAPT. STERN: So you'll trade it for\n" .string "my DEEPSEATOOTH?$" -SlateportCity_Harbor_Text_180412:: @ 8180412 +SlateportCity_Harbor_Text_TradeForDeepSeaScale:: @ 8180412 .string "CAPT. STERN: So you'll trade it for\n" .string "my DEEPSEASCALE?$" -SlateportCity_Harbor_Text_180447:: @ 8180447 +SlateportCity_Harbor_Text_WhichOneDoYouWant:: @ 8180447 .string "CAPT. STERN: Which one do you want?$" -SlateportCity_Harbor_Text_18046B:: @ 818046B +SlateportCity_Harbor_Text_HandedScannerToStern:: @ 818046B .string "{PLAYER} handed the SCANNER to\n" .string "CAPT. STERN.$" -SlateportCity_Harbor_Text_180491:: @ 8180491 +SlateportCity_Harbor_Text_ThisWillHelpResearch:: @ 8180491 .string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n" .string "This will help our research a lot!$" diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index 44943382d..ca7c6148c 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_House1_EventScript_15567B", + "script": "SlateportCity_NameRatersHouse_EventScript_NameRater", "flag": "0" } ], diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index b5139c129..16632bc80 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -1,72 +1,72 @@ SlateportCity_House1_MapScripts:: @ 815567A .byte 0 -SlateportCity_House1_EventScript_15567B:: @ 815567B +SlateportCity_NameRatersHouse_EventScript_NameRater:: @ 815567B lock faceplayer - msgbox SlateportCity_House1_Text_17D46A, MSGBOX_YESNO + msgbox SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SlateportCity_House1_EventScript_15569C + goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate compare VAR_RESULT, NO - goto_if_eq SlateportCity_House1_EventScript_1556BF + goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate end -SlateportCity_House1_EventScript_15569C:: @ 815569C - msgbox SlateportCity_House1_Text_17D4DB, MSGBOX_DEFAULT +SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate:: @ 815569C + msgbox SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname, MSGBOX_DEFAULT special SelectMonForNPCTrade waitstate compare VAR_0x8004, 255 - goto_if_ne SlateportCity_House1_EventScript_1556C9 + goto_if_ne SlateportCity_NameRatersHouse_EventScript_RateMonNickname compare VAR_0x8004, 255 - goto_if_eq SlateportCity_House1_EventScript_1556BF + goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate end -SlateportCity_House1_EventScript_1556BF:: @ 81556BF - msgbox SlateportCity_House1_Text_17D61E, MSGBOX_DEFAULT +SlateportCity_NameRatersHouse_EventScript_DeclineNameRate:: @ 81556BF + msgbox SlateportCity_NameRatersHouse_Text_DoVisitAgain, MSGBOX_DEFAULT release end -SlateportCity_House1_EventScript_1556C9:: @ 81556C9 +SlateportCity_NameRatersHouse_EventScript_RateMonNickname:: @ 81556C9 specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, SPECIES_EGG - goto_if_eq SlateportCity_House1_EventScript_15571C + goto_if_eq SlateportCity_NameRatersHouse_EventScript_CantRateEgg special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare VAR_RESULT, 1 - goto_if_eq SlateportCity_House1_EventScript_155726 + goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT specialvar VAR_RESULT, MonOTNameMatchesPlayer special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_if_eq SlateportCity_House1_EventScript_155726 - msgbox SlateportCity_House1_Text_17D505, MSGBOX_YESNO + goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT + msgbox SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SlateportCity_House1_EventScript_155730 + goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChangeNickname compare VAR_RESULT, NO - goto_if_eq SlateportCity_House1_EventScript_1556BF + goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate end -SlateportCity_House1_EventScript_15571C:: @ 815571C - msgbox SlateportCity_House1_Text_17D752, MSGBOX_DEFAULT +SlateportCity_NameRatersHouse_EventScript_CantRateEgg:: @ 815571C + msgbox SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg, MSGBOX_DEFAULT release end -SlateportCity_House1_EventScript_155726:: @ 8155726 - msgbox SlateportCity_House1_Text_17D6CC, MSGBOX_DEFAULT +SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT:: @ 8155726 + msgbox SlateportCity_NameRatersHouse_Text_MagnificentName, MSGBOX_DEFAULT release end -SlateportCity_House1_EventScript_155730:: @ 8155730 - msgbox SlateportCity_House1_Text_17D580, MSGBOX_DEFAULT +SlateportCity_NameRatersHouse_EventScript_ChangeNickname:: @ 8155730 + msgbox SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe, MSGBOX_DEFAULT call Common_EventScript_NameReceivedPartyMon specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_if_eq SlateportCity_House1_EventScript_15575A - msgbox SlateportCity_House1_Text_17D63A, MSGBOX_DEFAULT + goto_if_eq SlateportCity_NameRatersHouse_EventScript_NewNameDifferent + msgbox SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior, MSGBOX_DEFAULT release end -SlateportCity_House1_EventScript_15575A:: @ 815575A - msgbox SlateportCity_House1_Text_17D5B0, MSGBOX_DEFAULT +SlateportCity_NameRatersHouse_EventScript_NewNameDifferent:: @ 815575A + msgbox SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_House1/text.inc b/data/maps/SlateportCity_House1/text.inc index 249271333..cc10595da 100644 --- a/data/maps/SlateportCity_House1/text.inc +++ b/data/maps/SlateportCity_House1/text.inc @@ -1,47 +1,47 @@ -SlateportCity_House1_Text_17D46A:: @ 817D46A +SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname:: @ 817D46A .string "Hi, hi! I'm the NAME RATER!\n" .string "I'm the fortune-teller of names!\p" .string "I shall be pleased to rate your\n" .string "POKéMON's nickname.$" -SlateportCity_House1_Text_17D4DB:: @ 817D4DB +SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname:: @ 817D4DB .string "Which POKéMON's nickname should\n" .string "I divine?$" -SlateportCity_House1_Text_17D505:: @ 817D505 +SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne:: @ 817D505 .string "Hmmm... {STR_VAR_1}, is it? That is\n" .string "quite a fine name you bestowed.\p" .string "But! What say you, if I were to\n" .string "suggest a slightly better name?$" -SlateportCity_House1_Text_17D580:: @ 817D580 +SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe:: @ 817D580 .string "Ah, good. Then, what shall the new\n" .string "nickname be?$" -SlateportCity_House1_Text_17D5B0:: @ 817D5B0 +SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName:: @ 817D5B0 .string "Done! From now on, this POKéMON\n" .string "shall be known as {STR_VAR_1}!\p" .string "It is a better name than before!\n" .string "How fortunate for you!$" -SlateportCity_House1_Text_17D61E:: @ 817D61E +SlateportCity_NameRatersHouse_Text_DoVisitAgain:: @ 817D61E .string "I see.\n" .string "Do come visit again.$" -SlateportCity_House1_Text_17D63A:: @ 817D63A +SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior:: @ 817D63A .string "Done! From now on, this POKéMON\n" .string "shall be known as {STR_VAR_1}!\p" .string "It looks no different from before,\n" .string "and yet, this is vastly superior!\l" .string "How fortunate for you!$" -SlateportCity_House1_Text_17D6CC:: @ 817D6CC +SlateportCity_NameRatersHouse_Text_MagnificentName:: @ 817D6CC .string "Hmmm... {STR_VAR_1} it is!\p" .string "This is a magnificent nickname!\n" .string "It is impeccably beyond reproach!\p" .string "You'll do well to cherish your\n" .string "{STR_VAR_1} now and beyond.$" -SlateportCity_House1_Text_17D752:: @ 817D752 +SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg:: @ 817D752 .string "Now, now.\n" .string "That is merely an EGG!$" diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index ab188efca..19a27a119 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_House2_EventScript_156390", + "script": "SlateportCity_House_EventScript_PokefanM", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_House2_EventScript_156399", + "script": "SlateportCity_House_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc index 7c4324b44..5883b0f88 100644 --- a/data/maps/SlateportCity_House2/scripts.inc +++ b/data/maps/SlateportCity_House2/scripts.inc @@ -1,21 +1,21 @@ SlateportCity_House2_MapScripts:: @ 815638F .byte 0 -SlateportCity_House2_EventScript_156390:: @ 8156390 - msgbox SlateportCity_House2_Text_1804CF, MSGBOX_NPC +SlateportCity_House_EventScript_PokefanM:: @ 8156390 + msgbox SlateportCity_House_Text_NatureToDoWithStatGains, MSGBOX_NPC end -SlateportCity_House2_EventScript_156399:: @ 8156399 +SlateportCity_House_EventScript_Girl:: @ 8156399 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 compare VAR_RESULT, 1 - goto_if_eq SlateportCity_House2_EventScript_1563B5 - msgbox SlateportCity_House2_Text_180567, MSGBOX_DEFAULT + goto_if_eq SlateportCity_House_EventScript_HaveContestPass + msgbox SlateportCity_House_Text_NeedContestPass, MSGBOX_DEFAULT release end -SlateportCity_House2_EventScript_1563B5:: @ 81563B5 - msgbox SlateportCity_House2_Text_1805CD, MSGBOX_DEFAULT +SlateportCity_House_EventScript_HaveContestPass:: @ 81563B5 + msgbox SlateportCity_House_Text_HaveContestPass, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_House2/text.inc b/data/maps/SlateportCity_House2/text.inc index 4f17a2f4b..571587be7 100644 --- a/data/maps/SlateportCity_House2/text.inc +++ b/data/maps/SlateportCity_House2/text.inc @@ -1,16 +1,16 @@ -SlateportCity_House2_Text_1804CF:: @ 81804CF +SlateportCity_House_Text_NatureToDoWithStatGains:: @ 81804CF .string "My POKéMON has a HASTY nature.\p" .string "It has higher SPEED compared to my\n" .string "other POKéMON.\p" .string "Maybe their nature has something to\n" .string "do with the stat gains of POKéMON.$" -SlateportCity_House2_Text_180567:: @ 8180567 +SlateportCity_House_Text_NeedContestPass:: @ 8180567 .string "You need a CONTEST PASS to enter a\n" .string "CONTEST.\p" .string "It's easy to get. They give it to\n" .string "anyone who has POKéMON.$" -SlateportCity_House2_Text_1805CD:: @ 81805CD +SlateportCity_House_Text_HaveContestPass:: @ 81805CD .string "Oh, a CONTEST PASS!\n" .string "You're going to be a contestant?$" diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index 4e4841946..9808f21c2 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Mart_EventScript_156411", + "script": "SlateportCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Mart_EventScript_15643E", + "script": "SlateportCity_Mart_EventScript_BlackBelt", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_Mart_EventScript_156447", + "script": "SlateportCity_Mart_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc index 1cadc675b..eff383ee3 100644 --- a/data/maps/SlateportCity_Mart/scripts.inc +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -1,18 +1,18 @@ SlateportCity_Mart_MapScripts:: @ 8156410 .byte 0 -SlateportCity_Mart_EventScript_156411:: @ 8156411 +SlateportCity_Mart_EventScript_Clerk:: @ 8156411 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart SlateportCity_Mart_Items + pokemart SlateportCity_Mart_Pokemart msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -SlateportCity_Mart_Items:: @ 8156428 +SlateportCity_Mart_Pokemart:: @ 8156428 .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_POTION @@ -26,10 +26,10 @@ SlateportCity_Mart_Items:: @ 8156428 release end -SlateportCity_Mart_EventScript_15643E:: @ 815643E - msgbox SlateportCity_Mart_Text_180730, MSGBOX_NPC +SlateportCity_Mart_EventScript_BlackBelt:: @ 815643E + msgbox SlateportCity_Mart_Text_SomeItemsOnlyAtMart, MSGBOX_NPC end -SlateportCity_Mart_EventScript_156447:: @ 8156447 - msgbox SlateportCity_Mart_Text_18079D, MSGBOX_NPC +SlateportCity_Mart_EventScript_Man:: @ 8156447 + msgbox SlateportCity_Mart_Text_GreatBallIsBetter, MSGBOX_NPC end diff --git a/data/maps/SlateportCity_Mart/text.inc b/data/maps/SlateportCity_Mart/text.inc index b5243d406..effa3cba3 100644 --- a/data/maps/SlateportCity_Mart/text.inc +++ b/data/maps/SlateportCity_Mart/text.inc @@ -1,10 +1,10 @@ -SlateportCity_Mart_Text_180730:: @ 8180730 +SlateportCity_Mart_Text_SomeItemsOnlyAtMart:: @ 8180730 .string "The MARKET does have some interesting\n" .string "merchandise.\p" .string "But there are some items you can only\n" .string "get at a POKé MART.$" -SlateportCity_Mart_Text_18079D:: @ 818079D +SlateportCity_Mart_Text_GreatBallIsBetter:: @ 818079D .string "A GREAT BALL is better than a POKé BALL\n" .string "at catching POKéMON.\p" .string "With this, I should be able to get that\n" diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 5ae498eb5..e642ba510 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155ADB", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BA1", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BAA", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155B98", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155B8F", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BB3", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155ADB", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BBC", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6", "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { @@ -125,7 +125,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C16", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C1F", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C28", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C31", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { @@ -177,7 +177,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C3A", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt", "flag": "FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM" }, { @@ -225,7 +225,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155AE4" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft" }, { "type": "trigger", @@ -234,7 +234,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155AF5" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight" } ], "bg_events": [ @@ -244,7 +244,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BC5" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment" }, { "type": "sign", @@ -252,7 +252,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BCE" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment" }, { "type": "sign", @@ -260,7 +260,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BD7" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay" }, { "type": "sign", @@ -268,7 +268,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BE0" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay" }, { "type": "sign", @@ -276,7 +276,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BD7" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay" }, { "type": "sign", @@ -284,7 +284,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BE0" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay" }, { "type": "sign", @@ -292,7 +292,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BE9" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1" }, { "type": "sign", @@ -300,7 +300,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BF2" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2" }, { "type": "sign", @@ -308,7 +308,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155BFB" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3" }, { "type": "sign", @@ -316,7 +316,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C04" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay" }, { "type": "sign", @@ -324,7 +324,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C04" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay" }, { "type": "sign", @@ -332,7 +332,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C0D" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine" }, { "type": "sign", @@ -340,7 +340,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C0D" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine" } ] } diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 921368e14..525dfdab6 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -1,8 +1,8 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OceanicMuseum_1F_MapScript1_155AD0 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OceanicMuseum_1F_MapScript1_OnTransition .byte 0 -SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 +SlateportCity_OceanicMuseum_1F_MapScript1_OnTransition:: @ 8155AD0 .ifdef SAPPHIRE setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_AQUA_MEMBER_F setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M @@ -12,148 +12,148 @@ SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .endif end -SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB - msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant:: @ 8155ADB + msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4 +SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft:: @ 8155AE4 lockall applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 + goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end -SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 +SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight:: @ 8155AF5 lockall applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 + goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end -SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 +SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 8155B06 showmoneybox 0, 0 nop - msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, MSGBOX_YESNO + msgbox SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee closemessage hidemoneybox 0, 0 - applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_155B8D + applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D +SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 8155B2D checkmoney 50, 0 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney removemoney 50, 0 updatemoneybox 0, 0 nop - msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox 0, 0 releaseall end -SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A - goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_155B7B - msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 8155B5A + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway + msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT closemessage hidemoneybox 0, 0 - applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_155B8D + applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B - msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway:: @ 8155B7B + msgbox SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox 0, 0 releaseall end -SlateportCity_OceanicMuseum_1F_Movement_155B8D:: @ 8155B8D +SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter:: @ 8155B8D walk_down step_end -SlateportCity_OceanicMuseum_1F_EventScript_155B8F:: @ 8155B8F - msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1:: @ 8155B8F + msgbox SlateportCity_OceanicMuseum_1F_Text_EvilTeamExistForGoodOfAll, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155B98:: @ 8155B98 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E2E3, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2:: @ 8155B98 + msgbox SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155BA1:: @ 8155BA1 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E338, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3:: @ 8155BA1 + msgbox SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155BAA:: @ 8155BAA - msgbox SlateportCity_OceanicMuseum_1F_Text_17E36F, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4:: @ 8155BAA + msgbox SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155BB3:: @ 8155BB3 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E3A9, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5:: @ 8155BB3 + msgbox SlateportCity_OceanicMuseum_1F_Text_RustboroBungled, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155BBC:: @ 8155BBC - msgbox SlateportCity_OceanicMuseum_1F_Text_17E3ED, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6:: @ 8155BBC + msgbox SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155BC5:: @ 8155BC5 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E6C9, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment:: @ 8155BC5 + msgbox SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155BCE:: @ 8155BCE - msgbox SlateportCity_OceanicMuseum_1F_Text_17E741, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment:: @ 8155BCE + msgbox SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155BD7:: @ 8155BD7 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E7C4, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay:: @ 8155BD7 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155BE0:: @ 8155BE0 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E892, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay:: @ 8155BE0 + msgbox SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155BE9:: @ 8155BE9 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E944, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1:: @ 8155BE9 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155BF2:: @ 8155BF2 - msgbox SlateportCity_OceanicMuseum_1F_Text_17EA19, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2:: @ 8155BF2 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155BFB:: @ 8155BFB - msgbox SlateportCity_OceanicMuseum_1F_Text_17EB0D, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3:: @ 8155BFB + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155C04:: @ 8155C04 - msgbox SlateportCity_OceanicMuseum_1F_Text_17EBBC, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay:: @ 8155C04 + msgbox SlateportCity_OceanicMuseum_1F_Text_FossilDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155C0D:: @ 8155C0D - msgbox SlateportCity_OceanicMuseum_1F_Text_17EC98, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine:: @ 8155C0D + msgbox SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_155C16:: @ 8155C16 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E434, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1:: @ 8155C16 + msgbox SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155C1F:: @ 8155C1F - msgbox SlateportCity_OceanicMuseum_1F_Text_17E477, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2:: @ 8155C1F + msgbox SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155C28:: @ 8155C28 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E4D7, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3:: @ 8155C28 + msgbox SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155C31:: @ 8155C31 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E540, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4:: @ 8155C31 + msgbox SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 8155C3A lock faceplayer delay 8 @@ -162,21 +162,21 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A waitmovement 0 applymovement 13, Common_Movement_Delay48 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis, MSGBOX_DEFAULT giveitem ITEM_TM46_THIEF compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief setflag FLAG_RECEIVED_TM46 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_1F_Text_YouScrewedUpOurPlans, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth compare VAR_FACING, 2 - goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_155CAD + goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth end -SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: @ 8155C98 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM playse SE_EXIT @@ -184,8 +184,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 release end -SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: @ 8155CAD + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM playse SE_EXIT @@ -193,12 +193,12 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD release end -SlateportCity_OceanicMuseum_1F_EventScript_155CC2:: @ 8155CC2 - msgbox SlateportCity_OceanicMuseum_1F_Text_17E695, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief:: @ 8155CC2 + msgbox SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis, MSGBOX_DEFAULT release end -SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC +SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit:: @ 8155CCC face_down walk_fast_down walk_fast_down @@ -207,7 +207,7 @@ SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC delay_8 step_end -SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3 +SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth:: @ 8155CD3 walk_fast_right walk_fast_down walk_fast_down diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/text.inc b/data/maps/SlateportCity_OceanicMuseum_1F/text.inc index 8ae2727f1..689a64a22 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/text.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/text.inc @@ -1,16 +1,16 @@ -SlateportCity_OceanicMuseum_1F_Text_17E18D:: @ 817E18D +SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter:: @ 817E18D .string "Welcome to the OCEANIC MUSEUM.\p" .string "The entrance fee is ¥50.\n" .string "Would you like to enter?$" -SlateportCity_OceanicMuseum_1F_Text_17E1DE:: @ 817E1DE +SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself:: @ 817E1DE .string "Please enjoy yourself.$" -SlateportCity_OceanicMuseum_1F_Text_17E1F5:: @ 817E1F5 +SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney:: @ 817E1F5 .string "Oh? I'm sorry, but you don't seem to\n" .string "have enough money.$" -SlateportCity_OceanicMuseum_1F_Text_17E22D:: @ 817E22D +SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup:: @ 817E22D .string "Oh? You're with that group that\n" .string "went in earlier?\p" .string "You're the only one who's late.\n" @@ -19,53 +19,53 @@ SlateportCity_OceanicMuseum_1F_Text_17E22D:: @ 817E22D UnknownString_817E2A0: @ 817E2A0 .string "Please visit another time!$" -SlateportCity_OceanicMuseum_1F_Text_17E2BB:: @ 817E2BB +SlateportCity_OceanicMuseum_1F_Text_EvilTeamExistForGoodOfAll:: @ 817E2BB .string "We, TEAM {EVIL_TEAM}, exist for the good\n" .string "of all!$" -SlateportCity_OceanicMuseum_1F_Text_17E2E3:: @ 817E2E3 +SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere:: @ 817E2E3 .string "We were told to assemble here, so\n" .string "we did, but...\p" .string "Our BOSS, the lynchpin, isn't here.$" -SlateportCity_OceanicMuseum_1F_Text_17E338:: @ 817E338 +SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich:: @ 817E338 .string "If I ripped off the stuff here,\n" .string "would it make me rich?$" -SlateportCity_OceanicMuseum_1F_Text_17E36F:: @ 817E36F +SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds:: @ 817E36F .string "What I learn here, I can put to use on\n" .string "nefarious deeds...$" -SlateportCity_OceanicMuseum_1F_Text_17E3A9:: @ 817E3A9 +SlateportCity_OceanicMuseum_1F_Text_RustboroBungled:: @ 817E3A9 .string "If our goons didn't bungle things\n" .string "in RUSTBORO, we wouldn't be here!$" -SlateportCity_OceanicMuseum_1F_Text_17E3ED:: @ 817E3ED +SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney:: @ 817E3ED .string "I didn't have ¥50, so it took a long\n" .string "time getting by the receptionist.$" -SlateportCity_OceanicMuseum_1F_Text_17E434:: @ 817E434 +SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling:: @ 817E434 .string "I want to learn about the sea and\n" .string "use that knowledge for battling.$" -SlateportCity_OceanicMuseum_1F_Text_17E477:: @ 817E477 +SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel:: @ 817E477 .string "I get all giddy and gooey when I\n" .string "see the sea!\p" .string "For me, CAPT. STERN is the number\n" .string "one role model!$" -SlateportCity_OceanicMuseum_1F_Text_17E4D7:: @ 817E4D7 +SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow:: @ 817E4D7 .string "The sea is vast without end, and\n" .string "infinitely deep...\p" .string "There must be many POKéMON that we\n" .string "don't know about.$" -SlateportCity_OceanicMuseum_1F_Text_17E540:: @ 817E540 +SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon:: @ 817E540 .string "I want a sea POKéMON.\p" .string "I think it would feel cool and nice\n" .string "to hug.$" -SlateportCity_OceanicMuseum_1F_Text_17E582:: @ 817E582 +SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis:: @ 817E582 .string "Aiyeeeh!\n" .string "What are you doing here?\p" .string "Me? I'm the TEAM {EVIL_TEAM} member you\n" @@ -73,7 +73,7 @@ SlateportCity_OceanicMuseum_1F_Text_17E582:: @ 817E582 .string "Here, take this!\n" .string "You have to forgive me!$" -SlateportCity_OceanicMuseum_1F_Text_17E606:: @ 817E606 +SlateportCity_OceanicMuseum_1F_Text_YouScrewedUpOurPlans:: @ 817E606 .string "Aww, darn it!\n" .string "You so screwed up our plans!\p" .string "I was going to rip off something\n" @@ -81,23 +81,23 @@ SlateportCity_OceanicMuseum_1F_Text_17E606:: @ 817E606 .string "Just you wait!\n" .string "You'll get yours one day!$" -SlateportCity_OceanicMuseum_1F_Text_17E695:: @ 817E695 +SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis:: @ 817E695 .string "Awww, come on!\n" .string "You have to take this and let me go!$" -SlateportCity_OceanicMuseum_1F_Text_17E6C9:: @ 817E6C9 +SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment:: @ 817E6C9 .string "A blue fluid is spiraling inside a\n" .string "glass vessel.\p" .string "“This is an experiment to create a\n" .string "WHIRLPOOL artificially using wind.”$" -SlateportCity_OceanicMuseum_1F_Text_17E741:: @ 817E741 +SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment:: @ 817E741 .string "A red ball is bobbing up and down\n" .string "inside a glass vessel.\p" .string "“This is an experiment simulating a\n" .string "WATERFALL using the ball's buoyancy.”$" -SlateportCity_OceanicMuseum_1F_Text_17E7C4:: @ 817E7C4 +SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay:: @ 817E7C4 .string "It's a sample of soil from the ocean\n" .string "floor.\p" .string "“Over many years, the remains of\n" @@ -106,7 +106,7 @@ SlateportCity_OceanicMuseum_1F_Text_17E7C4:: @ 817E7C4 .string "“By analyzing these layers, the\n" .string "ancient past is revealed.”$" -SlateportCity_OceanicMuseum_1F_Text_17E892:: @ 817E892 +SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay:: @ 817E892 .string "It's a sample of beach sand.\p" .string "“Stones from mountains are washed\n" .string "down by rivers where they are\l" @@ -114,7 +114,7 @@ SlateportCity_OceanicMuseum_1F_Text_17E892:: @ 817E892 .string "“They are reduced to grains and end\n" .string "up as sand on beaches.”$" -SlateportCity_OceanicMuseum_1F_Text_17E944:: @ 817E944 +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1:: @ 817E944 .string "“OCEANIC MINI FACT 1\n" .string "Why is seawater blue?\p" .string "“Light is composed of many colors.\p" @@ -123,7 +123,7 @@ SlateportCity_OceanicMuseum_1F_Text_17E944:: @ 817E944 .string "“However, blue light retains its\n" .string "color, making the sea appear blue.”$" -SlateportCity_OceanicMuseum_1F_Text_17EA19:: @ 817EA19 +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2:: @ 817EA19 .string "“OCEANIC MINI FACT 2\n" .string "Why is the sea salty?\p" .string "“Seawater contains dissolved salt in\n" @@ -133,7 +133,7 @@ SlateportCity_OceanicMuseum_1F_Text_17EA19:: @ 817EA19 .string "“The concentration of dissolved salt\n" .string "makes the sea salty.”$" -SlateportCity_OceanicMuseum_1F_Text_17EB0D:: @ 817EB0D +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3:: @ 817EB0D .string "“OCEANIC MINI FACT 3\n" .string "Which is bigger? The sea or land?\p" .string "“The sea covers about 70% of the\n" @@ -141,7 +141,7 @@ SlateportCity_OceanicMuseum_1F_Text_17EB0D:: @ 817EB0D .string "“The sea is therefore more than twice\n" .string "the size of land.”$" -SlateportCity_OceanicMuseum_1F_Text_17EBBC:: @ 817EBBC +SlateportCity_OceanicMuseum_1F_Text_FossilDisplay:: @ 817EBBC .string "It's a fossil with wavy ridges on it.\p" .string "“Soil on the ocean floor gets scoured\n" .string "by the tide.\p" @@ -150,7 +150,7 @@ SlateportCity_OceanicMuseum_1F_Text_17EBBC:: @ 817EBBC .string "“If this soil becomes fossilized, it is\n" .string "called a ripple mark.”$" -SlateportCity_OceanicMuseum_1F_Text_17EC98:: @ 817EC98 +SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine:: @ 817EC98 .string "A strange machine is rotating under\n" .string "a glass dome.\p" .string "Maybe it's for measuring the depth\n" diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index abcb6f3d8..759ca06a9 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155CE6", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_CaptStern", "flag": "FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F34", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F3D", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F46", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3", "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" } ], @@ -120,7 +120,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155EDA" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1" }, { "type": "sign", @@ -128,7 +128,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155EE3" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2" }, { "type": "sign", @@ -136,7 +136,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F22" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica" }, { "type": "sign", @@ -144,7 +144,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F22" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica" }, { "type": "sign", @@ -152,7 +152,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F19" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica" }, { "type": "sign", @@ -160,7 +160,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F19" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica" }, { "type": "sign", @@ -168,7 +168,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F19" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica" }, { "type": "sign", @@ -176,7 +176,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F10" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" }, { "type": "sign", @@ -184,7 +184,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F10" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" }, { "type": "sign", @@ -192,7 +192,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F2B" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica" }, { "type": "sign", @@ -200,7 +200,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F2B" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica" }, { "type": "sign", @@ -208,7 +208,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F07" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay" }, { "type": "sign", @@ -216,7 +216,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F07" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay" }, { "type": "sign", @@ -224,7 +224,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155EFE" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay" }, { "type": "sign", @@ -232,7 +232,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155EFE" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay" }, { "type": "sign", @@ -240,7 +240,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155EF5" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_HoennModel" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155EF5" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_HoennModel" }, { "type": "sign", @@ -256,7 +256,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155EEC" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment" }, { "type": "sign", @@ -264,7 +264,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155EEC" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment" }, { "type": "sign", @@ -272,7 +272,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F10" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" }, { "type": "sign", @@ -280,7 +280,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F10" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" } ] } diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 5ca2083fa..84ef12339 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -1,71 +1,71 @@ SlateportCity_OceanicMuseum_2F_MapScripts:: @ 8155CDA - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OceanicMuseum_2F_EventScript_OnTransition .byte 0 -SlateportCity_OceanicMuseum_2F_MapScript1_155CE0:: @ 8155CE0 +SlateportCity_OceanicMuseum_2F_EventScript_OnTransition:: @ 8155CE0 call Common_EventScript_SetupEvilTeamGfxIds end -SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 +SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 8155CE6 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts, MSGBOX_DEFAULT closemessage playbgm MUS_EVIL_TEAM, TRUE addobject 3 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter waitmovement 0 addobject 4 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach waitmovement 0 compare VAR_FACING, 1 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts compare VAR_FACING, 4 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 - msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, MSGBOX_DEFAULT + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts + msgbox SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts, MSGBOX_DEFAULT compare VAR_FACING, 4 - call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D - msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, MSGBOX_DEFAULT - msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, MSGBOX_DEFAULT + call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts + msgbox SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_WereEvilTeam, MSGBOX_DEFAULT closemessage - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle waitmovement 0 compare VAR_FACING, 1 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth compare VAR_FACING, 3 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 - trainerbattle_no_intro TRAINER_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Text_17EE4E - msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, MSGBOX_DEFAULT + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest + trainerbattle_no_intro TRAINER_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat + msgbox SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious, MSGBOX_DEFAULT closemessage - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis, MSGBOX_DEFAULT savebgm 0 - trainerbattle_no_intro TRAINER_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Text_17EED6 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF + trainerbattle_no_intro TRAINER_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated waitmovement 0 applymovement 3, Common_Movement_WalkInPlaceFastestDown applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_MeddlingKid, MSGBOX_DEFAULT closemessage delay 35 addobject 2 - applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_EvilLeaderEnter + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForEvilLeader waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, MSGBOX_DEFAULT - applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6 + msgbox SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong, MSGBOX_DEFAULT + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_EvilLeaderApproachPlayer waitmovement 0 .ifdef SAPPHIRE - msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_ArchieWarning, MSGBOX_DEFAULT .else - msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_MaxieWarning, MSGBOX_DEFAULT .endif closemessage fadescreen FADE_TO_BLACK @@ -77,12 +77,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs, MSGBOX_DEFAULT setvar VAR_0x8004, ITEM_DEVON_GOODS call Common_EventScript_PlayerHandedOverTheItem - msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 + applymovement 1, SlateportCity_OceanicMuseum_2F_EventScript_SternLeave waitmovement 0 playse SE_EXIT removeobject 1 @@ -93,33 +93,33 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 release end -SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62 +SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: @ 8155E62 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D +SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: @ 8155E6D applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78 - applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_155E8E +SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth:: @ 8155E78 + applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth waitmovement 0 return -SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83 - applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_155E92 +SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest:: @ 8155E83 + applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest waitmovement 0 return -SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E +SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth:: @ 8155E8E walk_left walk_down walk_in_place_fastest_left step_end -SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92 +SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest:: @ 8155E92 walk_up walk_left walk_left @@ -127,7 +127,7 @@ SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92 walk_in_place_fastest_left step_end -SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98 +SlateportCity_OceanicMuseum_2F_EventScript_SternLeave:: @ 8155E98 walk_up walk_left walk_left @@ -143,11 +143,11 @@ SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98 delay_8 step_end -SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6 +SlateportCity_OceanicMuseum_2F_Movement_EvilLeaderApproachPlayer:: @ 8155EA6 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8 +SlateportCity_OceanicMuseum_2F_Movement_EvilLeaderEnter:: @ 8155EA8 walk_down walk_down walk_down @@ -159,17 +159,17 @@ SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2 +SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle:: @ 8155EB2 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4 +SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter:: @ 8155EB4 walk_down walk_right walk_in_place_fastest_down step_end -SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8 +SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach:: @ 8155EB8 walk_down walk_down walk_down @@ -178,17 +178,17 @@ SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF +SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated:: @ 8155EBF lock_facing_direction walk_left unlock_facing_direction step_end -SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3 +SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter:: @ 8155EC3 walk_down step_end -SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5 +SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach:: @ 8155EC5 walk_down walk_down walk_down @@ -199,7 +199,7 @@ SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE +SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForEvilLeader:: @ 8155ECE delay_16 delay_16 delay_16 @@ -213,58 +213,58 @@ SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE walk_in_place_fastest_up step_end -SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA - msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1:: @ 8155EDA + msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155EE3:: @ 8155EE3 - msgbox SlateportCity_OceanicMuseum_2F_Text_17F5E3, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2:: @ 8155EE3 + msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155EEC:: @ 8155EEC - msgbox SlateportCity_OceanicMuseum_2F_Text_17F653, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment:: @ 8155EEC + msgbox SlateportCity_OceanicMuseum_2F_Text_PressureExperiment, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155EF5:: @ 8155EF5 - msgbox SlateportCity_OceanicMuseum_2F_Text_17F754, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_HoennModel:: @ 8155EF5 + msgbox SlateportCity_OceanicMuseum_2F_Text_HoennModel, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155EFE:: @ 8155EFE - msgbox SlateportCity_OceanicMuseum_2F_Text_17F7BC, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay:: @ 8155EFE + msgbox SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155F07:: @ 8155F07 - msgbox SlateportCity_OceanicMuseum_2F_Text_17F84E, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay:: @ 8155F07 + msgbox SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155F10:: @ 8155F10 - msgbox SlateportCity_OceanicMuseum_2F_Text_17F8BC, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica:: @ 8155F10 + msgbox SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155F19:: @ 8155F19 - msgbox SlateportCity_OceanicMuseum_2F_Text_17F918, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica:: @ 8155F19 + msgbox SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155F22:: @ 8155F22 - msgbox SlateportCity_OceanicMuseum_2F_Text_17F975, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica:: @ 8155F22 + msgbox SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155F2B:: @ 8155F2B - msgbox SlateportCity_OceanicMuseum_2F_Text_17F9C7, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica:: @ 8155F2B + msgbox SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_155F34:: @ 8155F34 - msgbox SlateportCity_OceanicMuseum_2F_Text_17F4B6, MSGBOX_NPC +SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1:: @ 8155F34 + msgbox SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip, MSGBOX_NPC end -SlateportCity_OceanicMuseum_2F_EventScript_155F3D:: @ 8155F3D - msgbox SlateportCity_OceanicMuseum_2F_Text_17F50E, MSGBOX_NPC +SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2:: @ 8155F3D + msgbox SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum, MSGBOX_NPC end -SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46 +SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3:: @ 8155F46 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/text.inc b/data/maps/SlateportCity_OceanicMuseum_2F/text.inc index 8a08ea2b3..91af1df76 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/text.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/text.inc @@ -1,4 +1,4 @@ -SlateportCity_OceanicMuseum_2F_Text_17ECFD:: @ 817ECFD +SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts:: @ 817ECFD .string "Yes? If you're looking for STERN,\n" .string "that would be me.\p" .string "Ah! That must be the part I\n" @@ -6,47 +6,47 @@ SlateportCity_OceanicMuseum_2F_Text_17ECFD:: @ 817ECFD .string "Thank you! That's great!\n" .string "We can prepare for our expedition now.$" -SlateportCity_OceanicMuseum_2F_Text_17EDAE:: @ 817EDAE +SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts:: @ 817EDAE .string "Hehehe, hold it!\n" .string "We'll take those parts!$" -SlateportCity_OceanicMuseum_2F_Text_17EDD7:: @ 817EDD7 +SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou:: @ 817EDD7 .string "CAPT. STERN: Wh-what?\n" .string "Who are you people?$" -SlateportCity_OceanicMuseum_2F_Text_17EE01:: @ 817EE01 +SlateportCity_OceanicMuseum_2F_Text_WereEvilTeam:: @ 817EE01 .string "We're TEAM {EVIL_TEAM}!\p" .string "Our BOSS wants those parts!\n" .string "Shut your yap and fork them over!$" -SlateportCity_OceanicMuseum_2F_Text_17EE4E:: @ 817EE4E +SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat:: @ 817EE4E .string "Awaaaah!\n" .string "A kid beat me!$" -SlateportCity_OceanicMuseum_2F_Text_17EE66:: @ 817EE66 +SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious:: @ 817EE66 .string "Oh, man, what a disaster...\n" .string "The BOSS is going to be furious...$" -SlateportCity_OceanicMuseum_2F_Text_17EEA5:: @ 817EEA5 +SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis:: @ 817EEA5 .string "Humph, sniveling wimp!\n" .string "Let me take care of this!$" -SlateportCity_OceanicMuseum_2F_Text_17EED6:: @ 817EED6 +SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat:: @ 817EED6 .string "What?!\n" .string "I lost, too!$" -SlateportCity_OceanicMuseum_2F_Text_17EEEA:: @ 817EEEA +SlateportCity_OceanicMuseum_2F_Text_MeddlingKid:: @ 817EEEA .string "Now what? If we don't get the parts,\n" .string "we're in for it!\p" .string "Arrgh, I didn't count on being meddled\n" .string "with by some meddling kid!$" -SlateportCity_OceanicMuseum_2F_Text_17EF62:: @ 817EF62 +SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong:: @ 817EF62 .string "I came to see what was taking so\n" .string "long to snatch some parts, and you\l" .string "simps are held up by a mere child?$" -SlateportCity_OceanicMuseum_2F_Text_17EFC9:: @ 817EFC9 +SlateportCity_OceanicMuseum_2F_Text_ArchieWarning:: @ 817EFC9 .string "I am TEAM AQUA's ARCHIE.\p" .string "Tell me, why do you meddle in the\n" .string "noble affairs of TEAM AQUA?\p" @@ -65,7 +65,7 @@ SlateportCity_OceanicMuseum_2F_Text_17EFC9:: @ 817EFC9 .string "Heed my warning!\n" .string "Farewell!$" -SlateportCity_OceanicMuseum_2F_Text_17F17E:: @ 817F17E +SlateportCity_OceanicMuseum_2F_Text_MaxieWarning:: @ 817F17E .string "I am TEAM MAGMA's MAXIE.\p" .string "Why on earth do you feel compelled\n" .string "to mess up TEAM MAGMA's plans?\p" @@ -83,7 +83,7 @@ SlateportCity_OceanicMuseum_2F_Text_17F17E:: @ 817F17E .string "Keep that firmly in mind!\n" .string "Farewell!$" -SlateportCity_OceanicMuseum_2F_Text_17F352:: @ 817F352 +SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs:: @ 817F352 .string "CAPT. STERN: You're...\n" .string "Ah, okay, you're {PLAYER}{KUN}...\p" .string "Anyway, that was a tense situation!\n" @@ -95,39 +95,39 @@ UnknownString_817F404: @ 817F404 .string "{PLAYER} handed over the DEVON GOODS\n" .string "to CAPT. STERN.$" -SlateportCity_OceanicMuseum_2F_Text_17F433:: @ 817F433 +SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo:: @ 817F433 .string "CAPT. STERN: Whoops!\n" .string "There's no time to lose!\p" .string "We have to set out on our ocean floor\n" .string "expedition really soon.\p" .string "Thanks, and excuse me!$" -SlateportCity_OceanicMuseum_2F_Text_17F4B6:: @ 817F4B6 +SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip:: @ 817F4B6 .string "I saw a model of a ship here.\p" .string "It reminded me of the ABANDONED SHIP\n" .string "near DEWFORD TOWN...$" -SlateportCity_OceanicMuseum_2F_Text_17F50E:: @ 817F50E +SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum:: @ 817F50E .string "Don't you dare run around inside\n" .string "the MUSEUM!$" -SlateportCity_OceanicMuseum_2F_Text_17F53B:: @ 817F53B +SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine:: @ 817F53B .string "Wow, the submarine's awesome!\n" .string "I want to go for a ride!$" -SlateportCity_OceanicMuseum_2F_Text_17F572:: @ 817F572 +SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1:: @ 817F572 .string "“KANTO WATER QUALITY SAMPLE,” the\n" .string "label says.\p" .string "The sea is all connected, but the\n" .string "water seems to differ by region.$" -SlateportCity_OceanicMuseum_2F_Text_17F5E3:: @ 817F5E3 +SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2:: @ 817F5E3 .string "“JOHTO WATER QUALITY SAMPLE,” the\n" .string "label says.\p" .string "Maybe the water's saltiness differs\n" .string "from one region to another...$" -SlateportCity_OceanicMuseum_2F_Text_17F653:: @ 817F653 +SlateportCity_OceanicMuseum_2F_Text_PressureExperiment:: @ 817F653 .string "A rubber ball is expanding and shrinking.\p" .string "“In the sea, the weight of water itself\n" .string "exerts pressure.\p" @@ -137,40 +137,40 @@ SlateportCity_OceanicMuseum_2F_Text_17F653:: @ 817F653 .string "the pressure can reach even tens of\l" .string "thousands of tons on a small area.”$" -SlateportCity_OceanicMuseum_2F_Text_17F754:: @ 817F754 +SlateportCity_OceanicMuseum_2F_Text_HoennModel:: @ 817F754 .string "“MODEL OF HOENN REGION”\p" .string "It's a miniature diorama of the\n" .string "HOENN region.\p" .string "Where is LITTLEROOT TOWN on this?$" -SlateportCity_OceanicMuseum_2F_Text_17F7BC:: @ 817F7BC +SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay:: @ 817F7BC .string "It's a display on the flow of seawater.\p" .string "“Near the bottom of the sea, water\n" .string "flows due to differences in such\l" .string "factors as temperature and salinity.”$" -SlateportCity_OceanicMuseum_2F_Text_17F84E:: @ 817F84E +SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay:: @ 817F84E .string "It's a display on the flow of\n" .string "seawater.\p" .string "“Toward the surface, seawater flows\n" .string "as currents driven by the winds.”$" -SlateportCity_OceanicMuseum_2F_Text_17F8BC:: @ 817F8BC +SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica:: @ 817F8BC .string "“THE FERRY S.S. TIDAL\p" .string "“A scale replica of the ship under\n" .string "construction at STERN'S SHIPYARD.”$" -SlateportCity_OceanicMuseum_2F_Text_17F918:: @ 817F918 +SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica:: @ 817F918 .string "“SUBMARINE EXPLORER 1\p" .string "“A replica of the high-performance\n" .string "ocean floor exploration submarine.”$" -SlateportCity_OceanicMuseum_2F_Text_17F975:: @ 817F975 +SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica:: @ 817F975 .string "“SUBMERSIBLE POD\p" .string "“A replica of a compact, unmanned\n" .string "pod for seafloor exploration.”$" -SlateportCity_OceanicMuseum_2F_Text_17F9C7:: @ 817F9C7 +SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica:: @ 817F9C7 .string "“S.S. ANNE\p" .string "“A replica of the luxury liner that\n" .string "circles the globe.”$" diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index 5110f7dac..bccc16164 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_1F_EventScript_1563CE", + "script": "SlateportCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_1F_EventScript_1563DC", + "script": "SlateportCity_PokemonCenter_1F_EventScript_Sailor", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_1F_EventScript_1563E5", + "script": "SlateportCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index a0d401b29..7ba3b957a 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,13 +1,13 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_1563C5 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition .byte 0 -SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 +SlateportCity_PokemonCenter_1F_OnTransition:: @ 81563C5 setrespawn HEAL_LOCATION_SLATEPORT_CITY call Common_EventScript_UpdateBrineyLocation end -SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE +SlateportCity_PokemonCenter_1F_EventScript_Nurse:: @ 81563CE setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,10 +15,10 @@ SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE release end -SlateportCity_PokemonCenter_1F_EventScript_1563DC:: @ 81563DC - msgbox SlateportCity_PokemonCenter_1F_Text_180602, MSGBOX_NPC +SlateportCity_PokemonCenter_1F_EventScript_Sailor:: @ 81563DC + msgbox SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon, MSGBOX_NPC end -SlateportCity_PokemonCenter_1F_EventScript_1563E5:: @ 81563E5 - msgbox SlateportCity_PokemonCenter_1F_Text_1806CB, MSGBOX_NPC +SlateportCity_PokemonCenter_1F_EventScript_Woman:: @ 81563E5 + msgbox SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend, MSGBOX_NPC end diff --git a/data/maps/SlateportCity_PokemonCenter_1F/text.inc b/data/maps/SlateportCity_PokemonCenter_1F/text.inc index cb1d79a8a..245147476 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/text.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -SlateportCity_PokemonCenter_1F_Text_180602:: @ 8180602 +SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon:: @ 8180602 .string "Want a tip for battling?\p" .string "I'd say it's raising different kinds\n" .string "of POKéMON in a balanced manner.\p" @@ -7,7 +7,7 @@ SlateportCity_PokemonCenter_1F_Text_180602:: @ 8180602 .string "If it has a type disadvantage, it\n" .string "might not stand a chance.$" -SlateportCity_PokemonCenter_1F_Text_1806CB:: @ 81806CB +SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend:: @ 81806CB .string "I trade POKéMON with my friends.\p" .string "If a traded POKéMON is holding an\n" .string "item, it makes me twice as happy!$" diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index c00a08617..75a77398b 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_155A7F", + "script": "SlateportCity_PokemonFanClub_EventScript_Man", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_155A88", + "script": "SlateportCity_PokemonFanClub_EventScript_Twin", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_155A15", + "script": "SlateportCity_PokemonFanClub_EventScript_SootheBellWoman", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_15576B", + "script": "SlateportCity_PokemonFanClub_EventScript_Chairman", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_155AA4", + "script": "SlateportCity_PokemonFanClub_EventScript_Zigzagoon", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_155A91", + "script": "SlateportCity_PokemonFanClub_EventScript_Skitty", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_155AB7", + "script": "SlateportCity_PokemonFanClub_EventScript_Azumarill", "flag": "0" } ], diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 04a86af1f..a40e59fb7 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -1,206 +1,206 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8155764 - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonFanClub_MapScript1_15576A + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonFanClub_EventScript_OnTransition .byte 0 -SlateportCity_PokemonFanClub_MapScript1_15576A:: @ 815576A +SlateportCity_PokemonFanClub_EventScript_OnTransition:: @ 815576A end -SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B +SlateportCity_PokemonFanClub_EventScript_Chairman:: @ 815576B lock faceplayer switch VAR_SLATEPORT_FAN_CLUB_STATE - case 0, SlateportCity_PokemonFanClub_EventScript_155795 - case 1, SlateportCity_PokemonFanClub_EventScript_1557A8 - case 2, SlateportCity_PokemonFanClub_EventScript_1557FE + case 0, SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment + case 1, SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon + case 2, SlateportCity_PokemonFanClub_EventScript_NoMoreScarves release end -SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 +SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment:: @ 8155795 setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1 - msgbox SlateportCity_PokemonFanClub_Text_17D773, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_155808 + msgbox SlateportCity_PokemonFanClub_Text_MeetChairman, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon end -SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 +SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon:: @ 81557A8 setvar VAR_TEMP_2, 0 - call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 - call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 - call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 - call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 - call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf + call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf + call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf + call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf + call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf compare VAR_TEMP_2, 5 - call_if_eq SlateportCity_PokemonFanClub_EventScript_15588D + call_if_eq SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE - msgbox SlateportCity_PokemonFanClub_Text_17DA14, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_155808 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoMoreScarves + msgbox SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon end -SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE - msgbox SlateportCity_PokemonFanClub_Text_17DDD5, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_NoMoreScarves:: @ 81557FE + msgbox SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 - msgbox SlateportCity_PokemonFanClub_Text_17DA49, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon:: @ 8155808 + msgbox SlateportCity_PokemonFanClub_Text_HmHmISee, MSGBOX_DEFAULT setvar VAR_TEMP_1, 0 - call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_1559FE - call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_1559E7 - call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_1559D0 - call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_1559B9 - call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_1559A2 + call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonTough + call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonSmart + call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonCute + call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty + call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonCool bufferleadmonspeciesname 0 switch VAR_TEMP_1 - case 0, SlateportCity_PokemonFanClub_EventScript_155899 - case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 - case 2, SlateportCity_PokemonFanClub_EventScript_1558D4 - case 3, SlateportCity_PokemonFanClub_EventScript_155905 - case 4, SlateportCity_PokemonFanClub_EventScript_155936 - case 5, SlateportCity_PokemonFanClub_EventScript_155967 + case 0, SlateportCity_PokemonFanClub_EventScript_NoHighConditions + case 1, SlateportCity_PokemonFanClub_EventScript_GiveRedScarf + case 2, SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf + case 3, SlateportCity_PokemonFanClub_EventScript_GivePinkScarf + case 4, SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf + case 5, SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf release end -SlateportCity_PokemonFanClub_EventScript_15588D:: @ 815588D +SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves:: @ 815588D setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2 return -SlateportCity_PokemonFanClub_EventScript_155893:: @ 8155893 +SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf:: @ 8155893 addvar VAR_TEMP_2, 1 return -SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 - msgbox SlateportCity_PokemonFanClub_Text_17DA5C, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_NoHighConditions:: @ 8155899 + msgbox SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 +SlateportCity_PokemonFanClub_EventScript_GiveRedScarf:: @ 81558A3 checkitemspace ITEM_RED_SCARF, 1 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 - msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_RED_SCARF giveitem ITEM_RED_SCARF - msgbox SlateportCity_PokemonFanClub_Text_17DC1B, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainRedScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 +SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf:: @ 81558D4 checkitemspace ITEM_BLUE_SCARF, 1 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 - msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_BLUE_SCARF giveitem ITEM_BLUE_SCARF - msgbox SlateportCity_PokemonFanClub_Text_17DC74, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainBlueScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 +SlateportCity_PokemonFanClub_EventScript_GivePinkScarf:: @ 8155905 checkitemspace ITEM_PINK_SCARF, 1 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 - msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_PINK_SCARF giveitem ITEM_PINK_SCARF - msgbox SlateportCity_PokemonFanClub_Text_17DCCB, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainPinkScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 +SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf:: @ 8155936 checkitemspace ITEM_GREEN_SCARF, 1 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 - msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_GREEN_SCARF giveitem ITEM_GREEN_SCARF - msgbox SlateportCity_PokemonFanClub_Text_17DD27, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainGreenScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 +SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf:: @ 8155967 checkitemspace ITEM_YELLOW_SCARF, 1 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 - msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT + goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf + msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT setflag FLAG_RECEIVED_YELLOW_SCARF giveitem ITEM_YELLOW_SCARF - msgbox SlateportCity_PokemonFanClub_Text_17DD78, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_ExplainYellowScarf, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 - msgbox SlateportCity_PokemonFanClub_Text_17DB0B, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf:: @ 8155998 + msgbox SlateportCity_PokemonFanClub_Text_NoSpaceForReward, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 +SlateportCity_PokemonFanClub_EventScript_CheckMonCool:: @ 81559A2 specialvar VAR_RESULT, CheckLeadMonCool compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_1559B3 + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCool return -SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 +SlateportCity_PokemonFanClub_EventScript_SetMonCool:: @ 81559B3 setvar VAR_TEMP_1, 1 return -SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 +SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty:: @ 81559B9 specialvar VAR_RESULT, CheckLeadMonBeauty compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_1559CA + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonBeauty return -SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA +SlateportCity_PokemonFanClub_EventScript_SetMonBeauty:: @ 81559CA setvar VAR_TEMP_1, 2 return -SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 +SlateportCity_PokemonFanClub_EventScript_CheckMonCute:: @ 81559D0 specialvar VAR_RESULT, CheckLeadMonCute compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_1559E1 + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCute return -SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 +SlateportCity_PokemonFanClub_EventScript_SetMonCute:: @ 81559E1 setvar VAR_TEMP_1, 3 return -SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 +SlateportCity_PokemonFanClub_EventScript_CheckMonSmart:: @ 81559E7 specialvar VAR_RESULT, CheckLeadMonSmart compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_1559F8 + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonSmart return -SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 +SlateportCity_PokemonFanClub_EventScript_SetMonSmart:: @ 81559F8 setvar VAR_TEMP_1, 4 return -SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE +SlateportCity_PokemonFanClub_EventScript_CheckMonTough:: @ 81559FE specialvar VAR_RESULT, CheckLeadMonTough compare VAR_RESULT, 1 - call_if_eq SlateportCity_PokemonFanClub_EventScript_155A0F + call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonTough return -SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F +SlateportCity_PokemonFanClub_EventScript_SetMonTough:: @ 8155A0F setvar VAR_TEMP_1, 5 return -SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 +SlateportCity_PokemonFanClub_EventScript_SootheBellWoman:: @ 8155A15 lock faceplayer - goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_155A75 - msgbox SlateportCity_PokemonFanClub_Text_17DE6B, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell + msgbox SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if_ge SlateportCity_PokemonFanClub_EventScript_155A3A + goto_if_ge SlateportCity_PokemonFanClub_EventScript_GiveSootheBell release end -SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A +SlateportCity_PokemonFanClub_EventScript_GiveSootheBell:: @ 8155A3A playse SE_PIN applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 - msgbox SlateportCity_PokemonFanClub_Text_17DF57, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_PokemonAdoresYou, MSGBOX_DEFAULT giveitem ITEM_SOOTHE_BELL compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -208,45 +208,45 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A release end -SlateportCity_PokemonFanClub_EventScript_155A75:: @ 8155A75 - msgbox SlateportCity_PokemonFanClub_Text_17DFB8, MSGBOX_DEFAULT +SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell:: @ 8155A75 + msgbox SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove, MSGBOX_DEFAULT release end -SlateportCity_PokemonFanClub_EventScript_155A7F:: @ 8155A7F - msgbox SlateportCity_PokemonFanClub_Text_17E03B, MSGBOX_NPC +SlateportCity_PokemonFanClub_EventScript_Man:: @ 8155A7F + msgbox SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting, MSGBOX_NPC end -SlateportCity_PokemonFanClub_EventScript_155A88:: @ 8155A88 - msgbox SlateportCity_PokemonFanClub_Text_17E0ED, MSGBOX_NPC +SlateportCity_PokemonFanClub_EventScript_Twin:: @ 8155A88 + msgbox SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein, MSGBOX_NPC end -SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 +SlateportCity_PokemonFanClub_EventScript_Skitty:: @ 8155A91 lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox SlateportCity_PokemonFanClub_Text_17E14E, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end -SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 +SlateportCity_PokemonFanClub_EventScript_Zigzagoon:: @ 8155AA4 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox SlateportCity_PokemonFanClub_Text_17E164, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 +SlateportCity_PokemonFanClub_EventScript_Azumarill:: @ 8155AB7 lock faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox SlateportCity_PokemonFanClub_Text_17E178, MSGBOX_DEFAULT + msgbox SlateportCity_PokemonFanClub_Text_Azumarill, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/SlateportCity_PokemonFanClub/text.inc b/data/maps/SlateportCity_PokemonFanClub/text.inc index 742a6ef39..6716bffe1 100644 --- a/data/maps/SlateportCity_PokemonFanClub/text.inc +++ b/data/maps/SlateportCity_PokemonFanClub/text.inc @@ -1,4 +1,4 @@ -SlateportCity_PokemonFanClub_Text_17D773:: @ 817D773 +SlateportCity_PokemonFanClub_Text_MeetChairman:: @ 817D773 .string "Er-hem! I am the CHAIRMAN of the\n" .string "POKéMON FAN CLUB!\p" .string "Being the CHAIRMAN, I am naturally\n" @@ -24,15 +24,15 @@ SlateportCity_PokemonFanClub_Text_17D773:: @ 817D773 .string "Please, do allow me to examine your\n" .string "POKéMON and see how it's grown.$" -SlateportCity_PokemonFanClub_Text_17DA14:: @ 817DA14 +SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing:: @ 817DA14 .string "How is your POKéMON growing?\n" .string "Allow me to examine it.$" -SlateportCity_PokemonFanClub_Text_17DA49:: @ 817DA49 +SlateportCity_PokemonFanClub_Text_HmHmISee:: @ 817DA49 .string "Hm, hm...\n" .string "I see...$" -SlateportCity_PokemonFanClub_Text_17DA5C:: @ 817DA5C +SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks:: @ 817DA5C .string "Hmmm... It's not bad, but it's not\n" .string "good, either...\p" .string "You, the TRAINER, must put more\n" @@ -40,53 +40,53 @@ SlateportCity_PokemonFanClub_Text_17DA5C:: @ 817DA5C .string "For instance, may I suggest that\n" .string "you give it more {POKEBLOCK}S?$" -SlateportCity_PokemonFanClub_Text_17DB0B:: @ 817DB0B +SlateportCity_PokemonFanClub_Text_NoSpaceForReward:: @ 817DB0B .string "Oh, my...\p" .string "Your POKéMON is growing quite well,\n" .string "so you deserve a reward.\p" .string "Unfortunately, you have no space for\n" .string "this in your BAG.$" -SlateportCity_PokemonFanClub_Text_17DB89:: @ 817DB89 +SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis:: @ 817DB89 .string "Your {STR_VAR_1}, it is growing in\n" .string "a most impressive manner!\l" .string "It is one fine specimen!\p" .string "But! If you were to give it this,\n" .string "it would grow even better! Indeed!$" -SlateportCity_PokemonFanClub_Text_17DC1B:: @ 817DC1B +SlateportCity_PokemonFanClub_Text_ExplainRedScarf:: @ 817DC1B .string "Let a POKéMON hold that RED SCARF.\p" .string "Everyone will recognize the coolness\n" .string "of that POKéMON!$" -SlateportCity_PokemonFanClub_Text_17DC74:: @ 817DC74 +SlateportCity_PokemonFanClub_Text_ExplainBlueScarf:: @ 817DC74 .string "Let a POKéMON hold that BLUE SCARF.\p" .string "Its beauty will be accentuated much\n" .string "more than now!$" -SlateportCity_PokemonFanClub_Text_17DCCB:: @ 817DCCB +SlateportCity_PokemonFanClub_Text_ExplainPinkScarf:: @ 817DCCB .string "Let a POKéMON hold that PINK SCARF.\p" .string "It will draw out the cuteness of\n" .string "the POKéMON some more!$" -SlateportCity_PokemonFanClub_Text_17DD27:: @ 817DD27 +SlateportCity_PokemonFanClub_Text_ExplainGreenScarf:: @ 817DD27 .string "Let a POKéMON hold that GREEN SCARF.\p" .string "That will enhance the\n" .string "smartness of POKéMON!$" -SlateportCity_PokemonFanClub_Text_17DD78:: @ 817DD78 +SlateportCity_PokemonFanClub_Text_ExplainYellowScarf:: @ 817DD78 .string "Let a POKéMON hold that YELLOW SCARF.\p" .string "It will bolster your POKéMON's\n" .string "toughness so much more!$" -SlateportCity_PokemonFanClub_Text_17DDD5:: @ 817DDD5 +SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou:: @ 817DDD5 .string "I'm sorry, but I've nothing else to\n" .string "give you! None at all!\p" .string "After all, you're blessed with the gift\n" .string "of raising POKéMON without resorting\l" .string "to any items!$" -SlateportCity_PokemonFanClub_Text_17DE6B:: @ 817DE6B +SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou:: @ 817DE6B .string "I love seeing POKéMON that love\n" .string "their TRAINERS.\p" .string "POKéMON are very sensitive to the\n" @@ -96,18 +96,18 @@ SlateportCity_PokemonFanClub_Text_17DE6B:: @ 817DE6B .string "When your POKéMON grow to love you,\n" .string "please come show me.$" -SlateportCity_PokemonFanClub_Text_17DF57:: @ 817DF57 +SlateportCity_PokemonFanClub_Text_PokemonAdoresYou:: @ 817DF57 .string "Your POKéMON really adores you.\p" .string "For you, a most compassionate\n" .string "TRAINER, a gift from the FAN CLUB!$" -SlateportCity_PokemonFanClub_Text_17DFB8:: @ 817DFB8 +SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove:: @ 817DFB8 .string "POKéMON are very sensitive to the\n" .string "feelings of their TRAINERS.\p" .string "If you treat your POKéMON with love\n" .string "and care, they'll love you back.$" -SlateportCity_PokemonFanClub_Text_17E03B:: @ 817E03B +SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting:: @ 817E03B .string "If you keep letting a POKéMON faint\n" .string "in battle, it'll come to resent it.\p" .string "Soon, it will become less trusting\n" @@ -115,17 +115,17 @@ SlateportCity_PokemonFanClub_Text_17E03B:: @ 817E03B .string "In other words, it certainly won't\n" .string "like you very much.$" -SlateportCity_PokemonFanClub_Text_17E0ED:: @ 817E0ED +SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein:: @ 817E0ED .string "Do POKéMON enjoy having items used\n" .string "on them?\p" .string "Mine acted really happy when I gave\n" .string "it some PROTEIN.$" -SlateportCity_PokemonFanClub_Text_17E14E:: @ 817E14E +SlateportCity_PokemonFanClub_Text_Skitty:: @ 817E14E .string "SKITTY: Fffnyaaaah...$" -SlateportCity_PokemonFanClub_Text_17E164:: @ 817E164 +SlateportCity_PokemonFanClub_Text_Zigzagoon:: @ 817E164 .string "ZIGZAGOON: Kyuuu...$" -SlateportCity_PokemonFanClub_Text_17E178:: @ 817E178 +SlateportCity_PokemonFanClub_Text_Azumarill:: @ 817E178 .string "AZUMARILL: Marimari?$" diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index e1521f88a..490311a98 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_1F_EventScript_155336", + "script": "SlateportCity_SternsShipyard_1F_EventScript_Dock", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_1F_EventScript_1553E3", + "script": "SlateportCity_SternsShipyard_1F_EventScript_Scientist1", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_1F_EventScript_1553EC", + "script": "SlateportCity_SternsShipyard_1F_EventScript_Scientist2", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_1F_EventScript_1553F5", + "script": "SlateportCity_SternsShipyard_1F_EventScript_Briney", "flag": "FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD" } ], diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 083d8e993..10d16faf7 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -1,16 +1,16 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 .byte 0 -SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 +SlateportCity_SternsShipyard_1F_EventScript_Dock:: @ 8155336 lockall - goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_155388 - goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_15539C - goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553CF - goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553B0 - msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_FerryReady + goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined + goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_GoFindStern + msgbox SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails, MSGBOX_DEFAULT applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -19,45 +19,45 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 releaseall end -SlateportCity_SternsShipyard_1F_EventScript_155388:: @ 8155388 +SlateportCity_SternsShipyard_1F_EventScript_FerryReady:: @ 8155388 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_17C472, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_FerryIsReady, MSGBOX_DEFAULT releaseall end -SlateportCity_SternsShipyard_1F_EventScript_15539C:: @ 815539C +SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined:: @ 815539C applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_17C3F7, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs, MSGBOX_DEFAULT releaseall end -SlateportCity_SternsShipyard_1F_EventScript_1553B0:: @ 81553B0 +SlateportCity_SternsShipyard_1F_EventScript_GoFindStern:: @ 81553B0 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -SlateportCity_SternsShipyard_1F_EventScript_1553CF:: @ 81553CF +SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran:: @ 81553CF applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_17C360, MSGBOX_DEFAULT + msgbox SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran, MSGBOX_DEFAULT releaseall end -SlateportCity_SternsShipyard_1F_EventScript_1553E3:: @ 81553E3 - msgbox SlateportCity_SternsShipyard_1F_Text_17C6BB, MSGBOX_NPC +SlateportCity_SternsShipyard_1F_EventScript_Scientist1:: @ 81553E3 + msgbox SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing, MSGBOX_NPC end -SlateportCity_SternsShipyard_1F_EventScript_1553EC:: @ 81553EC - msgbox SlateportCity_SternsShipyard_1F_Text_17C764, MSGBOX_NPC +SlateportCity_SternsShipyard_1F_EventScript_Scientist2:: @ 81553EC + msgbox SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily, MSGBOX_NPC end -SlateportCity_SternsShipyard_1F_EventScript_1553F5:: @ 81553F5 - msgbox SlateportCity_SternsShipyard_1F_Text_17C53D, MSGBOX_NPC +SlateportCity_SternsShipyard_1F_EventScript_Briney:: @ 81553F5 + msgbox SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock, MSGBOX_NPC end diff --git a/data/maps/SlateportCity_SternsShipyard_1F/text.inc b/data/maps/SlateportCity_SternsShipyard_1F/text.inc index cddd2a94e..e47e995cf 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/text.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/text.inc @@ -1,4 +1,4 @@ -SlateportCity_SternsShipyard_1F_Text_17C14B:: @ 817C14B +SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails:: @ 817C14B .string "Umm... If this goes here, and that\n" .string "goes over there...\p" .string "Then where does this thing go?\n" @@ -6,7 +6,7 @@ SlateportCity_SternsShipyard_1F_Text_17C14B:: @ 817C14B .string "Aaargh! I can't make heads or tails\n" .string "of this!$" -SlateportCity_SternsShipyard_1F_Text_17C1EC:: @ 817C1EC +SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern:: @ 817C1EC .string "Hm?\n" .string "Hi, I'm DOCK.\p" .string "CAPT. STERN commissioned me to\n" @@ -20,26 +20,26 @@ SlateportCity_SternsShipyard_1F_Text_17C1EC:: @ 817C1EC .string "Could I get you to go find CAPT.\n" .string "STERN and deliver that to him?$" -SlateportCity_SternsShipyard_1F_Text_17C2F2:: @ 817C2F2 +SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern:: @ 817C2F2 .string "DOCK: Where could CAPT. STERN have\n" .string "gone off to?\p" .string "Could you go find CAPT. STERN and\n" .string "deliver that parcel to him?$" -SlateportCity_SternsShipyard_1F_Text_17C360:: @ 817C360 +SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran:: @ 817C360 .string "DOCK: Shipbuilding is an art.\p" .string "A lot of things can't be figured out\n" .string "just by calculating.\p" .string "I really could use advice from a veteran\n" .string "who knows the seas...$" -SlateportCity_SternsShipyard_1F_Text_17C3F7:: @ 817C3F7 +SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs:: @ 817C3F7 .string "DOCK: Hi! MR. BRINEY's joined us to\n" .string "lend us his help.\p" .string "Thanks to the veteran sailor, the\n" .string "ferry is steadily coming together.$" -SlateportCity_SternsShipyard_1F_Text_17C472:: @ 817C472 +SlateportCity_SternsShipyard_1F_Text_FerryIsReady:: @ 817C472 .string "DOCK: The ferry is finally ready!\p" .string "The new S.S. TIDAL is truly a marvel\n" .string "of technology!\p" @@ -48,7 +48,7 @@ SlateportCity_SternsShipyard_1F_Text_17C472:: @ 817C472 .string "You know, there's never an end to\n" .string "technology's march.$" -SlateportCity_SternsShipyard_1F_Text_17C53D:: @ 817C53D +SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock:: @ 817C53D .string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n" .string "It's been too long!\p" .string "Aye, since I met you, this old seadog's\n" @@ -66,7 +66,7 @@ SlateportCity_SternsShipyard_1F_Text_17C53D:: @ 817C53D UnknownString_817C6A6: @ 817C6A6 .string "PEEKO: Pii piihyoro!$" -SlateportCity_SternsShipyard_1F_Text_17C6BB:: @ 817C6BB +SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing:: @ 817C6BB .string "The seasons, the weather, where the\n" .string "moon sits in the sky...\p" .string "These and other conditions make the\n" @@ -74,6 +74,6 @@ SlateportCity_SternsShipyard_1F_Text_17C6BB:: @ 817C6BB .string "That's right!\n" .string "The sea is like a living thing!$" -SlateportCity_SternsShipyard_1F_Text_17C764:: @ 817C764 +SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily:: @ 817C764 .string "I get seasick real easily.\n" .string "So I get to help out here instead.$" diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index fc8e9815b..cb7b0f40c 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_2F_EventScript_1553FF", + "script": "SlateportCity_SternsShipyard_2F_EventScript_Scientist1", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_SternsShipyard_2F_EventScript_155408", + "script": "SlateportCity_SternsShipyard_2F_EventScript_Scientist2", "flag": "0" } ], diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc index 851a6d324..0af807a9b 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc @@ -1,10 +1,10 @@ SlateportCity_SternsShipyard_2F_MapScripts:: @ 81553FE .byte 0 -SlateportCity_SternsShipyard_2F_EventScript_1553FF:: @ 81553FF - msgbox SlateportCity_SternsShipyard_2F_Text_17C7A2, MSGBOX_NPC +SlateportCity_SternsShipyard_2F_EventScript_Scientist1:: @ 81553FF + msgbox SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding, MSGBOX_NPC end -SlateportCity_SternsShipyard_2F_EventScript_155408:: @ 8155408 - msgbox SlateportCity_SternsShipyard_2F_Text_17C80C, MSGBOX_NPC +SlateportCity_SternsShipyard_2F_EventScript_Scientist2:: @ 8155408 + msgbox SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy, MSGBOX_NPC end diff --git a/data/maps/SlateportCity_SternsShipyard_2F/text.inc b/data/maps/SlateportCity_SternsShipyard_2F/text.inc index 2c32d3390..124411e4c 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/text.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/text.inc @@ -1,9 +1,9 @@ -SlateportCity_SternsShipyard_2F_Text_17C7A2:: @ 817C7A2 +SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding:: @ 817C7A2 .string "Designing a large ship is more like\n" .string "making a big building than putting\l" .string "together a transportation vehicle.$" -SlateportCity_SternsShipyard_2F_Text_17C80C:: @ 817C80C +SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy:: @ 817C80C .string "Don't you think it's strange that a\n" .string "ship made of heavy iron floats?\p" .string "It floats because of a principle\n" diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 2b97319bc..61c648b30 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D18D", + "script": "SootopolisCity_EventScript_CaveEntranceWoman1", "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D196", + "script": "SootopolisCity_EventScript_CaveEntranceWoman2", "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D16E", + "script": "SootopolisCity_EventScript_CaveOfOriginExpert", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D268", + "script": "SootopolisCity_EventScript_Woman2", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D48F", + "script": "SootopolisCity_EventScript_YouMustGoWithOrb", "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D19F", + "script": "SootopolisCity_EventScript_KiriGiveBerry", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D2C5", + "script": "SootopolisCity_EventScript_Boy1", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { @@ -112,7 +112,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D2E4", + "script": "SootopolisCity_EventScript_Boy1Normal", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { @@ -125,7 +125,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D287", + "script": "SootopolisCity_EventScript_Man1", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { @@ -138,7 +138,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D498", + "script": "SootopolisCity_EventScript_YoullBeOkay", "flag": "FLAG_HIDE_STEVEN_SOOTOPOLIS" }, { @@ -151,7 +151,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_EventScript_14D2A6", + "script": "SootopolisCity_EventScript_Woman1", "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" } ], @@ -249,7 +249,7 @@ "elevation": 3, "var": "VAR_SOOTOPOLIS_STATE", "var_value": "1", - "script": "SootopolisCity_EventScript_14D308" + "script": "SootopolisCity_EventScript_LeadPlayerCaveOfOrigin" } ], "bg_events": [ @@ -259,7 +259,7 @@ "y": 34, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SootopolisCity_EventScript_14D2ED" + "script": "SootopolisCity_EventScript_GymSign" }, { "type": "sign", @@ -299,7 +299,7 @@ "y": 37, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SootopolisCity_EventScript_14D2F6" + "script": "SootopolisCity_EventScript_CitySign" } ] } diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 556391c0b..96093a180 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1,24 +1,24 @@ SootopolisCity_MapScripts:: @ 814D07D - map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_14D08D - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_14D10D - map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_14D165 + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_OnResume .byte 0 -SootopolisCity_MapScript1_14D08D:: @ 814D08D - call_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0A0 - call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0B1 +SootopolisCity_OnLoad:: @ 814D08D + call_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_ExpertBlockCaveOfOrigin + call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_WeatherEventDoorsLocked end -SootopolisCity_EventScript_14D0A0:: @ 814D0A0 +SootopolisCity_EventScript_ExpertBlockCaveOfOrigin:: @ 814D0A0 setobjectxyperm 3, 31, 18 setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1 return -SootopolisCity_EventScript_14D0B1:: @ 814D0B1 - call_if_unset FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D0BB +SootopolisCity_EventScript_WeatherEventDoorsLocked:: @ 814D0B1 + call_if_unset FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_LockCityDoors return -SootopolisCity_EventScript_14D0BB:: @ 814D0BB +SootopolisCity_EventScript_LockCityDoors:: @ 814D0BB setmetatile 9, 6, METATILE_Sootopolis_Door_Closed, 1 setmetatile 9, 17, METATILE_Sootopolis_Door_Closed, 1 setmetatile 9, 26, METATILE_Sootopolis_Door_Closed, 1 @@ -30,64 +30,64 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1 return -SootopolisCity_MapScript1_14D10D:: @ 814D10D +SootopolisCity_OnTransition:: @ 814D10D setflag FLAG_VISITED_SOOTOPOLIS_CITY - call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D159 - call_if_set FLAG_SYS_WEATHER_CTRL, SootopolisCity_EventScript_14D123 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_SetStevenOutsideGymPostLegendary + call_if_set FLAG_SYS_WEATHER_CTRL, SootopolisCity_EventScript_SetWeather end -SootopolisCity_EventScript_14D123:: @ 814D123 +SootopolisCity_EventScript_SetWeather:: @ 814D123 call Common_EventScript_SetLegendaryWeather setobjectxyperm 1, 29, 19 setobjectxyperm 2, 33, 19 compare VAR_SOOTOPOLIS_STATE, 1 - call_if_eq SootopolisCity_EventScript_14D142 + call_if_eq SootopolisCity_EventScript_SetStevenWallaceInitialPositions return -SootopolisCity_EventScript_14D142:: @ 814D142 +SootopolisCity_EventScript_SetStevenWallaceInitialPositions:: @ 814D142 setobjectxyperm 10, 29, 6 setobjectmovementtype 10, 10 setobjectxyperm 5, 30, 6 setobjectmovementtype 5, 9 return -SootopolisCity_EventScript_14D159:: @ 814D159 +SootopolisCity_EventScript_SetStevenOutsideGymPostLegendary:: @ 814D159 setobjectxyperm 10, 31, 33 setobjectmovementtype 10, 8 return -SootopolisCity_MapScript1_14D165:: @ 814D165 +SootopolisCity_OnResume:: @ 814D165 setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 end -SootopolisCity_EventScript_14D16E:: @ 814D16E +SootopolisCity_EventScript_CaveOfOriginExpert:: @ 814D16E lock faceplayer - goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D183 - msgbox SootopolisCity_Text_1696A4, MSGBOX_DEFAULT + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_CaveOfOriginExpertPostLegendary + msgbox SootopolisCity_Text_CaveOfOriginPleaseLeave, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D183:: @ 814D183 - msgbox SootopolisCity_Text_16A455, MSGBOX_DEFAULT +SootopolisCity_EventScript_CaveOfOriginExpertPostLegendary:: @ 814D183 + msgbox SootopolisCity_Text_AllLifeStartsAtTheCave, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D18D:: @ 814D18D - msgbox SootopolisCity_Text_16A2B2, MSGBOX_NPC +SootopolisCity_EventScript_CaveEntranceWoman1:: @ 814D18D + msgbox SootopolisCity_Text_TheLegendWasTrue, MSGBOX_NPC end -SootopolisCity_EventScript_14D196:: @ 814D196 - msgbox SootopolisCity_Text_16A2FB, MSGBOX_NPC +SootopolisCity_EventScript_CaveEntranceWoman2:: @ 814D196 + msgbox SootopolisCity_Text_NaturalBalanceIsShifting, MSGBOX_NPC end -SootopolisCity_EventScript_14D19F:: @ 814D19F +SootopolisCity_EventScript_KiriGiveBerry:: @ 814D19F lock faceplayer dotimebasedevents special GetPlayerBigGuyGirlString - goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241 - msgbox SootopolisCity_Text_1C63F2, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_KiriReceivedBerry + msgbox SootopolisCity_Text_NameIsKiriHaveOneOfThese, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, ITEM_CHERI_BERRY @@ -95,112 +95,112 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS - msgbox SootopolisCity_Text_1C64D0, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_GiveYouThisBerryToo, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_EventScript_14D1FF + goto_if_eq SootopolisCity_EventScript_GiveFigyBerry compare VAR_RESULT, 1 - goto_if_eq SootopolisCity_EventScript_14D220 + goto_if_eq SootopolisCity_EventScript_GiveIapapaBerry end -SootopolisCity_EventScript_14D1FF:: @ 814D1FF +SootopolisCity_EventScript_GiveFigyBerry:: @ 814D1FF giveitem ITEM_FIGY_BERRY compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox SootopolisCity_Text_1C650B, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D220:: @ 814D220 +SootopolisCity_EventScript_GiveIapapaBerry:: @ 814D220 giveitem ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox SootopolisCity_Text_1C650B, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D241:: @ 814D241 - msgbox SootopolisCity_Text_1C6540, MSGBOX_YESNO +SootopolisCity_EventScript_KiriReceivedBerry:: @ 814D241 + msgbox SootopolisCity_Text_KiriBornInSeasons, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SootopolisCity_EventScript_14D25E - msgbox SootopolisCity_Text_1C6626, MSGBOX_DEFAULT + goto_if_eq SootopolisCity_EventScript_KiriLikeSeasonBornIn + msgbox SootopolisCity_Text_OhDoesntMatter, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D25E:: @ 814D25E - msgbox SootopolisCity_Text_1C65D4, MSGBOX_DEFAULT +SootopolisCity_EventScript_KiriLikeSeasonBornIn:: @ 814D25E + msgbox SootopolisCity_Text_ThenILoveAutumn, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D268:: @ 814D268 +SootopolisCity_EventScript_Woman2:: @ 814D268 lock faceplayer - goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_14D27D - msgbox SootopolisCity_Text_16A4D6, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_Woman2PostGym + msgbox SootopolisCity_Text_YoureGoingToChallengeWallace, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D27D:: @ 814D27D - msgbox SootopolisCity_Text_16A531, MSGBOX_DEFAULT +SootopolisCity_EventScript_Woman2PostGym:: @ 814D27D + msgbox SootopolisCity_Text_BecomeYourFan, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D287:: @ 814D287 +SootopolisCity_EventScript_Man1:: @ 814D287 lock faceplayer - goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D29C - msgbox SootopolisCity_Text_169813, MSGBOX_DEFAULT + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_Man1PostLegendary + msgbox SootopolisCity_Text_NoOrdinaryTourist1, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D29C:: @ 814D29C - msgbox SootopolisCity_Text_16A587, MSGBOX_DEFAULT +SootopolisCity_EventScript_Man1PostLegendary:: @ 814D29C + msgbox SootopolisCity_Text_NoOrdinaryTourist2, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D2A6:: @ 814D2A6 +SootopolisCity_EventScript_Woman1:: @ 814D2A6 lock faceplayer - goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2BB - msgbox SootopolisCity_Text_1698A0, MSGBOX_DEFAULT + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_Woman1PostLegendary + msgbox SootopolisCity_Text_SootopolisSkyBeautiful, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D2BB:: @ 814D2BB - msgbox SootopolisCity_Text_16A614, MSGBOX_DEFAULT +SootopolisCity_EventScript_Woman1PostLegendary:: @ 814D2BB + msgbox SootopolisCity_Text_NightSkyFavoriteScenery, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D2C5:: @ 814D2C5 +SootopolisCity_EventScript_Boy1:: @ 814D2C5 lock faceplayer - goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2DA - msgbox SootopolisCity_Text_1697A7, MSGBOX_DEFAULT + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_Boy1PostLegendary + msgbox SootopolisCity_Text_WonderWhatWorldIsLike, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D2DA:: @ 814D2DA - msgbox SootopolisCity_Text_16A6AE, MSGBOX_DEFAULT +SootopolisCity_EventScript_Boy1PostLegendary:: @ 814D2DA + msgbox SootopolisCity_Text_WhereIsMyHouse, MSGBOX_DEFAULT release end -SootopolisCity_EventScript_14D2E4:: @ 814D2E4 - msgbox SootopolisCity_Text_16972B, MSGBOX_NPC +SootopolisCity_EventScript_Boy1Normal:: @ 814D2E4 + msgbox SootopolisCity_Text_PhysicallyFitLivingHere, MSGBOX_NPC end -SootopolisCity_EventScript_14D2ED:: @ 814D2ED - msgbox SootopolisCity_Text_16A6C7, MSGBOX_SIGN +SootopolisCity_EventScript_GymSign:: @ 814D2ED + msgbox SootopolisCity_Text_GymSign, MSGBOX_SIGN end -SootopolisCity_EventScript_14D2F6:: @ 814D2F6 - msgbox SootopolisCity_Text_16A711, MSGBOX_SIGN +SootopolisCity_EventScript_CitySign:: @ 814D2F6 + msgbox SootopolisCity_Text_CitySign, MSGBOX_SIGN end ClosedSootopolisDoorScript:: @ 814D2FF msgbox ClosedSootopolisDoorText, MSGBOX_SIGN end -SootopolisCity_EventScript_14D308:: @ 814D308 +SootopolisCity_EventScript_LeadPlayerCaveOfOrigin:: @ 814D308 lockall applymovement 10, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight @@ -210,21 +210,21 @@ SootopolisCity_EventScript_14D308:: @ 814D308 waitmovement 0 applymovement 10, Common_Movement_Delay48 waitmovement 0 - applymovement 10, SootopolisCity_Movement_14D413 + applymovement 10, SootopolisCity_EventScript_StevenApproachYouCameToo waitmovement 0 .ifdef SAPPHIRE - msgbox SootopolisCity_Text_169988, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_YouCameInRainstorm, MSGBOX_DEFAULT .else - msgbox SootopolisCity_Text_169E0F, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_YouCameInScorchingSun, MSGBOX_DEFAULT .endif closemessage - applymovement 10, SootopolisCity_Movement_14D417 - applymovement LOCALID_PLAYER, SootopolisCity_Movement_14D440 + applymovement 10, SootopolisCity_EventScript_StevenLeadPlayerToWallace + applymovement LOCALID_PLAYER, SootopolisCity_EventScript_PlayerFollowStevenToWallace waitmovement 10 .ifdef SAPPHIRE - msgbox SootopolisCity_Text_1699FD, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_MyNameIsWallaceDownpour, MSGBOX_DEFAULT .else - msgbox SootopolisCity_Text_169E82, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_MyNameIsWallaceSunshine, MSGBOX_DEFAULT .endif playse SE_PIN applymovement 5, Common_Movement_ExclamationMark @@ -232,15 +232,15 @@ SootopolisCity_EventScript_14D308:: @ 814D308 applymovement 5, Common_Movement_Delay48 waitmovement 0 .ifdef SAPPHIRE - msgbox SootopolisCity_Text_169AB7, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_ThatIsTheBlueOrb, MSGBOX_DEFAULT .else - msgbox SootopolisCity_Text_169F3C, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_ThatIsTheRedOrb, MSGBOX_DEFAULT .endif closemessage delay 30 - applymovement 5, SootopolisCity_Movement_14D46A - applymovement 10, SootopolisCity_Movement_14D41D - applymovement LOCALID_PLAYER, SootopolisCity_Movement_14D445 + applymovement 5, SootopolisCity_EventScript_WallaceStartLeadPlayerToCave + applymovement 10, SootopolisCity_EventScript_StevenStartFollowPlayerToCave + applymovement LOCALID_PLAYER, SootopolisCity_EventScript_PlayerStartFollowWallaceToCave waitmovement 0 applymovement 5, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight @@ -249,29 +249,29 @@ SootopolisCity_EventScript_14D308:: @ 814D308 applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 .ifdef SAPPHIRE - msgbox SootopolisCity_Text_169AE7, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_PeopleNeedRainToLive, MSGBOX_DEFAULT .else - msgbox SootopolisCity_Text_169F6B, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_PeopleNeedSunlightToLive, MSGBOX_DEFAULT .endif closemessage delay 30 - applymovement 5, SootopolisCity_Movement_14D47C - applymovement LOCALID_PLAYER, SootopolisCity_Movement_14D457 - applymovement 10, SootopolisCity_Movement_14D42D + applymovement 5, SootopolisCity_EventScript_WallaceContinueLeadPlayerToCave + applymovement LOCALID_PLAYER, SootopolisCity_EventScript_PlayerContinueFollowWallaceToCave + applymovement 10, SootopolisCity_EventScript_StevenContinueFollowPlayerToCave waitmovement 0 applymovement 5, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE - msgbox SootopolisCity_Text_169BC7, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_CaveOfOriginWithBlueOrb, MSGBOX_DEFAULT .else - msgbox SootopolisCity_Text_16A06C, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_CaveOfOriginWithRedOrb, MSGBOX_DEFAULT .endif applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE - msgbox SootopolisCity_Text_169C99, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_NeverExpectedHoldingBlueOrb, MSGBOX_DEFAULT .else - msgbox SootopolisCity_Text_16A13E, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_NeverExpectedHoldingRedOrb, MSGBOX_DEFAULT .endif moveobjectoffscreen 5 setobjectmovementtype 5, 9 @@ -281,13 +281,13 @@ SootopolisCity_EventScript_14D308:: @ 814D308 releaseall end -SootopolisCity_Movement_14D413:: @ 814D413 +SootopolisCity_EventScript_StevenApproachYouCameToo:: @ 814D413 walk_left walk_left walk_left step_end -SootopolisCity_Movement_14D417:: @ 814D417 +SootopolisCity_EventScript_StevenLeadPlayerToWallace:: @ 814D417 walk_right walk_right walk_right @@ -295,7 +295,7 @@ SootopolisCity_Movement_14D417:: @ 814D417 walk_in_place_fastest_down step_end -SootopolisCity_Movement_14D41D:: @ 814D41D +SootopolisCity_EventScript_StevenStartFollowPlayerToCave:: @ 814D41D walk_down walk_right walk_down @@ -313,7 +313,7 @@ SootopolisCity_Movement_14D41D:: @ 814D41D walk_left step_end -SootopolisCity_Movement_14D42D:: @ 814D42D +SootopolisCity_EventScript_StevenContinueFollowPlayerToCave:: @ 814D42D walk_left walk_left walk_left @@ -334,14 +334,14 @@ SootopolisCity_Movement_14D42D:: @ 814D42D walk_right step_end -SootopolisCity_Movement_14D440:: @ 814D440 +SootopolisCity_EventScript_PlayerFollowStevenToWallace:: @ 814D440 walk_right walk_right walk_right walk_right step_end -SootopolisCity_Movement_14D445:: @ 814D445 +SootopolisCity_EventScript_PlayerStartFollowWallaceToCave:: @ 814D445 walk_right walk_down walk_down @@ -361,7 +361,7 @@ SootopolisCity_Movement_14D445:: @ 814D445 walk_left step_end -SootopolisCity_Movement_14D457:: @ 814D457 +SootopolisCity_EventScript_PlayerContinueFollowWallaceToCave:: @ 814D457 delay_16 delay_16 walk_left @@ -382,7 +382,7 @@ SootopolisCity_Movement_14D457:: @ 814D457 walk_right step_end -SootopolisCity_Movement_14D46A:: @ 814D46A +SootopolisCity_EventScript_WallaceStartLeadPlayerToCave:: @ 814D46A walk_down walk_down walk_down @@ -402,7 +402,7 @@ SootopolisCity_Movement_14D46A:: @ 814D46A walk_left step_end -SootopolisCity_Movement_14D47C:: @ 814D47C +SootopolisCity_EventScript_WallaceContinueLeadPlayerToCave:: @ 814D47C delay_16 delay_16 walk_left @@ -423,28 +423,28 @@ SootopolisCity_Movement_14D47C:: @ 814D47C walk_right step_end -SootopolisCity_EventScript_14D48F:: @ 814D48F +SootopolisCity_EventScript_YouMustGoWithOrb:: @ 814D48F .ifdef SAPPHIRE - msgbox SootopolisCity_Text_169D37, MSGBOX_NPC + msgbox SootopolisCity_Text_YouMustGoWithBlueOrb, MSGBOX_NPC .else - msgbox SootopolisCity_Text_16A1DB, MSGBOX_NPC + msgbox SootopolisCity_Text_YouMustGoWithRedOrb, MSGBOX_NPC .endif end -SootopolisCity_EventScript_14D498:: @ 814D498 +SootopolisCity_EventScript_YoullBeOkay:: @ 814D498 lock faceplayer goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE - msgbox SootopolisCity_Text_169DA6, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_YoullBeOkaySapphire, MSGBOX_DEFAULT .else - msgbox SootopolisCity_Text_16A249, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_YoullBeOkayRuby, MSGBOX_DEFAULT .endif release end SootopolisCity_EventScript_14D4AD:: @ 814D4AD - msgbox SootopolisCity_Text_16A33E, MSGBOX_DEFAULT + msgbox SootopolisCity_Text_WeOweItAllToYou, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 diff --git a/data/maps/SootopolisCity/text.inc b/data/maps/SootopolisCity/text.inc index 6a804bc24..ca6fe5872 100644 --- a/data/maps/SootopolisCity/text.inc +++ b/data/maps/SootopolisCity/text.inc @@ -1,32 +1,32 @@ ClosedSootopolisDoorText: @ 8169690 .string "The door is closed.$" -SootopolisCity_Text_1696A4:: @ 81696A4 +SootopolisCity_Text_CaveOfOriginPleaseLeave:: @ 81696A4 .string "Who might you be?\p" .string "This is the CAVE OF ORIGIN.\p" .string "The spirits of POKéMON, becalmed at\n" .string "MT. PYRE, are said to be revived here.\p" .string "Please leave.$" -SootopolisCity_Text_16972B:: @ 816972B +SootopolisCity_Text_PhysicallyFitLivingHere:: @ 816972B .string "Diving in the sea. Climbing up and\n" .string "down stairs all the time...\p" .string "If you live in this town, you end up\n" .string "getting physically fit.$" -SootopolisCity_Text_1697A7:: @ 81697A7 +SootopolisCity_Text_WonderWhatWorldIsLike:: @ 81697A7 .string "I... I've never been out of this city.\p" .string "I wonder what the world is like on the\n" .string "other side of this round sky?$" -SootopolisCity_Text_169813:: @ 8169813 +SootopolisCity_Text_NoOrdinaryTourist1:: @ 8169813 .string "Hm!\n" .string "You've come all the way to SOOTOPOLIS?\l" .string "You're no ordinary tourist.\p" .string "But I suppose that doesn't make you an\n" .string "extraordinary tourist, either.$" -SootopolisCity_Text_1698A0:: @ 81698A0 +SootopolisCity_Text_SootopolisSkyBeautiful:: @ 81698A0 .string "SOOTOPOLIS sprang up as a town in the\n" .string "crater of a volcano.\p" .string "If you look up at the sky, the lip of\n" @@ -35,13 +35,13 @@ SootopolisCity_Text_1698A0:: @ 81698A0 .string "But that's what makes the sky above\n" .string "SOOTOPOLIS the most beautiful.$" -SootopolisCity_Text_169988:: @ 8169988 +SootopolisCity_Text_YouCameInRainstorm:: @ 8169988 .string "STEVEN: {PLAYER}{KUN}, you came, too?\n" .string "In this terrible rainstorm, yet...\p" .string "Oh, yes, can you hear out what my\n" .string "friend has to say?$" -SootopolisCity_Text_1699FD:: @ 81699FD +SootopolisCity_Text_MyNameIsWallaceDownpour:: @ 81699FD .string "My name is WALLACE.\n" .string "I'm this town's GYM LEADER.\p" .string "I've also been entrusted with the\n" @@ -49,12 +49,12 @@ SootopolisCity_Text_1699FD:: @ 81699FD .string "This downpour is caused by a power\n" .string "emanating from the CAVE OF ORIGIN.$" -SootopolisCity_Text_169AB7:: @ 8169AB7 +SootopolisCity_Text_ThatIsTheBlueOrb:: @ 8169AB7 .string "That... That is the BLUE ORB.\p" .string "I see.\n" .string "Follow me.$" -SootopolisCity_Text_169AE7:: @ 8169AE7 +SootopolisCity_Text_PeopleNeedRainToLive:: @ 8169AE7 .string "STEVEN: This rain...\p" .string "People and POKéMON need water to live...\p" .string "But why does this rain fill us with\n" @@ -64,7 +64,7 @@ SootopolisCity_Text_169AE7:: @ 8169AE7 .string "over HOENN...\p" .string "If that were to happen...$" -SootopolisCity_Text_169BC7:: @ 8169BC7 +SootopolisCity_Text_CaveOfOriginWithBlueOrb:: @ 8169BC7 .string "WALLACE: The CAVE OF ORIGIN is ahead.\p" .string "No one from SOOTOPOLIS is permitted\n" .string "to enter the CAVE OF ORIGIN.\p" @@ -73,32 +73,32 @@ SootopolisCity_Text_169BC7:: @ 8169BC7 .string "You must go regardless of what awaits\n" .string "you inside the CAVE...$" -SootopolisCity_Text_169C99:: @ 8169C99 +SootopolisCity_Text_NeverExpectedHoldingBlueOrb:: @ 8169C99 .string "STEVEN: {PLAYER}{KUN}, I never expected you\n" .string "to be holding the BLUE ORB.\p" .string "You'll be okay. With your POKéMON,\n" .string "you'll get things done no matter what.\p" .string "I'm convinced of it!$" -SootopolisCity_Text_169D37:: @ 8169D37 +SootopolisCity_Text_YouMustGoWithBlueOrb:: @ 8169D37 .string "WALLACE: You must go together with\n" .string "your BLUE ORB.\p" .string "You must go regardless of what awaits\n" .string "you inside the CAVE...$" -SootopolisCity_Text_169DA6:: @ 8169DA6 +SootopolisCity_Text_YoullBeOkaySapphire:: @ 8169DA6 .string "STEVEN: You'll be okay. With your\n" .string "POKéMON, you'll get things done\l" .string "whatever happens.\p" .string "I'm convinced of it!$" -SootopolisCity_Text_169E0F:: @ 8169E0F +SootopolisCity_Text_YouCameInScorchingSun:: @ 8169E0F .string "STEVEN: {PLAYER}{KUN}, you came, too?\n" .string "Under this scorching sun, yet...\p" .string "Oh, yes, can you hear out what my\n" .string "friend has to say?$" -SootopolisCity_Text_169E82:: @ 8169E82 +SootopolisCity_Text_MyNameIsWallaceSunshine:: @ 8169E82 .string "My name is WALLACE.\n" .string "I'm this town's GYM LEADER.\p" .string "I've also been entrusted with the\n" @@ -106,12 +106,12 @@ SootopolisCity_Text_169E82:: @ 8169E82 .string "This sunshine is caused by a power\n" .string "emanating from the CAVE OF ORIGIN.$" -SootopolisCity_Text_169F3C:: @ 8169F3C +SootopolisCity_Text_ThatIsTheRedOrb:: @ 8169F3C .string "That... That is the RED ORB.\p" .string "I see.\n" .string "Follow me.$" -SootopolisCity_Text_169F6B:: @ 8169F6B +SootopolisCity_Text_PeopleNeedSunlightToLive:: @ 8169F6B .string "STEVEN: This sunlight...\p" .string "People and POKéMON need sunlight\n" .string "to live...\p" @@ -122,7 +122,7 @@ SootopolisCity_Text_169F6B:: @ 8169F6B .string "will be under its withering glare...\p" .string "If that were to happen...$" -SootopolisCity_Text_16A06C:: @ 816A06C +SootopolisCity_Text_CaveOfOriginWithRedOrb:: @ 816A06C .string "WALLACE: The CAVE OF ORIGIN is ahead.\p" .string "No one from SOOTOPOLIS is permitted\n" .string "to enter the CAVE OF ORIGIN.\p" @@ -131,34 +131,34 @@ SootopolisCity_Text_16A06C:: @ 816A06C .string "You must go regardless of what awaits\n" .string "you inside the CAVE...$" -SootopolisCity_Text_16A13E:: @ 816A13E +SootopolisCity_Text_NeverExpectedHoldingRedOrb:: @ 816A13E .string "STEVEN: {PLAYER}{KUN}, I never expected you\n" .string "to be holding the RED ORB.\p" .string "You'll be okay. With your POKéMON,\n" .string "you'll get things done no matter what.\p" .string "I'm convinced of it!$" -SootopolisCity_Text_16A1DB:: @ 816A1DB +SootopolisCity_Text_YouMustGoWithRedOrb:: @ 816A1DB .string "WALLACE: You must go together with\n" .string "your RED ORB.\p" .string "You must go regardless of what awaits\n" .string "you inside the CAVE...$" -SootopolisCity_Text_16A249:: @ 816A249 +SootopolisCity_Text_YoullBeOkayRuby:: @ 816A249 .string "STEVEN: You'll be okay. With your\n" .string "POKéMON, you'll get things done\l" .string "whatever happens.\p" .string "I'm convinced of it!$" -SootopolisCity_Text_16A2B2:: @ 816A2B2 +SootopolisCity_Text_TheLegendWasTrue:: @ 816A2B2 .string "The legend told by the old man on\n" .string "MT. PYRE... It wasn't a made-up story.$" -SootopolisCity_Text_16A2FB:: @ 816A2FB +SootopolisCity_Text_NaturalBalanceIsShifting:: @ 816A2FB .string "The natural balance of HOENN is going\n" .string "through a wrenching shift...$" -SootopolisCity_Text_16A33E:: @ 816A33E +SootopolisCity_Text_WeOweItAllToYou:: @ 816A33E .string "STEVEN: {PLAYER}{KUN}, we owe it all to you.\p" .string "The sky above SOOTOPOLIS has returned\n" .string "to normal. For that, WALLACE sends his\l" @@ -170,46 +170,46 @@ SootopolisCity_Text_16A33E:: @ 816A33E .string "on equal footing with him.\p" .string "Give it your best shot.$" -SootopolisCity_Text_16A455:: @ 816A455 +SootopolisCity_Text_AllLifeStartsAtTheCave:: @ 816A455 .string "All life starts at the CAVE OF ORIGIN,\n" .string "and it all ends on MT. PYRE...\p" .string "Where do people and POKéMON come\n" .string "from? Where are we bound?$" -SootopolisCity_Text_16A4D6:: @ 816A4D6 +SootopolisCity_Text_YoureGoingToChallengeWallace:: @ 816A4D6 .string "Let me guess, you're going to challenge\n" .string "WALLACE?\p" .string "Oh, you are really?\n" .string "You're awfully brave!$" -SootopolisCity_Text_16A531:: @ 816A531 +SootopolisCity_Text_BecomeYourFan:: @ 816A531 .string "Let me guess, you've beaten WALLACE!\n" .string "Oh, you did, really?\p" .string "Maybe I'll become your fan!$" -SootopolisCity_Text_16A587:: @ 816A587 +SootopolisCity_Text_NoOrdinaryTourist2:: @ 816A587 .string "Hm!\n" .string "You've come all the way to SOOTOPOLIS?\l" .string "You're no ordinary tourist.\p" .string "But I suppose that doesn't make you an\n" .string "extraordinary tourist, either.$" -SootopolisCity_Text_16A614:: @ 816A614 +SootopolisCity_Text_NightSkyFavoriteScenery:: @ 816A614 .string "A circle of a night sky framed by the\n" .string "crater of a volcano...\p" .string "And in that ring, stars flicker and\n" .string "blink as if they were alive...\l" .string "It's my favorite scenery.$" -SootopolisCity_Text_16A6AE:: @ 816A6AE +SootopolisCity_Text_WhereIsMyHouse:: @ 816A6AE .string "Hunh? Where is my house?$" -SootopolisCity_Text_16A6C7:: @ 816A6C7 +SootopolisCity_Text_GymSign:: @ 816A6C7 .string "SOOTOPOLIS CITY POKéMON GYM\n" .string "LEADER: WALLACE\p" .string "“Artist, and lover of WATER.”$" -SootopolisCity_Text_16A711:: @ 816A711 +SootopolisCity_Text_CitySign:: @ 816A711 .string "SOOTOPOLIS CITY\p" .string "“The mystical city where history\n" .string "slumbers.”$" diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 35f78c2fd..dd0590817 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Gym_1F_EventScript_15AFFF", + "script": "SootopolisCity_Gym_1F_EventScript_Wallace", "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Gym_1F_EventScript_15B084", + "script": "SootopolisCity_Gym_1F_EventScript_GymGuide", "flag": "0" } ], @@ -69,7 +69,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SootopolisCity_Gym_1F_EventScript_15B0A3" + "script": "SootopolisCity_Gym_1F_EventScript_LeftGymStatue" }, { "type": "sign", @@ -77,7 +77,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_Gym_1F_EventScript_15B0B3" + "script": "SootopolisCity_Gym_1F_EventScript_RightGymStatue" } ] } diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 28f5f062d..c72cff7d7 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -1,79 +1,79 @@ SootopolisCity_Gym_1F_MapScripts:: @ 815AF07 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_15AF86 - map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_15AF22 - map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_15AF25 - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_15AF1C + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_OnFrame + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_OnResume + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_OnTransition .byte 0 -SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C +SootopolisCity_Gym_1F_OnTransition:: @ 815AF1C setvar VAR_ICE_STEP_COUNT, 1 end -SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 +SootopolisCity_Gym_1F_OnResume:: @ 815AF22 setstepcallback 4 end -SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 - call SootopolisCity_Gym_1F_EventScript_15AF2E +SootopolisCity_Gym_1F_OnLoad:: @ 815AF25 + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special SetSootopolisGymCrackedIceMetatiles end -SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E +SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles:: @ 815AF2E compare VAR_ICE_STEP_COUNT, 8 - goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF85 + goto_if_lt SootopolisCity_Gym_1F_EventScript_StopCheckingStairs compare VAR_ICE_STEP_COUNT, 28 - goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF73 + goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstStairs compare VAR_ICE_STEP_COUNT, 69 - goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF61 + goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs setmetatile 8, 4, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0 -SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61 +SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs:: @ 815AF61 setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0 -SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73 +SootopolisCity_Gym_1F_EventScript_OpenFirstStairs:: @ 815AF73 setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0 -SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 +SootopolisCity_Gym_1F_EventScript_StopCheckingStairs:: @ 815AF85 return -SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 - map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_15AFA8 - map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_15AFBC - map_script_2 VAR_ICE_STEP_COUNT, 69, SootopolisCity_Gym_1F_EventScript_15AFD0 - map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_15AFE4 +SootopolisCity_Gym_1F_OnFrame:: @ 815AF86 + map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs + map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs + map_script_2 VAR_ICE_STEP_COUNT, 69, SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs + map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_FallThroughIce .2byte 0 -SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 +SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 815AFA8 addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse SE_ICE_STAIRS - call SootopolisCity_Gym_1F_EventScript_15AF2E + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end -SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC +SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 815AFBC addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse SE_ICE_STAIRS - call SootopolisCity_Gym_1F_EventScript_15AF2E + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end -SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 +SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 815AFD0 addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse SE_ICE_STAIRS - call SootopolisCity_Gym_1F_EventScript_15AF2E + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end -SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 +SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 815AFE4 lockall delay 20 - applymovement LOCALID_PLAYER, SootopolisCity_Gym_1F_Movement_15AFFD + applymovement LOCALID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce waitmovement 0 playse SE_FALL delay 60 @@ -81,75 +81,75 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 waitstate end -SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD +SootopolisCity_Gym_1F_Movement_FallThroughIce:: @ 815AFFD set_invisible step_end -SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF - trainerbattle_single TRAINER_WALLACE, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D, NO_MUSIC - goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 - goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A - msgbox SootopolisCity_Gym_1F_Text_18F4D7, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_Wallace:: @ 815AFFF + trainerbattle_single TRAINER_WALLACE, SootopolisCity_Gym_1F_Text_WallaceIntro, SootopolisCity_Gym_1F_Text_WallaceDefeat, SootopolisCity_Gym_1F_EventScript_WallaceDefeated, NO_MUSIC + goto_if_unset FLAG_RECEIVED_TM_WATER_PULSE, SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2 + goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge + msgbox SootopolisCity_Gym_1F_Text_WallacePostBattle, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D - message SootopolisCity_Gym_1F_Text_18F342 +SootopolisCity_Gym_1F_EventScript_WallaceDefeated:: @ 815B02D + message SootopolisCity_Gym_1F_Text_ReceivedRainBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox SootopolisCity_Gym_1F_Text_18F36B, MSGBOX_DEFAULT + msgbox SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET setvar VAR_0x8008, 8 call Common_EventScript_SetGymTrainers - goto SootopolisCity_Gym_1F_EventScript_15B056 + goto SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2 end -SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 +SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 815B056 giveitem ITEM_TM03_WATER_PULSE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox SootopolisCity_Gym_1F_Text_18F466, MSGBOX_DEFAULT - setflag FLAG_RECEIVED_TM03 + msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_WATER_PULSE release end -SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A - msgbox SootopolisCity_Gym_1F_Text_18F5B4, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge:: @ 815B07A + msgbox SootopolisCity_Gym_1F_Text_GoGetFortreeBadge, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 +SootopolisCity_Gym_1F_EventScript_GymGuide:: @ 815B084 lock faceplayer - goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_15B099 - msgbox SootopolisCity_Gym_1F_Text_18E8A5, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory + msgbox SootopolisCity_Gym_1F_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 - msgbox SootopolisCity_Gym_1F_Text_18E9C9, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory:: @ 815B099 + msgbox SootopolisCity_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 +SootopolisCity_Gym_1F_EventScript_LeftGymStatue:: @ 815B0A3 lockall - goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 - goto SootopolisCity_Gym_1F_EventScript_15B0CD + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified + goto SootopolisCity_Gym_1F_EventScript_GymStatue end -SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 +SootopolisCity_Gym_1F_EventScript_RightGymStatue:: @ 815B0B3 lockall - goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 - goto SootopolisCity_Gym_1F_EventScript_15B0CD + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified + goto SootopolisCity_Gym_1F_EventScript_GymStatue end -SootopolisCity_Gym_1F_EventScript_15B0C3:: @ 815B0C3 - msgbox SootopolisCity_Gym_1F_Text_18F665, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GymStatueCertified:: @ 815B0C3 + msgbox SootopolisCity_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -SootopolisCity_Gym_1F_EventScript_15B0CD:: @ 815B0CD - msgbox SootopolisCity_Gym_1F_Text_18F649, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GymStatue:: @ 815B0CD + msgbox SootopolisCity_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SootopolisCity_Gym_1F/text.inc b/data/maps/SootopolisCity_Gym_1F/text.inc index 1fd341f85..478bdb6b7 100644 --- a/data/maps/SootopolisCity_Gym_1F/text.inc +++ b/data/maps/SootopolisCity_Gym_1F/text.inc @@ -1,4 +1,4 @@ -SootopolisCity_Gym_1F_Text_18E8A5:: @ 818E8A5 +SootopolisCity_Gym_1F_Text_GymGuideAdvice:: @ 818E8A5 .string "Yo! How's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "SOOTOPOLIS's GYM LEADER WALLACE is\n" @@ -10,118 +10,118 @@ SootopolisCity_Gym_1F_Text_18E8A5:: @ 818E8A5 .string "The rest of the way, you have to\n" .string "go for it yourself!$" -SootopolisCity_Gym_1F_Text_18E9C9:: @ 818E9C9 +SootopolisCity_Gym_1F_Text_GymGuidePostVictory:: @ 818E9C9 .string "Yow! You've beaten even WALLACE, who\n" .string "was supposedly the best in all HOENN!\p" .string "Okay! Check out your TRAINER's CARD.\p" .string "If you've gotten all the BADGES, you're\n" .string "set for the POKéMON LEAGUE challenge!$" -SootopolisCity_Gym_B1F_Text_18EA87:: @ 818EA87 +SootopolisCity_Gym_B1F_Text_AndreaIntro:: @ 818EA87 .string "I'll show you the sublime techniques\n" .string "I learned from our LEADER WALLACE!$" -SootopolisCity_Gym_B1F_Text_18EACF:: @ 818EACF +SootopolisCity_Gym_B1F_Text_AndreaDefeat:: @ 818EACF .string "Please forgive me, WALLACE...$" -SootopolisCity_Gym_B1F_Text_18EAED:: @ 818EAED +SootopolisCity_Gym_B1F_Text_AndreaPostBattle:: @ 818EAED .string "Watch what happens if you crack all\n" .string "the floor tiles.$" -SootopolisCity_Gym_B1F_Text_18EB22:: @ 818EB22 +SootopolisCity_Gym_B1F_Text_CrissyIntro:: @ 818EB22 .string "You came all the way here, but you won't\n" .string "get to see WALLACE.\p" .string "Not if you lose to me, you won't!$" -SootopolisCity_Gym_B1F_Text_18EB81:: @ 818EB81 +SootopolisCity_Gym_B1F_Text_CrissyDefeat:: @ 818EB81 .string "You're strong!\n" .string "I was fooled by your cute looks!$" -SootopolisCity_Gym_B1F_Text_18EBB1:: @ 818EBB1 +SootopolisCity_Gym_B1F_Text_CrissyPostBattle:: @ 818EBB1 .string "You might be good enough to avoid\n" .string "being wiped out in one hit by WALLACE.$" -SootopolisCity_Gym_B1F_Text_18EBFA:: @ 818EBFA +SootopolisCity_Gym_B1F_Text_BriannaIntro:: @ 818EBFA .string "The sight of WALLACE conducting a\n" .string "battle...\p" .string "The very beauty of it compelled me to\n" .string "become a TRAINER.$" -SootopolisCity_Gym_B1F_Text_18EC5E:: @ 818EC5E +SootopolisCity_Gym_B1F_Text_BriannaDefeat:: @ 818EC5E .string "You battled with more beauty than\n" .string "I could muster...$" -SootopolisCity_Gym_B1F_Text_18EC92:: @ 818EC92 +SootopolisCity_Gym_B1F_Text_BriannaPostBattle:: @ 818EC92 .string "The grace you bring to battle is\n" .string "fabulous.\p" .string "Oh... I'm so fortunate to have found\n" .string "POKéMON.$" -SootopolisCity_Gym_B1F_Text_18ECEB:: @ 818ECEB +SootopolisCity_Gym_1F_Text_ConnieIntro:: @ 818ECEB .string "I should teach you how harsh battles\n" .string "can be.$" -SootopolisCity_Gym_B1F_Text_18ED18:: @ 818ED18 +SootopolisCity_Gym_1F_Text_ConnieDefeat:: @ 818ED18 .string "Oh.\n" .string "You're strong.$" -SootopolisCity_Gym_B1F_Text_18ED2B:: @ 818ED2B +SootopolisCity_Gym_B1F_Text_ConniePostBattle:: @ 818ED2B .string "I'll tell you something good.\p" .string "If you want to reach WALLACE, you\n" .string "need to walk on each floor tile once.$" -SootopolisCity_Gym_B1F_Text_18ED91:: @ 818ED91 +SootopolisCity_Gym_1F_Text_BridgetIntro:: @ 818ED91 .string "The POKéMON GYM of the highest level\n" .string "in the HOENN region...\p" .string "That's the SOOTOPOLIS GYM.$" -SootopolisCity_Gym_B1F_Text_18EDE8:: @ 818EDE8 +SootopolisCity_Gym_1F_Text_BridgetDefeat:: @ 818EDE8 .string "What a high level you are!$" -SootopolisCity_Gym_B1F_Text_18EE03:: @ 818EE03 +SootopolisCity_Gym_1F_Text_BridgetPostBattle:: @ 818EE03 .string "Rather than being satisfied by being\n" .string "in a strong GYM, I imagine training in\l" .string "other places will make you stronger.\l" .string "But above all, it looks more fun.$" -SootopolisCity_Gym_B1F_Text_18EE96:: @ 818EE96 +SootopolisCity_Gym_1F_Text_OliviaIntro:: @ 818EE96 .string "I train my POKéMON together with\n" .string "WALLACE.\p" .string "Don't think I'm a pushover.$" -SootopolisCity_Gym_B1F_Text_18EEDC:: @ 818EEDC +SootopolisCity_Gym_1F_Text_OliviaDefeat:: @ 818EEDC .string "I was bowled right over...$" -SootopolisCity_Gym_B1F_Text_18EEF7:: @ 818EEF7 +SootopolisCity_Gym_1F_Text_OliviaPostBattle:: @ 818EEF7 .string "I think you have potential.\n" .string "Why don't you stay and train with us?$" -SootopolisCity_Gym_B1F_Text_18EF39:: @ 818EF39 +SootopolisCity_Gym_1F_Text_TiffanyIntro:: @ 818EF39 .string "A graceful glide across the ice while\n" .string "crossing no lines...\p" .string "A TRAINER putting on that performance\n" .string "would be elegantly beautiful!$" -SootopolisCity_Gym_B1F_Text_18EFB8:: @ 818EFB8 +SootopolisCity_Gym_1F_Text_TiffanyDefeat:: @ 818EFB8 .string "Well, excuse me?!$" -SootopolisCity_Gym_B1F_Text_18EFCA:: @ 818EFCA +SootopolisCity_Gym_1F_Text_TiffanyPostBattle:: @ 818EFCA .string "This is really obvious, but how strong\n" .string "you are as a TRAINER has nothing to do\l" .string "with how young or old you are.$" -SootopolisCity_Gym_B1F_Text_18F037:: @ 818F037 +SootopolisCity_Gym_1F_Text_MarissaIntro:: @ 818F037 .string "When I'm with my POKéMON, the time\n" .string "flies by before you can say, “Oops!”$" -SootopolisCity_Gym_B1F_Text_18F07F:: @ 818F07F +SootopolisCity_Gym_1F_Text_MarissaDefeat:: @ 818F07F .string "Oops!$" -SootopolisCity_Gym_B1F_Text_18F085:: @ 818F085 +SootopolisCity_Gym_1F_Text_MarissaPostBattle:: @ 818F085 .string "I wish I can forget about lost causes\n" .string "before I can manage an “Oops!”$" -SootopolisCity_Gym_1F_Text_18F0CA:: @ 818F0CA +SootopolisCity_Gym_1F_Text_WallaceIntro:: @ 818F0CA .string "Allow me to formally introduce\n" .string "myself.\p" .string "I am WALLACE.\n" @@ -138,7 +138,7 @@ SootopolisCity_Gym_1F_Text_18F0CA:: @ 818F0CA .string "a performance of illusions in water\l" .string "by me and my POKéMON!$" -SootopolisCity_Gym_1F_Text_18F282:: @ 818F282 +SootopolisCity_Gym_1F_Text_WallaceDefeat:: @ 818F282 .string "Bravo.\p" .string "I realize now your authenticity and\n" .string "magnificence as a POKéMON TRAINER.\p" @@ -147,11 +147,11 @@ SootopolisCity_Gym_1F_Text_18F282:: @ 818F282 .string "You have proven yourself worthy of\n" .string "the RAIN BADGE. Accept it.$" -SootopolisCity_Gym_1F_Text_18F342:: @ 818F342 +SootopolisCity_Gym_1F_Text_ReceivedRainBadge:: @ 818F342 .string "{PLAYER} received the RAIN BADGE\n" .string "from WALLACE.$" -SootopolisCity_Gym_1F_Text_18F36B:: @ 818F36B +SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis:: @ 818F36B .string "Having that BADGE assures you the\n" .string "full obedience of all your POKéMON to\l" .string "every command you make.\p" @@ -161,13 +161,13 @@ SootopolisCity_Gym_1F_Text_18F36B:: @ 818F36B .string "And, so that you never forget the\n" .string "battle we shared, take this...$" -SootopolisCity_Gym_1F_Text_18F466:: @ 818F466 +SootopolisCity_Gym_1F_Text_ExplainWaterPulse:: @ 818F466 .string "The TM I handed you contains\n" .string "WATER PULSE.\p" .string "In use, it will occasionally confuse\n" .string "the target with ultrasonic waves.$" -SootopolisCity_Gym_1F_Text_18F4D7:: @ 818F4D7 +SootopolisCity_Gym_1F_Text_WallacePostBattle:: @ 818F4D7 .string "TRAINERS who have gathered all the\n" .string "GYM BADGES of HOENN should make way\l" .string "for the ultimate destination.\p" @@ -176,17 +176,17 @@ SootopolisCity_Gym_1F_Text_18F4D7:: @ 818F4D7 .string "of HOENN, to the island EVER GRANDE.\l" .string "The POKéMON LEAGUE is there.$" -SootopolisCity_Gym_1F_Text_18F5B4:: @ 818F5B4 +SootopolisCity_Gym_1F_Text_GoGetFortreeBadge:: @ 818F5B4 .string "There remains but one BADGE to\n" .string "obtain in HOENN.\p" .string "If you wish to challenge the POKéMON\n" .string "LEAGUE, you must obtain the last\l" .string "BADGE from the GYM in FORTREE.$" -SootopolisCity_Gym_1F_Text_18F649:: @ 818F649 +SootopolisCity_Gym_1F_Text_GymStatue:: @ 818F649 .string "SOOTOPOLIS CITY POKéMON GYM$" -SootopolisCity_Gym_1F_Text_18F665:: @ 818F665 +SootopolisCity_Gym_1F_Text_GymStatueCertified:: @ 818F665 .string "SOOTOPOLIS CITY POKéMON GYM\p" .string "WALLACE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 7a5d9bf37..8e2d7476e 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "SootopolisCity_Gym_B1F_EventScript_15B0D8", + "script": "SootopolisCity_Gym_B1F_EventScript_Andrea", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "SootopolisCity_Gym_B1F_EventScript_15B11D", + "script": "SootopolisCity_Gym_B1F_EventScript_Connie", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", - "script": "SootopolisCity_Gym_B1F_EventScript_15B106", + "script": "SootopolisCity_Gym_B1F_EventScript_Brianna", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", - "script": "SootopolisCity_Gym_B1F_EventScript_15B134", + "script": "SootopolisCity_Gym_B1F_EventScript_Bridget", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", - "script": "SootopolisCity_Gym_B1F_EventScript_15B162", + "script": "SootopolisCity_Gym_B1F_EventScript_Tiffany", "flag": "0" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "SootopolisCity_Gym_B1F_EventScript_15B179", + "script": "SootopolisCity_Gym_B1F_EventScript_Marissa", "flag": "0" }, { @@ -99,7 +99,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "SootopolisCity_Gym_B1F_EventScript_15B0EF", + "script": "SootopolisCity_Gym_B1F_EventScript_Crissy", "flag": "0" }, { @@ -112,7 +112,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "SootopolisCity_Gym_B1F_EventScript_15B14B", + "script": "SootopolisCity_Gym_B1F_EventScript_Olivia", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index de082cbae..0b62e70c2 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -1,42 +1,42 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 815B0D7 .byte 0 -SootopolisCity_Gym_B1F_EventScript_15B0D8:: @ 815B0D8 - trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF - msgbox SootopolisCity_Gym_B1F_Text_18EAED, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Andrea:: @ 815B0D8 + trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_AndreaIntro, SootopolisCity_Gym_B1F_Text_AndreaDefeat + msgbox SootopolisCity_Gym_B1F_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_15B0EF:: @ 815B0EF - trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 - msgbox SootopolisCity_Gym_B1F_Text_18EBB1, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Crissy:: @ 815B0EF + trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_CrissyIntro, SootopolisCity_Gym_B1F_Text_CrissyDefeat + msgbox SootopolisCity_Gym_B1F_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_15B106:: @ 815B106 - trainerbattle_single TRAINER_BRIANNA_2, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E - msgbox SootopolisCity_Gym_B1F_Text_18EC92, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Brianna:: @ 815B106 + trainerbattle_single TRAINER_BRIANNA_2, SootopolisCity_Gym_B1F_Text_BriannaIntro, SootopolisCity_Gym_B1F_Text_BriannaDefeat + msgbox SootopolisCity_Gym_B1F_Text_BriannaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_15B11D:: @ 815B11D - trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 - msgbox SootopolisCity_Gym_B1F_Text_18ED2B, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Connie:: @ 815B11D + trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_1F_Text_ConnieIntro, SootopolisCity_Gym_1F_Text_ConnieDefeat + msgbox SootopolisCity_Gym_B1F_Text_ConniePostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_15B134:: @ 815B134 - trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 - msgbox SootopolisCity_Gym_B1F_Text_18EE03, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Bridget:: @ 815B134 + trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_1F_Text_BridgetIntro, SootopolisCity_Gym_1F_Text_BridgetDefeat + msgbox SootopolisCity_Gym_1F_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_15B14B:: @ 815B14B - trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC - msgbox SootopolisCity_Gym_B1F_Text_18EEF7, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Olivia:: @ 815B14B + trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_1F_Text_OliviaIntro, SootopolisCity_Gym_1F_Text_OliviaDefeat + msgbox SootopolisCity_Gym_1F_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_15B162:: @ 815B162 - trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 - msgbox SootopolisCity_Gym_B1F_Text_18EFCA, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Tiffany:: @ 815B162 + trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_1F_Text_TiffanyIntro, SootopolisCity_Gym_1F_Text_TiffanyDefeat + msgbox SootopolisCity_Gym_1F_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_15B179:: @ 815B179 - trainerbattle_single TRAINER_MARISSA, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F - msgbox SootopolisCity_Gym_B1F_Text_18F085, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Marissa:: @ 815B179 + trainerbattle_single TRAINER_MARISSA, SootopolisCity_Gym_1F_Text_MarissaIntro, SootopolisCity_Gym_1F_Text_MarissaDefeat + msgbox SootopolisCity_Gym_1F_Text_MarissaPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 913be18dc..a9d706b77 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House1_EventScript_15B29B", + "script": "SootopolisCity_House1_EventScript_BrickBreakBlackBelt", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House1_EventScript_15B2D1", + "script": "SootopolisCity_House1_EventScript_Kecleon", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index f49381a28..b5f9a18fb 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -1,28 +1,28 @@ SootopolisCity_House1_MapScripts:: @ 815B29A .byte 0 -SootopolisCity_House1_EventScript_15B29B:: @ 815B29B +SootopolisCity_House1_EventScript_BrickBreakBlackBelt:: @ 815B29B lock faceplayer - goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7 - msgbox SootopolisCity_House1_Text_18F991, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_BrickBreakBlacSootopolisCity_House1_EventScript_ReceivedBrickBreakBelt + msgbox SootopolisCity_House1_Text_DevelopedThisTM, MSGBOX_DEFAULT giveitem ITEM_TM31_BRICK_BREAK setflag FLAG_RECEIVED_TM31 - msgbox SootopolisCity_House1_Text_18FA03, MSGBOX_DEFAULT + msgbox SootopolisCity_House1_Text_ExplainBrickBreak, MSGBOX_DEFAULT release end -SootopolisCity_House1_EventScript_15B2C7:: @ 815B2C7 - msgbox SootopolisCity_House1_Text_18FA03, MSGBOX_DEFAULT +SootopolisCity_House1_EventScript_BrickBreakBlacSootopolisCity_House1_EventScript_ReceivedBrickBreakBelt:: @ 815B2C7 + msgbox SootopolisCity_House1_Text_ExplainBrickBreak, MSGBOX_DEFAULT release end -SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 +SootopolisCity_House1_EventScript_Kecleon:: @ 815B2D1 lock faceplayer waitse playmoncry SPECIES_KECLEON, 0 - msgbox SootopolisCity_House1_Text_18FA50, MSGBOX_DEFAULT + msgbox SootopolisCity_House1_Text_Kecleon, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/SootopolisCity_House1/text.inc b/data/maps/SootopolisCity_House1/text.inc index 6c6179744..6361f557b 100644 --- a/data/maps/SootopolisCity_House1/text.inc +++ b/data/maps/SootopolisCity_House1/text.inc @@ -1,12 +1,12 @@ -SootopolisCity_House1_Text_18F991:: @ 818F991 +SootopolisCity_House1_Text_DevelopedThisTM:: @ 818F991 .string "For thirty years I've remained in\n" .string "SOOTOPOLIS honing my skills.\p" .string "I developed a shattering TM.\n" .string "I bequeath it to you!$" -SootopolisCity_House1_Text_18FA03:: @ 818FA03 +SootopolisCity_House1_Text_ExplainBrickBreak:: @ 818FA03 .string "TM31 contains BRICK BREAK! It's a move\n" .string "so horrible that I can't describe it.$" -SootopolisCity_House1_Text_18FA50:: @ 818FA50 +SootopolisCity_House1_Text_Kecleon:: @ 818FA50 .string "KECLEON: Puu puhyaah.$" diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index f39496a7c..7e0a17bdd 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House2_EventScript_15B2E5", + "script": "SootopolisCity_House2_EventScript_ExpertF", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc index b3d7eb609..60d6b1919 100644 --- a/data/maps/SootopolisCity_House2/scripts.inc +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -1,21 +1,21 @@ SootopolisCity_House2_MapScripts:: @ 815B2E4 .byte 0 -SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 +SootopolisCity_House2_EventScript_ExpertF:: @ 815B2E5 lock faceplayer - msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO + msgbox SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs, MSGBOX_YESNO compare VAR_RESULT, YES - call_if_eq SootopolisCity_House2_EventScript_15B307 + call_if_eq SootopolisCity_House2_EventScript_KnowAboutOrbs compare VAR_RESULT, NO - call_if_eq SootopolisCity_House2_EventScript_15B310 + call_if_eq SootopolisCity_House2_EventScript_DontKnowAboutOrbs release end -SootopolisCity_House2_EventScript_15B307:: @ 815B307 - msgbox SootopolisCity_House2_Text_18FAAE, MSGBOX_DEFAULT +SootopolisCity_House2_EventScript_KnowAboutOrbs:: @ 815B307 + msgbox SootopolisCity_House2_Text_YesTwoOrbsSideBySide, MSGBOX_DEFAULT return -SootopolisCity_House2_EventScript_15B310:: @ 815B310 - msgbox SootopolisCity_House2_Text_18FB04, MSGBOX_DEFAULT +SootopolisCity_House2_EventScript_DontKnowAboutOrbs:: @ 815B310 + msgbox SootopolisCity_House2_Text_OughtToVisitAndSee, MSGBOX_DEFAULT return diff --git a/data/maps/SootopolisCity_House2/text.inc b/data/maps/SootopolisCity_House2/text.inc index e132b20f7..5bf326b22 100644 --- a/data/maps/SootopolisCity_House2/text.inc +++ b/data/maps/SootopolisCity_House2/text.inc @@ -1,13 +1,13 @@ -SootopolisCity_House2_Text_18FA66:: @ 818FA66 +SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs:: @ 818FA66 .string "MT. PYRE...\p" .string "At its peak are two orbs placed side\n" .string "by side. Did you know?$" -SootopolisCity_House2_Text_18FAAE:: @ 818FAAE +SootopolisCity_House2_Text_YesTwoOrbsSideBySide:: @ 818FAAE .string "Yes, two orbs side by side...\p" .string "The sight of them together...\n" .string "It is somehow soothing...$" -SootopolisCity_House2_Text_18FB04:: @ 818FB04 +SootopolisCity_House2_Text_OughtToVisitAndSee:: @ 818FB04 .string "Is that so?\n" .string "Perhaps you ought to visit and see...$" diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index 6ae769781..1f0a39dad 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House3_EventScript_15B31A", + "script": "SootopolisCity_House3_EventScript_Woman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House3_EventScript_15B343", + "script": "SootopolisCity_House3_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc index b466ecc1f..6661d5d22 100644 --- a/data/maps/SootopolisCity_House3/scripts.inc +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -1,21 +1,21 @@ SootopolisCity_House3_MapScripts:: @ 815B319 .byte 0 -SootopolisCity_House3_EventScript_15B31A:: @ 815B31A +SootopolisCity_House3_EventScript_Woman:: @ 815B31A lock faceplayer - msgbox SootopolisCity_House3_Text_18FB36, MSGBOX_YESNO + msgbox SootopolisCity_House3_Text_WallaceHasManyFansDoYou, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq SootopolisCity_House3_EventScript_15B339 - msgbox SootopolisCity_House3_Text_18FBC0, MSGBOX_DEFAULT + goto_if_eq SootopolisCity_House3_EventScript_HaveFans + msgbox SootopolisCity_House3_Text_LonesomeTryWorkingHarder, MSGBOX_DEFAULT release end -SootopolisCity_House3_EventScript_15B339:: @ 815B339 - msgbox SootopolisCity_House3_Text_18FB9C, MSGBOX_DEFAULT +SootopolisCity_House3_EventScript_HaveFans:: @ 815B339 + msgbox SootopolisCity_House3_Text_YouMustBePrettyStrong, MSGBOX_DEFAULT release end -SootopolisCity_House3_EventScript_15B343:: @ 815B343 - msgbox SootopolisCity_House3_Text_18FC1A, MSGBOX_NPC +SootopolisCity_House3_EventScript_Girl:: @ 815B343 + msgbox SootopolisCity_House3_Text_TrainerFanClubWasWild, MSGBOX_NPC end diff --git a/data/maps/SootopolisCity_House3/text.inc b/data/maps/SootopolisCity_House3/text.inc index c06b456a2..3bd795b09 100644 --- a/data/maps/SootopolisCity_House3/text.inc +++ b/data/maps/SootopolisCity_House3/text.inc @@ -1,19 +1,19 @@ -SootopolisCity_House3_Text_18FB36:: @ 818FB36 +SootopolisCity_House3_Text_WallaceHasManyFansDoYou:: @ 818FB36 .string "You're a POKéMON TRAINER, aren't you?\p" .string "SOOTOPOLIS's GYM LEADER WALLACE has\n" .string "many fans.\l" .string "Do you have any?$" -SootopolisCity_House3_Text_18FB9C:: @ 818FB9C +SootopolisCity_House3_Text_YouMustBePrettyStrong:: @ 818FB9C .string "Oh, then you must be pretty strong.$" -SootopolisCity_House3_Text_18FBC0:: @ 818FBC0 +SootopolisCity_House3_Text_LonesomeTryWorkingHarder:: @ 818FBC0 .string "Oh, dear...\n" .string "That's a little lonesome.\p" .string "Try working a little harder to get a\n" .string "fan following.$" -SootopolisCity_House3_Text_18FC1A:: @ 818FC1A +SootopolisCity_House3_Text_TrainerFanClubWasWild:: @ 818FC1A .string "Dedicated fans come over from even\n" .string "KANTO and JOHTO.\p" .string "It was really wild when I went to the\n" diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 05510e1c2..a8cb0c9e5 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House4_EventScript_15B34D", + "script": "SootopolisCity_House4_EventScript_Man", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House4_EventScript_15B356", + "script": "SootopolisCity_House4_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House4_EventScript_15B35F", + "script": "SootopolisCity_House4_EventScript_Azumarill", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc index 8ef51d2a5..fb4864eef 100644 --- a/data/maps/SootopolisCity_House4/scripts.inc +++ b/data/maps/SootopolisCity_House4/scripts.inc @@ -1,20 +1,20 @@ SootopolisCity_House4_MapScripts:: @ 815B34C .byte 0 -SootopolisCity_House4_EventScript_15B34D:: @ 815B34D - msgbox SootopolisCity_House4_Text_18FC92, MSGBOX_NPC +SootopolisCity_House4_EventScript_Man:: @ 815B34D + msgbox SootopolisCity_House4_Text_AncientTreasuresWaitingInSea, MSGBOX_NPC end -SootopolisCity_House4_EventScript_15B356:: @ 815B356 - msgbox SootopolisCity_House4_Text_18FD41, MSGBOX_NPC +SootopolisCity_House4_EventScript_Woman:: @ 815B356 + msgbox SootopolisCity_House4_Text_StrollUnderwaterWithPokemon, MSGBOX_NPC end -SootopolisCity_House4_EventScript_15B35F:: @ 815B35F +SootopolisCity_House4_EventScript_Azumarill:: @ 815B35F lock faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox SootopolisCity_House4_Text_18FDD8, MSGBOX_DEFAULT + msgbox SootopolisCity_House4_Text_Azumarill, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/SootopolisCity_House4/text.inc b/data/maps/SootopolisCity_House4/text.inc index 5a7d92d06..89153ab5d 100644 --- a/data/maps/SootopolisCity_House4/text.inc +++ b/data/maps/SootopolisCity_House4/text.inc @@ -1,4 +1,4 @@ -SootopolisCity_House4_Text_18FC92:: @ 818FC92 +SootopolisCity_House4_Text_AncientTreasuresWaitingInSea:: @ 818FC92 .string "Listen up, and I'll tell you something\n" .string "good.\p" .string "There's supposed to be an ancient\n" @@ -6,12 +6,12 @@ SootopolisCity_House4_Text_18FC92:: @ 818FC92 .string "There could be treasures just waiting\n" .string "to be discovered down there.$" -SootopolisCity_House4_Text_18FD41:: @ 818FD41 +SootopolisCity_House4_Text_StrollUnderwaterWithPokemon:: @ 818FD41 .string "Ancient treasures...\p" .string "It would be nice if they existed, but\n" .string "even if they didn't, it would be so\l" .string "beautiful to take an underwater\l" .string "stroll with my POKéMON.$" -SootopolisCity_House4_Text_18FDD8:: @ 818FDD8 +SootopolisCity_House4_Text_Azumarill:: @ 818FDD8 .string "AZUMARILL: Marurii.$" diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 610a62e42..93821b87b 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House5_EventScript_15B373", + "script": "SootopolisCity_House5_EventScript_Maniac", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House5_EventScript_15B37C", + "script": "SootopolisCity_House5_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc index 0d47e0ceb..aa6a0bd13 100644 --- a/data/maps/SootopolisCity_House5/scripts.inc +++ b/data/maps/SootopolisCity_House5/scripts.inc @@ -1,10 +1,10 @@ SootopolisCity_House5_MapScripts:: @ 815B372 .byte 0 -SootopolisCity_House5_EventScript_15B373:: @ 815B373 - msgbox SootopolisCity_House5_Text_18FDEC, MSGBOX_NPC +SootopolisCity_House5_EventScript_Maniac:: @ 815B373 + msgbox SootopolisCity_House5_Text_SootopolisMtPyreConnection, MSGBOX_NPC end -SootopolisCity_House5_EventScript_15B37C:: @ 815B37C - msgbox SootopolisCity_House5_Text_18FE7B, MSGBOX_NPC +SootopolisCity_House5_EventScript_Girl:: @ 815B37C + msgbox SootopolisCity_House5_Text_BrotherUsedToStudySea, MSGBOX_NPC end diff --git a/data/maps/SootopolisCity_House5/text.inc b/data/maps/SootopolisCity_House5/text.inc index c5887ffe2..59656ef01 100644 --- a/data/maps/SootopolisCity_House5/text.inc +++ b/data/maps/SootopolisCity_House5/text.inc @@ -1,8 +1,8 @@ -SootopolisCity_House5_Text_18FDEC:: @ 818FDEC +SootopolisCity_House5_Text_SootopolisMtPyreConnection:: @ 818FDEC .string "There appears to be some connection\n" .string "between SOOTOPOLIS and MT. PYRE.\p" .string "My friends and I did some research on\n" .string "it at the lab where I used to work.$" -SootopolisCity_House5_Text_18FE7B:: @ 818FE7B +SootopolisCity_House5_Text_BrotherUsedToStudySea:: @ 818FE7B .string "My big brother used to study the sea.$" diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index 92a9c4942..03abf39fa 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House6_EventScript_15B386", + "script": "SootopolisCity_House6_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 6d3173638..14bf39098 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -1,34 +1,34 @@ SootopolisCity_House6_MapScripts:: @ 815B385 .byte 0 -SootopolisCity_House6_EventScript_15B386:: @ 815B386 +SootopolisCity_House6_EventScript_Woman:: @ 815B386 lock faceplayer - goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_15B3CD - msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_ReceivedWailmerDoll + msgbox SootopolisCity_House6_Text_FirstGuestInWhileTakeDoll, MSGBOX_YESNO compare VAR_RESULT, NO - call_if_eq SootopolisCity_House6_EventScript_15B3C3 - msgbox SootopolisCity_House6_Text_18FF12, MSGBOX_DEFAULT + call_if_eq SootopolisCity_House6_EventScript_DeclineWailmerDoll + msgbox SootopolisCity_House6_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT givedecoration DECOR_WAILMER_DOLL compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_House6_EventScript_15B3D7 + goto_if_eq SootopolisCity_House6_EventScript_NoRoomForWailmerDoll setflag FLAG_RECEIVED_WAILMER_DOLL release end -SootopolisCity_House6_EventScript_15B3C3:: @ 815B3C3 - msgbox SootopolisCity_House6_Text_18FF6D, MSGBOX_DEFAULT +SootopolisCity_House6_EventScript_DeclineWailmerDoll:: @ 815B3C3 + msgbox SootopolisCity_House6_Text_DontWantThisDoll, MSGBOX_DEFAULT release end -SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD - msgbox SootopolisCity_House6_Text_18FF95, MSGBOX_DEFAULT +SootopolisCity_House6_EventScript_ReceivedWailmerDoll:: @ 815B3CD + msgbox SootopolisCity_House6_Text_LovePlushDolls, MSGBOX_DEFAULT release end -SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 +SootopolisCity_House6_EventScript_NoRoomForWailmerDoll:: @ 815B3D7 bufferdecorationname 1, DECOR_WAILMER_DOLL msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT - msgbox SootopolisCity_House6_Text_18FF28, MSGBOX_DEFAULT + msgbox SootopolisCity_House6_Text_IllHoldItForYou, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_House6/text.inc b/data/maps/SootopolisCity_House6/text.inc index 778d47604..327c2bf02 100644 --- a/data/maps/SootopolisCity_House6/text.inc +++ b/data/maps/SootopolisCity_House6/text.inc @@ -1,19 +1,19 @@ -SootopolisCity_House6_Text_18FEA1:: @ 818FEA1 +SootopolisCity_House6_Text_FirstGuestInWhileTakeDoll:: @ 818FEA1 .string "Hello! You're our first guest in a\n" .string "good while.\p" .string "You've brightened up my day, so I'll\n" .string "give you a big WAILMER DOLL.$" -SootopolisCity_House6_Text_18FF12:: @ 818FF12 +SootopolisCity_House6_Text_TakeGoodCareOfIt:: @ 818FF12 .string "Take good care of it!$" -SootopolisCity_House6_Text_18FF28:: @ 818FF28 +SootopolisCity_House6_Text_IllHoldItForYou:: @ 818FF28 .string "Oh, you want it, but not right now?\n" .string "Okay, then I'll hold it for you.$" -SootopolisCity_House6_Text_18FF6D:: @ 818FF6D +SootopolisCity_House6_Text_DontWantThisDoll:: @ 818FF6D .string "Are you sure?\n" .string "You don't want this DOLL?$" -SootopolisCity_House6_Text_18FF95:: @ 818FF95 +SootopolisCity_House6_Text_LovePlushDolls:: @ 818FF95 .string "I love plush DOLLS!$" diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 9f783dc84..fe9dfcb85 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House7_EventScript_15B3EE", + "script": "SootopolisCity_House7_EventScript_OldMan", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House7_EventScript_15B3F7", + "script": "SootopolisCity_House7_EventScript_PokefanF", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc index 6d55926dd..e7da9b687 100644 --- a/data/maps/SootopolisCity_House7/scripts.inc +++ b/data/maps/SootopolisCity_House7/scripts.inc @@ -1,10 +1,10 @@ SootopolisCity_House7_MapScripts:: @ 815B3ED .byte 0 -SootopolisCity_House7_EventScript_15B3EE:: @ 815B3EE - msgbox SootopolisCity_House7_Text_18FFA9, MSGBOX_NPC +SootopolisCity_House7_EventScript_OldMan:: @ 815B3EE + msgbox SootopolisCity_House7_Text_CityFromEruptedVolcano, MSGBOX_NPC end -SootopolisCity_House7_EventScript_15B3F7:: @ 815B3F7 - msgbox SootopolisCity_House7_Text_19005B, MSGBOX_NPC +SootopolisCity_House7_EventScript_PokefanF:: @ 815B3F7 + msgbox SootopolisCity_House7_Text_CaveMadeToKeepSomething, MSGBOX_NPC end diff --git a/data/maps/SootopolisCity_House7/text.inc b/data/maps/SootopolisCity_House7/text.inc index 199e2d1a9..59f481696 100644 --- a/data/maps/SootopolisCity_House7/text.inc +++ b/data/maps/SootopolisCity_House7/text.inc @@ -1,4 +1,4 @@ -SootopolisCity_House7_Text_18FFA9:: @ 818FFA9 +SootopolisCity_House7_Text_CityFromEruptedVolcano:: @ 818FFA9 .string "An underwater volcano erupted and\n" .string "forced itself up from the depths.\p" .string "Its crater emerged from the sea and\n" @@ -6,7 +6,7 @@ SootopolisCity_House7_Text_18FFA9:: @ 818FFA9 .string "That's how SOOTOPOLIS CITY came into\n" .string "being.$" -SootopolisCity_House7_Text_19005B:: @ 819005B +SootopolisCity_House7_Text_CaveMadeToKeepSomething:: @ 819005B .string "The cave that links SOOTOPOLIS and\n" .string "the outside world...\p" .string "It seems as if the cave was made to\n" diff --git a/data/maps/SootopolisCity_House8/map.json b/data/maps/SootopolisCity_House8/map.json index 3b6db3d8d..5fe09e51a 100644 --- a/data/maps/SootopolisCity_House8/map.json +++ b/data/maps/SootopolisCity_House8/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House8_EventScript_15B492", + "script": "SootopolisCity_MonSizeRecordHouse_EventScript_BarboachBrother", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_House8_EventScript_15B401", + "script": "SootopolisCity_MonSizeRecordHouse_EventScript_ShroomishBrother", "flag": "0" } ], @@ -62,7 +62,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SootopolisCity_House8_EventScript_15B523" + "script": "SootopolisCity_MonSizeRecordHouse_EventScript_ShroomishSizeRecord" }, { "type": "sign", @@ -70,7 +70,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SootopolisCity_House8_EventScript_15B531" + "script": "SootopolisCity_MonSizeRecordHouse_EventScript_BarboachSizeRecord" } ] } diff --git a/data/maps/SootopolisCity_House8/scripts.inc b/data/maps/SootopolisCity_House8/scripts.inc index 0e00ae7d6..5c564efc8 100644 --- a/data/maps/SootopolisCity_House8/scripts.inc +++ b/data/maps/SootopolisCity_House8/scripts.inc @@ -1,114 +1,114 @@ SootopolisCity_House8_MapScripts:: @ 815B400 .byte 0 -SootopolisCity_House8_EventScript_15B401:: @ 815B401 +SootopolisCity_MonSizeRecordHouse_EventScript_ShroomishBrother:: @ 815B401 special GetShroomishSizeRecordInfo lock faceplayer - msgbox SootopolisCity_House8_Text_1900F7, MSGBOX_DEFAULT + msgbox SootopolisCity_MonSizeRecordHouse_Text_PleaseShowMeBigShroomish, MSGBOX_DEFAULT special SelectMonForNPCTrade waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 - goto_if_eq SootopolisCity_House8_EventScript_15B448 + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_CancelShowShroomish special CompareShroomishSize compare VAR_RESULT, 1 - goto_if_eq SootopolisCity_House8_EventScript_15B452 + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_NotShroomish compare VAR_RESULT, 2 - goto_if_eq SootopolisCity_House8_EventScript_15B45C + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_SmallShroomish compare VAR_RESULT, 3 - goto_if_eq SootopolisCity_House8_EventScript_15B466 + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_BigShroomish release end -SootopolisCity_House8_EventScript_15B448:: @ 815B448 - msgbox SootopolisCity_House8_Text_190366, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_CancelShowShroomish:: @ 815B448 + msgbox SootopolisCity_MonSizeRecordHouse_Text_DontHaveBigShroomish, MSGBOX_DEFAULT release end -SootopolisCity_House8_EventScript_15B452:: @ 815B452 - msgbox SootopolisCity_House8_Text_190329, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_NotShroomish:: @ 815B452 + msgbox SootopolisCity_MonSizeRecordHouse_Text_ThatsNotShroomish, MSGBOX_DEFAULT release end -SootopolisCity_House8_EventScript_15B45C:: @ 815B45C - msgbox SootopolisCity_House8_Text_1902E4, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_SmallShroomish:: @ 815B45C + msgbox SootopolisCity_MonSizeRecordHouse_Text_SeenBiggerShroomish, MSGBOX_DEFAULT release end -SootopolisCity_House8_EventScript_15B466:: @ 815B466 - msgbox SootopolisCity_House8_Text_19021D, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_BigShroomish:: @ 815B466 + msgbox SootopolisCity_MonSizeRecordHouse_Text_GoshMightBeBiggerThanBarboach, MSGBOX_DEFAULT giveitem ITEM_ELIXIR compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_House8_EventScript_15B488 + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_NoRoomForElixir1 closemessage release end -SootopolisCity_House8_EventScript_15B488:: @ 815B488 - msgbox SootopolisCity_House8_Text_1902C4, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_NoRoomForElixir1:: @ 815B488 + msgbox SootopolisCity_MonSizeRecordHouse_Text_BagCrammedFull1, MSGBOX_DEFAULT release end -SootopolisCity_House8_EventScript_15B492:: @ 815B492 +SootopolisCity_MonSizeRecordHouse_EventScript_BarboachBrother:: @ 815B492 special GetBarboachSizeRecordInfo lock faceplayer - msgbox SootopolisCity_House8_Text_190431, MSGBOX_DEFAULT + msgbox SootopolisCity_MonSizeRecordHouse_Text_PleaseShowMeBigBarboach, MSGBOX_DEFAULT special SelectMonForNPCTrade waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 - goto_if_eq SootopolisCity_House8_EventScript_15B4D9 + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_CancelShowBarboach special CompareBarboachSize compare VAR_RESULT, 1 - goto_if_eq SootopolisCity_House8_EventScript_15B4E3 + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_NotBarboach compare VAR_RESULT, 2 - goto_if_eq SootopolisCity_House8_EventScript_15B4ED + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_SmallBarboach compare VAR_RESULT, 3 - goto_if_eq SootopolisCity_House8_EventScript_15B4F7 + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_BigBarboach release end -SootopolisCity_House8_EventScript_15B4D9:: @ 815B4D9 - msgbox SootopolisCity_House8_Text_19065A, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_CancelShowBarboach:: @ 815B4D9 + msgbox SootopolisCity_MonSizeRecordHouse_Text_DontHaveBigBarboach, MSGBOX_DEFAULT release end -SootopolisCity_House8_EventScript_15B4E3:: @ 815B4E3 - msgbox SootopolisCity_House8_Text_190628, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_NotBarboach:: @ 815B4E3 + msgbox SootopolisCity_MonSizeRecordHouse_Text_ThatsNotBarboach, MSGBOX_DEFAULT release end -SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED - msgbox SootopolisCity_House8_Text_1905E6, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_SmallBarboach:: @ 815B4ED + msgbox SootopolisCity_MonSizeRecordHouse_Text_SeenBiggerBarboach, MSGBOX_DEFAULT release end -SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 - msgbox SootopolisCity_House8_Text_190536, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_BigBarboach:: @ 815B4F7 + msgbox SootopolisCity_MonSizeRecordHouse_Text_WowMightBeBiggerThanBarboach, MSGBOX_DEFAULT giveitem ITEM_ELIXIR compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_House8_EventScript_15B519 + goto_if_eq SootopolisCity_MonSizeRecordHouse_EventScript_NoRoomForElixir2 closemessage release end -SootopolisCity_House8_EventScript_15B519:: @ 815B519 - msgbox SootopolisCity_House8_Text_1905C1, MSGBOX_DEFAULT +SootopolisCity_MonSizeRecordHouse_EventScript_NoRoomForElixir2:: @ 815B519 + msgbox SootopolisCity_House8_Text_BagIsFull, MSGBOX_DEFAULT release end -SootopolisCity_House8_EventScript_15B523:: @ 815B523 +SootopolisCity_MonSizeRecordHouse_EventScript_ShroomishSizeRecord:: @ 815B523 special GetShroomishSizeRecordInfo lockall - msgbox SootopolisCity_House8_Text_1903C9, MSGBOX_DEFAULT + msgbox SootopolisCity_MonSizeRecordHouse_Text_BiggestShroomishInHistory, MSGBOX_DEFAULT releaseall end -SootopolisCity_House8_EventScript_15B531:: @ 815B531 +SootopolisCity_MonSizeRecordHouse_EventScript_BarboachSizeRecord:: @ 815B531 special GetBarboachSizeRecordInfo lockall - msgbox SootopolisCity_House8_Text_1906BE, MSGBOX_DEFAULT + msgbox SootopolisCity_MonSizeRecordHouse_Text_BiggestBarboachInHistory, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SootopolisCity_House8/text.inc b/data/maps/SootopolisCity_House8/text.inc index 13a328ae1..ac2de8f25 100644 --- a/data/maps/SootopolisCity_House8/text.inc +++ b/data/maps/SootopolisCity_House8/text.inc @@ -1,4 +1,4 @@ -SootopolisCity_House8_Text_1900F7:: @ 81900F7 +SootopolisCity_MonSizeRecordHouse_Text_PleaseShowMeBigShroomish:: @ 81900F7 .string "Do you know the POKéMON SHROOMISH?\n" .string "It's hardly ever seen in SOOTOPOLIS.\p" .string "Anyway, I love big SHROOMISH.\n" @@ -10,7 +10,7 @@ SootopolisCity_House8_Text_1900F7:: @ 81900F7 .string "Huh? Do you have a SHROOMISH with you?\n" .string "P-p-please, show me!$" -SootopolisCity_House8_Text_19021D:: @ 819021D +SootopolisCity_MonSizeRecordHouse_Text_GoshMightBeBiggerThanBarboach:: @ 819021D .string "{STR_VAR_2} inches!\n" .string "Oh, my gosh, this is a big one!\p" .string "It might even beat the big BARBOACH\n" @@ -21,32 +21,32 @@ SootopolisCity_House8_Text_19021D:: @ 819021D UnknownString_81902AE: @ 81902AE .string "{PLAYER} received a POTION.$" -SootopolisCity_House8_Text_1902C4:: @ 81902C4 +SootopolisCity_MonSizeRecordHouse_Text_BagCrammedFull1:: @ 81902C4 .string "Hunh?\n" .string "Your BAG is crammed full.$" -SootopolisCity_House8_Text_1902E4:: @ 81902E4 +SootopolisCity_MonSizeRecordHouse_Text_SeenBiggerShroomish:: @ 81902E4 .string "{STR_VAR_2} inches, is it?\p" .string "Hmm... I've seen a bigger SHROOMISH\n" .string "than this one.$" -SootopolisCity_House8_Text_190329:: @ 8190329 +SootopolisCity_MonSizeRecordHouse_Text_ThatsNotShroomish:: @ 8190329 .string "Oh, now this is quite something...\n" .string "But it's not a SHROOMISH!$" -SootopolisCity_House8_Text_190366:: @ 8190366 +SootopolisCity_MonSizeRecordHouse_Text_DontHaveBigShroomish:: @ 8190366 .string "You don't have a big SHROOMISH?\n" .string "That's too bad...\p" .string "If you get a big SHROOMISH, please\n" .string "come show me.$" -SootopolisCity_House8_Text_1903C9:: @ 81903C9 +SootopolisCity_MonSizeRecordHouse_Text_BiggestShroomishInHistory:: @ 81903C9 .string "The biggest SHROOMISH in history!\n" .string "{STR_VAR_2}'s {STR_VAR_3}-inch giant!\p" .string "A SHROOMISH bigger than a BARBOACH\n" .string "always wanted!$" -SootopolisCity_House8_Text_190431:: @ 8190431 +SootopolisCity_MonSizeRecordHouse_Text_PleaseShowMeBigBarboach:: @ 8190431 .string "Do you know the POKéMON BARBOACH?\n" .string "It's rarely seen in SOOTOPOLIS.\p" .string "I love, I mean love, big BARBOACH!\p" @@ -57,7 +57,7 @@ SootopolisCity_House8_Text_190431:: @ 8190431 .string "Hunh? Do you have a BARBOACH?\n" .string "P-p-please show me!$" -SootopolisCity_House8_Text_190536:: @ 8190536 +SootopolisCity_MonSizeRecordHouse_Text_WowMightBeBiggerThanBarboach:: @ 8190536 .string "{STR_VAR_2} inches!\n" .string "Wow, that is big!\p" .string "It might be even bigger than the huge\n" @@ -65,25 +65,25 @@ SootopolisCity_House8_Text_190536:: @ 8190536 .string "Thanks for showing me!\n" .string "This is my thanks!$" -SootopolisCity_House8_Text_1905C1:: @ 81905C1 +SootopolisCity_House8_Text_BagIsFull:: @ 81905C1 .string "Whoops, looks like your BAG is full.$" -SootopolisCity_House8_Text_1905E6:: @ 81905E6 +SootopolisCity_MonSizeRecordHouse_Text_SeenBiggerBarboach:: @ 81905E6 .string "{STR_VAR_2} inches?\p" .string "Hmm... I've seen a bigger BARBOACH\n" .string "than this one here.$" -SootopolisCity_House8_Text_190628:: @ 8190628 +SootopolisCity_MonSizeRecordHouse_Text_ThatsNotBarboach:: @ 8190628 .string "Well, isn't this something!\n" .string "But it's no BARBOACH!$" -SootopolisCity_House8_Text_19065A:: @ 819065A +SootopolisCity_MonSizeRecordHouse_Text_DontHaveBigBarboach:: @ 819065A .string "Don't you have a big BARBOACH?\n" .string "How disappointing...\p" .string "If you get a big BARBOACH, please\n" .string "come show me!$" -SootopolisCity_House8_Text_1906BE:: @ 81906BE +SootopolisCity_MonSizeRecordHouse_Text_BiggestBarboachInHistory:: @ 81906BE .string "The biggest BARBOACH in history!\n" .string "{STR_VAR_2}'s {STR_VAR_3}-inch colossus!\p" .string "A BARBOACH bigger than a SHROOMISH\n" diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 66db4cb40..35f94e033 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Mart_EventScript_15B21B", + "script": "SootopolisCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Mart_EventScript_15B24A", + "script": "SootopolisCity_Mart_EventScript_FatMan", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Mart_EventScript_15B272", + "script": "SootopolisCity_Mart_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 132bca889..ee1681bb9 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -1,18 +1,18 @@ SootopolisCity_Mart_MapScripts:: @ 815B21A .byte 0 -SootopolisCity_Mart_EventScript_15B21B:: @ 815B21B +SootopolisCity_Mart_EventScript_Clerk:: @ 815B21B lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart SootopolisCity_Mart_Items + pokemart SootopolisCity_Mart_Pokemart msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -SootopolisCity_Mart_Items:: @ 815B234 +SootopolisCity_Mart_Pokemart:: @ 815B234 .2byte ITEM_ULTRA_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_MAX_POTION @@ -26,30 +26,30 @@ SootopolisCity_Mart_Items:: @ 815B234 release end -SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A +SootopolisCity_Mart_EventScript_FatMan:: @ 815B24A lock faceplayer - goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B268 - goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B268 - msgbox SootopolisCity_Mart_Text_18F8D7, MSGBOX_DEFAULT + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_FatManNoLegendary + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_FatManNoLegendary + msgbox SootopolisCity_Mart_Text_TooScaryOutside, MSGBOX_DEFAULT release end -SootopolisCity_Mart_EventScript_15B268:: @ 815B268 - msgbox SootopolisCity_Mart_Text_18F890, MSGBOX_DEFAULT +SootopolisCity_Mart_EventScript_FatManNoLegendary:: @ 815B268 + msgbox SootopolisCity_Mart_Text_PPUpIsGreat, MSGBOX_DEFAULT release end -SootopolisCity_Mart_EventScript_15B272:: @ 815B272 +SootopolisCity_Mart_EventScript_Gentleman:: @ 815B272 lock faceplayer - goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B290 - goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B290 - msgbox SootopolisCity_Mart_Text_18F96B, MSGBOX_DEFAULT + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_GentlemanNoLegendary + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_GentlemanNoLegendary + msgbox SootopolisCity_Mart_Text_DidSomethingAwaken, MSGBOX_DEFAULT release end -SootopolisCity_Mart_EventScript_15B290:: @ 815B290 - msgbox SootopolisCity_Mart_Text_18F8F2, MSGBOX_DEFAULT +SootopolisCity_Mart_EventScript_GentlemanNoLegendary:: @ 815B290 + msgbox SootopolisCity_Mart_Text_FullRestoreItemOfDreams, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_Mart/text.inc b/data/maps/SootopolisCity_Mart/text.inc index 00d1724c6..e32cf279d 100644 --- a/data/maps/SootopolisCity_Mart/text.inc +++ b/data/maps/SootopolisCity_Mart/text.inc @@ -1,17 +1,17 @@ -SootopolisCity_Mart_Text_18F890:: @ 818F890 +SootopolisCity_Mart_Text_PPUpIsGreat:: @ 818F890 .string "PP UP is great!\p" .string "It raises the POWER POINTS, the PP,\n" .string "of a POKéMON move.$" -SootopolisCity_Mart_Text_18F8D7:: @ 818F8D7 +SootopolisCity_Mart_Text_TooScaryOutside:: @ 818F8D7 .string "What... What is happening?$" -SootopolisCity_Mart_Text_18F8F2:: @ 818F8F2 +SootopolisCity_Mart_Text_FullRestoreItemOfDreams:: @ 818F8F2 .string "Do you know FULL RESTORE?\p" .string "Full restoration of HP!\n" .string "Eradication of all status problems!\p" .string "It's truly an item of your dreams!$" -SootopolisCity_Mart_Text_18F96B:: @ 818F96B +SootopolisCity_Mart_Text_DidSomethingAwaken:: @ 818F96B .string "This weather...\n" .string "Did something awaken?$" diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index cb33cd661..394beead0 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_1F_EventScript_15BC70", + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_1F_EventScript_15B1A8", + "script": "SootopolisCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_1F_EventScript_15B1D0", + "script": "SootopolisCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index c82d98fef..ce2a51b4c 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190 - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_15B196 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition .byte 0 -SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 +SootopolisCity_PokemonCenter_1F_OnTransition:: @ 815B196 setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY end @@ -14,30 +14,30 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 release end -SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 +SootopolisCity_PokemonCenter_1F_EventScript_Gentleman:: @ 815B1A8 lock faceplayer - goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 - goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 - msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, MSGBOX_DEFAULT + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendary + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendary + msgbox SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6 - msgbox SootopolisCity_PokemonCenter_1F_Text_18F6A2, MSGBOX_DEFAULT +SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendary:: @ 815B1C6 + msgbox SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 +SootopolisCity_PokemonCenter_1F_EventScript_Woman:: @ 815B1D0 lock faceplayer - goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE - goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE - msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, MSGBOX_DEFAULT + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendary + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendary + msgbox SootopolisCity_PokemonCenter_1F_Text_ImReallyScared, MSGBOX_DEFAULT release end -SootopolisCity_PokemonCenter_1F_EventScript_15B1EE:: @ 815B1EE - msgbox SootopolisCity_PokemonCenter_1F_Text_18F7EA, MSGBOX_DEFAULT +SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendary:: @ 815B1EE + msgbox SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/text.inc b/data/maps/SootopolisCity_PokemonCenter_1F/text.inc index c36146bc8..5be058ef0 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/text.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -SootopolisCity_PokemonCenter_1F_Text_18F6A2:: @ 818F6A2 +SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn:: @ 818F6A2 .string "WALLACE, this town's GYM LEADER, is a\n" .string "powerful TRAINER.\p" .string "He's rumored to be the best in the\n" @@ -7,18 +7,18 @@ SootopolisCity_PokemonCenter_1F_Text_18F6A2:: @ 818F6A2 .string "They're said to be even stronger than\n" .string "WALLACE. How strong could they be?$" -SootopolisCity_PokemonCenter_1F_Text_18F770:: @ 818F770 +SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge:: @ 818F770 .string "Everyone in town has taken refuge\n" .string "and won't come out of their homes.\p" .string "This weather..\n" .string "Could it be the prelude to something?$" -SootopolisCity_PokemonCenter_1F_Text_18F7EA:: @ 818F7EA +SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon:: @ 818F7EA .string "Whenever, wherever, and whatever\n" .string "happens, I will always be friends with\l" .string "POKéMON.\p" .string "Because it's fun to be with POKéMON!$" -SootopolisCity_PokemonCenter_1F_Text_18F860:: @ 818F860 +SootopolisCity_PokemonCenter_1F_Text_ImReallyScared:: @ 818F860 .string "I don't know why...\n" .string "But... I'm really scared...$" diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index c9b222919..878a18186 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -32,7 +32,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_EventScript_14E899", + "script": "VerdanturfTown_EventScript_Man", "flag": "0" }, { @@ -45,7 +45,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_EventScript_14E866", + "script": "VerdanturfTown_EventScript_Twin", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_EventScript_14E8AB", + "script": "VerdanturfTown_EventScript_Boy", "flag": "0" }, { @@ -71,7 +71,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_EventScript_14E8A2", + "script": "VerdanturfTown_EventScript_Camper", "flag": "0" } ], @@ -142,7 +142,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "VerdanturfTown_EventScript_14E8CA" + "script": "VerdanturfTown_EventScript_TownSign" }, { "type": "sign", @@ -158,7 +158,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "VerdanturfTown_EventScript_14E8D3" + "script": "VerdanturfTown_EventScript_WandasHouseSign" }, { "type": "sign", @@ -182,7 +182,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "VerdanturfTown_EventScript_14E8DC" + "script": "VerdanturfTown_EventScript_ContestHallSign" }, { "type": "sign", @@ -190,7 +190,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "VerdanturfTown_EventScript_14E8E5" + "script": "VerdanturfTown_EventScript_RusturfTunnelSign" } ] } diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 24e6eb6c6..4b3b1e09d 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -1,63 +1,63 @@ VerdanturfTown_MapScripts:: @ 814E854 - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_14E85A + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_OnTransition .byte 0 -VerdanturfTown_MapScript1_14E85A:: @ 814E85A +VerdanturfTown_OnTransition:: @ 814E85A setflag FLAG_VISITED_VERDANTURF_TOWN setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF end -VerdanturfTown_EventScript_14E866:: @ 814E866 +VerdanturfTown_EventScript_Twin:: @ 814E866 lock faceplayer - goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E885 - msgbox VerdanturfTown_Text_16CAEB, MSGBOX_DEFAULT + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_TwinTunnelOpen + msgbox VerdanturfTown_Text_ManTryingToDigTunnel, MSGBOX_DEFAULT applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end -VerdanturfTown_EventScript_14E885:: @ 814E885 - msgbox VerdanturfTown_Text_16CBCE, MSGBOX_DEFAULT +VerdanturfTown_EventScript_TwinTunnelOpen:: @ 814E885 + msgbox VerdanturfTown_Text_ManDugTunnelForLove, MSGBOX_DEFAULT applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end -VerdanturfTown_EventScript_14E899:: @ 814E899 - msgbox VerdanturfTown_Text_16CC24, MSGBOX_NPC +VerdanturfTown_EventScript_Man:: @ 814E899 + msgbox VerdanturfTown_Text_AirCleanHere, MSGBOX_NPC end -VerdanturfTown_EventScript_14E8A2:: @ 814E8A2 - msgbox VerdanturfTown_Text_16CCD0, MSGBOX_NPC +VerdanturfTown_EventScript_Camper:: @ 814E8A2 + msgbox VerdanturfTown_Text_MakeContestDebut, MSGBOX_NPC end -VerdanturfTown_EventScript_14E8AB:: @ 814E8AB +VerdanturfTown_EventScript_Boy:: @ 814E8AB lock faceplayer - goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E8C0 - msgbox VerdanturfTown_Text_16CD4D, MSGBOX_DEFAULT + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_BoyTunnelOpen + msgbox VerdanturfTown_Text_GuyTryingToBustThroughCave, MSGBOX_DEFAULT release end -VerdanturfTown_EventScript_14E8C0:: @ 814E8C0 - msgbox VerdanturfTown_Text_16CE30, MSGBOX_DEFAULT +VerdanturfTown_EventScript_BoyTunnelOpen:: @ 814E8C0 + msgbox VerdanturfTown_Text_EasyToGetToRustboroNow, MSGBOX_DEFAULT release end -VerdanturfTown_EventScript_14E8CA:: @ 814E8CA - msgbox VerdanturfTown_Text_16CEC0, MSGBOX_SIGN +VerdanturfTown_EventScript_TownSign:: @ 814E8CA + msgbox VerdanturfTown_Text_TownSign, MSGBOX_SIGN end -VerdanturfTown_EventScript_14E8D3:: @ 814E8D3 - msgbox VerdanturfTown_Text_16CF0D, MSGBOX_SIGN +VerdanturfTown_EventScript_WandasHouseSign:: @ 814E8D3 + msgbox VerdanturfTown_Text_WandasHouse, MSGBOX_SIGN end -VerdanturfTown_EventScript_14E8DC:: @ 814E8DC - msgbox VerdanturfTown_Text_16CF1B, MSGBOX_SIGN +VerdanturfTown_EventScript_ContestHallSign:: @ 814E8DC + msgbox VerdanturfTown_Text_ContestHallSign, MSGBOX_SIGN end -VerdanturfTown_EventScript_14E8E5:: @ 814E8E5 - msgbox VerdanturfTown_Text_16CF6D, MSGBOX_SIGN +VerdanturfTown_EventScript_RusturfTunnelSign:: @ 814E8E5 + msgbox VerdanturfTown_Text_RusturfTunnelSign, MSGBOX_SIGN end diff --git a/data/maps/VerdanturfTown/text.inc b/data/maps/VerdanturfTown/text.inc index 8ba1a7db8..8c0efdb39 100644 --- a/data/maps/VerdanturfTown/text.inc +++ b/data/maps/VerdanturfTown/text.inc @@ -1,4 +1,4 @@ -VerdanturfTown_Text_16CAEB:: @ 816CAEB +VerdanturfTown_Text_ManTryingToDigTunnel:: @ 816CAEB .string "My papa told me.\p" .string "He says this tunnel is full of\n" .string "timid POKéMON.\p" @@ -9,25 +9,25 @@ VerdanturfTown_Text_16CAEB:: @ 816CAEB .string "But there's one man.\n" .string "He's trying to dig the tunnel by himself!$" -VerdanturfTown_Text_16CBCE:: @ 816CBCE +VerdanturfTown_Text_ManDugTunnelForLove:: @ 816CBCE .string "There was a man who dug a tunnel for\n" .string "a lady he loved.\p" .string "I don't really get it, but hey!$" -VerdanturfTown_Text_16CC24:: @ 816CC24 +VerdanturfTown_Text_AirCleanHere:: @ 816CC24 .string "The way the winds blow, volcanic ash\n" .string "is never blown in this direction.\p" .string "The air is clean and delicious here.\n" .string "Living here should do wonders for even\l" .string "frail and sickly people.$" -VerdanturfTown_Text_16CCD0:: @ 816CCD0 +VerdanturfTown_Text_MakeContestDebut:: @ 816CCD0 .string "I'm feeling a little confident about the\n" .string "cuteness of my POKéMON.\p" .string "I wanted to make its CONTEST debut,\n" .string "so that's why I'm here.$" -VerdanturfTown_Text_16CD4D:: @ 816CD4D +VerdanturfTown_Text_GuyTryingToBustThroughCave:: @ 816CD4D .string "Did you see the cave next to the\n" .string "POKéMON MART?\p" .string "There's a guy in there who's trying to\n" @@ -36,26 +36,26 @@ VerdanturfTown_Text_16CD4D:: @ 816CD4D .string "It'd be great if we could go through...\n" .string "It'll make it easy to visit RUSTBORO.$" -VerdanturfTown_Text_16CE30:: @ 816CE30 +VerdanturfTown_Text_EasyToGetToRustboroNow:: @ 816CE30 .string "That cave next to the POKéMON MART\n" .string "is now a tunnel to the other side.\p" .string "It's great - it's easy to go shop for new\n" .string "DEVON products in RUSTBORO now.$" -VerdanturfTown_Text_16CEC0:: @ 816CEC0 +VerdanturfTown_Text_TownSign:: @ 816CEC0 .string "VERDANTURF TOWN\p" .string "“The windswept highlands with the\n" .string "sweet fragrance of grass.”$" -VerdanturfTown_Text_16CF0D:: @ 816CF0D +VerdanturfTown_Text_WandasHouse:: @ 816CF0D .string "WANDA'S HOUSE$" -VerdanturfTown_Text_16CF1B:: @ 816CF1B +VerdanturfTown_Text_ContestHallSign:: @ 816CF1B .string "POKéMON CONTESTS\n" .string "NORMAL RANK REGISTRATION\p" .string "“Gather here, all ye POKéMON TRAINERS!”$" -VerdanturfTown_Text_16CF6D:: @ 816CF6D +VerdanturfTown_Text_RusturfTunnelSign:: @ 816CF6D .string "RUSTURF TUNNEL\n" .string "“Linking RUSTBORO and VERDANTURF\p" .string "“The tunnel project has been\n" diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 7416a3302..eb0a37eb7 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_154030", + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9", + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu", "flag": "0" } ], diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc index 2479bb5e7..51f059c32 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc @@ -1,63 +1,63 @@ VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 815402F .byte 0 -VerdanturfTown_FriendshipRatersHouse_EventScript_154030:: @ 8154030 +VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater:: @ 8154030 lock faceplayer - msgbox VerdanturfTown_FriendshipRatersHouse_Text_178A9C, MSGBOX_DEFAULT + msgbox VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore switch VAR_RESULT - case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154093 - case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_15409D - case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_1540A7 - case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_1540B1 - case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_1540BB - case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_1540C5 - case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_1540CF + case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou + case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary + case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou + case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou + case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot + case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy + case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou release end -VerdanturfTown_FriendshipRatersHouse_EventScript_154093:: @ 8154093 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_178C90, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou:: @ 8154093 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_15409D:: @ 815409D - msgbox VerdanturfTown_FriendshipRatersHouse_Text_178C39, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary:: @ 815409D + msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryWary, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_1540A7:: @ 81540A7 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_178BFA, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou:: @ 81540A7 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_1540B1:: @ 81540B1 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_178BC4, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou:: @ 81540B1 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_1540BB:: @ 81540BB - msgbox VerdanturfTown_FriendshipRatersHouse_Text_178B82, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot:: @ 81540BB + msgbox VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_1540C5:: @ 81540C5 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_178B43, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy:: @ 81540C5 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_1540CF:: @ 81540CF - msgbox VerdanturfTown_FriendshipRatersHouse_Text_178AF2, MSGBOX_DEFAULT +VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou:: @ 81540CF + msgbox VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou, MSGBOX_DEFAULT release end -VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 +VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu:: @ 81540D9 lock faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, MSGBOX_DEFAULT + msgbox VerdanturfTown_FriendshipRatersHouse_Text_Pikachu, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc index 683ae3fc6..3a447442b 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc @@ -1,39 +1,39 @@ -VerdanturfTown_FriendshipRatersHouse_Text_178A9C:: @ 8178A9C +VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou:: @ 8178A9C .string "Let me see your POKéMON.\n" .string "I'll check to see how much it likes you.\p" .string "Oh.\n" .string "Your POKéMON...$" -VerdanturfTown_FriendshipRatersHouse_Text_178AF2:: @ 8178AF2 +VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou:: @ 8178AF2 .string "It adores you.\n" .string "It can't possibly love you any more.\l" .string "I even feel happy seeing it.$" -VerdanturfTown_FriendshipRatersHouse_Text_178B43:: @ 8178B43 +VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy:: @ 8178B43 .string "It seems to be very happy.\n" .string "It obviously likes you a whole lot.$" -VerdanturfTown_FriendshipRatersHouse_Text_178B82:: @ 8178B82 +VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot:: @ 8178B82 .string "It likes you quite a lot.\n" .string "It seems to want to be babied a little.$" -VerdanturfTown_FriendshipRatersHouse_Text_178BC4:: @ 8178BC4 +VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou:: @ 8178BC4 .string "It's getting used to you.\n" .string "It seems to believe in you.$" -VerdanturfTown_FriendshipRatersHouse_Text_178BFA:: @ 8178BFA +VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou:: @ 8178BFA .string "It's not very used to you yet.\n" .string "It neither loves nor hates you.$" -VerdanturfTown_FriendshipRatersHouse_Text_178C39:: @ 8178C39 +VerdanturfTown_FriendshipRatersHouse_Text_VeryWary:: @ 8178C39 .string "It's very wary.\n" .string "It has scary viciousness in its eyes.\l" .string "It doesn't like you much at all.$" -VerdanturfTown_FriendshipRatersHouse_Text_178C90:: @ 8178C90 +VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou:: @ 8178C90 .string "This is a little hard for me to say...\p" .string "Your POKéMON simply detests you.\n" .string "Doesn't that make you uncomfortable?$" -VerdanturfTown_FriendshipRatersHouse_Text_178CFD:: @ 8178CFD +VerdanturfTown_FriendshipRatersHouse_Text_Pikachu:: @ 8178CFD .string "PIKACHU: Pika pika!$" diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index 6ad225e02..665cac42e 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_House_EventScript_1540ED", + "script": "VerdanturfTown_House_EventScript_Woman1", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_House_EventScript_1540F6", + "script": "VerdanturfTown_House_EventScript_Woman2", "flag": "0" } ], diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc index 242a79f9d..223693884 100644 --- a/data/maps/VerdanturfTown_House/scripts.inc +++ b/data/maps/VerdanturfTown_House/scripts.inc @@ -1,10 +1,10 @@ VerdanturfTown_House_MapScripts:: @ 81540EC .byte 0 -VerdanturfTown_House_EventScript_1540ED:: @ 81540ED - msgbox VerdanturfTown_House_Text_178D11, MSGBOX_NPC +VerdanturfTown_House_EventScript_Woman1:: @ 81540ED + msgbox VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague, MSGBOX_NPC end -VerdanturfTown_House_EventScript_1540F6:: @ 81540F6 - msgbox VerdanturfTown_House_Text_178D8E, MSGBOX_NPC +VerdanturfTown_House_EventScript_Woman2:: @ 81540F6 + msgbox VerdanturfTown_House_Text_DefeatEliteFourInARow, MSGBOX_NPC end diff --git a/data/maps/VerdanturfTown_House/text.inc b/data/maps/VerdanturfTown_House/text.inc index 8db1656ee..73a33a1dc 100644 --- a/data/maps/VerdanturfTown_House/text.inc +++ b/data/maps/VerdanturfTown_House/text.inc @@ -1,10 +1,10 @@ -VerdanturfTown_House_Text_178D11:: @ 8178D11 +VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague:: @ 8178D11 .string "Far away, deep in EVER GRANDE CITY,\n" .string "is the POKéMON LEAGUE.\p" .string "The TRAINERS who gather there are\n" .string "all frighteningly well skilled.$" -VerdanturfTown_House_Text_178D8E:: @ 8178D8E +VerdanturfTown_House_Text_DefeatEliteFourInARow:: @ 8178D8E .string "In the POKéMON LEAGUE, I think the\n" .string "rules say that you have to battle the\l" .string "ELITE FOUR all in a row.\p" diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 533ca192b..af2003d6d 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_Mart_EventScript_153EBC", + "script": "VerdanturfTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_Mart_EventScript_153EEE", + "script": "VerdanturfTown_Mart_EventScript_Boy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_Mart_EventScript_153EF7", + "script": "VerdanturfTown_Mart_EventScript_ExpertF", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_Mart_EventScript_153F00", + "script": "VerdanturfTown_Mart_EventScript_Lass", "flag": "0" } ], diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index c843d78ee..33991fd42 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -1,18 +1,18 @@ VerdanturfTown_Mart_MapScripts:: @ 8153EBB .byte 0 -VerdanturfTown_Mart_EventScript_153EBC:: @ 8153EBC +VerdanturfTown_Mart_EventScript_Clerk:: @ 8153EBC lock faceplayer message Text_HowMayIServeYou waitmessage - pokemart VerdanturfTown_Mart_Items + pokemart VerdanturfTown_Mart_Pokemart msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -VerdanturfTown_Mart_Items:: @ 8153ED4 +VerdanturfTown_Mart_Pokemart:: @ 8153ED4 .2byte ITEM_GREAT_BALL .2byte ITEM_NEST_BALL .2byte ITEM_SUPER_POTION @@ -28,14 +28,14 @@ VerdanturfTown_Mart_Items:: @ 8153ED4 release end -VerdanturfTown_Mart_EventScript_153EEE:: @ 8153EEE - msgbox VerdanturfTown_Mart_Text_1781C9, MSGBOX_NPC +VerdanturfTown_Mart_EventScript_Boy:: @ 8153EEE + msgbox VerdanturfTown_Mart_Text_XSpecialIsCrucial, MSGBOX_NPC end -VerdanturfTown_Mart_EventScript_153EF7:: @ 8153EF7 - msgbox VerdanturfTown_Mart_Text_178240, MSGBOX_NPC +VerdanturfTown_Mart_EventScript_ExpertF:: @ 8153EF7 + msgbox VerdanturfTown_Mart_Text_NoStrategyGuidesForContest, MSGBOX_NPC end -VerdanturfTown_Mart_EventScript_153F00:: @ 8153F00 - msgbox VerdanturfTown_Mart_Text_1782C0, MSGBOX_NPC +VerdanturfTown_Mart_EventScript_Lass:: @ 8153F00 + msgbox VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon, MSGBOX_NPC end diff --git a/data/maps/VerdanturfTown_Mart/text.inc b/data/maps/VerdanturfTown_Mart/text.inc index 1c4ac2081..29565fc24 100644 --- a/data/maps/VerdanturfTown_Mart/text.inc +++ b/data/maps/VerdanturfTown_Mart/text.inc @@ -1,16 +1,16 @@ -VerdanturfTown_Mart_Text_1781C9:: @ 81781C9 +VerdanturfTown_Mart_Text_XSpecialIsCrucial:: @ 81781C9 .string "For any POKéMON match, X SPECIAL\n" .string "is crucial.\p" .string "It jacks up the power of some moves\n" .string "even though it's only for one battle.$" -VerdanturfTown_Mart_Text_178240:: @ 8178240 +VerdanturfTown_Mart_Text_NoStrategyGuidesForContest:: @ 8178240 .string "They don't sell any items that will let\n" .string "you win CONTESTS...\p" .string "It means you have to raise POKéMON\n" .string "diligently on an everyday basis.$" -VerdanturfTown_Mart_Text_1782C0:: @ 81782C0 +VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon:: @ 81782C0 .string "The NEST BALL works better on\n" .string "weakened POKéMON.\p" .string "VERDANTURF is the only place you can\n" diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 03dc8227f..7be046e6a 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_1F_EventScript_153F18", + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_1F_EventScript_153F26", + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_1F_EventScript_153F2F", + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM", "flag": "0" } ], diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 1c60fc1bb..6dbc1a8e3 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,14 +1,13 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition .byte 0 -VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F +VerdanturfTown_PokemonCenter_1F_OnTransition:: @ 8153F0F setrespawn HEAL_LOCATION_VERDANTURF_TOWN call Common_EventScript_UpdateBrineyLocation end -PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 -VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 +VerdanturfTown_PokemonCenter_1F_EventScript_Nurse:: @ 8153F18 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,10 +15,10 @@ VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 release end -VerdanturfTown_PokemonCenter_1F_EventScript_153F26:: @ 8153F26 - msgbox VerdanturfTown_PokemonCenter_1F_Text_17831D, MSGBOX_NPC +VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman:: @ 8153F26 + msgbox VerdanturfTown_PokemonCenter_1F_Text_TrainerIsntQualifiedIf, MSGBOX_NPC end -VerdanturfTown_PokemonCenter_1F_EventScript_153F2F:: @ 8153F2F - msgbox VerdanturfTown_PokemonCenter_1F_Text_178389, MSGBOX_NPC +VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8153F2F + msgbox VerdanturfTown_PokemonCenter_1F_Text_AllContestsOriginateHere, MSGBOX_NPC end diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc index 4af44c024..828c31654 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc @@ -1,9 +1,9 @@ -VerdanturfTown_PokemonCenter_1F_Text_17831D:: @ 817831D +VerdanturfTown_PokemonCenter_1F_Text_TrainerIsntQualifiedIf:: @ 817831D .string "I daresay a TRAINER isn't qualified if\n" .string "POKéMON aren't settled and friendly.\l" .string "Have you given them any {POKEBLOCK}S?$" -VerdanturfTown_PokemonCenter_1F_Text_178389:: @ 8178389 +VerdanturfTown_PokemonCenter_1F_Text_AllContestsOriginateHere:: @ 8178389 .string "Let me hazard a guess why you're in\n" .string "VERDANTURF. The reason: CONTESTS.\p" .string "All CONTEST challenges originate here.$" diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 33a7a9efb..62a4a99f9 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_153F5B", + "script": "VerdanturfTown_WandasHouse_EventScript_Wally", "flag": "FLAG_HIDE_WALLY_WANDAS_HOUSE" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_153FAF", + "script": "VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend", "flag": "FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_153F7D", + "script": "VerdanturfTown_WandasHouse_EventScript_WallysUncle", "flag": "FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_153FEA", + "script": "VerdanturfTown_WandasHouse_EventScript_WallysAunt", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_WandasHouse_EventScript_153FB8", + "script": "VerdanturfTown_WandasHouse_EventScript_Wanda", "flag": "FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE" } ], diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index 9d83597c1..2caa426e2 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -1,83 +1,83 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A .byte 0 -VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B +VerdanturfTown_WandasHouse_EventScript_Wally:: @ 8153F5B lock faceplayer - goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_153F73 - msgbox VerdanturfTown_WandasHouse_Text_1783F6, MSGBOX_DEFAULT + goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech + msgbox VerdanturfTown_WandasHouse_Text_StrongerSpeech, MSGBOX_DEFAULT setflag FLAG_WALLY_SPEECH release end -VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73 - msgbox VerdanturfTown_WandasHouse_Text_178521, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech:: @ 8153F73 + msgbox VerdanturfTown_WandasHouse_Text_StrongerSpeechShort, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D +VerdanturfTown_WandasHouse_EventScript_WallysUncle:: @ 8153F7D lock faceplayer - goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_153FA5 - goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153F9B - msgbox VerdanturfTown_WandasHouse_Text_17859A, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff + msgbox VerdanturfTown_WandasHouse_Text_WallysNextDoor, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_153F9B:: @ 8153F9B - msgbox VerdanturfTown_WandasHouse_Text_178683, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff:: @ 8153F9B + msgbox VerdanturfTown_WandasHouse_Text_WallySlippedOff, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_153FA5:: @ 8153FA5 - msgbox VerdanturfTown_WandasHouse_Text_1786B5, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande:: @ 8153FA5 + msgbox VerdanturfTown_WandasHouse_Text_WallyGoneThatFar, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF - msgbox VerdanturfTown_WandasHouse_Text_17886A, MSGBOX_NPC +VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend:: @ 8153FAF + msgbox VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay, MSGBOX_NPC end -VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 +VerdanturfTown_WandasHouse_EventScript_Wanda:: @ 8153FB8 lock faceplayer - goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153FE0 - goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_153FD6 - msgbox VerdanturfTown_WandasHouse_Text_1787FB, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WandaDontWorry + goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_MeetWanda + msgbox VerdanturfTown_WandasHouse_Text_DontWorryAboutWally, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_153FD6:: @ 8153FD6 - msgbox VerdanturfTown_WandasHouse_Text_178739, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_MeetWanda:: @ 8153FD6 + msgbox VerdanturfTown_WandasHouse_Text_MeetWanda, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0 - msgbox VerdanturfTown_WandasHouse_Text_1787FB, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WandaDontWorry:: @ 8153FE0 + msgbox VerdanturfTown_WandasHouse_Text_DontWorryAboutWally, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA +VerdanturfTown_WandasHouse_EventScript_WallysAunt:: @ 8153FEA lock faceplayer - goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_154025 - goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_15401B - goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_154011 - msgbox VerdanturfTown_WandasHouse_Text_1788B1, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen + msgbox VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_154011:: @ 8154011 - msgbox VerdanturfTown_WandasHouse_Text_178983, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen:: @ 8154011 + msgbox VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_15401B:: @ 815401B - msgbox VerdanturfTown_WandasHouse_Text_1789DD, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened:: @ 815401B + msgbox VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally, MSGBOX_DEFAULT release end -VerdanturfTown_WandasHouse_EventScript_154025:: @ 8154025 - msgbox VerdanturfTown_WandasHouse_Text_178A47, MSGBOX_DEFAULT +VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande:: @ 8154025 + msgbox VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande, MSGBOX_DEFAULT release end diff --git a/data/maps/VerdanturfTown_WandasHouse/text.inc b/data/maps/VerdanturfTown_WandasHouse/text.inc index 5ff4091dc..60d038317 100644 --- a/data/maps/VerdanturfTown_WandasHouse/text.inc +++ b/data/maps/VerdanturfTown_WandasHouse/text.inc @@ -1,4 +1,4 @@ -VerdanturfTown_WandasHouse_Text_1783F6:: @ 81783F6 +VerdanturfTown_WandasHouse_Text_StrongerSpeech:: @ 81783F6 .string "WALLY: I lost to you, {PLAYER}, but I'm\n" .string "not feeling down anymore.\p" .string "Because I have a new purpose in life.\n" @@ -10,13 +10,13 @@ VerdanturfTown_WandasHouse_Text_1783F6:: @ 81783F6 .string "When I do, I'm going to challenge you\n" .string "to another battle.$" -VerdanturfTown_WandasHouse_Text_178521:: @ 8178521 +VerdanturfTown_WandasHouse_Text_StrongerSpeechShort:: @ 8178521 .string "WALLY: Please watch me, {PLAYER}.\n" .string "I'm going to get stronger than you.\p" .string "When I do, I'm going to challenge you\n" .string "to another battle.$" -VerdanturfTown_WandasHouse_Text_17859A:: @ 817859A +VerdanturfTown_WandasHouse_Text_WallysNextDoor:: @ 817859A .string "UNCLE: Oh! {PLAYER}{KUN}!\n" .string "WALLY's next door.\p" .string "But, boy, there's something I have to\n" @@ -27,18 +27,18 @@ VerdanturfTown_WandasHouse_Text_17859A:: @ 817859A .string "It could be POKéMON that are giving the\l" .string "boy hope.$" -VerdanturfTown_WandasHouse_Text_178683:: @ 8178683 +VerdanturfTown_WandasHouse_Text_WallySlippedOff:: @ 8178683 .string "WALLY's gone away...\n" .string "He slipped off on his own...$" -VerdanturfTown_WandasHouse_Text_1786B5:: @ 81786B5 +VerdanturfTown_WandasHouse_Text_WallyGoneThatFar:: @ 81786B5 .string "UNCLE: Is that right?\n" .string "WALLY's gone away that far all by\l" .string "himself...\p" .string "Well, I have to give him credit - he is\n" .string "my little brother's son.$" -VerdanturfTown_WandasHouse_Text_178739:: @ 8178739 +VerdanturfTown_WandasHouse_Text_MeetWanda:: @ 8178739 .string "WANDA: You are?\n" .string "Oh, right, I get it!\p" .string "You're the {PLAYER} who WALLY was\n" @@ -48,18 +48,18 @@ VerdanturfTown_WandasHouse_Text_178739:: @ 8178739 .string "I think WALLY's become a lot more lively\n" .string "and healthy since he came here.$" -VerdanturfTown_WandasHouse_Text_1787FB:: @ 81787FB +VerdanturfTown_WandasHouse_Text_DontWorryAboutWally:: @ 81787FB .string "WANDA: Don't worry about WALLY.\n" .string "He'll be just fine.\p" .string "I know my little cousin, and he has\n" .string "POKéMON with him, too.$" -VerdanturfTown_WandasHouse_Text_17886A:: @ 817886A +VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay:: @ 817886A .string "Thanks to you, I can see my girlfriend\n" .string "every day.\l" .string "Happy? You bet I am!$" -VerdanturfTown_WandasHouse_Text_1788B1:: @ 81788B1 +VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven:: @ 81788B1 .string "My daughter's boyfriend is a very\n" .string "driven and passionate sort of person.\p" .string "He's been digging a tunnel nonstop\n" @@ -67,17 +67,17 @@ VerdanturfTown_WandasHouse_Text_1788B1:: @ 81788B1 .string "My daughter's a little concerned,\n" .string "so she goes out to the tunnel a lot.$" -VerdanturfTown_WandasHouse_Text_178983:: @ 8178983 +VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging:: @ 8178983 .string "It's amazing. My daughter's boyfriend\n" .string "was digging the tunnel by hand!\p" .string "It's so incredible!$" -VerdanturfTown_WandasHouse_Text_1789DD:: @ 81789DD +VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally:: @ 81789DD .string "If anything were to happen to WALLY,\n" .string "I would never be able to look his\l" .string "parents in PETALBURG in the eye...$" -VerdanturfTown_WandasHouse_Text_178A47:: @ 8178A47 +VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande:: @ 8178A47 .string "WALLY was in EVER GRANDE?\p" .string "His parents in PETALBURG would be\n" .string "astonished to hear that!$" diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 0accc07f1..5c3eded6f 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_1F_EventScript_15DF6F", + "script": "VictoryRoad_1F_EventScript_Edgar", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_1F_EventScript_15DF9D", + "script": "VictoryRoad_1F_EventScript_Hope", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_1F_EventScript_15DF86", + "script": "VictoryRoad_1F_EventScript_Albert", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_1F_EventScript_15DF28", + "script": "VictoryRoad_1F_EventScript_WallyRematchPostBattle", "flag": "FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD" }, { @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_1F_EventScript_15DF31", + "script": "VictoryRoad_1F_EventScript_Wally", "flag": "FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD" } ], @@ -148,7 +148,7 @@ "elevation": 3, "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", - "script": "VictoryRoad_1F_EventScript_15DE97" + "script": "VictoryRoad_1F_EventScript_WallyTrigger0" }, { "type": "trigger", @@ -157,7 +157,7 @@ "elevation": 3, "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", - "script": "VictoryRoad_1F_EventScript_15DEAB" + "script": "VictoryRoad_1F_EventScript_WallyTrigger1" }, { "type": "trigger", @@ -166,7 +166,7 @@ "elevation": 3, "var": "VAR_VICTORY_ROAD_1F_STATE", "var_value": "0", - "script": "VictoryRoad_1F_EventScript_15DEBF" + "script": "VictoryRoad_1F_EventScript_WallyTrigger2" } ], "bg_events": [ diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 19b12dcaf..0b77c741d 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,45 +1,45 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 - map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_15DE89 + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition .byte 0 -VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 - call_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VictoryRoad_1F_EventScript_15DE93 +VictoryRoad_1F_OnTransition:: @ 815DE89 + call_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VictoryRoad_1F_EventScript_HideWally end -VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 +VictoryRoad_1F_EventScript_HideWally:: @ 815DE93 setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD return -VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 +VictoryRoad_1F_EventScript_WallyTrigger0:: @ 815DE97 lockall addobject 4 - applymovement 4, VictoryRoad_1F_Movement_15DF07 + applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer0 waitmovement 0 - goto VictoryRoad_1F_EventScript_15DED3 + goto VictoryRoad_1F_EventScript_WallyApproachPlayer end -VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB +VictoryRoad_1F_EventScript_WallyTrigger1:: @ 815DEAB lockall addobject 4 - applymovement 4, VictoryRoad_1F_Movement_15DF13 + applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer1 waitmovement 0 - goto VictoryRoad_1F_EventScript_15DED3 + goto VictoryRoad_1F_EventScript_WallyApproachPlayer end -VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF +VictoryRoad_1F_EventScript_WallyTrigger2:: @ 815DEBF lockall addobject 4 - applymovement 4, VictoryRoad_1F_Movement_15DF1E + applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer2 waitmovement 0 - goto VictoryRoad_1F_EventScript_15DED3 + goto VictoryRoad_1F_EventScript_WallyApproachPlayer end -VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 +VictoryRoad_1F_EventScript_WallyApproachPlayer:: @ 815DED3 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox VictoryRoad_1F_Text_19782B, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_197943 - msgbox VictoryRoad_1F_Text_197967, MSGBOX_DEFAULT + msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat + msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD @@ -47,7 +47,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 releaseall end -VictoryRoad_1F_Movement_15DF07:: @ 815DF07 +VictoryRoad_1F_Movement_WallyApproachPlayer0:: @ 815DF07 walk_up walk_up walk_up @@ -61,7 +61,7 @@ VictoryRoad_1F_Movement_15DF07:: @ 815DF07 walk_right step_end -VictoryRoad_1F_Movement_15DF13:: @ 815DF13 +VictoryRoad_1F_Movement_WallyApproachPlayer1:: @ 815DF13 walk_up walk_up walk_up @@ -74,7 +74,7 @@ VictoryRoad_1F_Movement_15DF13:: @ 815DF13 walk_right step_end -VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E +VictoryRoad_1F_Movement_WallyApproachPlayer2:: @ 815DF1E walk_up walk_up walk_up @@ -86,34 +86,34 @@ VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E walk_right step_end -VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 - msgbox VictoryRoad_1F_Text_197967, MSGBOX_NPC +VictoryRoad_1F_EventScript_WallyRematchPostBattle:: @ 815DF28 + msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_NPC end -VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 - trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 +VictoryRoad_1F_EventScript_Wally:: @ 815DF31 + trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq VictoryRoad_1F_EventScript_15DF58 - msgbox VictoryRoad_1F_Text_197A47, MSGBOX_AUTOCLOSE + goto_if_eq VictoryRoad_1F_EventScript_WallyRematch + msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_15DF58:: @ 815DF58 - trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 - msgbox VictoryRoad_1F_Text_197A47, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_WallyRematch:: @ 815DF58 + trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat + msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F - trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A - msgbox VictoryRoad_1F_Text_197B36, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Edgar:: @ 815DF6F + trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_EdgarIntro, VictoryRoad_1F_Text_EdgarDefeat + msgbox VictoryRoad_1F_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_15DF86:: @ 815DF86 - trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 - msgbox VictoryRoad_1F_Text_197BF7, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Albert:: @ 815DF86 + trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_AlbertIntro, VictoryRoad_1F_Text_AlbertDefeat + msgbox VictoryRoad_1F_Text_AlbertPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D - trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D - msgbox VictoryRoad_1F_Text_197CAF, MSGBOX_AUTOCLOSE +VictoryRoad_1F_EventScript_Hope:: @ 815DF9D + trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_HopeIntro, VictoryRoad_1F_Text_HopeDefeat + msgbox VictoryRoad_1F_Text_HopePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc index 67f2026c7..2ccca699c 100644 --- a/data/maps/VictoryRoad_1F/text.inc +++ b/data/maps/VictoryRoad_1F/text.inc @@ -1,4 +1,4 @@ -VictoryRoad_1F_Text_19782B:: @ 819782B +VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore:: @ 819782B .string "WALLY: Hi! {PLAYER}!\p" .string "I bet you're surprised to see me here!\p" .string "I made it all the way here, and it's\n" @@ -10,63 +10,63 @@ VictoryRoad_1F_Text_19782B:: @ 819782B .string "gave me courage and strength!\p" .string "Okay... Here I come!$" -VictoryRoad_1F_Text_197943:: @ 8197943 +VictoryRoad_1F_Text_WallyEntranceDefeat:: @ 8197943 .string "Wow!\n" .string "{PLAYER}, you are strong, after all!$" -VictoryRoad_1F_Text_197967:: @ 8197967 +VictoryRoad_1F_Text_WallyPostEntranceBattle:: @ 8197967 .string "WALLY: I couldn't beat you today,\n" .string "{PLAYER}, but one of these days, I'll\l" .string "catch up to you!$" -VictoryRoad_1F_Text_1979BA:: @ 81979BA +VictoryRoad_1F_Text_WallyIntro:: @ 81979BA .string "WALLY: Hi! {PLAYER}!\p" .string "I've gotten stronger since that last\n" .string "time! I wanted to show you, {PLAYER}!\p" .string "Okay... Here I come!$" -VictoryRoad_1F_Text_197A23:: @ 8197A23 +VictoryRoad_1F_Text_WallyDefeat:: @ 8197A23 .string "Wow!\n" .string "{PLAYER}, you are strong, after all!$" -VictoryRoad_1F_Text_197A47:: @ 8197A47 +VictoryRoad_1F_Text_WallyPostBattle:: @ 8197A47 .string "WALLY: I couldn't beat you this time,\n" .string "too... But one of these days, {PLAYER},\l" .string "I'm going to catch up to you...\p" .string "And challenge the POKéMON LEAGUE!$" -VictoryRoad_1F_Text_197AD1:: @ 8197AD1 +VictoryRoad_1F_Text_EdgarIntro:: @ 8197AD1 .string "I've made it this far a couple times,\n" .string "but the last stretch is so long...$" -VictoryRoad_1F_Text_197B1A:: @ 8197B1A +VictoryRoad_1F_Text_EdgarDefeat:: @ 8197B1A .string "My dream ends here again...$" -VictoryRoad_1F_Text_197B36:: @ 8197B36 +VictoryRoad_1F_Text_EdgarPostBattle:: @ 8197B36 .string "You've made it this far. Keep the\n" .string "momentum going and become the\l" .string "CHAMPION! If anyone can, it's you!$" -VictoryRoad_1F_Text_197B99:: @ 8197B99 +VictoryRoad_1F_Text_AlbertIntro:: @ 8197B99 .string "I didn't come all this way to lose now.\n" .string "That possibility doesn't exist!$" -VictoryRoad_1F_Text_197BE1:: @ 8197BE1 +VictoryRoad_1F_Text_AlbertDefeat:: @ 8197BE1 .string "Impossible...\n" .string "I lost?$" -VictoryRoad_1F_Text_197BF7:: @ 8197BF7 +VictoryRoad_1F_Text_AlbertPostBattle:: @ 8197BF7 .string "I lost here...\p" .string "That means I lack the qualifications\n" .string "to become the CHAMPION...$" -VictoryRoad_1F_Text_197C45:: @ 8197C45 +VictoryRoad_1F_Text_HopeIntro:: @ 8197C45 .string "This seemingly infinite and harsh road\n" .string "lives up to its name of VICTORY.$" -VictoryRoad_1F_Text_197C8D:: @ 8197C8D +VictoryRoad_1F_Text_HopeDefeat:: @ 8197C8D .string "Your battle style is fantastic...$" -VictoryRoad_1F_Text_197CAF:: @ 8197CAF +VictoryRoad_1F_Text_HopePostBattle:: @ 8197CAF .string "You seem to have the potential for\n" .string "becoming the CHAMPION.$" diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 741fa7dbc..3c6fc158e 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -190,7 +190,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", - "script": "VictoryRoad_B1F_EventScript_15DFB5", + "script": "VictoryRoad_B1F_EventScript_Samuel", "flag": "0" }, { @@ -203,7 +203,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_B1F_EventScript_15DFCC", + "script": "VictoryRoad_B1F_EventScript_Shannon", "flag": "0" }, { @@ -216,7 +216,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B1F_EventScript_15DFE3", + "script": "VictoryRoad_B1F_EventScript_Michelle", "flag": "0" }, { diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index 24430a300..04d9ba737 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -1,17 +1,17 @@ VictoryRoad_B1F_MapScripts:: @ 815DFB4 .byte 0 -VictoryRoad_B1F_EventScript_15DFB5:: @ 815DFB5 - trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 - msgbox VictoryRoad_B1F_Text_197D5B, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Samuel:: @ 815DFB5 + trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_SamuelIntro, VictoryRoad_B1F_Text_SamuelDefeat + msgbox VictoryRoad_B1F_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_15DFCC:: @ 815DFCC - trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 - msgbox VictoryRoad_B1F_Text_197E13, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Shannon:: @ 815DFCC + trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_ShannonIntro, VictoryRoad_B1F_Text_ShannonDefeat + msgbox VictoryRoad_B1F_Text_ShannonPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3 - trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 - msgbox VictoryRoad_B1F_Text_197EB6, MSGBOX_AUTOCLOSE +VictoryRoad_B1F_EventScript_Michelle:: @ 815DFE3 + trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_MichelleIntro, VictoryRoad_B1F_Text_MichelleDefeat + msgbox VictoryRoad_B1F_Text_MichellePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_B1F/text.inc b/data/maps/VictoryRoad_B1F/text.inc index 06c630c04..64def9bc9 100644 --- a/data/maps/VictoryRoad_B1F/text.inc +++ b/data/maps/VictoryRoad_B1F/text.inc @@ -1,35 +1,35 @@ -VictoryRoad_B1F_Text_197CE9:: @ 8197CE9 +VictoryRoad_B1F_Text_SamuelIntro:: @ 8197CE9 .string "The thought that I'm getting closer to\n" .string "the POKéMON LEAGUE...\p" .string "I'm getting stage fright...$" -VictoryRoad_B1F_Text_197D42:: @ 8197D42 +VictoryRoad_B1F_Text_SamuelDefeat:: @ 8197D42 .string "I couldn't do a thing...$" -VictoryRoad_B1F_Text_197D5B:: @ 8197D5B +VictoryRoad_B1F_Text_SamuelPostBattle:: @ 8197D5B .string "The POKéMON LEAGUE became distant\n" .string "again... What a letdown...$" -VictoryRoad_B1F_Text_197D98:: @ 8197D98 +VictoryRoad_B1F_Text_ShannonIntro:: @ 8197D98 .string "To win your way through the POKéMON\n" .string "LEAGUE, you need the trust of your\l" .string "POKéMON.$" -VictoryRoad_B1F_Text_197DE8:: @ 8197DE8 +VictoryRoad_B1F_Text_ShannonDefeat:: @ 8197DE8 .string "Your relationship is based on\n" .string "solid trust.$" -VictoryRoad_B1F_Text_197E13:: @ 8197E13 +VictoryRoad_B1F_Text_ShannonPostBattle:: @ 8197E13 .string "By being together all the time, trust\n" .string "grows between POKéMON and TRAINERS.$" -VictoryRoad_B1F_Text_197E5D:: @ 8197E5D +VictoryRoad_B1F_Text_MichelleIntro:: @ 8197E5D .string "This isn't the goal. It's only a place\n" .string "on the way to the POKéMON LEAGUE.$" -VictoryRoad_B1F_Text_197EA6:: @ 8197EA6 +VictoryRoad_B1F_Text_MichelleDefeat:: @ 8197EA6 .string "That's the way!$" -VictoryRoad_B1F_Text_197EB6:: @ 8197EB6 +VictoryRoad_B1F_Text_MichellePostBattle:: @ 8197EB6 .string "You'll do fine, for sure!\n" .string "Your POKéMON are all eager to go!$" diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 3587ef562..4f8d33574 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_15DFFB", + "script": "VictoryRoad_B2F_EventScript_Vito", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", - "script": "VictoryRoad_B2F_EventScript_15E012", + "script": "VictoryRoad_B2F_EventScript_Owen", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_15E029", + "script": "VictoryRoad_B2F_EventScript_Caroline", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", - "script": "VictoryRoad_B2F_EventScript_15E040", + "script": "VictoryRoad_B2F_EventScript_Julie", "flag": "0" }, { diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 6416ce7f3..2a13a3f01 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -1,22 +1,22 @@ VictoryRoad_B2F_MapScripts:: @ 815DFFA .byte 0 -VictoryRoad_B2F_EventScript_15DFFB:: @ 815DFFB - trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 - msgbox VictoryRoad_B2F_Text_197F71, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Vito:: @ 815DFFB + trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_VitoIntro, VictoryRoad_B2F_Text_VitoDefeat + msgbox VictoryRoad_B2F_Text_VitoPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_15E012:: @ 815E012 - trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B - msgbox VictoryRoad_B2F_Text_198047, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Owen:: @ 815E012 + trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_OwenIntro, VictoryRoad_B2F_Text_OwenDefeat + msgbox VictoryRoad_B2F_Text_OwenPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_15E029:: @ 815E029 - trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD - msgbox VictoryRoad_B2F_Text_1980C8, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Caroline:: @ 815E029 + trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_CarolineIntro, VictoryRoad_B2F_Text_CarolineDefeat + msgbox VictoryRoad_B2F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_B2F_EventScript_15E040:: @ 815E040 - trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 - msgbox VictoryRoad_B2F_Text_1981BA, MSGBOX_AUTOCLOSE +VictoryRoad_B2F_EventScript_Julie:: @ 815E040 + trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_JulieIntro, VictoryRoad_B2F_Text_JulieDefeat + msgbox VictoryRoad_B2F_Text_JuliePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_B2F/text.inc b/data/maps/VictoryRoad_B2F/text.inc index 7b55094ea..d86fe16f4 100644 --- a/data/maps/VictoryRoad_B2F/text.inc +++ b/data/maps/VictoryRoad_B2F/text.inc @@ -1,49 +1,49 @@ -VictoryRoad_B2F_Text_197EF2:: @ 8197EF2 +VictoryRoad_B2F_Text_VitoIntro:: @ 8197EF2 .string "I trained together with my whole family,\n" .string "every one of us!\l" .string "I'm not losing to anyone!$" -VictoryRoad_B2F_Text_197F46:: @ 8197F46 +VictoryRoad_B2F_Text_VitoDefeat:: @ 8197F46 .string "Better than my family?!\n" .string "Is that possible?!$" -VictoryRoad_B2F_Text_197F71:: @ 8197F71 +VictoryRoad_B2F_Text_VitoPostBattle:: @ 8197F71 .string "I was better than everyone in my\n" .string "family. I've never lost before...\p" .string "I've lost my confidence...\n" .string "Maybe I'll go home...$" -VictoryRoad_B2F_Text_197FE5:: @ 8197FE5 +VictoryRoad_B2F_Text_OwenIntro:: @ 8197FE5 .string "I'd heard that there was a tough\n" .string "little kid around. Do they mean you?$" -VictoryRoad_B2F_Text_19802B:: @ 819802B +VictoryRoad_B2F_Text_OwenDefeat:: @ 819802B .string "The little shrimp is tough!$" -VictoryRoad_B2F_Text_198047:: @ 8198047 +VictoryRoad_B2F_Text_OwenPostBattle:: @ 8198047 .string "The rumors I heard, that tough little\n" .string "kid is from PETALBURG CITY.$" -VictoryRoad_B2F_Text_198089:: @ 8198089 +VictoryRoad_B2F_Text_CarolineIntro:: @ 8198089 .string "You must be getting a little tired.$" -VictoryRoad_B2F_Text_1980AD:: @ 81980AD +VictoryRoad_B2F_Text_CarolineDefeat:: @ 81980AD .string "No signs of tiring at all!$" -VictoryRoad_B2F_Text_1980C8:: @ 81980C8 +VictoryRoad_B2F_Text_CarolinePostBattle:: @ 81980C8 .string "VICTORY ROAD and the POKéMON LEAGUE\n" .string "are long and grueling challenges.\l" .string "Beware of fatigue!$" -VictoryRoad_B2F_Text_198121:: @ 8198121 +VictoryRoad_B2F_Text_JulieIntro:: @ 8198121 .string "You shouldn't get complacent just\n" .string "because you have a lot of GYM BADGES.\p" .string "There's always going to be someone\n" .string "who's better than you!$" -VictoryRoad_B2F_Text_1981A3:: @ 81981A3 +VictoryRoad_B2F_Text_JulieDefeat:: @ 81981A3 .string "You're better than me!$" -VictoryRoad_B2F_Text_1981BA:: @ 81981BA +VictoryRoad_B2F_Text_JuliePostBattle:: @ 81981BA .string "Gaze on your collected BADGES and\n" .string "remember the TRAINERS you've faced.$" diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index f27b43107..be0d7064e 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -109,11 +109,11 @@ EventScript_ResetAllMapFlags:: @ 819FA81 setflag FLAG_UNKNOWN_2F4 setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER - setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS setflag FLAG_HIDE_PETALBURG_GYM_GUIDE setflag FLAG_UNKNOWN_30E setflag FLAG_UNKNOWN_30F diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 262b14eba..546ffb138 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 LOCALID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 + applymovement LOCALID_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 LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA +PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 81B69AA applymovement LOCALID_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 LOCALID_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 LOCALID_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 LOCALID_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 LOCALID_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 LOCALID_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 LOCALID_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 LOCALID_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 LOCALID_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/pokeblocks.inc b/data/scripts/pokeblocks.inc index 8d4a92cf4..fc4645714 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,4 +1,4 @@ -FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 +FallarborTown_ContestLobby_EventScript_BerryBlender2:: @ 81B7604 setvar VAR_0x8008, 4 setvar VAR_0x8009, 1 applymovement VAR_0x8008, FallarborTown_ContestLobby_Movement_1B7821 @@ -6,7 +6,7 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 goto FallarborTown_ContestLobby_EventScript_1B7681 end -SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E +SlateportCity_ContestLobby_EventScript_BerryBlender1:: @ 81B761E setvar VAR_0x8008, 2 setvar VAR_0x8009, 2 applymovement 6, Common_Movement_FaceOriginalDirection @@ -120,30 +120,27 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 releaseall end -FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A +FallarborTown_ContestLobby_EventScript_BerryBlenderMan:: @ 81B778A setvar VAR_0x8008, 4 - goto FallarborTown_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC end -SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 +SlateportCity_ContestLobby_EventScript_MasterM:: @ 81B7795 setvar VAR_0x8008, 2 - goto SlateportCity_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 setvar VAR_0x8008, 2 - goto VerdanturfTown_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB setvar VAR_0x8008, 3 - goto LilycoveCity_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC end -FallarborTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 -LilycoveCity_ContestLobby_EventScript_1B77B6:: @ 81B77B6 -SlateportCity_ContestLobby_EventScript_1B77B6:: @ 81B77B6 -VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 +VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC:: @ 81B77B6 lock faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, MSGBOX_DEFAULT @@ -185,11 +182,11 @@ VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821 walk_in_place_fastest_right step_end -FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823 +FallarborTown_ContestLobby_EventScript_BerryBlender1:: @ 81B7823 goto FallarborTown_ContestLobby_EventScript_1B783B end -SlateportCity_ContestLobby_EventScript_1B7829:: @ 81B7829 +SlateportCity_ContestLobby_EventScript_BerryBlender0:: @ 81B7829 goto SlateportCity_ContestLobby_EventScript_1B783B end 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 diff --git a/data/specials.inc b/data/specials.inc index 52480dcb5..283f1a3da 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -112,7 +112,7 @@ gSpecials:: def_special ScrSpecial_SetHipsterSpokenFlag def_special ScrSpecial_HipsterTeachWord def_special ScrSpecial_PlayBardSong - def_special sub_80F83D0 + def_special SetMauvilleOldManObjEventGfx def_special ScrSpecial_GenerateGiddyLine def_special ScrSpecial_GiddyShouldTellAnotherTale def_special ScrSpecial_StorytellerGetFreeStorySlot @@ -135,7 +135,7 @@ gSpecials:: def_special TV_CopyNicknameToStringVar1AndEnsureTerminated def_special TV_CheckMonOTIDEqualsPlayerID def_special BufferTrendyPhraseString - def_special TrendyPhraseIsOld + def_special IsTrendyPhraseBoring def_special BufferRandomHobbyOrLifestyleString def_special GetDewfordHallPaintingNameIndex def_special SwapRegisteredBike diff --git a/data/text/berries.inc b/data/text/berries.inc index 196a7a741..5130009b8 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -1,4 +1,4 @@ -PetalburgCity_Gym_Text_1C5570:: @ 81C5570 +PetalburgCity_Gym_Text_GiveEnigmaBerry:: @ 81C5570 .string "DAD: Hi, {PLAYER}!\p" .string "I just received a very rare BERRY.\n" .string "I'd like you to have it.$" @@ -74,18 +74,18 @@ Route120_Text_1C5A4D:: @ 81C5A4D .string "I'll get more BERRIES from the\n" .string "BERRY MASTER.$" -LilycoveCity_Text_1C5A7A:: @ 81C5A7A +LilycoveCity_Text_BerrySuitsYou:: @ 81C5A7A .string "When it gets right down to it...\p" .string "The same way suits suit me perfectly,\n" .string "a crisp breeze suits the sea.\p" .string "And you, a BERRY suits you to a “T”...\p" .string "Why should that be so?$" -LilycoveCity_Text_1C5B1D:: @ 81C5B1D +LilycoveCity_Text_BecauseYoureTrainer:: @ 81C5B1D .string "When it gets right down to it...\p" .string "It's because you're a TRAINER!$" -LilycoveCity_Text_1C5B5D:: @ 81C5B5D +LilycoveCity_Text_PokeblocksSuitPokemon:: @ 81C5B5D .string "When it gets right down to it...\p" .string "The way dignified simplicity suits me,\n" .string "{POKEBLOCK}S perfectly suit POKéMON.$" @@ -200,7 +200,7 @@ Route104_PrettyPetalFlowerShop_Text_1C6335:: @ 81C6335 .string "for POKéMON.\p" .string "I want some candy, too.$" -SootopolisCity_Text_1C63F2:: @ 81C63F2 +SootopolisCity_Text_NameIsKiriHaveOneOfThese:: @ 81C63F2 .string "Hi, what's your name?\p" .string "... ... ... ... ... ... ... ... ...\n" .string "Okay. That's nice!\p" @@ -210,26 +210,26 @@ SootopolisCity_Text_1C63F2:: @ 81C63F2 .string "That's what they wished.\p" .string "You can have one of these.$" -SootopolisCity_Text_1C64D0:: @ 81C64D0 +SootopolisCity_Text_GiveYouThisBerryToo:: @ 81C64D0 .string "KIRI will give you this BERRY, too!\n" .string "I really like it lots!$" -SootopolisCity_Text_1C650B:: @ 81C650B +SootopolisCity_Text_WhatKindOfWishInYourName:: @ 81C650B .string "I wonder what kind of wish is included\n" .string "in your name.$" -SootopolisCity_Text_1C6540:: @ 81C6540 +SootopolisCity_Text_KiriBornInSeasons:: @ 81C6540 .string "Spring, summer, autumn, and winter.\p" .string "If you're born in springtime, do you like\n" .string "the spring, and if you're born in the\l" .string "summer, do you like the summer?$" -SootopolisCity_Text_1C65D4:: @ 81C65D4 +SootopolisCity_Text_ThenILoveAutumn:: @ 81C65D4 .string "Then KIRI was born in the autumn,\n" .string "so I love the autumn!\p" .string "Which season do you like?$" -SootopolisCity_Text_1C6626:: @ 81C6626 +SootopolisCity_Text_OhDoesntMatter:: @ 81C6626 .string "Oh...\n" .string "It doesn't matter...\p" .string "There's so much that I want to know...$" diff --git a/data/text/eon_ticket.inc b/data/text/eon_ticket.inc index de4ee1023..ccaab6e1e 100644 --- a/data/text/eon_ticket.inc +++ b/data/text/eon_ticket.inc @@ -8,12 +8,12 @@ UnknownString_81C5070: @ 81C5070 .string "You should find out what this is about\n" .string "in LILYCOVE.$" -LilycoveCity_Harbor_Text_1C50F2:: @ 81C50F2 +EventTicket_Text_ThatPass:: @ 81C50F2 .string "The ferry to SLATEPORT is...\p" .string "Oh?\n" .string "That PASS...$" -LilycoveCity_Harbor_Text_1C5120:: @ 81C5120 +EventTicket_Text_ShowEonTicket:: @ 81C5120 .string "Aye, mate, are you the one who brought\n" .string "that mighty odd PASS?\p" .string "I'll tell you, you're trying to reach a\n" diff --git a/data/text/lottery_corner.inc b/data/text/lottery_corner.inc index 807f1aa09..d1403e041 100644 --- a/data/text/lottery_corner.inc +++ b/data/text/lottery_corner.inc @@ -1,4 +1,4 @@ -LilycoveCity_DepartmentStore_1F_Text_1C4B5E:: @ 81C4B5E +LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket:: @ 81C4B5E .string "This is the POKéMON LOTTERY CORNER.\p" .string "All shoppers visiting our DEPARTMENT\n" .string "STORE get to draw a POKéMON LOTO\l" @@ -9,73 +9,73 @@ LilycoveCity_DepartmentStore_1F_Text_1C4B5E:: @ 81C4B5E .string "Would you like to draw a POKéMON\n" .string "LOTO TICKET?$" -LilycoveCity_DepartmentStore_1F_Text_1C4C6A:: @ 81C4C6A +LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow:: @ 81C4C6A .string "Please come back tomorrow.$" -LilycoveCity_DepartmentStore_1F_Text_1C4C85:: @ 81C4C85 +LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain:: @ 81C4C85 .string "Please do visit us again.$" UnknownString_81C4C9F: @ 81C4C9F .string "Please pick a LOTO TICKET.\n" .string "... ... ...$" -LilycoveCity_DepartmentStore_1F_Text_1C4CC6:: @ 81C4CC6 +LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket:: @ 81C4CC6 .string "Please pick a LOTO TICKET.\n" .string "...{PAUSE}{0x39} ...{PAUSE}{0x39} ...{PAUSE}{0x39}$" -LilycoveCity_DepartmentStore_1F_Text_1C4CF6:: @ 81C4CF6 +LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait:: @ 81C4CF6 .string "The LOTO TICKET number is {STR_VAR_1}.\p" .string "I need to run a check on this number\n" .string "to see if it matches any of your\l" .string "POKéMON's ID numbers. Please wait.$" -LilycoveCity_DepartmentStore_1F_Text_1C4D7D:: @ 81C4D7D +LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon:: @ 81C4D7D .string "Congratulations!\p" .string "The ID number of your team's\n" .string "{STR_VAR_1} matches your LOTO TICKET's\l" .string "number!$" -LilycoveCity_DepartmentStore_1F_Text_1C4DD1:: @ 81C4DD1 +LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon:: @ 81C4DD1 .string "Congratulations!\p" .string "The ID number of your PC-boxed\n" .string "{STR_VAR_1} matches your LOTO TICKET's\l" .string "number!$" -LilycoveCity_DepartmentStore_1F_Text_1C4E27:: @ 81C4E27 +LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched:: @ 81C4E27 .string "I'm sorry.\n" .string "None of the numbers matched.$" -LilycoveCity_DepartmentStore_1F_Text_1C4E4F:: @ 81C4E4F +LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched:: @ 81C4E4F .string "Two digits matched, so you win the\n" .string "third prize!\l" .string "You've won the {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_1C4E92:: @ 81C4E92 +LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched:: @ 81C4E92 .string "Three digits matched, so you win the\n" .string "second prize!\l" .string "You've won the {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_1C4ED8:: @ 81C4ED8 +LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched:: @ 81C4ED8 .string "Four digits matched, so you win the\n" .string "first prize!\l" .string "You've won the {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_1C4F1C:: @ 81C4F1C +LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched:: @ 81C4F1C .string "Oh, my goodness, all five digits matched!\p" .string "You've won the jackpot prize!\n" .string "You've won the {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_1C4F77:: @ 81C4F77 +LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis:: @ 81C4F77 .string "Oh?\n" .string "You seem to have no room for this.\p" .string "Please make room in your BAG and\n" .string "let me know.$" -LilycoveCity_DepartmentStore_1F_Text_1C4FCC:: @ 81C4FCC +LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding:: @ 81C4FCC .string "{PLAYER}?\n" .string "Yes, I've been expecting you.\p" .string "This is the prize we've been holding\n" .string "for you.$" -LilycoveCity_DepartmentStore_1F_Text_1C501C:: @ 81C501C +LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2:: @ 81C501C .string "Please do visit again.$" diff --git a/data/text/pokeblocks.inc b/data/text/pokeblocks.inc index 374af1101..02e19ee16 100644 --- a/data/text/pokeblocks.inc +++ b/data/text/pokeblocks.inc @@ -53,8 +53,7 @@ FallarborTown_ContestLobby_Text_1B71D2:: @ 81B71D2 .string "You should get a {POKEBLOCK} CASE and then\n" .string "come see me.$" -LilycoveCity_ContestLobby_Text_1B7225:: @ 81B7225 -SlateportCity_ContestLobby_Text_1B7225:: @ 81B7225 +SlateportCity_ContestLobby_Text_LetsGetBlendingAlready:: @ 81B7225 .string "Let's get blending already!$" LilycoveCity_ContestLobby_Text_1B7241:: @ 81B7241 diff --git a/include/constants/flags.h b/include/constants/flags.h index 8b7138092..7a4289d18 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -78,7 +78,7 @@ #define FLAG_MET_HIDDEN_POWER_GIVER 0x76 #define FLAG_RECEIVED_TM31 0x79 -#define FLAG_RECEIVED_HM03 0x7A +#define FLAG_RECEIVED_HM_SURF 0x7A #define FLAG_RECEIVED_HM08 0x7B #define FLAG_DEFEATED_WALLY_VICTORY_ROAD 0x7E @@ -117,14 +117,14 @@ #define FLAG_CUTE_PAINTING_MADE 0xA2 #define FLAG_SMART_PAINTING_MADE 0xA3 #define FLAG_TOUGH_PAINTING_MADE 0xA4 -#define FLAG_RECEIVED_TM39 0xA5 -#define FLAG_RECEIVED_TM08 0xA6 -#define FLAG_RECEIVED_TM34 0xA7 -#define FLAG_RECEIVED_TM50 0xA8 +#define FLAG_RECEIVED_TM_ROCK_TOMB 0xA5 +#define FLAG_RECEIVED_TM_BULK_UP 0xA6 +#define FLAG_RECEIVED_TM_SHOCK_WAVE 0xA7 +#define FLAG_RECEIVED_TM_OVERHEAT 0xA8 #define FLAG_RECEIVED_TM42 0xA9 -#define FLAG_RECEIVED_TM40 0xAA -#define FLAG_RECEIVED_TM04 0xAB -#define FLAG_RECEIVED_TM03 0xAC +#define FLAG_RECEIVED_TM_AERIAL_ACE 0xAA +#define FLAG_RECEIVED_TM_CALM_MIND 0xAB +#define FLAG_RECEIVED_TM_WATER_PULSE 0xAC #define FLAG_DECORATION_1 0xAD #define FLAG_DECORATION_2 0xAE #define FLAG_DECORATION_3 0xAF @@ -161,7 +161,7 @@ #define FLAG_ENCOUNTERED_LATIAS_OR_LATIOS 0xCE #define FLAG_RECEIVED_BASEMENT_KEY 0xD0 -#define FLAG_RECEIVED_TM24 0xD1 +#define FLAG_GOT_TM_THUNDERBOLT_FROM_WATTSON 0xD1 #define FLAG_RECEIVED_RED_OR_BLUE_ORB 0xD4 #define FLAG_RECEIVED_PREMIER_BALL_RUSTBORO 0xD5 @@ -180,8 +180,8 @@ #define FLAG_RECEIVED_STARTER_DOLL 0xE2 #define FLAG_RECEIVED_GOOD_ROD 0xE3 #define FLAG_REGI_DOORS_OPENED 0xE4 -#define FLAG_RECEIVED_TM27 0xE5 -#define FLAG_RECEIVED_TM36 0xE6 +#define FLAG_RECEIVED_TM_RETURN 0xE5 +#define FLAG_RECEIVED_TM_SLUDGE_BOMB 0xE6 #define FLAG_RECEIVED_TM05 0xE7 #define FLAG_RECEIVED_TM19 0xE8 @@ -257,7 +257,7 @@ // hidden item flags #define FLAG_HIDDEN_ITEMS_START 0x258 -#define FLAG_HIDDEN_ITEM_0 0x258 +#define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL 0x258 #define FLAG_HIDDEN_ITEM_1 0x259 #define FLAG_HIDDEN_ITEM_2 0x25A #define FLAG_HIDDEN_ITEM_3 0x25B @@ -285,13 +285,13 @@ #define FLAG_HIDDEN_ITEM_19 0x271 #define FLAG_HIDDEN_ITEM_1A 0x272 #define FLAG_HIDDEN_ITEM_1B 0x273 -#define FLAG_HIDDEN_ITEM_1C 0x274 +#define FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET 0x274 #define FLAG_HIDDEN_ITEM_1D 0x275 #define FLAG_HIDDEN_ITEM_1E 0x276 -#define FLAG_HIDDEN_ITEM_1F 0x277 -#define FLAG_HIDDEN_ITEM_20 0x278 -#define FLAG_HIDDEN_ITEM_21 0x279 -#define FLAG_HIDDEN_ITEM_22 0x27A +#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY 0x277 +#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY 0x278 +#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY 0x279 +#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY 0x27A #define FLAG_HIDDEN_ITEM_23 0x27B #define FLAG_HIDDEN_ITEM_24 0x27C #define FLAG_HIDDEN_ITEM_25 0x27D @@ -300,7 +300,7 @@ #define FLAG_HIDDEN_ITEM_28 0x280 #define FLAG_HIDDEN_ITEM_29 0x281 #define FLAG_HIDDEN_ITEM_2A 0x282 -#define FLAG_HIDDEN_ITEM_2B 0x283 +#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP 0x283 #define FLAG_HIDDEN_ITEM_2C 0x284 #define FLAG_HIDDEN_ITEM_2D 0x285 #define FLAG_HIDDEN_ITEM_2E 0x286 @@ -332,7 +332,7 @@ #define FLAG_HIDDEN_ITEM_48 0x2A0 #define FLAG_HIDDEN_ITEM_49 0x2A1 #define FLAG_HIDDEN_ITEM_4A 0x2A2 -#define FLAG_HIDDEN_ITEM_4B 0x2A3 +#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL 0x2A3 #define FLAG_HIDDEN_ITEM_4C 0x2A4 #define FLAG_HIDDEN_ITEM_4D 0x2A5 #define FLAG_HIDDEN_ITEM_4E 0x2A6 @@ -409,11 +409,11 @@ #define FLAG_HIDE_RAYQUAZA 0x305 #define FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 0x306 #define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307 -#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY 0x308 -#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL 0x309 -#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN 0x30A -#define FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER 0x30B -#define FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS 0x30C +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 0x308 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 0x309 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 0x30A +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 0x30B +#define FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS 0x30C #define FLAG_HIDE_PETALBURG_GYM_GUIDE 0x30D #define FLAG_UNKNOWN_30E 0x30E #define FLAG_UNKNOWN_30F 0x30F @@ -517,7 +517,7 @@ #define FLAG_UNKNOWN_BIRCH_380 0x380 // TODO: what should this be called? #define FLAG_HIDE_BIRCH_ROUTE101 0x381 #define FLAG_HIDE_BIRCH_ROUTE103 0x382 -#define FLAG_HIDE_TRICKMASTER_END 0x383 +#define FLAG_HIDE_TRICK_HOUSE_END_MAN 0x383 #define FLAG_HIDE_EVIL_TEAM_ROUTE110 0x384 #define FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 0x385 #define FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 0x386 @@ -650,9 +650,9 @@ #define FLAG_ITEM_ROUTE132_1 0x40C #define FLAG_ITEM_ROUTE133_1 0x40D #define FLAG_ITEM_ROUTE133_2 0x40E -#define FLAG_ITEM_PETALBURG_1 0x40F +#define FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE 0x40F #define FLAG_ITEM_PETALBURG_2 0x410 -#define FLAG_ITEM_RUSTBORO_1 0x411 +#define FLAG_ITEM_RUSTBORO_CITY_X_DEFEND 0x411 #define FLAG_ITEM_LILYCOVE_1 0x412 #define FLAG_ITEM_MOSSDEEP_1 0x413 #define FLAG_ITEM_METEOR_FALLS_1F_1R_1 0x414 @@ -671,16 +671,16 @@ #define FLAG_ITEM_ROUTE104_2 0x421 #define FLAG_ITEM_PETALBURG_WOODS_3 0x422 #define FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1 0x423 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1 0x424 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1 0x425 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2 0x426 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1 0x427 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2 0x428 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1 0x429 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL 0x424 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL 0x425 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL 0x426 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL 0x427 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL 0x428 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL 0x429 #define FLAG_ITEM_ROUTE124_1 0x42A -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1 0x42B -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1 0x42C -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1 0x42D +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL 0x42B +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL 0x42C +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL 0x42D #define FLAG_ITEM_JAGGED_PASS_1 0x42E #define FLAG_ITEM_AQUA_HIDEOUT_B1F_1 0x42F #define FLAG_ITEM_AQUA_HIDEOUT_B2F_1 0x430 @@ -688,8 +688,8 @@ #define FLAG_ITEM_MT_PYRE_EXTERIOR_2 0x432 #define FLAG_ITEM_NEW_MAUVILLE_INSIDE_1 0x433 #define FLAG_ITEM_NEW_MAUVILLE_INSIDE_2 0x434 -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1 0x435 -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 0x436 +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL 0x435 +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER 0x436 #define FLAG_ITEM_SCORCHED_SLAB_1 0x437 #define FLAG_ITEM_METEOR_FALLS_B1F_2R_1 0x438 #define FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1 0x439 @@ -706,14 +706,14 @@ #define FLAG_ITEM_ROUTE124_2 0x444 #define FLAG_ITEM_ROUTE124_3 0x445 #define FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1 0x446 -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1 0x447 -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1 0x448 -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1 0x449 -#define FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1 0x44A -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1 0x44B -#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1 0x44C -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3 0x44D -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4 0x44E +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_ICE_BEAM 0x44A +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B +#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_RAIN_DANCE 0x44E #define FLAG_ITEM_ROUTE121_1 0x44F #define FLAG_ITEM_ROUTE123_3 0x450 #define FLAG_ITEM_ROUTE126_1 0x451 @@ -727,7 +727,7 @@ #define FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2 0x459 #define FLAG_ITEM_ROUTE103_1 0x45A #define FLAG_ITEM_ROUTE104_3 0x45B -#define FLAG_ITEM_MAUVILLE_1 0x45C +#define FLAG_ITEM_MAUVILLE_CITY_X_SPEED 0x45C #define FLAG_ITEM_PETALBURG_WOODS_4 0x45D #define FLAG_ITEM_ROUTE115_4 0x45E #define FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1 0x45F diff --git a/include/constants/opponents.h b/include/constants/opponents.h index 11dd87ec4..0edbbdafe 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -662,12 +662,12 @@ #define TRAINER_WALLY_4 658 #define TRAINER_WALLY_5 659 #define TRAINER_WALLY_6 660 -#define TRAINER_BRENDAN_10 661 -#define TRAINER_BRENDAN_11 662 -#define TRAINER_BRENDAN_12 663 -#define TRAINER_MAY_10 664 -#define TRAINER_MAY_11 665 -#define TRAINER_MAY_12 666 +#define TRAINER_BRENDAN_LILYCOVE_MUDKIP 661 +#define TRAINER_BRENDAN_LILYCOVE_TREECKO 662 +#define TRAINER_BRENDAN_LILYCOVE_TORCHIC 663 +#define TRAINER_MAY_LILYCOVE_MUDKIP 664 +#define TRAINER_MAY_LILYCOVE_TREECKO 665 +#define TRAINER_MAY_LILYCOVE_TORCHIC 666 #define TRAINER_JONAH 667 #define TRAINER_HENRY 668 #define TRAINER_ROGER 669 diff --git a/include/mauville_man.h b/include/mauville_man.h index 5b2d00c6a..2cd0e9053 100644 --- a/include/mauville_man.h +++ b/include/mauville_man.h @@ -5,7 +5,7 @@ void SetupMauvilleOldMan(void); void sub_80F7F30(void); -void sub_80F83D0(void); +void SetMauvilleOldManObjEventGfx(void); void debug_sub_810B32C(u8); u8 GetCurrentMauvilleOldMan(void); diff --git a/src/data/trainers_de.h b/src/data/trainers_de.h index 46d64d8dc..22b544da4 100644 --- a/src/data/trainers_de.h +++ b/src/data/trainers_de.h @@ -9253,7 +9253,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemCustomMoves = gTrainerParty_Wally6 } }, - [TRAINER_BRENDAN_10] = + [TRAINER_BRENDAN_LILYCOVE_MUDKIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 } }, - [TRAINER_BRENDAN_11] = + [TRAINER_BRENDAN_LILYCOVE_TREECKO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 } }, - [TRAINER_BRENDAN_12] = + [TRAINER_BRENDAN_LILYCOVE_TORCHIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 } }, - [TRAINER_MAY_10] = + [TRAINER_MAY_LILYCOVE_MUDKIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_May10 } }, - [TRAINER_MAY_11] = + [TRAINER_MAY_LILYCOVE_TREECKO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_May11 } }, - [TRAINER_MAY_12] = + [TRAINER_MAY_LILYCOVE_TORCHIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, diff --git a/src/data/trainers_en.h b/src/data/trainers_en.h index 621945db8..1a729c78a 100644 --- a/src/data/trainers_en.h +++ b/src/data/trainers_en.h @@ -9253,7 +9253,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemCustomMoves = gTrainerParty_Wally6 } }, - [TRAINER_BRENDAN_10] = + [TRAINER_BRENDAN_LILYCOVE_MUDKIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 } }, - [TRAINER_BRENDAN_11] = + [TRAINER_BRENDAN_LILYCOVE_TREECKO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 } }, - [TRAINER_BRENDAN_12] = + [TRAINER_BRENDAN_LILYCOVE_TORCHIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 } }, - [TRAINER_MAY_10] = + [TRAINER_MAY_LILYCOVE_MUDKIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_May10 } }, - [TRAINER_MAY_11] = + [TRAINER_MAY_LILYCOVE_TREECKO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = { .party = {.NoItemDefaultMoves = gTrainerParty_May11 } }, - [TRAINER_MAY_12] = + [TRAINER_MAY_LILYCOVE_TORCHIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 94b697954..cc0c89c71 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -773,7 +773,7 @@ static const struct MenuAction gUnknown_Debug_083C1A9C[] = { static const u8 gUnknown_Debug_083C1AAC[] = {2}; static const u16 gUnknown_Debug_083C1AAE[][9] = { - {FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08} + {FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08} }; static const u8 gUnknown_Debug_083C1AC0[] = DTR("ジムリーダー", "GYM LEADER"); @@ -1283,7 +1283,7 @@ static const struct MenuAction gUnknown_Debug_083C3194[] = { static const u8 gUnknown_Debug_083C31DC[] = {9, 9, 9, 9, 9, 9, 9, 9, 3}; static const u16 gUnknown_Debug_83C31E6[][9] = { - {FLAG_RECEIVED_HM01, FLAG_RECEIVED_HM02, FLAG_RECEIVED_HM03, FLAG_RECEIVED_HM04, FLAG_RECEIVED_HM05, FLAG_RECEIVED_HM06, FLAG_RETURNED_DEVON_GOODS, FLAG_DEVON_GOODS_STOLEN, FLAG_RECOVERED_DEVON_GOODS}, + {FLAG_RECEIVED_HM01, FLAG_RECEIVED_HM02, FLAG_RECEIVED_HM_SURF, FLAG_RECEIVED_HM04, FLAG_RECEIVED_HM05, FLAG_RECEIVED_HM06, FLAG_RETURNED_DEVON_GOODS, FLAG_DEVON_GOODS_STOLEN, FLAG_RECOVERED_DEVON_GOODS}, {FLAG_RECEIVED_BIKE, 0x05B, 0x05C, 0x05D, FLAG_RECEIVED_WAILMER_PAIL, FLAG_RECEIVED_POKEBLOCK_CASE, FLAG_RECEIVED_OLD_ROD, FLAG_RECEIVED_GOOD_ROD, FLAG_RECEIVED_SUPER_ROD}, {FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FLAG_EXCHANGED_SCANNER, FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, FLAG_LEGENDARY_BATTLE_COMPLETED, FLAG_RECEIVED_REPEAT_BALL, FLAG_RECEIVED_SS_TICKET, FLAG_KECLEON_FLED_FORTREE, FLAG_RECEIVED_FOSSIL_MON, FLAG_DEFEATED_SS_TIDAL_TRAINERS}, {0x06C, FLAG_DEFEATED_WALLY_VICTORY_ROAD, FLAG_DEFEATED_WALLY_MAUVILLE, FLAG_WALLY_SPEECH, FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, FLAG_USED_ROOM_1_KEY, FLAG_USED_ROOM_2_KEY, FLAG_USED_ROOM_4_KEY, FLAG_USED_ROOM_6_KEY}, diff --git a/src/dewford_trend.c b/src/dewford_trend.c index 644dc1708..ef3866784 100644 --- a/src/dewford_trend.c +++ b/src/dewford_trend.c @@ -209,7 +209,7 @@ void BufferTrendyPhraseString(void) ConvertEasyChatWordsToString(gStringVar1, s->words, 2, 1); } -void TrendyPhraseIsOld(void) +void IsTrendyPhraseBoring(void) { u16 result = 0; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index a737c2ba7..f4890c503 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -60,7 +60,7 @@ extern u8 Event_TV[]; extern u8 ClosedSootopolisDoorScript[]; extern u8 gUnknown_081A4363[]; extern u8 gUnknown_081C346A[]; -extern u8 gUnknown_081616E1[]; +extern u8 Route110_TrickHousePuzzle_EventScript_Door[]; extern u8 EventScript_RegionMap[]; extern u8 S_RunningShoesManual[]; extern u8 EventScript_PictureBookshelf[]; @@ -465,7 +465,7 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE) return gUnknown_081C346A; if (MetatileBehavior_IsTrickHousePuzzleDoor(metatileBehavior) == TRUE) - return gUnknown_081616E1; + return Route110_TrickHousePuzzle_EventScript_Door; if (MetatileBehavior_IsRegionMap(metatileBehavior) == TRUE) return EventScript_RegionMap; if (MetatileBehavior_IsRunningShoesManual(metatileBehavior) == TRUE) diff --git a/src/field_specials.c b/src/field_specials.c index 956c84eda..defe435e8 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1644,7 +1644,7 @@ u16 GetSlotMachineId(void) bool8 FoundAbandonedShipRoom1Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_HIDDEN_ITEM_1F; + u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY; *specVar = flag; if (!FlagGet(flag)) { @@ -1656,7 +1656,7 @@ bool8 FoundAbandonedShipRoom1Key(void) bool8 FoundAbandonedShipRoom2Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_HIDDEN_ITEM_20; + u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY; *specVar = flag; if (!FlagGet(flag)) { @@ -1668,7 +1668,7 @@ bool8 FoundAbandonedShipRoom2Key(void) bool8 FoundAbandonedShipRoom4Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_HIDDEN_ITEM_21; + u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY; *specVar = flag; if (!FlagGet(flag)) { @@ -1680,7 +1680,7 @@ bool8 FoundAbandonedShipRoom4Key(void) bool8 FoundAbandonedShipRoom6Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = FLAG_HIDDEN_ITEM_22; + u16 flag = FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY; *specVar = flag; if (!FlagGet(flag)) { diff --git a/src/mauville_man.c b/src/mauville_man.c index acd6af5bc..a2325b650 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -247,7 +247,7 @@ void SetupMauvilleOldMan(void) SetupGiddy(); break; } - sub_80F83D0(); + SetMauvilleOldManObjEventGfx(); } #if DEBUG @@ -278,7 +278,7 @@ void debug_sub_810B32C(u8 a) SetupGiddy(); break; } - sub_80F83D0(); + SetMauvilleOldManObjEventGfx(); } #endif @@ -562,7 +562,7 @@ void sub_80F7F30(void) case MAUVILLE_MAN_GIDDY: break; } - sub_80F83D0(); + SetMauvilleOldManObjEventGfx(); } #define tState data[0] @@ -804,7 +804,7 @@ static void Task_BardSong(u8 taskId) } } -void sub_80F83D0(void) +void SetMauvilleOldManObjEventGfx(void) { VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BARD + GetCurrentMauvilleOldMan()); }