diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 52a40d4254..9c6463f3c8 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -171,7 +171,7 @@ FLAG_TALKED_TO_LAKE_ACUITY_LOW_WATER_RIVAL FLAG_UNK_0x00AA FLAG_LOCAL_DEX_DIPLOMA_RECEIVED FLAG_NATIONAL_DEX_DIPLOMA_RECEIVED -FLAG_UNK_0x00AD +FLAG_DEFEATED_GALACTIC_HQ_CONTROL_ROOM_SATURN FLAG_UNK_0x00AE FLAG_POKEMON_LEAGUE_DOOR_GUARD_MOVED_AWAY FLAG_DEFEATED_AARON @@ -444,7 +444,7 @@ FLAG_HIDE_LAKE_ACUITY_JUPITER FLAG_HIDE_TEAM_GALACTIC_ETERNA_BUILDING_1F_LOOKER FLAG_HIDE_LAKE_VALOR_GALACTIC FLAG_HIDE_CELESTIC_TOWN_CYNTHIA -FLAG_UNK_0x01BE +FLAG_HIDE_GALACTIC_HQ_4F_CYRUS FLAG_HIDE_VEILSTONE_GALACTIC_GRUNTS FLAG_HIDE_LAKE_VERITY_TEAM_GALACTIC FLAG_HIDE_LAKE_VALOR_DRAINED_MAGIKARP @@ -546,10 +546,10 @@ FLAG_HIDE_HEARTHOME_HIKER_3 FLAG_HIDE_ETERNA_CITY_GYM_GARDENIA FLAG_HIDE_ROUTE_206_CYCLING_ROAD_NORTH_GATE_SCIENTIST_M FLAG_HIDE_VEILSTONE_CITY_GRUNT_M_STORAGE_KEY -FLAG_UNK_0x0224 -FLAG_UNK_0x0225 -FLAG_UNK_0x0226 -FLAG_UNK_0x0227 +FLAG_HIDE_GALACTIC_HQ_1F_DOOR +FLAG_HIDE_GALACTIC_HQ_3F_DOOR +FLAG_HIDE_GALACTIC_HQ_4F_DOOR +FLAG_HIDE_GALACTIC_HQ_B2F_DOOR FLAG_HIDE_VEILSTONE_CITY_GALACTIC_WAREHOUSE_GALACTIC_HQ_DOOR FLAG_HIDE_CELESTIC_TOWN_CAVE_ELDER FLAG_HIDE_SANDGEM_TOWN_LAB_PROF_OAK @@ -564,8 +564,8 @@ FLAG_UNK_0x0232 FLAG_UNK_0x0233 FLAG_HIDE_SNOWPOINT_CITY_POKECENTER_1F_MAYLENE FLAG_HIDE_MT_CORONET_2F_CAVE_PAINTING -FLAG_UNK_0x0236 -FLAG_UNK_0x0237 +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_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_CYNTHIA @@ -593,13 +593,13 @@ FLAG_HIDE_FULLMOON_ISLAND_FOREST_CRESSELIA FLAG_HIDE_TURNBACK_CAVE_GIRATINA_ROOM_GIRATINA FLAG_HIDE_FLOWER_PARADISE_SHAYMIN FLAG_UNK_0x0252 -FLAG_UNK_0x0253 -FLAG_UNK_0x0254 +FLAG_HIDE_GALACTIC_HQ_HALL_CYRUS +FLAG_HIDE_GALACTIC_HQ_HALL_LOOKER FLAG_UNK_0x0255 FLAG_UNK_0x0256 FLAG_HIDE_POKEMON_MANSION_FIVE_MAID_KNOCKOUT_MAID FLAG_HIDE_POKEMON_MANSION_FIVE_MAID_KNOCKOUT_BOSS -FLAG_UNK_0x0259 +FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS FLAG_UNK_0x025A FLAG_HIDE_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE_SAILOR_ELDRITCH FLAG_UNK_0x025C @@ -656,7 +656,7 @@ FLAG_UNK_0x028E FLAG_HIDE_MT_CORONET_GALACTIC_GRUNTS FLAG_HIDE_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM_WORKER FLAG_HIDE_JUBILIFE_TV_3F_GROUP_RANKING_ROOM_WORKER -FLAG_UNK_0x0292 +FLAG_HIDE_GALACTIC_HQ_1F_SATURN FLAG_HIDE_LAKE_ACUITY_LOW_WATER_RIVAL FLAG_UNK_0x0294 FLAG_HIDE_MT_CORONET_1F_NORTH_ROOM_1_GRUNT_F @@ -668,7 +668,7 @@ FLAG_HIDE_MT_CORONET_1F_NORTH_ROOM_1_GRUNTS_M FLAG_HIDE_CELESTIC_TOWN_CAVE_CYRUS FLAG_HIDE_HEARTHOME_GYM_BOLLARDS FLAG_HIDE_PASTORIA_CITY_CROAGUNK -FLAG_UNK_0x029E +FLAG_HIDE_GALACTIC_HQ_CONTROL_ROOM_CHARON FLAG_HIDE_MT_CORONET_2F_LOOKER FLAG_HIDE_SENDOFF_SPRING_CYNTHIA FLAG_HIDE_AMITY_SQUARE_FOLLOWER_MON @@ -4241,7 +4241,7 @@ VAR_HALLOWED_TOWER_STATE VAR_UNK_0x408B VAR_ROUTE_207_COUNTERPART_TRIGGER_STATE VAR_UNK_0x408D -VAR_UNK_0x408E +VAR_GALACTIC_HQ_HALL_STATE VAR_UNK_0x408F VAR_UNK_0x4090 VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE @@ -4313,7 +4313,7 @@ VAR_UNK_0x40D2 VAR_LAKE_ACUITY_STATE VAR_UNK_0x40D4 VAR_UNK_0x40D5 -VAR_UNK_0x40D6 +VAR_GALACTIC_HQ_4F_STATE VAR_PASTORIA_CITY_OBSERVATORY_GATE_1F_STATE VAR_UNK_0x40D8 VAR_UNK_0x40D9 @@ -4368,7 +4368,7 @@ VAR_UNK_0x4109 VAR_ACCESSORY_STARTER_MASK VAR_TURNBACK_CAVE_PILLARS_SEEN VAR_TURNBACK_CAVE_ROOMS_VISITED -VAR_UNK_0x410D +FLAG_GALACTIC_HQ_CONTROL_ROOM_STATE VAR_UNK_0x410E VAR_PLAYER_HOUSE_POSTGAME_STATE VAR_OLD_CHATEAU_DINING_AREA_OLD_MAN_STATE diff --git a/res/field/events/events_galactic_hq_1f.json b/res/field/events/events_galactic_hq_1f.json index 8f9a49d16c..2a90fac607 100644 --- a/res/field/events/events_galactic_hq_1f.json +++ b/res/field/events/events_galactic_hq_1f.json @@ -19,7 +19,7 @@ ], "object_events": [ { - "id": "GALACTIC_HQ_1F_GRUNT_F_0", + "id": "LOCALID_GRUNT_F_1", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -34,7 +34,7 @@ "y": 0 }, { - "id": "GALACTIC_HQ_1F_SCIENTIST_M_1", + "id": "LOCALID_SCIENTIST_M_1", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -64,11 +64,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_1F_GALACTIC_GRUNT", + "id": "LOCALID_GALACTIC_GRUNT", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_1F", "initial_dir": 1, "data": [ @@ -81,11 +81,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_1F_SCIENTIST_FREDRICK", + "id": "LOCALID_SCIENTIST_FREDRICK", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_SCIENTIST_FREDRICK", "initial_dir": 3, "data": [ @@ -98,11 +98,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_1F_GALACTIC_HQ_DOOR_5", + "id": "LOCALID_GALACTIC_HQ_DOOR_WEST", "graphics_id": "OBJ_EVENT_GFX_GALACTIC_HQ_DOOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0224", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_1F_DOOR", "script": 6, "initial_dir": 1, "data": [], @@ -113,11 +113,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_1F_GALACTIC_HQ_DOOR_6", + "id": "LOCALID_GALACTIC_HQ_DOOR_EAST", "graphics_id": "OBJ_EVENT_GFX_GALACTIC_HQ_DOOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0224", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_1F_DOOR", "script": 6, "initial_dir": 1, "data": [], @@ -128,7 +128,7 @@ "y": 0 }, { - "id": "GALACTIC_HQ_1F_GRUNT_F_7", + "id": "LOCALID_GRUNT_F_2", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -143,7 +143,7 @@ "y": 0 }, { - "id": "GALACTIC_HQ_1F_GRUNT_M_8", + "id": "LOCALID_GRUNT_M", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -158,11 +158,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_1F_SATURN_9", + "id": "LOCALID_SATURN", "graphics_id": "OBJ_EVENT_GFX_SATURN", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0292", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_1F_SATURN", "script": 8, "initial_dir": 2, "data": [], diff --git a/res/field/events/events_galactic_hq_2f.json b/res/field/events/events_galactic_hq_2f.json index 76b1ecb688..cee6750dcb 100644 --- a/res/field/events/events_galactic_hq_2f.json +++ b/res/field/events/events_galactic_hq_2f.json @@ -114,11 +114,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_2F_GALACTIC_GRUNT_1", + "id": "LOCALID_GALACTIC_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_2F_1", "initial_dir": 0, "data": [ @@ -131,11 +131,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_2F_GALACTIC_GRUNT_2", + "id": "LOCALID_GALACTIC_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_2F_2", "initial_dir": 0, "data": [ @@ -148,11 +148,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_2F_GALACTIC_GRUNT_3", + "id": "LOCALID_GALACTIC_GRUNT_3", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_2F_3", "initial_dir": 2, "data": [ @@ -165,11 +165,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_2F_SCIENTIST_DARRIUS", + "id": "LOCALID_SCIENTIST_DARRIUS", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_SCIENTIST_DARRIUS", "initial_dir": 0, "data": [ @@ -197,7 +197,7 @@ "y": 0 }, { - "id": "GALACTIC_HQ_2F_BOOK_6", + "id": "LOCALID_BOOK", "graphics_id": "OBJ_EVENT_GFX_BOOK", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_galactic_hq_3f.json b/res/field/events/events_galactic_hq_3f.json index 71009c3256..7af04b9db3 100644 --- a/res/field/events/events_galactic_hq_3f.json +++ b/res/field/events/events_galactic_hq_3f.json @@ -35,11 +35,11 @@ ], "object_events": [ { - "id": "GALACTIC_HQ_3F_GRUNT_M_0", + "id": "LOCALID_GRUNT_M", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": 1, "initial_dir": 1, "data": [], @@ -65,11 +65,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_3F_GALACTIC_GRUNT_2", + "id": "LOCALID_GALACTIC_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_FACE_SIDES", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_3F_2", "initial_dir": 3, "data": [ @@ -83,11 +83,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_3F_GALACTIC_GRUNT_3", + "id": "LOCALID_GALACTIC_GRUNT_3", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_3F_3", "initial_dir": 0, "data": [ @@ -100,11 +100,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_3F_GALACTIC_GRUNT_4", + "id": "LOCALID_GALACTIC_GRUNT_4", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_3F_4", "initial_dir": 1, "data": [ @@ -117,11 +117,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_3F_GALACTIC_HQ_DOOR_5", + "id": "LOCALID_GALACTIC_HQ_DOOR_WEST", "graphics_id": "OBJ_EVENT_GFX_GALACTIC_HQ_DOOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0225", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_3F_DOOR", "script": 2, "initial_dir": 1, "data": [], @@ -132,11 +132,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_3F_GALACTIC_HQ_DOOR_6", + "id": "LOCALID_GALACTIC_HQ_DOOR_EAST", "graphics_id": "OBJ_EVENT_GFX_GALACTIC_HQ_DOOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0225", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_3F_DOOR", "script": 2, "initial_dir": 1, "data": [], @@ -147,11 +147,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_3F_GALACTIC_GRUNT_1", + "id": "LOCALID_GALACTIC_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_3F_1", "initial_dir": 0, "data": [ diff --git a/res/field/events/events_galactic_hq_4f.json b/res/field/events/events_galactic_hq_4f.json index eb76729b47..2e70716b6c 100644 --- a/res/field/events/events_galactic_hq_4f.json +++ b/res/field/events/events_galactic_hq_4f.json @@ -27,11 +27,11 @@ ], "object_events": [ { - "id": "GALACTIC_HQ_4F_CYRUS_0", + "id": "LOCALID_CYRUS", "graphics_id": "OBJ_EVENT_GFX_CYRUS", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01BE", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_4F_CYRUS", "script": 1, "initial_dir": 0, "data": [], @@ -42,11 +42,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_4F_GALACTIC_HQ_DOOR_1", + "id": "LOCALID_GALACTIC_HQ_DOOR_WEST", "graphics_id": "OBJ_EVENT_GFX_GALACTIC_HQ_DOOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0226", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_4F_DOOR", "script": 2, "initial_dir": 0, "data": [], @@ -57,11 +57,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_4F_GALACTIC_HQ_DOOR_2", + "id": "LOCALID_GALACTIC_HQ_DOOR_EAST", "graphics_id": "OBJ_EVENT_GFX_GALACTIC_HQ_DOOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0226", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_4F_DOOR", "script": 2, "initial_dir": 1, "data": [], @@ -72,11 +72,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_4F_BOLLARD_3", + "id": "LOCALID_BOLLARD_WEST", "graphics_id": "OBJ_EVENT_GFX_BOLLARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": 0, "initial_dir": 0, "data": [], @@ -87,11 +87,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_4F_BOLLARD_4", + "id": "LOCALID_BOLLARD_EAST", "graphics_id": "OBJ_EVENT_GFX_BOLLARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": 0, "initial_dir": 0, "data": [], @@ -136,7 +136,7 @@ "y": 0, "width": 2, "length": 1, - "var": "VAR_UNK_0x40D6", + "var": "VAR_GALACTIC_HQ_4F_STATE", "value": 0 } ] diff --git a/res/field/events/events_galactic_hq_b1f.json b/res/field/events/events_galactic_hq_b1f.json index d44db51289..8888140966 100644 --- a/res/field/events/events_galactic_hq_b1f.json +++ b/res/field/events/events_galactic_hq_b1f.json @@ -2,11 +2,11 @@ "bg_events": [], "object_events": [ { - "id": "GALACTIC_HQ_B1F_GRUNT_M_0", + "id": "LOCALID_GRUNT_M", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": 1, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_galactic_hq_b2f.json b/res/field/events/events_galactic_hq_b2f.json index d6c3fbfbf8..9636cad890 100644 --- a/res/field/events/events_galactic_hq_b2f.json +++ b/res/field/events/events_galactic_hq_b2f.json @@ -2,11 +2,11 @@ "bg_events": [], "object_events": [ { - "id": "GALACTIC_HQ_B2F_GRUNT_M_0", + "id": "LOCALID_GRUNT_M", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": 1, "initial_dir": 3, "data": [], @@ -17,11 +17,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_B2F_SCIENTIST_M_1", + "id": "LOCALID_SCIENTIST_M", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": 2, "initial_dir": 1, "data": [], @@ -47,11 +47,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_B2F_GALACTIC_GRUNT_1", + "id": "LOCALID_GALACTIC_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_B2F_1", "initial_dir": 2, "data": [ @@ -64,11 +64,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_B2F_GALACTIC_GRUNT_2", + "id": "LOCALID_GALACTIC_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_GALACTIC_HQ_B2F_2", "initial_dir": 1, "data": [ @@ -96,11 +96,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_B2F_GALACTIC_HQ_DOOR_6", + "id": "LOCALID_GALACTIC_HQ_DOOR_WEST", "graphics_id": "OBJ_EVENT_GFX_GALACTIC_HQ_DOOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0227", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_B2F_DOOR", "script": 3, "initial_dir": 1, "data": [], @@ -111,11 +111,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_B2F_GALACTIC_HQ_DOOR_7", + "id": "LOCALID_GALACTIC_HQ_DOOR_EAST", "graphics_id": "OBJ_EVENT_GFX_GALACTIC_HQ_DOOR", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0227", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_B2F_DOOR", "script": 3, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_galactic_hq_control_room.json b/res/field/events/events_galactic_hq_control_room.json index 87d961766b..3cdf715897 100644 --- a/res/field/events/events_galactic_hq_control_room.json +++ b/res/field/events/events_galactic_hq_control_room.json @@ -35,11 +35,11 @@ ], "object_events": [ { - "id": "GALACTIC_HQ_CONTROL_ROOM_SATURN_0", + "id": "LOCALID_SATURN", "graphics_id": "OBJ_EVENT_GFX_SATURN", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": 3, "initial_dir": 0, "data": [], @@ -50,11 +50,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_CONTROL_ROOM_AZELF_1", + "id": "LOCALID_AZELF", "graphics_id": "OBJ_EVENT_GFX_AZELF", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0236", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_CONTROL_ROOM_LAKE_GUARDIANS", "script": 13, "initial_dir": 1, "data": [], @@ -65,11 +65,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_CONTROL_ROOM_MESPRIT_2", + "id": "LOCALID_MESPRIT", "graphics_id": "OBJ_EVENT_GFX_MESPRIT", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0236", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_CONTROL_ROOM_LAKE_GUARDIANS", "script": 12, "initial_dir": 1, "data": [], @@ -80,11 +80,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_CONTROL_ROOM_UXIE_3", + "id": "LOCALID_UXIE", "graphics_id": "OBJ_EVENT_GFX_UXIE", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0236", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_CONTROL_ROOM_LAKE_GUARDIANS", "script": 11, "initial_dir": 1, "data": [], @@ -95,11 +95,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_CONTROL_ROOM_CHARON_4", + "id": "LOCALID_CHARON", "graphics_id": "OBJ_EVENT_GFX_CHARON", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x029E", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_CONTROL_ROOM_CHARON", "script": 15, "initial_dir": 0, "data": [], @@ -126,7 +126,7 @@ "y": 0, "width": 1, "length": 1, - "var": "VAR_UNK_0x410D", + "var": "FLAG_GALACTIC_HQ_CONTROL_ROOM_STATE", "value": 1 } ] diff --git a/res/field/events/events_galactic_hq_hall.json b/res/field/events/events_galactic_hq_hall.json index 425f2b687a..4cbc961d09 100644 --- a/res/field/events/events_galactic_hq_hall.json +++ b/res/field/events/events_galactic_hq_hall.json @@ -2,11 +2,11 @@ "bg_events": [], "object_events": [ { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_0", + "id": "LOCALID_GRUNTS_GROUP_OF_4_1", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -17,11 +17,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_M_1", + "id": "LOCALID_GRUNT_M_1", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -32,11 +32,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_CYRUS_2", + "id": "LOCALID_CYRUS", "graphics_id": "OBJ_EVENT_GFX_CYRUS", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0253", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_CYRUS", "script": 0, "initial_dir": 1, "data": [], @@ -47,11 +47,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_LOOKER_3", + "id": "LOCALID_LOOKER", "graphics_id": "OBJ_EVENT_GFX_LOOKER", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0254", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_LOOKER", "script": 0, "initial_dir": 2, "data": [], @@ -62,11 +62,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_4", + "id": "LOCALID_GRUNTS_GROUP_OF_4_2", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -77,11 +77,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_5", + "id": "LOCALID_GRUNTS_GROUP_OF_4_3", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -92,11 +92,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_3_6", + "id": "LOCALID_GRUNTS_GROUP_OF_3_1", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -107,11 +107,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_7", + "id": "LOCALID_GRUNTS_GROUP_OF_4_4", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -122,11 +122,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_3_8", + "id": "LOCALID_GRUNTS_GROUP_OF_3_2", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -137,11 +137,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_3_9", + "id": "LOCALID_GRUNTS_GROUP_OF_3_3", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -152,11 +152,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_3_10", + "id": "LOCALID_GRUNTS_GROUP_OF_3_4", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -167,11 +167,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_11", + "id": "LOCALID_GRUNTS_GROUP_OF_4_5", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -182,11 +182,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_12", + "id": "LOCALID_GRUNTS_GROUP_OF_4_6", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -197,11 +197,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_13", + "id": "LOCALID_GRUNTS_GROUP_OF_4_7", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -212,11 +212,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_14", + "id": "LOCALID_GRUNTS_GROUP_OF_4_8", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -227,11 +227,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_3_15", + "id": "LOCALID_GRUNTS_GROUP_OF_3_5", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -242,11 +242,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_3_16", + "id": "LOCALID_GRUNTS_GROUP_OF_3_6", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -257,11 +257,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_3_17", + "id": "LOCALID_GRUNTS_GROUP_OF_3_7", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -272,11 +272,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_3_18", + "id": "LOCALID_GRUNTS_GROUP_OF_3_8", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -287,11 +287,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_M_19", + "id": "LOCALID_GRUNT_M_2", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -302,11 +302,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_M_20", + "id": "LOCALID_GRUNT_M_3", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -317,11 +317,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_M_21", + "id": "LOCALID_GRUNT_M_4", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -332,11 +332,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_M_22", + "id": "LOCALID_GRUNT_M_5", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -347,11 +347,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_F_23", + "id": "LOCALID_GRUNT_F_1", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -362,11 +362,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_F_24", + "id": "LOCALID_GRUNT_F_2", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -377,11 +377,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_F_25", + "id": "LOCALID_GRUNT_F_3", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -392,11 +392,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_F_26", + "id": "LOCALID_GRUNT_F_4", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -407,11 +407,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_27", + "id": "LOCALID_GRUNTS_GROUP_OF_4_9", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -422,11 +422,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNTS_GROUP_OF_4_28", + "id": "LOCALID_GRUNTS_GROUP_OF_4_10", "graphics_id": "OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -437,11 +437,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_F_29", + "id": "LOCALID_GRUNT_F_5", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -452,11 +452,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_F_30", + "id": "LOCALID_GRUNT_F_6", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -467,11 +467,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_M_31", + "id": "LOCALID_GRUNT_M_6", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -482,11 +482,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_M_32", + "id": "LOCALID_GRUNT_M_7", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -497,11 +497,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_M_33", + "id": "LOCALID_GRUNT_M_8", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -512,11 +512,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_M_34", + "id": "LOCALID_GRUNT_M_9", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -527,11 +527,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_HALL_GRUNT_F_35", + "id": "LOCALID_GRUNT_F_7", "graphics_id": "OBJ_EVENT_GFX_GRUNT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0259", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_HALL_GRUNTS", "script": 0, "initial_dir": 0, "data": [], @@ -570,7 +570,7 @@ "y": 0, "width": 1, "length": 2, - "var": "VAR_UNK_0x408E", + "var": "VAR_GALACTIC_HQ_HALL_STATE", "value": 0 } ] diff --git a/res/field/events/events_galactic_hq_laboratory.json b/res/field/events/events_galactic_hq_laboratory.json index 19c81fa731..64b50a8f0c 100644 --- a/res/field/events/events_galactic_hq_laboratory.json +++ b/res/field/events/events_galactic_hq_laboratory.json @@ -83,11 +83,11 @@ ], "object_events": [ { - "id": "GALACTIC_HQ_LABORATORY_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", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": 1, "initial_dir": 2, "data": [], @@ -98,11 +98,11 @@ "y": 0 }, { - "id": "GALACTIC_HQ_LABORATORY_SCIENTIST_F_1", + "id": "LOCALID_SCIENTIST_F", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_F", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0237", + "hidden_flag": "FLAG_HIDE_GALACTIC_HQ_TEAM_GALACTIC", "script": 2, "initial_dir": 2, "data": [], diff --git a/res/field/scripts/scripts_galactic_hq_1f.s b/res/field/scripts/scripts_galactic_hq_1f.s index 5c2c32a736..95cec95731 100644 --- a/res/field/scripts/scripts_galactic_hq_1f.s +++ b/res/field/scripts/scripts_galactic_hq_1f.s @@ -1,149 +1,150 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_1f.h" +#include "res/field/events/events_galactic_hq_1f.h" - ScriptEntry _0022 - ScriptEntry _0028 - ScriptEntry _0051 - ScriptEntry _007A - ScriptEntry _00A3 - ScriptEntry _00DF - ScriptEntry _0174 - ScriptEntry _00CC + ScriptEntry GalacticHQ1F_OnTransition + ScriptEntry GalacticHQ1F_GruntF1 + ScriptEntry GalacticHQ1F_GruntM + ScriptEntry GalacticHQ1F_GruntF2 + ScriptEntry GalacticHQ1F_ScientistM1 + ScriptEntry GalacticHQ1F_Door + ScriptEntry GalacticHQ1F_Sign + ScriptEntry GalacticHQ1F_Saturn ScriptEntryEnd -_0022: +GalacticHQ1F_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_GALACTIC_HQ End -_0028: +GalacticHQ1F_GruntF1: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, _0046 - Message 0 + GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, GalacticHQ1F_WeHaveNoPlansNow + Message GalacticHQ1F_Text_ThisIsGalacticVeilstoneBuilding WaitButton CloseMessage ReleaseAll End -_0046: - Message 1 +GalacticHQ1F_WeHaveNoPlansNow: + Message GalacticHQ1F_Text_WeHaveNoPlansNow WaitButton CloseMessage ReleaseAll End -_0051: +GalacticHQ1F_GruntM: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, _006F - Message 4 + GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, GalacticHQ1F_NothingLeftNow + Message GalacticHQ1F_Text_WeWillTakeEverything WaitButton CloseMessage ReleaseAll End -_006F: - Message 5 +GalacticHQ1F_NothingLeftNow: + Message GalacticHQ1F_Text_NothingLeftNow WaitButton CloseMessage ReleaseAll End -_007A: +GalacticHQ1F_GruntF2: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, _0098 - Message 6 + GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, GalacticHQ1F_IWonderWhereBossWent + Message GalacticHQ1F_Text_YoureTooYoung WaitButton CloseMessage ReleaseAll End -_0098: - Message 7 +GalacticHQ1F_IWonderWhereBossWent: + Message GalacticHQ1F_Text_IWonderWhereBossWent WaitButton CloseMessage ReleaseAll End -_00A3: +GalacticHQ1F_ScientistM1: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, _00C1 - Message 2 + GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, GalacticHQ1F_ThisIsWhereWeWork + Message GalacticHQ1F_Text_GalacticConductsRnD WaitButton CloseMessage ReleaseAll End -_00C1: - Message 3 +GalacticHQ1F_ThisIsWhereWeWork: + Message GalacticHQ1F_Text_ThisIsWhereWeWork WaitButton CloseMessage ReleaseAll End -_00CC: - NPCMessage 8 +GalacticHQ1F_Saturn: + NPCMessage GalacticHQ1F_Text_WhatToDo End -_00DF: +GalacticHQ1F_Door: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer CheckItem ITEM_GALACTIC_KEY, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0107 - Message 9 + GoToIfEq VAR_RESULT, TRUE, GalacticHQ1F_AskUseGalacticKey + Message GalacticHQ1F_Text_DoorIsLocked WaitButton CloseMessage ReleaseAll End -_0107: - Message 10 +GalacticHQ1F_AskUseGalacticKey: + Message GalacticHQ1F_Text_UseGalacticKey ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _012A - GoToIfEq VAR_RESULT, MENU_NO, _015E + GoToIfEq VAR_RESULT, MENU_YES, GalacticHQ1F_UseGalacticKey + GoToIfEq VAR_RESULT, MENU_NO, GalacticHQ1F_DontUseKey End -_012A: +GalacticHQ1F_UseGalacticKey: BufferPlayerName 0 - Message 11 + Message GalacticHQ1F_Text_TheDoorOpened WaitButton WaitSE SEQ_SE_CONFIRM PlaySE SEQ_SE_DP_DOOR10 - ApplyMovement 5, _0164 - ApplyMovement 6, _016C + ApplyMovement LOCALID_GALACTIC_HQ_DOOR_WEST, GalacticHQ1F_Movement_DoorWestMoveWest + ApplyMovement LOCALID_GALACTIC_HQ_DOOR_EAST, GalacticHQ1F_Movement_DoorEastMoveEast WaitMovement - SetFlag FLAG_UNK_0x0224 - RemoveObject 5 - RemoveObject 6 + SetFlag FLAG_HIDE_GALACTIC_HQ_1F_DOOR + RemoveObject LOCALID_GALACTIC_HQ_DOOR_WEST + RemoveObject LOCALID_GALACTIC_HQ_DOOR_EAST CloseMessage ReleaseAll End -_015E: +GalacticHQ1F_DontUseKey: CloseMessage ReleaseAll End .balign 4, 0 -_0164: +GalacticHQ1F_Movement_DoorWestMoveWest: WalkFastWest EndMovement .balign 4, 0 -_016C: +GalacticHQ1F_Movement_DoorEastMoveEast: WalkFastEast EndMovement -_0174: - EventMessage 12 +GalacticHQ1F_Sign: + EventMessage GalacticHQ1F_Text_TeamGalacticCredo End .balign 4, 0 diff --git a/res/field/scripts/scripts_galactic_hq_2f.s b/res/field/scripts/scripts_galactic_hq_2f.s index 85ad878eb0..6928989417 100644 --- a/res/field/scripts/scripts_galactic_hq_2f.s +++ b/res/field/scripts/scripts_galactic_hq_2f.s @@ -2,26 +2,26 @@ #include "res/text/bank/galactic_hq_2f.h" - ScriptEntry _001E - ScriptEntry _007A - ScriptEntry _008B - ScriptEntry _009C - ScriptEntry _00AD - ScriptEntry _00CF - ScriptEntry _00BE + ScriptEntry GalacticHQ2F_Bed + ScriptEntry GalacticHQ2F_SignNapRoom + ScriptEntry GalacticHQ2F_SignTVRoom + ScriptEntry GalacticHQ2F_SignCredo + ScriptEntry GalacticHQ2F_KitchenSink + ScriptEntry GalacticHQ2F_Report + ScriptEntry GalacticHQ2F_Refrigerator ScriptEntryEnd -_001E: +GalacticHQ2F_Bed: PlaySE SEQ_SE_CONFIRM LockAll - Message 0 + Message GalacticHQ2F_Text_TakeARest ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _003E - GoTo _0074 + GoToIfEq VAR_RESULT, MENU_YES, GalacticHQ2F_TakeARest + GoTo GalacticHQ2F_BedEnd -_003E: +GalacticHQ2F_TakeARest: BufferPlayerName 0 - Message 1 + Message GalacticHQ2F_Text_FellAsleep CloseMessage FadeScreenOut WaitFadeScreen @@ -31,58 +31,58 @@ _003E: FadeScreenIn WaitFadeScreen BufferPlayerName 0 - Message 2 + Message GalacticHQ2F_Text_PokemonBecameFullyHealed WaitButton CloseMessage ReleaseAll End -_0074: +GalacticHQ2F_BedEnd: CloseMessage ReleaseAll End -_007A: - EventMessage 7 +GalacticHQ2F_SignNapRoom: + EventMessage GalacticHQ2F_Text_TeamGalacticNapRoom End -_008B: - EventMessage 8 +GalacticHQ2F_SignTVRoom: + EventMessage GalacticHQ2F_Text_TeamGalacticTVRoom End -_009C: - EventMessage 9 +GalacticHQ2F_SignCredo: + EventMessage GalacticHQ2F_Text_TeamGalacticCredo End -_00AD: - EventMessage 10 +GalacticHQ2F_KitchenSink: + EventMessage GalacticHQ2F_Text_KitchenSinkNotice End -_00BE: - EventMessage 11 +GalacticHQ2F_Refrigerator: + EventMessage GalacticHQ2F_Text_RefrigeratorNotice End -_00CF: +GalacticHQ2F_Report: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - Message 3 + Message GalacticHQ2F_Text_ReadReport ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _010A - Message 5 + GoToIfEq VAR_RESULT, MENU_NO, GalacticHQ2F_PutReportBack + Message GalacticHQ2F_Text_StatuePlateText1 ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _010A - Message 6 - GoTo _010A + GoToIfEq VAR_RESULT, MENU_NO, GalacticHQ2F_PutReportBack + Message GalacticHQ2F_Text_StatuePlateText2 + GoTo GalacticHQ2F_PutReportBack End -_010A: +GalacticHQ2F_PutReportBack: BufferPlayerName 0 - Message 4 - GoTo _0118 + Message GalacticHQ2F_Text_PutReportBack + GoTo GalacticHQ2F_ReportEnd End -_0118: +GalacticHQ2F_ReportEnd: WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_galactic_hq_3f.s b/res/field/scripts/scripts_galactic_hq_3f.s index 8bb5bbdc5e..c0270164cd 100644 --- a/res/field/scripts/scripts_galactic_hq_3f.s +++ b/res/field/scripts/scripts_galactic_hq_3f.s @@ -1,68 +1,69 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_3f.h" +#include "res/field/events/events_galactic_hq_3f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _00B8 + ScriptEntry GalacticHQ3F_GruntM + ScriptEntry GalacticHQ3F_Door + ScriptEntry GalacticHQ3F_Sign ScriptEntryEnd -_000E: - NPCMessage 0 +GalacticHQ3F_GruntM: + NPCMessage GalacticHQ3F_Text_DoorsOpenWithSpecialKey End -_0021: +GalacticHQ3F_Door: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer CheckItem ITEM_GALACTIC_KEY, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0049 - Message 1 + GoToIfEq VAR_RESULT, TRUE, GalacticHQ3F_AskUseGalacticKey + Message GalacticHQ3F_Text_DoorIsLocked WaitButton CloseMessage ReleaseAll End -_0049: - Message 2 +GalacticHQ3F_AskUseGalacticKey: + Message GalacticHQ3F_Text_UseGalacticKey ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _006C - GoToIfEq VAR_RESULT, MENU_NO, _00A0 + GoToIfEq VAR_RESULT, MENU_YES, GalacticHQ3F_UseGalacticKey + GoToIfEq VAR_RESULT, MENU_NO, GalacticHQ3F_DontUseKey End -_006C: +GalacticHQ3F_UseGalacticKey: BufferPlayerName 0 - Message 3 + Message GalacticHQ3F_Text_DoorOpened WaitButton WaitSE SEQ_SE_CONFIRM PlaySE SEQ_SE_DP_DOOR10 - ApplyMovement 5, _00A8 - ApplyMovement 6, _00B0 + ApplyMovement LOCALID_GALACTIC_HQ_DOOR_WEST, GalacticHQ3F_Movement_DoorWestMoveWest + ApplyMovement LOCALID_GALACTIC_HQ_DOOR_EAST, GalacticHQ3F_Movement_DoorEastMoveEast WaitMovement - SetFlag FLAG_UNK_0x0225 - RemoveObject 5 - RemoveObject 6 + SetFlag FLAG_HIDE_GALACTIC_HQ_3F_DOOR + RemoveObject LOCALID_GALACTIC_HQ_DOOR_WEST + RemoveObject LOCALID_GALACTIC_HQ_DOOR_EAST CloseMessage ReleaseAll End -_00A0: +GalacticHQ3F_DontUseKey: CloseMessage ReleaseAll End .balign 4, 0 -_00A8: +GalacticHQ3F_Movement_DoorWestMoveWest: WalkFastWest EndMovement .balign 4, 0 -_00B0: +GalacticHQ3F_Movement_DoorEastMoveEast: WalkFastEast EndMovement -_00B8: - EventMessage 4 +GalacticHQ3F_Sign: + EventMessage GalacticHQ3F_Text_TeamGalacticCredo End .balign 4, 0 diff --git a/res/field/scripts/scripts_galactic_hq_4f.s b/res/field/scripts/scripts_galactic_hq_4f.s index c9015f8769..e1e4ad85ec 100644 --- a/res/field/scripts/scripts_galactic_hq_4f.s +++ b/res/field/scripts/scripts_galactic_hq_4f.s @@ -1,93 +1,95 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_4f.h" +#include "res/text/bank/menu_entries.h" +#include "res/field/events/events_galactic_hq_4f.h" - ScriptEntry _0012 - ScriptEntry _012C - ScriptEntry _01C4 - ScriptEntry _01D5 + ScriptEntry GalacticHQ4F_TriggerCyrus + ScriptEntry GalacticHQ4F_Door + ScriptEntry GalacticHQ4F_SignWarpPanels + ScriptEntry GalacticHQ4F_Report ScriptEntryEnd -_0012: +GalacticHQ4F_TriggerCyrus: LockAll - ApplyMovement 0, _00E8 + ApplyMovement LOCALID_CYRUS, GalacticHQ4F_Movement_CyrusWalkOnSpotSouth WaitMovement - Message 0 + Message GalacticHQ4F_Text_SpeechWasBigLie CloseMessage - ApplyMovement 0, _00F0 + ApplyMovement LOCALID_CYRUS, GalacticHQ4F_Movement_CyrusWalkSouth WaitMovement - Message 1 + Message GalacticHQ4F_Text_IKnowWhyYoureHere CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8004, 8, _0054 - GoToIfEq VAR_0x8004, 9, _0064 + GoToIfEq VAR_0x8004, 8, GalacticHQ4F_CyrusWalkToPlayerX8 + GoToIfEq VAR_0x8004, 9, GalacticHQ4F_CyrusWalkToPlayerX9 End -_0054: - ApplyMovement 0, _00F8 +GalacticHQ4F_CyrusWalkToPlayerX8: + ApplyMovement LOCALID_CYRUS, GalacticHQ4F_Movement_CyrusWalkToPlayerX8 WaitMovement - GoTo _0074 + GoTo GalacticHQ4F_Cyrus -_0064: - ApplyMovement 0, _0100 +GalacticHQ4F_CyrusWalkToPlayerX9: + ApplyMovement LOCALID_CYRUS, GalacticHQ4F_Movement_CyrusWalkToPlayerX9 WaitMovement - GoTo _0074 + GoTo GalacticHQ4F_Cyrus -_0074: +GalacticHQ4F_Cyrus: StartTrainerBattle TRAINER_GALACTIC_BOSS_CYRUS_GALACTIC_HQ CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _00E1 - Message 2 + GoToIfEq VAR_RESULT, FALSE, GalacticHQ4F_BlackOut + Message GalacticHQ4F_Text_YouAreIndeedStrong SetVar VAR_0x8004, ITEM_MASTER_BALL SetVar VAR_0x8005, 1 CanFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT - CallIfEq VAR_RESULT, 1, _00DB - Message 3 + CallIfEq VAR_RESULT, TRUE, GalacticHQ4F_GiveMasterBall + Message GalacticHQ4F_Text_IMakePowerMyOwn CloseMessage - ApplyMovement 0, _0110 + ApplyMovement LOCALID_CYRUS, GalacticHQ4F_Movement_CyrusWalkNorthEast WaitMovement - Message 4 + Message GalacticHQ4F_Text_TakeWarpPanel CloseMessage - ApplyMovement 0, _0124 + ApplyMovement LOCALID_CYRUS, GalacticHQ4F_Movement_CyrusLeave WaitMovement - RemoveObject 0 - SetVar VAR_UNK_0x40D6, 1 + RemoveObject LOCALID_CYRUS + SetVar VAR_GALACTIC_HQ_4F_STATE, 1 ReleaseAll End -_00DB: +GalacticHQ4F_GiveMasterBall: Common_GiveItemQuantity Return -_00E1: +GalacticHQ4F_BlackOut: BlackOutFromBattle ReleaseAll End .balign 4, 0 -_00E8: +GalacticHQ4F_Movement_CyrusWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_00F0: +GalacticHQ4F_Movement_CyrusWalkSouth: WalkNormalSouth EndMovement .balign 4, 0 -_00F8: +GalacticHQ4F_Movement_CyrusWalkToPlayerX8: WalkNormalSouth EndMovement .balign 4, 0 -_0100: +GalacticHQ4F_Movement_CyrusWalkToPlayerX9: WalkNormalSouth WalkNormalEast WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0110: +GalacticHQ4F_Movement_CyrusWalkNorthEast: WalkNormalNorth WalkNormalEast 4 WalkNormalNorth 3 @@ -95,102 +97,102 @@ _0110: EndMovement .balign 4, 0 -_0124: +GalacticHQ4F_Movement_CyrusLeave: WalkNormalEast 7 EndMovement -_012C: +GalacticHQ4F_Door: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer CheckItem ITEM_GALACTIC_KEY, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0154 - Message 5 + GoToIfEq VAR_RESULT, TRUE, GalacticHQ4F_AskUseGalacticKey + Message GalacticHQ4F_Text_DoorIsLocked WaitButton CloseMessage ReleaseAll End -_0154: - Message 6 +GalacticHQ4F_AskUseGalacticKey: + Message GalacticHQ4F_Text_UseGalacticKey ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0177 - GoToIfEq VAR_RESULT, MENU_NO, _01AB + GoToIfEq VAR_RESULT, MENU_YES, GalacticHQ4F_UseGalacticKey + GoToIfEq VAR_RESULT, MENU_NO, GalacticHQ4F_DontUseKey End -_0177: +GalacticHQ4F_UseGalacticKey: BufferPlayerName 0 - Message 7 + Message GalacticHQ4F_Text_DoorOpened WaitButton WaitSE SEQ_SE_CONFIRM PlaySE SEQ_SE_DP_DOOR10 - ApplyMovement 1, _01B4 - ApplyMovement 2, _01BC + ApplyMovement LOCALID_GALACTIC_HQ_DOOR_WEST, GalacticHQ4F_Movement_DoorWestMoveWest + ApplyMovement LOCALID_GALACTIC_HQ_DOOR_EAST, GalacticHQ4F_Movement_DoorEastMoveEast WaitMovement - SetFlag FLAG_UNK_0x0226 - RemoveObject 1 - RemoveObject 2 + SetFlag FLAG_HIDE_GALACTIC_HQ_4F_DOOR + RemoveObject LOCALID_GALACTIC_HQ_DOOR_WEST + RemoveObject LOCALID_GALACTIC_HQ_DOOR_EAST CloseMessage ReleaseAll End -_01AB: +GalacticHQ4F_DontUseKey: CloseMessage ReleaseAll End .balign 4, 0 -_01B4: +GalacticHQ4F_Movement_DoorWestMoveWest: WalkFastWest EndMovement .balign 4, 0 -_01BC: +GalacticHQ4F_Movement_DoorEastMoveEast: WalkFastEast EndMovement -_01C4: - EventMessage 8 +GalacticHQ4F_SignWarpPanels: + EventMessage GalacticHQ4F_Text_TeamGalacticWarpPanels End -_01D5: +GalacticHQ4F_Report: PlaySE SEQ_SE_CONFIRM LockAll - Message 9 - GoTo _01E6 + Message GalacticHQ4F_Text_TeamGalacticReport + GoTo GalacticHQ4F_ReadWhichReport End -_01E6: - Message 10 +GalacticHQ4F_ReadWhichReport: + Message GalacticHQ4F_Text_ReadWhichReport InitGlobalTextMenu 1, 1, 0, VAR_RESULT - AddMenuEntry 0x10C, 0 - AddMenuEntry 0x10D, 1 - AddMenuEntry 0x10E, 2 - AddMenuEntry 0x10F, 3 + AddMenuEntry MenuEntries_Text_GalacticReport_CreationOfSpace, 0 + AddMenuEntry MenuEntries_Text_GalacticReport_MythicalPokemon, 1 + AddMenuEntry MenuEntries_Text_GalacticReport_RedChain, 2 + AddMenuEntry MenuEntries_Text_GalacticReport_Exit, 3 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0240 - GoToIfEq VAR_0x8008, 1, _024B - GoToIfEq VAR_0x8008, 2, _0256 - GoTo _0261 + GoToIfEq VAR_0x8008, 0, GalacticHQ4F_ReportCreationOfSpace + GoToIfEq VAR_0x8008, 1, GalacticHQ4F_ReportMythicalPokemon + GoToIfEq VAR_0x8008, 2, GalacticHQ4F_ReportRedChain + GoTo GalacticHQ4F_ReportEnd End -_0240: - Message 11 - GoTo _01E6 +GalacticHQ4F_ReportCreationOfSpace: + Message GalacticHQ4F_Text_ReportCreationOfSpace + GoTo GalacticHQ4F_ReadWhichReport End -_024B: - Message 12 - GoTo _01E6 +GalacticHQ4F_ReportMythicalPokemon: + Message GalacticHQ4F_Text_ReportMythicalPokemon + GoTo GalacticHQ4F_ReadWhichReport End -_0256: - Message 13 - GoTo _01E6 +GalacticHQ4F_ReportRedChain: + Message GalacticHQ4F_Text_ReportRedChain + GoTo GalacticHQ4F_ReadWhichReport End -_0261: +GalacticHQ4F_ReportEnd: CloseMessage ReleaseAll End diff --git a/res/field/scripts/scripts_galactic_hq_b1f.s b/res/field/scripts/scripts_galactic_hq_b1f.s index 483ed5b5a7..8e780b0266 100644 --- a/res/field/scripts/scripts_galactic_hq_b1f.s +++ b/res/field/scripts/scripts_galactic_hq_b1f.s @@ -2,11 +2,11 @@ #include "res/text/bank/galactic_hq_b1f.h" - ScriptEntry _0006 + ScriptEntry GalacticHQB1F_GruntM ScriptEntryEnd -_0006: - NPCMessage 0 +GalacticHQB1F_GruntM: + NPCMessage GalacticHQB1F_Text_GruntiestOfGrunts End .balign 4, 0 diff --git a/res/field/scripts/scripts_galactic_hq_b2f.s b/res/field/scripts/scripts_galactic_hq_b2f.s index cdb617f814..d873d61a34 100644 --- a/res/field/scripts/scripts_galactic_hq_b2f.s +++ b/res/field/scripts/scripts_galactic_hq_b2f.s @@ -1,66 +1,67 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_b2f.h" +#include "res/field/events/events_galactic_hq_b2f.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry GalacticHQB2F_GruntM + ScriptEntry GalacticHQB2F_ScientistM + ScriptEntry GalacticHQB2F_Door ScriptEntryEnd -_000E: - NPCMessage 0 +GalacticHQB2F_GruntM: + NPCMessage GalacticHQB2F_Text_ToGetIntoSpeech End -_0021: - NPCMessage 1 +GalacticHQB2F_ScientistM: + NPCMessage GalacticHQB2F_Text_FreeAllPokemon End -_0034: +GalacticHQB2F_Door: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer CheckItem ITEM_GALACTIC_KEY, 1, VAR_RESULT - GoToIfEq VAR_RESULT, 1, _005C - Message 2 + GoToIfEq VAR_RESULT, TRUE, GalacticHQB2F_AskUseGalacticKey + Message GalacticHQB2F_Text_DoorIsLocked WaitButton CloseMessage ReleaseAll End -_005C: - Message 3 +GalacticHQB2F_AskUseGalacticKey: + Message GalacticHQB2F_Text_UseGalacticKey ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _007F - GoToIfEq VAR_RESULT, MENU_NO, _00B3 + GoToIfEq VAR_RESULT, MENU_YES, GalacticHQB2F_UseGalacticKey + GoToIfEq VAR_RESULT, MENU_NO, GalacticHQB2F_DontUseKey End -_007F: +GalacticHQB2F_UseGalacticKey: BufferPlayerName 0 - Message 4 + Message GalacticHQB2F_Text_DoorOpened WaitButton WaitSE SEQ_SE_CONFIRM PlaySE SEQ_SE_DP_DOOR10 - ApplyMovement 6, _00BC - ApplyMovement 7, _00C4 + ApplyMovement LOCALID_GALACTIC_HQ_DOOR_WEST, GalacticHQB2F_Movement_DoorWestMoveWest + ApplyMovement LOCALID_GALACTIC_HQ_DOOR_EAST, GalacticHQB2F_Movement_DoorEastMoveEast WaitMovement - SetFlag FLAG_UNK_0x0227 - RemoveObject 6 - RemoveObject 7 + SetFlag FLAG_HIDE_GALACTIC_HQ_B2F_DOOR + RemoveObject LOCALID_GALACTIC_HQ_DOOR_WEST + RemoveObject LOCALID_GALACTIC_HQ_DOOR_EAST CloseMessage ReleaseAll End -_00B3: +GalacticHQB2F_DontUseKey: CloseMessage ReleaseAll End .balign 4, 0 -_00BC: +GalacticHQB2F_Movement_DoorWestMoveWest: WalkFastWest EndMovement .balign 4, 0 -_00C4: +GalacticHQB2F_Movement_DoorEastMoveEast: WalkFastEast EndMovement diff --git a/res/field/scripts/scripts_galactic_hq_control_room.s b/res/field/scripts/scripts_galactic_hq_control_room.s index 6a57ed4f7b..cb245bf42d 100644 --- a/res/field/scripts/scripts_galactic_hq_control_room.s +++ b/res/field/scripts/scripts_galactic_hq_control_room.s @@ -1,251 +1,252 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_control_room.h" +#include "res/field/events/events_galactic_hq_control_room.h" - ScriptEntry _003E - ScriptEntry _0055 - ScriptEntry _0059 - ScriptEntry _014C - ScriptEntry _0173 - ScriptEntry _019A - ScriptEntry _01C1 - ScriptEntry _01C3 - ScriptEntry _01C5 - ScriptEntry _01C7 - ScriptEntry _03C4 - ScriptEntry _03D7 - ScriptEntry _03EA - ScriptEntry _0394 - ScriptEntry _03FD + ScriptEntry GalacticHQControlRoom_OnTransition + ScriptEntry GalacticHQControlRoom_OnResume + ScriptEntry GalacticHQControlRoom_Saturn + ScriptEntry GalacticHQControlRoom_MachineUxie + ScriptEntry GalacticHQControlRoom_MachineMesprit + ScriptEntry GalacticHQControlRoom_MachineAzelf + ScriptEntry GalacticHQControlRoom_Unused7 + ScriptEntry GalacticHQControlRoom_Unused8 + ScriptEntry GalacticHQControlRoom_Unused9 + ScriptEntry GalacticHQControlRoom_Button + ScriptEntry GalacticHQControlRoom_Uxie + ScriptEntry GalacticHQControlRoom_Mesprit + ScriptEntry GalacticHQControlRoom_Azelf + ScriptEntry GalacticHQControlRoom_TriggerSaturn + ScriptEntry GalacticHQControlRoom_Charon ScriptEntryEnd -_003E: - GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, _004B +GalacticHQControlRoom_OnTransition: + GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, GalacticHQControlRoom_SetSaturnPositionEastOfButton End -_004B: - SetObjectEventPos 0, 9, 6 +GalacticHQControlRoom_SetSaturnPositionEastOfButton: + SetObjectEventPos LOCALID_SATURN, 9, 6 End -_0055: +GalacticHQControlRoom_OnResume: ScrCmd_25E End -_0059: +GalacticHQControlRoom_Saturn: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, _0109 - GoToIfSet FLAG_UNK_0x00AD, _0114 - Message 0 + GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, GalacticHQControlRoom_BossCraftedRedChain + GoToIfSet FLAG_DEFEATED_GALACTIC_HQ_CONTROL_ROOM_SATURN, GalacticHQControlRoom_PressButtonAndFreePokemon + Message GalacticHQControlRoom_Text_SaturnIntro CloseMessage StartTrainerBattle TRAINER_COMMANDER_SATURN_GALACTIC_HQ CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _011F - SetFlag FLAG_UNK_0x00AD - SetVar VAR_UNK_0x410D, 1 - Message 1 + GoToIfEq VAR_RESULT, FALSE, GalacticHQControlRoom_BlackOut + SetFlag FLAG_DEFEATED_GALACTIC_HQ_CONTROL_ROOM_SATURN + SetVar FLAG_GALACTIC_HQ_CONTROL_ROOM_STATE, 1 + Message GalacticHQControlRoom_Text_WhatMakesYouSoTough CloseMessage GetPlayerDir VAR_0x8004 SetVar VAR_MAP_LOCAL_2, VAR_0x8004 - GoToIfEq VAR_0x8004, 0, _00D5 - GoToIfEq VAR_0x8004, 2, _00E5 - GoToIfEq VAR_0x8004, 3, _00F5 + GoToIfEq VAR_0x8004, DIR_NORTH, GalacticHQControlRoom_SaturnMoveAsideNorth + GoToIfEq VAR_0x8004, DIR_WEST, GalacticHQControlRoom_SaturnMoveAsideWest + GoToIfEq VAR_0x8004, DIR_EAST, GalacticHQControlRoom_SaturnMoveAsideEast End -_00D5: - ApplyMovement 0, _0128 +GalacticHQControlRoom_SaturnMoveAsideNorth: + ApplyMovement LOCALID_SATURN, GalacticHQControlRoom_Movement_SaturnWalkEastOnSpotSouth WaitMovement - GoTo _0105 + GoTo GalacticHQControlRoom_SaturnEnd -_00E5: - ApplyMovement 0, _0134 +GalacticHQControlRoom_SaturnMoveAsideWest: + ApplyMovement LOCALID_SATURN, GalacticHQControlRoom_Movement_SaturnWalkSouthOnSpotNorth WaitMovement - GoTo _0105 + GoTo GalacticHQControlRoom_SaturnEnd -_00F5: - ApplyMovement 0, _0140 +GalacticHQControlRoom_SaturnMoveAsideEast: + ApplyMovement LOCALID_SATURN, GalacticHQControlRoom_Movement_SaturnWalkEastOnSpotWest WaitMovement - GoTo _0105 + GoTo GalacticHQControlRoom_SaturnEnd -_0105: +GalacticHQControlRoom_SaturnEnd: ReleaseAll End -_0109: - Message 3 +GalacticHQControlRoom_BossCraftedRedChain: + Message GalacticHQControlRoom_Text_BossCraftedRedChain WaitButton CloseMessage ReleaseAll End -_0114: - Message 2 +GalacticHQControlRoom_PressButtonAndFreePokemon: + Message GalacticHQControlRoom_Text_PressButtonAndFreePokemon WaitButton CloseMessage ReleaseAll End -_011F: +GalacticHQControlRoom_BlackOut: BlackOutFromBattle ReleaseAll End .balign 4, 0 -_0128: +GalacticHQControlRoom_Movement_SaturnWalkEastOnSpotSouth: WalkNormalEast WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0134: +GalacticHQControlRoom_Movement_SaturnWalkSouthOnSpotNorth: WalkNormalSouth WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0140: +GalacticHQControlRoom_Movement_SaturnWalkEastOnSpotWest: WalkNormalEast WalkOnSpotNormalWest EndMovement -_014C: +GalacticHQControlRoom_MachineUxie: PlaySE SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, _0168 - Message 13 + GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, GalacticHQControlRoom_UxieWasSealedInside + Message GalacticHQControlRoom_Text_UxieIsSealedInside WaitButton CloseMessage ReleaseAll End -_0168: - Message 16 +GalacticHQControlRoom_UxieWasSealedInside: + Message GalacticHQControlRoom_Text_UxieWasSealedInside WaitButton CloseMessage ReleaseAll End -_0173: +GalacticHQControlRoom_MachineMesprit: PlaySE SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, _018F - Message 14 + GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, GalacticHQControlRoom_MespritWasSealedInside + Message GalacticHQControlRoom_Text_MespritIsSealedInside WaitButton CloseMessage ReleaseAll End -_018F: - Message 17 +GalacticHQControlRoom_MespritWasSealedInside: + Message GalacticHQControlRoom_Text_MespritWasSealedInside WaitButton CloseMessage ReleaseAll End -_019A: +GalacticHQControlRoom_MachineAzelf: PlaySE SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, _01B6 - Message 15 + GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, GalacticHQControlRoom_AzelfWasSealedInside + Message GalacticHQControlRoom_Text_AzelfIsSealedInside WaitButton CloseMessage ReleaseAll End -_01B6: - Message 18 +GalacticHQControlRoom_AzelfWasSealedInside: + Message GalacticHQControlRoom_Text_AzelfWasSealedInside WaitButton CloseMessage ReleaseAll End -_01C1: +GalacticHQControlRoom_Unused7: End -_01C3: +GalacticHQControlRoom_Unused8: End -_01C5: +GalacticHQControlRoom_Unused9: End -_01C7: +GalacticHQControlRoom_Button: PlaySE SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, _0347 - Message 10 + GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, GalacticHQControlRoom_AlreadyPressedButton + Message GalacticHQControlRoom_Text_AskPressButton ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _01FB - GoToIfEq VAR_RESULT, MENU_NO, _0341 + GoToIfEq VAR_RESULT, MENU_YES, GalacticHQControlRoom_FreePokemon + GoToIfEq VAR_RESULT, MENU_NO, GalacticHQControlRoom_DontPressButton End -_01FB: - SetVar VAR_UNK_0x410D, 0 +GalacticHQControlRoom_FreePokemon: + SetVar FLAG_GALACTIC_HQ_CONTROL_ROOM_STATE, 0 PlaySE SEQ_SE_DP_BUTTON3 BufferPlayerName 0 - Message 11 + Message GalacticHQControlRoom_Text_PlayerPressedButton CloseMessage ClearFlag FLAG_HIDE_MT_CORONET_1F_NORTH_ROOM_1_GRUNT_F SetFlag FLAG_FREED_GALACTIC_HQ_POKEMON ScrCmd_25F WaitTime 30, VAR_RESULT - ApplyMovement 2, _036C - ApplyMovement 1, _0374 - ApplyMovement 3, _037C + ApplyMovement LOCALID_MESPRIT, GalacticHQControlRoom_Movement_MespritMoveSouth + ApplyMovement LOCALID_AZELF, GalacticHQControlRoom_Movement_AzelfMoveSouth + ApplyMovement LOCALID_UXIE, GalacticHQControlRoom_Movement_UxieMoveSouth WaitMovement - SetObjectEventPos 2, 2, 6 - SetObjectEventPos 1, 14, 6 - SetObjectEventPos 3, 8, 12 - Call _0296 - Call _0296 - Call _0296 - RemoveObject 2 - RemoveObject 1 - RemoveObject 3 - GoToIfEq VAR_MAP_LOCAL_2, 0, _02C0 - GoToIfEq VAR_MAP_LOCAL_2, 2, _02DA - GoToIfEq VAR_MAP_LOCAL_2, 3, _02F4 + SetObjectEventPos LOCALID_MESPRIT, 2, 6 + SetObjectEventPos LOCALID_AZELF, 14, 6 + SetObjectEventPos LOCALID_UXIE, 8, 12 + Call GalacticHQControlRoom_FlickerLakeGuardians + Call GalacticHQControlRoom_FlickerLakeGuardians + Call GalacticHQControlRoom_FlickerLakeGuardians + RemoveObject LOCALID_MESPRIT + RemoveObject LOCALID_AZELF + RemoveObject LOCALID_UXIE + GoToIfEq VAR_MAP_LOCAL_2, DIR_NORTH, GalacticHQControlRoom_SaturnPlayerFaceEachOtherNorth + GoToIfEq VAR_MAP_LOCAL_2, DIR_WEST, GalacticHQControlRoom_SaturnPlayerFaceEachOtherWest + GoToIfEq VAR_MAP_LOCAL_2, DIR_EAST, GalacticHQControlRoom_SaturnPlayerFaceEachOtherEast End -_0296: - RemoveObject 2 - RemoveObject 1 - RemoveObject 3 +GalacticHQControlRoom_FlickerLakeGuardians: + RemoveObject LOCALID_MESPRIT + RemoveObject LOCALID_AZELF + RemoveObject LOCALID_UXIE WaitTime 2, VAR_RESULT - ClearFlag FLAG_UNK_0x0236 - AddObject 2 - AddObject 1 - AddObject 3 + ClearFlag FLAG_HIDE_GALACTIC_HQ_CONTROL_ROOM_LAKE_GUARDIANS + AddObject LOCALID_MESPRIT + AddObject LOCALID_AZELF + AddObject LOCALID_UXIE WaitTime 2, VAR_RESULT Return -_02C0: - ApplyMovement 0, _0354 - ApplyMovement LOCALID_PLAYER, _0384 +GalacticHQControlRoom_SaturnPlayerFaceEachOtherNorth: + ApplyMovement LOCALID_SATURN, GalacticHQControlRoom_Movement_SaturnFacePlayerWest + ApplyMovement LOCALID_PLAYER, GalacticHQControlRoom_Movement_PlayerWalkOnSpotEast WaitMovement - GoTo _030E + GoTo GalacticHQControlRoom_RemoveSaturn End -_02DA: - ApplyMovement 0, _0360 - ApplyMovement LOCALID_PLAYER, _038C +GalacticHQControlRoom_SaturnPlayerFaceEachOtherWest: + ApplyMovement LOCALID_SATURN, GalacticHQControlRoom_Movement_SaturnFacePlayerNorth + ApplyMovement LOCALID_PLAYER, GalacticHQControlRoom_Movement_PlayerWalkOnSpotSouth WaitMovement - GoTo _030E + GoTo GalacticHQControlRoom_RemoveSaturn End -_02F4: - ApplyMovement 0, _0354 - ApplyMovement LOCALID_PLAYER, _0384 +GalacticHQControlRoom_SaturnPlayerFaceEachOtherEast: + ApplyMovement LOCALID_SATURN, GalacticHQControlRoom_Movement_SaturnFacePlayerWest + ApplyMovement LOCALID_PLAYER, GalacticHQControlRoom_Movement_PlayerWalkOnSpotEast WaitMovement - GoTo _030E + GoTo GalacticHQControlRoom_RemoveSaturn End -_030E: - Message 3 +GalacticHQControlRoom_RemoveSaturn: + Message GalacticHQControlRoom_Text_BossCraftedRedChain CloseMessage FadeScreenOut WaitFadeScreen - RemoveObject 0 + RemoveObject LOCALID_SATURN FadeScreenIn WaitFadeScreen SetFlag FLAG_HIDE_MT_CORONET_2F_CAVE_PAINTING @@ -254,130 +255,130 @@ _030E: ReleaseAll End -_0341: +GalacticHQControlRoom_DontPressButton: CloseMessage ReleaseAll End -_0347: - Message 12 +GalacticHQControlRoom_AlreadyPressedButton: + Message GalacticHQControlRoom_Text_AlreadyPressedButton WaitButton CloseMessage ReleaseAll End .balign 4, 0 -_0354: +GalacticHQControlRoom_Movement_SaturnFacePlayerWest: Delay8 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0360: +GalacticHQControlRoom_Movement_SaturnFacePlayerNorth: Delay8 WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_036C: +GalacticHQControlRoom_Movement_MespritMoveSouth: WalkNormalSouth 2 EndMovement .balign 4, 0 -_0374: +GalacticHQControlRoom_Movement_AzelfMoveSouth: WalkNormalSouth 2 EndMovement .balign 4, 0 -_037C: +GalacticHQControlRoom_Movement_UxieMoveSouth: WalkNormalSouth 2 EndMovement .balign 4, 0 -_0384: +GalacticHQControlRoom_Movement_PlayerWalkOnSpotEast: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_038C: +GalacticHQControlRoom_Movement_PlayerWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement -_0394: +GalacticHQControlRoom_TriggerSaturn: LockAll - ApplyMovement 0, _03BC + ApplyMovement LOCALID_SATURN, GalacticHQControlRoom_Movement_SaturnWalkOnSpotSouth WaitMovement - Message 4 + Message GalacticHQControlRoom_Text_PressButtonAndFreePokemon2 CloseMessage - ApplyMovement LOCALID_PLAYER, _03B4 + ApplyMovement LOCALID_PLAYER, GalacticHQControlRoom_Movement_PlayerWalkNorth WaitMovement ReleaseAll End .balign 4, 0 -_03B4: +GalacticHQControlRoom_Movement_PlayerWalkNorth: WalkNormalNorth EndMovement .balign 4, 0 -_03BC: +GalacticHQControlRoom_Movement_SaturnWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement -_03C4: - NPCMessage 13 +GalacticHQControlRoom_Uxie: + NPCMessage GalacticHQControlRoom_Text_UxieIsSealedInside End -_03D7: - NPCMessage 14 +GalacticHQControlRoom_Mesprit: + NPCMessage GalacticHQControlRoom_Text_MespritIsSealedInside End -_03EA: - NPCMessage 15 +GalacticHQControlRoom_Azelf: + NPCMessage GalacticHQControlRoom_Text_AzelfIsSealedInside End -_03FD: +GalacticHQControlRoom_Charon: PlaySE SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_UNK_0x00AD, _0450 - ApplyMovement 4, _0470 + GoToIfSet FLAG_DEFEATED_GALACTIC_HQ_CONTROL_ROOM_SATURN, GalacticHQControlRoom_PerhapsAnotherOption + ApplyMovement LOCALID_CHARON, GalacticHQControlRoom_Movement_CharonWalkOnSpotNorth WaitMovement - Message 5 + Message GalacticHQControlRoom_Text_WhereWouldTheyGo CloseMessage - ApplyMovement 0, _0460 + ApplyMovement LOCALID_SATURN, GalacticHQControlRoom_Movement_SaturnWalkOnSpotWest WaitMovement WaitTime 20, VAR_RESULT - Message 6 - Message 7 + Message GalacticHQControlRoom_Text_WhatAreYouSaying + Message GalacticHQControlRoom_Text_ILookForwardToPlan CloseMessage WaitTime 20, VAR_RESULT - ApplyMovement 0, _0468 + ApplyMovement LOCALID_SATURN, GalacticHQControlRoom_Movement_SaturnWalkOnSpotNorth WaitMovement - Message 8 + Message GalacticHQControlRoom_Text_BossCanDoWithoutSupport WaitButton CloseMessage ReleaseAll End -_0450: +GalacticHQControlRoom_PerhapsAnotherOption: FacePlayer - Message 9 + Message GalacticHQControlRoom_Text_PerhapsAnotherOption WaitButton CloseMessage ReleaseAll End .balign 4, 0 -_0460: +GalacticHQControlRoom_Movement_SaturnWalkOnSpotWest: WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0468: +GalacticHQControlRoom_Movement_SaturnWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0470: +GalacticHQControlRoom_Movement_CharonWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement diff --git a/res/field/scripts/scripts_galactic_hq_hall.s b/res/field/scripts/scripts_galactic_hq_hall.s index c464881a8c..05aefb6687 100644 --- a/res/field/scripts/scripts_galactic_hq_hall.s +++ b/res/field/scripts/scripts_galactic_hq_hall.s @@ -1,182 +1,183 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_hall.h" +#include "res/field/events/events_galactic_hq_hall.h" - ScriptEntry _0006 + ScriptEntry GalacticHQHall_TriggerSpeech ScriptEntryEnd -_0006: +GalacticHQHall_TriggerSpeech: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - ApplyMovement 3, _0234 + ApplyMovement LOCALID_LOOKER, GalacticHQHall_Movement_LookerNoticePlayer WaitMovement - Message 0 + Message GalacticHQHall_Text_PsstOverHere CloseMessage - CallIfEq VAR_0x8005, 12, _01AD - CallIfEq VAR_0x8005, 13, _01C1 + CallIfEq VAR_0x8005, 12, GalacticHQHall_LookerPlayerWalkToSpeechZ12 + CallIfEq VAR_0x8005, 13, GalacticHQHall_LookerPlayerWalkToSpeechZ13 AddFreeCamera VAR_0x8004, VAR_0x8005 FadeScreenOut FADE_SCREEN_SPEED_MEDIUM - ApplyFreeCameraMovement _01F8 + ApplyFreeCameraMovement GalacticHQHall_Movement_CameraMoveNorthWest WaitMovement FadeScreenIn WaitFadeScreen WaitTime 15, VAR_RESULT - ClearFlag FLAG_UNK_0x0253 - AddObject 2 - ApplyMovement 2, _01D8 + ClearFlag FLAG_HIDE_GALACTIC_HQ_HALL_CYRUS + AddObject LOCALID_CYRUS + ApplyMovement LOCALID_CYRUS, GalacticHQHall_Movement_CyrusEnter WaitMovement PlaySE SEQ_SE_DP_DENDOU WaitTime 30, VAR_RESULT - Message 1 + Message GalacticHQHall_Text_TheWorldMustChange CloseMessage PlaySE SEQ_SE_DP_DENDOU WaitTime 30, VAR_RESULT - Message 2 + Message GalacticHQHall_Text_WeWillChangeIt CloseMessage WaitTime 30, VAR_RESULT - Message 3 + Message GalacticHQHall_Text_LetThereBeGlory CloseMessage PlaySE SEQ_SE_DP_DENDOU WaitTime 15, VAR_RESULT - Message 4 - Message 5 + Message GalacticHQHall_Text_GruntsWroooar + Message GalacticHQHall_Text_CyrusIsTheGreatest CloseMessage WaitTime 15, VAR_RESULT - ApplyMovement 2, _01E8 + ApplyMovement LOCALID_CYRUS, GalacticHQHall_Movement_CyrusLeave WaitMovement - RemoveObject 2 + RemoveObject LOCALID_CYRUS FadeScreenOut FADE_SCREEN_SPEED_MEDIUM WaitFadeScreen - ApplyFreeCameraMovement _0204 + ApplyFreeCameraMovement GalacticHQHall_Movement_CameraMoveSouthEast WaitMovement RestoreCamera - RemoveObject 0 - RemoveObject 1 - RemoveObject 4 - RemoveObject 5 - RemoveObject 6 - RemoveObject 7 - RemoveObject 8 - RemoveObject 9 - RemoveObject 10 - RemoveObject 11 - RemoveObject 12 - RemoveObject 13 - RemoveObject 14 - RemoveObject 15 - RemoveObject 16 - RemoveObject 17 - RemoveObject 18 - RemoveObject 19 - RemoveObject 20 - RemoveObject 21 - RemoveObject 22 - RemoveObject 23 - RemoveObject 24 - RemoveObject 25 - RemoveObject 26 - RemoveObject 27 - RemoveObject 28 - RemoveObject 29 - RemoveObject 30 - RemoveObject 31 - RemoveObject 32 - RemoveObject 33 - RemoveObject 34 - RemoveObject 35 - ApplyMovement 3, _0248 - ApplyMovement LOCALID_PLAYER, _0224 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_1 + RemoveObject LOCALID_GRUNT_M_1 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_2 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_3 + RemoveObject LOCALID_GRUNTS_GROUP_OF_3_1 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_4 + RemoveObject LOCALID_GRUNTS_GROUP_OF_3_2 + RemoveObject LOCALID_GRUNTS_GROUP_OF_3_3 + RemoveObject LOCALID_GRUNTS_GROUP_OF_3_4 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_5 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_6 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_7 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_8 + RemoveObject LOCALID_GRUNTS_GROUP_OF_3_5 + RemoveObject LOCALID_GRUNTS_GROUP_OF_3_6 + RemoveObject LOCALID_GRUNTS_GROUP_OF_3_7 + RemoveObject LOCALID_GRUNTS_GROUP_OF_3_8 + RemoveObject LOCALID_GRUNT_M_2 + RemoveObject LOCALID_GRUNT_M_3 + RemoveObject LOCALID_GRUNT_M_4 + RemoveObject LOCALID_GRUNT_M_5 + RemoveObject LOCALID_GRUNT_F_1 + RemoveObject LOCALID_GRUNT_F_2 + RemoveObject LOCALID_GRUNT_F_3 + RemoveObject LOCALID_GRUNT_F_4 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_9 + RemoveObject LOCALID_GRUNTS_GROUP_OF_4_10 + RemoveObject LOCALID_GRUNT_F_5 + RemoveObject LOCALID_GRUNT_F_6 + RemoveObject LOCALID_GRUNT_M_6 + RemoveObject LOCALID_GRUNT_M_7 + RemoveObject LOCALID_GRUNT_M_8 + RemoveObject LOCALID_GRUNT_M_9 + RemoveObject LOCALID_GRUNT_F_7 + ApplyMovement LOCALID_LOOKER, GalacticHQHall_Movement_LookerWalkOnSpotSouth + ApplyMovement LOCALID_PLAYER, GalacticHQHall_Movement_PlayerWalkOnSpotNorth WaitMovement FadeScreenIn WaitFadeScreen WaitTime 15, VAR_RESULT - Message 6 + Message GalacticHQHall_Text_QuiteThePerformance CloseMessage - ApplyMovement 3, _0250 - ApplyMovement LOCALID_PLAYER, _022C + ApplyMovement LOCALID_LOOKER, GalacticHQHall_Movement_LookerLeave + ApplyMovement LOCALID_PLAYER, GalacticHQHall_Movement_PlayerWalkOnSpotWest WaitMovement - RemoveObject 3 - SetVar VAR_UNK_0x408E, 1 + RemoveObject LOCALID_LOOKER + SetVar VAR_GALACTIC_HQ_HALL_STATE, 1 ReleaseAll End -_01AD: - ApplyMovement 3, _0240 - ApplyMovement LOCALID_PLAYER, _0210 +GalacticHQHall_LookerPlayerWalkToSpeechZ12: + ApplyMovement LOCALID_LOOKER, GalacticHQHall_Movement_LookerWalkOnSpotWest + ApplyMovement LOCALID_PLAYER, GalacticHQHall_Movement_PlayerWalkSouthWest WaitMovement Return -_01C1: - ApplyMovement 3, _0240 - ApplyMovement LOCALID_PLAYER, _021C +GalacticHQHall_LookerPlayerWalkToSpeechZ13: + ApplyMovement LOCALID_LOOKER, GalacticHQHall_Movement_LookerWalkOnSpotWest + ApplyMovement LOCALID_PLAYER, GalacticHQHall_Movement_PlayerWalkWest WaitMovement Return .balign 4, 0 -_01D8: +GalacticHQHall_Movement_CyrusEnter: WalkNormalSouth 3 WalkNormalWest 4 WalkNormalSouth EndMovement .balign 4, 0 -_01E8: +GalacticHQHall_Movement_CyrusLeave: WalkNormalNorth WalkNormalEast 4 WalkNormalNorth 3 EndMovement .balign 4, 0 -_01F8: +GalacticHQHall_Movement_CameraMoveNorthWest: WalkNormalWest 6 WalkNormalNorth 6 EndMovement .balign 4, 0 -_0204: +GalacticHQHall_Movement_CameraMoveSouthEast: WalkNormalSouth 6 WalkNormalEast 6 EndMovement .balign 4, 0 -_0210: +GalacticHQHall_Movement_PlayerWalkSouthWest: WalkNormalSouth WalkNormalWest EndMovement .balign 4, 0 -_021C: +GalacticHQHall_Movement_PlayerWalkWest: WalkNormalWest EndMovement .balign 4, 0 -_0224: +GalacticHQHall_Movement_PlayerWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_022C: +GalacticHQHall_Movement_PlayerWalkOnSpotWest: WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0234: +GalacticHQHall_Movement_LookerNoticePlayer: WalkOnSpotFastEast EmoteExclamationMark EndMovement .balign 4, 0 -_0240: +GalacticHQHall_Movement_LookerWalkOnSpotWest: WalkOnSpotFastWest EndMovement .balign 4, 0 -_0248: +GalacticHQHall_Movement_LookerWalkOnSpotSouth: WalkOnSpotFastSouth EndMovement .balign 4, 0 -_0250: +GalacticHQHall_Movement_LookerLeave: WalkFastWest WalkOnSpotFastNorth Delay8 diff --git a/res/field/scripts/scripts_galactic_hq_laboratory.s b/res/field/scripts/scripts_galactic_hq_laboratory.s index a4c5ced8a9..fecf081322 100644 --- a/res/field/scripts/scripts_galactic_hq_laboratory.s +++ b/res/field/scripts/scripts_galactic_hq_laboratory.s @@ -2,21 +2,21 @@ #include "res/text/bank/galactic_hq_laboratory.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0034 + ScriptEntry GalacticHQLaboratory_ScientistM + ScriptEntry GalacticHQLaboratory_ScientistF + ScriptEntry GalacticHQLaboratory_Machine ScriptEntryEnd -_000E: - NPCMessage 0 +GalacticHQLaboratory_ScientistM: + NPCMessage GalacticHQLaboratory_Text_ExperimentWentTooFar End -_0021: - NPCMessage 1 +GalacticHQLaboratory_ScientistF: + NPCMessage GalacticHQLaboratory_Text_IFeelTooSickened End -_0034: - EventMessage 2 +GalacticHQLaboratory_Machine: + EventMessage GalacticHQLaboratory_Text_SomethingInGreenFluid End .balign 4, 0 diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index 40d7ea5da2..30f56a2b1a 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -67,8 +67,8 @@ _0006: SetFlag FLAG_HIDE_ROUTE_213_GRUNT_M SetFlag FLAG_HIDE_ROUTE_213_LOOKER SetFlag FLAG_HIDE_GRAND_LAKE_ROUTE_213_LOBBY_LOOKER - SetFlag FLAG_UNK_0x0253 - SetFlag FLAG_UNK_0x0292 + SetFlag FLAG_HIDE_GALACTIC_HQ_HALL_CYRUS + SetFlag FLAG_HIDE_GALACTIC_HQ_1F_SATURN SetFlag FLAG_HIDE_VEILSTONE_CITY_GRUNT_M_STORAGE_KEY SetFlag FLAG_UNUSED_0x04E4 SetFlag FLAG_HIDE_VEILSTONE_CRASHER_WAKE diff --git a/res/field/scripts/scripts_sendoff_spring.s b/res/field/scripts/scripts_sendoff_spring.s index 781aad939b..675011057a 100644 --- a/res/field/scripts/scripts_sendoff_spring.s +++ b/res/field/scripts/scripts_sendoff_spring.s @@ -41,7 +41,7 @@ _0021: SetFlag FLAG_HIDE_MT_CORONET_1F_NORTH_ROOM_1_GRUNT_F SetFlag FLAG_HIDE_MT_CORONET_2F_LOOKER SetFlag FLAG_ALT_MUSIC_GALACTIC_HQ_1F - ClearFlag FLAG_UNK_0x0292 + ClearFlag FLAG_HIDE_GALACTIC_HQ_1F_SATURN SetFlag FLAG_GALACTIC_LEFT_LAKE_VALOR SetFlag FLAG_HIDE_MT_CORONET_1F_NORTH_ROOM_1_GRUNT_F ReleaseAll diff --git a/res/field/scripts/scripts_spear_pillar_distorted.s b/res/field/scripts/scripts_spear_pillar_distorted.s index c098af6fe3..3c6c87a8bf 100644 --- a/res/field/scripts/scripts_spear_pillar_distorted.s +++ b/res/field/scripts/scripts_spear_pillar_distorted.s @@ -49,7 +49,7 @@ _0088: ApplyMovement 0, _0154 WaitMovement Message 5 - SetFlag FLAG_UNK_0x029E + SetFlag FLAG_HIDE_GALACTIC_HQ_CONTROL_ROOM_CHARON GoTo _00DA End diff --git a/res/text/galactic_hq_1f.json b/res/text/galactic_hq_1f.json index 2bd99a67ca..667abd90d2 100644 --- a/res/text/galactic_hq_1f.json +++ b/res/text/galactic_hq_1f.json @@ -2,7 +2,7 @@ "key": 54339, "messages": [ { - "id": "pl_msg_00000282_00000", + "id": "GalacticHQ1F_Text_ThisIsGalacticVeilstoneBuilding", "en_US": [ "Welcome.\n", "This is Team Galactic Headqu...\r", @@ -14,7 +14,7 @@ ] }, { - "id": "pl_msg_00000282_00001", + "id": "GalacticHQ1F_Text_WeHaveNoPlansNow", "en_US": [ "Welcome.\n", "This is Team Galactic Headqu...\r", @@ -25,7 +25,7 @@ ] }, { - "id": "pl_msg_00000282_00002", + "id": "GalacticHQ1F_Text_GalacticConductsRnD", "en_US": [ "Team Galactic conducts R&D around\n", "the clock here.\r", @@ -34,7 +34,7 @@ ] }, { - "id": "pl_msg_00000282_00003", + "id": "GalacticHQ1F_Text_ThisIsWhereWeWork", "en_US": [ "This is where we, Team Galactic, work.\n", "What are we supposed to do?\r", @@ -45,7 +45,7 @@ ] }, { - "id": "pl_msg_00000282_00004", + "id": "GalacticHQ1F_Text_WeWillTakeEverything", "en_US": [ "We, Team Galactic, will take everything\n", "that can be taken!\r", @@ -55,7 +55,7 @@ ] }, { - "id": "pl_msg_00000282_00005", + "id": "GalacticHQ1F_Text_NothingLeftNow", "en_US": [ "We, Team Galactic, will take everything\n", "that can be taken!\r", @@ -67,18 +67,18 @@ ] }, { - "id": "pl_msg_00000282_00006", + "id": "GalacticHQ1F_Text_YoureTooYoung", "en_US": [ "You’re too young for us...\n", "You can join us when you’re older." ] }, { - "id": "pl_msg_00000282_00007", + "id": "GalacticHQ1F_Text_IWonderWhereBossWent", "en_US": "I wonder where our boss went..." }, { - "id": "pl_msg_00000282_00008", + "id": "GalacticHQ1F_Text_WhatToDo", "en_US": [ "Saturn: So, it’s you...\r", "I’ve heard about you and what took\n", @@ -107,14 +107,14 @@ ] }, { - "id": "pl_msg_00000282_00009", + "id": "GalacticHQ1F_Text_DoorIsLocked", "en_US": [ "The door is locked.\n", "A special key is needed." ] }, { - "id": "pl_msg_00000282_00010", + "id": "GalacticHQ1F_Text_UseGalacticKey", "en_US": [ "The door is locked.\n", "A special key is needed.\r", @@ -122,11 +122,11 @@ ] }, { - "id": "pl_msg_00000282_00011", + "id": "GalacticHQ1F_Text_TheDoorOpened", "en_US": "The door opened." }, { - "id": "pl_msg_00000282_00012", + "id": "GalacticHQ1F_Text_TeamGalacticCredo", "en_US": [ "The Team Galactic credo!\n", "Everything belongs to Team Galactic!\r", diff --git a/res/text/galactic_hq_2f.json b/res/text/galactic_hq_2f.json index 0074061572..1ff46b68f4 100644 --- a/res/text/galactic_hq_2f.json +++ b/res/text/galactic_hq_2f.json @@ -2,28 +2,28 @@ "key": 54351, "messages": [ { - "id": "pl_msg_00000283_00000", + "id": "GalacticHQ2F_Text_TakeARest", "en_US": [ "It’s a bed...\n", "Want to take a rest?" ] }, { - "id": "pl_msg_00000283_00001", + "id": "GalacticHQ2F_Text_FellAsleep", "en_US": [ "{STRVAR_1 3, 0, 0} quickly fell asleep\n", "in the bed...\r" ] }, { - "id": "pl_msg_00000283_00002", + "id": "GalacticHQ2F_Text_PokemonBecameFullyHealed", "en_US": [ "{STRVAR_1 3, 0, 0} and the Pokémon\n", "became fully healed from the rest!" ] }, { - "id": "pl_msg_00000283_00003", + "id": "GalacticHQ2F_Text_ReadReport", "en_US": [ "There is a report titled “The Pokémon\n", "Statues of Eterna.”\r", @@ -31,11 +31,11 @@ ] }, { - "id": "pl_msg_00000283_00004", + "id": "GalacticHQ2F_Text_PutReportBack", "en_US": "{STRVAR_1 3, 0, 0} put the report back." }, { - "id": "pl_msg_00000283_00005", + "id": "GalacticHQ2F_Text_StatuePlateText1", "en_US": [ "Pokémon statue plate text no. 1\n", "(from stolen plate):\r", @@ -51,7 +51,7 @@ ] }, { - "id": "pl_msg_00000283_00006", + "id": "GalacticHQ2F_Text_StatuePlateText2", "en_US": [ "Pokémon statue plate text no. 2\n", "(from stolen plate):\r", @@ -66,7 +66,7 @@ ] }, { - "id": "pl_msg_00000283_00007", + "id": "GalacticHQ2F_Text_TeamGalacticNapRoom", "en_US": [ "Team Galactic Nap Room\r", "Ensure the bed is unoccupied\n", @@ -74,7 +74,7 @@ ] }, { - "id": "pl_msg_00000283_00008", + "id": "GalacticHQ2F_Text_TeamGalacticTVRoom", "en_US": [ "Team Galactic TV Room\r", "State-of-the-art audio & video\n", @@ -84,7 +84,7 @@ ] }, { - "id": "pl_msg_00000283_00009", + "id": "GalacticHQ2F_Text_TeamGalacticCredo", "en_US": [ "The Team Galactic credo!\n", "Everything belongs to Team Galactic!\r", @@ -93,7 +93,7 @@ ] }, { - "id": "pl_msg_00000283_00010", + "id": "GalacticHQ2F_Text_KitchenSinkNotice", "en_US": [ "There is a notice tacked on to\n", "the kitchen sink.\r", @@ -104,7 +104,7 @@ ] }, { - "id": "pl_msg_00000283_00011", + "id": "GalacticHQ2F_Text_RefrigeratorNotice", "en_US": [ "There is a notice taped on to\n", "the refrigerator.\r", diff --git a/res/text/galactic_hq_3f.json b/res/text/galactic_hq_3f.json index 459f27af10..d2c8e0310f 100644 --- a/res/text/galactic_hq_3f.json +++ b/res/text/galactic_hq_3f.json @@ -2,7 +2,7 @@ "key": 54347, "messages": [ { - "id": "pl_msg_00000284_00000", + "id": "GalacticHQ3F_Text_DoorsOpenWithSpecialKey", "en_US": [ "The locked doors only open with\n", "a special key.\r", @@ -12,14 +12,14 @@ ] }, { - "id": "pl_msg_00000284_00001", + "id": "GalacticHQ3F_Text_DoorIsLocked", "en_US": [ "The door is locked.\n", "A special key is needed." ] }, { - "id": "pl_msg_00000284_00002", + "id": "GalacticHQ3F_Text_UseGalacticKey", "en_US": [ "The door is locked.\n", "A special key is needed.\r", @@ -27,11 +27,11 @@ ] }, { - "id": "pl_msg_00000284_00003", + "id": "GalacticHQ3F_Text_DoorOpened", "en_US": "The door opened." }, { - "id": "pl_msg_00000284_00004", + "id": "GalacticHQ3F_Text_TeamGalacticCredo", "en_US": [ "The Team Galactic credo!\n", "Everything belongs to Team Galactic!\r", diff --git a/res/text/galactic_hq_4f.json b/res/text/galactic_hq_4f.json index 5f8d9ab3ab..0118e7719e 100644 --- a/res/text/galactic_hq_4f.json +++ b/res/text/galactic_hq_4f.json @@ -2,7 +2,7 @@ "key": 54359, "messages": [ { - "id": "pl_msg_00000285_00000", + "id": "GalacticHQ4F_Text_SpeechWasBigLie", "en_US": [ "Cyrus: ...So, you’ve come.\n", "You heard my speech, I take it.\r", @@ -22,7 +22,7 @@ ] }, { - "id": "pl_msg_00000285_00001", + "id": "GalacticHQ4F_Text_IKnowWhyYoureHere", "en_US": [ "I know why you’re here. I can sense\n", "it in you.\r", @@ -51,7 +51,7 @@ ] }, { - "id": "pl_msg_00000285_00002", + "id": "GalacticHQ4F_Text_YouAreIndeedStrong", "en_US": [ "Cyrus: I see.\n", "You are indeed strong.\r", @@ -71,7 +71,7 @@ ] }, { - "id": "pl_msg_00000285_00003", + "id": "GalacticHQ4F_Text_IMakePowerMyOwn", "en_US": [ "Cyrus: The Master Ball is the ultimate\n", "Poké Ball.\r", @@ -87,7 +87,7 @@ ] }, { - "id": "pl_msg_00000285_00004", + "id": "GalacticHQ4F_Text_TakeWarpPanel", "en_US": [ "If you wish to save the Pokémon from\n", "the lakes, take the warp panel ahead.\r", @@ -99,14 +99,14 @@ ] }, { - "id": "pl_msg_00000285_00005", + "id": "GalacticHQ4F_Text_DoorIsLocked", "en_US": [ "The door is locked.\n", "A special key is needed." ] }, { - "id": "pl_msg_00000285_00006", + "id": "GalacticHQ4F_Text_UseGalacticKey", "en_US": [ "The door is locked.\n", "A special key is needed.\r", @@ -114,11 +114,11 @@ ] }, { - "id": "pl_msg_00000285_00007", + "id": "GalacticHQ4F_Text_DoorOpened", "en_US": "The door opened." }, { - "id": "pl_msg_00000285_00008", + "id": "GalacticHQ4F_Text_TeamGalacticWarpPanels", "en_US": [ "Team Galactic Warp Panels!\r", "The green warp panel returns you\n", @@ -128,15 +128,15 @@ ] }, { - "id": "pl_msg_00000285_00009", + "id": "GalacticHQ4F_Text_TeamGalacticReport", "en_US": "Team Galactic Report\r" }, { - "id": "pl_msg_00000285_00010", + "id": "GalacticHQ4F_Text_ReadWhichReport", "en_US": "Which report would you like to read?" }, { - "id": "pl_msg_00000285_00011", + "id": "GalacticHQ4F_Text_ReportCreationOfSpace", "en_US": [ "Some say the universe originated\n", "from a massive explosion.\r", @@ -154,7 +154,7 @@ ] }, { - "id": "pl_msg_00000285_00012", + "id": "GalacticHQ4F_Text_ReportMythicalPokemon", "en_US": [ "The mythical Pokémon...\r", "According to myths, the Pokémon\n", @@ -169,7 +169,7 @@ ] }, { - "id": "pl_msg_00000285_00013", + "id": "GalacticHQ4F_Text_ReportRedChain", "en_US": [ "The Red Chain...\r", "The Pokémon of the three lakes and\n", diff --git a/res/text/galactic_hq_b1f.json b/res/text/galactic_hq_b1f.json index e2beeaa250..f5f85b4c0d 100644 --- a/res/text/galactic_hq_b1f.json +++ b/res/text/galactic_hq_b1f.json @@ -2,7 +2,7 @@ "key": 54355, "messages": [ { - "id": "pl_msg_00000286_00000", + "id": "GalacticHQB1F_Text_GruntiestOfGrunts", "en_US": [ "I’m a Team Galactic member.\n", "But I don’t even have a Pokémon!\r", diff --git a/res/text/galactic_hq_b2f.json b/res/text/galactic_hq_b2f.json index c274cb1930..7baf29c866 100644 --- a/res/text/galactic_hq_b2f.json +++ b/res/text/galactic_hq_b2f.json @@ -2,7 +2,7 @@ "key": 54367, "messages": [ { - "id": "pl_msg_00000287_00000", + "id": "GalacticHQB2F_Text_ToGetIntoSpeech", "en_US": [ "OK, to get into Master Cyrus’s\n", "speech... Uh, where was it now?\r", @@ -15,7 +15,7 @@ ] }, { - "id": "pl_msg_00000287_00001", + "id": "GalacticHQB2F_Text_FreeAllPokemon", "en_US": [ "Team Galactic will set free all Pokémon,\n", "all of nature!\r", @@ -24,14 +24,14 @@ ] }, { - "id": "pl_msg_00000287_00002", + "id": "GalacticHQB2F_Text_DoorIsLocked", "en_US": [ "The door is locked.\n", "A special key is needed." ] }, { - "id": "pl_msg_00000287_00003", + "id": "GalacticHQB2F_Text_UseGalacticKey", "en_US": [ "The door is locked.\n", "A special key is needed.\r", @@ -39,7 +39,7 @@ ] }, { - "id": "pl_msg_00000287_00004", + "id": "GalacticHQB2F_Text_DoorOpened", "en_US": "The door opened." } ] diff --git a/res/text/galactic_hq_control_room.json b/res/text/galactic_hq_control_room.json index 94f4b4591f..1e77a5de34 100644 --- a/res/text/galactic_hq_control_room.json +++ b/res/text/galactic_hq_control_room.json @@ -2,7 +2,7 @@ "key": 54363, "messages": [ { - "id": "pl_msg_00000288_00000", + "id": "GalacticHQControlRoom_Text_SaturnIntro", "en_US": [ "You... You came all the way here\n", "just to save some Pokémon?\r", @@ -19,7 +19,7 @@ ] }, { - "id": "pl_msg_00000288_00001", + "id": "GalacticHQControlRoom_Text_WhatMakesYouSoTough", "en_US": [ "...Gah!\n", "What makes you so tough?\r", @@ -30,14 +30,14 @@ ] }, { - "id": "pl_msg_00000288_00002", + "id": "GalacticHQControlRoom_Text_PressButtonAndFreePokemon", "en_US": [ "Press the button and set them free.\n", "Isn’t that why you came?" ] }, { - "id": "pl_msg_00000288_00003", + "id": "GalacticHQControlRoom_Text_BossCraftedRedChain", "en_US": [ "Our boss crafted a Red Chain from\n", "crystals he took from the three\f", @@ -51,14 +51,14 @@ ] }, { - "id": "pl_msg_00000288_00004", + "id": "GalacticHQControlRoom_Text_PressButtonAndFreePokemon2", "en_US": [ "Press the button and set them free.\n", "Isn’t that why you came?\r" ] }, { - "id": "pl_msg_00000288_00005", + "id": "GalacticHQControlRoom_Text_WhereWouldTheyGo", "en_US": [ "Charon: Fuhyahya!\r", "Those Pokémon of the lakes, where do\n", @@ -66,11 +66,11 @@ ] }, { - "id": "pl_msg_00000288_00006", + "id": "GalacticHQControlRoom_Text_WhatAreYouSaying", "en_US": "Saturn: What are you trying to say?\r" }, { - "id": "pl_msg_00000288_00007", + "id": "GalacticHQControlRoom_Text_ILookForwardToPlan", "en_US": [ "Charon: Nothing.\n", "Pay it no heed.\r", @@ -87,7 +87,7 @@ ] }, { - "id": "pl_msg_00000288_00008", + "id": "GalacticHQControlRoom_Text_BossCanDoWithoutSupport", "en_US": [ "Saturn: Gramps.\r", "Our boss can do without your kind of\n", @@ -95,7 +95,7 @@ ] }, { - "id": "pl_msg_00000288_00009", + "id": "GalacticHQControlRoom_Text_PerhapsAnotherOption", "en_US": [ "Charon: Humph. Saturn and even Cyrus\n", "fall to a mere child...\r", @@ -109,63 +109,63 @@ ] }, { - "id": "pl_msg_00000288_00010", + "id": "GalacticHQControlRoom_Text_AskPressButton", "en_US": [ "Press the button and set\n", "the Pokémon free?" ] }, { - "id": "pl_msg_00000288_00011", + "id": "GalacticHQControlRoom_Text_PlayerPressedButton", "en_US": [ "{STRVAR_1 3, 0, 0} pressed the button and\n", "set the Pokémon free.\r" ] }, { - "id": "pl_msg_00000288_00012", + "id": "GalacticHQControlRoom_Text_AlreadyPressedButton", "en_US": [ "The button has been pressed already.\n", "You have to leave." ] }, { - "id": "pl_msg_00000288_00013", + "id": "GalacticHQControlRoom_Text_UxieIsSealedInside", "en_US": [ "UXIE is sealed inside! It appears to\n", "be suffering, with eyes squeezed shut." ] }, { - "id": "pl_msg_00000288_00014", + "id": "GalacticHQControlRoom_Text_MespritIsSealedInside", "en_US": [ "MESPRIT is sealed inside! It seems to\n", "be suffering, with its tail twitching." ] }, { - "id": "pl_msg_00000288_00015", + "id": "GalacticHQControlRoom_Text_AzelfIsSealedInside", "en_US": [ "AZELF is sealed inside! It appears to\n", "be suffering, with wracking shudders." ] }, { - "id": "pl_msg_00000288_00016", + "id": "GalacticHQControlRoom_Text_UxieWasSealedInside", "en_US": [ "It’s Team Galactic’s sinister machine.\n", "UXIE had been sealed inside it." ] }, { - "id": "pl_msg_00000288_00017", + "id": "GalacticHQControlRoom_Text_MespritWasSealedInside", "en_US": [ "It’s Team Galactic’s sinister machine.\n", "MESPRIT had been sealed inside it." ] }, { - "id": "pl_msg_00000288_00018", + "id": "GalacticHQControlRoom_Text_AzelfWasSealedInside", "en_US": [ "It’s Team Galactic’s sinister machine.\n", "AZELF had been sealed inside it." diff --git a/res/text/galactic_hq_hall.json b/res/text/galactic_hq_hall.json index 347b7131d6..b9d2b0f9dd 100644 --- a/res/text/galactic_hq_hall.json +++ b/res/text/galactic_hq_hall.json @@ -2,7 +2,7 @@ "key": 54371, "messages": [ { - "id": "pl_msg_00000290_00000", + "id": "GalacticHQHall_Text_PsstOverHere", "en_US": [ "Looker: Psst! Here.\n", "Over here.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000290_00001", + "id": "GalacticHQHall_Text_TheWorldMustChange", "en_US": [ "Cyrus: Fellow members of Team Galactic!\n", "Hear me!\r", @@ -33,7 +33,7 @@ ] }, { - "id": "pl_msg_00000290_00002", + "id": "GalacticHQHall_Text_WeWillChangeIt", "en_US": [ "Then, who will change it?\r", "Me, Cyrus. And Team Galactic.\n", @@ -49,7 +49,7 @@ ] }, { - "id": "pl_msg_00000290_00003", + "id": "GalacticHQHall_Text_LetThereBeGlory", "en_US": [ "Understand it, fellow members!\r", "My long-held dreamworld is on the\n", @@ -62,15 +62,15 @@ ] }, { - "id": "pl_msg_00000290_00004", + "id": "GalacticHQHall_Text_GruntsWroooar", "en_US": "Grunts: WROOOAR!!\r" }, { - "id": "pl_msg_00000290_00005", + "id": "GalacticHQHall_Text_CyrusIsTheGreatest", "en_US": "Grunt: Master Cyrus is the greatest!\r" }, { - "id": "pl_msg_00000290_00006", + "id": "GalacticHQHall_Text_QuiteThePerformance", "en_US": [ "Looker: ...Whew.\r", "So, that was Cyrus, the boss of the\n", @@ -92,7 +92,7 @@ ] }, { - "id": "pl_msg_00000290_00007", + "id": "GalacticHQHall_Text_Dummy7", "garbage": 34 } ] diff --git a/res/text/galactic_hq_laboratory.json b/res/text/galactic_hq_laboratory.json index dfcdfc73c7..6afeb1020f 100644 --- a/res/text/galactic_hq_laboratory.json +++ b/res/text/galactic_hq_laboratory.json @@ -2,7 +2,7 @@ "key": 54375, "messages": [ { - "id": "pl_msg_00000289_00000", + "id": "GalacticHQLaboratory_Text_ExperimentWentTooFar", "en_US": [ "I feel awful about what we did...\n", "This experiment went too far...\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000289_00001", + "id": "GalacticHQLaboratory_Text_IFeelTooSickened", "en_US": [ "Urff...\n", "I feel too sickened to say anything...\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000289_00002", + "id": "GalacticHQLaboratory_Text_SomethingInGreenFluid", "en_US": [ "There is something suspended in\n", "a green fluid..." diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index cd70553d17..7837ee8797 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -1098,19 +1098,19 @@ "en_US": "DIVE BALL" }, { - "id": "pl_msg_00000361_00268", + "id": "MenuEntries_Text_GalacticReport_CreationOfSpace", "en_US": "THE CREATION OF SPACE" }, { - "id": "pl_msg_00000361_00269", + "id": "MenuEntries_Text_GalacticReport_MythicalPokemon", "en_US": "MYTHICAL POKéMON" }, { - "id": "pl_msg_00000361_00270", + "id": "MenuEntries_Text_GalacticReport_RedChain", "en_US": "RED CHAIN" }, { - "id": "pl_msg_00000361_00271", + "id": "MenuEntries_Text_GalacticReport_Exit", "en_US": "EXIT" }, {