diff --git a/data-de/maps/FortreeCity_DecorationShop/text.inc b/data-de/maps/FortreeCity_DecorationShop/text.inc index 07c3b3379..b202d0e13 100644 --- a/data-de/maps/FortreeCity_DecorationShop/text.inc +++ b/data-de/maps/FortreeCity_DecorationShop/text.inc @@ -1,11 +1,11 @@ -FortreeCity_DecorationShop_Text_186A61:: @ 8186A61 +FortreeCity_DecorationShop_Text_MerchandiseSentToPC:: @ 8186A61 .string "Die Artikel, die du hier kaufst, werden\n" .string "sofort auf deinen PC gesendet.\p" .string "Das ist großartig! Ich wünschte, ich\n" .string "könnte mich so auch nach Hause\l" .string "senden lassen.$" -FortreeCity_DecorationShop_Text_186AD6:: @ 8186AD6 +FortreeCity_DecorationShop_Text_BuyingDeskForDolls:: @ 8186AD6 .string "Ich kaufe mir einen schönen Tisch, auf\n" .string "den ich meine PUPPEN setze.\p" .string "Wenn ich das nicht tue, werden meine\n" diff --git a/data-de/maps/FortreeCity_Gym/text.inc b/data-de/maps/FortreeCity_Gym/text.inc index 5c1696822..598d45c56 100644 --- a/data-de/maps/FortreeCity_Gym/text.inc +++ b/data-de/maps/FortreeCity_Gym/text.inc @@ -1,4 +1,4 @@ -FortreeCity_Gym_Text_18589C:: @ 818589C +FortreeCity_Gym_Text_GymGuideAdvice:: @ 818589C .string "Na, wie sieht es aus, auf dem Weg zum\n" .string "CHAMP, {PLAYER}?\p" .string "Die LEITERIN der ARENA von BAUMHAUSEN\n" @@ -10,68 +10,68 @@ FortreeCity_Gym_Text_18589C:: @ 818589C .string "denen sie die Flügel stutzen kann!\p" .string "Okay, dann viel Glück!$" -FortreeCity_Gym_Text_185994:: @ 8185994 +FortreeCity_Gym_Text_GymGuidePostVictory:: @ 8185994 .string "Du hast es geschafft!\n" .string "Du hast Startfreigabe!$" -FortreeCity_Gym_Text_1859B9:: @ 81859B9 +FortreeCity_Gym_Text_JaredIntro:: @ 81859B9 .string "Bewundere den eleganten Kampfstil der\n" .string "VOGEL-POKéMON!$" -FortreeCity_Gym_Text_1859EA:: @ 81859EA +FortreeCity_Gym_Text_JaredDefeat:: @ 81859EA .string "Du...\n" .string "Du bist stark...$" -FortreeCity_Gym_Text_185A02:: @ 8185A02 +FortreeCity_Gym_Text_JaredPostBattle:: @ 8185A02 .string "Ein TRAINER muss clever genug sein, mit\n" .string "den Wendungen im Kampf fertig zu\l" .string "werden.\p" .string "Mal sehen, ob du clever genug bist, bis\n" .string "zu unserer LEITERIN vorzudringen.$" -FortreeCity_Gym_Text_185A7F:: @ 8185A7F +FortreeCity_Gym_Text_WillIntro:: @ 8185A7F .string "Liebhaber von VOGEL-POKéMON streben\n" .string "danach, dieser ARENA beizutreten.\p" .string "Als Mitglied der ARENA von BAUMHAUSEN\n" .string "CITY darf ich nicht verlieren!$" -FortreeCity_Gym_Text_185AEC:: @ 8185AEC +FortreeCity_Gym_Text_WillDefeat:: @ 8185AEC .string "Das war doch etwas zu schwer für mich\n" .string "zu tragen...$" -FortreeCity_Gym_Text_185B18:: @ 8185B18 +FortreeCity_Gym_Text_WillPostBattle:: @ 8185B18 .string "Die Welt ist groß und es gibt zahlreiche\n" .string "starke TRAINER.\p" .string "Ich werde weiter trainieren und so\n" .string "immer stärker werden!$" -FortreeCity_Gym_Text_185B8D:: @ 8185B8D +FortreeCity_Gym_Text_TerrellIntro:: @ 8185B8D .string "Es gibt keinen Grund, dass WIBKE,\n" .string "unsere ARENALEITERIN, sich mit dir\l" .string "abgibt!\p" .string "Ich bin schon stark genug für dich!$" -FortreeCity_Gym_Text_185BEB:: @ 8185BEB +FortreeCity_Gym_Text_TerrellDefeat:: @ 8185BEB .string "WIBKE... Ich...\n" .string "Ich habe verlooooren!$" -FortreeCity_Gym_Text_185C00:: @ 8185C00 +FortreeCity_Gym_Text_TerrellPostBattle:: @ 8185C00 .string "WIBKE ist süß, aber auch stark.\n" .string "Sie ist die ultimative LEITERIN!\p" .string "Hups... Wie peinlich. Ich werde nicht rot!$" -FortreeCity_Gym_Text_185C45:: @ 8185C45 +FortreeCity_Gym_Text_KyleeIntro:: @ 8185C45 .string "WIBKE hat mich persönlich geschult!\n" .string "Du wirst kein leichtes Spiel haben!$" -FortreeCity_Gym_Text_185C7C:: @ 8185C7C +FortreeCity_Gym_Text_KyleeDefeat:: @ 8185C7C .string "Ich wurde geschlagen...$" -FortreeCity_Gym_Text_185C8C:: @ 8185C8C +FortreeCity_Gym_Text_KyleePostBattle:: @ 8185C8C .string "Dank WIBKE leben die Einwohner von\n" .string "BAUMHAUSEN CITY ohne Furcht.$" -FortreeCity_Gym_Text_185CCB:: @ 8185CCB +FortreeCity_Gym_Text_WinonaIntro:: @ 8185CCB .string "Ich bin WIBKE, die LEITERIN der ARENA\n" .string "von BAUMHAUSEN CITY.\p" .string "Ich wurde das mit Hilfe meiner VOGEL-\n" @@ -81,18 +81,18 @@ FortreeCity_Gym_Text_185CCB:: @ 8185CCB .string "Werde Zeuge der eleganten Choreo-\n" .string "graphie meiner VOGEL-POKéMON!$" -FortreeCity_Gym_Text_185DBA:: @ 8185DBA +FortreeCity_Gym_Text_WinonaDefeat:: @ 8185DBA .string "Ich habe noch nie einen TRAINER ge-\n" .string "sehen, der seine POKéMON mit mehr\l" .string "Grazie trainiert als ich...\p" .string "In Anbetracht deiner Fähigkeiten\n" .string "überreiche ich dir diesen ARENAORDEN.$" -FortreeCity_Gym_Text_185E48:: @ 8185E48 +FortreeCity_Gym_Text_ReceivedFeatherBadge:: @ 8185E48 .string "{PLAYER} erhält den FEDERORDEN von\n" .string "WIBKE.$" -FortreeCity_Gym_Text_185E73:: @ 8185E73 +FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis:: @ 8185E73 .string "Mit dem FEDERORDEN gehorchen dir alle\n" .string "POKéMON bis Lv. 70, auch die, die du\l" .string "durch Tausch bekommen hast.\p" @@ -101,19 +101,19 @@ FortreeCity_Gym_Text_185E73:: @ 8185E73 .string "Und dies...\n" .string "Dies ist ein Geschenk von mir.$" -FortreeCity_Gym_Text_185F4A:: @ 8185F4A +FortreeCity_Gym_Text_ExplainAerialAce:: @ 8185F4A .string "TM40 enthält AERO-ASS.\p" .string "Diese Geschwindigkeit...\n" .string "Kein POKéMON kann ihr entgehen.$" -FortreeCity_Gym_Text_185F98:: @ 8185F98 +FortreeCity_Gym_Text_WinonaPostBattle:: @ 8185F98 .string "Auch wenn ich gegen dich verloren habe,\n" .string "gehört meine Liebe den VOGEL-POKéMON.$" -FortreeCity_Gym_Text_185FD5:: @ 8185FD5 +FortreeCity_Gym_Text_GymStatue:: @ 8185FD5 .string "POKéMON ARENA von BAUMHAUSEN CITY$" -FortreeCity_Gym_Text_185FEE:: @ 8185FEE +FortreeCity_Gym_Text_GymStatueCertified:: @ 8185FEE .string "POKéMON ARENA von BAUMHAUSEN CITY\p" .string "WIBKES ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data-de/maps/FortreeCity_House1/text.inc b/data-de/maps/FortreeCity_House1/text.inc index 06160fb4a..7a5e8141f 100644 --- a/data-de/maps/FortreeCity_House1/text.inc +++ b/data-de/maps/FortreeCity_House1/text.inc @@ -1,4 +1,4 @@ -FortreeCity_House1_Text_18568C:: @ 818568C +FortreeCity_House1_Text_WouldYouTradeIt:: @ 818568C .string "Hi! Da gibt es dieses POKéMON, nach\n" .string "dem ich suche.\p" .string "Ich möchte ein {STR_VAR_1} haben.\n" @@ -6,32 +6,32 @@ FortreeCity_House1_Text_18568C:: @ 818568C .string "Würdest du es gegen mein {STR_VAR_2}\n" .string "tauschen?$" -FortreeCity_House1_Text_1856F7:: @ 81856F7 +FortreeCity_House1_Text_PleaseBeNiceToMon:: @ 81856F7 .string "Danke schön!\p" .string "Ich werde gut zu deinem {STR_VAR_1}\n" .string "sein, also sei auch gut zu meinem\l" .string "{STR_VAR_2}!$" -FortreeCity_House1_Text_185737:: @ 8185737 +FortreeCity_House1_Text_ThatMonIsntAMon:: @ 8185737 .string "Warte!\n" .string "Das ist kein {STR_VAR_1}.\p" .string "Ich glaube, du willst gar nicht mit mir\n" .string "tauschen.$" -FortreeCity_House1_Text_18577F:: @ 818577F +FortreeCity_House1_Text_ChangeYourMindSeeMe:: @ 818577F .string "Oh, okay. Wenn du es dir anders über-\n" .string "legst, komm wieder vorbei.\p" .string "Ich werde hier warten!$" -FortreeCity_House1_Text_1857C7:: @ 81857C7 +FortreeCity_House1_Text_PromiseToTakeGoodCareOfMon:: @ 81857C7 .string "Danke, dass du mit mir getauscht hast!\p" .string "Dieses POKéMON habe ich mir schon lange\n" .string "gewünscht. Bei mir wird's ihm gut gehen!$" -FortreeCity_House1_Text_18582A:: @ 818582A +FortreeCity_House1_Text_TradingMemoriesWithOthers:: @ 818582A .string "Mit anderen sein POKéMON tauschen...\p" .string "Das ist, als ob du die Erinnerungen mit\n" .string "anderen Menschen teilst.$" -FortreeCity_House1_Text_185888:: @ 8185888 +FortreeCity_House1_Text_Zigzagoon:: @ 8185888 .string "ZIGZACHS: Gumomoh?$" diff --git a/data-de/maps/FortreeCity_House2/text.inc b/data-de/maps/FortreeCity_House2/text.inc index c257d6c5b..93eebae1b 100644 --- a/data-de/maps/FortreeCity_House2/text.inc +++ b/data-de/maps/FortreeCity_House2/text.inc @@ -1,38 +1,38 @@ -FortreeCity_House2_Text_186306:: @ 8186306 +FortreeCity_House2_Text_HiddenPowersArousedByNature:: @ 8186306 .string "Menschen... POKéMON...\p" .string "Ihre versteckten Kräfte werden durch\n" .string "das Leben in der Natur geweckt.$" -FortreeCity_House2_Text_186360:: @ 8186360 +FortreeCity_House2_Text_CoinInWhichHand:: @ 8186360 .string "Lass diese alte Frau mal sehen, ob deine\n" .string "versteckten Kräfte erwacht sind...\p" .string "Ich halte eine Münze in meiner Hand.\p" .string "Nun? In welcher Hand halte ich sie?\n" .string "In der linken oder rechten Hand?$" -FortreeCity_House2_Text_1863F6:: @ 81863F6 +FortreeCity_House2_Text_CorrectTryAgainWhichHand:: @ 81863F6 .string "Oh! Das stimmt!\p" .string "Versuchen wir es noch einmal.\p" .string "In welcher Hand halte ich die Münze?\n" .string "Rechts oder links?$" -FortreeCity_House2_Text_186455:: @ 8186455 +FortreeCity_House2_Text_CorrectTryAgainWhichHand2:: @ 8186455 .string "Oh! Schon wieder richtig!\p" .string "Probieren wir es noch einmal.\p" .string "In welcher Hand ist die Münze nun?\n" .string "In der linken oder der rechten Hand?$" -FortreeCity_House2_Text_1864C6:: @ 81864C6 +FortreeCity_House2_Text_YourHiddenPowerHasAwoken:: @ 81864C6 .string "Oh! Hervorragend!\n" .string "Deine versteckten Kräfte sind erwacht!\p" .string "Hier, das ist für dich. Wecke damit die\n" .string "versteckten Kräfte deiner POKéMON.$" -FortreeCity_House2_Text_18652F:: @ 818652F +FortreeCity_House2_Text_ExplainHiddenPower:: @ 818652F .string "KRAFTRESERVE ist eine Attacke, die je\n" .string "nach POKéMON anders aussieht.$" -FortreeCity_House2_Text_186565:: @ 8186565 +FortreeCity_House2_Text_YouGuessedWrong:: @ 8186565 .string "Och, zu schade!\n" .string "Du hast falsch geraten.$" diff --git a/data-de/maps/FortreeCity_House3/text.inc b/data-de/maps/FortreeCity_House3/text.inc index 8370d6692..63853c0e5 100644 --- a/data-de/maps/FortreeCity_House3/text.inc +++ b/data-de/maps/FortreeCity_House3/text.inc @@ -1,4 +1,4 @@ -FortreeCity_House3_Text_186624:: @ 8186624 +FortreeCity_House3_Text_MetStevenHadAmazingPokemon:: @ 8186624 .string "Da wir gerade vom POKéDEX reden... Ich\n" .string "erinnere mich...\p" .string "Ich habe diesen TRAINER, TROY,\n" @@ -11,7 +11,7 @@ FortreeCity_House3_Text_186624:: @ 8186624 .string "Er ist bestimmt stärker als die ARENA-\n" .string "LEITERIN in diesem Ort...$" -FortreeCity_House3_Text_186745:: @ 8186745 +FortreeCity_House3_Text_OhYouHavePokedex:: @ 8186745 .string "Was ist das da? Was hast du da?\p" .string "... ... ... ... ... ...\p" .string "Oh, das ist also ein POKéDEX?\n" diff --git a/data-de/maps/FortreeCity_House4/text.inc b/data-de/maps/FortreeCity_House4/text.inc index c1491ae96..8a1a658c2 100644 --- a/data-de/maps/FortreeCity_House4/text.inc +++ b/data-de/maps/FortreeCity_House4/text.inc @@ -1,18 +1,18 @@ -FortreeCity_House4_Text_1867AF:: @ 81867AF +FortreeCity_House4_Text_BringsWorldCloserTogether:: @ 81867AF .string "Wenn sie mit POKéMON zusammen sind,\n" .string "finden die Menschen schnell Freunde.\p" .string "Und so rücken die Menschen weltweit\n" .string "näher zusammen. Wunderbar, nicht wahr?$" -FortreeCity_House4_Text_186835:: @ 8186835 +FortreeCity_House4_Text_GoBirdPokemon:: @ 8186835 .string "Fertig!\n" .string "Los, VOGEL-POKéMON!$" -FortreeCity_House4_Text_18684E:: @ 818684E +FortreeCity_House4_Text_AskedWingullToRunErrand:: @ 818684E .string "Hähähä, mein WINGULL macht\n" .string "Besorgungen für mich.$" -FortreeCity_House4_Text_186881:: @ 8186881 +FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb:: @ 8186881 .string "Gut!\n" .string "Komm zurück, WINGULL!\p" .string "Huch! Was ist das?\n" @@ -22,9 +22,9 @@ FortreeCity_House4_Text_186881:: @ 8186881 .string "Aber, ich bin kein TRAINER, daher kannst\n" .string "du es haben.$" -FortreeCity_House4_Text_186924:: @ 8186924 +FortreeCity_House4_Text_FriendsFarAwayThanksToWingull:: @ 8186924 .string "Dank meines WINGULL habe ich Freunde,\n" .string "die sehr weit weg von hier wohnen.$" -FortreeCity_House4_Text_18695C:: @ 818695C +FortreeCity_House4_Text_Wingull:: @ 818695C .string "WINGULL: Pihyoh!$" diff --git a/data-de/maps/FortreeCity_House5/text.inc b/data-de/maps/FortreeCity_House5/text.inc index 26c5b21ad..7a655e858 100644 --- a/data-de/maps/FortreeCity_House5/text.inc +++ b/data-de/maps/FortreeCity_House5/text.inc @@ -1,14 +1,14 @@ -FortreeCity_House5_Text_18696D:: @ 818696D +FortreeCity_House5_Text_TreeHousesAreGreat:: @ 818696D .string "Die Baumhäuser von BAUMHAUSEN\n" .string "CITY sind fantastisch!\p" .string "Ich glaube, es ist der beste Platz, um\n" .string "mit seinen POKéMON zusammenzuleben.$" -FortreeCity_House5_Text_1869D6:: @ 81869D6 +FortreeCity_House5_Text_AdaptedToNature:: @ 81869D6 .string "POKéMON und Menschen sind auf die\n" .string "Natur angewiesen, um zu überleben.\p" .string "Es gibt überhaupt keinen Grund, die\n" .string "Natur nach unserem Willen zu formen.$" -FortreeCity_House5_Text_186A4F:: @ 8186A4F +FortreeCity_House5_Text_Zigzagoon:: @ 8186A4F .string "ZIGZACHS: Bufuu!$" diff --git a/data-de/maps/FortreeCity_Mart/text.inc b/data-de/maps/FortreeCity_Mart/text.inc index da371d141..2ed526bfc 100644 --- a/data-de/maps/FortreeCity_Mart/text.inc +++ b/data-de/maps/FortreeCity_Mart/text.inc @@ -1,15 +1,15 @@ -FortreeCity_Mart_Text_1861EF:: @ 81861EF +FortreeCity_Mart_Text_SuperRepelBetter:: @ 81861EF .string "SUPERSCHUTZ hält lange an, und ist auch\n" .string "äußerst nützlich.\p" .string "Es ist viel besser als normaler SCHUTZ.$" -FortreeCity_Mart_Text_186251:: @ 8186251 +FortreeCity_Mart_Text_StockUpOnItems:: @ 8186251 .string "Ich horte immer mehr Items, als ich\n" .string "eigentlich benötige.\p" .string "Man weiß ja nie, was einem passieren\n" .string "kann. Vorsicht ist die Mutter der\l" .string "Porzellankiste!$" -FortreeCity_Mart_Text_1862CA:: @ 81862CA +FortreeCity_Mart_Text_RareCandyMakesMonGrow:: @ 81862CA .string "Ein SONDERBONBON erhöht den Level\n" .string "eines POKéMON sofort um 1.$" diff --git a/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc b/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc index f38a010bc..54a349ba1 100644 --- a/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc +++ b/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc @@ -1,11 +1,11 @@ -FortreeCity_PokemonCenter_1F_Text_186027:: @ 8186027 +FortreeCity_PokemonCenter_1F_Text_GoToSafariZone:: @ 8186027 .string "Na, Kindchen, arbeitest du an einem\n" .string "POKéDEX?\p" .string "Hmm... Ich an deiner Stelle würde mal\n" .string "die SAFARI-ZONE auf der ROUTE 121\l" .string "besuchen.$" -FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 +FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat:: @ 8186086 .string "Hast du schon mal eine\n" .string "STATISTIK GETAUSCHT?\p" .string "Sehr nützliche Einrichtung! Die Erfolge\n" @@ -14,7 +14,7 @@ FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 .string "Ich weiß zwar nicht, wie das passiert,\n" .string "aber es ist einfach irre. Und aufregend!$" -FortreeCity_PokemonCenter_1F_Text_186138:: @ 8186138 +FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav:: @ 8186138 .string "Hey, du hast einen POKéNAV!\n" .string "Ich habe auch so einen.\p" .string "Schau dir mal die TRAINER an.\p" diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index bd4004dcf..604f68fed 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_158258", + "script": "FortreeCity_DecorationShop_EventScript_PokefanM", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_158261", + "script": "FortreeCity_DecorationShop_EventScript_Girl", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_15826A", + "script": "FortreeCity_DecorationShop_EventScript_ClerkDesks", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_158298", + "script": "FortreeCity_DecorationShop_EventScript_ClerkChairs", "flag": "0" } ], diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index ec7a9a7cb..36fdf157d 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -1,26 +1,26 @@ FortreeCity_DecorationShop_MapScripts:: @ 8158257 .byte 0 -FortreeCity_DecorationShop_EventScript_158258:: @ 8158258 - msgbox FortreeCity_DecorationShop_Text_186A61, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_PokefanM:: @ 8158258 + msgbox FortreeCity_DecorationShop_Text_MerchandiseSentToPC, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_158261:: @ 8158261 - msgbox FortreeCity_DecorationShop_Text_186AD6, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_Girl:: @ 8158261 + msgbox FortreeCity_DecorationShop_Text_BuyingDeskForDolls, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A +FortreeCity_DecorationShop_EventScript_ClerkDesks:: @ 815826A lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration FortreeCity_DecorationShop_Decorations1 + pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Desks msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -FortreeCity_DecorationShop_Decorations1:: @ 8158284 +FortreeCity_DecorationShop_PokemartDecor_Desks:: @ 8158284 .2byte DECOR_SMALL_DESK .2byte DECOR_POKEMON_DESK .2byte DECOR_HEAVY_DESK @@ -33,18 +33,18 @@ FortreeCity_DecorationShop_Decorations1:: @ 8158284 release end -FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 +FortreeCity_DecorationShop_EventScript_ClerkChairs:: @ 8158298 lock faceplayer message Text_HowMayIServeYou waitmessage - pokemartdecoration FortreeCity_DecorationShop_Decorations2 + pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Chairs msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -FortreeCity_DecorationShop_Decorations2:: @ 81582B0 +FortreeCity_DecorationShop_PokemartDecor_Chairs:: @ 81582B0 .2byte DECOR_SMALL_CHAIR .2byte DECOR_POKEMON_CHAIR .2byte DECOR_HEAVY_CHAIR diff --git a/data/maps/FortreeCity_DecorationShop/text.inc b/data/maps/FortreeCity_DecorationShop/text.inc index 7673c0eea..1830cded6 100644 --- a/data/maps/FortreeCity_DecorationShop/text.inc +++ b/data/maps/FortreeCity_DecorationShop/text.inc @@ -1,10 +1,10 @@ -FortreeCity_DecorationShop_Text_186A61:: @ 8186A61 +FortreeCity_DecorationShop_Text_MerchandiseSentToPC:: @ 8186A61 .string "Merchandise you buy here is sent to\n" .string "your own PC.\p" .string "That's fantastic! I wish they could\n" .string "also deliver me home like that.$" -FortreeCity_DecorationShop_Text_186AD6:: @ 8186AD6 +FortreeCity_DecorationShop_Text_BuyingDeskForDolls:: @ 8186AD6 .string "I'm buying a pretty desk and I'm\n" .string "putting my cute DOLLS on it.\p" .string "If I don't, when I decorate my\n" diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 5501546d1..82a89d544 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,17 +16,17 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC end FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 - trainerbattle_single TRAINER_WINONA, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15, NO_MUSIC + trainerbattle_single TRAINER_WINONA, FortreeCity_Gym_Text_WinonaIntro, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_157F15, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E - msgbox FortreeCity_Gym_Text_185F98, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_WinonaPostBattle, MSGBOX_DEFAULT release end FortreeCity_Gym_EventScript_157F15:: @ 8157F15 - message FortreeCity_Gym_Text_185E48 + message FortreeCity_Gym_Text_ReceivedFeatherBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox FortreeCity_Gym_Text_185E73, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 @@ -38,41 +38,41 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem ITEM_TM40_AERIAL_ACE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox FortreeCity_Gym_Text_185F4A, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 release end FortreeCity_Gym_EventScript_157F62:: @ 8157F62 - trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA - msgbox FortreeCity_Gym_Text_185A02, MSGBOX_AUTOCLOSE + trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredIntro, FortreeCity_Gym_Text_JaredDefeat + msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_157F79:: @ 8157F79 - trainerbattle_single TRAINER_WILL, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC - msgbox FortreeCity_Gym_Text_185B18, MSGBOX_AUTOCLOSE + trainerbattle_single TRAINER_WILL, FortreeCity_Gym_Text_WillIntro, FortreeCity_Gym_Text_WillDefeat + msgbox FortreeCity_Gym_Text_WillPostBattle, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_157F90:: @ 8157F90 - trainerbattle_single TRAINER_TERRELL, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB - msgbox FortreeCity_Gym_Text_185C00, MSGBOX_AUTOCLOSE + trainerbattle_single TRAINER_TERRELL, FortreeCity_Gym_Text_TerrellIntro, FortreeCity_Gym_Text_TerrellDefeat + msgbox FortreeCity_Gym_Text_TerrellPostBattle, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 - trainerbattle_single TRAINER_KYLEE, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C - msgbox FortreeCity_Gym_Text_185C8C, MSGBOX_AUTOCLOSE + trainerbattle_single TRAINER_KYLEE, FortreeCity_Gym_Text_KyleeIntro, FortreeCity_Gym_Text_KyleeDefeat + msgbox FortreeCity_Gym_Text_KyleePostBattle, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE lock faceplayer goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_157FD3 - msgbox FortreeCity_Gym_Text_18589C, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 - msgbox FortreeCity_Gym_Text_185994, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end @@ -89,11 +89,11 @@ FortreeCity_Gym_EventScript_157FED:: @ 8157FED end FortreeCity_Gym_EventScript_157FFD:: @ 8157FFD - msgbox FortreeCity_Gym_Text_185FEE, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end FortreeCity_Gym_EventScript_158007:: @ 8158007 - msgbox FortreeCity_Gym_Text_185FD5, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/FortreeCity_Gym/text.inc b/data/maps/FortreeCity_Gym/text.inc index a63fa957f..285540cd6 100644 --- a/data/maps/FortreeCity_Gym/text.inc +++ b/data/maps/FortreeCity_Gym/text.inc @@ -1,4 +1,4 @@ -FortreeCity_Gym_Text_18589C:: @ 818589C +FortreeCity_Gym_Text_GymGuideAdvice:: @ 818589C .string "Yo, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "FORTREE GYM LEADER WINONA is a\n" @@ -9,66 +9,66 @@ FortreeCity_Gym_Text_18589C:: @ 818589C .string "are trying to take wing!\p" .string "Okay, go for it!$" -FortreeCity_Gym_Text_185994:: @ 8185994 +FortreeCity_Gym_Text_GymGuidePostVictory:: @ 8185994 .string "You did it!\n" .string "You've achieved liftoff!$" -FortreeCity_Gym_Text_1859B9:: @ 81859B9 +FortreeCity_Gym_Text_JaredIntro:: @ 81859B9 .string "Behold the elegant battle style of\n" .string "BIRD POKéMON!$" -FortreeCity_Gym_Text_1859EA:: @ 81859EA +FortreeCity_Gym_Text_JaredDefeat:: @ 81859EA .string "You...\n" .string "You're strong...$" -FortreeCity_Gym_Text_185A02:: @ 8185A02 +FortreeCity_Gym_Text_JaredPostBattle:: @ 8185A02 .string "A TRAINER has to be smart to keep\n" .string "up with unexpected turns of events.\p" .string "Let's see if you have the smarts to\n" .string "get to our LEADER?$" -FortreeCity_Gym_Text_185A7F:: @ 8185A7F +FortreeCity_Gym_Text_WillIntro:: @ 8185A7F .string "The lovers of BIRD POKéMON aspire\n" .string "to join this GYM.\p" .string "As a member of the FORTREE GYM,\n" .string "I'm not allowed to lose!$" -FortreeCity_Gym_Text_185AEC:: @ 8185AEC +FortreeCity_Gym_Text_WillDefeat:: @ 8185AEC .string "It was too much of a load for me\n" .string "to bear...$" -FortreeCity_Gym_Text_185B18:: @ 8185B18 +FortreeCity_Gym_Text_WillPostBattle:: @ 8185B18 .string "The world is huge, and there are\n" .string "countless tough TRAINERS.\p" .string "I'm going to keep training and make\n" .string "myself even stronger.$" -FortreeCity_Gym_Text_185B8D:: @ 8185B8D +FortreeCity_Gym_Text_TerrellIntro:: @ 8185B8D .string "There's no need for WINONA, our GYM\n" .string "LEADER, to deal with you!\p" .string "I'm plenty good enough for you!$" -FortreeCity_Gym_Text_185BEB:: @ 8185BEB +FortreeCity_Gym_Text_TerrellDefeat:: @ 8185BEB .string "WINONA, I...\n" .string "I lost!$" -FortreeCity_Gym_Text_185C00:: @ 8185C00 +FortreeCity_Gym_Text_TerrellPostBattle:: @ 8185C00 .string "WINONA is cute and she's strong.\n" .string "She's the ultimate LEADER!\p" .string "Blush...$" -FortreeCity_Gym_Text_185C45:: @ 8185C45 +FortreeCity_Gym_Text_KyleeIntro:: @ 8185C45 .string "WINONA taught me personally!\n" .string "You can't beat me easily!$" -FortreeCity_Gym_Text_185C7C:: @ 8185C7C +FortreeCity_Gym_Text_KyleeDefeat:: @ 8185C7C .string "I was beaten...$" -FortreeCity_Gym_Text_185C8C:: @ 8185C8C +FortreeCity_Gym_Text_KyleePostBattle:: @ 8185C8C .string "Thanks to WINONA, the people of\n" .string "FORTREE can live without fear.$" -FortreeCity_Gym_Text_185CCB:: @ 8185CCB +FortreeCity_Gym_Text_WinonaIntro:: @ 8185CCB .string "I am WINONA. I am the LEADER of the\n" .string "FORTREE POKéMON GYM.\p" .string "I have become one with BIRD POKéMON\n" @@ -78,18 +78,18 @@ FortreeCity_Gym_Text_185CCB:: @ 8185CCB .string "Witness the elegant choreography\n" .string "of BIRD POKéMON and I!$" -FortreeCity_Gym_Text_185DBA:: @ 8185DBA +FortreeCity_Gym_Text_WinonaDefeat:: @ 8185DBA .string "Never before have I seen a TRAINER\n" .string "command POKéMON with more grace\l" .string "than I...\p" .string "In recognition of your prowess,\n" .string "I present to you this GYM BADGE.$" -FortreeCity_Gym_Text_185E48:: @ 8185E48 +FortreeCity_Gym_Text_ReceivedFeatherBadge:: @ 8185E48 .string "{PLAYER} received the FEATHER BADGE\n" .string "from WINONA.$" -FortreeCity_Gym_Text_185E73:: @ 8185E73 +FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis:: @ 8185E73 .string "With the FEATHER BADGE, all POKéMON up\n" .string "to LV 70, even those received through\l" .string "trades, will obey your every command.\p" @@ -98,19 +98,19 @@ FortreeCity_Gym_Text_185E73:: @ 8185E73 .string "And this...\n" .string "This is a gift from me.$" -FortreeCity_Gym_Text_185F4A:: @ 8185F4A +FortreeCity_Gym_Text_ExplainAerialAce:: @ 8185F4A .string "TM40 contains AERIAL ACE.\p" .string "Its speed...\n" .string "No POKéMON should be able to avoid it.$" -FortreeCity_Gym_Text_185F98:: @ 8185F98 +FortreeCity_Gym_Text_WinonaPostBattle:: @ 8185F98 .string "Though I fell to you, I will remain\n" .string "devoted to BIRD POKéMON.$" -FortreeCity_Gym_Text_185FD5:: @ 8185FD5 +FortreeCity_Gym_Text_GymStatue:: @ 8185FD5 .string "FORTREE CITY POKéMON GYM$" -FortreeCity_Gym_Text_185FEE:: @ 8185FEE +FortreeCity_Gym_Text_GymStatueCertified:: @ 8185FEE .string "FORTREE CITY POKéMON GYM\p" .string "WINONA'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 9afb92218..6a3d9c6d2 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_157E13", + "script": "FortreeCity_House1_EventScript_Trader", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_157EC0", + "script": "FortreeCity_House1_EventScript_Zigzagoon", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_157EB7", + "script": "FortreeCity_House1_EventScript_ExpertF", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 0af969a06..3c054bf5e 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -1,64 +1,64 @@ FortreeCity_House1_MapScripts:: @ 8157E12 .byte 0 -FortreeCity_House1_EventScript_157E13:: @ 8157E13 +FortreeCity_House1_EventScript_Trader:: @ 8157E13 lock faceplayer - goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_157EAD + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_TradeCompleted setvar VAR_0x8008, 1 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox FortreeCity_House1_Text_18568C, MSGBOX_YESNO + msgbox FortreeCity_House1_Text_WouldYouTradeIt, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq FortreeCity_House1_EventScript_157E95 + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade special SelectMonForNPCTrade waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq FortreeCity_House1_EventScript_157E95 + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne FortreeCity_House1_EventScript_157E9F + goto_if_ne FortreeCity_House1_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_1856F7, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_PleaseBeNiceToMon, MSGBOX_DEFAULT setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end -FortreeCity_House1_EventScript_157E95:: @ 8157E95 - msgbox FortreeCity_House1_Text_18577F, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_DeclineTrade:: @ 8157E95 + msgbox FortreeCity_House1_Text_ChangeYourMindSeeMe, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_157E9F:: @ 8157E9F +FortreeCity_House1_EventScript_NotRequestedMon:: @ 8157E9F bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_185737, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_ThatMonIsntAMon, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_157EAD:: @ 8157EAD - msgbox FortreeCity_House1_Text_1857C7, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_TradeCompleted:: @ 8157EAD + msgbox FortreeCity_House1_Text_PromiseToTakeGoodCareOfMon, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_157EB7:: @ 8157EB7 - msgbox FortreeCity_House1_Text_18582A, MSGBOX_NPC +FortreeCity_House1_EventScript_ExpertF:: @ 8157EB7 + msgbox FortreeCity_House1_Text_TradingMemoriesWithOthers, MSGBOX_NPC end -FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 +FortreeCity_House1_EventScript_Zigzagoon:: @ 8157EC0 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House1_Text_185888, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House1/text.inc b/data/maps/FortreeCity_House1/text.inc index 18baa846a..221987017 100644 --- a/data/maps/FortreeCity_House1/text.inc +++ b/data/maps/FortreeCity_House1/text.inc @@ -1,35 +1,35 @@ -FortreeCity_House1_Text_18568C:: @ 818568C +FortreeCity_House1_Text_WouldYouTradeIt:: @ 818568C .string "Hi, there's this POKéMON that I'm\n" .string "looking for.\p" .string "I want a {STR_VAR_1}.\n" .string "Do you have one?\p" .string "Would you trade it for my {STR_VAR_2}?$" -FortreeCity_House1_Text_1856F7:: @ 81856F7 +FortreeCity_House1_Text_PleaseBeNiceToMon:: @ 81856F7 .string "Thank you!\p" .string "I'll be good to your {STR_VAR_1},\n" .string "so please be nice to my {STR_VAR_2}!$" -FortreeCity_House1_Text_185737:: @ 8185737 +FortreeCity_House1_Text_ThatMonIsntAMon:: @ 8185737 .string "Wait!\n" .string "That POKéMON isn't a {STR_VAR_1}.\p" .string "I guess you don't want to trade\n" .string "with me.$" -FortreeCity_House1_Text_18577F:: @ 818577F +FortreeCity_House1_Text_ChangeYourMindSeeMe:: @ 818577F .string "Oh, okay. If you change your mind,\n" .string "please come see me.\p" .string "I'll be waiting!$" -FortreeCity_House1_Text_1857C7:: @ 81857C7 +FortreeCity_House1_Text_PromiseToTakeGoodCareOfMon:: @ 81857C7 .string "Thank you for trading with me!\p" .string "I really wanted this POKéMON, so\n" .string "I promise to take good care of it!$" -FortreeCity_House1_Text_18582A:: @ 818582A +FortreeCity_House1_Text_TradingMemoriesWithOthers:: @ 818582A .string "Trading POKéMON with others...\p" .string "It's as if you're trading your own\n" .string "memories with other people.$" -FortreeCity_House1_Text_185888:: @ 8185888 +FortreeCity_House1_Text_Zigzagoon:: @ 8185888 .string "ZIGZAGOON: Gumomoh?$" diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 815c98f60..05c1d2a62 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -4,40 +4,40 @@ FortreeCity_House2_MapScripts:: @ 81580B3 FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer - goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_158157 - call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_15814B - msgbox FortreeCity_House2_Text_186360, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_ExplainHiddenPower + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_Greeting + msgbox FortreeCity_House2_Text_CoinInWhichHand, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_158161 - msgbox FortreeCity_House2_Text_1863F6, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_158161 - msgbox FortreeCity_House2_Text_186455, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand2, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT - case 0, FortreeCity_House2_EventScript_158161 - msgbox FortreeCity_House2_Text_1864C6, MSGBOX_DEFAULT + case 0, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_YourHiddenPowerHasAwoken, MSGBOX_DEFAULT giveitem ITEM_TM10_HIDDEN_POWER compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 - msgbox FortreeCity_House2_Text_18652F, MSGBOX_DEFAULT + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_15814B:: @ 815814B - msgbox FortreeCity_House2_Text_186306, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_Greeting:: @ 815814B + msgbox FortreeCity_House2_Text_HiddenPowersArousedByNature, MSGBOX_DEFAULT setflag FLAG_MET_HIDDEN_POWER_GIVER return -FortreeCity_House2_EventScript_158157:: @ 8158157 - msgbox FortreeCity_House2_Text_18652F, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_ExplainHiddenPower:: @ 8158157 + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_158161:: @ 8158161 - msgbox FortreeCity_House2_Text_186565, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_WrongGuess:: @ 8158161 + msgbox FortreeCity_House2_Text_YouGuessedWrong, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_House2/text.inc b/data/maps/FortreeCity_House2/text.inc index bf57a3ee6..8ea1da0cc 100644 --- a/data/maps/FortreeCity_House2/text.inc +++ b/data/maps/FortreeCity_House2/text.inc @@ -1,38 +1,38 @@ -FortreeCity_House2_Text_186306:: @ 8186306 +FortreeCity_House2_Text_HiddenPowersArousedByNature:: @ 8186306 .string "People... POKéMON...\p" .string "Their hidden powers are aroused by\n" .string "living in natural environments...$" -FortreeCity_House2_Text_186360:: @ 8186360 +FortreeCity_House2_Text_CoinInWhichHand:: @ 8186360 .string "Let this old woman see if your hidden\n" .string "power has awoken...\p" .string "I hold a coin in my hand.\p" .string "Now, tell me, have I palmed it in the\n" .string "right hand? Or in the left?$" -FortreeCity_House2_Text_1863F6:: @ 81863F6 +FortreeCity_House2_Text_CorrectTryAgainWhichHand:: @ 81863F6 .string "Oh! Yes, correct!\p" .string "We shall try again.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left?$" -FortreeCity_House2_Text_186455:: @ 8186455 +FortreeCity_House2_Text_CorrectTryAgainWhichHand2:: @ 8186455 .string "Oh! Yes, correct again!\p" .string "We shall try once more.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left? Choose!$" -FortreeCity_House2_Text_1864C6:: @ 81864C6 +FortreeCity_House2_Text_YourHiddenPowerHasAwoken:: @ 81864C6 .string "Oh! Splendid!\n" .string "Your hidden power has awoken!\p" .string "Here, take this and awaken the hidden\n" .string "power of your POKéMON.$" -FortreeCity_House2_Text_18652F:: @ 818652F +FortreeCity_House2_Text_ExplainHiddenPower:: @ 818652F .string "HIDDEN POWER is a move that changes\n" .string "with the POKéMON.$" -FortreeCity_House2_Text_186565:: @ 8186565 +FortreeCity_House2_Text_YouGuessedWrong:: @ 8186565 .string "No, too bad.\n" .string "You guessed wrong.$" diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index ba1f04b2c..ce546cf9d 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_15816C", + "script": "FortreeCity_House3_EventScript_Maniac", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_158175", + "script": "FortreeCity_House3_EventScript_SchoolKidM", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc index 3786fe5cf..52b6e786d 100644 --- a/data/maps/FortreeCity_House3/scripts.inc +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -1,10 +1,10 @@ FortreeCity_House3_MapScripts:: @ 815816B .byte 0 -FortreeCity_House3_EventScript_15816C:: @ 815816C - msgbox FortreeCity_House3_Text_186624, MSGBOX_NPC +FortreeCity_House3_EventScript_Maniac:: @ 815816C + msgbox FortreeCity_House3_Text_MetStevenHadAmazingPokemon, MSGBOX_NPC end -FortreeCity_House3_EventScript_158175:: @ 8158175 - msgbox FortreeCity_House3_Text_186745, MSGBOX_NPC +FortreeCity_House3_EventScript_SchoolKidM:: @ 8158175 + msgbox FortreeCity_House3_Text_OhYouHavePokedex, MSGBOX_NPC end diff --git a/data/maps/FortreeCity_House3/text.inc b/data/maps/FortreeCity_House3/text.inc index db8d4ae97..6ffdee9a1 100644 --- a/data/maps/FortreeCity_House3/text.inc +++ b/data/maps/FortreeCity_House3/text.inc @@ -1,4 +1,4 @@ -FortreeCity_House3_Text_186624:: @ 8186624 +FortreeCity_House3_Text_MetStevenHadAmazingPokemon:: @ 8186624 .string "Speaking of POKéDEXES, I remembered\n" .string "something.\p" .string "I met this TRAINER, STEVEN, when\n" @@ -10,7 +10,7 @@ FortreeCity_House3_Text_186624:: @ 8186624 .string "He might even be stronger than the\n" .string "GYM LEADER in this town...$" -FortreeCity_House3_Text_186745:: @ 8186745 +FortreeCity_House3_Text_OhYouHavePokedex:: @ 8186745 .string "What's that thing you have there?\p" .string "... ... ... ... ... ...\p" .string "Oh, it's called a POKéDEX?\n" diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index ce27f0e83..ba50ef7ee 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -21,7 +21,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_15817F", + "script": "FortreeCity_House4_EventScript_Woman", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_158188", + "script": "FortreeCity_House4_EventScript_Boy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_15821E", + "script": "FortreeCity_House4_EventScript_Wingull", "flag": "FLAG_HIDE_WINGULL_FORTREE_HOUSE" } ], diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 3e3d0948e..6230881e1 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -1,36 +1,36 @@ FortreeCity_House4_MapScripts:: @ 815817E .byte 0 -FortreeCity_House4_EventScript_15817F:: @ 815817F - msgbox FortreeCity_House4_Text_1867AF, MSGBOX_NPC +FortreeCity_House4_EventScript_Woman:: @ 815817F + msgbox FortreeCity_House4_Text_BringsWorldCloserTogether, MSGBOX_NPC end -FortreeCity_House4_EventScript_158188:: @ 8158188 +FortreeCity_House4_EventScript_Boy:: @ 8158188 lockall - goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204 - goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6 - goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2 - msgbox FortreeCity_House4_Text_186835, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_ReceivedMentalHerb + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_WingullReturned + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_WingullOnErrand + msgbox FortreeCity_House4_Text_GoBirdPokemon, MSGBOX_DEFAULT closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE - applymovement 3, FortreeCity_House4_Movement_158218 + applymovement 3, FortreeCity_House4_Movement_WingullExit waitmovement 0 removeobject 3 releaseall end -FortreeCity_House4_EventScript_1581C2:: @ 81581C2 +FortreeCity_House4_EventScript_WingullOnErrand:: @ 81581C2 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_18684E, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_AskedWingullToRunErrand, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_EventScript_1581D6:: @ 81581D6 +FortreeCity_House4_EventScript_WingullReturned:: @ 81581D6 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_186881, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT giveitem ITEM_MENTAL_HERB compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -38,14 +38,14 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 releaseall end -FortreeCity_House4_EventScript_158204:: @ 8158204 +FortreeCity_House4_EventScript_ReceivedMentalHerb:: @ 8158204 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_186924, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_FriendsFarAwayThanksToWingull, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_Movement_158218:: @ 8158218 +FortreeCity_House4_Movement_WingullExit:: @ 8158218 walk_fast_down walk_fast_down walk_fast_right @@ -53,12 +53,12 @@ FortreeCity_House4_Movement_158218:: @ 8158218 delay_8 step_end -FortreeCity_House4_EventScript_15821E:: @ 815821E +FortreeCity_House4_EventScript_Wingull:: @ 815821E lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox FortreeCity_House4_Text_18695C, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_Wingull, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House4/text.inc b/data/maps/FortreeCity_House4/text.inc index 9de8a7d19..e270856de 100644 --- a/data/maps/FortreeCity_House4/text.inc +++ b/data/maps/FortreeCity_House4/text.inc @@ -1,18 +1,18 @@ -FortreeCity_House4_Text_1867AF:: @ 81867AF +FortreeCity_House4_Text_BringsWorldCloserTogether:: @ 81867AF .string "By being together with POKéMON,\n" .string "people make more and more friends.\p" .string "And that brings the world closer\n" .string "together. I think it's wonderful!$" -FortreeCity_House4_Text_186835:: @ 8186835 +FortreeCity_House4_Text_GoBirdPokemon:: @ 8186835 .string "There!\n" .string "Go, BIRD POKéMON!$" -FortreeCity_House4_Text_18684E:: @ 818684E +FortreeCity_House4_Text_AskedWingullToRunErrand:: @ 818684E .string "Heheh, I asked my WINGULL to run an\n" .string "errand for me.$" -FortreeCity_House4_Text_186881:: @ 8186881 +FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb:: @ 8186881 .string "Good!\n" .string "Welcome back, WINGULL!\p" .string "Huh? What is this?\n" @@ -22,9 +22,9 @@ FortreeCity_House4_Text_186881:: @ 8186881 .string "But I'm not a TRAINER, so you can\n" .string "have it.$" -FortreeCity_House4_Text_186924:: @ 8186924 +FortreeCity_House4_Text_FriendsFarAwayThanksToWingull:: @ 8186924 .string "Thanks to my WINGULL, I have friends\n" .string "who live far away.$" -FortreeCity_House4_Text_18695C:: @ 818695C +FortreeCity_House4_Text_Wingull:: @ 818695C .string "WINGULL: Pihyoh!$" diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 5db037c20..78c597e35 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_158232", + "script": "FortreeCity_House5_EventScript_PokefanF", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_158244", + "script": "FortreeCity_House5_EventScript_Zigzagoon", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_15823B", + "script": "FortreeCity_House5_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc index 3b4b1d436..64d477bda 100644 --- a/data/maps/FortreeCity_House5/scripts.inc +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -1,20 +1,20 @@ FortreeCity_House5_MapScripts:: @ 8158231 .byte 0 -FortreeCity_House5_EventScript_158232:: @ 8158232 - msgbox FortreeCity_House5_Text_18696D, MSGBOX_NPC +FortreeCity_House5_EventScript_PokefanF:: @ 8158232 + msgbox FortreeCity_House5_Text_TreeHousesAreGreat, MSGBOX_NPC end -FortreeCity_House5_EventScript_15823B:: @ 815823B - msgbox FortreeCity_House5_Text_1869D6, MSGBOX_NPC +FortreeCity_House5_EventScript_Man:: @ 815823B + msgbox FortreeCity_House5_Text_AdaptedToNature, MSGBOX_NPC end -FortreeCity_House5_EventScript_158244:: @ 8158244 +FortreeCity_House5_EventScript_Zigzagoon:: @ 8158244 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House5_Text_186A4F, MSGBOX_DEFAULT + msgbox FortreeCity_House5_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House5/text.inc b/data/maps/FortreeCity_House5/text.inc index a2c7a2315..f344ea09a 100644 --- a/data/maps/FortreeCity_House5/text.inc +++ b/data/maps/FortreeCity_House5/text.inc @@ -1,13 +1,13 @@ -FortreeCity_House5_Text_18696D:: @ 818696D +FortreeCity_House5_Text_TreeHousesAreGreat:: @ 818696D .string "The tree houses of FORTREE are great!\p" .string "I think it's the number one town for\n" .string "living together with POKéMON.$" -FortreeCity_House5_Text_1869D6:: @ 81869D6 +FortreeCity_House5_Text_AdaptedToNature:: @ 81869D6 .string "POKéMON and people have adapted to\n" .string "nature to survive.\p" .string "There's no need to make nature\n" .string "conform to the way we want to live.$" -FortreeCity_House5_Text_186A4F:: @ 8186A4F +FortreeCity_House5_Text_Zigzagoon:: @ 8186A4F .string "ZIGZAGOON: Bufuu!$" diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index f36f58635..6776862c3 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_158067", + "script": "FortreeCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_158098", + "script": "FortreeCity_Mart_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_1580A1", + "script": "FortreeCity_Mart_EventScript_Girl", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Mart_EventScript_1580AA", + "script": "FortreeCity_Mart_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index c41d5edae..d7ce0849d 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -1,7 +1,7 @@ FortreeCity_Mart_MapScripts:: @ 8158066 .byte 0 -FortreeCity_Mart_EventScript_158067:: @ 8158067 +FortreeCity_Mart_EventScript_Clerk:: @ 8158067 lock faceplayer message Text_HowMayIServeYou @@ -27,14 +27,14 @@ FortreeCity_Mart_Items:: @ 8158080 release end -FortreeCity_Mart_EventScript_158098:: @ 8158098 - msgbox FortreeCity_Mart_Text_1861EF, MSGBOX_NPC +FortreeCity_Mart_EventScript_Woman:: @ 8158098 + msgbox FortreeCity_Mart_Text_SuperRepelBetter, MSGBOX_NPC end -FortreeCity_Mart_EventScript_1580A1:: @ 81580A1 - msgbox FortreeCity_Mart_Text_186251, MSGBOX_NPC +FortreeCity_Mart_EventScript_Girl:: @ 81580A1 + msgbox FortreeCity_Mart_Text_StockUpOnItems, MSGBOX_NPC end -FortreeCity_Mart_EventScript_1580AA:: @ 81580AA - msgbox FortreeCity_Mart_Text_1862CA, MSGBOX_NPC +FortreeCity_Mart_EventScript_Boy:: @ 81580AA + msgbox FortreeCity_Mart_Text_RareCandyMakesMonGrow, MSGBOX_NPC end diff --git a/data/maps/FortreeCity_Mart/text.inc b/data/maps/FortreeCity_Mart/text.inc index 244826911..af57db78f 100644 --- a/data/maps/FortreeCity_Mart/text.inc +++ b/data/maps/FortreeCity_Mart/text.inc @@ -1,15 +1,15 @@ -FortreeCity_Mart_Text_1861EF:: @ 81861EF +FortreeCity_Mart_Text_SuperRepelBetter:: @ 81861EF .string "SUPER REPEL lasts a long time, and\n" .string "it gets the job done.\p" .string "It's much better than an ordinary\n" .string "REPEL.$" -FortreeCity_Mart_Text_186251:: @ 8186251 +FortreeCity_Mart_Text_StockUpOnItems:: @ 8186251 .string "I always stock up on more items than\n" .string "I'm sure I'll need.\p" .string "You never know what might happen.\n" .string "Better to be safe than sorry!$" -FortreeCity_Mart_Text_1862CA:: @ 81862CA +FortreeCity_Mart_Text_RareCandyMakesMonGrow:: @ 81862CA .string "A RARE CANDY makes a POKéMON grow\n" .string "immediately by one level.$" diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index a99395fab..a2364a94d 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_158029", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_158032", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_1F_EventScript_15803B", + "script": "FortreeCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 90b74adc0..44d9d5156 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_158017 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition .byte 0 -FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 +FortreeCity_PokemonCenter_1F_OnTransition:: @ 8158017 setrespawn HEAL_LOCATION_FORTREE_CITY end @@ -14,14 +14,14 @@ FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B release end -FortreeCity_PokemonCenter_1F_EventScript_158029:: @ 8158029 - msgbox FortreeCity_PokemonCenter_1F_Text_186027, MSGBOX_NPC +FortreeCity_PokemonCenter_1F_EventScript_Gentleman:: @ 8158029 + msgbox FortreeCity_PokemonCenter_1F_Text_GoToSafariZone, MSGBOX_NPC end -FortreeCity_PokemonCenter_1F_EventScript_158032:: @ 8158032 - msgbox FortreeCity_PokemonCenter_1F_Text_186086, MSGBOX_NPC +FortreeCity_PokemonCenter_1F_EventScript_Man:: @ 8158032 + msgbox FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat, MSGBOX_NPC end -FortreeCity_PokemonCenter_1F_EventScript_15803B:: @ 815803B - msgbox FortreeCity_PokemonCenter_1F_Text_186138, MSGBOX_NPC +FortreeCity_PokemonCenter_1F_EventScript_Boy:: @ 815803B + msgbox FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav, MSGBOX_NPC end diff --git a/data/maps/FortreeCity_PokemonCenter_1F/text.inc b/data/maps/FortreeCity_PokemonCenter_1F/text.inc index 7cfdb10bd..aa75c9239 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/text.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -FortreeCity_PokemonCenter_1F_Text_186027:: @ 8186027 +FortreeCity_PokemonCenter_1F_Text_GoToSafariZone:: @ 8186027 .string "Listen, kid, are you working\n" .string "on a POKéDEX?\p" .string "Hmm... Go to the SAFARI ZONE.\n" .string "That's my suggestion.$" -FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 +FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat:: @ 8186086 .string "Have you done anything at the\n" .string "RECORD CORNER?\p" .string "It's pretty neat. It mixes and matches\n" @@ -12,7 +12,7 @@ FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 .string "I don't know quite how it works,\n" .string "but it's cool. It's exciting, even!$" -FortreeCity_PokemonCenter_1F_Text_186138:: @ 8186138 +FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav:: @ 8186138 .string "Hey, you've got a POKéNAV!\n" .string "It's the same as mine.\p" .string "Check out the TRAINER'S EYES on it.\p"