diff --git a/data-de/maps/FallarborTown/text.inc b/data-de/maps/FallarborTown/text.inc index a695f5d83..a5717cc50 100644 --- a/data-de/maps/FallarborTown/text.inc +++ b/data-de/maps/FallarborTown/text.inc @@ -1,25 +1,25 @@ -FallarborTown_Text_16C7FF:: @ 816C7FF +FallarborTown_Text_ShadyFellowAtLab:: @ 816C7FF .string "Was ist los? Was ist los?\p" .string "Ich habe eine zwielichtige Gestalt aus\n" .string "dem LABOR von PROF. KOSMO flitzen\l" .string "sehen.$" -FallarborTown_Text_16C855:: @ 816C855 +FallarborTown_Text_RegionKnownForMeteors:: @ 816C855 .string "Diese Region ist schon seit Urzeiten\n" .string "für ihre Meteoritenschauer bekannt.\p" .string "Man sagt, METEORFÄLLE sei durch\n" .string "den Aufprall eines METEORITEN\l" .string "entstanden.$" -FallarborTown_Text_16C8D6:: @ 816C8D6 +FallarborTown_Text_MyPreciousAzurill:: @ 816C8D6 .string "Schau mal! Guck doch mal!\n" .string "Das ist mein süßes AZURILL!\p" .string "Es ist glatt, weich und plüschig!$" -FallarborTown_Text_16C92C:: @ 816C92C +FallarborTown_Text_Azurill:: @ 816C92C .string "AZURILL: Rooreelooo.$" -FallarborTown_Text_16C941:: @ 816C941 +FallarborTown_Text_HaveYouChallengedFlannery:: @ 816C941 .string "Hast du schon FLAVIA, die LEITERIN\n" .string "der ARENA von BAD LAVASTADT,\l" .string "herausgefordert?\p" @@ -30,17 +30,17 @@ FallarborTown_Text_16C941:: @ 816C941 .string "FLAVIA ebenfalls ein großer TRAINER\l" .string "wird.$" -FallarborTown_Text_16CA39:: @ 816CA39 +FallarborTown_Text_PokemonContestSuperRankSign:: @ 816CA39 .string "POKéMON WETTBEWERBE\n" .string "SUPER-KLASSE REGISTRIERUNGEN\p" .string "“Brecht in die POKéMON-Szene\n" .string "ein!”$" -FallarborTown_Text_16CA83:: @ 816CA83 +FallarborTown_Text_TownSign:: @ 816CA83 .string "LAUBWECHSELFELD\n" .string "“Eine Gemeinschaft von Farmern mit\l" .string "kleinen Gärten.”$" -FallarborTown_Text_16CAB9:: @ 816CAB9 +FallarborTown_Text_MoveTutorSign:: @ 816CAB9 .string "HAUS des ATTACKEN-HELFERS\n" .string "“Neue Attacken für deine POKéMON.”$" diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 057f9252c..ee6c8e5fb 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -32,7 +32,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_14E814", + "script": "FallarborTown_EventScript_Girl", "flag": "0" }, { @@ -45,7 +45,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_14E7F5", + "script": "FallarborTown_EventScript_ExpertM", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_14E81D", + "script": "FallarborTown_EventScript_Gentleman", "flag": "0" }, { @@ -71,7 +71,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_EventScript_14E826", + "script": "FallarborTown_EventScript_Azurill", "flag": "FLAG_HIDE_AZURILL_FALLARBOR" } ], @@ -136,7 +136,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_EventScript_14E839" + "script": "FallarborTown_EventScript_PokemonContestSuperRankSign" }, { "type": "sign", @@ -152,7 +152,7 @@ "y": 11, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_EventScript_14E842" + "script": "FallarborTown_EventScript_TownSign" }, { "type": "sign", @@ -168,7 +168,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FallarborTown_EventScript_14E84B" + "script": "FallarborTown_EventScript_MoveTutorSign" }, { "type": "hidden_item", diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index a39d7e51f..8de016c45 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,55 +1,55 @@ FallarborTown_MapScripts:: @ 814E7E0 - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_14E7E6 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_OnTransition .byte 0 -FallarborTown_MapScript1_14E7E6:: @ 814E7E6 +FallarborTown_OnTransition:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR clearflag FLAG_CONTEST_SKETCH_CREATED end -FallarborTown_EventScript_14E7F5:: @ 814E7F5 +FallarborTown_EventScript_ExpertM:: @ 814E7F5 lock faceplayer - goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A - msgbox FallarborTown_Text_16C7FF, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_ExpertMNormal + msgbox FallarborTown_Text_ShadyFellowAtLab, MSGBOX_DEFAULT release end -FallarborTown_EventScript_14E80A:: @ 814E80A - msgbox FallarborTown_Text_16C855, MSGBOX_DEFAULT +FallarborTown_EventScript_ExpertMNormal:: @ 814E80A + msgbox FallarborTown_Text_RegionKnownForMeteors, MSGBOX_DEFAULT release end -FallarborTown_EventScript_14E814:: @ 814E814 - msgbox FallarborTown_Text_16C8D6, MSGBOX_NPC +FallarborTown_EventScript_Girl:: @ 814E814 + msgbox FallarborTown_Text_MyPreciousAzurill, MSGBOX_NPC end -FallarborTown_EventScript_14E81D:: @ 814E81D - msgbox FallarborTown_Text_16C941, MSGBOX_NPC +FallarborTown_EventScript_Gentleman:: @ 814E81D + msgbox FallarborTown_Text_HaveYouChallengedFlannery, MSGBOX_NPC end -FallarborTown_EventScript_14E826:: @ 814E826 +FallarborTown_EventScript_Azurill:: @ 814E826 lock faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox FallarborTown_Text_16C92C, MSGBOX_DEFAULT + msgbox FallarborTown_Text_Azurill, MSGBOX_DEFAULT waitmoncry release end -FallarborTown_EventScript_14E839:: @ 814E839 - msgbox FallarborTown_Text_16CA39, MSGBOX_SIGN +FallarborTown_EventScript_PokemonContestSuperRankSign:: @ 814E839 + msgbox FallarborTown_Text_PokemonContestSuperRankSign, MSGBOX_SIGN end -FallarborTown_EventScript_14E842:: @ 814E842 -MeteorFalls_1F_1R_EventScript_14E842:: @ 814E842 -MeteorFalls_1F_2R_EventScript_14E842:: @ 814E842 - msgbox FallarborTown_Text_16CA83, MSGBOX_SIGN +FallarborTown_EventScript_TownSign:: @ 814E842 +MeteorFalls_1F_1R_EventScript_TownSign:: @ 814E842 +MeteorFalls_1F_2R_EventScript_TownSign:: @ 814E842 + msgbox FallarborTown_Text_TownSign, MSGBOX_SIGN end -FallarborTown_EventScript_14E84B:: @ 814E84B - msgbox FallarborTown_Text_16CAB9, MSGBOX_SIGN +FallarborTown_EventScript_MoveTutorSign:: @ 814E84B + msgbox FallarborTown_Text_MoveTutorSign, MSGBOX_SIGN end diff --git a/data/maps/FallarborTown/text.inc b/data/maps/FallarborTown/text.inc index 6f3850b7e..480b20e1b 100644 --- a/data/maps/FallarborTown/text.inc +++ b/data/maps/FallarborTown/text.inc @@ -1,23 +1,23 @@ -FallarborTown_Text_16C7FF:: @ 816C7FF +FallarborTown_Text_ShadyFellowAtLab:: @ 816C7FF .string "What's up, what's up?\p" .string "I saw a shady fellow scuttling in and\n" .string "out of PROF. COZMO's LAB.$" -FallarborTown_Text_16C855:: @ 816C855 +FallarborTown_Text_RegionKnownForMeteors:: @ 816C855 .string "This region's been known for meteors\n" .string "since the olden days.\p" .string "They say METEOR FALLS was gouged out\n" .string "by a falling meteorite long ago.$" -FallarborTown_Text_16C8D6:: @ 816C8D6 +FallarborTown_Text_MyPreciousAzurill:: @ 816C8D6 .string "See! Take a look!\n" .string "This is my precious AZURILL!\p" .string "It's slick and smooth and plushy, too!$" -FallarborTown_Text_16C92C:: @ 816C92C +FallarborTown_Text_Azurill:: @ 816C92C .string "AZURILL: Rooreelooo.$" -FallarborTown_Text_16C941:: @ 816C941 +FallarborTown_Text_HaveYouChallengedFlannery:: @ 816C941 .string "Have you already challenged FLANNERY,\n" .string "the LEADER of LAVARIDGE GYM?\p" .string "The girl's grandfather was famous.\n" @@ -27,15 +27,15 @@ FallarborTown_Text_16C941:: @ 816C941 .string "become a great TRAINER in her own\l" .string "right.$" -FallarborTown_Text_16CA39:: @ 816CA39 +FallarborTown_Text_PokemonContestSuperRankSign:: @ 816CA39 .string "POKéMON CONTESTS\n" .string "SUPER RANK REGISTRATION\p" .string "“Burst on to the POKéMON scene!”$" -FallarborTown_Text_16CA83:: @ 816CA83 +FallarborTown_Text_TownSign:: @ 816CA83 .string "FALLARBOR TOWN\n" .string "“A farm community with small gardens.”$" -FallarborTown_Text_16CAB9:: @ 816CAB9 +FallarborTown_Text_MoveTutorSign:: @ 816CAB9 .string "MOVE TUTOR'S HOUSE\n" .string "“New moves taught to POKéMON.”$"