diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 99c9d50a9d..ca522ef296 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -3798,8 +3798,8 @@ .short \amount .endm - .macro ScrCmd_27A - .short SCRCMD_27A + .macro UseVistaLighthouseBinoculars + .short SCRCMD_USEVISTALIGHTHOUSEBINOCULARS .endm .macro InitDailyRandomLevel diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 9f8a70516d..4139bc25ae 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -152,7 +152,7 @@ FLAG_UNK_0x0096 FLAG_RECEIVED_VEILSTONE_CITY_NORTHEAST_HOUSE_PORYGON FLAG_CAUGHT_ROAMING_LEGENDARY_BIRDS FLAG_ACTIVATED_ROAMING_LEGENDARY_BIRDS -FLAG_UNK_0x009A +FLAG_RECEIVED_SUNYSHORE_CITY_HM07 FLAG_AGREED_WITH_LOOKER_TO_ENTER_HIDEOUT FLAG_OBTAINED_WAKE_TM55 FLAG_OBTAINED_MAYLENE_TM60 @@ -204,7 +204,7 @@ FLAG_RECEIVED_GRAND_LAKE_ROUTE_213_NORTHWEST_HOUSE_TM92 FLAG_UNK_0x00CB FLAG_RECEIVED_VEILSTONE_CITY_TM63 FLAG_RECEIVED_ROUTE_215_TM66 -FLAG_UNK_0x00CE +FLAG_RECEIVED_ROUTE_222_TM56 FLAG_UNK_0x00CF FLAG_CAUGHT_DIALGA FLAG_CAUGHT_PALKIA @@ -245,7 +245,7 @@ FLAG_OBTAINED_POKETCH FLAG_TRADED_FOR_GASPAR_HAUNTER FLAG_UNK_0x00F5 FLAG_UNK_0x00F6 -FLAG_UNK_0x00F7 +FLAG_TALKED_TO_JULIA_SUNYSHORE_CITY_NORTHEAST_HOUSE FLAG_UNK_0x00F8 FLAG_TALKED_TO_DR_FOOTSTEP FLAG_UNK_0x00FA @@ -352,7 +352,7 @@ FLAG_GALACTIC_LEFT_LAKE_VALOR FLAG_UNK_0x015F FLAG_RECEIVED_MT_CORONET_2F_BLACK_FLUTE FLAG_TALKED_TO_GRAND_LAKE_ROUTE_213_NORTHWEST_HOUSE_PSYCHIC -FLAG_UNK_0x0162 +FLAG_VOLKNER_RETURNED_TO_GYM FLAG_UNK_0x0163 FLAG_TALKED_TO_POKEMON_MANSION_OFFICE_OLD_MAN_NATIONAL_DEX FLAG_GAME_CORNER_SAVED_TM64 @@ -567,7 +567,7 @@ FLAG_HIDE_MT_CORONET_2F_CAVE_PAINTING FLAG_HIDE_GALACTIC_HQ_CONTROL_ROOM_LAKE_GUARDIANS FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC FLAG_HIDE_JUBILIFE_CITY_CLOWN_3 -FLAG_UNK_0x0239 +FLAG_HIDE_SUNYSHORE_CITY_FLINT FLAG_HIDE_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_CYNTHIA FLAG_HIDE_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_PROF_ROWAN FLAG_HIDE_HEARTHOME_CITY_KEIRA @@ -595,7 +595,7 @@ FLAG_HIDE_FLOWER_PARADISE_SHAYMIN FLAG_UNK_0x0252 FLAG_HIDE_GALACTIC_HQ_HALL_CYRUS FLAG_HIDE_GALACTIC_HQ_HALL_LOOKER -FLAG_UNK_0x0255 +FLAG_HIDE_SUNYSHORE_CITY_RIVAL FLAG_HIDE_SNOWPOINT_CITY_CYNTHIA FLAG_HIDE_POKEMON_MANSION_FIVE_MAID_KNOCKOUT_MAID FLAG_HIDE_POKEMON_MANSION_FIVE_MAID_KNOCKOUT_BOSS @@ -616,8 +616,8 @@ FLAG_HIDE_ROUTE_212_NORTH_POLICEMAN_CALEB_NO_BATTLE FLAG_HIDE_ROUTE_212_NORTH_POLICEMAN_CALEB FLAG_HIDE_ROUTE_212_SOUTH_POLICEMAN_DANNY_NO_BATTLE FLAG_HIDE_ROUTE_212_SOUTH_POLICEMAN_DANNY -FLAG_UNK_0x026A -FLAG_UNK_0x026B +FLAG_HIDE_ROUTE_222_POLICEMAN_THOMAS_NO_BATTLE +FLAG_HIDE_ROUTE_222_POLICEMAN_THOMAS FLAG_HIDE_ROUTE_209_JOGGER_RICHARD_NO_BATTLE FLAG_HIDE_ROUTE_209_JOGGER_RICHARD FLAG_HIDE_ROUTE_209_JOGGER_RAUL_NO_BATTLE @@ -639,7 +639,7 @@ FLAG_HIDE_VALOR_LAKEFRONT_COLLECTOR FLAG_UNK_0x027E FLAG_HIDE_ROUTE_221_WORKER_WEST FLAG_HIDE_ROUTE_221_WORKER_EAST -FLAG_UNK_0x0281 +FLAG_HIDE_VISTA_LIGHTHOUSE_VOLKNER FLAG_HIDE_POKEMON_LEAGUE_AARON_ROOM_ENTRANCE_DOOR FLAG_HIDE_POKEMON_LEAGUE_BERTHA_ROOM_ENTRANCE_DOOR FLAG_HIDE_POKEMON_LEAGUE_FLINT_ROOM_ENTRANCE_DOOR @@ -2724,10 +2724,10 @@ FLAG_RECEIVED_ROUTE_208_HOUSE_RANDOM_BERRY FLAG_RECEIVED_CELESTIC_TOWN_POKECENTER_1F_GREAT_BALL FLAG_ADDED_TROPHY_GARDEN_MON FLAG_RECEIVED_PASTORIA_CITY_SOUTHWEST_HOUSE_RANDOM_BERRY -FLAG_UNK_0x0AA4 +FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE FLAG_UNK_0x0AA5 FLAG_UNK_0x0AA6 -FLAG_UNK_0x0AA7 +FLAG_VISIT_TOMORROW_SUNYSHORE_CITY_NORTHEAST_HOUSE FLAG_WON_AGAINST_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON FLAG_CHECKED_LUCKY_NUMBER FLAG_OBTAINED_FLOWER_SHOP_BERRY @@ -4280,7 +4280,7 @@ VAR_ETERNA_FOREST_FOLLOWER_CHERYL_STATE VAR_CANALAVE_LIBRARY_STATE VAR_UNK_0x40B3 VAR_REVIVED_POKEMON_SPECIES -VAR_UNK_0x40B5 +VAR_SUNYSHORE_CITY_EAST_HOUSE_SCIENTIST_STATE VAR_CURRENT_UNDERGROUND_MISSION VAR_UNK_0x40B7 VAR_BATTLE_FACTORY_CHALLENGE_TYPE diff --git a/include/binoculars_vista_lighthouse.h b/include/binoculars_vista_lighthouse.h new file mode 100644 index 0000000000..65cc388ee5 --- /dev/null +++ b/include/binoculars_vista_lighthouse.h @@ -0,0 +1,8 @@ +#ifndef POKEPLATINUM_BINOCULARS_VISTA_LIGHTHOUSE_H +#define POKEPLATINUM_BINOCULARS_VISTA_LIGHTHOUSE_H + +#include "field/field_system_decl.h" + +void UseVistaLighthouseBinoculars(FieldSystem *fieldSystem); + +#endif // POKEPLATINUM_BINOCULARS_VISTA_LIGHTHOUSE_H diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h index 5c5734fb96..e3eb52c4c3 100644 --- a/include/data/scripts/scrcmd.h +++ b/include/data/scripts/scrcmd.h @@ -639,7 +639,7 @@ ScriptCommand(SCRCMD_CHECKCANADDCOINS, ScrCm ScriptCommand(SCRCMD_GETDAILYRANDOMLEVEL, ScrCmd_GetDailyRandomLevel) ScriptCommand(SCRCMD_GETPARTYMONLEVEL, ScrCmd_GetPartyMonLevel) ScriptCommand(SCRCMD_REMOVEACCESSORY, ScrCmd_RemoveAccessory) -ScriptCommand(SCRCMD_27A, ScrCmd_27A) +ScriptCommand(SCRCMD_USEVISTALIGHTHOUSEBINOCULARS, ScrCmd_UseVistaLighthouseBinoculars) ScriptCommand(SCRCMD_INITDAILYRANDOMLEVEL, ScrCmd_InitDailyRandomLevel) ScriptCommand(SCRCMD_27C, ScrCmd_27C) ScriptCommand(SCRCMD_27D, ScrCmd_27D) diff --git a/include/unk_02050568.h b/include/unk_02050568.h deleted file mode 100644 index a15d83265d..0000000000 --- a/include/unk_02050568.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef POKEPLATINUM_UNK_02050568_H -#define POKEPLATINUM_UNK_02050568_H - -#include "field/field_system_decl.h" - -void sub_02050568(FieldSystem *fieldSystem); - -#endif // POKEPLATINUM_UNK_02050568_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index bdeaceb67f..513660cfad 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -216,7 +216,7 @@ Static main Object main.nef.p/src_unk_0205001C.c.o Object main.nef.p/src_unk_0205003C.c.o Object main.nef.p/src_unk_02050548.c.o - Object main.nef.p/src_unk_02050568.c.o + Object main.nef.p/src_binoculars_vista_lighthouse.c.o Object main.nef.p/src_vars_flags.c.o Object main.nef.p/src_field_task.c.o Object main.nef.p/src_encounter.c.o diff --git a/res/field/events/events_route_222.json b/res/field/events/events_route_222.json index 1dcf9518ec..8e2893bfe6 100644 --- a/res/field/events/events_route_222.json +++ b/res/field/events/events_route_222.json @@ -67,7 +67,7 @@ ], "object_events": [ { - "id": "ROUTE_222_FISHERMAN_BRETT", + "id": "LOCALID_FISHERMAN_BRETT", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -82,7 +82,7 @@ "y": 0 }, { - "id": "ROUTE_222_FISHERMAN_ALEC", + "id": "LOCALID_FISHERMAN_ALEC", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -97,7 +97,7 @@ "y": 0 }, { - "id": "ROUTE_222_FISHERMAN_GEORGE", + "id": "LOCALID_FISHERMAN_GEORGE", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -112,7 +112,7 @@ "y": 0 }, { - "id": "ROUTE_222_FISHERMAN_COLE", + "id": "LOCALID_FISHERMAN_COLE", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -127,7 +127,7 @@ "y": 0 }, { - "id": "ROUTE_222_BEAUTY_NICOLA", + "id": "LOCALID_BEAUTY_NICOLA", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -144,7 +144,7 @@ "y": 0 }, { - "id": "ROUTE_222_TUBER_CONNER", + "id": "LOCALID_TUBER_CONNER", "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -161,7 +161,7 @@ "y": 0 }, { - "id": "ROUTE_222_RICH_BOY_TREY", + "id": "LOCALID_RICH_BOY_TREY", "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -178,7 +178,7 @@ "y": 0 }, { - "id": "ROUTE_222_SAILOR_LUTHER", + "id": "LOCALID_SAILOR_LUTHER", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -195,11 +195,11 @@ "y": 0 }, { - "id": "ROUTE_222_POLICEMAN_THOMAS", + "id": "LOCALID_POLICEMAN_THOMAS", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_FACE_SIDES", - "hidden_flag": "FLAG_UNK_0x026B", + "hidden_flag": "FLAG_HIDE_ROUTE_222_POLICEMAN_THOMAS", "script": "TRAINER_POLICEMAN_THOMAS", "initial_dir": 3, "data": [ @@ -213,7 +213,7 @@ "y": 0 }, { - "id": "ROUTE_222_TUBER_HOLLY", + "id": "LOCALID_TUBER_HOLLY", "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -230,7 +230,7 @@ "y": 0 }, { - "id": "ROUTE_222_SAILOR_MARC", + "id": "LOCALID_SAILOR_MARC", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "movement_type": "MOVEMENT_TYPE_LOOK_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -247,7 +247,7 @@ "y": 0 }, { - "id": "ROUTE_222_ARROW_SIGNPOST_11", + "id": "LOCALID_ARROW_SIGNPOST_SUNYSHORE_CITY", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -264,7 +264,7 @@ "y": 0 }, { - "id": "ROUTE_222_ARROW_SIGNPOST_12", + "id": "LOCALID_ARROW_SIGNPOST_HOTEL_GRAND_LAKE", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -281,7 +281,7 @@ "y": 0 }, { - "id": "ROUTE_222_SIGNBOARD_13", + "id": "LOCALID_SIGNBOARD_PIKACHU_FAN_CLUB", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -296,7 +296,7 @@ "y": 0 }, { - "id": "ROUTE_222_SIGNBOARD_14", + "id": "LOCALID_SIGNBOARD_POKEMON_SIZE_CONTEST", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -311,7 +311,7 @@ "y": 0 }, { - "id": "ROUTE_222_FISHERMAN_15", + "id": "LOCALID_FISHERMAN", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -326,7 +326,7 @@ "y": 0 }, { - "id": "ROUTE_222_ROCK_SMASH_16", + "id": "LOCALID_ROCK_SMASH_1", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -341,7 +341,7 @@ "y": 0 }, { - "id": "ROUTE_222_ROCK_SMASH_17", + "id": "LOCALID_ROCK_SMASH_2", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -356,7 +356,7 @@ "y": 0 }, { - "id": "ROUTE_222_CUT_TREE_18", + "id": "LOCALID_CUT_TREE_1", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -401,7 +401,7 @@ "y": 0 }, { - "id": "ROUTE_222_BERRY_SOIL_21", + "id": "LOCALID_BERRY_SOIL_1", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -418,7 +418,7 @@ "y": 0 }, { - "id": "ROUTE_222_BERRY_SOIL_22", + "id": "LOCALID_BERRY_SOIL_2", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -435,7 +435,7 @@ "y": 0 }, { - "id": "ROUTE_222_BERRY_SOIL_23", + "id": "LOCALID_BERRY_SOIL_3", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -452,7 +452,7 @@ "y": 0 }, { - "id": "ROUTE_222_BERRY_SOIL_24", + "id": "LOCALID_BERRY_SOIL_4", "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", @@ -469,7 +469,7 @@ "y": 0 }, { - "id": "ROUTE_222_RICH_BOY_25", + "id": "LOCALID_RICH_BOY", "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -484,7 +484,7 @@ "y": 0 }, { - "id": "ROUTE_222_VENT_26", + "id": "LOCALID_VENT_1", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -499,7 +499,7 @@ "y": 0 }, { - "id": "ROUTE_222_VENT_27", + "id": "LOCALID_VENT_2", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -514,7 +514,7 @@ "y": 0 }, { - "id": "ROUTE_222_VENT_28", + "id": "LOCALID_VENT_3", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -529,11 +529,11 @@ "y": 0 }, { - "id": "ROUTE_222_POLICEMAN_29", + "id": "LOCALID_POLICEMAN_THOMAS_NO_BATTLE", "graphics_id": "OBJ_EVENT_GFX_POLICEMAN", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x026A", + "hidden_flag": "FLAG_HIDE_ROUTE_222_POLICEMAN_THOMAS_NO_BATTLE", "script": 7, "initial_dir": 3, "data": [ diff --git a/res/field/events/events_route_222_east_house.json b/res/field/events/events_route_222_east_house.json index f884f1789b..634a75e699 100644 --- a/res/field/events/events_route_222_east_house.json +++ b/res/field/events/events_route_222_east_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "ROUTE_222_EAST_HOUSE_FISHERMAN_0", + "id": "LOCALID_FISHERMAN", "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_route_222_gate_to_sunyshore_city.json b/res/field/events/events_route_222_gate_to_sunyshore_city.json index e376903a4e..95b965704f 100644 --- a/res/field/events/events_route_222_gate_to_sunyshore_city.json +++ b/res/field/events/events_route_222_gate_to_sunyshore_city.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "ROUTE_222_GATE_TO_SUNYSHORE_CITY_WORKER_0", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "ROUTE_222_GATE_TO_SUNYSHORE_CITY_POKEFAN_M_1", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_route_222_west_house.json b/res/field/events/events_route_222_west_house.json index fe2134cc78..5007f5596f 100644 --- a/res/field/events/events_route_222_west_house.json +++ b/res/field/events/events_route_222_west_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "ROUTE_222_WEST_HOUSE_PIKACHU_0", + "id": "LOCALID_PIKACHU_1", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "ROUTE_222_WEST_HOUSE_PIKACHU_1", + "id": "LOCALID_PIKACHU_2", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "ROUTE_222_WEST_HOUSE_PIKACHU_2", + "id": "LOCALID_PIKACHU_3", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "ROUTE_222_WEST_HOUSE_PIKACHU_3", + "id": "LOCALID_PIKACHU_4", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "ROUTE_222_WEST_HOUSE_PIKACHU_4", + "id": "LOCALID_PIKACHU_5", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "ROUTE_222_WEST_HOUSE_POKEFAN_M_5", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "ROUTE_222_WEST_HOUSE_POKE_KID_JANET", + "id": "LOCALID_POKE_KID_JANET", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NORMAL", diff --git a/res/field/events/events_sunyshore_city.json b/res/field/events/events_sunyshore_city.json index f8cd73c670..eac0207179 100644 --- a/res/field/events/events_sunyshore_city.json +++ b/res/field/events/events_sunyshore_city.json @@ -19,7 +19,7 @@ ], "object_events": [ { - "id": "SUNYSHORE_CITY_SAILOR_0", + "id": "LOCALID_SAILOR_1", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -34,7 +34,7 @@ "y": 7 }, { - "id": "SUNYSHORE_CITY_POKEFAN_F_1", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -49,7 +49,7 @@ "y": 7 }, { - "id": "SUNYSHORE_CITY_POKEMON_BREEDER_F_2", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -64,7 +64,7 @@ "y": 7 }, { - "id": "SUNYSHORE_CITY_WORKER_3", + "id": "LOCALID_WORKER", "graphics_id": "OBJ_EVENT_GFX_WORKER", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -79,7 +79,7 @@ "y": 7 }, { - "id": "SUNYSHORE_CITY_SIGNBOARD_4", + "id": "LOCALID_SIGNBOARD_SUNYSHORE_MARKET", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -94,7 +94,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_MAP_SIGNPOST_5", + "id": "LOCALID_MAP_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -111,7 +111,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_GYM_SIGNPOST_6", + "id": "LOCALID_GYM_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_GYM_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -126,7 +126,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_SAILOR_7", + "id": "LOCALID_SAILOR_2", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -141,7 +141,7 @@ "y": 7 }, { - "id": "SUNYSHORE_CITY_SIGNBOARD_8", + "id": "LOCALID_SIGNBOARD_VISTA_LIGHTHOUSE", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -156,7 +156,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_JASMINE_9", + "id": "LOCALID_JASMINE", "graphics_id": "OBJ_EVENT_GFX_JASMINE", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -171,7 +171,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_VENT_10", + "id": "LOCALID_VENT_1", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -186,7 +186,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_VENT_11", + "id": "LOCALID_VENT_2", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -201,7 +201,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_VENT_12", + "id": "LOCALID_VENT_3", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -216,7 +216,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_SIGNBOARD_13", + "id": "LOCALID_SIGNBOARD_JULIAS_HOUSE", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -231,7 +231,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_SIGNBOARD_14", + "id": "LOCALID_SIGNBOARD_POKEMON_ROCK", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -246,7 +246,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_SIGNBOARD_15", + "id": "LOCALID_SIGNBOARD_BLANK", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -261,7 +261,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_VENT_16", + "id": "LOCALID_VENT_4", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -291,11 +291,11 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_FLINT_18", + "id": "LOCALID_FLINT", "graphics_id": "OBJ_EVENT_GFX_FLINT", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0239", + "hidden_flag": "FLAG_HIDE_SUNYSHORE_CITY_FLINT", "script": 18, "initial_dir": 1, "data": [], @@ -306,7 +306,7 @@ "y": 7 }, { - "id": "SUNYSHORE_CITY_VENT_19", + "id": "LOCALID_VENT_5", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -321,11 +321,11 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_RIVAL_20", + "id": "LOCALID_RIVAL", "graphics_id": "OBJ_EVENT_GFX_BARRY", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0255", + "hidden_flag": "FLAG_HIDE_SUNYSHORE_CITY_RIVAL", "script": 0, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_sunyshore_city_east_house.json b/res/field/events/events_sunyshore_city_east_house.json index a741328d4f..6403f7838e 100644 --- a/res/field/events/events_sunyshore_city_east_house.json +++ b/res/field/events/events_sunyshore_city_east_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_EAST_HOUSE_SCIENTIST_M_0", + "id": "LOCALID_SCIENTIST_M", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sunyshore_city_gym_room_1.json b/res/field/events/events_sunyshore_city_gym_room_1.json index 5c930327ba..abc2d3b0ce 100644 --- a/res/field/events/events_sunyshore_city_gym_room_1.json +++ b/res/field/events/events_sunyshore_city_gym_room_1.json @@ -19,7 +19,7 @@ ], "object_events": [ { - "id": "SUNYSHORE_CITY_GYM_ROOM_1_GYM_GUIDE_0", + "id": "LOCALID_GYM_GUIDE", "graphics_id": "OBJ_EVENT_GFX_GYM_GUIDE", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -34,7 +34,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_GYM_ROOM_1_SCHOOL_KID_TIERA", + "id": "LOCALID_SCHOOL_KID_TIERA", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_F", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", diff --git a/res/field/events/events_sunyshore_city_gym_room_2.json b/res/field/events/events_sunyshore_city_gym_room_2.json index b6ddcbc6fc..c33fe5d584 100644 --- a/res/field/events/events_sunyshore_city_gym_room_2.json +++ b/res/field/events/events_sunyshore_city_gym_room_2.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_GYM_ROOM_2_SCHOOL_KID_FORREST", + "id": "LOCALID_SCHOOL_KID_FORREST", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -19,7 +19,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_GYM_ROOM_2_GUITARIST_JERRY", + "id": "LOCALID_GUITARIST_JERRY", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -36,7 +36,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_GYM_ROOM_2_POKE_KID_MEGHAN", + "id": "LOCALID_POKE_KID_MEGHAN", "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", diff --git a/res/field/events/events_sunyshore_city_gym_room_3.json b/res/field/events/events_sunyshore_city_gym_room_3.json index 407346ff2c..5f6cf76fbd 100644 --- a/res/field/events/events_sunyshore_city_gym_room_3.json +++ b/res/field/events/events_sunyshore_city_gym_room_3.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_GYM_ROOM_3_VOLKNER_0", + "id": "LOCALID_VOLKNER", "graphics_id": "OBJ_EVENT_GFX_VOLKNER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_GYM_ROOM_3_ACE_TRAINER_DESTINY", + "id": "LOCALID_ACE_TRAINER_DESTINY", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -34,7 +34,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_GYM_ROOM_3_GUITARIST_PRESTON", + "id": "LOCALID_GUITARIST_PRESTON", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -51,7 +51,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_GYM_ROOM_3_GUITARIST_LONNIE", + "id": "LOCALID_GUITARIST_LONNIE", "graphics_id": "OBJ_EVENT_GFX_GUITARIST", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -68,7 +68,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_GYM_ROOM_3_ACE_TRAINER_ZACHERY", + "id": "LOCALID_ACE_TRAINER_ZACHERY", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", diff --git a/res/field/events/events_sunyshore_city_mart.json b/res/field/events/events_sunyshore_city_mart.json index 56284013f1..b77408952f 100644 --- a/res/field/events/events_sunyshore_city_mart.json +++ b/res/field/events/events_sunyshore_city_mart.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_MART_CASHIER_F_0", + "id": "LOCALID_CASHIER_F", "graphics_id": "OBJ_EVENT_GFX_CASHIER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_MART_RUIN_MANIAC_1", + "id": "LOCALID_RUIN_MANIAC", "graphics_id": "OBJ_EVENT_GFX_RUIN_MANIAC", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_MART_SAILOR_2", + "id": "LOCALID_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_MART_MYSTERY_GIFT_DELIVERYMAN_3", + "id": "LOCALID_MYSTERY_GIFT_DELIVERYMAN", "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_MART_CASHIER_F_4", + "id": "LOCALID_CASHIER_F", "graphics_id": "OBJ_EVENT_GFX_CASHIER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sunyshore_city_northeast_house.json b/res/field/events/events_sunyshore_city_northeast_house.json index 1b669191bc..19bc49f909 100644 --- a/res/field/events/events_sunyshore_city_northeast_house.json +++ b/res/field/events/events_sunyshore_city_northeast_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_NORTHEAST_HOUSE_BEAUTY_0", + "id": "LOCALID_JULIA", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sunyshore_city_northwest_house.json b/res/field/events/events_sunyshore_city_northwest_house.json index 319ba55a8b..105fd0172e 100644 --- a/res/field/events/events_sunyshore_city_northwest_house.json +++ b/res/field/events/events_sunyshore_city_northwest_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_NORTHWEST_HOUSE_OLD_MAN_0", + "id": "LOCALID_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_NORTHWEST_HOUSE_OLD_WOMAN_1", + "id": "LOCALID_OLD_WOMAN", "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sunyshore_city_pokecenter_1f.json b/res/field/events/events_sunyshore_city_pokecenter_1f.json index 170db146be..6c5298b43a 100644 --- a/res/field/events/events_sunyshore_city_pokecenter_1f.json +++ b/res/field/events/events_sunyshore_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_POKECENTER_1F_POKECENTER_NURSE_0", + "id": "LOCALID_POKECENTER_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_POKECENTER_1F_OLD_MAN_1", + "id": "LOCALID_OLD_MAN", "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_POKECENTER_1F_NINJA_BOY_2", + "id": "LOCALID_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_POKECENTER_1F_MIDDLE_AGED_MAN_3", + "id": "LOCALID_MIDDLE_AGED_MAN", "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_POKECENTER_1F_UNK_111_4", + "id": "LOCALID_DAILY_TRAINER_1", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_1", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_POKECENTER_1F_UNK_112_5", + "id": "LOCALID_DAILY_TRAINER_2", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_DAILY_TRAINER_2", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sunyshore_city_pokecenter_2f.json b/res/field/events/events_sunyshore_city_pokecenter_2f.json index 3f6b2b882a..6ec79f0705 100644 --- a/res/field/events/events_sunyshore_city_pokecenter_2f.json +++ b/res/field/events/events_sunyshore_city_pokecenter_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_POKECENTER_2F_TEALA_0", + "id": "LOCALID_TEALA_MIDDLE", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_POKECENTER_2F_TEALA_1", + "id": "LOCALID_TEALA_EAST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_POKECENTER_2F_TEALA_2", + "id": "LOCALID_TEALA_WEST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sunyshore_city_pokecenter_b1f.json b/res/field/events/events_sunyshore_city_pokecenter_b1f.json index 0c7e6dac27..ec99bd1a58 100644 --- a/res/field/events/events_sunyshore_city_pokecenter_b1f.json +++ b/res/field/events/events_sunyshore_city_pokecenter_b1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_POKECENTER_B1FWIFI_PLAZA_ATTENDANT_F_0", + "id": "LOCALID_WIFI_PLAZA_ATTENDANT_F", "graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_POKECENTER_B1F_TEALA_1", + "id": "LOCALID_TEALA_MIDDLE", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_POKECENTER_B1F_TEALA_2", + "id": "LOCALID_TEALA_EAST", "graphics_id": "OBJ_EVENT_GFX_TEALA", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sunyshore_city_west_house.json b/res/field/events/events_sunyshore_city_west_house.json index 58d851d05a..058d86ef7a 100644 --- a/res/field/events/events_sunyshore_city_west_house.json +++ b/res/field/events/events_sunyshore_city_west_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_CITY_WEST_HOUSE_BATTLE_GIRL_0", + "id": "LOCALID_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_WEST_HOUSE_CLOWN_1", + "id": "LOCALID_CLOWN", "graphics_id": "OBJ_EVENT_GFX_CLOWN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_WEST_HOUSE_GYM_GUIDE_2", + "id": "LOCALID_GYM_GUIDE", "graphics_id": "OBJ_EVENT_GFX_GYM_GUIDE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_WEST_HOUSE_POKEMON_BREEDER_F_3", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_WEST_HOUSE_YOUNGSTER_4", + "id": "LOCALID_YOUNGSTER_1", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_WEST_HOUSE_YOUNGSTER_5", + "id": "LOCALID_YOUNGSTER_2", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "SUNYSHORE_CITY_WEST_HOUSE_YOUNGSTER_6", + "id": "LOCALID_YOUNGSTER_3", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sunyshore_market.json b/res/field/events/events_sunyshore_market.json index d28fddf206..68353f26c3 100644 --- a/res/field/events/events_sunyshore_market.json +++ b/res/field/events/events_sunyshore_market.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "SUNYSHORE_MARKET_POKEMON_BREEDER_F_0", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "SUNYSHORE_MARKET_POKEFAN_M_1", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "SUNYSHORE_MARKET_SAILOR_2", + "id": "LOCALID_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "SUNYSHORE_MARKET_GYM_GUIDE_3", + "id": "LOCALID_GYM_GUIDE", "graphics_id": "OBJ_EVENT_GFX_GYM_GUIDE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "SUNYSHORE_MARKET_BATTLE_GIRL_4", + "id": "LOCALID_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_vista_lighthouse.json b/res/field/events/events_vista_lighthouse.json index 8f8ca5f601..bd9d363a18 100644 --- a/res/field/events/events_vista_lighthouse.json +++ b/res/field/events/events_vista_lighthouse.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "VISTA_LIGHTHOUSE_SAILOR_0", + "id": "LOCALID_SAILOR", "graphics_id": "OBJ_EVENT_GFX_SAILOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -26,7 +26,7 @@ "y": 0 }, { - "id": "VISTA_LIGHTHOUSE_YOUNGSTER_1", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -41,11 +41,11 @@ "y": 0 }, { - "id": "VISTA_LIGHTHOUSE_VOLKNER_2", + "id": "LOCALID_VOLKNER", "graphics_id": "OBJ_EVENT_GFX_VOLKNER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0281", + "hidden_flag": "FLAG_HIDE_VISTA_LIGHTHOUSE_VOLKNER", "script": 4, "initial_dir": 0, "data": [], diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index e848646884..e33f5d6342 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -119,7 +119,7 @@ _0006: SetFlag FLAG_HIDE_SPEAR_PILLAR_DISTORTED_MESPRIT SetFlag FLAG_HIDE_ROUTE_205_SOUTH_YOUNGSTER SetFlag FLAG_HIDE_ROUTE_217_MAYLENE - SetFlag FLAG_UNK_0x0255 + SetFlag FLAG_HIDE_SUNYSHORE_CITY_RIVAL SetFlag FLAG_UNK_0x01E3 SetFlag FLAG_UNK_0x02C5 SetFlag FLAG_UNK_0x02C7 diff --git a/res/field/scripts/scripts_route_222.s b/res/field/scripts/scripts_route_222.s index 115c8371f3..da4fc02681 100644 --- a/res/field/scripts/scripts_route_222.s +++ b/res/field/scripts/scripts_route_222.s @@ -2,83 +2,80 @@ #include "res/text/bank/route_222.h" - ScriptEntry _00D7 - ScriptEntry _007D - ScriptEntry _00EA - ScriptEntry _0101 - ScriptEntry _0118 - ScriptEntry _012F - ScriptEntry _0146 - ScriptEntry _0022 + ScriptEntry Route222_Fisherman + ScriptEntry Route222_RichBoy + ScriptEntry Route222_ArrowSignpostHotelGrandLake + ScriptEntry Route222_ArrowSignpostSunyshoreCity + ScriptEntry Route222_SignPikachuFanClub + ScriptEntry Route222_SignPokemonSizeContest + ScriptEntry Route222_PolicemanThomas + ScriptEntry Route222_OnTransition ScriptEntryEnd -_0022: +Route222_OnTransition: GetTimeOfDay VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _0069 - GoToIfEq VAR_MAP_LOCAL_0, 1, _0069 - GoToIfEq VAR_MAP_LOCAL_0, 2, _0069 - GoToIfEq VAR_MAP_LOCAL_0, 3, _0073 - GoToIfEq VAR_MAP_LOCAL_0, 4, _0073 + GoToIfInRange VAR_MAP_LOCAL_0, TIMEOFDAY_MORNING, TIMEOFDAY_TWILIGHT, Route222_SetPolicemanThomasNoBattle + GoToIfInRange VAR_MAP_LOCAL_0, TIMEOFDAY_NIGHT, TIMEOFDAY_LATE_NIGHT, Route222_SetPolicemanThomasBattle End -_0069: - ClearFlag FLAG_UNK_0x026A - SetFlag FLAG_UNK_0x026B +Route222_SetPolicemanThomasNoBattle: + ClearFlag FLAG_HIDE_ROUTE_222_POLICEMAN_THOMAS_NO_BATTLE + SetFlag FLAG_HIDE_ROUTE_222_POLICEMAN_THOMAS End -_0073: - ClearFlag FLAG_UNK_0x026B - SetFlag FLAG_UNK_0x026A +Route222_SetPolicemanThomasBattle: + ClearFlag FLAG_HIDE_ROUTE_222_POLICEMAN_THOMAS + SetFlag FLAG_HIDE_ROUTE_222_POLICEMAN_THOMAS_NO_BATTLE End -_007D: +Route222_RichBoy: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00CE, _00C2 - Message 0 + GoToIfSet FLAG_RECEIVED_ROUTE_222_TM56, Route222_ExplainFling + Message Route222_Text_IGiveTMFling SetVar VAR_0x8004, ITEM_TM56 SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _00CD + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, Route222_BagIsFull Common_GiveItemQuantity - SetFlag FLAG_UNK_0x00CE - GoTo _00C2 + SetFlag FLAG_RECEIVED_ROUTE_222_TM56 + GoTo Route222_ExplainFling -_00C2: - Message 1 +Route222_ExplainFling: + Message Route222_Text_ExplainFling WaitButton CloseMessage ReleaseAll End -_00CD: +Route222_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_00D7: - NPCMessage 2 +Route222_Fisherman: + NPCMessage Route222_Text_CatchingMadeMeHappy End -_00EA: - ShowArrowSign 4 +Route222_ArrowSignpostHotelGrandLake: + ShowArrowSign Route222_Text_SignRt222HotelGrandLake End -_0101: - ShowArrowSign 5 +Route222_ArrowSignpostSunyshoreCity: + ShowArrowSign Route222_Text_SignRt222SunyshoreCity End -_0118: - ShowLandmarkSign 6 +Route222_SignPikachuFanClub: + ShowLandmarkSign Route222_Text_SignPikachuFanClub End -_012F: - ShowLandmarkSign 7 +Route222_SignPokemonSizeContest: + ShowLandmarkSign Route222_Text_SignPokemonSizeContest End -_0146: - NPCMessage 3 +Route222_PolicemanThomas: + NPCMessage Route222_Text_MoreAgitatedAtNight End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_222_east_house.s b/res/field/scripts/scripts_route_222_east_house.s index c23c3486b1..85cc146cbe 100644 --- a/res/field/scripts/scripts_route_222_east_house.s +++ b/res/field/scripts/scripts_route_222_east_house.s @@ -3,11 +3,11 @@ #include "generated/size_contest_results.h" - ScriptEntry Route222EastHouse_OnLoad + ScriptEntry Route222EastHouse_OnTransition ScriptEntry Route222EastHouse_Fisherman ScriptEntryEnd -Route222EastHouse_OnLoad: +Route222EastHouse_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_POKEMON_SIZE_JUDGE End @@ -16,7 +16,7 @@ Route222EastHouse_Fisherman: LockAll FacePlayer CheckPartyHasSpecies VAR_RESULT, SPECIES_REMORAID - GoToIfEq VAR_RESULT, 0, Route222EastHouse_NoRemoraid + GoToIfEq VAR_RESULT, FALSE, Route222EastHouse_NoRemoraid Message Route222EastHouse_Text_DreamtLargeRemoraidWasNoDream CloseMessage FadeScreenOut @@ -26,7 +26,7 @@ Route222EastHouse_Fisherman: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_0x8002, 0xFF, Route222EastHouse_ShowNoPokemon + GoToIfEq VAR_0x8002, PARTY_SLOT_NONE, Route222EastHouse_ShowNoPokemon GetPartyMonSpecies VAR_0x8002, VAR_0x8001 GoToIfNe VAR_0x8001, SPECIES_REMORAID, Route222EastHouse_ShowedOtherSpecies CalcSizeContestResult VAR_RESULT, VAR_0x8002 diff --git a/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s b/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s index cd0e13b687..f781fbee2d 100644 --- a/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s +++ b/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s @@ -2,14 +2,14 @@ #include "res/text/bank/route_222_gate_to_sunyshore_city.h" - ScriptEntry _000A - ScriptEntry _001D + ScriptEntry Route222GateToSunyshoreCity_Worker + ScriptEntry Route222GateToSunyshoreCity_PokefanM ScriptEntryEnd -_000A: - NPCMessage 0 +Route222GateToSunyshoreCity_Worker: + NPCMessage Route222GateToSunyshoreCity_Text_ShockinglyElectric End -_001D: - NPCMessage 1 +Route222GateToSunyshoreCity_PokefanM: + NPCMessage Route222GateToSunyshoreCity_Text_VolknersBoredLately End diff --git a/res/field/scripts/scripts_route_222_west_house.s b/res/field/scripts/scripts_route_222_west_house.s index 89929fd641..f2ec9e624f 100644 --- a/res/field/scripts/scripts_route_222_west_house.s +++ b/res/field/scripts/scripts_route_222_west_house.s @@ -2,41 +2,41 @@ #include "res/text/bank/route_222_west_house.h" - ScriptEntry _001E - ScriptEntry _0024 - ScriptEntry _0043 - ScriptEntry _0062 - ScriptEntry _0081 - ScriptEntry _00A0 - ScriptEntry _00BF + ScriptEntry Route222WestHouse_OnTransition + ScriptEntry Route222WestHouse_Pikachu + ScriptEntry Route222WestHouse_Unused3 + ScriptEntry Route222WestHouse_Unused4 + ScriptEntry Route222WestHouse_Unused5 + ScriptEntry Route222WestHouse_Unused6 + ScriptEntry Route222WestHouse_PokefanM ScriptEntryEnd -_001E: +Route222WestHouse_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_PIKACHU_FAN_CLUB End -_0024: - PokemonCryAndMessage SPECIES_PIKACHU, 0 +Route222WestHouse_Pikachu: + PokemonCryAndMessage SPECIES_PIKACHU, Route222WestHouse_Text_PikachuCryPikachuu End -_0043: - PokemonCryAndMessage SPECIES_PIKACHU, 1 +Route222WestHouse_Unused3: + PokemonCryAndMessage SPECIES_PIKACHU, Route222WestHouse_Text_PikachuCryPikaah End -_0062: - PokemonCryAndMessage SPECIES_PIKACHU, 2 +Route222WestHouse_Unused4: + PokemonCryAndMessage SPECIES_PIKACHU, Route222WestHouse_Text_PikachuCryPikaPika End -_0081: - PokemonCryAndMessage SPECIES_PIKACHU, 3 +Route222WestHouse_Unused5: + PokemonCryAndMessage SPECIES_PIKACHU, Route222WestHouse_Text_PikachuCryPiPikachu End -_00A0: - PokemonCryAndMessage SPECIES_PIKACHU, 4 +Route222WestHouse_Unused6: + PokemonCryAndMessage SPECIES_PIKACHU, Route222WestHouse_Text_PikachuCryPiiKaahchu End -_00BF: - NPCMessage 5 +Route222WestHouse_PokefanM: + NPCMessage Route222WestHouse_Text_OnlyPikachu End .balign 4, 0 diff --git a/res/field/scripts/scripts_sunyshore_city.s b/res/field/scripts/scripts_sunyshore_city.s index 47cd9142b7..7ae69b9b89 100644 --- a/res/field/scripts/scripts_sunyshore_city.s +++ b/res/field/scripts/scripts_sunyshore_city.s @@ -1,493 +1,494 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city.h" +#include "res/field/events/events_sunyshore_city.h" - ScriptEntry _0593 - ScriptEntry _0680 - ScriptEntry _0693 - ScriptEntry _06A6 - ScriptEntry _06B9 - ScriptEntry _06CC - ScriptEntry _06DF - ScriptEntry _0099 - ScriptEntry _0530 - ScriptEntry _06F2 - ScriptEntry _0709 - ScriptEntry _071E - ScriptEntry _0735 - ScriptEntry _074C - ScriptEntry _0763 - ScriptEntry _077A - ScriptEntry _0791 - ScriptEntry _0850 - ScriptEntry _004E + ScriptEntry SunyshoreCity_OnFrameFlint + ScriptEntry SunyshoreCity_Unused2 + ScriptEntry SunyshoreCity_Sailor2 + ScriptEntry SunyshoreCity_Sailor1 + ScriptEntry SunyshoreCity_Worker + ScriptEntry SunyshoreCity_PokefanF + ScriptEntry SunyshoreCity_PokemonBreederF + ScriptEntry SunyshoreCity_TriggerRivalAndJasmine + ScriptEntry SunyshoreCity_Jasmine + ScriptEntry SunyshoreCity_MapSign + ScriptEntry SunyshoreCity_GymSign + ScriptEntry SunyshoreCity_SignVistaLighthouse + ScriptEntry SunyshoreCity_SignSunyshoreMarket + ScriptEntry SunyshoreCity_SignJuliasHouse + ScriptEntry SunyshoreCity_SignBlank + ScriptEntry SunyshoreCity_SignPokemonRock + ScriptEntry SunyshoreCity_UnusedSealMerchant + ScriptEntry SunyshoreCity_Flint + ScriptEntry SunyshoreCity_OnTransition ScriptEntryEnd -_004E: - CallIfEq VAR_SANDGEM_TOWN_LAB_STATE, 2, _0077 - CallIfEq VAR_SANDGEM_TOWN_LAB_STATE, 3, _0077 - GoToIfEq VAR_SUNYSHORE_STATE, 0, _0083 +SunyshoreCity_OnTransition: + CallIfEq VAR_SANDGEM_TOWN_LAB_STATE, 2, SunyshoreCity_HideSandgemTownLabCounterpart + CallIfEq VAR_SANDGEM_TOWN_LAB_STATE, 3, SunyshoreCity_HideSandgemTownLabCounterpart + GoToIfEq VAR_SUNYSHORE_STATE, 0, SunyshoreCity_SetFlintPositionAtGate End -_0077: +SunyshoreCity_HideSandgemTownLabCounterpart: SetFlag FLAG_HIDE_SANDGEM_TOWN_LAB_COUNTERPART SetVar VAR_SANDGEM_TOWN_LAB_STATE, 4 Return -_0083: - SetObjectEventPos 18, 0x349, 0x316 - SetObjectEventMovementType 18, MOVEMENT_TYPE_LOOK_WEST - SetObjectEventDir 18, DIR_WEST +SunyshoreCity_SetFlintPositionAtGate: + SetObjectEventPos LOCALID_FLINT, 841, 790 + SetObjectEventMovementType LOCALID_FLINT, MOVEMENT_TYPE_LOOK_WEST + SetObjectEventDir LOCALID_FLINT, DIR_WEST End -_0099: +SunyshoreCity_TriggerRivalAndJasmine: LockAll - ApplyMovement 9, _04E8 + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineNoticePlayer WaitMovement - ClearFlag FLAG_UNK_0x0255 - AddObject 20 - LockObject 20 + ClearFlag FLAG_HIDE_SUNYSHORE_CITY_RIVAL + AddObject LOCALID_RIVAL + LockObject LOCALID_RIVAL GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8004, 0x355, _00FA - GoToIfEq VAR_0x8004, 0x356, _0114 - GoToIfEq VAR_0x8004, 0x357, _012E - GoToIfEq VAR_0x8004, 0x358, _0148 - GoToIfEq VAR_0x8004, 0x359, _0162 + GoToIfEq VAR_0x8004, 853, SunyshoreCity_RivalEnterX853 + GoToIfEq VAR_0x8004, 854, SunyshoreCity_RivalEnterX854 + GoToIfEq VAR_0x8004, 855, SunyshoreCity_RivalEnterX855 + GoToIfEq VAR_0x8004, 856, SunyshoreCity_RivalEnterX856 + GoToIfEq VAR_0x8004, 857, SunyshoreCity_RivalEnterX857 End -_00FA: - ApplyMovement 20, _0454 - ApplyMovement LOCALID_PLAYER, _04F4 +SunyshoreCity_RivalEnterX853: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalEnterX853 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchRivalEnterWest WaitMovement - GoTo _017C + GoTo SunyshoreCity_RivalAndJasmine End -_0114: - ApplyMovement 20, _0464 - ApplyMovement LOCALID_PLAYER, _04F4 +SunyshoreCity_RivalEnterX854: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalEnterX854 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchRivalEnterWest WaitMovement - GoTo _017C + GoTo SunyshoreCity_RivalAndJasmine End -_012E: - ApplyMovement 20, _0474 - ApplyMovement LOCALID_PLAYER, _0504 +SunyshoreCity_RivalEnterX855: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalEnterX855 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchRivalEnterX855 WaitMovement - GoTo _017C + GoTo SunyshoreCity_RivalAndJasmine End -_0148: - ApplyMovement 20, _0480 - ApplyMovement LOCALID_PLAYER, _050C +SunyshoreCity_RivalEnterX856: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalEnterX856 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchRivalEnterEast WaitMovement - GoTo _017C + GoTo SunyshoreCity_RivalAndJasmine End -_0162: - ApplyMovement 20, _0490 - ApplyMovement LOCALID_PLAYER, _050C +SunyshoreCity_RivalEnterX857: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalEnterX857 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchRivalEnterEast WaitMovement - GoTo _017C + GoTo SunyshoreCity_RivalAndJasmine End -_017C: +SunyshoreCity_RivalAndJasmine: BufferRivalName 0 BufferPlayerName 1 - Message 10 - ApplyMovement 20, _04A0 + Message SunyshoreCity_Text_YouGotAllBadges + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalWalkOnSpotSouth WaitMovement - Message 11 - CallIfEq VAR_0x8004, 0x355, _02BE - CallIfEq VAR_0x8004, 0x356, _02CA - CallIfEq VAR_0x8004, 0x357, _02D6 - CallIfEq VAR_0x8004, 0x358, _02E2 - CallIfEq VAR_0x8004, 0x359, _02EE - Message 12 + Message SunyshoreCity_Text_YouWatchMe + CallIfEq VAR_0x8004, 853, SunyshoreCity_RivalFacePlayerX853 + CallIfEq VAR_0x8004, 854, SunyshoreCity_RivalFacePlayerX854 + CallIfEq VAR_0x8004, 855, SunyshoreCity_RivalFacePlayerX855 + CallIfEq VAR_0x8004, 856, SunyshoreCity_RivalFacePlayerX856 + CallIfEq VAR_0x8004, 857, SunyshoreCity_RivalFacePlayerX857 + Message SunyshoreCity_Text_HurryToPokemonLeague CloseMessage - CallIfEq VAR_0x8004, 0x355, _02FA - CallIfEq VAR_0x8004, 0x356, _030E - CallIfEq VAR_0x8004, 0x357, _0322 - CallIfEq VAR_0x8004, 0x358, _032E - CallIfEq VAR_0x8004, 0x359, _0342 - RemoveObject 20 - CallIfEq VAR_0x8004, 0x355, _0356 - CallIfEq VAR_0x8004, 0x356, _0362 - CallIfEq VAR_0x8004, 0x357, _036E - CallIfEq VAR_0x8004, 0x358, _037A - CallIfEq VAR_0x8004, 0x359, _0386 - ApplyMovement LOCALID_PLAYER, _0528 + CallIfEq VAR_0x8004, 853, SunyshoreCity_RivalLeaveX853 + CallIfEq VAR_0x8004, 854, SunyshoreCity_RivalLeaveX854 + CallIfEq VAR_0x8004, 855, SunyshoreCity_RivalLeaveX855 + CallIfEq VAR_0x8004, 856, SunyshoreCity_RivalLeaveX856 + CallIfEq VAR_0x8004, 857, SunyshoreCity_RivalLeaveX857 + RemoveObject LOCALID_RIVAL + CallIfEq VAR_0x8004, 853, SunyshoreCity_JasmineWalkToPlayerX853 + CallIfEq VAR_0x8004, 854, SunyshoreCity_JasmineWalkToPlayerX854 + CallIfEq VAR_0x8004, 855, SunyshoreCity_JasmineWalkToPlayerX855 + CallIfEq VAR_0x8004, 856, SunyshoreCity_JasmineWalkToPlayerX856 + CallIfEq VAR_0x8004, 857, SunyshoreCity_JasmineWalkToPlayerX857 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWalkOnSpotNorth WaitMovement - Message 13 - Call _0577 + Message SunyshoreCity_Text_HaveThisAsMyThanks + Call SunyshoreCity_GiveWaterfall CloseMessage - CallIfEq VAR_0x8004, 0x355, _0392 - CallIfEq VAR_0x8004, 0x356, _039E - CallIfEq VAR_0x8004, 0x357, _03AA - CallIfEq VAR_0x8004, 0x358, _03B6 - CallIfEq VAR_0x8004, 0x359, _03C2 + CallIfEq VAR_0x8004, 853, SunyshoreCity_JasmineLeaveX853 + CallIfEq VAR_0x8004, 854, SunyshoreCity_JasmineLeaveX854 + CallIfEq VAR_0x8004, 855, SunyshoreCity_JasmineLeaveX855 + CallIfEq VAR_0x8004, 856, SunyshoreCity_JasmineLeaveX856 + CallIfEq VAR_0x8004, 857, SunyshoreCity_JasmineLeaveX857 SetVar VAR_SUNYSHORE_STATE, 3 ReleaseAll End -_02BE: - ApplyMovement 20, _04A8 +SunyshoreCity_RivalFacePlayerX853: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalWalkOnSpotWest WaitMovement Return -_02CA: - ApplyMovement 20, _04A8 +SunyshoreCity_RivalFacePlayerX854: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalWalkOnSpotWest WaitMovement Return -_02D6: - ApplyMovement 20, _04B0 +SunyshoreCity_RivalFacePlayerX855: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalWalkOnSpotNorth WaitMovement Return -_02E2: - ApplyMovement 20, _04B8 +SunyshoreCity_RivalFacePlayerX856: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalWalkOnSpotEast WaitMovement Return -_02EE: - ApplyMovement 20, _04B8 +SunyshoreCity_RivalFacePlayerX857: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalWalkOnSpotEast WaitMovement Return -_02FA: - ApplyMovement 20, _04C0 - ApplyMovement LOCALID_PLAYER, _051C +SunyshoreCity_RivalLeaveX853: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalLeaveX853 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchRivalLeave WaitMovement Return -_030E: - ApplyMovement 20, _04C8 - ApplyMovement LOCALID_PLAYER, _051C +SunyshoreCity_RivalLeaveX854: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalLeaveX854 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchRivalLeave WaitMovement Return -_0322: - ApplyMovement 20, _04D0 +SunyshoreCity_RivalLeaveX855: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalLeaveX855 WaitMovement Return -_032E: - ApplyMovement 20, _04D8 - ApplyMovement LOCALID_PLAYER, _051C +SunyshoreCity_RivalLeaveX856: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalLeaveX856 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchRivalLeave WaitMovement Return -_0342: - ApplyMovement 20, _04E0 - ApplyMovement LOCALID_PLAYER, _051C +SunyshoreCity_RivalLeaveX857: + ApplyMovement LOCALID_RIVAL, SunyshoreCity_Movement_RivalLeaveX857 + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchRivalLeave WaitMovement Return -_0356: - ApplyMovement 9, _03D0 +SunyshoreCity_JasmineWalkToPlayerX853: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineWalkToPlayerX853 WaitMovement Return -_0362: - ApplyMovement 9, _03DC +SunyshoreCity_JasmineWalkToPlayerX854: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineWalkToPlayerX854 WaitMovement Return -_036E: - ApplyMovement 9, _03E8 +SunyshoreCity_JasmineWalkToPlayerX855: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineWalkToPlayerX855 WaitMovement Return -_037A: - ApplyMovement 9, _03F4 +SunyshoreCity_JasmineWalkToPlayerX856: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineWalkToPlayerX856 WaitMovement Return -_0386: - ApplyMovement 9, _0400 +SunyshoreCity_JasmineWalkToPlayerX857: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineWalkToPlayerX857 WaitMovement Return -_0392: - ApplyMovement 9, _0408 +SunyshoreCity_JasmineLeaveX853: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineLeaveX853 WaitMovement Return -_039E: - ApplyMovement 9, _0418 +SunyshoreCity_JasmineLeaveX854: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineLeaveX854 WaitMovement Return -_03AA: - ApplyMovement 9, _0428 +SunyshoreCity_JasmineLeaveX855: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineLeaveX855 WaitMovement Return -_03B6: - ApplyMovement 9, _0438 +SunyshoreCity_JasmineLeaveX856: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineLeaveX856 WaitMovement Return -_03C2: - ApplyMovement 9, _0448 +SunyshoreCity_JasmineLeaveX857: + ApplyMovement LOCALID_JASMINE, SunyshoreCity_Movement_JasmineLeaveX857 WaitMovement Return .balign 4, 0 -_03D0: +SunyshoreCity_Movement_JasmineWalkToPlayerX853: WalkNormalWest 4 WalkNormalSouth EndMovement .balign 4, 0 -_03DC: +SunyshoreCity_Movement_JasmineWalkToPlayerX854: WalkNormalWest 3 WalkNormalSouth EndMovement .balign 4, 0 -_03E8: +SunyshoreCity_Movement_JasmineWalkToPlayerX855: WalkNormalWest 2 WalkNormalSouth EndMovement .balign 4, 0 -_03F4: +SunyshoreCity_Movement_JasmineWalkToPlayerX856: WalkNormalWest WalkNormalSouth EndMovement .balign 4, 0 -_0400: +SunyshoreCity_Movement_JasmineWalkToPlayerX857: WalkNormalSouth EndMovement .balign 4, 0 -_0408: +SunyshoreCity_Movement_JasmineLeaveX853: WalkNormalNorth WalkNormalEast 4 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0418: +SunyshoreCity_Movement_JasmineLeaveX854: WalkNormalNorth WalkNormalEast 3 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0428: +SunyshoreCity_Movement_JasmineLeaveX855: WalkNormalNorth WalkNormalEast 2 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0438: +SunyshoreCity_Movement_JasmineLeaveX856: WalkNormalNorth WalkNormalEast WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0448: +SunyshoreCity_Movement_JasmineLeaveX857: WalkNormalNorth WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0454: +SunyshoreCity_Movement_RivalEnterX853: Delay8 WalkFastNorth 4 WalkFastWest EndMovement .balign 4, 0 -_0464: +SunyshoreCity_Movement_RivalEnterX854: Delay8 WalkFastNorth 4 WalkOnSpotFastWest EndMovement .balign 4, 0 -_0474: +SunyshoreCity_Movement_RivalEnterX855: Delay8 WalkFastNorth 3 EndMovement .balign 4, 0 -_0480: +SunyshoreCity_Movement_RivalEnterX856: Delay8 WalkFastNorth 4 WalkOnSpotFastEast EndMovement .balign 4, 0 -_0490: +SunyshoreCity_Movement_RivalEnterX857: Delay8 WalkFastNorth 4 WalkFastEast EndMovement .balign 4, 0 -_04A0: +SunyshoreCity_Movement_RivalWalkOnSpotSouth: WalkOnSpotFastSouth EndMovement .balign 4, 0 -_04A8: +SunyshoreCity_Movement_RivalWalkOnSpotWest: WalkOnSpotFastWest EndMovement .balign 4, 0 -_04B0: +SunyshoreCity_Movement_RivalWalkOnSpotNorth: WalkOnSpotFastNorth EndMovement .balign 4, 0 -_04B8: +SunyshoreCity_Movement_RivalWalkOnSpotEast: WalkOnSpotFastEast EndMovement .balign 4, 0 -_04C0: +SunyshoreCity_Movement_RivalLeaveX853: WalkFastSouth 8 EndMovement .balign 4, 0 -_04C8: +SunyshoreCity_Movement_RivalLeaveX854: WalkFastSouth 8 EndMovement .balign 4, 0 -_04D0: +SunyshoreCity_Movement_RivalLeaveX855: WalkFastSouth 8 EndMovement .balign 4, 0 -_04D8: +SunyshoreCity_Movement_RivalLeaveX856: WalkFastSouth 8 EndMovement .balign 4, 0 -_04E0: +SunyshoreCity_Movement_RivalLeaveX857: WalkFastSouth 8 EndMovement .balign 4, 0 -_04E8: +SunyshoreCity_Movement_JasmineNoticePlayer: WalkOnSpotNormalSouth EmoteExclamationMark EndMovement .balign 4, 0 -_04F4: +SunyshoreCity_Movement_PlayerWatchRivalEnterWest: WalkOnSpotNormalSouth Delay8 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0504: +SunyshoreCity_Movement_PlayerWatchRivalEnterX855: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_050C: +SunyshoreCity_Movement_PlayerWatchRivalEnterEast: WalkOnSpotNormalSouth Delay8 2 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_051C: +SunyshoreCity_Movement_PlayerWatchRivalLeave: Delay8 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0528: +SunyshoreCity_Movement_PlayerWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement -_0530: +SunyshoreCity_Jasmine: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x009A, _056C - Message 8 + GoToIfSet FLAG_RECEIVED_SUNYSHORE_CITY_HM07, SunyshoreCity_ICameToGetStronger + Message SunyshoreCity_Text_FeelAtHome CheckBadgeAcquired BADGE_ID_BEACON, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0561 - GoTo _056C + GoToIfEq VAR_RESULT, FALSE, SunyshoreCity_ForcedToTurnBack + GoTo SunyshoreCity_ICameToGetStronger End -_0561: - Message 5 +SunyshoreCity_ForcedToTurnBack: + Message SunyshoreCity_Text_ForcedToTurnBack WaitButton CloseMessage ReleaseAll End -_056C: - Message 9 +SunyshoreCity_ICameToGetStronger: + Message SunyshoreCity_Text_ICameToGetStronger WaitButton CloseMessage ReleaseAll End -_0577: - Message 6 +SunyshoreCity_GiveWaterfall: + Message SunyshoreCity_Text_ThisIsntMuchBut SetVar VAR_0x8004, ITEM_HM07 SetVar VAR_0x8005, 1 Common_GiveItemQuantity - SetFlag FLAG_UNK_0x009A - Message 7 + SetFlag FLAG_RECEIVED_SUNYSHORE_CITY_HM07 + Message SunyshoreCity_Text_ThatHMContainsWaterfall Return -_0593: +SunyshoreCity_OnFrameFlint: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x316, _05B7 - GoToIfEq VAR_0x8005, 0x317, _05C7 + GoToIfEq VAR_0x8005, 790, SunyshoreCity_FlintWalkToPlayerZ790 + GoToIfEq VAR_0x8005, 791, SunyshoreCity_FlintWalkToPlayerZ791 End -_05B7: - ApplyMovement 18, _063C +SunyshoreCity_FlintWalkToPlayerZ790: + ApplyMovement LOCALID_FLINT, SunyshoreCity_Movement_FlintWalkToPlayerZ790 WaitMovement - GoTo _05D7 + GoTo SunyshoreCity_GiveVolknerHotBattle -_05C7: - ApplyMovement 18, _0650 +SunyshoreCity_FlintWalkToPlayerZ791: + ApplyMovement LOCALID_FLINT, SunyshoreCity_Movement_FlintWalkToPlayerZ791 WaitMovement - GoTo _05D7 + GoTo SunyshoreCity_GiveVolknerHotBattle -_05D7: - Message 0 +SunyshoreCity_GiveVolknerHotBattle: + Message SunyshoreCity_Text_TheNamesFlint CloseMessage - ApplyMovement 18, _0668 + ApplyMovement LOCALID_FLINT, SunyshoreCity_Movement_FlintWalkOnSpotNormalSouth WaitMovement WaitTime 15, VAR_RESULT - ApplyMovement 18, _0670 + ApplyMovement LOCALID_FLINT, SunyshoreCity_Movement_FlintWalkOnSpotNormalWest WaitMovement - Message 1 + Message SunyshoreCity_Text_GiveVolknerHotBattle CloseMessage WaitTime 15, VAR_RESULT - ApplyMovement 18, _0678 + ApplyMovement LOCALID_FLINT, SunyshoreCity_Movement_FlintLeave WaitMovement - RemoveObject 18 + RemoveObject LOCALID_FLINT WaitTime 1, VAR_RESULT - SetObjectEventPos 18, 0x34D, 0x2EC - SetObjectEventMovementType 18, MOVEMENT_TYPE_LOOK_SOUTH - SetObjectEventDir 18, DIR_SOUTH - ClearFlag FLAG_UNK_0x0239 - AddObject 18 + SetObjectEventPos LOCALID_FLINT, 845, 748 + SetObjectEventMovementType LOCALID_FLINT, MOVEMENT_TYPE_LOOK_SOUTH + SetObjectEventDir LOCALID_FLINT, DIR_SOUTH + ClearFlag FLAG_HIDE_SUNYSHORE_CITY_FLINT + AddObject LOCALID_FLINT SetVar VAR_SUNYSHORE_STATE, 1 ReleaseAll End .balign 4, 0 -_063C: +SunyshoreCity_Movement_FlintWalkToPlayerZ790: WalkNormalWest 3 WalkOnSpotNormalWest EmoteExclamationMark @@ -495,7 +496,7 @@ _063C: EndMovement .balign 4, 0 -_0650: +SunyshoreCity_Movement_FlintWalkToPlayerZ791: WalkNormalSouth WalkNormalWest 3 WalkOnSpotNormalWest @@ -504,73 +505,73 @@ _0650: EndMovement .balign 4, 0 -_0668: +SunyshoreCity_Movement_FlintWalkOnSpotNormalSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0670: +SunyshoreCity_Movement_FlintWalkOnSpotNormalWest: WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0678: +SunyshoreCity_Movement_FlintLeave: WalkNormalEast 9 EndMovement -_0680: - NPCMessage 14 +SunyshoreCity_Unused2: + NPCMessage SunyshoreCity_Text_Dummy14 End -_0693: - NPCMessage 20 +SunyshoreCity_Sailor2: + NPCMessage SunyshoreCity_Text_PeopleAndPokemonAdapt End -_06A6: - NPCMessage 15 +SunyshoreCity_Sailor1: + NPCMessage SunyshoreCity_Text_ThatGiantRock End -_06B9: - NPCMessage 17 +SunyshoreCity_Worker: + NPCMessage SunyshoreCity_Text_GymUsesTooMuchElectricity End -_06CC: - NPCMessage 18 +SunyshoreCity_PokefanF: + NPCMessage SunyshoreCity_Text_CityUsesALotOfElectricity End -_06DF: - NPCMessage 19 +SunyshoreCity_PokemonBreederF: + NPCMessage SunyshoreCity_Text_MajorPortTown End -_06F2: - ShowMapSign 21 +SunyshoreCity_MapSign: + ShowMapSign SunyshoreCity_Text_MapSign End -_0709: - ShowScrollingSign 22 +SunyshoreCity_GymSign: + ShowScrollingSign SunyshoreCity_Text_SignPokemonGym End -_071E: - ShowLandmarkSign 23 +SunyshoreCity_SignVistaLighthouse: + ShowLandmarkSign SunyshoreCity_Text_SignVistaLighthouse End -_0735: - ShowLandmarkSign 24 +SunyshoreCity_SignSunyshoreMarket: + ShowLandmarkSign SunyshoreCity_Text_SignSunyshoreMarket End -_074C: - ShowLandmarkSign 25 +SunyshoreCity_SignJuliasHouse: + ShowLandmarkSign SunyshoreCity_Text_SignJuliasHouse End -_0763: - ShowLandmarkSign 26 +SunyshoreCity_SignBlank: + ShowLandmarkSign SunyshoreCity_Text_SignBlank End -_077A: - ShowLandmarkSign 27 +SunyshoreCity_SignPokemonRock: + ShowLandmarkSign SunyshoreCity_Text_SignPokemonRock End -_0791: +SunyshoreCity_UnusedSealMerchant: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer @@ -578,112 +579,112 @@ _0791: CloseMessageWithoutErasing GetDayOfWeek VAR_RESULT SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, DAY_OF_WEEK_SUNDAY, _0806 - GoToIfEq VAR_0x8008, DAY_OF_WEEK_MONDAY, _0810 - GoToIfEq VAR_0x8008, DAY_OF_WEEK_TUESDAY, _081A - GoToIfEq VAR_0x8008, DAY_OF_WEEK_WEDNESDAY, _0824 - GoToIfEq VAR_0x8008, DAY_OF_WEEK_THURSDAY, _082E - GoToIfEq VAR_0x8008, DAY_OF_WEEK_FRIDAY, _0838 - GoToIfEq VAR_0x8008, DAY_OF_WEEK_SATURDAY, _0842 + GoToIfEq VAR_0x8008, DAY_OF_WEEK_SUNDAY, SunyshoreCity_UnusedSealMerchantSunday + GoToIfEq VAR_0x8008, DAY_OF_WEEK_MONDAY, SunyshoreCity_UnusedSealMerchantMonday + GoToIfEq VAR_0x8008, DAY_OF_WEEK_TUESDAY, SunyshoreCity_UnusedSealMerchantTuesday + GoToIfEq VAR_0x8008, DAY_OF_WEEK_WEDNESDAY, SunyshoreCity_UnusedSealMerchantWednesday + GoToIfEq VAR_0x8008, DAY_OF_WEEK_THURSDAY, SunyshoreCity_UnusedSealMerchantThursday + GoToIfEq VAR_0x8008, DAY_OF_WEEK_FRIDAY, SunyshoreCity_UnusedSealMerchantFriday + GoToIfEq VAR_0x8008, DAY_OF_WEEK_SATURDAY, SunyshoreCity_UnusedSealMerchantSaturday End -_0806: +SunyshoreCity_UnusedSealMerchantSunday: PokeMartSeal MART_SEAL_ID_SUNYSHORE_MONDAY - GoTo _084C + GoTo SunyshoreCity_UnusedSealMerchantEnd -_0810: +SunyshoreCity_UnusedSealMerchantMonday: PokeMartSeal MART_SEAL_ID_SUNYSHORE_TUESDAY - GoTo _084C + GoTo SunyshoreCity_UnusedSealMerchantEnd -_081A: +SunyshoreCity_UnusedSealMerchantTuesday: PokeMartSeal MART_SEAL_ID_SUNYSHORE_WEDNESDAY - GoTo _084C + GoTo SunyshoreCity_UnusedSealMerchantEnd -_0824: +SunyshoreCity_UnusedSealMerchantWednesday: PokeMartSeal MART_SEAL_ID_SUNYSHORE_THURSDAY - GoTo _084C + GoTo SunyshoreCity_UnusedSealMerchantEnd -_082E: +SunyshoreCity_UnusedSealMerchantThursday: PokeMartSeal MART_SEAL_ID_SUNYSHORE_FRIDAY - GoTo _084C + GoTo SunyshoreCity_UnusedSealMerchantEnd -_0838: +SunyshoreCity_UnusedSealMerchantFriday: PokeMartSeal MART_SEAL_ID_SUNYSHORE_SATURDAY - GoTo _084C + GoTo SunyshoreCity_UnusedSealMerchantEnd -_0842: +SunyshoreCity_UnusedSealMerchantSaturday: PokeMartSeal MART_SEAL_ID_SUNYSHORE_SUNDAY - GoTo _084C + GoTo SunyshoreCity_UnusedSealMerchantEnd -_084C: +SunyshoreCity_UnusedSealMerchantEnd: ReleaseAll End -_0850: +SunyshoreCity_Flint: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0162, _086E - Message 2 + GoToIfSet FLAG_VOLKNER_RETURNED_TO_GYM, SunyshoreCity_VolknerFinallyCameBack + Message SunyshoreCity_Text_VolknerNotBackYet WaitButton CloseMessage ReleaseAll End -_086E: - Message 3 +SunyshoreCity_VolknerFinallyCameBack: + Message SunyshoreCity_Text_VolknerFinallyCameBack CloseMessage WaitTime 15, VAR_RESULT GetPlayerDir VAR_RESULT - GoToIfEq VAR_RESULT, 0, _08A6 - GoToIfEq VAR_RESULT, 2, _08BE - GoToIfEq VAR_RESULT, 3, _08D6 + GoToIfEq VAR_RESULT, DIR_NORTH, SunyshoreCity_FlintLeaveNorth + GoToIfEq VAR_RESULT, DIR_WEST, SunyshoreCity_FlintLeaveWest + GoToIfEq VAR_RESULT, DIR_EAST, SunyshoreCity_FlintLeaveEast End -_08A6: - ApplyMovement 18, _08F8 - ApplyMovement LOCALID_PLAYER, _0914 +SunyshoreCity_FlintLeaveNorth: + ApplyMovement LOCALID_FLINT, SunyshoreCity_Movement_FlintLeaveNorth + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchFlintLeaveNorthEast WaitMovement - GoTo _08EE + GoTo SunyshoreCity_RemoveVolkner -_08BE: - ApplyMovement 18, _0908 - ApplyMovement LOCALID_PLAYER, _0920 +SunyshoreCity_FlintLeaveWest: + ApplyMovement LOCALID_FLINT, SunyshoreCity_Movement_FlintLeaveWestEast + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchFlintLeaveWest WaitMovement - GoTo _08EE + GoTo SunyshoreCity_RemoveVolkner -_08D6: - ApplyMovement 18, _0908 - ApplyMovement LOCALID_PLAYER, _0914 +SunyshoreCity_FlintLeaveEast: + ApplyMovement LOCALID_FLINT, SunyshoreCity_Movement_FlintLeaveWestEast + ApplyMovement LOCALID_PLAYER, SunyshoreCity_Movement_PlayerWatchFlintLeaveNorthEast WaitMovement - GoTo _08EE + GoTo SunyshoreCity_RemoveVolkner -_08EE: - RemoveObject 18 +SunyshoreCity_RemoveVolkner: + RemoveObject LOCALID_FLINT ReleaseAll End .balign 4, 0 -_08F8: +SunyshoreCity_Movement_FlintLeaveNorth: WalkNormalEast WalkNormalSouth 2 WalkNormalEast 8 EndMovement .balign 4, 0 -_0908: +SunyshoreCity_Movement_FlintLeaveWestEast: WalkNormalSouth 2 WalkNormalEast 9 EndMovement .balign 4, 0 -_0914: +SunyshoreCity_Movement_PlayerWatchFlintLeaveNorthEast: Delay8 FaceEast EndMovement .balign 4, 0 -_0920: +SunyshoreCity_Movement_PlayerWatchFlintLeaveWest: Delay8 WalkOnSpotNormalSouth WalkOnSpotNormalEast diff --git a/res/field/scripts/scripts_sunyshore_city_east_house.s b/res/field/scripts/scripts_sunyshore_city_east_house.s index bdea4229ba..54a5ce9179 100644 --- a/res/field/scripts/scripts_sunyshore_city_east_house.s +++ b/res/field/scripts/scripts_sunyshore_city_east_house.s @@ -3,61 +3,61 @@ #include "generated/natures.h" - ScriptEntry _0006 + ScriptEntry SunyshoreCityEastHouse_Scientist ScriptEntryEnd -_0006: +SunyshoreCityEastHouse_Scientist: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_UNK_0x40B5, 1, _002C - SetVar VAR_UNK_0x40B5, 1 - Message 0 + GoToIfGe VAR_SUNYSHORE_CITY_EAST_HOUSE_SCIENTIST_STATE, 1, SunyshoreCityEastHouse_TryCheckNatures + SetVar VAR_SUNYSHORE_CITY_EAST_HOUSE_SCIENTIST_STATE, 1 + Message SunyshoreCityEastHouse_Text_MayISeeNatures WaitButton CloseMessage ReleaseAll End -_002C: +SunyshoreCityEastHouse_TryCheckNatures: CheckPoketchAppRegistered POKETCH_APPID_ROULETTE, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0125 + GoToIfEq VAR_RESULT, TRUE, SunyshoreCityEastHouse_AppsMayOutnumberPokemon CheckPoketchAppRegistered POKETCH_APPID_DOTART, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _00A7 + GoToIfEq VAR_RESULT, TRUE, SunyshoreCityEastHouse_CheckQuirkyNature CheckPoketchAppRegistered POKETCH_APPID_CALENDAR, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0089 - GoTo _006B + GoToIfEq VAR_RESULT, TRUE, SunyshoreCityEastHouse_CheckNaiveNature + GoTo SunyshoreCityEastHouse_CheckSeriousNature -_006B: +SunyshoreCityEastHouse_CheckSeriousNature: FindPartySlotWithNature VAR_0x8000, NATURE_SERIOUS - GoToIfNe VAR_0x8000, 0xFF, _00C5 - Message 1 + GoToIfNe VAR_0x8000, PARTY_SLOT_NONE, SunyshoreCityEastHouse_GiveCalendarApp + Message SunyshoreCityEastHouse_Text_LikeToSeeSeriousNature WaitButton CloseMessage ReleaseAll End -_0089: +SunyshoreCityEastHouse_CheckNaiveNature: FindPartySlotWithNature VAR_0x8000, NATURE_NAIVE - GoToIfNe VAR_0x8000, 0xFF, _00E5 - Message 2 + GoToIfNe VAR_0x8000, PARTY_SLOT_NONE, SunyshoreCityEastHouse_GiveDotArtistApp + Message SunyshoreCityEastHouse_Text_LikeToSeeNaiveNature WaitButton CloseMessage ReleaseAll End -_00A7: +SunyshoreCityEastHouse_CheckQuirkyNature: FindPartySlotWithNature VAR_0x8000, NATURE_QUIRKY - GoToIfNe VAR_0x8000, 0xFF, _0105 - Message 3 + GoToIfNe VAR_0x8000, PARTY_SLOT_NONE, SunyshoreCityEastHouse_GiveRouletteApp + Message SunyshoreCityEastHouse_Text_LikeToSeeQuirkyNature WaitButton CloseMessage ReleaseAll End -_00C5: +SunyshoreCityEastHouse_GiveCalendarApp: GetPartyMonSpecies VAR_0x8000, VAR_0x8001 BufferPartyMonSpecies 0, VAR_0x8000 - Message 4 + Message SunyshoreCityEastHouse_Text_IllGiveCalendarApp SetVar VAR_0x8004, POKETCH_APPID_CALENDAR Common_GivePoketchApp WaitButton @@ -65,10 +65,10 @@ _00C5: ReleaseAll End -_00E5: +SunyshoreCityEastHouse_GiveDotArtistApp: GetPartyMonSpecies VAR_0x8000, VAR_0x8001 BufferPartyMonSpecies 0, VAR_0x8000 - Message 5 + Message SunyshoreCityEastHouse_Text_IllGiveDotArtistApp SetVar VAR_0x8004, POKETCH_APPID_DOTART Common_GivePoketchApp WaitButton @@ -76,10 +76,10 @@ _00E5: ReleaseAll End -_0105: +SunyshoreCityEastHouse_GiveRouletteApp: GetPartyMonSpecies VAR_0x8000, VAR_0x8001 BufferPartyMonSpecies 0, VAR_0x8000 - Message 6 + Message SunyshoreCityEastHouse_Text_IllGiveRouletteApp SetVar VAR_0x8004, POKETCH_APPID_ROULETTE Common_GivePoketchApp WaitButton @@ -87,8 +87,8 @@ _0105: ReleaseAll End -_0125: - Message 7 +SunyshoreCityEastHouse_AppsMayOutnumberPokemon: + Message SunyshoreCityEastHouse_Text_AppsMayOutnumberPokemon WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_sunyshore_city_northeast_house.s b/res/field/scripts/scripts_sunyshore_city_northeast_house.s index 297a042d15..807e67d15d 100644 --- a/res/field/scripts/scripts_sunyshore_city_northeast_house.s +++ b/res/field/scripts/scripts_sunyshore_city_northeast_house.s @@ -3,115 +3,115 @@ #include "generated/ribbons.h" - ScriptEntry _0006 + ScriptEntry SunyshoreCityEastHouse_Julia ScriptEntryEnd -_0006: +SunyshoreCityEastHouse_Julia: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0AA4, _006A - GoToIfSet FLAG_UNK_0x0AA7, _005F - GoToIfUnset FLAG_UNK_0x00F7, _004C + GoToIfSet FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE, SunyshoreCityNortheastHouse_GoToTellAnotherStoryTomorrow + GoToIfSet FLAG_VISIT_TOMORROW_SUNYSHORE_CITY_NORTHEAST_HOUSE, SunyshoreCityNortheastHouse_PleaseVisitTomorrow + GoToIfUnset FLAG_TALKED_TO_JULIA_SUNYSHORE_CITY_NORTHEAST_HOUSE, SunyshoreCityNortheastHouse_TellMeStories GetFirstNonEggInParty VAR_0x8002 - Call _0070 - GoToIfEq VAR_RESULT, 1, _0136 - GoTo _0146 + Call SunyshoreCityNortheastHouse_CheckHasTodaysRibbon + GoToIfEq VAR_RESULT, TRUE, SunyshoreCityNortheastHouse_GaveRibbonBefore + GoTo SunyshoreCityNortheastHouse_AskDailyStory -_004C: - SetFlag FLAG_UNK_0x00F7 - SetFlag FLAG_UNK_0x0AA7 - Message 0 +SunyshoreCityNortheastHouse_TellMeStories: + SetFlag FLAG_TALKED_TO_JULIA_SUNYSHORE_CITY_NORTHEAST_HOUSE + SetFlag FLAG_VISIT_TOMORROW_SUNYSHORE_CITY_NORTHEAST_HOUSE + Message SunyshoreCityNortheastHouse_Text_TellMeStories WaitButton CloseMessage ReleaseAll End -_005F: - Message 1 +SunyshoreCityNortheastHouse_PleaseVisitTomorrow: + Message SunyshoreCityNortheastHouse_Text_PleaseVisitTomorrow WaitButton CloseMessage ReleaseAll End -_006A: - GoTo _012B +SunyshoreCityNortheastHouse_GoToTellAnotherStoryTomorrow: + GoTo SunyshoreCityNortheastHouse_TellAnotherStoryTomorrow -_0070: +SunyshoreCityNortheastHouse_CheckHasTodaysRibbon: GetDayOfWeek VAR_RESULT - GoToIfEq VAR_RESULT, DAY_OF_WEEK_SUNDAY, _00C8 - GoToIfEq VAR_RESULT, DAY_OF_WEEK_MONDAY, _00D2 - GoToIfEq VAR_RESULT, DAY_OF_WEEK_TUESDAY, _00DC - GoToIfEq VAR_RESULT, DAY_OF_WEEK_WEDNESDAY, _00E6 - GoToIfEq VAR_RESULT, DAY_OF_WEEK_THURSDAY, _00F0 - GoToIfEq VAR_RESULT, DAY_OF_WEEK_FRIDAY, _00FA - GoTo _0104 + GoToIfEq VAR_RESULT, DAY_OF_WEEK_SUNDAY, SunyshoreCityNortheastHouse_CheckHasRibbonSmile + GoToIfEq VAR_RESULT, DAY_OF_WEEK_MONDAY, SunyshoreCityNortheastHouse_CheckHasRibbonAlert + GoToIfEq VAR_RESULT, DAY_OF_WEEK_TUESDAY, SunyshoreCityNortheastHouse_CheckHasRibbonShock + GoToIfEq VAR_RESULT, DAY_OF_WEEK_WEDNESDAY, SunyshoreCityNortheastHouse_CheckHasRibbonDowncast + GoToIfEq VAR_RESULT, DAY_OF_WEEK_THURSDAY, SunyshoreCityNortheastHouse_CheckHasRibbonCareless + GoToIfEq VAR_RESULT, DAY_OF_WEEK_FRIDAY, SunyshoreCityNortheastHouse_CheckHasRibbonRelax + GoTo SunyshoreCityNortheastHouse_CheckHasRibbonSnooze -_00C8: +SunyshoreCityNortheastHouse_CheckHasRibbonSmile: GetPartyMonRibbon VAR_RESULT, VAR_0x8002, RIBBON_SMILE Return -_00D2: +SunyshoreCityNortheastHouse_CheckHasRibbonAlert: GetPartyMonRibbon VAR_RESULT, VAR_0x8002, RIBBON_ALERT Return -_00DC: +SunyshoreCityNortheastHouse_CheckHasRibbonShock: GetPartyMonRibbon VAR_RESULT, VAR_0x8002, RIBBON_SHOCK Return -_00E6: +SunyshoreCityNortheastHouse_CheckHasRibbonDowncast: GetPartyMonRibbon VAR_RESULT, VAR_0x8002, RIBBON_DOWNCAST Return -_00F0: +SunyshoreCityNortheastHouse_CheckHasRibbonCareless: GetPartyMonRibbon VAR_RESULT, VAR_0x8002, RIBBON_CARELESS Return -_00FA: +SunyshoreCityNortheastHouse_CheckHasRibbonRelax: GetPartyMonRibbon VAR_RESULT, VAR_0x8002, RIBBON_RELAX Return -_0104: +SunyshoreCityNortheastHouse_CheckHasRibbonSnooze: GetPartyMonRibbon VAR_RESULT, VAR_0x8002, RIBBON_SNOOZE Return -_010E: +SunyshoreCityNortheastHouse_GiveRibbon: BufferPartyMonSpecies 1, VAR_0x8002 BufferPlayerName 2 - Message 4 + Message SunyshoreCityNortheastHouse_Text_GiveThisToPokemon PlayFanfare SEQ_FANFA1 - Message 5 + Message SunyshoreCityNortheastHouse_Text_PlayerReceivedRibbon WaitFanfare - Message 6 - GoTo _012B + Message SunyshoreCityNortheastHouse_Text_PlayerPutRibbonOnPokemon + GoTo SunyshoreCityNortheastHouse_TellAnotherStoryTomorrow -_012B: - Message 7 +SunyshoreCityNortheastHouse_TellAnotherStoryTomorrow: + Message SunyshoreCityNortheastHouse_Text_TellAnotherStoryTomorrow WaitButton CloseMessage ReleaseAll End -_0136: +SunyshoreCityNortheastHouse_GaveRibbonBefore: BufferPartyMonSpecies 1, VAR_0x8002 - Message 8 + Message SunyshoreCityNortheastHouse_Text_GaveRibbonBefore WaitButton CloseMessage ReleaseAll End -_0146: +SunyshoreCityNortheastHouse_AskDailyStory: GetDayOfWeek VAR_RESULT - GoToIfEq VAR_RESULT, DAY_OF_WEEK_SUNDAY, _019E - GoToIfEq VAR_RESULT, DAY_OF_WEEK_MONDAY, _01F2 - GoToIfEq VAR_RESULT, DAY_OF_WEEK_TUESDAY, _0246 - GoToIfEq VAR_RESULT, DAY_OF_WEEK_WEDNESDAY, _029A - GoToIfEq VAR_RESULT, DAY_OF_WEEK_THURSDAY, _02EE - GoToIfEq VAR_RESULT, DAY_OF_WEEK_FRIDAY, _0342 - GoTo _0396 + GoToIfEq VAR_RESULT, DAY_OF_WEEK_SUNDAY, SunyshoreCityNortheastHouse_AskSundayStory + GoToIfEq VAR_RESULT, DAY_OF_WEEK_MONDAY, SunyshoreCityNortheastHouse_AskMondayStory + GoToIfEq VAR_RESULT, DAY_OF_WEEK_TUESDAY, SunyshoreCityNortheastHouse_AskTuesdayStory + GoToIfEq VAR_RESULT, DAY_OF_WEEK_WEDNESDAY, SunyshoreCityNortheastHouse_AskWednesdayStory + GoToIfEq VAR_RESULT, DAY_OF_WEEK_THURSDAY, SunyshoreCityNortheastHouse_AskThursdayStory + GoToIfEq VAR_RESULT, DAY_OF_WEEK_FRIDAY, SunyshoreCityNortheastHouse_AskFridayStory + GoTo SunyshoreCityNortheastHouse_AskSaturdayStory -_019E: - Message 20 +SunyshoreCityNortheastHouse_AskSundayStory: + Message SunyshoreCityNortheastHouse_Text_AskSundayStory WaitABPress CloseMessage FadeScreenOut @@ -120,16 +120,16 @@ _019E: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _03EA + GoToIfEq VAR_RESULT, 0, SunyshoreCityNortheastHouse_CouldntThinkUpAnything BufferCustomMessageWord 0, VAR_0x8000 - Message 21 - SetFlag FLAG_UNK_0x0AA4 + Message SunyshoreCityNortheastHouse_Text_TellSundayStory + SetFlag FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE SetPartyMonRibbon VAR_0x8002, RIBBON_SMILE BufferRibbonName 3, RIBBON_SMILE - GoTo _010E + GoTo SunyshoreCityNortheastHouse_GiveRibbon -_01F2: - Message 2 +SunyshoreCityNortheastHouse_AskMondayStory: + Message SunyshoreCityNortheastHouse_Text_AskMondayStory WaitABPress CloseMessage FadeScreenOut @@ -138,16 +138,16 @@ _01F2: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _03EA + GoToIfEq VAR_RESULT, 0, SunyshoreCityNortheastHouse_CouldntThinkUpAnything BufferCustomMessageWord 0, VAR_0x8000 - Message 3 - SetFlag FLAG_UNK_0x0AA4 + Message SunyshoreCityNortheastHouse_Text_TellMondayStory + SetFlag FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE SetPartyMonRibbon VAR_0x8002, RIBBON_ALERT BufferRibbonName 3, RIBBON_ALERT - GoTo _010E + GoTo SunyshoreCityNortheastHouse_GiveRibbon -_0246: - Message 10 +SunyshoreCityNortheastHouse_AskTuesdayStory: + Message SunyshoreCityNortheastHouse_Text_AskTuesdayStory WaitABPress CloseMessage FadeScreenOut @@ -156,16 +156,16 @@ _0246: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _03EA + GoToIfEq VAR_RESULT, 0, SunyshoreCityNortheastHouse_CouldntThinkUpAnything BufferCustomMessageWord 0, VAR_0x8000 - Message 11 - SetFlag FLAG_UNK_0x0AA4 + Message SunyshoreCityNortheastHouse_Text_TellTuesdayStory + SetFlag FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE SetPartyMonRibbon VAR_0x8002, RIBBON_SHOCK BufferRibbonName 3, RIBBON_SHOCK - GoTo _010E + GoTo SunyshoreCityNortheastHouse_GiveRibbon -_029A: - Message 12 +SunyshoreCityNortheastHouse_AskWednesdayStory: + Message SunyshoreCityNortheastHouse_Text_AskWednesdayStory WaitABPress CloseMessage FadeScreenOut @@ -174,16 +174,16 @@ _029A: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _03EA + GoToIfEq VAR_RESULT, 0, SunyshoreCityNortheastHouse_CouldntThinkUpAnything BufferCustomMessageWord 0, VAR_0x8000 - Message 13 - SetFlag FLAG_UNK_0x0AA4 + Message SunyshoreCityNortheastHouse_Text_TellWednesdayStory + SetFlag FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE SetPartyMonRibbon VAR_0x8002, RIBBON_DOWNCAST BufferRibbonName 3, RIBBON_DOWNCAST - GoTo _010E + GoTo SunyshoreCityNortheastHouse_GiveRibbon -_02EE: - Message 14 +SunyshoreCityNortheastHouse_AskThursdayStory: + Message SunyshoreCityNortheastHouse_Text_AskThursdayStory WaitABPress CloseMessage FadeScreenOut @@ -192,16 +192,16 @@ _02EE: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _03EA + GoToIfEq VAR_RESULT, 0, SunyshoreCityNortheastHouse_CouldntThinkUpAnything BufferCustomMessageWord 0, VAR_0x8000 - Message 15 - SetFlag FLAG_UNK_0x0AA4 + Message SunyshoreCityNortheastHouse_Text_TellThursdayStory + SetFlag FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE SetPartyMonRibbon VAR_0x8002, RIBBON_CARELESS BufferRibbonName 3, RIBBON_CARELESS - GoTo _010E + GoTo SunyshoreCityNortheastHouse_GiveRibbon -_0342: - Message 16 +SunyshoreCityNortheastHouse_AskFridayStory: + Message SunyshoreCityNortheastHouse_Text_AskFridayStory WaitABPress CloseMessage FadeScreenOut @@ -210,16 +210,16 @@ _0342: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _03EA + GoToIfEq VAR_RESULT, 0, SunyshoreCityNortheastHouse_CouldntThinkUpAnything BufferCustomMessageWord 0, VAR_0x8000 - Message 17 - SetFlag FLAG_UNK_0x0AA4 + Message SunyshoreCityNortheastHouse_Text_TellFridayStory + SetFlag FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE SetPartyMonRibbon VAR_0x8002, RIBBON_RELAX BufferRibbonName 3, RIBBON_RELAX - GoTo _010E + GoTo SunyshoreCityNortheastHouse_GiveRibbon -_0396: - Message 18 +SunyshoreCityNortheastHouse_AskSaturdayStory: + Message SunyshoreCityNortheastHouse_Text_AskSaturdayStory WaitABPress CloseMessage FadeScreenOut @@ -228,16 +228,16 @@ _0396: ReturnToField FadeScreenIn WaitFadeScreen - GoToIfEq VAR_RESULT, 0, _03EA + GoToIfEq VAR_RESULT, 0, SunyshoreCityNortheastHouse_CouldntThinkUpAnything BufferCustomMessageWord 0, VAR_0x8000 - Message 19 - SetFlag FLAG_UNK_0x0AA4 + Message SunyshoreCityNortheastHouse_Text_TellSaturdayStory + SetFlag FLAG_TOLD_DAILY_STORY_SUNYSHORE_CITY_NORTHEAST_HOUSE SetPartyMonRibbon VAR_0x8002, RIBBON_SNOOZE BufferRibbonName 3, RIBBON_SNOOZE - GoTo _010E + GoTo SunyshoreCityNortheastHouse_GiveRibbon -_03EA: - Message 9 +SunyshoreCityNortheastHouse_CouldntThinkUpAnything: + Message SunyshoreCityNortheastHouse_Text_CouldntThinkUpAnything WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_sunyshore_city_northwest_house.s b/res/field/scripts/scripts_sunyshore_city_northwest_house.s index c4a51ede44..d5798bd4d4 100644 --- a/res/field/scripts/scripts_sunyshore_city_northwest_house.s +++ b/res/field/scripts/scripts_sunyshore_city_northwest_house.s @@ -2,14 +2,14 @@ #include "res/text/bank/sunyshore_city_northwest_house.h" - ScriptEntry _000A - ScriptEntry _001D + ScriptEntry SunyshoreCityNorthwestHouse_OldMan + ScriptEntry SunyshoreCityNorthwestHouse_OldWoman ScriptEntryEnd -_000A: - NPCMessage 0 +SunyshoreCityNorthwestHouse_OldMan: + NPCMessage SunyshoreCityNorthwestHouse_Text_GalacticUpToNoGood End -_001D: - NPCMessage 1 +SunyshoreCityNorthwestHouse_OldWoman: + NPCMessage SunyshoreCityNorthwestHouse_Text_CyrusLivedHere End diff --git a/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s b/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s index 0795fecec9..1c14dd567c 100644 --- a/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s @@ -1,41 +1,42 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city_pokecenter_1f.h" +#include "res/field/events/events_sunyshore_city_pokecenter_1f.h" - ScriptEntry _0012 - ScriptEntry _001E - ScriptEntry _0031 - ScriptEntry _0062 + ScriptEntry SunyshoreCityPokecenter1F_Nurse + ScriptEntry SunyshoreCityPokecenter1F_OldMan + ScriptEntry SunyshoreCityPokecenter1F_NinjaBoy + ScriptEntry SunyshoreCityPokecenter1F_MiddleAgedMan ScriptEntryEnd -_0012: - Common_CallPokecenterNurse 0 +SunyshoreCityPokecenter1F_Nurse: + Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE End -_001E: - NPCMessage 0 +SunyshoreCityPokecenter1F_OldMan: + NPCMessage SunyshoreCityPokecenter1F_Text_DreamedBecomingGymLeader End -_0031: +SunyshoreCityPokecenter1F_NinjaBoy: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfBadgeAcquired BADGE_ID_BEACON, _0057 - Message 1 + GoToIfBadgeAcquired BADGE_ID_BEACON, SunyshoreCityPokecenter1F_AwesomelyCoolEightBadges + Message SunyshoreCityPokecenter1F_Text_ReallyCoolSevenBadges WaitButton CloseMessage ReleaseAll End -_0057: - Message 2 +SunyshoreCityPokecenter1F_AwesomelyCoolEightBadges: + Message SunyshoreCityPokecenter1F_Text_AwesomelyCoolEightBadges WaitButton CloseMessage ReleaseAll End -_0062: - NPCMessage 3 +SunyshoreCityPokecenter1F_MiddleAgedMan: + NPCMessage SunyshoreCityPokecenter1F_Text_RoadsOutOfSolarPanels End .balign 4, 0 diff --git a/res/field/scripts/scripts_sunyshore_city_west_house.s b/res/field/scripts/scripts_sunyshore_city_west_house.s index a18f71da8c..40551ca831 100644 --- a/res/field/scripts/scripts_sunyshore_city_west_house.s +++ b/res/field/scripts/scripts_sunyshore_city_west_house.s @@ -2,41 +2,41 @@ #include "res/text/bank/sunyshore_city_west_house.h" - ScriptEntry _001E - ScriptEntry _0031 - ScriptEntry _0044 - ScriptEntry _0057 - ScriptEntry _006A - ScriptEntry _007D - ScriptEntry _0090 + ScriptEntry SunyshoreCityWestHouse_BattleGirl + ScriptEntry SunyshoreCityWestHouse_Clown + ScriptEntry SunyshoreCityWestHouse_Youngster1 + ScriptEntry SunyshoreCityWestHouse_Youngster2 + ScriptEntry SunyshoreCityWestHouse_Youngster3 + ScriptEntry SunyshoreCityWestHouse_GymGuide + ScriptEntry SunyshoreCityWestHouse_PokemonBreederF ScriptEntryEnd -_001E: - NPCMessage 0 +SunyshoreCityWestHouse_BattleGirl: + NPCMessage SunyshoreCityWestHouse_Text_GoneUndergroundLately End -_0031: - NPCMessage 1 +SunyshoreCityWestHouse_Clown: + NPCMessage SunyshoreCityWestHouse_Text_SpheresUndergroundLikeGems End -_0044: - NPCMessage 2 +SunyshoreCityWestHouse_Youngster1: + NPCMessage SunyshoreCityWestHouse_Text_BuriedSpheresGrow End -_0057: - NPCMessage 3 +SunyshoreCityWestHouse_Youngster2: + NPCMessage SunyshoreCityWestHouse_Text_GetFlagsFromFriends End -_006A: - NPCMessage 4 +SunyshoreCityWestHouse_Youngster3: + NPCMessage SunyshoreCityWestHouse_Text_GoUndergroundHaveFun End -_007D: - NPCMessage 5 +SunyshoreCityWestHouse_GymGuide: + NPCMessage SunyshoreCityWestHouse_Text_DefusedByTouch End -_0090: - NPCMessage 6 +SunyshoreCityWestHouse_PokemonBreederF: + NPCMessage SunyshoreCityWestHouse_Text_UndergroundManByronRelated End .balign 4, 0 diff --git a/res/field/scripts/scripts_vista_lighthouse.s b/res/field/scripts/scripts_vista_lighthouse.s index 18a2132dbd..45ee98d30e 100644 --- a/res/field/scripts/scripts_vista_lighthouse.s +++ b/res/field/scripts/scripts_vista_lighthouse.s @@ -1,79 +1,80 @@ #include "macros/scrcmd.inc" #include "res/text/bank/vista_lighthouse.h" +#include "res/field/events/events_vista_lighthouse.h" - ScriptEntry _0012 - ScriptEntry _0025 - ScriptEntry _0038 - ScriptEntry _004C + ScriptEntry VistaLighthouse_Sailor + ScriptEntry VistaLighthouse_Youngster + ScriptEntry VistaLighthouse_Binoculars + ScriptEntry VistaLighthouse_Volkner ScriptEntryEnd -_0012: - NPCMessage 4 +VistaLighthouse_Sailor: + NPCMessage VistaLighthouse_Text_LighthouseRepresentsSafety End -_0025: - NPCMessage 5 +VistaLighthouse_Youngster: + NPCMessage VistaLighthouse_Text_GoingFarAwayOneDay End -_0038: +VistaLighthouse_Binoculars: PlaySE SEQ_SE_CONFIRM LockAll BufferPlayerName 0 - Message 3 + Message VistaLighthouse_Text_PlayerLookedThroughBinoculars CloseMessage - ScrCmd_27A + UseVistaLighthouseBinoculars ReleaseAll End -_004C: +VistaLighthouse_Volkner: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 - Message 1 - Message 2 + Message VistaLighthouse_Text_YoureTheLatestChallenger + Message VistaLighthouse_Text_IWantThrillAgain + Message VistaLighthouse_Text_UnleashArsenalAtYou CloseMessage WaitTime 15, VAR_RESULT GetPlayerDir VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0092 - GoToIfEq VAR_RESULT, 2, _00AA - GoToIfEq VAR_RESULT, 3, _00C2 + GoToIfEq VAR_RESULT, DIR_NORTH, VistaLighthouse_VolknerWalkToDoorNorth + GoToIfEq VAR_RESULT, DIR_WEST, VistaLighthouse_VolknerWalkToDoorWest + GoToIfEq VAR_RESULT, DIR_EAST, VistaLighthouse_VolknerWalkToDoorEast End -_0092: - ApplyMovement 2, _0104 - ApplyMovement LOCALID_PLAYER, _013C +VistaLighthouse_VolknerWalkToDoorNorth: + ApplyMovement LOCALID_VOLKNER, VistaLighthouse_Movement_VolknerWalkToDoorNorth + ApplyMovement LOCALID_PLAYER, VistaLighthouse_Movement_PlayerWatchVolknerWalkToDoorNorth WaitMovement - GoTo _00D2 + GoTo VistaLighthouse_VolknerLeave -_00AA: - ApplyMovement 2, _0118 - ApplyMovement LOCALID_PLAYER, _0148 +VistaLighthouse_VolknerWalkToDoorWest: + ApplyMovement LOCALID_VOLKNER, VistaLighthouse_Movement_VolknerWalkToDoorWestEast + ApplyMovement LOCALID_PLAYER, VistaLighthouse_Movement_PlayerWatchVolknerWalkToDoorWest WaitMovement - GoTo _00D2 + GoTo VistaLighthouse_VolknerLeave -_00C2: - ApplyMovement 2, _0118 +VistaLighthouse_VolknerWalkToDoorEast: + ApplyMovement LOCALID_VOLKNER, VistaLighthouse_Movement_VolknerWalkToDoorWestEast WaitMovement - GoTo _00D2 + GoTo VistaLighthouse_VolknerLeave -_00D2: +VistaLighthouse_VolknerLeave: LoadDoorAnimation 0, 0, 6, 9, ANIMATION_TAG_DOOR_1 PlayDoorOpenAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 - ApplyMovement 2, _0130 + ApplyMovement LOCALID_VOLKNER, VistaLighthouse_Movement_VolknerLeave WaitMovement PlayDoorCloseAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 UnloadAnimation ANIMATION_TAG_DOOR_1 - RemoveObject 2 - SetFlag FLAG_UNK_0x0162 + RemoveObject LOCALID_VOLKNER + SetFlag FLAG_VOLKNER_RETURNED_TO_GYM ReleaseAll End .balign 4, 0 -_0104: +VistaLighthouse_Movement_VolknerWalkToDoorNorth: WalkNormalEast 3 WalkNormalSouth 6 WalkNormalWest 3 @@ -81,7 +82,7 @@ _0104: EndMovement .balign 4, 0 -_0118: +VistaLighthouse_Movement_VolknerWalkToDoorWestEast: WalkNormalSouth WalkNormalEast 3 WalkNormalSouth 5 @@ -90,19 +91,19 @@ _0118: EndMovement .balign 4, 0 -_0130: +VistaLighthouse_Movement_VolknerLeave: WalkNormalNorth SetInvisible EndMovement .balign 4, 0 -_013C: +VistaLighthouse_Movement_PlayerWatchVolknerWalkToDoorNorth: Delay8 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0148: +VistaLighthouse_Movement_PlayerWatchVolknerWalkToDoorWest: Delay8 WalkOnSpotNormalSouth Delay8 diff --git a/res/text/route_222.json b/res/text/route_222.json index 3aa2206d8d..9f8d8e4ce7 100644 --- a/res/text/route_222.json +++ b/res/text/route_222.json @@ -2,7 +2,7 @@ "key": 38544, "messages": [ { - "id": "pl_msg_00000517_00000", + "id": "Route222_Text_IGiveTMFling", "en_US": [ "The only items you ever throw are\n", "Poké Balls!\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000517_00001", + "id": "Route222_Text_ExplainFling", "en_US": [ "Using that move, the Pokémon hurls\n", "whatever item it’s holding at the foe.\r", @@ -24,7 +24,7 @@ ] }, { - "id": "pl_msg_00000517_00002", + "id": "Route222_Text_CatchingMadeMeHappy", "en_US": [ "When I first started fishing, catching\n", "anything made me happy.\r", @@ -34,35 +34,35 @@ ] }, { - "id": "pl_msg_00000517_00003", + "id": "Route222_Text_MoreAgitatedAtNight", "en_US": [ "I can’t explain it.\n", "I get more easily agitated at night." ] }, { - "id": "pl_msg_00000517_00004", + "id": "Route222_Text_SignRt222HotelGrandLake", "en_US": [ "Rt. 222\n", "Hotel Grand Lake" ] }, { - "id": "pl_msg_00000517_00005", + "id": "Route222_Text_SignRt222SunyshoreCity", "en_US": [ "Rt. 222\n", "Sunyshore City" ] }, { - "id": "pl_msg_00000517_00006", + "id": "Route222_Text_SignPikachuFanClub", "en_US": [ "PIKACHU Fan Club\n", "Pikapikapikah! Pikapika?" ] }, { - "id": "pl_msg_00000517_00007", + "id": "Route222_Text_SignPokemonSizeContest", "en_US": [ "Pokémon Size Contest\n", "Big Pokémon Wanted!" diff --git a/res/text/route_222_gate_to_sunyshore_city.json b/res/text/route_222_gate_to_sunyshore_city.json index f6d8570422..a9915e7ff8 100644 --- a/res/text/route_222_gate_to_sunyshore_city.json +++ b/res/text/route_222_gate_to_sunyshore_city.json @@ -2,7 +2,7 @@ "key": 52890, "messages": [ { - "id": "pl_msg_00000520_00000", + "id": "Route222GateToSunyshoreCity_Text_ShockinglyElectric", "en_US": [ "If I had to describe Sunyshore Gym\n", "in a word, it’d be...\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000520_00001", + "id": "Route222GateToSunyshoreCity_Text_VolknersBoredLately", "en_US": [ "Sunyshore’s Gym Leader Volkner’s been\n", "bored lately, I hear.\r", diff --git a/res/text/route_222_west_house.json b/res/text/route_222_west_house.json index bcfb3d722d..ad01b05f48 100644 --- a/res/text/route_222_west_house.json +++ b/res/text/route_222_west_house.json @@ -2,27 +2,27 @@ "key": 20107, "messages": [ { - "id": "pl_msg_00000518_00000", + "id": "Route222WestHouse_Text_PikachuCryPikachuu", "en_US": "PIKACHU: Pikachuu!" }, { - "id": "pl_msg_00000518_00001", + "id": "Route222WestHouse_Text_PikachuCryPikaah", "en_US": "PIKACHU: Pikaah!" }, { - "id": "pl_msg_00000518_00002", + "id": "Route222WestHouse_Text_PikachuCryPikaPika", "en_US": "PIKACHU: Pika pika?" }, { - "id": "pl_msg_00000518_00003", + "id": "Route222WestHouse_Text_PikachuCryPiPikachu", "en_US": "PIKACHU: Pi! Pikachu!" }, { - "id": "pl_msg_00000518_00004", + "id": "Route222WestHouse_Text_PikachuCryPiiKaahchu", "en_US": "PIKACHU: Pii! Kaahchu!" }, { - "id": "pl_msg_00000518_00005", + "id": "Route222WestHouse_Text_OnlyPikachu", "en_US": [ "Eehehe! I’m going for the Pokémon\n", "Championship with only PIKACHU!" diff --git a/res/text/sunyshore_city.json b/res/text/sunyshore_city.json index 37f96c1790..071421f271 100644 --- a/res/text/sunyshore_city.json +++ b/res/text/sunyshore_city.json @@ -2,7 +2,7 @@ "key": 18359, "messages": [ { - "id": "pl_msg_00000162_00000", + "id": "SunyshoreCity_Text_TheNamesFlint", "en_US": [ "Yo!\n", "Fellow Trainer!\r", @@ -16,7 +16,7 @@ ] }, { - "id": "pl_msg_00000162_00001", + "id": "SunyshoreCity_Text_GiveVolknerHotBattle", "en_US": [ "I just had this idea.\n", "Maybe you can pull it off.\r", @@ -37,7 +37,7 @@ ] }, { - "id": "pl_msg_00000162_00002", + "id": "SunyshoreCity_Text_VolknerNotBackYet", "en_US": [ "Flint: Yo! Hiya!\n", "He hasn’t come back yet.\r", @@ -49,7 +49,7 @@ ] }, { - "id": "pl_msg_00000162_00003", + "id": "SunyshoreCity_Text_VolknerFinallyCameBack", "en_US": [ "Flint: Yo! Hiya!\n", "He’s finally come back!\r", @@ -67,7 +67,7 @@ ] }, { - "id": "pl_msg_00000162_00004", + "id": "SunyshoreCity_Text_MyNameIsJasmine", "en_US": [ "...Er...um... M-my name is Jasmine,\n", "and I’m a Gym Leader.\r", @@ -81,18 +81,18 @@ ] }, { - "id": "pl_msg_00000162_00005", + "id": "SunyshoreCity_Text_ForcedToTurnBack", "en_US": [ "Oh, if you don’t have the Gym Badge,\n", "you’ll be forced to turn back." ] }, { - "id": "pl_msg_00000162_00006", + "id": "SunyshoreCity_Text_ThisIsntMuchBut", "en_US": "This isn’t much, but...\r" }, { - "id": "pl_msg_00000162_00007", + "id": "SunyshoreCity_Text_ThatHMContainsWaterfall", "en_US": [ "...That Hidden Machine...\n", "It contains Waterfall.\r", @@ -103,7 +103,7 @@ ] }, { - "id": "pl_msg_00000162_00008", + "id": "SunyshoreCity_Text_FeelAtHome", "en_US": [ "Jasmine: ...This city makes me feel\n", "at home somehow.\r", @@ -112,7 +112,7 @@ ] }, { - "id": "pl_msg_00000162_00009", + "id": "SunyshoreCity_Text_ICameToGetStronger", "en_US": [ "Jasmine: ...I came from very far away\n", "because I wanted to get stronger.\r", @@ -123,7 +123,7 @@ ] }, { - "id": "pl_msg_00000162_00010", + "id": "SunyshoreCity_Text_YouGotAllBadges", "en_US": [ "{STRVAR_1 3, 0, 0}: Hey!\n", "{STRVAR_1 3, 1, 0}!\r", @@ -136,7 +136,7 @@ ] }, { - "id": "pl_msg_00000162_00011", + "id": "SunyshoreCity_Text_YouWatchMe", "en_US": [ "Because I’m going to be the toughest\n", "Trainer ever! You watch me!\r", @@ -151,7 +151,7 @@ ] }, { - "id": "pl_msg_00000162_00012", + "id": "SunyshoreCity_Text_HurryToPokemonLeague", "en_US": [ "I’m not going to challenge you to a\n", "battle now.\r", @@ -168,7 +168,7 @@ ] }, { - "id": "pl_msg_00000162_00013", + "id": "SunyshoreCity_Text_HaveThisAsMyThanks", "en_US": [ "Jasmine: ...Was that your friend?\r", "Seeing how you two got along made me\n", @@ -186,22 +186,22 @@ ] }, { - "id": "pl_msg_00000162_00014", + "id": "SunyshoreCity_Text_Dummy14", "garbage": 38 }, { - "id": "pl_msg_00000162_00015", + "id": "SunyshoreCity_Text_ThatGiantRock", "en_US": [ "That giant rock...\n", "Isn’t it really a Pokémon?" ] }, { - "id": "pl_msg_00000162_00016", + "id": "SunyshoreCity_Text_Dummy16", "garbage": 47 }, { - "id": "pl_msg_00000162_00017", + "id": "SunyshoreCity_Text_GymUsesTooMuchElectricity", "en_US": [ "The Gym Leader uses too much\n", "electricity!\r", @@ -210,7 +210,7 @@ ] }, { - "id": "pl_msg_00000162_00018", + "id": "SunyshoreCity_Text_CityUsesALotOfElectricity", "en_US": [ "The city uses a lot of electricity,\n", "especially the lighthouse and the Gym.\r", @@ -221,7 +221,7 @@ ] }, { - "id": "pl_msg_00000162_00019", + "id": "SunyshoreCity_Text_MajorPortTown", "en_US": [ "This is a major port town.\n", "And...\r", @@ -230,7 +230,7 @@ ] }, { - "id": "pl_msg_00000162_00020", + "id": "SunyshoreCity_Text_PeopleAndPokemonAdapt", "en_US": [ "Whatever the environment, people\n", "and Pokémon adapt to live there.\r", @@ -238,14 +238,14 @@ ] }, { - "id": "pl_msg_00000162_00021", + "id": "SunyshoreCity_Text_MapSign", "en_US": [ "Sunyshore City\n", "Solar Powered!" ] }, { - "id": "pl_msg_00000162_00022", + "id": "SunyshoreCity_Text_SignPokemonGym", "en_US": [ "Sunyshore City Pokémon Gym\n", "Leader: Volkner\f", @@ -253,32 +253,32 @@ ] }, { - "id": "pl_msg_00000162_00023", + "id": "SunyshoreCity_Text_SignVistaLighthouse", "en_US": [ "Vista Lighthouse\n", "The Beacon That Lights Sinnoh" ] }, { - "id": "pl_msg_00000162_00024", + "id": "SunyshoreCity_Text_SignSunyshoreMarket", "en_US": [ "Sunyshore Market\n", "A Selection of the World’s Seals" ] }, { - "id": "pl_msg_00000162_00025", + "id": "SunyshoreCity_Text_SignJuliasHouse", "en_US": [ "Julia’s House\n", "Delightful Ribbons for Pokémon" ] }, { - "id": "pl_msg_00000162_00026", + "id": "SunyshoreCity_Text_SignBlank", "en_US": "It’s a blank sign painted white." }, { - "id": "pl_msg_00000162_00027", + "id": "SunyshoreCity_Text_SignPokemonRock", "en_US": [ "Pokémon Rock\n", "Sunyshore’s Heritage Site" diff --git a/res/text/sunyshore_city_east_house.json b/res/text/sunyshore_city_east_house.json index 6d6cda22d3..bff2f39db6 100644 --- a/res/text/sunyshore_city_east_house.json +++ b/res/text/sunyshore_city_east_house.json @@ -2,7 +2,7 @@ "key": 54323, "messages": [ { - "id": "pl_msg_00000173_00000", + "id": "SunyshoreCityEastHouse_Text_MayISeeNatures", "en_US": [ "That glaringly bright and cool thing\n", "you have!\r", @@ -18,7 +18,7 @@ ] }, { - "id": "pl_msg_00000173_00001", + "id": "SunyshoreCityEastHouse_Text_LikeToSeeSeriousNature", "en_US": [ "What am I in the mood to see now...\r", "I’d like to see a Pokémon with\n", @@ -26,7 +26,7 @@ ] }, { - "id": "pl_msg_00000173_00002", + "id": "SunyshoreCityEastHouse_Text_LikeToSeeNaiveNature", "en_US": [ "What am I in the mood to see now...\r", "I’d like to see a Pokémon with\n", @@ -34,7 +34,7 @@ ] }, { - "id": "pl_msg_00000173_00003", + "id": "SunyshoreCityEastHouse_Text_LikeToSeeQuirkyNature", "en_US": [ "What am I in the mood to see now...\r", "I’d like to see a Pokémon with\n", @@ -42,7 +42,7 @@ ] }, { - "id": "pl_msg_00000173_00004", + "id": "SunyshoreCityEastHouse_Text_IllGiveCalendarApp", "en_US": [ "Yep! Your {STRVAR_1 0, 0, 0} has\n", "a Serious nature all right!\r", @@ -51,7 +51,7 @@ ] }, { - "id": "pl_msg_00000173_00005", + "id": "SunyshoreCityEastHouse_Text_IllGiveDotArtistApp", "en_US": [ "Yep! Your {STRVAR_1 0, 0, 0} has\n", "a Naive nature all right!\r", @@ -60,7 +60,7 @@ ] }, { - "id": "pl_msg_00000173_00006", + "id": "SunyshoreCityEastHouse_Text_IllGiveRouletteApp", "en_US": [ "Yep! Your {STRVAR_1 0, 0, 0} has\n", "a Quirky nature all right!\r", @@ -69,7 +69,7 @@ ] }, { - "id": "pl_msg_00000173_00007", + "id": "SunyshoreCityEastHouse_Text_AppsMayOutnumberPokemon", "en_US": [ "Someday, Pokétch apps may outnumber\n", "all the species of Pokémon." diff --git a/res/text/sunyshore_city_northeast_house.json b/res/text/sunyshore_city_northeast_house.json index 1bab6264c7..e565a4a093 100644 --- a/res/text/sunyshore_city_northeast_house.json +++ b/res/text/sunyshore_city_northeast_house.json @@ -2,7 +2,7 @@ "key": 54299, "messages": [ { - "id": "pl_msg_00000168_00000", + "id": "SunyshoreCityNortheastHouse_Text_TellMeStories", "en_US": [ "Julia: Oh, hello.\n", "You’re quite the nifty Trainer.\r", @@ -17,14 +17,14 @@ ] }, { - "id": "pl_msg_00000168_00001", + "id": "SunyshoreCityNortheastHouse_Text_PleaseVisitTomorrow", "en_US": [ "Starting tomorrow, please visit and\n", "tell me stories about your travels." ] }, { - "id": "pl_msg_00000168_00002", + "id": "SunyshoreCityNortheastHouse_Text_AskMondayStory", "en_US": [ "Julia: Today is Monday!\r", "It’s time to get going on a brand-new\n", @@ -36,7 +36,7 @@ ] }, { - "id": "pl_msg_00000168_00003", + "id": "SunyshoreCityNortheastHouse_Text_TellMondayStory", "en_US": [ "{STRVAR_1 28, 0, 0} splashed with water...\n", "...\r", @@ -45,21 +45,21 @@ ] }, { - "id": "pl_msg_00000168_00004", + "id": "SunyshoreCityNortheastHouse_Text_GiveThisToPokemon", "en_US": [ "Thank you!\n", "Please give this to your Pokémon.\r" ] }, { - "id": "pl_msg_00000168_00005", + "id": "SunyshoreCityNortheastHouse_Text_PlayerReceivedRibbon", "en_US": [ "{STRVAR_1 3, 2, 0} received\n", "the {STRVAR_1 39, 3, 0}.\r" ] }, { - "id": "pl_msg_00000168_00006", + "id": "SunyshoreCityNortheastHouse_Text_PlayerPutRibbonOnPokemon", "en_US": [ "{STRVAR_1 3, 2, 0} put\n", "the {STRVAR_1 39, 3, 0}\f", @@ -67,14 +67,14 @@ ] }, { - "id": "pl_msg_00000168_00007", + "id": "SunyshoreCityNortheastHouse_Text_TellAnotherStoryTomorrow", "en_US": [ "Julia: Please tell me another story\n", "tomorrow." ] }, { - "id": "pl_msg_00000168_00008", + "id": "SunyshoreCityNortheastHouse_Text_GaveRibbonBefore", "en_US": [ "Julia: Hello!\r", "Oh, this is the {STRVAR_1 0, 1, 0} I gave\n", @@ -84,14 +84,14 @@ ] }, { - "id": "pl_msg_00000168_00009", + "id": "SunyshoreCityNortheastHouse_Text_CouldntThinkUpAnything", "en_US": [ "Julia: Oh...\n", "You couldn’t think up anything?" ] }, { - "id": "pl_msg_00000168_00010", + "id": "SunyshoreCityNortheastHouse_Text_AskTuesdayStory", "en_US": [ "Julia: Today is Tuesday!\r", "The first date I went on with my\n", @@ -105,7 +105,7 @@ ] }, { - "id": "pl_msg_00000168_00011", + "id": "SunyshoreCityNortheastHouse_Text_TellTuesdayStory", "en_US": [ "One mean {STRVAR_1 28, 0, 0} that bursts\n", "out from a closet?\f", @@ -115,7 +115,7 @@ ] }, { - "id": "pl_msg_00000168_00012", + "id": "SunyshoreCityNortheastHouse_Text_AskWednesdayStory", "en_US": [ "Julia: Sigh...\n", "I gained a little weight...\r", @@ -127,7 +127,7 @@ ] }, { - "id": "pl_msg_00000168_00013", + "id": "SunyshoreCityNortheastHouse_Text_TellWednesdayStory", "en_US": [ "A tearful {STRVAR_1 28, 0, 0}...\n", "...\r", @@ -136,7 +136,7 @@ ] }, { - "id": "pl_msg_00000168_00014", + "id": "SunyshoreCityNortheastHouse_Text_AskThursdayStory", "en_US": [ "Julia: It’s Thursday already?\n", "I lost track of time!\r", @@ -148,7 +148,7 @@ ] }, { - "id": "pl_msg_00000168_00015", + "id": "SunyshoreCityNortheastHouse_Text_TellThursdayStory", "en_US": [ "The {STRVAR_1 28, 0, 0} had shoes\n", "on the wrong feet?\r", @@ -159,7 +159,7 @@ ] }, { - "id": "pl_msg_00000168_00016", + "id": "SunyshoreCityNortheastHouse_Text_AskFridayStory", "en_US": [ "Julia: Today is Friday!\r", "My meager cooking repertoire is\n", @@ -171,7 +171,7 @@ ] }, { - "id": "pl_msg_00000168_00017", + "id": "SunyshoreCityNortheastHouse_Text_TellFridayStory", "en_US": [ "You went {STRVAR_1 28, 0, 0}\n", "shopping and paid $777 including tax?\r", @@ -181,7 +181,7 @@ ] }, { - "id": "pl_msg_00000168_00018", + "id": "SunyshoreCityNortheastHouse_Text_AskSaturdayStory", "en_US": [ "Julia: Yawn...\n", "Today’s Saturday...\f", @@ -191,7 +191,7 @@ ] }, { - "id": "pl_msg_00000168_00019", + "id": "SunyshoreCityNortheastHouse_Text_TellSaturdayStory", "en_US": [ "{STRVAR_1 28, 0, 0} snuggle pillow...\n", "...\r", @@ -201,7 +201,7 @@ ] }, { - "id": "pl_msg_00000168_00020", + "id": "SunyshoreCityNortheastHouse_Text_AskSundayStory", "en_US": [ "Julia: Oh, hello! You’re on your\n", "adventure even though it’s Sunday!\r", @@ -216,7 +216,7 @@ ] }, { - "id": "pl_msg_00000168_00021", + "id": "SunyshoreCityNortheastHouse_Text_TellSundayStory", "en_US": [ "You love {STRVAR_1 28, 0, 0}?\n", "...\r", diff --git a/res/text/sunyshore_city_northwest_house.json b/res/text/sunyshore_city_northwest_house.json index a34d254e71..60c7dc6ad1 100644 --- a/res/text/sunyshore_city_northwest_house.json +++ b/res/text/sunyshore_city_northwest_house.json @@ -2,7 +2,7 @@ "key": 54315, "messages": [ { - "id": "pl_msg_00000170_00000", + "id": "SunyshoreCityNorthwestHouse_Text_GalacticUpToNoGood", "en_US": [ "I’d heard that Team Galactic was up to\n", "no good.\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000170_00001", + "id": "SunyshoreCityNorthwestHouse_Text_CyrusLivedHere", "en_US": [ "A long time ago, there was a boy\n", "named Cyrus who lived here.\r", diff --git a/res/text/sunyshore_city_pokecenter_1f.json b/res/text/sunyshore_city_pokecenter_1f.json index 5ad1ac54ff..b31008e84f 100644 --- a/res/text/sunyshore_city_pokecenter_1f.json +++ b/res/text/sunyshore_city_pokecenter_1f.json @@ -2,7 +2,7 @@ "key": 10899, "messages": [ { - "id": "pl_msg_00000166_00000", + "id": "SunyshoreCityPokecenter1F_Text_DreamedBecomingGymLeader", "en_US": [ "I once dreamed of becoming a Gym\n", "Leader...\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000166_00001", + "id": "SunyshoreCityPokecenter1F_Text_ReallyCoolSevenBadges", "en_US": [ "Wow, you’re really cool!\n", "You have seven Gym Badges!\r", @@ -22,7 +22,7 @@ ] }, { - "id": "pl_msg_00000166_00002", + "id": "SunyshoreCityPokecenter1F_Text_AwesomelyCoolEightBadges", "en_US": [ "Wow! You’re awesomely cool!\n", "You have all eight Gym Badges!\r", @@ -31,7 +31,7 @@ ] }, { - "id": "pl_msg_00000166_00003", + "id": "SunyshoreCityPokecenter1F_Text_RoadsOutOfSolarPanels", "en_US": [ "To make up for the lack of space, the\n", "city built roads out of solar panels.\r", @@ -42,28 +42,28 @@ ] }, { - "id": "pl_msg_00000166_00004", + "id": "SunyshoreCityPokecenter1F_Text_DoWeBattle", "en_US": [ "Do you want to hear me play my guitar?\n", "Or do we battle?" ] }, { - "id": "pl_msg_00000166_00005", + "id": "SunyshoreCityPokecenter1F_Text_RockInYourVeins", "en_US": [ "Your spirit’s vibes...\n", "You’ve got rock in your veins!\r" ] }, { - "id": "pl_msg_00000166_00006", + "id": "SunyshoreCityPokecenter1F_Text_MyGuitarLiesBroken", "en_US": [ "My guitar...\n", "It lies broken and weeping..." ] }, { - "id": "pl_msg_00000166_00007", + "id": "SunyshoreCityPokecenter1F_Text_PerfectWorld", "en_US": [ "For Trainers, Pokémon!\r", "For my girl, sweet kisses!\r", diff --git a/res/text/sunyshore_city_west_house.json b/res/text/sunyshore_city_west_house.json index 5a206c5b15..bf645518d3 100644 --- a/res/text/sunyshore_city_west_house.json +++ b/res/text/sunyshore_city_west_house.json @@ -2,7 +2,7 @@ "key": 21522, "messages": [ { - "id": "pl_msg_00000169_00000", + "id": "SunyshoreCityWestHouse_Text_GoneUndergroundLately", "en_US": [ "Have you gone underground lately?\r", "Depending on where you go down, you\n", @@ -12,7 +12,7 @@ ] }, { - "id": "pl_msg_00000169_00001", + "id": "SunyshoreCityWestHouse_Text_SpheresUndergroundLikeGems", "en_US": [ "The Spheres found in the underground\n", "tunnels are like gems.\r", @@ -21,7 +21,7 @@ ] }, { - "id": "pl_msg_00000169_00002", + "id": "SunyshoreCityWestHouse_Text_BuriedSpheresGrow", "en_US": [ "If you bury Spheres, they grow\n", "a little every day.\r", @@ -31,7 +31,7 @@ ] }, { - "id": "pl_msg_00000169_00003", + "id": "SunyshoreCityWestHouse_Text_GetFlagsFromFriends", "en_US": [ "Get Flags from your friends to make\n", "your Secret Base better.\r", @@ -41,14 +41,14 @@ ] }, { - "id": "pl_msg_00000169_00004", + "id": "SunyshoreCityWestHouse_Text_GoUndergroundHaveFun", "en_US": [ "Go underground and have fun down\n", "there. Make it an adventure!" ] }, { - "id": "pl_msg_00000169_00005", + "id": "SunyshoreCityWestHouse_Text_DefusedByTouch", "en_US": [ "Some underground Traps need to be\n", "defused by touch or by using the\f", @@ -56,7 +56,7 @@ ] }, { - "id": "pl_msg_00000169_00006", + "id": "SunyshoreCityWestHouse_Text_UndergroundManByronRelated", "en_US": [ "The Underground Man in Eterna and\n", "Byron of Canalave are related.\r", diff --git a/res/text/vista_lighthouse.json b/res/text/vista_lighthouse.json index 1868a78cef..38a862924b 100644 --- a/res/text/vista_lighthouse.json +++ b/res/text/vista_lighthouse.json @@ -2,7 +2,7 @@ "key": 54347, "messages": [ { - "id": "pl_msg_00000174_00000", + "id": "VistaLighthouse_Text_YoureTheLatestChallenger", "en_US": [ "...\n", "...\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000174_00001", + "id": "VistaLighthouse_Text_IWantThrillAgain", "en_US": [ "All right, I’ve decided!\r", "If I find you to be weak, I’m going to\n", @@ -23,7 +23,7 @@ ] }, { - "id": "pl_msg_00000174_00002", + "id": "VistaLighthouse_Text_UnleashArsenalAtYou", "en_US": [ "As the toughest Gym Leader in Sinnoh,\n", "I’m going to unleash everything in\f", @@ -31,21 +31,21 @@ ] }, { - "id": "pl_msg_00000174_00003", + "id": "VistaLighthouse_Text_PlayerLookedThroughBinoculars", "en_US": [ "{STRVAR_1 3, 0, 0} took a look through\n", "the binoculars.\r" ] }, { - "id": "pl_msg_00000174_00004", + "id": "VistaLighthouse_Text_LighthouseRepresentsSafety", "en_US": [ "The Vista Lighthouse represents\n", "safety and protection to us Sailors." ] }, { - "id": "pl_msg_00000174_00005", + "id": "VistaLighthouse_Text_GoingFarAwayOneDay", "en_US": [ "I love how far away you can see with\n", "the binoculars.\r", @@ -54,35 +54,35 @@ ] }, { - "id": "pl_msg_00000174_00006", + "id": "VistaLighthouse_Text_Dummy6", "garbage": 69 }, { - "id": "pl_msg_00000174_00007", + "id": "VistaLighthouse_Text_Dummy7", "garbage": 17 }, { - "id": "pl_msg_00000174_00008", + "id": "VistaLighthouse_Text_Dummy8", "garbage": 32 }, { - "id": "pl_msg_00000174_00009", + "id": "VistaLighthouse_Text_Dummy9", "garbage": 10 }, { - "id": "pl_msg_00000174_00010", + "id": "VistaLighthouse_Text_Dummy10", "garbage": 90 }, { - "id": "pl_msg_00000174_00011", + "id": "VistaLighthouse_Text_Dummy11", "garbage": 89 }, { - "id": "pl_msg_00000174_00012", + "id": "VistaLighthouse_Text_Dummy12", "garbage": 45 }, { - "id": "pl_msg_00000174_00013", + "id": "VistaLighthouse_Text_Dummy13", "garbage": 27 } ] diff --git a/src/binoculars_vista_lighthouse.c b/src/binoculars_vista_lighthouse.c new file mode 100644 index 0000000000..d420e4e58f --- /dev/null +++ b/src/binoculars_vista_lighthouse.c @@ -0,0 +1,152 @@ +#include "binoculars_vista_lighthouse.h" + +#include +#include + +#include "struct_decls/struct_02061AB4_decl.h" + +#include "field/field_system.h" +#include "field/field_system_sub2_t.h" + +#include "camera.h" +#include "field_map_change.h" +#include "field_task.h" +#include "field_transition.h" +#include "heap.h" +#include "inlines.h" +#include "location.h" +#include "map_object.h" +#include "player_avatar.h" +#include "sound_playback.h" +#include "system.h" +#include "system_flags.h" +#include "unk_02056B30.h" +#include "unk_02070428.h" +#include "vars_flags.h" + +typedef struct VistaLighthouseBinoculars { + FieldSystem *fieldSystem; + u16 xPos; + u16 zPos; + u8 state; + u8 padding[3]; +} VistaLighthouseBinoculars; + +static BOOL Task_UseVistaLighthouseBinoculars(FieldTask *taskMan); +static void VistaLighthouseBinoculars_SetPlayerHidden(PlayerAvatar *playerAvatar, BOOL hidden); +static void VistaLighthouseBinoculars_SetCamera(FieldSystem *fieldSystem); + +void UseVistaLighthouseBinoculars(FieldSystem *fieldSystem) +{ + VistaLighthouseBinoculars *binoculars = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(VistaLighthouseBinoculars)); + + memset(binoculars, 0, sizeof(VistaLighthouseBinoculars)); + FieldTask_InitCall(fieldSystem->task, Task_UseVistaLighthouseBinoculars, binoculars); +} + +static BOOL Task_UseVistaLighthouseBinoculars(FieldTask *taskMan) +{ + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); + VistaLighthouseBinoculars *binoculars = FieldTask_GetEnv(taskMan); + VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); + + switch (binoculars->state) { + case 0: + binoculars->xPos = Player_GetXPos(fieldSystem->playerAvatar); + binoculars->zPos = Player_GetZPos(fieldSystem->playerAvatar); + sub_02070428(fieldSystem, 1); + FieldTransition_FadeOut(taskMan); + binoculars->state++; + break; + case 1: + FieldTransition_FinishMap(taskMan); + binoculars->state++; + break; + case 2: + SystemFlag_SetPoketchHidden(varsFlags); + + Location locationPokemonLeague; + + Location_Set(&locationPokemonLeague, MAP_HEADER_POKEMON_LEAGUE, -1, 847, 561, DIR_SOUTH); + FieldTask_ChangeMapByLocation(taskMan, &locationPokemonLeague); + binoculars->state++; + break; + case 3: + FieldTransition_StartMap(taskMan); + binoculars->state++; + break; + case 4: + VistaLighthouseBinoculars_SetPlayerHidden(fieldSystem->playerAvatar, TRUE); + VistaLighthouseBinoculars_SetCamera(fieldSystem); + sub_02056B30(taskMan, 3, 17, 0xffff, 0x0, 6, 1, HEAP_ID_FIELD2); + Sound_PlayEffect(SEQ_SE_DP_KASYA); + binoculars->state++; + break; + case 5: + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + binoculars->state++; + } + break; + case 6: + sub_02056B30(taskMan, 3, 16, 0xffff, 0x0, 6, 1, HEAP_ID_FIELD2); + Sound_PlayEffect(SEQ_SE_DP_KASYA); + binoculars->state++; + break; + case 7: + FieldTransition_FinishMap(taskMan); + binoculars->state++; + break; + case 8: + SystemFlag_ClearPoketchHidden(varsFlags); + + Location locationVistaLighthouse; + + Location_Set(&locationVistaLighthouse, MAP_HEADER_VISTA_LIGHTHOUSE, -1, binoculars->xPos, binoculars->zPos, DIR_NORTH); + FieldTask_ChangeMapByLocation(taskMan, &locationVistaLighthouse); + binoculars->state++; + break; + case 9: + FieldTransition_StartMap(taskMan); + binoculars->state++; + break; + case 10: + VistaLighthouseBinoculars_SetPlayerHidden(fieldSystem->playerAvatar, FALSE); + FieldTransition_FadeIn(taskMan); + binoculars->state++; + break; + case 11: + Heap_Free(binoculars); + sub_02070428(fieldSystem, 0); + return TRUE; + } + + return FALSE; +} + +static void VistaLighthouseBinoculars_SetPlayerHidden(PlayerAvatar *playerAvatar, BOOL hidden) +{ + MapObject *mapObj = Player_MapObject(playerAvatar); + MapObject_SetHidden(mapObj, hidden); +} + +static void VistaLighthouseBinoculars_SetCamera(FieldSystem *fieldSystem) +{ + VecFx32 target; + CameraAngle angle; + + Camera_SetFOV(FX32_CONST(0.547f), fieldSystem->camera); + Camera_SetDistance(FX32_CONST(248.1074f), fieldSystem->camera); + + target.x = FX32_CONST(13573.1399); + target.y = FX32_CONST(350.8571f); + target.z = FX32_CONST(9178.2534); + + Camera_SetTarget(&target, fieldSystem->camera); + + angle.x = FX32_CONST(0.5086f); + angle.y = FX32_CONST(0.3203125f); + angle.z = FX32_CONST(0); + + Camera_SetAngleAroundTarget(&angle, fieldSystem->camera); + Camera_SetClipping(12 * FX32_ONE, 1564 * FX32_ONE, fieldSystem->camera); +} diff --git a/src/meson.build b/src/meson.build index f40a69c51a..3c965f9d26 100644 --- a/src/meson.build +++ b/src/meson.build @@ -204,7 +204,7 @@ pokeplatinum_c = files( 'unk_0205001C.c', 'unk_0205003C.c', 'unk_02050548.c', - 'unk_02050568.c', + 'binoculars_vista_lighthouse.c', 'vars_flags.c', 'field_task.c', 'encounter.c', diff --git a/src/scrcmd.c b/src/scrcmd.c index ffd6c41054..becf4efd67 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -94,6 +94,7 @@ #include "appearance.h" #include "bag.h" #include "bg_window.h" +#include "binoculars_vista_lighthouse.h" #include "camera.h" #include "clear_game.h" #include "comm_player_manager.h" @@ -200,7 +201,6 @@ #include "unk_0204F04C.h" #include "unk_0204FAB4.h" #include "unk_0205003C.h" -#include "unk_02050568.h" #include "unk_020528D0.h" #include "unk_020559DC.h" #include "unk_0205749C.h" @@ -651,7 +651,7 @@ static BOOL ScrCmd_BufferContestBackdropName(ScriptContext *ctx); static BOOL ScrCmd_CheckBonusRoundStreak(ScriptContext *ctx); static BOOL ScrCmd_GetDailyRandomLevel(ScriptContext *ctx); static BOOL ScrCmd_RemoveAccessory(ScriptContext *ctx); -static BOOL ScrCmd_27A(ScriptContext *ctx); +static BOOL ScrCmd_UseVistaLighthouseBinoculars(ScriptContext *ctx); static BOOL ScrCmd_InitDailyRandomLevel(ScriptContext *ctx); static BOOL ScrCmd_27D(ScriptContext *ctx); static BOOL ScrCmd_CheckIsDepartmentStoreRegular(ScriptContext *ctx); @@ -5997,11 +5997,11 @@ static BOOL ScrCmd_RemoveAccessory(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_27A(ScriptContext *ctx) +static BOOL ScrCmd_UseVistaLighthouseBinoculars(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; - sub_02050568(fieldSystem); + UseVistaLighthouseBinoculars(fieldSystem); return TRUE; } diff --git a/src/unk_02050568.c b/src/unk_02050568.c deleted file mode 100644 index fcedcf872d..0000000000 --- a/src/unk_02050568.c +++ /dev/null @@ -1,157 +0,0 @@ - -#include "unk_02050568.h" - -#include -#include - -#include "struct_decls/struct_02061AB4_decl.h" - -#include "field/field_system.h" -#include "field/field_system_sub2_t.h" - -#include "camera.h" -#include "field_map_change.h" -#include "field_task.h" -#include "field_transition.h" -#include "heap.h" -#include "inlines.h" -#include "location.h" -#include "map_object.h" -#include "player_avatar.h" -#include "sound_playback.h" -#include "system.h" -#include "system_flags.h" -#include "unk_02056B30.h" -#include "unk_02070428.h" -#include "vars_flags.h" - -typedef struct { - FieldSystem *fieldSystem; - u16 unk_04; - u16 unk_06; - u8 unk_08; - u8 unk_09[3]; -} UnkStruct_02050568; - -static BOOL sub_020505A0(FieldTask *taskMan); -static void sub_0205074C(PlayerAvatar *playerAvatar, BOOL param1); -static void sub_0205075C(FieldSystem *fieldSystem); - -void sub_02050568(FieldSystem *fieldSystem) -{ - UnkStruct_02050568 *v0 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_02050568)); - - memset(v0, 0, sizeof(UnkStruct_02050568)); - FieldTask_InitCall(fieldSystem->task, sub_020505A0, v0); -} - -static BOOL sub_020505A0(FieldTask *taskMan) -{ - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - UnkStruct_02050568 *v1 = FieldTask_GetEnv(taskMan); - VarsFlags *v2 = SaveData_GetVarsFlags(fieldSystem->saveData); - - switch (v1->unk_08) { - case 0: - v1->unk_04 = Player_GetXPos(fieldSystem->playerAvatar); - v1->unk_06 = Player_GetZPos(fieldSystem->playerAvatar); - sub_02070428(fieldSystem, 1); - FieldTransition_FadeOut(taskMan); - v1->unk_08++; - break; - case 1: - FieldTransition_FinishMap(taskMan); - v1->unk_08++; - break; - case 2: - SystemFlag_SetPoketchHidden(v2); - - { - Location v3; - - Location_Set(&v3, 172, -1, 847, 561, 1); - FieldTask_ChangeMapByLocation(taskMan, &v3); - } - v1->unk_08++; - break; - case 3: - FieldTransition_StartMap(taskMan); - v1->unk_08++; - break; - case 4: - sub_0205074C(fieldSystem->playerAvatar, 1); - sub_0205075C(fieldSystem); - sub_02056B30(taskMan, 3, 17, 0xffff, 0x0, 6, 1, HEAP_ID_FIELD2); - Sound_PlayEffect(SEQ_SE_DP_KASYA); - v1->unk_08++; - break; - case 5: - if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - v1->unk_08++; - } - break; - case 6: - sub_02056B30(taskMan, 3, 16, 0xffff, 0x0, 6, 1, HEAP_ID_FIELD2); - Sound_PlayEffect(SEQ_SE_DP_KASYA); - v1->unk_08++; - break; - case 7: - FieldTransition_FinishMap(taskMan); - v1->unk_08++; - break; - case 8: - SystemFlag_ClearPoketchHidden(v2); - - { - Location v4; - - Location_Set(&v4, 164, -1, v1->unk_04, v1->unk_06, 0); - FieldTask_ChangeMapByLocation(taskMan, &v4); - } - v1->unk_08++; - break; - case 9: - FieldTransition_StartMap(taskMan); - v1->unk_08++; - break; - case 10: - sub_0205074C(fieldSystem->playerAvatar, 0); - FieldTransition_FadeIn(taskMan); - v1->unk_08++; - break; - case 11: - Heap_Free(v1); - sub_02070428(fieldSystem, 0); - return 1; - } - - return 0; -} - -static void sub_0205074C(PlayerAvatar *playerAvatar, BOOL param1) -{ - MapObject *mapObj = Player_MapObject(playerAvatar); - MapObject_SetHidden(mapObj, param1); -} - -static void sub_0205075C(FieldSystem *fieldSystem) -{ - VecFx32 v0; - CameraAngle v1; - - Camera_SetFOV(0x8c1, fieldSystem->camera); - Camera_SetDistance(0xf81b8, fieldSystem->camera); - - v0.x = 0x350523d; - v0.y = 0x15edb7; - v0.z = 0x23da40e; - - Camera_SetTarget(&v0, fieldSystem->camera); - - v1.x = 0x823; - v1.y = 0x520; - v1.z = 0; - - Camera_SetAngleAroundTarget(&v1, fieldSystem->camera); - Camera_SetClipping(12 * FX32_ONE, 1564 * FX32_ONE, fieldSystem->camera); -}