diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index fe1ff9543..a26477303 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1369,7 +1369,7 @@ SlateportCity_PokemonFanClub_EventScript_1AE0AC:: @ 81AE0AC release end -FallarborTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 +FallarborTown_ContestLobby_EventScript_Reporter:: @ 81AE0B6 LilycoveCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 diff --git a/data-de/maps/FallarborTown_ContestHall/text.inc b/data-de/maps/FallarborTown_ContestHall/text.inc index 43c34e295..a523ad3ab 100644 --- a/data-de/maps/FallarborTown_ContestHall/text.inc +++ b/data-de/maps/FallarborTown_ContestHall/text.inc @@ -1,21 +1,21 @@ -FallarborTown_ContestHall_Text_177335:: @ 8177335 +FallarborTown_ContestHall_Text_DoAllRightInPreliminary:: @ 8177335 .string "Im 1. Durchlauf schneiden wir immer\n" .string "gut ab, aber im 2. Durchlauf...\p" .string "Vielleicht sollte ich beobachten, was\n" .string "die anderen Teilnehmer machen...$" -FallarborTown_ContestHall_Text_1773C6:: @ 81773C6 +FallarborTown_ContestHall_Text_MonAllTheseRibbons:: @ 81773C6 .string "Schau mal! Mein POKéMON hat all\n" .string "diese BÄNDER gewonnen!\p" .string "Besitzen deine POKéMON auch BÄNDER?\n" .string "Du kannst das im POKéNAV überprüfen.$" -FallarborTown_ContestHall_Text_177437:: @ 8177437 +FallarborTown_ContestHall_Text_CantWinEverywhere:: @ 8177437 .string "Ich kann ARENALEITER nicht besiegen...\p" .string "Ich kann keine WETTBEWERBE gewinnen...\p" .string "Ich war schon hier und dort und überall,\n" .string "aber immer vergebens.$" -FallarborTown_ContestHall_Text_1774B1:: @ 81774B1 +FallarborTown_ContestHall_Text_SuperRankStage:: @ 81774B1 .string "POKéMON-WETTBEWERBE\n" .string "BÜHNE für die SUPER-KLASSE!$" diff --git a/data-de/maps/FallarborTown_ContestLobby/text.inc b/data-de/maps/FallarborTown_ContestLobby/text.inc index 085d43e7d..2588dc12f 100644 --- a/data-de/maps/FallarborTown_ContestLobby/text.inc +++ b/data-de/maps/FallarborTown_ContestLobby/text.inc @@ -1,4 +1,4 @@ -FallarborTown_ContestLobby_Text_177141:: @ 8177141 +FallarborTown_ContestLobby_Text_UsedToHaveSketch:: @ 8177141 .string "Dort hing mal eine Zeichnung von meinem\n" .string "POKéMON, aber nun hängt dort die\l" .string "Zeichnung eines anderen POKéMON.\p" @@ -6,12 +6,12 @@ FallarborTown_ContestLobby_Text_177141:: @ 8177141 .string "teilnehmen lassen, dann gibt es eine\l" .string "neue Zeichnung von ihm!$" -FallarborTown_ContestLobby_Text_1771F2:: @ 81771F2 +FallarborTown_ContestLobby_Text_AreYouMakingPokeblock:: @ 81771F2 .string "Hallo, willst du {POKEBLOCK} herstellen?\p" .string "Dann komm doch mal wieder vorbei und\n" .string "bring genug BEEREN mit.$" -FallarborTown_ContestLobby_Text_177246:: @ 8177246 +FallarborTown_ContestLobby_Text_ICreateSketches:: @ 8177246 .string "Siehst du, wie sie hier die Zeichnungen\n" .string "des Sieger-POKéMON aushängen?\p" .string "Ich bin der Zeichner dieser Werke!\p" @@ -19,7 +19,7 @@ FallarborTown_ContestLobby_Text_177246:: @ 8177246 .string "WETTBEWERB gewinnt, werde ich es mit\l" .string "Vergnügen zeichnen!$" -FallarborTown_ContestLobby_Text_1772D8:: @ 81772D8 +FallarborTown_ContestLobby_Text_YourSketchIsUp:: @ 81772D8 .string "Hallo und herzlichen Glückwunsch!\p" .string "Ich habe eine Zeichnung deines POKéMON\n" .string "hier aufgehängt, damit jeder es sieht.$" diff --git a/data-de/maps/FallarborTown_House1/text.inc b/data-de/maps/FallarborTown_House1/text.inc index c19ee545d..c89ae3bee 100644 --- a/data-de/maps/FallarborTown_House1/text.inc +++ b/data-de/maps/FallarborTown_House1/text.inc @@ -1,4 +1,4 @@ -FallarborTown_House1_Text_177755:: @ 8177755 +FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow:: @ 8177755 .string "PROF. KOSMO: Oh...\n" .string "Ich hätte mich nie dazu verleiten\l" .string "lassen dürfen, TEAM {EVIL_TEAM} zu verraten,\l" @@ -6,7 +6,7 @@ FallarborTown_House1_Text_177755:: @ 8177755 .string "Der METEORIT von METEORFÄLLE...\n" .string "Nun wird er niemals mir gehören...$" -FallarborTown_House1_Text_17780E:: @ 817780E +FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt:: @ 817780E .string "Oh!\n" .string "Oooh?\p" .string "Dieses Item...\p" @@ -17,36 +17,36 @@ FallarborTown_House1_Text_17780E:: @ 817780E .string "Du bekommst auch etwas dafür.\n" .string "Was hältst du von dieser TM?$" -FallarborTown_House1_Text_1778C4:: @ 81778C4 +FallarborTown_CozmosHouse_Text_PleaseUseThisTM:: @ 81778C4 .string "PROF. KOSMO: Mit dieser TM möchte ich\n" .string "dir meine Dankbarkeit ausdrücken.\l" .string "Bitte, nimm sie an!$" -FallarborTown_House1_Text_177910:: @ 8177910 +FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch:: @ 8177910 .string "PROF. KOSMO: Oh, ich kann es einfach\n" .string "nicht glauben! Das ist nett! So nett!!!\p" .string "Das wird mir bei meinen Forschungen\n" .string "enorm weiterhelfen!$" -FallarborTown_House1_Text_17797D:: @ 817797D +FallarborTown_CozmosHouse_Text_CrushedWithDisappointment:: @ 817797D .string "PROF. KOSMO: Oh, aber...\n" .string "Das enttäuscht mich jetzt maßlos...$" -FallarborTown_House1_Text_1779B8:: @ 81779B8 +FallarborTown_CozmosHouse_Text_MayIHaveMeteorite:: @ 81779B8 .string "PROF. KOSMO: Bitte, darf ich den\n" .string "METEORITEN haben?\p" .string "Ich möchte ihn nicht umsonst haben! Wie\n" .string "wäre es mit dieser TM im Tausch dafür?$" -FallarborTown_House1_Text_177A2B:: @ 8177A2B +FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls:: @ 8177A2B .string "PROF. KOSMO ist unterwegs zu\n" .string "METEORFÄLLE an der ROUTE 114. Einige\l" .string "Leute von TEAM {EVIL_TEAM} begleiten ihn.$" -FallarborTown_House1_Text_177A7C:: @ 8177A7C +FallarborTown_CozmosHouse_Text_FeelSorryForCozmo:: @ 8177A7C .string "Armer PROF. KOSMO...\n" .string "Er ist so deprimiert... Er tut mir Leid.$" -FallarborTown_House1_Text_177ABB:: @ 8177ABB +FallarborTown_CozmosHouse_Text_CozmoIsSoHappy:: @ 8177ABB .string "Schau dir nur PROF. KOSMO an...\n" .string "Er ist so glücklich! Richtig niedlich.$" diff --git a/data-de/maps/FallarborTown_House2/text.inc b/data-de/maps/FallarborTown_House2/text.inc index b0450c136..eaaba3988 100644 --- a/data-de/maps/FallarborTown_House2/text.inc +++ b/data-de/maps/FallarborTown_House2/text.inc @@ -1,4 +1,4 @@ -FallarborTown_House2_Text_177AF4:: @ 8177AF4 +FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor:: @ 8177AF4 .string "Ich bin der ATTACKEN-HELFER.\p" .string "Ich kenne alle Attacken, die ein\n" .string "POKéMON lernen kann - und ich kann sie\l" @@ -8,31 +8,31 @@ FallarborTown_House2_Text_177AF4:: @ 8177AF4 .string "Als Gegenleistung hätte ich gerne eine\n" .string "HERZSCHUPPE. Die sammle ich nämlich.$" -FallarborTown_House2_Text_177BDB:: @ 8177BDB +FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove:: @ 8177BDB .string "Oh! Das ist es! Das ist ehrlich und\n" .string "wahrhaftig eine HERZSCHUPPE!\p" .string "Lass mich raten... Ich soll einem POKéMON\n" .string "eine neue Attacke beibringen?!?$" -FallarborTown_House2_Text_177C3F:: @ 8177C3F +FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon:: @ 8177C3F .string "Welches POKéMON soll sie lernen?$" -FallarborTown_House2_Text_177C5D:: @ 8177C5D +FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove:: @ 8177C5D .string "Welche Attacke soll ich es lehren?$" -FallarborTown_House2_Text_177C78:: @ 8177C78 +FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon:: @ 8177C78 .string "Tut mir Leid...\p" .string "Scheinbar gibt es keine Attacke, die ich\n" .string "diesem POKéMON beibringen kann.$" -FallarborTown_House2_Text_177CC3:: @ 8177CC3 +FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale:: @ 8177CC3 .string "{PLAYER} tauscht eine HERZSCHUPPE ein.$" -FallarborTown_House2_Text_177CEF:: @ 8177CEF +FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale:: @ 8177CEF .string "Falls deine POKéMON neue Attacken\n" .string "lernen sollen, komm mit einer\l" .string "HERZSCHUPPE wieder.$" -FallarborTown_House2_Text_177D33:: @ 8177D33 +FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg:: @ 8177D33 .string "Bitte? Ich kann einem EI nicht eine\n" .string "einzige Attacke beibringen!$" diff --git a/data-de/maps/FallarborTown_Mart/text.inc b/data-de/maps/FallarborTown_Mart/text.inc index 6f6ebef5c..8872fde25 100644 --- a/data-de/maps/FallarborTown_Mart/text.inc +++ b/data-de/maps/FallarborTown_Mart/text.inc @@ -1,4 +1,4 @@ -FallarborTown_Mart_Text_176FF0:: @ 8176FF0 +FallarborTown_Mart_Text_DecidingSkittyEvolve:: @ 8176FF0 .string "Ich habe lange überlegt, ob sich mein\n" .string "ENECO entwickeln soll oder nicht.\p" .string "Ich müsste nur diesen MONDSTEIN ein-\n" @@ -8,10 +8,10 @@ FallarborTown_Mart_Text_176FF0:: @ 8176FF0 .string "stärker.\p" .string "Aber es würde auch anders aussehen.$" -FallarborTown_Mart_Text_1770D3:: @ 81770D3 +FallarborTown_Mart_Text_Skitty:: @ 81770D3 .string "ENECO: Miyao?$" -FallarborTown_Mart_Text_1770E2:: @ 81770E2 +FallarborTown_Mart_Text_SellNuggetIFound:: @ 81770E2 .string "Ich habe hier ein NUGGET gefunden...\n" .string "Das werde ich wohl verkaufen. Was soll\l" .string "ich sonst damit machen?$" diff --git a/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc b/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc index 66a21c458..76ab2edf0 100644 --- a/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc +++ b/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 +FallarborTown_PokemonCenter_1F_Text_LanetteGreeting:: @ 81774D4 .string "Oh, hallo.\n" .string "Wer bist du?\p" .string "Du heißt {PLAYER}{KUN}?\n" @@ -18,13 +18,13 @@ FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 .string "Wenn du magst, besuche mich doch mal.\n" .string "Ich wohne an der ROUTE 114.$" -FallarborTown_PokemonCenter_1F_Text_17768C:: @ 817768C +FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown:: @ 817768C .string "Ich frage mich, wie die POKéMON wohl\n" .string "vor langer, langer Zeit aussahen.\p" .string "Vielleicht kann mir der FOSSILMANIAC\n" .string "am Ortsrand etwas dazu sagen.$" -FallarborTown_PokemonCenter_1F_Text_1776F5:: @ 81776F5 +FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees:: @ 81776F5 .string "Auf den Feldern von LAUBWECHSELFELD\n" .string "haben wir widerstandsfähige Bäume\p" .string "gepflanzt, die auch in der Vulkanasche\n" diff --git a/data/event_scripts.s b/data/event_scripts.s index e8e21acc5..3744fb3bc 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1362,7 +1362,7 @@ SlateportCity_PokemonFanClub_EventScript_1AE0AC:: @ 81AE0AC release end -FallarborTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 +FallarborTown_ContestLobby_EventScript_Reporter:: @ 81AE0B6 LilycoveCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 diff --git a/data/maps/FallarborTown_ContestHall/map.json b/data/maps/FallarborTown_ContestHall/map.json index 9fea71049..92b956e53 100644 --- a/data/maps/FallarborTown_ContestHall/map.json +++ b/data/maps/FallarborTown_ContestHall/map.json @@ -21,7 +21,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestHall_EventScript_153ACF", + "script": "FallarborTown_ContestHall_EventScript_DoAllRightInPreliminary", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 3, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestHall_EventScript_153AD8", + "script": "FallarborTown_ContestHall_EventScript_MonAllTheseRibbons", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 3, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestHall_EventScript_153AE1", + "script": "FallarborTown_ContestHall_EventScript_CantWinEverywhere", "flag": "0" } ], @@ -75,7 +75,7 @@ "y": 14, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestHall_EventScript_153AEA" + "script": "FallarborTown_ContestHall_EventScript_SuperRankStage" }, { "type": "sign", @@ -83,7 +83,7 @@ "y": 14, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestHall_EventScript_153AEA" + "script": "FallarborTown_ContestHall_EventScript_SuperRankStage" } ] } diff --git a/data/maps/FallarborTown_ContestHall/scripts.inc b/data/maps/FallarborTown_ContestHall/scripts.inc index 34ece82e2..98f37f218 100644 --- a/data/maps/FallarborTown_ContestHall/scripts.inc +++ b/data/maps/FallarborTown_ContestHall/scripts.inc @@ -1,18 +1,18 @@ FallarborTown_ContestHall_MapScripts:: @ 8153ACE .byte 0 -FallarborTown_ContestHall_EventScript_153ACF:: @ 8153ACF - msgbox FallarborTown_ContestHall_Text_177335, MSGBOX_NPC +FallarborTown_ContestHall_EventScript_DoAllRightInPreliminary:: @ 8153ACF + msgbox FallarborTown_ContestHall_Text_DoAllRightInPreliminary, MSGBOX_NPC end -FallarborTown_ContestHall_EventScript_153AD8:: @ 8153AD8 - msgbox FallarborTown_ContestHall_Text_1773C6, MSGBOX_NPC +FallarborTown_ContestHall_EventScript_MonAllTheseRibbons:: @ 8153AD8 + msgbox FallarborTown_ContestHall_Text_MonAllTheseRibbons, MSGBOX_NPC end -FallarborTown_ContestHall_EventScript_153AE1:: @ 8153AE1 - msgbox FallarborTown_ContestHall_Text_177437, MSGBOX_NPC +FallarborTown_ContestHall_EventScript_CantWinEverywhere:: @ 8153AE1 + msgbox FallarborTown_ContestHall_Text_CantWinEverywhere, MSGBOX_NPC end -FallarborTown_ContestHall_EventScript_153AEA:: @ 8153AEA - msgbox FallarborTown_ContestHall_Text_1774B1, MSGBOX_SIGN +FallarborTown_ContestHall_EventScript_SuperRankStage:: @ 8153AEA + msgbox FallarborTown_ContestHall_Text_SuperRankStage, MSGBOX_SIGN end diff --git a/data/maps/FallarborTown_ContestHall/text.inc b/data/maps/FallarborTown_ContestHall/text.inc index 89a595136..0c8f6b688 100644 --- a/data/maps/FallarborTown_ContestHall/text.inc +++ b/data/maps/FallarborTown_ContestHall/text.inc @@ -1,21 +1,21 @@ -FallarborTown_ContestHall_Text_177335:: @ 8177335 +FallarborTown_ContestHall_Text_DoAllRightInPreliminary:: @ 8177335 .string "We do all right in the preliminary round,\n" .string "but we can never win the appeals...\p" .string "Maybe it means I have to watch what\n" .string "other contestants are doing...$" -FallarborTown_ContestHall_Text_1773C6:: @ 81773C6 +FallarborTown_ContestHall_Text_MonAllTheseRibbons:: @ 81773C6 .string "See!\n" .string "My POKéMON won all these RIBBONS!\p" .string "Have your POKéMON earned any RIBBONS?\n" .string "You can check them on your POKéNAV.$" -FallarborTown_ContestHall_Text_177437:: @ 8177437 +FallarborTown_ContestHall_Text_CantWinEverywhere:: @ 8177437 .string "I can't beat GYM LEADERS...\p" .string "I can't win any CONTESTS...\p" .string "I've been here, there, and everywhere,\n" .string "and it's all for naught...$" -FallarborTown_ContestHall_Text_1774B1:: @ 81774B1 +FallarborTown_ContestHall_Text_SuperRankStage:: @ 81774B1 .string "POKéMON CONTESTS\n" .string "SUPER RANK STAGE!$" diff --git a/data/maps/FallarborTown_ContestLobby/map.json b/data/maps/FallarborTown_ContestLobby/map.json index f62471670..fa4837bd9 100644 --- a/data/maps/FallarborTown_ContestLobby/map.json +++ b/data/maps/FallarborTown_ContestLobby/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_1539CD", + "script": "FallarborTown_ContestLobby_EventScript_ContestReceptionist", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_153A8E", + "script": "FallarborTown_ContestLobby_EventScript_Boy", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_153AB2", + "script": "FallarborTown_ContestLobby_EventScript_Girl", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_1B778A", + "script": "FallarborTown_ContestLobby_EventScript_BerryBlenderMan", "flag": "0" }, { @@ -73,7 +73,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_1AE0B6", + "script": "FallarborTown_ContestLobby_EventScript_Reporter", "flag": "FLAG_HIDE_CONTEST_REPORTER_FALLARBOR" }, { @@ -86,7 +86,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_ContestLobby_EventScript_153A97", + "script": "FallarborTown_ContestLobby_EventScript_SketchArtist", "flag": "0" } ], @@ -121,7 +121,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestLobby_EventScript_1B7823" + "script": "FallarborTown_ContestLobby_EventScript_BerryBlender1" }, { "type": "sign", @@ -129,7 +129,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestLobby_EventScript_1B7604" + "script": "FallarborTown_ContestLobby_EventScript_BerryBlender2" }, { "type": "sign", @@ -137,7 +137,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestLobby_EventScript_153ABB" + "script": "FallarborTown_ContestLobby_EventScript_ContestWinner1" }, { "type": "sign", @@ -145,7 +145,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_ContestLobby_EventScript_153AC2" + "script": "FallarborTown_ContestLobby_EventScript_ContestWinner2" } ] } diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index ac38ff349..6c47d7eff 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -1,12 +1,12 @@ FallarborTown_ContestLobby_MapScripts:: @ 81539C1 - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_ContestLobby_MapScript1_1539C7 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_ContestLobby_OnTransition .byte 0 -FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 +FallarborTown_ContestLobby_OnTransition:: @ 81539C7 call FallarborTown_ContestLobby_EventScript_1AE188 end -FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD +FallarborTown_ContestLobby_EventScript_ContestReceptionist:: @ 81539CD setvar VAR_0x800B, 6 setvar VAR_CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 @@ -87,31 +87,31 @@ FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C walk_in_place_fastest_right step_end -FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E - msgbox FallarborTown_ContestLobby_Text_177141, MSGBOX_NPC +FallarborTown_ContestLobby_EventScript_Boy:: @ 8153A8E + msgbox FallarborTown_ContestLobby_Text_UsedToHaveSketch, MSGBOX_NPC end -FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 +FallarborTown_ContestLobby_EventScript_SketchArtist:: @ 8153A97 goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9 - msgbox FallarborTown_ContestLobby_Text_177246, MSGBOX_NPC + msgbox FallarborTown_ContestLobby_Text_ICreateSketches, MSGBOX_NPC end FallarborTown_ContestLobby_EventScript_153AA9:: @ 8153AA9 - msgbox FallarborTown_ContestLobby_Text_1772D8, MSGBOX_NPC + msgbox FallarborTown_ContestLobby_Text_YourSketchIsUp, MSGBOX_NPC end -FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2 - msgbox FallarborTown_ContestLobby_Text_1771F2, MSGBOX_NPC +FallarborTown_ContestLobby_EventScript_Girl:: @ 8153AB2 + msgbox FallarborTown_ContestLobby_Text_AreYouMakingPokeblock, MSGBOX_NPC end -FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB +FallarborTown_ContestLobby_EventScript_ContestWinner1:: @ 8153ABB lockall fadescreen FADE_TO_BLACK showcontestwinner 2 releaseall end -FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 +FallarborTown_ContestLobby_EventScript_ContestWinner2:: @ 8153AC2 lockall special ShowBerryBlenderRecordWindow waitbuttonpress diff --git a/data/maps/FallarborTown_ContestLobby/text.inc b/data/maps/FallarborTown_ContestLobby/text.inc index 3bfa87936..c4c32e36c 100644 --- a/data/maps/FallarborTown_ContestLobby/text.inc +++ b/data/maps/FallarborTown_ContestLobby/text.inc @@ -1,23 +1,23 @@ -FallarborTown_ContestLobby_Text_177141:: @ 8177141 +FallarborTown_ContestLobby_Text_UsedToHaveSketch:: @ 8177141 .string "They had a sketch of my POKéMON up\n" .string "on the wall over there, but they\l" .string "changed it with a new one already.\p" .string "I'm going to enter my HANA in CONTESTS\n" .string "so we can get her sketch up again!$" -FallarborTown_ContestLobby_Text_1771F2:: @ 81771F2 +FallarborTown_ContestLobby_Text_AreYouMakingPokeblock:: @ 81771F2 .string "Hi, are you making any {POKEBLOCK}S?\p" .string "You should come by with a bunch of\n" .string "BERRIES sometime.$" -FallarborTown_ContestLobby_Text_177246:: @ 8177246 +FallarborTown_ContestLobby_Text_ICreateSketches:: @ 8177246 .string "You see how they display a sketch of\n" .string "a CONTEST winner here?\p" .string "I sketch them!\p" .string "If any of your POKéMON wins a CONTEST,\n" .string "I'd gladly make a sketch of it!$" -FallarborTown_ContestLobby_Text_1772D8:: @ 81772D8 +FallarborTown_ContestLobby_Text_YourSketchIsUp:: @ 81772D8 .string "Hello! Congratulations!\p" .string "I've put up a sketch of your POKéMON\n" .string "right here for everyone to see!$" diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index cfa8e3ce0..78dca2771 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House1_EventScript_153C5E", + "script": "FallarborTown_CozmosHouse_EventScript_CozmosWife", "flag": "0" } ], diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 9690ccb29..6888fb3bd 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -1,72 +1,72 @@ FallarborTown_House1_MapScripts:: @ 8153BAE - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_House1_MapScript1_153BB4 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_House1_OnTransition .byte 0 -FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 +FallarborTown_House1_OnTransition:: @ 8153BB4 end FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 lock faceplayer - goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C54 + goto_if_set FLAG_RECEIVED_TM_RETURN, FallarborTown_CozmosHouse_EventScript_GaveMeteorite checkitem ITEM_METEORITE, 1 compare VAR_RESULT, 1 - goto_if_eq FallarborTown_House1_EventScript_153BDA - msgbox FallarborTown_House1_Text_177755, MSGBOX_DEFAULT + goto_if_eq FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite + msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153BDA:: @ 8153BDA - call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_153C2D - call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_153C3E +FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8153BDA + call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_NoticeMeteorite + call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_AskForMeteorite compare VAR_RESULT, NO - goto_if_eq FallarborTown_House1_EventScript_153C47 - msgbox FallarborTown_House1_Text_1778C4, MSGBOX_DEFAULT + goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite + msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT giveitem ITEM_TM27_RETURN compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setvar VAR_0x8004, ITEM_METEORITE call Common_EventScript_PlayerHandedOverTheItem - setflag FLAG_RECEIVED_TM27 - msgbox FallarborTown_House1_Text_177910, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_TM_RETURN + msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C2D:: @ 8153C2D - msgbox FallarborTown_House1_Text_177755, MSGBOX_DEFAULT - msgbox FallarborTown_House1_Text_17780E, MSGBOX_YESNO +FallarborTown_CozmosHouse_EventScript_NoticeMeteorite:: @ 8153C2D + msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT + msgbox FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt, MSGBOX_YESNO return -FallarborTown_House1_EventScript_153C3E:: @ 8153C3E - msgbox FallarborTown_House1_Text_1779B8, MSGBOX_YESNO +FallarborTown_CozmosHouse_EventScript_AskForMeteorite:: @ 8153C3E + msgbox FallarborTown_CozmosHouse_Text_MayIHaveMeteorite, MSGBOX_YESNO return -FallarborTown_House1_EventScript_153C47:: @ 8153C47 +FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite:: @ 8153C47 setflag FLAG_TEMP_2 - msgbox FallarborTown_House1_Text_17797D, MSGBOX_DEFAULT + msgbox FallarborTown_CozmosHouse_Text_CrushedWithDisappointment, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C54:: @ 8153C54 - msgbox FallarborTown_House1_Text_177910, MSGBOX_DEFAULT +FallarborTown_CozmosHouse_EventScript_GaveMeteorite:: @ 8153C54 + msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C5E:: @ 8153C5E +FallarborTown_CozmosHouse_EventScript_CozmosWife:: @ 8153C5E lock faceplayer - goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C86 - goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_153C7C - msgbox FallarborTown_House1_Text_177A2B, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM_RETURN, FallarborTown_CozmosHouse_EventScript_CozmoIsHappy + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_CozmosHouse_EventScript_CozmoIsSad + msgbox FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C7C:: @ 8153C7C - msgbox FallarborTown_House1_Text_177A7C, MSGBOX_DEFAULT +FallarborTown_CozmosHouse_EventScript_CozmoIsSad:: @ 8153C7C + msgbox FallarborTown_CozmosHouse_Text_FeelSorryForCozmo, MSGBOX_DEFAULT release end -FallarborTown_House1_EventScript_153C86:: @ 8153C86 - msgbox FallarborTown_House1_Text_177ABB, MSGBOX_DEFAULT +FallarborTown_CozmosHouse_EventScript_CozmoIsHappy:: @ 8153C86 + msgbox FallarborTown_CozmosHouse_Text_CozmoIsSoHappy, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_House1/text.inc b/data/maps/FallarborTown_House1/text.inc index c8c155583..bc163fc52 100644 --- a/data/maps/FallarborTown_House1/text.inc +++ b/data/maps/FallarborTown_House1/text.inc @@ -1,4 +1,4 @@ -FallarborTown_House1_Text_177755:: @ 8177755 +FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow:: @ 8177755 .string "PROF. COZMO: Oh...\n" .string "I never should have let myself be\l" .string "conned into telling TEAM {EVIL_TEAM} where\l" @@ -6,7 +6,7 @@ FallarborTown_House1_Text_177755:: @ 8177755 .string "That METEORITE from METEOR FALLS...\n" .string "It's never going to be mine now...$" -FallarborTown_House1_Text_17780E:: @ 817780E +FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt:: @ 817780E .string "Oh!\n" .string "Hah?\p" .string "That item...\p" @@ -17,35 +17,35 @@ FallarborTown_House1_Text_17780E:: @ 817780E .string "I'm not asking for it for free.\n" .string "How about in exchange for this TM?$" -FallarborTown_House1_Text_1778C4:: @ 81778C4 +FallarborTown_CozmosHouse_Text_PleaseUseThisTM:: @ 81778C4 .string "PROF. COZMO: This TM, it represents\n" .string "my feeling of gratitude.\l" .string "Please use it!$" -FallarborTown_House1_Text_177910:: @ 8177910 +FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch:: @ 8177910 .string "PROF. COZMO: Oh, I can't believe it.\n" .string "This is really, really great!\p" .string "This is really going to help my research!$" -FallarborTown_House1_Text_17797D:: @ 817797D +FallarborTown_CozmosHouse_Text_CrushedWithDisappointment:: @ 817797D .string "PROF. COZMO: Oh, but...\n" .string "I'm crushed with disappointment...$" -FallarborTown_House1_Text_1779B8:: @ 81779B8 +FallarborTown_CozmosHouse_Text_MayIHaveMeteorite:: @ 81779B8 .string "PROF. COZMO: Please, may I have that\n" .string "METEORITE?\p" .string "I'm not asking for it for free.\n" .string "How about in exchange for this TM?$" -FallarborTown_House1_Text_177A2B:: @ 8177A2B +FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls:: @ 8177A2B .string "PROF. COZMO went off to METEOR FALLS\n" .string "on ROUTE 114 with some people from\l" .string "TEAM {EVIL_TEAM}.$" -FallarborTown_House1_Text_177A7C:: @ 8177A7C +FallarborTown_CozmosHouse_Text_FeelSorryForCozmo:: @ 8177A7C .string "Poor PROF. COZMO...\n" .string "He's so depressed... I feel sorry for him.$" -FallarborTown_House1_Text_177ABB:: @ 8177ABB +FallarborTown_CozmosHouse_Text_CozmoIsSoHappy:: @ 8177ABB .string "Look at PROF. COZMO...\n" .string "He's so happy! I think it's cute.$" diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index b38c06092..428494609 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House2_EventScript_153C91", + "script": "FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner", "flag": "0" } ], diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 6ea37ea51..ad7930115 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -1,62 +1,62 @@ FallarborTown_House2_MapScripts:: @ 8153C90 .byte 0 -FallarborTown_House2_EventScript_153C91:: @ 8153C91 +FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: @ 8153C91 lockall applymovement 1, Common_Movement_FacePlayer waitmovement 0 - goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6 - msgbox FallarborTown_House2_Text_177AF4, MSGBOX_DEFAULT + goto_if_set FLAG_TEMP_1, FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove + msgbox FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor, MSGBOX_DEFAULT setflag FLAG_TEMP_1 - goto FallarborTown_House2_EventScript_153CB6 + goto FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove end -FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 +FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House2_EventScript_153D60 - msgbox FallarborTown_House2_Text_177BDB, MSGBOX_YESNO + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + msgbox FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove, MSGBOX_YESNO switch VAR_RESULT - case NO, FallarborTown_House2_EventScript_153D60 - goto FallarborTown_House2_EventScript_153CE4 + case NO, FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon end -FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 - msgbox FallarborTown_House2_Text_177C3F, MSGBOX_DEFAULT +FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon:: @ 8153CE4 + msgbox FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon, MSGBOX_DEFAULT special SelectMoveTutorMon waitstate compare VAR_0x8004, 255 - goto_if_eq FallarborTown_House2_EventScript_153D60 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale special IsSelectedMonEgg compare VAR_RESULT, 1 - goto_if_eq FallarborTown_House2_EventScript_153D52 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg compare VAR_0x8005, 0 - goto_if_eq FallarborTown_House2_EventScript_153D44 - goto FallarborTown_House2_EventScript_153D1A + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove end -FallarborTown_House2_EventScript_153D1A:: @ 8153D1A - msgbox FallarborTown_House2_Text_177C5D, MSGBOX_DEFAULT +FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 8153D1A + msgbox FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove, MSGBOX_DEFAULT special DisplayMoveTutorMenu waitstate compare VAR_0x8004, 0 - goto_if_eq FallarborTown_House2_EventScript_153CE4 - msgbox FallarborTown_House2_Text_177CC3, MSGBOX_DEFAULT + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + msgbox FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale, MSGBOX_DEFAULT removeitem ITEM_HEART_SCALE - goto FallarborTown_House2_EventScript_153D60 + goto FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale end -FallarborTown_House2_EventScript_153D44:: @ 8153D44 - msgbox FallarborTown_House2_Text_177C78, MSGBOX_DEFAULT - goto FallarborTown_House2_EventScript_153CE4 +FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon:: @ 8153D44 + msgbox FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon, MSGBOX_DEFAULT + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon end -FallarborTown_House2_EventScript_153D52:: @ 8153D52 - msgbox FallarborTown_House2_Text_177D33, MSGBOX_DEFAULT - goto FallarborTown_House2_EventScript_153CE4 +FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg:: @ 8153D52 + msgbox FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg, MSGBOX_DEFAULT + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon end -FallarborTown_House2_EventScript_153D60:: @ 8153D60 - msgbox FallarborTown_House2_Text_177CEF, MSGBOX_DEFAULT +FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale:: @ 8153D60 + msgbox FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/FallarborTown_House2/text.inc b/data/maps/FallarborTown_House2/text.inc index 2ccea7781..825a4c58b 100644 --- a/data/maps/FallarborTown_House2/text.inc +++ b/data/maps/FallarborTown_House2/text.inc @@ -1,4 +1,4 @@ -FallarborTown_House2_Text_177AF4:: @ 8177AF4 +FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor:: @ 8177AF4 .string "I'm the MOVE TUTOR.\p" .string "I know all the moves that POKéMON\n" .string "learn - every one of them - and I can\l" @@ -8,31 +8,31 @@ FallarborTown_House2_Text_177AF4:: @ 8177AF4 .string "I'll do it for a HEART SCALE.\n" .string "I'm collecting those now.$" -FallarborTown_House2_Text_177BDB:: @ 8177BDB +FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove:: @ 8177BDB .string "Oh! That's it! That's an honest to\n" .string "goodness HEART SCALE!\p" .string "Let me guess, you want me to teach\n" .string "a move?$" -FallarborTown_House2_Text_177C3F:: @ 8177C3F +FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon:: @ 8177C3F .string "Which POKéMON needs tutoring?$" -FallarborTown_House2_Text_177C5D:: @ 8177C5D +FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove:: @ 8177C5D .string "Which move should I teach?$" -FallarborTown_House2_Text_177C78:: @ 8177C78 +FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon:: @ 8177C78 .string "Sorry...\p" .string "It doesn't appear as if I have any move\n" .string "I can teach that POKéMON.$" -FallarborTown_House2_Text_177CC3:: @ 8177CC3 +FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale:: @ 8177CC3 .string "{PLAYER} handed over one HEART SCALE\n" .string "in exchange.$" -FallarborTown_House2_Text_177CEF:: @ 8177CEF +FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale:: @ 8177CEF .string "If your POKéMON need to learn a move,\n" .string "come back with a HEART SCALE.$" -FallarborTown_House2_Text_177D33:: @ 8177D33 +FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg:: @ 8177D33 .string "Hunh? There isn't a single move that\n" .string "I can teach an EGG.$" diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index 20b6e5cde..043340157 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_153967", + "script": "FallarborTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_15399C", + "script": "FallarborTown_Mart_EventScript_Woman", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_1539A5", + "script": "FallarborTown_Mart_EventScript_PokefanM", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_1539AE", + "script": "FallarborTown_Mart_EventScript_Skitty", "flag": "0" } ], diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index 12d92164b..9d44052b2 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -1,7 +1,7 @@ FallarborTown_Mart_MapScripts:: @ 8153966 .byte 0 -FallarborTown_Mart_EventScript_153967:: @ 8153967 +FallarborTown_Mart_EventScript_Clerk:: @ 8153967 lock faceplayer message Text_HowMayIServeYou @@ -29,20 +29,20 @@ FallarborTown_Mart_Items:: @ 8153980 release end -FallarborTown_Mart_EventScript_15399C:: @ 815399C - msgbox FallarborTown_Mart_Text_176FF0, MSGBOX_NPC +FallarborTown_Mart_EventScript_Woman:: @ 815399C + msgbox FallarborTown_Mart_Text_DecidingSkittyEvolve, MSGBOX_NPC end -FallarborTown_Mart_EventScript_1539A5:: @ 81539A5 - msgbox FallarborTown_Mart_Text_1770E2, MSGBOX_NPC +FallarborTown_Mart_EventScript_PokefanM:: @ 81539A5 + msgbox FallarborTown_Mart_Text_SellNuggetIFound, MSGBOX_NPC end -FallarborTown_Mart_EventScript_1539AE:: @ 81539AE +FallarborTown_Mart_EventScript_Skitty:: @ 81539AE lock faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox FallarborTown_Mart_Text_1770D3, MSGBOX_DEFAULT + msgbox FallarborTown_Mart_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FallarborTown_Mart/text.inc b/data/maps/FallarborTown_Mart/text.inc index a63892874..5860856c0 100644 --- a/data/maps/FallarborTown_Mart/text.inc +++ b/data/maps/FallarborTown_Mart/text.inc @@ -1,4 +1,4 @@ -FallarborTown_Mart_Text_176FF0:: @ 8176FF0 +FallarborTown_Mart_Text_DecidingSkittyEvolve:: @ 8176FF0 .string "I'm having a hard time deciding if I\n" .string "should make my SKITTY evolve or not.\p" .string "I only have to use this MOON STONE,\n" @@ -7,10 +7,10 @@ FallarborTown_Mart_Text_176FF0:: @ 8176FF0 .string "much stronger.\p" .string "But it will look so different, too.$" -FallarborTown_Mart_Text_1770D3:: @ 81770D3 +FallarborTown_Mart_Text_Skitty:: @ 81770D3 .string "SKITTY: Miyao?$" -FallarborTown_Mart_Text_1770E2:: @ 81770E2 +FallarborTown_Mart_Text_SellNuggetIFound:: @ 81770E2 .string "This NUGGET I found here...\n" .string "I suppose I'll have to sell it, seeing\l" .string "as how it has no other use.$" diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index 0a426fa7e..a9d867a6d 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -21,7 +21,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_153B02", + "script": "FallarborTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -34,7 +34,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_153B10", + "script": "FallarborTown_PokemonCenter_1F_EventScript_Girl", "flag": "0" }, { @@ -47,7 +47,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_153B19", + "script": "FallarborTown_PokemonCenter_1F_EventScript_ExpertM", "flag": "0" }, { @@ -60,7 +60,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_1F_EventScript_153B22", + "script": "FallarborTown_PokemonCenter_1F_EventScript_Lanette", "flag": "FLAG_HIDE_LANETTE_FALLARBOR" } ], diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 93b87791d..19cc4d7e4 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,13 +1,13 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_153AF9 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition .byte 0 -FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 +FallarborTown_PokemonCenter_1F_OnTransition:: @ 8153AF9 setrespawn HEAL_LOCATION_FALLARBOR_TOWN call Common_EventScript_UpdateBrineyLocation end -FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 +FallarborTown_PokemonCenter_1F_EventScript_Nurse:: @ 8153B02 setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -15,44 +15,44 @@ FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 release end -FallarborTown_PokemonCenter_1F_EventScript_153B10:: @ 8153B10 - msgbox FallarborTown_PokemonCenter_1F_Text_17768C, MSGBOX_NPC +FallarborTown_PokemonCenter_1F_EventScript_Girl:: @ 8153B10 + msgbox FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown, MSGBOX_NPC end -FallarborTown_PokemonCenter_1F_EventScript_153B19:: @ 8153B19 - msgbox FallarborTown_PokemonCenter_1F_Text_1776F5, MSGBOX_NPC +FallarborTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8153B19 + msgbox FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees, MSGBOX_NPC end -FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 +FallarborTown_PokemonCenter_1F_EventScript_Lanette:: @ 8153B22 lock faceplayer - msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, MSGBOX_DEFAULT + msgbox FallarborTown_PokemonCenter_1F_Text_LanetteGreeting, MSGBOX_DEFAULT closemessage switch VAR_FACING - case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49 - case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59 + case 2, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth + case 3, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest end -FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49 - applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B74 +FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth:: @ 8153B49 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth waitmovement 0 - goto FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited end -FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 - applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B81 +FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8153B59 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest waitmovement 0 - goto FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited end -FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 +FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8153B69 playse SE_SLIDING_DOOR removeobject 4 clearflag FLAG_HIDE_LANETTE release end -FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74 +FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth:: @ 8153B74 walk_right walk_down walk_down @@ -67,7 +67,7 @@ FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74 delay_8 step_end -FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81 +FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest:: @ 8153B81 walk_down walk_down walk_left diff --git a/data/maps/FallarborTown_PokemonCenter_1F/text.inc b/data/maps/FallarborTown_PokemonCenter_1F/text.inc index 2a9102ebf..049bb2006 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/text.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 +FallarborTown_PokemonCenter_1F_Text_LanetteGreeting:: @ 81774D4 .string "Oh, hello.\n" .string "You are?\p" .string "Okay, your name's {PLAYER}{KUN}.\n" @@ -15,13 +15,13 @@ FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 .string "If you could, please visit me at home.\n" .string "My house is on ROUTE 114.$" -FallarborTown_PokemonCenter_1F_Text_17768C:: @ 817768C +FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown:: @ 817768C .string "I wonder what POKéMON looked like\n" .string "long, long ago?\p" .string "Maybe the FOSSIL MANIAC at the edge\n" .string "of town will know.$" -FallarborTown_PokemonCenter_1F_Text_1776F5:: @ 81776F5 +FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees:: @ 81776F5 .string "In the fields of FALLARBOR, we plant\n" .string "seedlings of hardy trees that thrive\l" .string "even in volcanic ash.$" diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 8d4a92cf4..17d158a78 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,4 +1,4 @@ -FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 +FallarborTown_ContestLobby_EventScript_BerryBlender2:: @ 81B7604 setvar VAR_0x8008, 4 setvar VAR_0x8009, 1 applymovement VAR_0x8008, FallarborTown_ContestLobby_Movement_1B7821 @@ -120,30 +120,27 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 releaseall end -FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A +FallarborTown_ContestLobby_EventScript_BerryBlenderMan:: @ 81B778A setvar VAR_0x8008, 4 - goto FallarborTown_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 setvar VAR_0x8008, 2 - goto SlateportCity_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 setvar VAR_0x8008, 2 - goto VerdanturfTown_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB setvar VAR_0x8008, 3 - goto LilycoveCity_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC end -FallarborTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 -LilycoveCity_ContestLobby_EventScript_1B77B6:: @ 81B77B6 -SlateportCity_ContestLobby_EventScript_1B77B6:: @ 81B77B6 -VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 +VerdanturfTown_ContestLobby_EventScript_BerryBlendWithNPC:: @ 81B77B6 lock faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, MSGBOX_DEFAULT @@ -185,7 +182,7 @@ VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821 walk_in_place_fastest_right step_end -FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823 +FallarborTown_ContestLobby_EventScript_BerryBlender1:: @ 81B7823 goto FallarborTown_ContestLobby_EventScript_1B783B end diff --git a/include/constants/flags.h b/include/constants/flags.h index 08f87a536..8ddb17cf3 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -180,7 +180,7 @@ #define FLAG_RECEIVED_STARTER_DOLL 0xE2 #define FLAG_RECEIVED_GOOD_ROD 0xE3 #define FLAG_REGI_DOORS_OPENED 0xE4 -#define FLAG_RECEIVED_TM27 0xE5 +#define FLAG_RECEIVED_TM_RETURN 0xE5 #define FLAG_RECEIVED_TM_SLUDGE_BOMB 0xE6 #define FLAG_RECEIVED_TM05 0xE7 #define FLAG_RECEIVED_TM19 0xE8