diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-10 10:56:35 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-13 18:20:55 -0600 |
| commit | c0ae1cbc1c9c5c31c129009d521c4d62d15d1c95 (patch) | |
| tree | ddffbb2b32d73eab96593f2262411d6f207e66e5 | |
| parent | bab1458cb43bb08fce252b558c7652dc73703caa (diff) | |
Document Lilycove scripts
20 files changed, 656 insertions, 657 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 20b5f3e60..af4ada031 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -891,7 +891,7 @@ .endm @ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.) - .macro drawcontestwinner a:req + .macro showcontestwinner a:req .byte 0x77 .byte \a .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index 9dfc8c891..33e95cd09 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1103,7 +1103,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776 .include "data/scripts/day_care.inc" .include "data/scripts/flash.inc" .include "data/scripts/players_house.inc" - .include "data/scripts/pokeblocks.inc" + .include "data/scripts/berry_blender.inc" .include "data/text/mauville_man.inc" .include "data/text/trainers.inc" .include "data/scripts/repel.inc" diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 26f0ad36d..4f7c3ab0f 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2C53", + "script": "LilycoveCity_EventScript_Sailor2", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2C2B", + "script": "LilycoveCity_EventScript_Girl", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2C22", + "script": "LilycoveCity_EventScript_Man3", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2C4A", + "script": "LilycoveCity_EventScript_RichBoy", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2C91", + "script": "LilycoveCity_EventScript_Man2", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2C72", + "script": "LilycoveCity_EventScript_Woman2", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2C9A", + "script": "LilycoveCity_EventScript_ExpertM1", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2CA3", + "script": "LilycoveCity_EventScript_ExpertF", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2CAC", + "script": "LilycoveCity_EventScript_ExpertM2", "flag": "0" }, { @@ -152,7 +152,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2D7D", + "script": "LilycoveCity_EventScript_WailmerTrainerGrunt", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2DD5", + "script": "LilycoveCity_EventScript_AquaGrunt4", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { @@ -191,7 +191,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2DBA", + "script": "LilycoveCity_EventScript_AquaGrunt1", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { @@ -204,7 +204,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2DC3", + "script": "LilycoveCity_EventScript_AquaGrunt2", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { @@ -217,7 +217,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2DCC", + "script": "LilycoveCity_EventScript_AquaGrunt3", "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { @@ -230,7 +230,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2BD8", + "script": "LilycoveCity_EventScript_BerryGentleman", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2DDE", + "script": "LilycoveCity_EventScript_Rival", "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL" }, { @@ -256,7 +256,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E302D", + "script": "LilycoveCity_EventScript_SchoolKidM", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2CEE", + "script": "LilycoveCity_EventScript_Woman1", "flag": "0" }, { @@ -282,7 +282,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2CDD", + "script": "LilycoveCity_EventScript_Man1", "flag": "0" }, { @@ -295,7 +295,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2CCB", + "script": "LilycoveCity_EventScript_Sailor1", "flag": "0" }, { @@ -308,7 +308,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_EventScript_1E2CD4", + "script": "LilycoveCity_EventScript_FatMan", "flag": "0" } ], @@ -420,7 +420,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_1E2D1A" + "script": "LilycoveCity_EventScript_MuseumSign" }, { "type": "sign", @@ -436,7 +436,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_1E2D6B" + "script": "LilycoveCity_EventScript_DepartmentStoreSign" }, { "type": "sign", @@ -452,7 +452,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_1E2CFF" + "script": "LilycoveCity_EventScript_CitySign" }, { "type": "sign", @@ -460,7 +460,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_1E2D08" + "script": "LilycoveCity_EventScript_ContestHallSign" }, { "type": "sign", @@ -468,7 +468,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_1E2D11" + "script": "LilycoveCity_EventScript_MotelSign" }, { "type": "sign", @@ -476,7 +476,7 @@ "y": 30, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_1E2D44" + "script": "LilycoveCity_EventScript_HarborSign" }, { "type": "sign", @@ -484,7 +484,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_1E2D62" + "script": "LilycoveCity_EventScript_TrainerFanClubSign" }, { "type": "sign", @@ -492,7 +492,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_EventScript_1E2D74" + "script": "LilycoveCity_EventScript_MoveDeletersHouseSign" }, { "type": "hidden_item", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index b0d52d9f7..ada0490e3 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_MapScripts:: @ 81E2B3C map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_OnTransition - map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61 + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_OnLoad .byte 0 LilycoveCity_OnTransition: @ 81E2B47 @@ -11,11 +11,11 @@ LilycoveCity_OnTransition: @ 81E2B47 call Common_EventScript_SetupRivalGfxId end -LilycoveCity_MapScript1_1E2B61: @ 81E2B61 - call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2B6B +LilycoveCity_OnLoad: @ 81E2B61 + call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_SetWailmerMetatiles end -LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B +LilycoveCity_EventScript_SetWailmerMetatiles:: @ 81E2B6B setmetatile 76, 12, METATILE_Lilycove_Wailmer0, 1 setmetatile 77, 12, METATILE_Lilycove_Wailmer1, 1 setmetatile 76, 13, METATILE_Lilycove_Wailmer2, 1 @@ -30,362 +30,362 @@ LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B setmetatile 78, 17, METATILE_Lilycove_Wailmer3, 1 return -LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 +LilycoveCity_EventScript_BerryGentleman:: @ 81E2BD8 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18 - msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_ReceivedBerry + msgbox LilycoveCity_Text_BerrySuitsYou, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY - msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT + msgbox LilycoveCity_Text_BecauseYoureTrainer, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2C18:: @ 81E2C18 - msgbox LilycoveCity_Text_2A7321, MSGBOX_DEFAULT +LilycoveCity_EventScript_ReceivedBerry:: @ 81E2C18 + msgbox LilycoveCity_Text_PokeblocksSuitPokemon, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2C22:: @ 81E2C22 - msgbox LilycoveCity_Text_1E3D9E, MSGBOX_NPC +LilycoveCity_EventScript_Man3:: @ 81E2C22 + msgbox LilycoveCity_Text_ContestHallInTown, MSGBOX_NPC end -LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B +LilycoveCity_EventScript_Girl:: @ 81E2C2B lock faceplayer - goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2C40 - msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_GirlAquaGone + msgbox LilycoveCity_Text_StrangeCaveInCove, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2C40:: @ 81E2C40 - msgbox LilycoveCity_Text_1E3E7D, MSGBOX_DEFAULT +LilycoveCity_EventScript_GirlAquaGone:: @ 81E2C40 + msgbox LilycoveCity_Text_GoingToMoveDeleterForHMs, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A - msgbox LilycoveCity_Text_1E3F05, MSGBOX_NPC +LilycoveCity_EventScript_RichBoy:: @ 81E2C4A + msgbox LilycoveCity_Text_ImFromKanto, MSGBOX_NPC end -LilycoveCity_EventScript_1E2C53:: @ 81E2C53 +LilycoveCity_EventScript_Sailor2:: @ 81E2C53 lock faceplayer - goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C68 - msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT + goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Sailor2AquaGone + msgbox LilycoveCity_Text_TeamAquaBeenTrainingWailmer, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2C68:: @ 81E2C68 - msgbox LilycoveCity_Text_1E4020, MSGBOX_DEFAULT +LilycoveCity_EventScript_Sailor2AquaGone:: @ 81E2C68 + msgbox LilycoveCity_Text_SomeonePuntedTeamAquaOut, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2C72:: @ 81E2C72 +LilycoveCity_EventScript_Woman2:: @ 81E2C72 lock faceplayer - goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C87 - msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT + goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Woman2AquaGone + msgbox LilycoveCity_Text_SomeoneStoleMyPokemon, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2C87:: @ 81E2C87 - msgbox LilycoveCity_Text_1E4145, MSGBOX_DEFAULT +LilycoveCity_EventScript_Woman2AquaGone:: @ 81E2C87 + msgbox LilycoveCity_Text_MissingPokemonCameBack, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2C91:: @ 81E2C91 - msgbox LilycoveCity_Text_1E417B, MSGBOX_NPC +LilycoveCity_EventScript_Man2:: @ 81E2C91 + msgbox LilycoveCity_Text_ImArtDealer, MSGBOX_NPC end -LilycoveCity_EventScript_1E2C9A:: @ 81E2C9A - msgbox LilycoveCity_Text_1E420B, MSGBOX_SIGN +LilycoveCity_EventScript_ExpertM1:: @ 81E2C9A + msgbox LilycoveCity_Text_SeaRemainsForeverYoung, MSGBOX_SIGN end -LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3 - msgbox LilycoveCity_Text_1E4283, MSGBOX_SIGN +LilycoveCity_EventScript_ExpertF:: @ 81E2CA3 + msgbox LilycoveCity_Text_SixtyYearsAgoHusbandProposed, MSGBOX_SIGN end -LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC +LilycoveCity_EventScript_ExpertM2:: @ 81E2CAC lock faceplayer - goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2CC1 - msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_ExpertM2AquaGone + msgbox LilycoveCity_Text_TeamAquaRenovatedCavern, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2CC1:: @ 81E2CC1 - msgbox LilycoveCity_Text_1E43FF, MSGBOX_DEFAULT +LilycoveCity_EventScript_ExpertM2AquaGone:: @ 81E2CC1 + msgbox LilycoveCity_Text_TeamAquaLotGoneForGood, MSGBOX_DEFAULT release end -LilycoveCity_EventScript_1E2CCB:: @ 81E2CCB - msgbox LilycoveCity_Text_1E48A5, MSGBOX_NPC +LilycoveCity_EventScript_Sailor1:: @ 81E2CCB + msgbox LilycoveCity_Text_HeardTowerCalledSkyPillar, MSGBOX_NPC end -LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 - msgbox LilycoveCity_Text_1E4902, MSGBOX_NPC +LilycoveCity_EventScript_FatMan:: @ 81E2CD4 + msgbox LilycoveCity_Text_SawTallTowerOnRoute131, MSGBOX_NPC end -LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD +LilycoveCity_EventScript_Man1:: @ 81E2CDD lockall - msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC + msgbox LilycoveCity_Text_JustArrivedAndSawRarePokemon, MSGBOX_NPC applymovement 20, Common_Movement_FaceOriginalDirection end -LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE +LilycoveCity_EventScript_Woman1:: @ 81E2CEE lockall - msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC + msgbox LilycoveCity_Text_HoneymoonVowToSeeRarePokemon, MSGBOX_NPC applymovement 19, Common_Movement_FaceOriginalDirection end -LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF - msgbox LilycoveCity_Text_1E448B, MSGBOX_SIGN +LilycoveCity_EventScript_CitySign:: @ 81E2CFF + msgbox LilycoveCity_Text_CitySign, MSGBOX_SIGN end -LilycoveCity_EventScript_1E2D08:: @ 81E2D08 - msgbox LilycoveCity_Text_1E44C3, MSGBOX_SIGN +LilycoveCity_EventScript_ContestHallSign:: @ 81E2D08 + msgbox LilycoveCity_Text_ContestHallSign, MSGBOX_SIGN end -LilycoveCity_EventScript_1E2D11:: @ 81E2D11 - msgbox LilycoveCity_Text_1E44FC, MSGBOX_SIGN +LilycoveCity_EventScript_MotelSign:: @ 81E2D11 + msgbox LilycoveCity_Text_MotelSign, MSGBOX_SIGN end -LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A +LilycoveCity_EventScript_MuseumSign:: @ 81E2D1A lockall specialvar VAR_0x8004, CountPlayerContestPaintings switch VAR_0x8004 - case 0, LilycoveCity_EventScript_1E2D3A - msgbox LilycoveCity_Text_1E4571, MSGBOX_DEFAULT + case 0, LilycoveCity_EventScript_MuseumSignNoPaintings + msgbox LilycoveCity_Text_MuseumSignPlayersExhibit, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A - msgbox LilycoveCity_Text_1E4534, MSGBOX_DEFAULT +LilycoveCity_EventScript_MuseumSignNoPaintings:: @ 81E2D3A + msgbox LilycoveCity_Text_MuseumSign, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_1E2D44:: @ 81E2D44 +LilycoveCity_EventScript_HarborSign:: @ 81E2D44 lockall - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2D58 - msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_HarborSignFerryReady + msgbox LilycoveCity_Text_HarborSignUnderConstruction, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_1E2D58:: @ 81E2D58 - msgbox LilycoveCity_Text_1E4624, MSGBOX_DEFAULT +LilycoveCity_EventScript_HarborSignFerryReady:: @ 81E2D58 + msgbox LilycoveCity_Text_HarborSign, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_1E2D62:: @ 81E2D62 - msgbox LilycoveCity_Text_1E466E, MSGBOX_SIGN +LilycoveCity_EventScript_TrainerFanClubSign:: @ 81E2D62 + msgbox LilycoveCity_Text_TrainerFanClubSign, MSGBOX_SIGN end -LilycoveCity_EventScript_1E2D6B:: @ 81E2D6B - msgbox LilycoveCity_Text_1E46BE, MSGBOX_SIGN +LilycoveCity_EventScript_DepartmentStoreSign:: @ 81E2D6B + msgbox LilycoveCity_Text_DepartmentStoreSign, MSGBOX_SIGN end -LilycoveCity_EventScript_1E2D74:: @ 81E2D74 - msgbox LilycoveCity_Text_1E473D, MSGBOX_SIGN +LilycoveCity_EventScript_MoveDeletersHouseSign:: @ 81E2D74 + msgbox LilycoveCity_Text_MoveDeletersHouseSign, MSGBOX_SIGN end -LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D +LilycoveCity_EventScript_WailmerTrainerGrunt:: @ 81E2D7D lockall - goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0 - msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT + goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_MetWailmerTrainer + msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT + msgbox LilycoveCity_Text_GetLostMessingUpTraining, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_MET_WAILMER_TRAINER releaseall end -LilycoveCity_EventScript_1E2DB0:: @ 81E2DB0 - msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT +LilycoveCity_EventScript_MetWailmerTrainer:: @ 81E2DB0 + msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT releaseall end -LilycoveCity_EventScript_1E2DBA:: @ 81E2DBA - msgbox LilycoveCity_Text_1E3B2C, MSGBOX_NPC +LilycoveCity_EventScript_AquaGrunt1:: @ 81E2DBA + msgbox LilycoveCity_Text_MovedLootIntoHideoutToday, MSGBOX_NPC end -LilycoveCity_EventScript_1E2DC3:: @ 81E2DC3 - msgbox LilycoveCity_Text_1E3B95, MSGBOX_NPC +LilycoveCity_EventScript_AquaGrunt2:: @ 81E2DC3 + msgbox LilycoveCity_Text_ChanceToDoBigThings, MSGBOX_NPC end -LilycoveCity_EventScript_1E2DCC:: @ 81E2DCC - msgbox LilycoveCity_Text_1E3C46, MSGBOX_NPC +LilycoveCity_EventScript_AquaGrunt3:: @ 81E2DCC + msgbox LilycoveCity_Text_DontGoNearCaveInCove, MSGBOX_NPC end -LilycoveCity_EventScript_1E2DD5:: @ 81E2DD5 - msgbox LilycoveCity_Text_1E3CBE, MSGBOX_NPC +LilycoveCity_EventScript_AquaGrunt4:: @ 81E2DD5 + msgbox LilycoveCity_Text_IfWorldBecomesOurs, MSGBOX_NPC end -LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE +LilycoveCity_EventScript_Rival:: @ 81E2DDE lock faceplayer checkplayergender compare VAR_RESULT, MALE - goto_if_eq LilycoveCity_EventScript_1E2DF8 + goto_if_eq LilycoveCity_EventScript_May compare VAR_RESULT, FEMALE - goto_if_eq LilycoveCity_EventScript_1E2E6B + goto_if_eq LilycoveCity_EventScript_Brendan end -LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 +LilycoveCity_EventScript_May:: @ 81E2DF8 playbgm MUS_GIRL_SUP, 1 - call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E48 - call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E51 + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattleAgain + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattle compare VAR_RESULT, NO - goto_if_eq LilycoveCity_EventScript_1E2E5A - msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_EventScript_DeclineMayBattle + msgbox LilycoveCity_Text_MayWontBeBeaten, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, LilycoveCity_EventScript_1E2EDE - case 1, LilycoveCity_EventScript_1E2EEE - case 2, LilycoveCity_EventScript_1E2EFE + case 0, LilycoveCity_EventScript_BattleMayTreecko + case 1, LilycoveCity_EventScript_BattleMayTorchic + case 2, LilycoveCity_EventScript_BattleMayMudkip end -LilycoveCity_EventScript_1E2E48:: @ 81E2E48 - msgbox LilycoveCity_Text_1E31F5, MSGBOX_YESNO +LilycoveCity_EventScript_MayAskToBattleAgain:: @ 81E2E48 + msgbox LilycoveCity_Text_MayBattleMe, MSGBOX_YESNO return -LilycoveCity_EventScript_1E2E51:: @ 81E2E51 - msgbox LilycoveCity_Text_1E3061, MSGBOX_YESNO +LilycoveCity_EventScript_MayAskToBattle:: @ 81E2E51 + msgbox LilycoveCity_Text_MayShoppingLetsBattle, MSGBOX_YESNO return -LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A +LilycoveCity_EventScript_DeclineMayBattle:: @ 81E2E5A setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT + msgbox LilycoveCity_Text_MayNotRaisingPokemon, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm release end -LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B +LilycoveCity_EventScript_Brendan:: @ 81E2E6B playbgm MUS_BOY_SUP, 1 - call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EBB - call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EC4 + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattleAgain + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattle compare VAR_RESULT, NO - goto_if_eq LilycoveCity_EventScript_1E2ECD - msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_EventScript_DeclineBrendanBattle + msgbox LilycoveCity_Text_BrendanWontBeBeaten, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, LilycoveCity_EventScript_1E2F0E - case 1, LilycoveCity_EventScript_1E2F1E - case 2, LilycoveCity_EventScript_1E2F2E + case 0, LilycoveCity_EventScript_BattleBrendanTreecko + case 1, LilycoveCity_EventScript_BattleBrendanTorchic + case 2, LilycoveCity_EventScript_BattleBrendanMudkip end -LilycoveCity_EventScript_1E2EBB:: @ 81E2EBB - msgbox LilycoveCity_Text_1E36FA, MSGBOX_YESNO +LilycoveCity_EventScript_BrendanAskToBattleAgain:: @ 81E2EBB + msgbox LilycoveCity_Text_BrendanBattleMe, MSGBOX_YESNO return -LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4 - msgbox LilycoveCity_Text_1E3608, MSGBOX_YESNO +LilycoveCity_EventScript_BrendanAskToBattle:: @ 81E2EC4 + msgbox LilycoveCity_Text_BrendanShoppingLetsBattle, MSGBOX_YESNO return -LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD +LilycoveCity_EventScript_DeclineBrendanBattle:: @ 81E2ECD setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT + msgbox LilycoveCity_Text_BrendanNoConfidence, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm release end -LilycoveCity_EventScript_1E2EDE:: @ 81E2EDE - trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_1E3275 - goto LilycoveCity_EventScript_1E2F3E +LilycoveCity_EventScript_BattleMayTreecko:: @ 81E2EDE + trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_MayDefeat + goto LilycoveCity_EventScript_DefeatedMay end -LilycoveCity_EventScript_1E2EEE:: @ 81E2EEE - trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_1E3275 - goto LilycoveCity_EventScript_1E2F3E +LilycoveCity_EventScript_BattleMayTorchic:: @ 81E2EEE + trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_MayDefeat + goto LilycoveCity_EventScript_DefeatedMay end -LilycoveCity_EventScript_1E2EFE:: @ 81E2EFE - trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_1E3275 - goto LilycoveCity_EventScript_1E2F3E +LilycoveCity_EventScript_BattleMayMudkip:: @ 81E2EFE + trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_MayDefeat + goto LilycoveCity_EventScript_DefeatedMay end -LilycoveCity_EventScript_1E2F0E:: @ 81E2F0E - trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_1E3777 - goto LilycoveCity_EventScript_1E2FAA +LilycoveCity_EventScript_BattleBrendanTreecko:: @ 81E2F0E + trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_BrendanDefeat + goto LilycoveCity_EventScript_DefeatedBrendan end -LilycoveCity_EventScript_1E2F1E:: @ 81E2F1E - trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_1E3777 - goto LilycoveCity_EventScript_1E2FAA +LilycoveCity_EventScript_BattleBrendanTorchic:: @ 81E2F1E + trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_BrendanDefeat + goto LilycoveCity_EventScript_DefeatedBrendan end -LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E - trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_1E3777 - goto LilycoveCity_EventScript_1E2FAA +LilycoveCity_EventScript_BattleBrendanMudkip:: @ 81E2F2E + trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_BrendanDefeat + goto LilycoveCity_EventScript_DefeatedBrendan end -LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E - msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT - setvar VAR_RESULT, 0 - call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76 - compare VAR_RESULT, 0 - call_if_eq LilycoveCity_EventScript_1E2F86 - compare VAR_RESULT, 1 - call_if_eq LilycoveCity_EventScript_1E2F8F +LilycoveCity_EventScript_DefeatedMay:: @ 81E2F3E + msgbox LilycoveCity_Text_MayGoingBackToLittleroot, MSGBOX_DEFAULT + setvar VAR_RESULT, FALSE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge + compare VAR_RESULT, FALSE + call_if_eq LilycoveCity_EventScript_MayCollectBadges + compare VAR_RESULT, TRUE + call_if_eq LilycoveCity_EventScript_MayPokemonLeague clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL - goto LilycoveCity_EventScript_1E3006 + goto LilycoveCity_EventScript_RivalFlyAway end -LilycoveCity_EventScript_1E2F76:: @ 81E2F76 - goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_1E2F80 +LilycoveCity_EventScript_CheckFinalBadge:: @ 81E2F76 + goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_HasFinalBadge return -LilycoveCity_EventScript_1E2F80:: @ 81E2F80 - setvar VAR_RESULT, 1 +LilycoveCity_EventScript_HasFinalBadge:: @ 81E2F80 + setvar VAR_RESULT, TRUE return -LilycoveCity_EventScript_1E2F86:: @ 81E2F86 - msgbox LilycoveCity_Text_1E3398, MSGBOX_DEFAULT +LilycoveCity_EventScript_MayCollectBadges:: @ 81E2F86 + msgbox LilycoveCity_Text_MayYouGoingToCollectBadges, MSGBOX_DEFAULT return -LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FA1 - msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT +LilycoveCity_EventScript_MayPokemonLeague:: @ 81E2F8F + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_MayBattleFrontier + msgbox LilycoveCity_Text_MayYouGoingToPokemonLeague, MSGBOX_DEFAULT return -LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1 - msgbox LilycoveCity_Text_1E353A, MSGBOX_DEFAULT +LilycoveCity_EventScript_MayBattleFrontier:: @ 81E2FA1 + msgbox LilycoveCity_Text_MayYouGoingToBattleFrontier, MSGBOX_DEFAULT return -LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA - msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT - setvar VAR_RESULT, 0 - call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76 - compare VAR_RESULT, 0 - call_if_eq LilycoveCity_EventScript_1E2FE2 - compare VAR_RESULT, 1 - call_if_eq LilycoveCity_EventScript_1E2FEB +LilycoveCity_EventScript_DefeatedBrendan:: @ 81E2FAA + msgbox LilycoveCity_Text_BrendanGoingBackToLittleroot, MSGBOX_DEFAULT + setvar VAR_RESULT, FALSE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge + compare VAR_RESULT, FALSE + call_if_eq LilycoveCity_EventScript_BrendanCollectBadges + compare VAR_RESULT, TRUE + call_if_eq LilycoveCity_EventScript_BrendanPokemonLeague clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL - goto LilycoveCity_EventScript_1E3006 + goto LilycoveCity_EventScript_RivalFlyAway end -LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2 - msgbox LilycoveCity_Text_1E3876, MSGBOX_DEFAULT +LilycoveCity_EventScript_BrendanCollectBadges:: @ 81E2FE2 + msgbox LilycoveCity_Text_BrendanYouGoingToCollectBadges, MSGBOX_DEFAULT return -LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FFD - msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT +LilycoveCity_EventScript_BrendanPokemonLeague:: @ 81E2FEB + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_BrendanBattleFrontier + msgbox LilycoveCity_Text_BrendanYouGoingToPokemonLeague, MSGBOX_DEFAULT return -LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD - msgbox LilycoveCity_Text_1E39E3, MSGBOX_DEFAULT +LilycoveCity_EventScript_BrendanBattleFrontier:: @ 81E2FFD + msgbox LilycoveCity_Text_BrendanYouGoingToBattleFrontier, MSGBOX_DEFAULT return -LilycoveCity_EventScript_1E3006:: @ 81E3006 +LilycoveCity_EventScript_RivalFlyAway:: @ 81E3006 closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 @@ -401,26 +401,26 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006 release end -LilycoveCity_EventScript_1E302D:: @ 81E302D +LilycoveCity_EventScript_SchoolKidM:: @ 81E302D lock faceplayer - msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO + msgbox LilycoveCity_Text_DoYouKnowAboutBerryBlender, MSGBOX_YESNO compare VAR_RESULT, YES - call_if_eq LilycoveCity_EventScript_1E304F + call_if_eq LilycoveCity_EventScript_KnowAboutBerryBlender compare VAR_RESULT, NO - call_if_eq LilycoveCity_EventScript_1E3058 + call_if_eq LilycoveCity_EventScript_DontKnowAboutBerryBlender release end -LilycoveCity_EventScript_1E304F:: @ 81E304F - msgbox LilycoveCity_Text_1E47A1, MSGBOX_DEFAULT +LilycoveCity_EventScript_KnowAboutBerryBlender:: @ 81E304F + msgbox LilycoveCity_Text_FasterSpinBetterPokeblocks, MSGBOX_DEFAULT return -LilycoveCity_EventScript_1E3058:: @ 81E3058 - msgbox LilycoveCity_Text_1E4824, MSGBOX_DEFAULT +LilycoveCity_EventScript_DontKnowAboutBerryBlender:: @ 81E3058 + msgbox LilycoveCity_Text_ExplainBerryBlender, MSGBOX_DEFAULT return -LilycoveCity_Text_1E3061: @ 81E3061 +LilycoveCity_Text_MayShoppingLetsBattle: @ 81E3061 .string "MAY: Oh, hey?\n" .string "{PLAYER}{KUN}, are you shopping, too?\p" .string "I bought a whole bunch of DOLLS and\n" @@ -433,35 +433,35 @@ LilycoveCity_Text_1E3061: @ 81E3061 .string "I'll battle with you, so you can show\n" .string "me your POKéMON, {PLAYER}{KUN}.$" -LilycoveCity_Text_1E318D: @ 81E318D +LilycoveCity_Text_MayNotRaisingPokemon: @ 81E318D .string "MAY: Oh, why? {PLAYER}{KUN}, haven't you\n" .string "been raising your POKéMON?\p" .string "That's not a very good showing as a\n" .string "TRAINER…$" -LilycoveCity_Text_1E31F5: @ 81E31F5 +LilycoveCity_Text_MayBattleMe: @ 81E31F5 .string "MAY: Come on, battle with me, so I can\n" .string "check out your POKéMON!$" -LilycoveCity_Text_1E3234: @ 81E3234 +LilycoveCity_Text_MayWontBeBeaten: @ 81E3234 .string "MAY: The POKéMON I raised won't be\n" .string "beaten by your POKéMON, {PLAYER}{KUN}!$" -LilycoveCity_Text_1E3275: @ 81E3275 +LilycoveCity_Text_MayDefeat: @ 81E3275 .string "… … … … … … … …\p" .string "I remember the battle I had with you,\n" .string "{PLAYER}{KUN}, on ROUTE 103.\p" .string "That battle helped you become this\n" .string "strong, {PLAYER}{KUN}, didn't it?$" -LilycoveCity_Text_1E32FB: @ 81E32FB +LilycoveCity_Text_MayGoingBackToLittleroot: @ 81E32FB .string "MAY: I'm thinking of going back to\n" .string "LITTLEROOT soon.\p" .string "I've caught a decent group of POKéMON,\n" .string "and my POKéDEX is coming along, so\l" .string "I'm going home to show my dad.$" -LilycoveCity_Text_1E3398: @ 81E3398 +LilycoveCity_Text_MayYouGoingToCollectBadges: @ 81E3398 .string "{PLAYER}{KUN}, what are you going to do?\p" .string "Collect all the GYM BADGES and take\n" .string "the POKéMON LEAGUE challenge?\p" @@ -470,7 +470,7 @@ LilycoveCity_Text_1E3398: @ 81E3398 .string "POKéDEX. I'll complete it before you!\p" .string "See you!$" -LilycoveCity_Text_1E346D: @ 81E346D +LilycoveCity_Text_MayYouGoingToPokemonLeague: @ 81E346D .string "{PLAYER}{KUN}, what are you going to do?\p" .string "Are you taking the POKéMON LEAGUE\n" .string "challenge?\p" @@ -480,7 +480,7 @@ LilycoveCity_Text_1E346D: @ 81E346D .string "but I'll finish my POKéDEX before you!\p" .string "See you!$" -LilycoveCity_Text_1E353A: @ 81E353A +LilycoveCity_Text_MayYouGoingToBattleFrontier: @ 81E353A .string "{PLAYER}{KUN}, what are you going to do?\p" .string "Are you taking the BATTLE FRONTIER\n" .string "challenge?\p" @@ -490,7 +490,7 @@ LilycoveCity_Text_1E353A: @ 81E353A .string "but I'll finish my POKéDEX before you!\p" .string "See you!$" -LilycoveCity_Text_1E3608: @ 81E3608 +LilycoveCity_Text_BrendanShoppingLetsBattle: @ 81E3608 .string "BRENDAN: Oh, hey, it's {PLAYER}.\p" .string "I'm running an errand for my dad.\n" .string "No, I'm not buying any DOLLS.\p" @@ -498,39 +498,39 @@ LilycoveCity_Text_1E3608: @ 81E3608 .string "Want to have a battle to see who's been\n" .string "raising POKéMON better?$" -LilycoveCity_Text_1E36BF: @ 81E36BF +LilycoveCity_Text_BrendanNoConfidence: @ 81E36BF .string "BRENDAN: Oh, what's the matter?\n" .string "Don't have the confidence?$" -LilycoveCity_Text_1E36FA: @ 81E36FA +LilycoveCity_Text_BrendanBattleMe: @ 81E36FA .string "BRENDAN: Want to battle to see who's\n" .string "been raising POKéMON better?$" -LilycoveCity_Text_1E373C: @ 81E373C +LilycoveCity_Text_BrendanWontBeBeaten: @ 81E373C .string "BRENDAN: Aww, but you know I'm not\n" .string "going to lose to no {PLAYER}.$" -LilycoveCity_Text_1E3777: @ 81E3777 +LilycoveCity_Text_BrendanDefeat: @ 81E3777 .string "Humph…\n" .string "You've done a lot of raising.\p" .string "That stings a bit--I had a head start\n" .string "on you as a TRAINER…$" -LilycoveCity_Text_1E37D7: @ 81E37D7 +LilycoveCity_Text_BrendanGoingBackToLittleroot: @ 81E37D7 .string "BRENDAN: I…\n" .string "I plan on going home to LITTLEROOT.\p" .string "You know I'm helping out my dad on his\n" .string "POKéDEX. It's coming together pretty\l" .string "decently, so I should go show him.$" -LilycoveCity_Text_1E3876: @ 81E3876 +LilycoveCity_Text_BrendanYouGoingToCollectBadges: @ 81E3876 .string "{PLAYER}, what are you going to do?\p" .string "Collect all the GYM BADGES and take\n" .string "the POKéMON LEAGUE challenge?\p" .string "Maybe I'll do that, too…\p" .string "Well, anyway, hang in there!$" -LilycoveCity_Text_1E390C: @ 81E390C +LilycoveCity_Text_BrendanYouGoingToPokemonLeague: @ 81E390C .string "{PLAYER}, what are you going to do?\p" .string "Since you're that strong, are you\n" .string "taking the POKéMON LEAGUE challenge?\p" @@ -539,7 +539,7 @@ LilycoveCity_Text_1E390C: @ 81E390C .string "you, {PLAYER}.\p" .string "Well, anyway, hang in there!$" -LilycoveCity_Text_1E39E3: @ 81E39E3 +LilycoveCity_Text_BrendanYouGoingToBattleFrontier: @ 81E39E3 .string "{PLAYER}, what are you going to do?\p" .string "Are you taking the BATTLE FRONTIER\n" .string "challenge?\p" @@ -553,14 +553,14 @@ LilycoveCity_Text_1E39E3: @ 81E39E3 .string "FRONTIER.\p" .string "Well, anyway, hang in there!$" -LilycoveCity_Text_1E3B2C: @ 81E3B2C +LilycoveCity_Text_MovedLootIntoHideoutToday: @ 81E3B2C .string "Fufufu…\p" .string "We moved more loot into our secret\n" .string "HIDEOUT today…\p" .string "Wh-who are you?!\n" .string "I was just talking to myself!$" -LilycoveCity_Text_1E3B95: @ 81E3B95 +LilycoveCity_Text_ChanceToDoBigThings: @ 81E3B95 .string "I'm just a GRUNT, so I don't know what\n" .string "the BOSS is thinking…\p" .string "But being on TEAM AQUA, I know I'll get\n" @@ -568,44 +568,44 @@ LilycoveCity_Text_1E3B95: @ 81E3B95 .string "Wh-who are you?!\n" .string "I was just talking to myself!$" -LilycoveCity_Text_1E3C46: @ 81E3C46 +LilycoveCity_Text_DontGoNearCaveInCove: @ 81E3C46 .string "Hey, you!\p" .string "Don't go near the cave in the cove!\p" .string "Why? You don't need a reason why!\n" .string "I'm an adult, so you just listen to me!$" -LilycoveCity_Text_1E3CBE: @ 81E3CBE +LilycoveCity_Text_IfWorldBecomesOurs: @ 81E3CBE .string "If this whole wide world becomes ours,\n" .string "TEAM AQUA's, it will be a happier\l" .string "place for POKéMON, too.$" -LilycoveCity_Text_1E3D1F: @ 81E3D1F +LilycoveCity_Text_WailmerLeapOutOfWater: @ 81E3D1F .string "There! WAILMER!\n" .string "Leap out of the water now!$" -LilycoveCity_Text_1E3D4A: @ 81E3D4A +LilycoveCity_Text_GetLostMessingUpTraining: @ 81E3D4A .string "Hunh? What do you want?\p" .string "You're messing up our training,\n" .string "so can you, like, get lost?$" -LilycoveCity_Text_1E3D9E: @ 81E3D9E +LilycoveCity_Text_ContestHallInTown: @ 81E3D9E .string "There's a POKéMON CONTEST HALL\n" .string "right in this here town. \p" .string "That means well-raised POKéMON will\n" .string "come from all over the country.\p" .string "My heart swells with excitement!$" -LilycoveCity_Text_1E3E3C: @ 81E3E3C +LilycoveCity_Text_StrangeCaveInCove: @ 81E3E3C .string "Have you seen that strange cave in\n" .string "the cove at the edge of town?$" -LilycoveCity_Text_1E3E7D: @ 81E3E7D +LilycoveCity_Text_GoingToMoveDeleterForHMs: @ 81E3E7D .string "I'm going to teach my POKéMON some new\n" .string "moves for entering a CONTEST.\p" .string "So, I'm going to see the MOVE DELETER\n" .string "and make it forget HM moves.$" -LilycoveCity_Text_1E3F05: @ 81E3F05 +LilycoveCity_Text_ImFromKanto: @ 81E3F05 .string "I came from KANTO.\p" .string "The HOENN region is beautiful with\n" .string "all its water and verdant nature.\p" @@ -613,50 +613,50 @@ LilycoveCity_Text_1E3F05: @ 81E3F05 .string "Could there be rare POKéMON that live\n" .string "only in this area?$" -LilycoveCity_Text_1E3FAB: @ 81E3FAB +LilycoveCity_Text_TeamAquaBeenTrainingWailmer: @ 81E3FAB .string "TEAM AQUA's been training their\n" .string "WAILMER in the cove.\p" .string "We SAILORS can't get our boats out\n" .string "to sea with them in the way!$" -LilycoveCity_Text_1E4020: @ 81E4020 +LilycoveCity_Text_SomeonePuntedTeamAquaOut: @ 81E4020 .string "Ahoy, did you know?\p" .string "Someone punted TEAM AQUA out of\n" .string "the way for us!\p" .string "That got the WAILMER out of the cove,\n" .string "so we can get our boats out again.$" -LilycoveCity_Text_1E40AD: @ 81E40AD +LilycoveCity_Text_SomeoneStoleMyPokemon: @ 81E40AD .string "I was taking a relaxing snooze at the\n" .string "seaside inn to the sound of waves…\p" .string "When someone stole my POKéMON!\p" .string "Who's the abductor?\n" .string "TEAM AQUA? Is it TEAM AQUA?$" -LilycoveCity_Text_1E4145: @ 81E4145 +LilycoveCity_Text_MissingPokemonCameBack: @ 81E4145 .string "My missing POKéMON…\n" .string "It came back without me noticing!$" -LilycoveCity_Text_1E417B: @ 81E417B +LilycoveCity_Text_ImArtDealer: @ 81E417B .string "I'm an ART DEALER.\p" .string "I am a buyer and seller of fine art,\n" .string "especially paintings.\p" .string "I've heard that the MUSEUM here has\n" .string "magnificent works on exhibit…$" -LilycoveCity_Text_1E420B: @ 81E420B +LilycoveCity_Text_SeaRemainsForeverYoung: @ 81E420B .string "Even as we grow old and wrinkled,\n" .string "the sea remains forever young with\l" .string "the vivid brilliance of life…\p" .string "Fwohoho fwohohohoho…$" -LilycoveCity_Text_1E4283: @ 81E4283 +LilycoveCity_Text_SixtyYearsAgoHusbandProposed: @ 81E4283 .string "It was sixty years ago that my husband\n" .string "proposed to me here.\l" .string "The sea remains as beautiful as ever.\p" .string "Mufufufu mufufufufufu…$" -LilycoveCity_Text_1E42FC: @ 81E42FC +LilycoveCity_Text_TeamAquaRenovatedCavern: @ 81E42FC .string "Hm, you know of the peculiar cavern\n" .string "in this cove?\p" .string "That had been a natural formation,\n" @@ -667,92 +667,92 @@ LilycoveCity_Text_1E42FC: @ 81E42FC .string "But what they do and what they say\n" .string "don't match at all!$" -LilycoveCity_Text_1E43FF: @ 81E43FF +LilycoveCity_Text_TeamAquaLotGoneForGood: @ 81E43FF .string "That cave in the cove…\p" .string "I didn't notice it right away,\n" .string "but it's completely empty now.\p" .string "That TEAM AQUA lot, they must\n" .string "have gone away for good.$" -LilycoveCity_Text_1E448B: @ 81E448B +LilycoveCity_Text_CitySign: @ 81E448B .string "LILYCOVE CITY\p" .string "“Where the land ends and the\n" .string "sea begins.”$" -LilycoveCity_Text_1E44C3: @ 81E44C3 +LilycoveCity_Text_ContestHallSign: @ 81E44C3 .string "POKéMON CONTEST HALL\n" .string "“The gathering place for TRAINERS!”$" -LilycoveCity_Text_1E44FC: @ 81E44FC +LilycoveCity_Text_MotelSign: @ 81E44FC .string "COVE LILY MOTEL\p" .string "“Remember us as COVE LILY of\n" .string "LILYCOVE.”$" -LilycoveCity_Text_1E4534: @ 81E4534 +LilycoveCity_Text_MuseumSign: @ 81E4534 .string "LILYCOVE MUSEUM\p" .string "“POKéMON Masterpiece Collection\n" .string "on exhibit!”$" -LilycoveCity_Text_1E4571: @ 81E4571 +LilycoveCity_Text_MuseumSignPlayersExhibit: @ 81E4571 .string "LILYCOVE MUSEUM\p" .string "“{PLAYER}'s POKéMON Collection\n" .string "on exhibit!”$" -LilycoveCity_Text_1E45A7: @ 81E45A7 +LilycoveCity_Text_HarborSignUnderConstruction: @ 81E45A7 .string "LILYCOVE CITY HARBOR\p" .string "“The ferry S.S. TIDAL is under\n" .string "construction in SLATEPORT CITY.\p" .string "“Service is scheduled to begin\n" .string "shortly.”$" -LilycoveCity_Text_1E4624: @ 81E4624 +LilycoveCity_Text_HarborSign: @ 81E4624 .string "LILYCOVE CITY HARBOR\p" .string "“Enjoy a delightful cruise on\n" .string "the ferry S.S. TIDAL.”$" -LilycoveCity_Text_1E466E: @ 81E466E +LilycoveCity_Text_TrainerFanClubSign: @ 81E466E .string "POKéMON TRAINER FAN CLUB\p" .string "The names of TRAINERS are scribbled\n" .string "all over the sign…$" -LilycoveCity_Text_1E46BE: @ 81E46BE +LilycoveCity_Text_DepartmentStoreSign: @ 81E46BE .string "LILYCOVE DEPARTMENT STORE\p" .string "“Overflowing with great merchandise\n" .string "and excitement!\p" .string "“A great place to find that something\n" .string "you need!”$" -LilycoveCity_Text_1E473D: @ 81E473D +LilycoveCity_Text_MoveDeletersHouseSign: @ 81E473D .string "MOVE DELETER'S HOUSE\p" .string "“Unwanted POKéMON moves deleted.”$" -LilycoveCity_Text_1E4774: @ 81E4774 +LilycoveCity_Text_DoYouKnowAboutBerryBlender: @ 81E4774 .string "Do you know about the machine\n" .string "BERRY BLENDER?$" -LilycoveCity_Text_1E47A1: @ 81E47A1 +LilycoveCity_Text_FasterSpinBetterPokeblocks: @ 81E47A1 .string "People have to work together to get it\n" .string "to spin faster.\p" .string "The faster you can make it spin, the\n" .string "better {POKEBLOCK}S you can get, I've heard.$" -LilycoveCity_Text_1E4824: @ 81E4824 +LilycoveCity_Text_ExplainBerryBlender: @ 81E4824 .string "It's used for making a kind of candy\n" .string "called a {POKEBLOCK}.\p" .string "If you give a good {POKEBLOCK} to a POKéMON,\n" .string "its condition will improve by a lot.$" -LilycoveCity_Text_1E48A5: @ 81E48A5 +LilycoveCity_Text_HeardTowerCalledSkyPillar: @ 81E48A5 .string "I heard there's a tower somewhere out\n" .string "on the sea routes.\p" .string "It's called the SKY PILLAR, I hear.$" -LilycoveCity_Text_1E4902: @ 81E4902 +LilycoveCity_Text_SawTallTowerOnRoute131: @ 81E4902 .string "I saw this tall tower somewhere\n" .string "around ROUTE 131.\p" .string "Could that possibly be…?$" -LilycoveCity_Text_1E494D: @ 81E494D +LilycoveCity_Text_JustArrivedAndSawRarePokemon: @ 81E494D .string "We just arrived here on our\n" .string "honeymoon vacation.\p" .string "We happened to see a DRAGON-type\n" @@ -760,7 +760,7 @@ LilycoveCity_Text_1E494D: @ 81E494D .string "Do cool POKéMON like that live in\n" .string "the HOENN region?$" -LilycoveCity_Text_1E49F4: @ 81E49F4 +LilycoveCity_Text_HoneymoonVowToSeeRarePokemon: @ 81E49F4 .string "On our honeymoon, we vowed to see as\n" .string "many rare POKéMON as we can.\p" .string "So we were delighted to see a rare\n" diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 8f251039c..c447bb41d 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218189", + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner", "flag": "0" } ], @@ -59,7 +59,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218211" + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV" } ], "bg_events": [] diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index d4e630e4a..3f97cc597 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -1,43 +1,43 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188 .byte 0 -LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 +LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner:: @ 8218189 lockall - goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA - goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear + goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted + msgbox LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot, MSGBOX_DEFAULT applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT + msgbox LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT +LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted:: @ 82181C3 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem, MSGBOX_DEFAULT applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT + msgbox LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT +LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear:: @ 82181EA + msgbox LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar, MSGBOX_DEFAULT applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT + msgbox LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 +LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: @ 8218211 lockall playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -46,34 +46,34 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT + msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_218259 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_218260 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn waitmovement 0 release end -LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259 +LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV: @ 8218259 face_right lock_facing_direction walk_left unlock_facing_direction step_end -LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E +LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer: @ 821825E walk_up step_end -LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260 +LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn: @ 8218260 face_down walk_down face_up step_end -LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264 +LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot: @ 8218264 .string "Hm, so they doubled the guests by\n" .string "using POKéMON as attractions?\p" .string "Hm, well, maybe I should make a cute\n" @@ -81,17 +81,17 @@ LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264 .string "I wonder if that will attract more\n" .string "guests to stay with us?$" -LilycoveCity_CoveLilyMotel_1F_Text_21831E: @ 821831E +LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua: @ 821831E .string "Oh, sorry, sorry!\n" .string "I was too involved in watching TV!\p" .string "Since that TEAM AQUA came to town,\n" .string "the tourists have been staying away.$" -LilycoveCity_CoveLilyMotel_1F_Text_21839B: @ 821839B +LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV: @ 821839B .string "Hey, down in front!\n" .string "I can't see the TV!$" -LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3 +LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem: @ 82183C3 .string "Amazing! You're telling me a POKéMON\n" .string "found someone's lost item?\p" .string "That's something. If we had some smart\n" @@ -99,7 +99,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3 .string "We could recover anything that our\n" .string "guests mislaid…$" -LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470 +LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted: @ 8218470 .string "Oh, sorry, sorry!\n" .string "I was too involved in watching TV!\p" .string "I heard that someone busted\n" @@ -109,7 +109,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470 .string "It was a company called… Uh…\n" .string "GAME something…$" -LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544 +LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar: @ 8218544 .string "Amazing! A house-sitting POKéMON\n" .string "caught a burglar?\p" .string "That's something. If we had a tough\n" @@ -117,7 +117,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544 .string "We would be able to provide our guests\n" .string "with greater safety.$" -LilycoveCity_CoveLilyMotel_1F_Text_2185F4: @ 82185F4 +LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner: @ 82185F4 .string "Oh, sorry, sorry!\n" .string "I was too involved in watching TV.\p" .string "Oh, yes. A big group of guests arrived\n" diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 0bd551815..17c93e5a1 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218729", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218732", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218720", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218744", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21873B", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Woman", "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21874D", + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Scott", "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT" } ], diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index fd6aa34bd..7878e791a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -1,30 +1,30 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2 .byte 0 -LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 +LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner:: @ 82186D3 lock faceplayer - call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 - call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F + call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex + call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma specialvar VAR_RESULT, HasAllHoennMons - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare release end -LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, MSGBOX_DEFAULT +LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex:: @ 82186F9 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex, MSGBOX_DEFAULT return -LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 +LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare:: @ 8218702 setflag FLAG_TEMP_2 playfanfare MUS_FANFA4 waitfanfare - goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F + goto LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma end -LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F - message LilycoveCity_CoveLilyMotel_2F_Text_21881C +LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma:: @ 821870F + message LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis waitmessage call Common_EventScript_PlayGymBadgeFanfare special Special_ShowDiploma @@ -32,42 +32,42 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F release end -LilycoveCity_CoveLilyMotel_2F_EventScript_218720:: @ 8218720 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer:: @ 8218720 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer, MSGBOX_NPC end -LilycoveCity_CoveLilyMotel_2F_EventScript_218729:: @ 8218729 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist:: @ 8218729 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist, MSGBOX_NPC end -LilycoveCity_CoveLilyMotel_2F_EventScript_218732:: @ 8218732 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan:: @ 8218732 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute, MSGBOX_NPC end -LilycoveCity_CoveLilyMotel_2F_EventScript_21873B:: @ 821873B - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_Woman:: @ 821873B + msgbox LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart, MSGBOX_NPC end -LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, MSGBOX_NPC +LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid:: @ 8218744 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy, MSGBOX_NPC end -LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D +LilycoveCity_CoveLilyMotel_2F_EventScript_Scott:: @ 821874D lock faceplayer - goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT + goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_MetScott + msgbox LilycoveCity_CoveLilyMotel_2F_Text_SnoozingPreferBattles, MSGBOX_DEFAULT addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_LILYCOVE release end -LilycoveCity_CoveLilyMotel_2F_EventScript_21876A:: @ 821876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, MSGBOX_DEFAULT +LilycoveCity_CoveLilyMotel_2F_EventScript_MetScott:: @ 821876A + msgbox LilycoveCity_CoveLilyMotel_2F_Text_ContestsDoTakeStrategy, MSGBOX_DEFAULT release end -LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774 +LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex: @ 8218774 .string "I'm the GAME DESIGNER.\p" .string "Oh, is that right?\n" .string "You're working on a POKéDEX?\p" @@ -76,7 +76,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774 .string "If you do complete it, please come\n" .string "show me.$" -LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C +LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis: @ 821881C .string "Wow! That's awesome!\n" .string "Yep, it's totally awesome!\p" .string "This POKéDEX is completely filled!\n" @@ -85,17 +85,17 @@ LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C .string "Let me give you something in\n" .string "recognition of your feat!$" -LilycoveCity_CoveLilyMotel_2F_Text_2188D6: @ 82188D6 +LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer: @ 82188D6 .string "Me? You're talking to me?\n" .string "I'm the PROGRAMMER.\p" .string "I wonder what the SLOTS are\n" .string "like here.$" -LilycoveCity_CoveLilyMotel_2F_Text_21892B: @ 821892B +LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist: @ 821892B .string "I'm the GRAPHIC ARTIST! Aren't the\n" .string "POKéMON of HOENN interesting?$" -LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C +LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute: @ 821896C .string "The girl TUBERS, they're cute, hey?\n" .string "To battle against a cute TUBER…\p" .string "Whoop, it's so awesome!\p" @@ -103,17 +103,17 @@ LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C .string "A 2-on-2 battle with TWINS…\p" .string "Whoop, it's unbearably fun!$" -LilycoveCity_CoveLilyMotel_2F_Text_218A21: @ 8218A21 +LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart: @ 8218A21 .string "The sea breeze tickles my heart.\n" .string "It feels wonderful here!$" -LilycoveCity_CoveLilyMotel_2F_Text_218A5B: @ 8218A5B +LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy: @ 8218A5B .string "You never know when and where\n" .string "people will challenge you.\p" .string "That's why I never leave home without\n" .string "my GAME BOY ADVANCE.$" -LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF +LilycoveCity_CoveLilyMotel_2F_Text_SnoozingPreferBattles: @ 8218ACF .string "SCOTT: … … … … …\n" .string "… … … … … Zzz…\p" .string "… … … … … Huh?!\n" @@ -129,7 +129,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF .string "like the GYMS, CONTESTS, BATTLE TENT,\l" .string "the whole works!$" -LilycoveCity_CoveLilyMotel_2F_Text_218C33: @ 8218C33 +LilycoveCity_CoveLilyMotel_2F_Text_ContestsDoTakeStrategy: @ 8218C33 .string "SCOTT: I think it does take strategy\n" .string "to win a CONTEST.\p" .string "Devising CONTEST strategies is one way\n" diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 54fa58333..4f3fbcc28 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House1_EventScript_21ECCE", + "script": "LilycoveCity_House1_EventScript_ExpertM", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House1_EventScript_21ECD7", + "script": "LilycoveCity_House1_EventScript_Kecleon", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc index ce09fa3dc..207b27a11 100644 --- a/data/maps/LilycoveCity_House1/scripts.inc +++ b/data/maps/LilycoveCity_House1/scripts.inc @@ -1,26 +1,26 @@ LilycoveCity_House1_MapScripts:: @ 821ECCD .byte 0 -LilycoveCity_House1_EventScript_21ECCE:: @ 821ECCE - msgbox LilycoveCity_House1_Text_21ECEA, MSGBOX_NPC +LilycoveCity_House1_EventScript_ExpertM:: @ 821ECCE + msgbox LilycoveCity_House1_Text_PokemonPartnersNotTools, MSGBOX_NPC end -LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 +LilycoveCity_House1_EventScript_Kecleon:: @ 821ECD7 lock faceplayer waitse playmoncry SPECIES_KECLEON, 0 - msgbox LilycoveCity_House1_Text_21ED63, MSGBOX_DEFAULT + msgbox LilycoveCity_House1_Text_Kecleon, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_House1_Text_21ECEA: @ 821ECEA +LilycoveCity_House1_Text_PokemonPartnersNotTools: @ 821ECEA .string "POKéMON are partners to people.\n" .string "They aren't our tools.\p" .string "Unfortunately, there are some people\n" .string "who fail to understand that…$" -LilycoveCity_House1_Text_21ED63: @ 821ED63 +LilycoveCity_House1_Text_Kecleon: @ 821ED63 .string "KECLEON: Ruroro?$" diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index b3e4127a6..c92a50499 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House2_EventScript_21ED75", + "script": "LilycoveCity_House2_EventScript_FatMan", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 0a0792bfd..517ba0434 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -1,30 +1,30 @@ LilycoveCity_House2_MapScripts:: @ 821ED74 .byte 0 -LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 +LilycoveCity_House2_EventScript_FatMan:: @ 821ED75 lock faceplayer - goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_21EDAC - msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_ReceivedRest + msgbox LilycoveCity_House2_Text_NotAwakeYetHaveThis, MSGBOX_DEFAULT giveitem_std ITEM_TM44 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM44 - msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT + msgbox LilycoveCity_House2_Text_SleepIsEssential, MSGBOX_DEFAULT release end -LilycoveCity_House2_EventScript_21EDAC:: @ 821EDAC - msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT +LilycoveCity_House2_EventScript_ReceivedRest:: @ 821EDAC + msgbox LilycoveCity_House2_Text_SleepIsEssential, MSGBOX_DEFAULT release end -LilycoveCity_House2_Text_21EDB6: @ 821EDB6 +LilycoveCity_House2_Text_NotAwakeYetHaveThis: @ 821EDB6 .string "Huh? What? What's that?\p" .string "I'm not near awake yet…\n" .string "You can have this…$" -LilycoveCity_House2_Text_21EDF9: @ 821EDF9 +LilycoveCity_House2_Text_SleepIsEssential: @ 821EDF9 .string "Yawn…\p" .string "Sleep is essential for good health…\n" .string "Sleep and regain health…$" diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 537fc46b3..e8010956d 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_21EF3D", + "script": "LilycoveCity_House3_EventScript_GameBoyKid4", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_21EE4B", + "script": "LilycoveCity_House3_EventScript_PokefanF", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_21EED5", + "script": "LilycoveCity_House3_EventScript_GameBoyKid2", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_21EF09", + "script": "LilycoveCity_House3_EventScript_GameBoyKid3", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_21EEA1", + "script": "LilycoveCity_House3_EventScript_GameBoyKid1", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House3_EventScript_21EE8A", + "script": "LilycoveCity_House3_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 1f4cef433..8d4a1059e 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -7,98 +7,98 @@ LilycoveCity_House3_OnTransition: @ 821EE42 copyvar VAR_TEMP_1, VAR_RESULT end -LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B +LilycoveCity_House3_EventScript_PokefanF:: @ 821EE4B lock faceplayer - msgbox LilycoveCity_House3_Text_21EF99, MSGBOX_YESNO + msgbox LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LilycoveCity_House3_EventScript_21EE75 - msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_House3_EventScript_DeclinePokeblockLearn + msgbox LilycoveCity_House3_Text_ExplainPokeblocks, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 - msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_DeclinePokeblockLearn:: @ 821EE75 + msgbox LilycoveCity_House3_Text_OhAreYouSure, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A +LilycoveCity_House3_EventScript_Man:: @ 821EE8A lock faceplayer - msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT + msgbox LilycoveCity_House3_Text_HappyToHaveQuadruplets, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_House3_EventScript_21EEA1:: @ 821EEA1 +LilycoveCity_House3_EventScript_GameBoyKid1:: @ 821EEA1 lock faceplayer switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_21EF71 - case 1, LilycoveCity_House3_EventScript_21EF7B - case 2, LilycoveCity_House3_EventScript_21EF85 - case 3, LilycoveCity_House3_EventScript_21EF8F + case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle + case 1, LilycoveCity_House3_EventScript_WereMixingRecords + case 2, LilycoveCity_House3_EventScript_WereBlendingBerries + case 3, LilycoveCity_House3_EventScript_WereDoingContest end -LilycoveCity_House3_EventScript_21EED5:: @ 821EED5 +LilycoveCity_House3_EventScript_GameBoyKid2:: @ 821EED5 lock faceplayer switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_21EF71 - case 1, LilycoveCity_House3_EventScript_21EF7B - case 2, LilycoveCity_House3_EventScript_21EF85 - case 3, LilycoveCity_House3_EventScript_21EF8F + case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle + case 1, LilycoveCity_House3_EventScript_WereMixingRecords + case 2, LilycoveCity_House3_EventScript_WereBlendingBerries + case 3, LilycoveCity_House3_EventScript_WereDoingContest end -LilycoveCity_House3_EventScript_21EF09:: @ 821EF09 +LilycoveCity_House3_EventScript_GameBoyKid3:: @ 821EF09 lock faceplayer switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_21EF71 - case 1, LilycoveCity_House3_EventScript_21EF7B - case 2, LilycoveCity_House3_EventScript_21EF85 - case 3, LilycoveCity_House3_EventScript_21EF8F + case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle + case 1, LilycoveCity_House3_EventScript_WereMixingRecords + case 2, LilycoveCity_House3_EventScript_WereBlendingBerries + case 3, LilycoveCity_House3_EventScript_WereDoingContest end -LilycoveCity_House3_EventScript_21EF3D:: @ 821EF3D +LilycoveCity_House3_EventScript_GameBoyKid4:: @ 821EF3D lock faceplayer switch VAR_TEMP_1 - case 0, LilycoveCity_House3_EventScript_21EF71 - case 1, LilycoveCity_House3_EventScript_21EF7B - case 2, LilycoveCity_House3_EventScript_21EF85 - case 3, LilycoveCity_House3_EventScript_21EF8F + case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle + case 1, LilycoveCity_House3_EventScript_WereMixingRecords + case 2, LilycoveCity_House3_EventScript_WereBlendingBerries + case 3, LilycoveCity_House3_EventScript_WereDoingContest end -LilycoveCity_House3_EventScript_21EF71:: @ 821EF71 - msgbox LilycoveCity_House3_Text_21F4A7, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_WereDoingMultiBattle:: @ 821EF71 + msgbox LilycoveCity_House3_Text_GoingToWinMultiBattles, MSGBOX_DEFAULT release end -LilycoveCity_House3_EventScript_21EF7B:: @ 821EF7B - msgbox LilycoveCity_House3_Text_21F4E0, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_WereMixingRecords:: @ 821EF7B + msgbox LilycoveCity_House3_Text_LikeMixingAtRecordCorner, MSGBOX_DEFAULT release end -LilycoveCity_House3_EventScript_21EF85:: @ 821EF85 - msgbox LilycoveCity_House3_Text_21F523, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_WereBlendingBerries:: @ 821EF85 + msgbox LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender, MSGBOX_DEFAULT release end -LilycoveCity_House3_EventScript_21EF8F:: @ 821EF8F - msgbox LilycoveCity_House3_Text_21F55A, MSGBOX_DEFAULT +LilycoveCity_House3_EventScript_WereDoingContest:: @ 821EF8F + msgbox LilycoveCity_House3_Text_GoingToEnterContest, MSGBOX_DEFAULT release end -LilycoveCity_House3_Text_21EF99: @ 821EF99 +LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks: @ 821EF99 .string "Oh, my, my! Are you traveling alone?\n" .string "But you're so young! Good for you!\p" .string "I'm sure my kids could learn a thing\n" @@ -109,12 +109,12 @@ LilycoveCity_House3_Text_21EF99: @ 821EF99 .string "Would you like to learn from me,\n" .string "a master of {POKEBLOCK}S?$" -LilycoveCity_House3_Text_21F0A9: @ 821F0A9 +LilycoveCity_House3_Text_OhAreYouSure: @ 821F0A9 .string "Oh? Are you sure?\p" .string "You shouldn't always try to do\n" .string "everything by yourself, dear!$" -LilycoveCity_House3_Text_21F0F8: @ 821F0F8 +LilycoveCity_House3_Text_ExplainPokeblocks: @ 821F0F8 .string "Oh, good! You're a smart soul!\n" .string "This is a bit long, so listen up!\p" .string "Are you ready?\p" @@ -143,26 +143,26 @@ LilycoveCity_House3_Text_21F0F8: @ 821F0F8 .string "the world would be a happier place.\p" .string "Don't give up, dear!$" -LilycoveCity_House3_Text_21F430: @ 821F430 +LilycoveCity_House3_Text_HappyToHaveQuadruplets: @ 821F430 .string "When my wife gave birth to quadruplets,\n" .string "you bet I was shocked.\p" .string "But, now, seeing them play together,\n" .string "it makes me happy.$" -LilycoveCity_House3_Text_21F4A7: @ 821F4A7 +LilycoveCity_House3_Text_GoingToWinMultiBattles: @ 821F4A7 .string "We're having MULTI BATTLES, but I know\n" .string "I'm going to win.$" -LilycoveCity_House3_Text_21F4E0: @ 821F4E0 +LilycoveCity_House3_Text_LikeMixingAtRecordCorner: @ 821F4E0 .string "We like mixing stuff at\n" .string "the RECORD CORNER.\p" .string "But what gets mixed up?$" -LilycoveCity_House3_Text_21F523: @ 821F523 +LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender: @ 821F523 .string "We're going to make super {POKEBLOCK}S\n" .string "with a BERRY BLENDER!$" -LilycoveCity_House3_Text_21F55A: @ 821F55A +LilycoveCity_House3_Text_GoingToEnterContest: @ 821F55A .string "I want to brag about how tough my\n" .string "POKéMON is, so we're going to enter\l" .string "a CONTEST together.$" diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index f442d00ba..95fc79d35 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House4_EventScript_21F5B5", + "script": "LilycoveCity_House4_EventScript_Man1", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_House4_EventScript_21F5BE", + "script": "LilycoveCity_House4_EventScript_Man2", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc index 2306ff6df..685a91b7d 100644 --- a/data/maps/LilycoveCity_House4/scripts.inc +++ b/data/maps/LilycoveCity_House4/scripts.inc @@ -1,20 +1,20 @@ LilycoveCity_House4_MapScripts:: @ 821F5B4 .byte 0 -LilycoveCity_House4_EventScript_21F5B5:: @ 821F5B5 - msgbox LilycoveCity_House4_Text_21F5C7, MSGBOX_NPC +LilycoveCity_House4_EventScript_Man1:: @ 821F5B5 + msgbox LilycoveCity_House4_Text_MysteriesAtBottomOfSea, MSGBOX_NPC end -LilycoveCity_House4_EventScript_21F5BE:: @ 821F5BE - msgbox LilycoveCity_House4_Text_21F62B, MSGBOX_NPC +LilycoveCity_House4_EventScript_Man2:: @ 821F5BE + msgbox LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis, MSGBOX_NPC end -LilycoveCity_House4_Text_21F5C7: @ 821F5C7 +LilycoveCity_House4_Text_MysteriesAtBottomOfSea: @ 821F5C7 .string "This planet's biggest mysteries are\n" .string "at the bottom of the sea.\p" .string "Somebody said that, but I don't know…$" -LilycoveCity_House4_Text_21F62B: @ 821F62B +LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis: @ 821F62B .string "There's a deep underwater trench\n" .string "between MOSSDEEP and SOOTOPOLIS.\p" .string "That's what someone told me, anyway.$" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 11272059e..83028fbeb 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Curator", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E07", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E10", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E19", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4" }, { @@ -128,7 +128,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E42", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E22", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3" } ], @@ -176,7 +176,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting" }, { "type": "sign", @@ -184,7 +184,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting" }, { "type": "sign", @@ -192,7 +192,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting" }, { "type": "sign", @@ -200,7 +200,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting" }, { "type": "sign", @@ -208,7 +208,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting" }, { "type": "sign", @@ -216,7 +216,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting" }, { "type": "sign", @@ -224,7 +224,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting" }, { "type": "sign", @@ -232,7 +232,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA" + "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture" }, { "type": "sign", @@ -240,7 +240,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting" }, { "type": "sign", @@ -256,7 +256,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet" }, { "type": "sign", @@ -264,7 +264,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting" }, { "type": "sign", @@ -272,7 +272,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting" }, { "type": "sign", @@ -280,7 +280,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet" }, { "type": "sign", @@ -288,7 +288,7 @@ "y": 11, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture" }, { "type": "sign", @@ -296,7 +296,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet" } ] }
\ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 8075215aa..a9c6f1266 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -1,175 +1,174 @@ LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8 .byte 0 -LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter:: @ 8218CB9 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 +LilycoveCity_LilycoveMuseum_1F_EventScript_Curator:: @ 8218CC2 lockall applymovement 2, Common_Movement_FacePlayer - message LilycoveCity_LilycoveMuseum_1F_Text_218EBC + message LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings waitmessage multichoice 20, 8, MULTI_VIEWED_PAINTINGS, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet end -LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet:: @ 8218CEC + msgbox LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, MSGBOX_YESNO +LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings:: @ 8218CF5 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested compare VAR_RESULT, YES - goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings end -LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested:: @ 8218D14 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat, MSGBOX_SIGN releaseall end -LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, MSGBOX_SIGN - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99 +LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: @ 8218D1E + msgbox LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe, MSGBOX_SIGN + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs waitmovement 0 removeobject 2 switch VAR_FACING - case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A - case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F - case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84 + case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth + case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest + case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast end -LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A +LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 8218D5A lockall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end -LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F +LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 8218D6F lockall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end -LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 +LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast:: @ 8218D84 lockall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end -LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99 +LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs: @ 8218D99 walk_up step_end -LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B +LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest: @ 8218D9B walk_left walk_up step_end -LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E +LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast: @ 8218D9E walk_right walk_up step_end -LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1 +LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth: @ 8218DA1 walk_up walk_up step_end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting:: @ 8218DA4 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting:: @ 8218DAD + msgbox LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting:: @ 8218DB6 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting:: @ 8218DBF + msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting:: @ 8218DC8 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting:: @ 8218DD1 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA -LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture:: @ 8218DDA + msgbox LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture:: @ 8218DE3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet:: @ 8218DEC + msgbox LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM:: @ 8218DF5 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1:: @ 8218DFE + msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy:: @ 8218E07 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1:: @ 8218E10 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2:: @ 8218E19 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM:: @ 8218E22 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B +LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2:: @ 8218E2B lock faceplayer - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT + msgbox LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings, MSGBOX_DEFAULT closemessage applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end -LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan:: @ 8218E42 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B +LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum: @ 8218E4B .string "Welcome to LILYCOVE MUSEUM.\p" .string "Please take the time to enjoy our\n" .string "collection of fantastic artwork\l" .string "featuring POKéMON.$" -LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC +LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings: @ 8218EBC .string "I'm the CURATOR of this MUSEUM of\n" .string "fine arts.\p" .string "It's heartening to see someone so\n" @@ -177,116 +176,116 @@ LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC .string "Have you viewed our collection of\n" .string "paintings already?$" -LilycoveCity_LilycoveMuseum_1F_Text_218F5C: @ 8218F5C +LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime: @ 8218F5C .string "Ah, then let me not disturb you.\n" .string "Please, do take your time.$" -LilycoveCity_LilycoveMuseum_1F_Text_218F98: @ 8218F98 +LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings: @ 8218F98 .string "Oh? I do believe that you seem to\n" .string "be a POKéMON TRAINER.\p" .string "Have you an interest in paintings,\n" .string "too?$" -LilycoveCity_LilycoveMuseum_1F_Text_218FF8: @ 8218FF8 +LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat: @ 8218FF8 .string "I see…\p" .string "I'm honored that you would visit\n" .string "us in spite of that.$" -LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035 +LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe: @ 8219035 .string "Ah, excellent!\n" .string "You do like paintings!\p" .string "Then, may I ask you to come with me?$" -LilycoveCity_LilycoveMuseum_1F_Text_219080: @ 8219080 +LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting: @ 8219080 .string "It's a very old painting.\n" .string "The paint is peeling here and there.$" -LilycoveCity_LilycoveMuseum_1F_Text_2190BF: @ 82190BF +LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery: @ 82190BF .string "It's an odd landscape with bizarre\n" .string "and fantastic scenery.$" -LilycoveCity_LilycoveMuseum_1F_Text_2190F9: @ 82190F9 +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman: @ 82190F9 .string "It's a painting of a beautiful, smiling\n" .string "woman with a POKéMON on her lap.$" -LilycoveCity_LilycoveMuseum_1F_Text_219142: @ 8219142 +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon: @ 8219142 .string "It's a painting of a legendary POKéMON\n" .string "from long ago.\p" .string "The artist painted this from\n" .string "imagination.$" -LilycoveCity_LilycoveMuseum_1F_Text_2191A2: @ 82191A2 +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon: @ 82191A2 .string "It's a painting of GRASS POKéMON\n" .string "swaying in a breeze.\p" .string "They appear to be enjoying the wind's\n" .string "gentle caress.$" -LilycoveCity_LilycoveMuseum_1F_Text_21920D: @ 821920D +LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries: @ 821920D .string "It's a delicious-looking painting\n" .string "of BERRIES.\p" .string "This painting could make you hungry!$" -LilycoveCity_LilycoveMuseum_1F_Text_219260: @ 8219260 +LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica: @ 8219260 .string "It's a replica of a famous sculpture.\p" .string "It depicts an ancient BIRD POKéMON.$" -LilycoveCity_LilycoveMuseum_1F_Text_2192AA: @ 82192AA +LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone: @ 82192AA .string "It's a big POKé BALL carved from\n" .string "a black stone.\p" .string "It was apparently used in festivals\n" .string "in the olden days.$" -LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311 +LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText: @ 8219311 .string "It's a huge stone tablet inscribed\n" .string "with POKéMON and dense text in the\l" .string "small characters of an ancient,\l" .string "unreadable language.$" -LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C +LilycoveCity_LilycoveMuseum_1F_Text_WorksOfMagnificence: @ 821938C .string "Hmmm…\n" .string "What works of great magnificence…$" -LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4 +LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts: @ 82193B4 .string "Battling with POKéMON is fun,\n" .string "I'll grant you that.\p" .string "But one mustn't forget our love for\n" .string "the fine arts.$" -LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A +LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration: @ 821941A .string "This ART MUSEUM… Well, you could\n" .string "see many fantastic paintings.\p" .string "And the CURATOR is a wonderful person.\p" .string "Among artists like myself, this MUSEUM\n" .string "is an inspiration.$" -LilycoveCity_LilycoveMuseum_1F_Text_2194BA: @ 82194BA +LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty: @ 82194BA .string "This lady is pretty!\n" .string "She's like Mommy!$" -LilycoveCity_LilycoveMuseum_1F_Text_2194E1: @ 82194E1 +LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable: @ 82194E1 .string "This POKéMON is adorable!\n" .string "Just like our little boy!$" -LilycoveCity_LilycoveMuseum_1F_Text_219515: @ 8219515 +LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings: @ 8219515 .string "I'd heard that this ART MUSEUM got\n" .string "in some new paintings.\p" .string "So, naturally I hurried over.\p" .string "Are the new paintings up on\n" .string "the second floor?$" -LilycoveCity_LilycoveMuseum_1F_Text_21959B: @ 821959B +LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful: @ 821959B .string "Lately, the CURATOR has been\n" .string "unusually cheerful.\p" .string "I bet something good happened for him.\n" .string "Definitely.$" -LilycoveCity_LilycoveMuseum_1F_Text_2195FF: @ 82195FF +LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings: @ 82195FF .string "I aim to see many great paintings\n" .string "here and learn from them.\p" .string "I have this dream of one day having\n" .string "my artwork exhibited here.$" -LilycoveCity_LilycoveMuseum_1F_Text_21967A: @ 821967A +LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination: @ 821967A .string "The ART MUSEUM has become a favorite\n" .string "tourist destination.\p" .string "It's great for LILYCOVE…\n" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index 18a2829e4..54d6fbc63 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219866", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_Curator", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21998A", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_Girl", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219993", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21999C", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy", "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" } ], @@ -84,7 +84,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting" }, { "type": "sign", @@ -92,7 +92,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting" }, { "type": "sign", @@ -100,7 +100,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting" }, { "type": "sign", @@ -108,7 +108,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting" }, { "type": "sign", @@ -116,7 +116,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting" }, { "type": "sign", @@ -124,7 +124,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting" }, { "type": "sign", @@ -132,7 +132,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting" }, { "type": "sign", @@ -140,7 +140,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting" }, { "type": "sign", @@ -148,7 +148,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting" }, { "type": "sign", @@ -156,7 +156,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977" + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting" }, { "type": "sign", @@ -164,7 +164,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA" + "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture" }, { "type": "sign", @@ -172,7 +172,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA" + "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture" } ] }
\ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 190c2b677..4279d3064 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -1,224 +1,224 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A - map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_OnFrame .byte 0 -LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 - goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754 +LilycoveCity_LilycoveMuseum_2F_OnLoad: @ 8219745 + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754 - goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763 +LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting:: @ 8219754 + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763 - goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772 +LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting:: @ 8219763 + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772 - goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781 +LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting:: @ 8219772 + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781 - goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB +LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting:: @ 8219781 + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B +LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting:: @ 821978B setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, 1 setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3:: @ 82197A3 +LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting:: @ 82197A3 setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, 1 setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB:: @ 82197BB +LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting:: @ 82197BB setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, 1 setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3:: @ 82197D3 +LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting:: @ 82197D3 setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, 1 setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, 1 - goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting end -LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB +LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting:: @ 82197EB setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, 1 setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, 1 end -LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE - map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808 +LilycoveCity_LilycoveMuseum_2F_OnFrame: @ 82197FE + map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall .2byte 0 -LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: @ 8219808 lockall applymovement 1, Common_Movement_FacePlayer - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall, MSGBOX_SIGN + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall, MSGBOX_SIGN applymovement 1, Common_Movement_FacePlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN - copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 releaseall end -LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861 +LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft: @ 8219861 walk_in_place_fastest_left step_end -LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863 +LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall: @ 8219863 face_up delay_16 step_end -LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 +LilycoveCity_LilycoveMuseum_2F_EventScript_Curator:: @ 8219866 lockall - goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_219921 + goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament specialvar VAR_0x8004, CountPlayerContestPaintings switch VAR_0x8004 - case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA - case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA - case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA - case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA - case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, MSGBOX_NPC + case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting + case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting + case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting + case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting + case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer + msgbox LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting:: @ 82198BA + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 +LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: @ 82198C3 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, MSGBOX_DEFAULT - goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer, MSGBOX_DEFAULT + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall + msgbox LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests, MSGBOX_DEFAULT + goto LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament end -LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA +LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament:: @ 82198EA applymovement 1, Common_Movement_FacePlayer - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT + msgbox LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude, MSGBOX_DEFAULT givedecoration_std DECOR_GLASS_ORNAMENT - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament setflag FLAG_RECEIVED_GLASS_ORNAMENT closemessage releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 +LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament:: @ 8219911 call Common_EventScript_NoRoomForDecor - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT + msgbox LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou, MSGBOX_DEFAULT closemessage releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament:: @ 8219921 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit, MSGBOX_NPC releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B +LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting:: @ 821992B lockall - goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E +LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting:: @ 821993E lockall - goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951 +LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting:: @ 8219951 lockall - goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964 +LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting:: @ 8219964 lockall - goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977 +LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting:: @ 8219977 lockall - goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame, MSGBOX_SIGN end -LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_Girl:: @ 821998A + msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM:: @ 8219993 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, MSGBOX_NPC +LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 821999C + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon, MSGBOX_NPC end -LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen 1 - drawcontestwinner 9 + showcontestwinner 9 releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen 1 - drawcontestwinner 10 + showcontestwinner 10 releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen 1 - drawcontestwinner 11 + showcontestwinner 11 releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen 1 - drawcontestwinner 12 + showcontestwinner 12 releaseall end -LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN +LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD + msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN fadescreen 1 - drawcontestwinner 13 + showcontestwinner 13 releaseall end -LilycoveCity_LilycoveMuseum_2F_Text_2199EB: @ 82199EB +LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall: @ 82199EB .string "This is our special exhibit hall.$" -LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D +LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall: @ 8219A0D .string "As you can plainly see, there is not\n" .string "a single painting on exhibit.\p" .string "Here, I don't wish to exhibit works of\n" @@ -234,7 +234,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D .string "POKéMON seemingly ready to spring\l" .string "forth into glorious life!$" -LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4 +LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit: @ 8219BC4 .string "I beg your pardon. I didn't intend\n" .string "to monopolize the conversation.\p" .string "Now, as you are young, and yet\n" @@ -246,23 +246,23 @@ LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4 .string "the artist's permission to exhibit\l" .string "it here?$" -LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3 +LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit: @ 8219CF3 .string "I wish to fill this exhibit hall with\n" .string "modern and vibrant paintings of\l" .string "POKéMON.$" -LilycoveCity_LilycoveMuseum_2F_Text_219D42: @ 8219D42 +LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting: @ 8219D42 .string "Thanks to you, we've added a new\n" .string "painting to our collection!\p" .string "I've heard it depicts your POKéMON.\n" .string "Truly magnificent!\p" .string "Thank you so very, very much!$" -LilycoveCity_LilycoveMuseum_2F_Text_219DD4: @ 8219DD4 +LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer: @ 8219DD4 .string "Ah! It's you!\n" .string "{PLAYER}!$" -LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6 +LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests: @ 8219DE6 .string "Isn't this marvelous?\n" .string "This collection of paintings!\p" .string "Each one of them flawless!\n" @@ -272,56 +272,56 @@ LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6 .string "Sincerely, I thank you, {PLAYER}.\n" .string "This is my dream come true!$" -LilycoveCity_LilycoveMuseum_2F_Text_219EC5: @ 8219EC5 +LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude: @ 8219EC5 .string "This is merely a token of my gratitude.$" -LilycoveCity_LilycoveMuseum_2F_Text_219EED: @ 8219EED +LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou: @ 8219EED .string "I will keep this for you until we\n" .string "meet again.$" -LilycoveCity_LilycoveMuseum_2F_Text_219F1B: @ 8219F1B +LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit: @ 8219F1B .string "Ah, so good to see you, {PLAYER}!\p" .string "It's an honor to have you visit us\n" .string "on your busy journeys.\p" .string "Please, relax and do enjoy your\n" .string "visit with us.$" -LilycoveCity_LilycoveMuseum_2F_Text_219FA0: @ 8219FA0 +LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame: @ 8219FA0 .string "It's a picture frame with pink-colored\n" .string "adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_219FD3: @ 8219FD3 +LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame: @ 8219FD3 .string "It's a picture frame with\n" .string "yellow-colored adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_21A008: @ 821A008 +LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame: @ 821A008 .string "It's a picture frame with\n" .string "blue-colored adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_21A03B: @ 821A03B +LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame: @ 821A03B .string "It's a picture frame with\n" .string "red-colored adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_21A06D: @ 821A06D +LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame: @ 821A06D .string "It's a picture frame with\n" .string "green-colored adornments.$" -LilycoveCity_LilycoveMuseum_2F_Text_21A0A1: @ 821A0A1 +LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon: @ 821A0A1 .string "It's a painting of POKéMON.$" -LilycoveCity_LilycoveMuseum_2F_Text_21A0BD: @ 821A0BD +LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe: @ 821A0BD .string "I've been away awhile, so the new\n" .string "paintings up here surprised me.\p" .string "I wish someone would paint my POKéMON\n" .string "this pretty.$" -LilycoveCity_LilycoveMuseum_2F_Text_21A132: @ 821A132 +LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing: @ 821A132 .string "Well… So this is where they show\n" .string "the topical POKéMON paintings.\p" .string "I see, these new paintings are indeed\n" .string "rather amusing.$" -LilycoveCity_LilycoveMuseum_2F_Text_21A1A8: @ 821A1A8 +LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon: @ 821A1A8 .string "Wow, is that right?\n" .string "These paintings are of your POKéMON.\p" .string "Isn't that just the ultimate joy for\n" |