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/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/event_scripts.s b/data/event_scripts.s index 3744fb3bc..ccaa7db6a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -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?$" diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index c3e83734a..343b88e7c 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 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 04fdafbec..31eb37720 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 OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, MSGBOX_DEFAULT + msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT closemessage - applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_158395 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A + applymovement OBJ_EVENT_ID_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/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index b83e23289..d3c26d647 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -2,15 +2,15 @@ LilycoveCity_DepartmentStore_2F_MapScripts:: @ 8159F0E .byte 0 LilycoveCity_DepartmentStore_2F_EventScript_159F0F:: @ 8159F0F - msgbox LilycoveCity_DepartmentStore_2F_Text_18C162, MSGBOX_NPC + msgbox LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_159F18:: @ 8159F18 - msgbox LilycoveCity_DepartmentStore_2F_Text_18C195, MSGBOX_NPC + msgbox LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_159F21:: @ 8159F21 - msgbox LilycoveCity_DepartmentStore_2F_Text_18C1D9, MSGBOX_NPC + msgbox LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_159F2A:: @ 8159F2A 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 2fb9bea30..f367785c8 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 OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call Common_EventScript_FerryDepart return -LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE - applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_159A86 +LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast:: @ 81599CE + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast waitmovement 0 return -LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9 - applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_159A89 +LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth:: @ 81599D9 + applymovement OBJ_EVENT_ID_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 OBJ_EVENT_ID_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 4f14d7711..ecfebf464 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 OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_158504 + applymovement OBJ_EVENT_ID_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 OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE + applymovement OBJ_EVENT_ID_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 OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_158501 + applymovement OBJ_EVENT_ID_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 b8c026a10..6cdf9d603 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 OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + applymovement OBJ_EVENT_ID_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 OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + applymovement OBJ_EVENT_ID_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 OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + applymovement OBJ_EVENT_ID_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 3f3905177..2d89318ed 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 OBJ_EVENT_ID_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 OBJ_EVENT_ID_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/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/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/include/constants/flags.h b/include/constants/flags.h index bb583bae5..b402d0805 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -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