From 7c1e6f0a3a946f49aeba05f1fc8b68186ba8e80a Mon Sep 17 00:00:00 2001 From: Viperio <146665252+Viperio19@users.noreply.github.com> Date: Sun, 8 Mar 2026 08:29:54 +0100 Subject: [PATCH] Document floaroma and valley windworks scripts (#989) --- asm/macros/scrcmd.inc | 8 +- generated/object_events_gfx.txt | 2 +- generated/vars_flags.txt | 56 ++-- .../events/events_eterna_forest_outside.json | 16 +- res/field/events/events_fight_area.json | 16 +- res/field/events/events_floaroma_meadow.json | 16 +- .../events/events_floaroma_meadow_house.json | 4 +- res/field/events/events_floaroma_town.json | 34 +-- .../events/events_floaroma_town_mart.json | 10 +- .../events_floaroma_town_middle_house.json | 6 +- .../events_floaroma_town_pokecenter_1f.json | 12 +- .../events_floaroma_town_pokecenter_2f.json | 6 +- .../events_floaroma_town_pokecenter_b1f.json | 6 +- .../events_floaroma_town_southeast_house.json | 4 +- res/field/events/events_flower_paradise.json | 4 +- res/field/events/events_flower_shop.json | 6 +- .../events_fuego_ironworks_outside.json | 16 +- res/field/events/events_great_marsh_1.json | 2 +- res/field/events/events_great_marsh_2.json | 2 +- res/field/events/events_great_marsh_3.json | 2 +- res/field/events/events_great_marsh_4.json | 2 +- res/field/events/events_pastoria_city.json | 16 +- res/field/events/events_ravaged_path.json | 54 ++-- res/field/events/events_resort_area.json | 16 +- res/field/events/events_route_204_north.json | 20 +- res/field/events/events_route_204_south.json | 14 +- res/field/events/events_route_205_north.json | 16 +- res/field/events/events_route_205_south.json | 78 ++--- res/field/events/events_route_206.json | 16 +- res/field/events/events_route_207.json | 16 +- res/field/events/events_route_208.json | 16 +- res/field/events/events_route_209.json | 16 +- res/field/events/events_route_210_north.json | 16 +- res/field/events/events_route_210_south.json | 16 +- res/field/events/events_route_211_east.json | 16 +- res/field/events/events_route_212_north.json | 16 +- res/field/events/events_route_212_south.json | 16 +- res/field/events/events_route_213.json | 16 +- res/field/events/events_route_214.json | 16 +- res/field/events/events_route_215.json | 16 +- res/field/events/events_route_218.json | 16 +- res/field/events/events_route_221.json | 16 +- res/field/events/events_route_222.json | 16 +- res/field/events/events_route_224.json | 16 +- res/field/events/events_route_225.json | 16 +- res/field/events/events_route_226.json | 16 +- res/field/events/events_route_228.json | 16 +- res/field/events/events_route_229.json | 16 +- res/field/events/events_route_230.json | 16 +- res/field/events/events_solaceon_town.json | 16 +- .../events_valley_windworks_building.json | 32 +-- .../events_valley_windworks_outside.json | 18 +- res/field/scripts/scripts_canalave_city.s | 2 +- res/field/scripts/scripts_floaroma_meadow.s | 175 ++++++------ .../scripts/scripts_floaroma_meadow_house.s | 12 +- res/field/scripts/scripts_floaroma_town.s | 110 +++---- .../scripts_floaroma_town_middle_house.s | 42 +-- .../scripts_floaroma_town_pokecenter_1f.s | 31 +- .../scripts_floaroma_town_southeast_house.s | 12 +- res/field/scripts/scripts_flower_paradise.s | 53 ++-- res/field/scripts/scripts_flower_shop.s | 38 +-- res/field/scripts/scripts_init_new_game.s | 8 +- .../scripts_init_valley_windworks_building.s | 2 +- .../scripts_init_valley_windworks_outside.s | 2 +- res/field/scripts/scripts_ravaged_path.s | 4 +- res/field/scripts/scripts_rotoms_room.s | 10 +- res/field/scripts/scripts_route_204_north.s | 32 +-- res/field/scripts/scripts_route_204_south.s | 18 +- res/field/scripts/scripts_route_205_south.s | 169 +++++------ .../scripts_valley_windworks_building.s | 269 +++++++++--------- .../scripts_valley_windworks_outside.s | 175 ++++++------ res/text/floaroma_meadow.json | 38 +-- res/text/floaroma_meadow_house.json | 4 +- res/text/floaroma_town.json | 30 +- res/text/floaroma_town_middle_house.json | 12 +- res/text/floaroma_town_pokecenter_1f.json | 16 +- res/text/floaroma_town_southeast_house.json | 4 +- res/text/flower_paradise.json | 4 +- res/text/flower_shop.json | 8 +- res/text/route_204_north.json | 8 +- res/text/route_204_south.json | 6 +- res/text/route_205_south.json | 20 +- res/text/valley_windworks_building.json | 32 +-- res/text/valley_windworks_outside.json | 20 +- src/scrcmd.c | 14 +- 85 files changed, 1116 insertions(+), 1110 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 578c35efaf..5cf81a35b8 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -2278,11 +2278,11 @@ .short \z .endm - .macro ScrCmd_18B arg0, arg1, arg2 + .macro SetBgEventPos index, x, z .short 395 - .short \arg0 - .short \arg1 - .short \arg2 + .short \index + .short \x + .short \z .endm .macro ScrCmd_18C arg0, arg1 diff --git a/generated/object_events_gfx.txt b/generated/object_events_gfx.txt index 738da2e225..1576e60e54 100644 --- a/generated/object_events_gfx.txt +++ b/generated/object_events_gfx.txt @@ -98,7 +98,7 @@ OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST OBJ_EVENT_GFX_PLAYER_F OBJ_EVENT_GFX_PLAYER_F_BIKE OBJ_EVENT_GFX_PROF_ROWAN -OBJ_EVENT_GFX_UNK_100 +OBJ_EVENT_GFX_BERRY_SOIL OBJ_EVENT_GFX_COUNTERPART OBJ_EVENT_GFX_UNK_102 OBJ_EVENT_GFX_UNK_103 diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 0b9d4e3210..18e92da971 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -126,10 +126,10 @@ FLAG_RECEIVED_OREBURGH_CITY_NORTHWEST_HOUSE_3F_HARD_STONE FLAG_OBTAINED_FANTINA_TM65 FLAG_OBTAINED_FOCUS_BAND FLAG_UNK_0x007F -FLAG_UNK_0x0080 +FLAG_RECEIVED_FLOWER_SHOP_SPRAYDUCK FLAG_UNK_0x0081 FLAG_UNK_0x0082 -FLAG_UNK_0x0083 +FLAG_RECEIVED_FLOAROMA_TOWN_MIDDLE_HOUSE_TM88 FLAG_OLD_ROD_OBTAINED FLAG_TRADED_FOR_KAZZA_ABRA FLAG_UNK_0x0086 @@ -143,7 +143,7 @@ FLAG_UNK_0x008D FLAG_MAP_LOCAL FLAG_RECEIVED_PARCEL FLAG_HAS_POKEDEX -FLAG_UNK_0x0091 +FLAG_TALKED_TO_ROUTE_205_SOUTH_LITTLE_GIRL FLAG_OBTAINED_BYRON_TM91 FLAG_RECEIVED_HM06 FLAG_UNK_0x0094 @@ -157,8 +157,8 @@ FLAG_UNK_0x009B FLAG_OBTAINED_WAKE_TM55 FLAG_OBTAINED_MAYLENE_TM60 FLAG_OBTAINED_CANDICE_TM72 -FLAG_UNK_0x009F -FLAG_UNK_0x00A0 +FLAG_OBTAINED_FLOAROMA_MEADOW_WORKS_KEY +FLAG_DEFEATED_FLOAROMA_MEADOW_GRUNTS FLAG_UNK_0x00A1 FLAG_GOOD_ROD_OBTAINED FLAG_UNK_0x00A3 @@ -195,7 +195,7 @@ FLAG_RECEIVED_OREBURGH_CITY_NORTH_HOUSE_2F_HEAL_BALL FLAG_UNK_0x00C2 FLAG_GTS_INTRO_COMPLETED FLAG_UNK_0x00C4 -FLAG_UNK_0x00C5 +FLAG_RECEIVED_ROUTE_204_NORTH_TM78 FLAG_UNK_0x00C6 FLAG_UNK_0x00C7 FLAG_UNK_0x00C8 @@ -269,7 +269,7 @@ FLAG_UNK_0x010B FLAG_UNK_0x010C FLAG_UNK_0x010D FLAG_UNK_0x010E -FLAG_UNK_0x010F +FLAG_UNLOCKED_VALLEY_WINDWORKS_DOOR FLAG_SHOWN_COMPLETE_LOCAL_DEX FLAG_UNK_0x0111 FLAG_UNK_0x0112 @@ -289,7 +289,7 @@ FLAG_UNK_0x011F FLAG_CAUGHT_HEATRAN FLAG_CAUGHT_GIRATINA FLAG_UNK_0x0122 -FLAG_UNK_0x0123 +FLAG_CAUGHT_SHAYMIN FLAG_TALKED_TO_CELESTIC_TOWN_CAVE_CYNTHIA FLAG_CAUGHT_MESPRIT FLAG_CAUGHT_AZELF @@ -381,7 +381,7 @@ FLAG_HIDE_ROUTE_203_RIVAL FLAG_HIDE_OREBURGH_CITY_RIVAL FLAG_HIDE_ROUTE_201_BRIEFCASE FLAG_UNK_0x017E -FLAG_UNK_0x017F +FLAG_HIDE_ROUTE_205_SOUTH_YOUNGSTER FLAG_UNK_0x0180 FLAG_HIDE_JUBILIFE_CITY_LOOKER FLAG_UNK_0x0182 @@ -396,7 +396,7 @@ FLAG_HIDE_OREBURGH_MINE_B2F_ROARK FLAG_HIDE_JUBILIFE_CITY_COLLECTOR FLAG_UNK_0x018C FLAG_UNK_0x018D -FLAG_UNK_0x018E +FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_GRUNT_M FLAG_HIDE_LAKE_VERITY_LOW_WATER_STARLY FLAG_UNK_0x0190 FLAG_UNK_0x0191 @@ -412,14 +412,14 @@ FLAG_UNK_0x019A FLAG_UNK_0x019B FLAG_HIDE_JUBILIFE_GALACTIC_GRUNTS FLAG_HIDE_JUBILIFE_ROWAN -FLAG_UNK_0x019E -FLAG_UNK_0x019F -FLAG_UNK_0x01A0 -FLAG_UNK_0x01A1 -FLAG_UNK_0x01A2 +FLAG_HIDE_FLOAROMA_MEADOW_WORKS_KEY +FLAG_HIDE_FLOAROMA_MEADOW_GRUNT_M_WEST +FLAG_HIDE_FLOAROMA_MEADOW_GRUNT_M_EAST +FLAG_HIDE_FLOAROMA_TOWN_GRUNTS +FLAG_HIDE_ROUTE_205_SOUTH_GRUNTS FLAG_HIDE_LOOKER_IN_GAME_CORNER -FLAG_UNK_0x01A4 -FLAG_UNK_0x01A5 +FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_GALACTIC_GRUNT_1 +FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_TEAM_GALACTIC FLAG_UNK_0x01A6 FLAG_HIDE_ROARK_UNDERGROUND FLAG_HIDE_VEILSTONE_COUNTERPART @@ -502,9 +502,9 @@ FLAG_UNK_0x01F4 FLAG_HIDE_JUBILIFE_CITY_CLOWNS_1_AND_2 FLAG_HIDE_JUBILIFE_CITY_POKETCH_CO_PRESIDENT FLAG_HIDE_POKETCH_CO_1F_POKETCH_CO_PRESIDENT -FLAG_UNK_0x01F8 -FLAG_UNK_0x01F9 -FLAG_UNK_0x01FA +FLAG_HIDE_ROUTE_205_SOUTH_LITTLE_GIRL +FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_LITTLE_GIRL +FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_LOOKER FLAG_UNK_0x01FB FLAG_UNK_0x01FC FLAG_UNK_0x01FD @@ -521,7 +521,7 @@ FLAG_HIDE_HEARTHOME_ROUTE_209_GATE_RIVAL FLAG_UNK_0x0208 FLAG_UNK_0x0209 FLAG_HIDE_MART_MYSTERY_GIFT_DELIVERYMAN -FLAG_UNK_0x020B +FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON FLAG_UNK_0x020C FLAG_UNK_0x020D FLAG_UNK_0x020E @@ -591,7 +591,7 @@ FLAG_UNK_0x024D FLAG_UNK_0x024E FLAG_HIDE_FULLMOON_ISLAND_FOREST_CRESSELIA FLAG_HIDE_TURNBACK_CAVE_GIRATINA_ROOM_GIRATINA -FLAG_UNK_0x0251 +FLAG_HIDE_FLOWER_PARADISE_SHAYMIN FLAG_UNK_0x0252 FLAG_UNK_0x0253 FLAG_UNK_0x0254 @@ -2728,9 +2728,9 @@ FLAG_UNK_0x0AA4 FLAG_UNK_0x0AA5 FLAG_UNK_0x0AA6 FLAG_UNK_0x0AA7 -FLAG_UNK_0x0AA8 +FLAG_WON_AGAINST_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON FLAG_CHECKED_LUCKY_NUMBER -FLAG_UNK_0x0AAA +FLAG_OBTAINED_FLOWER_SHOP_BERRY FLAG_UNK_0x0AAB FLAG_UNK_0x0AAC FLAG_UNK_0x0AAD @@ -4236,7 +4236,7 @@ VAR_UNK_0x4085 VAR_FOLLOWER_RIVAL_STATE VAR_ROUTE_202_STATE VAR_ROUTE_203_RIVAL_STATE -VAR_UNK_0x4089 +VAR_VALLEY_WINDWORKS_STATE VAR_UNK_0x408A VAR_UNK_0x408B VAR_UNK_0x408C @@ -4306,7 +4306,7 @@ VAR_UNK_0x40CB VAR_UNK_0x40CC VAR_UNK_0x40CD VAR_ELEVATOR_FLOORS_ABOVE -VAR_UNK_0x40CF +VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE VAR_HAS_SEEN_UNDERGROUND_ROARK_INTRO VAR_HAS_ENTERED_HEARTHOME_GYM_BEFORE VAR_UNK_0x40D2 @@ -4332,7 +4332,7 @@ VAR_UNK_0x40E5 VAR_TWINLEAF_TOWN_RIVAL_TRIGGER_STATE VAR_POKETCH_CAMPAIGN_STATE VAR_FOLLOWER_CHERYL_TIMES_TALKED -VAR_UNK_0x40E9 +VAR_FLOAROMA_MEADOW_STATE VAR_UNK_0x40EA VAR_UNK_0x40EB VAR_UNK_0x40EC @@ -4385,7 +4385,7 @@ VAR_VEILSTONE_STATE VAR_UNK_0x411B VAR_UNK_0x411C VAR_UNK_0x411D -VAR_UNK_0x411E +VAR_VALLEY_WINDWORKS_LOOKER_STATE VAR_UNK_0x411F VARS_END SCRIPT_LOCAL_VARS_START = 32768 diff --git a/res/field/events/events_eterna_forest_outside.json b/res/field/events/events_eterna_forest_outside.json index f032e3f1b0..15c4aba39e 100644 --- a/res/field/events/events_eterna_forest_outside.json +++ b/res/field/events/events_eterna_forest_outside.json @@ -2,8 +2,8 @@ "bg_events": [], "object_events": [ { - "id": "ETERNA_FOREST_OUTSIDE_UNK_100_0", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ETERNA_FOREST_OUTSIDE_BERRY_SOIL_0", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -19,8 +19,8 @@ "y": 0 }, { - "id": "ETERNA_FOREST_OUTSIDE_UNK_100_1", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ETERNA_FOREST_OUTSIDE_BERRY_SOIL_1", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -36,8 +36,8 @@ "y": 0 }, { - "id": "ETERNA_FOREST_OUTSIDE_UNK_100_2", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ETERNA_FOREST_OUTSIDE_BERRY_SOIL_2", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -53,8 +53,8 @@ "y": 0 }, { - "id": "ETERNA_FOREST_OUTSIDE_UNK_100_3", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ETERNA_FOREST_OUTSIDE_BERRY_SOIL_3", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_fight_area.json b/res/field/events/events_fight_area.json index 54490d3628..4e34f025c8 100644 --- a/res/field/events/events_fight_area.json +++ b/res/field/events/events_fight_area.json @@ -143,8 +143,8 @@ "y": 0 }, { - "id": "FIGHT_AREA_UNK_100_9", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "FIGHT_AREA_BERRY_SOIL_9", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -160,8 +160,8 @@ "y": 0 }, { - "id": "FIGHT_AREA_UNK_100_10", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "FIGHT_AREA_BERRY_SOIL_10", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -177,8 +177,8 @@ "y": 0 }, { - "id": "FIGHT_AREA_UNK_100_11", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "FIGHT_AREA_BERRY_SOIL_11", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -194,8 +194,8 @@ "y": 0 }, { - "id": "FIGHT_AREA_UNK_100_12", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "FIGHT_AREA_BERRY_SOIL_12", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_floaroma_meadow.json b/res/field/events/events_floaroma_meadow.json index c3b0c4c0f4..fcc081acfa 100644 --- a/res/field/events/events_floaroma_meadow.json +++ b/res/field/events/events_floaroma_meadow.json @@ -91,11 +91,11 @@ ], "object_events": [ { - "id": "FLOAROMA_MEADOW_GRUNT_M_0", + "id": "LOCALID_GRUNT_M_WEST", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x019F", + "hidden_flag": "FLAG_HIDE_FLOAROMA_MEADOW_GRUNT_M_WEST", "script": 3, "initial_dir": 0, "data": [], @@ -106,11 +106,11 @@ "y": 0 }, { - "id": "FLOAROMA_MEADOW_GRUNT_M_1", + "id": "LOCALID_GRUNT_M_EAST", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01A0", + "hidden_flag": "FLAG_HIDE_FLOAROMA_MEADOW_GRUNT_M_EAST", "script": 4, "initial_dir": 0, "data": [], @@ -121,7 +121,7 @@ "y": 0 }, { - "id": "FLOAROMA_MEADOW_POKEFAN_M_2", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -136,11 +136,11 @@ "y": 0 }, { - "id": "FLOAROMA_MEADOW_POKEBALL_3", + "id": "LOCALID_ITEM_WORKS_KEY", "graphics_id": "OBJ_EVENT_GFX_POKEBALL", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x019E", + "hidden_flag": "FLAG_HIDE_FLOAROMA_MEADOW_WORKS_KEY", "script": 7, "initial_dir": 1, "data": [], @@ -251,7 +251,7 @@ "y": 0, "width": 2, "length": 1, - "var": "VAR_UNK_0x40E9", + "var": "VAR_FLOAROMA_MEADOW_STATE", "value": 0 } ] diff --git a/res/field/events/events_floaroma_meadow_house.json b/res/field/events/events_floaroma_meadow_house.json index 78bda03eaa..c20cc27f77 100644 --- a/res/field/events/events_floaroma_meadow_house.json +++ b/res/field/events/events_floaroma_meadow_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "FLOAROMA_MEADOW_HOUSE_HIKER_0", + "id": "LOCALID_HIKER", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "FLOAROMA_MEADOW_HOUSE_NINJA_BOY_1", + "id": "LOCALID_NINJA_BOY", "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_floaroma_town.json b/res/field/events/events_floaroma_town.json index ece712a3bd..fe97e62ba5 100644 --- a/res/field/events/events_floaroma_town.json +++ b/res/field/events/events_floaroma_town.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "FLOAROMA_TOWN_POKEMON_BREEDER_F_0", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 5 }, { - "id": "FLOAROMA_TOWN_LASS_1", + "id": "LOCALID_LASS_WEST", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 5 }, { - "id": "FLOAROMA_TOWN_SCHOOL_KID_M_2", + "id": "LOCALID_SCHOOL_KID_M", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 5 }, { - "id": "FLOAROMA_TOWN_BEAUTY_3", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 5 }, { - "id": "FLOAROMA_TOWN_LASS_4", + "id": "LOCALID_LASS_EAST", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,8 +77,8 @@ "y": 5 }, { - "id": "FLOAROMA_TOWN_UNK_100_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "LOCALID_BERRY_SOIL_WEST", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -92,8 +92,8 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_UNK_100_6", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "LOCALID_BERRY_SOIL_EAST", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -109,11 +109,11 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_GRUNT_M_7", + "id": "LOCALID_GRUNT_M_WEST", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01A1", + "hidden_flag": "FLAG_HIDE_FLOAROMA_TOWN_GRUNTS", "script": 2, "initial_dir": 3, "data": [], @@ -124,11 +124,11 @@ "y": 5 }, { - "id": "FLOAROMA_TOWN_GRUNT_M_8", + "id": "LOCALID_GRUNT_M_EAST", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01A1", + "hidden_flag": "FLAG_HIDE_FLOAROMA_TOWN_GRUNTS", "script": 2, "initial_dir": 2, "data": [], @@ -139,7 +139,7 @@ "y": 5 }, { - "id": "FLOAROMA_TOWN_MAP_SIGNPOST_9", + "id": "LOCALID_MAP_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_MAP_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -156,7 +156,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_SIGNBOARD_10", + "id": "LOCALID_SIGNBOARD_FLOWER_SHOP", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -171,7 +171,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_SIGNBOARD_11", + "id": "LOCALID_SIGNBOARD_FLOAROMA_MEADOW", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -188,7 +188,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_CAMPER_12", + "id": "LOCALID_CAMPER", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_floaroma_town_mart.json b/res/field/events/events_floaroma_town_mart.json index 099366d8d0..fdfe5aaffb 100644 --- a/res/field/events/events_floaroma_town_mart.json +++ b/res/field/events/events_floaroma_town_mart.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "FLOAROMA_TOWN_MART_BEAUTY_0", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_MART_SCHOOL_KID_F_1", + "id": "LOCALID_SCHOOL_KID_F", "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_F", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -34,7 +34,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_MART_CASHIER_F_2", + "id": "LOCALID_CASHIER_F", "graphics_id": "OBJ_EVENT_GFX_CASHIER_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -49,7 +49,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_MART_CASHIER_M_3", + "id": "LOCALID_CASHIER_M", "graphics_id": "OBJ_EVENT_GFX_CASHIER_M", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -64,7 +64,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_MART_MYSTERY_GIFT_DELIVERYMAN_4", + "id": "LOCALID_MYSTERY_GIFT_DELIVERYMAN", "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_floaroma_town_middle_house.json b/res/field/events/events_floaroma_town_middle_house.json index 3c4fc3c207..f691459da7 100644 --- a/res/field/events/events_floaroma_town_middle_house.json +++ b/res/field/events/events_floaroma_town_middle_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "FLOAROMA_TOWN_MIDDLE_HOUSE_POKEMON_BREEDER_F_0", + "id": "LOCALID_POKEMON_BREEDER_F", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_MIDDLE_HOUSE_TWIN_1", + "id": "LOCALID_TWIN", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_MIDDLE_HOUSE_CLEFAIRY_2", + "id": "LOCALID_CLEFAIRY", "graphics_id": "OBJ_EVENT_GFX_CLEFAIRY", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_floaroma_town_pokecenter_1f.json b/res/field/events/events_floaroma_town_pokecenter_1f.json index e3ede5273f..66f2358a36 100644 --- a/res/field/events/events_floaroma_town_pokecenter_1f.json +++ b/res/field/events/events_floaroma_town_pokecenter_1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "FLOAROMA_TOWN_POKECENTER_1F_ACE_TRAINER_F_0", + "id": "LOCALID_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_POKECENTER_1F_BATTLE_GIRL_1", + "id": "LOCALID_BATTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_POKECENTER_1F_POKECENTER_NURSE_2", + "id": "LOCALID_POKECENTER_NURSE", "graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_POKECENTER_1F_POKEFAN_M_3", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_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": "FLOAROMA_TOWN_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_floaroma_town_pokecenter_2f.json b/res/field/events/events_floaroma_town_pokecenter_2f.json index 83ded79903..2a3aa24485 100644 --- a/res/field/events/events_floaroma_town_pokecenter_2f.json +++ b/res/field/events/events_floaroma_town_pokecenter_2f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "FLOAROMA_TOWN_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": "FLOAROMA_TOWN_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": "FLOAROMA_TOWN_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_floaroma_town_pokecenter_b1f.json b/res/field/events/events_floaroma_town_pokecenter_b1f.json index 547782a65f..b3dbf33c5b 100644 --- a/res/field/events/events_floaroma_town_pokecenter_b1f.json +++ b/res/field/events/events_floaroma_town_pokecenter_b1f.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "FLOAROMA_TOWN_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": "FLOAROMA_TOWN_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": "FLOAROMA_TOWN_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_floaroma_town_southeast_house.json b/res/field/events/events_floaroma_town_southeast_house.json index a7af58bec3..ba25413434 100644 --- a/res/field/events/events_floaroma_town_southeast_house.json +++ b/res/field/events/events_floaroma_town_southeast_house.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "FLOAROMA_TOWN_SOUTHEAST_HOUSE_POKEFAN_F_0", + "id": "LOCALID_POKEFAN_F", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "FLOAROMA_TOWN_SOUTHEAST_HOUSE_POKEFAN_M_1", + "id": "LOCALID_POKEFAN_M", "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_flower_paradise.json b/res/field/events/events_flower_paradise.json index 6fef405c7c..5aef69bb33 100644 --- a/res/field/events/events_flower_paradise.json +++ b/res/field/events/events_flower_paradise.json @@ -2,11 +2,11 @@ "bg_events": [], "object_events": [ { - "id": "FLOWER_PARADISE_SHAYMIN_0", + "id": "LOCALID_SHAYMIN", "graphics_id": "OBJ_EVENT_GFX_SHAYMIN", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x0251", + "hidden_flag": "FLAG_HIDE_FLOWER_PARADISE_SHAYMIN", "script": 3, "initial_dir": 1, "data": [], diff --git a/res/field/events/events_flower_shop.json b/res/field/events/events_flower_shop.json index 195dd5baaf..0183a3b68e 100644 --- a/res/field/events/events_flower_shop.json +++ b/res/field/events/events_flower_shop.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "FLOWER_SHOP_BEAUTY_0", + "id": "LOCALID_BEAUTY", "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "FLOWER_SHOP_LASS_1", + "id": "LOCALID_LASS", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "FLOWER_SHOP_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", diff --git a/res/field/events/events_fuego_ironworks_outside.json b/res/field/events/events_fuego_ironworks_outside.json index b1f253a223..ff04fe4cb3 100644 --- a/res/field/events/events_fuego_ironworks_outside.json +++ b/res/field/events/events_fuego_ironworks_outside.json @@ -19,8 +19,8 @@ ], "object_events": [ { - "id": "FUEGO_IRONWORKS_OUTSIDE_UNK_100_0", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "FUEGO_IRONWORKS_OUTSIDE_BERRY_SOIL_0", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -36,8 +36,8 @@ "y": 0 }, { - "id": "FUEGO_IRONWORKS_OUTSIDE_UNK_100_1", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "FUEGO_IRONWORKS_OUTSIDE_BERRY_SOIL_1", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -53,8 +53,8 @@ "y": 0 }, { - "id": "FUEGO_IRONWORKS_OUTSIDE_UNK_100_2", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "FUEGO_IRONWORKS_OUTSIDE_BERRY_SOIL_2", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -70,8 +70,8 @@ "y": 0 }, { - "id": "FUEGO_IRONWORKS_OUTSIDE_UNK_100_3", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "FUEGO_IRONWORKS_OUTSIDE_BERRY_SOIL_3", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_great_marsh_1.json b/res/field/events/events_great_marsh_1.json index 584c4a36de..436fc0be06 100644 --- a/res/field/events/events_great_marsh_1.json +++ b/res/field/events/events_great_marsh_1.json @@ -84,7 +84,7 @@ "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01F9", + "hidden_flag": "MAP_HEADER_GREAT_MARSH_2", "script": 65535, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_great_marsh_2.json b/res/field/events/events_great_marsh_2.json index 5f15229ef3..fee03be93c 100644 --- a/res/field/events/events_great_marsh_2.json +++ b/res/field/events/events_great_marsh_2.json @@ -69,7 +69,7 @@ "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01F8", + "hidden_flag": "MAP_HEADER_GREAT_MARSH_1", "script": 65535, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_great_marsh_3.json b/res/field/events/events_great_marsh_3.json index f4eb2e2137..de402359df 100644 --- a/res/field/events/events_great_marsh_3.json +++ b/res/field/events/events_great_marsh_3.json @@ -68,7 +68,7 @@ "graphics_id": "OBJ_EVENT_GFX_RUIN_MANIAC", "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01F8", + "hidden_flag": "MAP_HEADER_GREAT_MARSH_1", "script": 65535, "initial_dir": 3, "data": [], diff --git a/res/field/events/events_great_marsh_4.json b/res/field/events/events_great_marsh_4.json index bec891040b..ac4028e3a3 100644 --- a/res/field/events/events_great_marsh_4.json +++ b/res/field/events/events_great_marsh_4.json @@ -84,7 +84,7 @@ "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01FA", + "hidden_flag": "MAP_HEADER_GREAT_MARSH_3", "script": 65535, "initial_dir": 0, "data": [], diff --git a/res/field/events/events_pastoria_city.json b/res/field/events/events_pastoria_city.json index 55f89e34ce..d348926afc 100644 --- a/res/field/events/events_pastoria_city.json +++ b/res/field/events/events_pastoria_city.json @@ -208,8 +208,8 @@ "y": 0 }, { - "id": "PASTORIA_CITY_UNK_100_13", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "PASTORIA_CITY_BERRY_SOIL_13", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -225,8 +225,8 @@ "y": 0 }, { - "id": "PASTORIA_CITY_UNK_100_14", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "PASTORIA_CITY_BERRY_SOIL_14", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -242,8 +242,8 @@ "y": 0 }, { - "id": "PASTORIA_CITY_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "PASTORIA_CITY_BERRY_SOIL_15", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -259,8 +259,8 @@ "y": 0 }, { - "id": "PASTORIA_CITY_UNK_100_16", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "PASTORIA_CITY_BERRY_SOIL_16", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_ravaged_path.json b/res/field/events/events_ravaged_path.json index 428380fa53..c1319f89e6 100644 --- a/res/field/events/events_ravaged_path.json +++ b/res/field/events/events_ravaged_path.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "RAVAGED_PATH_ROCK_SMASH_0", + "id": "LOCALID_ROCK_SMASH_1", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -17,7 +17,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_1", + "id": "LOCALID_ROCK_SMASH_2", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -32,7 +32,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_2", + "id": "LOCALID_ROCK_SMASH_3", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -47,7 +47,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_3", + "id": "LOCALID_ROCK_SMASH_4", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -62,7 +62,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_4", + "id": "LOCALID_ROCK_SMASH_5", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -77,7 +77,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_5", + "id": "LOCALID_ROCK_SMASH_6", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -92,7 +92,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_6", + "id": "LOCALID_ROCK_SMASH_7", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -107,7 +107,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_7", + "id": "LOCALID_ROCK_SMASH_8", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -122,7 +122,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_8", + "id": "LOCALID_ROCK_SMASH_9", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -137,7 +137,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_9", + "id": "LOCALID_ROCK_SMASH_10", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -152,7 +152,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_10", + "id": "LOCALID_ROCK_SMASH_11", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -167,7 +167,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_11", + "id": "LOCALID_ROCK_SMASH_12", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -182,7 +182,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_12", + "id": "LOCALID_ROCK_SMASH_13", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -197,7 +197,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_13", + "id": "LOCALID_ROCK_SMASH_14", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -212,7 +212,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_14", + "id": "LOCALID_ROCK_SMASH_15", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -227,7 +227,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_15", + "id": "LOCALID_ROCK_SMASH_16", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -242,7 +242,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_16", + "id": "LOCALID_ROCK_SMASH_17", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -257,7 +257,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_17", + "id": "LOCALID_ROCK_SMASH_18", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -272,7 +272,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_18", + "id": "LOCALID_ROCK_SMASH_19", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -287,7 +287,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_19", + "id": "LOCALID_ROCK_SMASH_20", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -302,7 +302,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_20", + "id": "LOCALID_ROCK_SMASH_21", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -317,7 +317,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_21", + "id": "LOCALID_ROCK_SMASH_22", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -332,7 +332,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_22", + "id": "LOCALID_ROCK_SMASH_23", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -347,7 +347,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_23", + "id": "LOCALID_ROCK_SMASH_24", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -362,7 +362,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_24", + "id": "LOCALID_ROCK_SMASH_25", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -377,7 +377,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_25", + "id": "LOCALID_ROCK_SMASH_26", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -392,7 +392,7 @@ "y": 0 }, { - "id": "RAVAGED_PATH_ROCK_SMASH_26", + "id": "LOCALID_ROCK_SMASH_27", "graphics_id": "OBJ_EVENT_GFX_ROCK_SMASH", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_resort_area.json b/res/field/events/events_resort_area.json index 5ed173a96e..b43f0340c4 100644 --- a/res/field/events/events_resort_area.json +++ b/res/field/events/events_resort_area.json @@ -126,8 +126,8 @@ "y": 0 }, { - "id": "RESORT_AREA_UNK_100_7", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "RESORT_AREA_BERRY_SOIL_7", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -143,8 +143,8 @@ "y": 0 }, { - "id": "RESORT_AREA_UNK_100_8", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "RESORT_AREA_BERRY_SOIL_8", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -160,8 +160,8 @@ "y": 0 }, { - "id": "RESORT_AREA_UNK_100_9", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "RESORT_AREA_BERRY_SOIL_9", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -177,8 +177,8 @@ "y": 0 }, { - "id": "RESORT_AREA_UNK_100_10", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "RESORT_AREA_BERRY_SOIL_10", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_204_north.json b/res/field/events/events_route_204_north.json index be864c4109..0fd76db063 100644 --- a/res/field/events/events_route_204_north.json +++ b/res/field/events/events_route_204_north.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "ROUTE_204_NORTH_BUG_CATCHER_BRANDON", + "id": "LOCALID_BUG_CATCHER_BRANDON", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "movement_type": "MOVEMENT_TYPE_WALK_BACK_AND_FORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -19,7 +19,7 @@ "y": 5 }, { - "id": "ROUTE_204_NORTH_AROMA_LADY_TAYLOR", + "id": "LOCALID_AROMA_LADY_TAYLOR", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -36,7 +36,7 @@ "y": 5 }, { - "id": "ROUTE_204_NORTH_TWIN_LIV", + "id": "LOCALID_TWIN_LIV", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -54,7 +54,7 @@ "y": 5 }, { - "id": "ROUTE_204_NORTH_TWIN_LIZ", + "id": "LOCALID_TWIN_LIZ", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -72,7 +72,7 @@ "y": 5 }, { - "id": "ROUTE_204_NORTH_YOUNGSTER_4", + "id": "LOCALID_YOUNGSTER_NORTH", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -87,7 +87,7 @@ "y": 5 }, { - "id": "ROUTE_204_NORTH_ARROW_SIGNPOST_5", + "id": "LOCALID_ARROW_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -104,7 +104,7 @@ "y": 0 }, { - "id": "ROUTE_204_NORTH_SIGNBOARD_6", + "id": "LOCALID_SIGNBOARD", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -119,7 +119,7 @@ "y": 0 }, { - "id": "ROUTE_204_NORTH_YOUNGSTER_7", + "id": "LOCALID_YOUNGSTER_SOUTH", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -134,7 +134,7 @@ "y": 0 }, { - "id": "ROUTE_204_NORTH_CUT_TREE_8", + "id": "LOCALID_CUT_TREE", "graphics_id": "OBJ_EVENT_GFX_CUT_TREE", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -164,7 +164,7 @@ "y": 0 }, { - "id": "ROUTE_204_NORTH_ACE_TRAINER_F_10", + "id": "LOCALID_ACE_TRAINER_F", "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_route_204_south.json b/res/field/events/events_route_204_south.json index 9de511fd45..a4630677a1 100644 --- a/res/field/events/events_route_204_south.json +++ b/res/field/events/events_route_204_south.json @@ -2,7 +2,7 @@ "bg_events": [], "object_events": [ { - "id": "ROUTE_204_SOUTH_LASS_SARAH", + "id": "LOCALID_LASS_SARAH", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -19,7 +19,7 @@ "y": 1 }, { - "id": "ROUTE_204_SOUTH_LASS_SAMANTHA", + "id": "LOCALID_LASS_SAMANTHA", "graphics_id": "OBJ_EVENT_GFX_LASS", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -36,7 +36,7 @@ "y": 1 }, { - "id": "ROUTE_204_SOUTH_YOUNGSTER_TYLER", + "id": "LOCALID_YOUNGSTER_TYLER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -53,7 +53,7 @@ "y": 1 }, { - "id": "ROUTE_204_SOUTH_YOUNGSTER_3", + "id": "LOCALID_YOUNGSTER_SOUTH", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -68,7 +68,7 @@ "y": 0 }, { - "id": "ROUTE_204_SOUTH_ARROW_SIGNPOST_4", + "id": "LOCALID_ARROW_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -85,7 +85,7 @@ "y": 0 }, { - "id": "ROUTE_204_SOUTH_SIGNBOARD_5", + "id": "LOCALID_SIGNBOARD", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -100,7 +100,7 @@ "y": 0 }, { - "id": "ROUTE_204_SOUTH_YOUNGSTER_6", + "id": "LOCALID_YOUNGSTER_NORTH", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_route_205_north.json b/res/field/events/events_route_205_north.json index 6c495aa845..9e7631a878 100644 --- a/res/field/events/events_route_205_north.json +++ b/res/field/events/events_route_205_north.json @@ -120,8 +120,8 @@ "y": 0 }, { - "id": "ROUTE_205_NORTH_UNK_100_7", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_205_NORTH_BERRY_SOIL_7", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -137,8 +137,8 @@ "y": 0 }, { - "id": "ROUTE_205_NORTH_UNK_100_8", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_205_NORTH_BERRY_SOIL_8", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -154,8 +154,8 @@ "y": 0 }, { - "id": "ROUTE_205_NORTH_UNK_100_9", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_205_NORTH_BERRY_SOIL_9", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -171,8 +171,8 @@ "y": 0 }, { - "id": "ROUTE_205_NORTH_UNK_100_10", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_205_NORTH_BERRY_SOIL_10", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_205_south.json b/res/field/events/events_route_205_south.json index 2d3105c0aa..7a8f1b0278 100644 --- a/res/field/events/events_route_205_south.json +++ b/res/field/events/events_route_205_south.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "ROUTE_205_SOUTH_HIKER_DANIEL", + "id": "LOCALID_HIKER_DANIEL", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -28,7 +28,7 @@ "y": 5 }, { - "id": "ROUTE_205_SOUTH_AROMA_LADY_ELIZABETH", + "id": "LOCALID_AROMA_LADY_ELIZABETH", "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F", "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -45,7 +45,7 @@ "y": 5 }, { - "id": "ROUTE_205_SOUTH_CAMPER_JACOB", + "id": "LOCALID_CAMPER_JACOB", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -62,7 +62,7 @@ "y": 6 }, { - "id": "ROUTE_205_SOUTH_PICNICKER_SIENA", + "id": "LOCALID_PICNICKER_SIENA", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -79,7 +79,7 @@ "y": 7 }, { - "id": "ROUTE_205_SOUTH_HIKER_NICHOLAS", + "id": "LOCALID_HIKER_NICHOLAS", "graphics_id": "OBJ_EVENT_GFX_HIKER", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_EAST", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -96,7 +96,7 @@ "y": 7 }, { - "id": "ROUTE_205_SOUTH_BATTLE_GIRL_KELSEY", + "id": "LOCALID_BATTLE_GIRL_KELSEY", "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", "movement_type": "MOVEMENT_TYPE_WALK_WEST_SOUTH_EAST_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -113,7 +113,7 @@ "y": 7 }, { - "id": "ROUTE_205_SOUTH_ARROW_SIGNPOST_6", + "id": "LOCALID_ARROW_SIGNPOST_FLOAROMA_TOWN", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -130,7 +130,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_ARROW_SIGNPOST_7", + "id": "LOCALID_ARROW_SIGNPOST_ETERNA_FOREST", "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -147,7 +147,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_BUG_CATCHER_8", + "id": "LOCALID_BUG_CATCHER", "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST", "trainer_type": "TRAINER_TYPE_NONE", @@ -162,7 +162,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_TRAINER_TIPS_SIGNPOST_9", + "id": "LOCALID_TRAINER_TIPS_SIGNPOST", "graphics_id": "OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -207,11 +207,11 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_GRUNT_M_12", + "id": "LOCALID_GRUNT_M_EAST", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01A2", + "hidden_flag": "FLAG_HIDE_ROUTE_205_SOUTH_GRUNTS", "script": 4, "initial_dir": 1, "data": [], @@ -222,11 +222,11 @@ "y": 5 }, { - "id": "ROUTE_205_SOUTH_GRUNT_M_13", + "id": "LOCALID_GRUNT_M_WEST", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01A2", + "hidden_flag": "FLAG_HIDE_ROUTE_205_SOUTH_GRUNTS", "script": 4, "initial_dir": 1, "data": [], @@ -237,8 +237,8 @@ "y": 5 }, { - "id": "ROUTE_205_SOUTH_UNK_100_14", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "LOCALID_BERRY_SOIL_1", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -254,8 +254,8 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "LOCALID_BERRY_SOIL_2", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -271,8 +271,8 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_UNK_100_16", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "LOCALID_BERRY_SOIL_3", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -288,8 +288,8 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_UNK_100_17", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "LOCALID_BERRY_SOIL_4", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -305,11 +305,11 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_TWIN_18", + "id": "LOCALID_LITTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01F8", + "hidden_flag": "FLAG_HIDE_ROUTE_205_SOUTH_LITTLE_GIRL", "script": 5, "initial_dir": 3, "data": [], @@ -320,12 +320,12 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_SIGNBOARD_19", + "id": "LOCALID_SIGNBOARD", "clone_id": 11, "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01AA", + "hidden_flag": "MAP_HEADER_FLOAROMA_TOWN", "script": 65535, "initial_dir": 0, "data": [ @@ -338,7 +338,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_PICNICKER_KARINA", + "id": "LOCALID_PICNICKER_KARINA", "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -355,7 +355,7 @@ "y": 7 }, { - "id": "ROUTE_205_SOUTH_CAMPER_ZACKARY", + "id": "LOCALID_CAMPER_ZACKARY", "graphics_id": "OBJ_EVENT_GFX_CAMPER", "movement_type": "MOVEMENT_TYPE_WALK_EAST_SOUTH_WEST_NORTH", "trainer_type": "TRAINER_TYPE_NORMAL", @@ -372,7 +372,7 @@ "y": 6 }, { - "id": "ROUTE_205_SOUTH_VENT_22", + "id": "LOCALID_VENT_1", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -387,7 +387,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_VENT_23", + "id": "LOCALID_VENT_2", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -402,7 +402,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_VENT_24", + "id": "LOCALID_VENT_3", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -417,7 +417,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_VENT_25", + "id": "LOCALID_VENT_4", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -432,7 +432,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_VENT_26", + "id": "LOCALID_VENT_5", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -447,7 +447,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_VENT_27", + "id": "LOCALID_VENT_6", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -462,7 +462,7 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_VENT_28", + "id": "LOCALID_VENT_7", "graphics_id": "OBJ_EVENT_GFX_VENT", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -507,11 +507,11 @@ "y": 0 }, { - "id": "ROUTE_205_SOUTH_YOUNGSTER_31", + "id": "LOCALID_YOUNGSTER", "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x017F", + "hidden_flag": "FLAG_HIDE_ROUTE_205_SOUTH_YOUNGSTER", "script": 3, "initial_dir": 0, "data": [], @@ -550,7 +550,7 @@ "y": 0, "width": 1, "length": 6, - "var": "VAR_UNK_0x4089", + "var": "VAR_VALLEY_WINDWORKS_STATE", "value": 0 }, { @@ -560,7 +560,7 @@ "y": 0, "width": 1, "length": 1, - "var": "VAR_UNK_0x4089", + "var": "VAR_VALLEY_WINDWORKS_STATE", "value": 1 } ] diff --git a/res/field/events/events_route_206.json b/res/field/events/events_route_206.json index ac27677c79..856c3341ba 100644 --- a/res/field/events/events_route_206.json +++ b/res/field/events/events_route_206.json @@ -264,8 +264,8 @@ "y": 0 }, { - "id": "ROUTE_206_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_206_BERRY_SOIL_15", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -281,8 +281,8 @@ "y": 0 }, { - "id": "ROUTE_206_UNK_100_16", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_206_BERRY_SOIL_16", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -298,8 +298,8 @@ "y": 0 }, { - "id": "ROUTE_206_UNK_100_17", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_206_BERRY_SOIL_17", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -315,8 +315,8 @@ "y": 0 }, { - "id": "ROUTE_206_UNK_100_18", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_206_BERRY_SOIL_18", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_207.json b/res/field/events/events_route_207.json index 45fc5a7b0f..e8aa796c09 100644 --- a/res/field/events/events_route_207.json +++ b/res/field/events/events_route_207.json @@ -239,8 +239,8 @@ "y": 0 }, { - "id": "ROUTE_207_UNK_100_12", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_207_BERRY_SOIL_12", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -256,8 +256,8 @@ "y": 0 }, { - "id": "ROUTE_207_UNK_100_13", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_207_BERRY_SOIL_13", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -273,8 +273,8 @@ "y": 0 }, { - "id": "ROUTE_207_UNK_100_14", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_207_BERRY_SOIL_14", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -290,8 +290,8 @@ "y": 0 }, { - "id": "ROUTE_207_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_207_BERRY_SOIL_15", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_208.json b/res/field/events/events_route_208.json index 6d3ffbb576..fe32fd853c 100644 --- a/res/field/events/events_route_208.json +++ b/res/field/events/events_route_208.json @@ -230,8 +230,8 @@ "y": 0 }, { - "id": "ROUTE_208_UNK_100_13", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_208_BERRY_SOIL_13", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -247,8 +247,8 @@ "y": 0 }, { - "id": "ROUTE_208_UNK_100_14", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_208_BERRY_SOIL_14", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -264,8 +264,8 @@ "y": 0 }, { - "id": "ROUTE_208_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_208_BERRY_SOIL_15", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -281,8 +281,8 @@ "y": 0 }, { - "id": "ROUTE_208_UNK_100_16", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_208_BERRY_SOIL_16", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_209.json b/res/field/events/events_route_209.json index 48b808d80f..250abfab0a 100644 --- a/res/field/events/events_route_209.json +++ b/res/field/events/events_route_209.json @@ -345,8 +345,8 @@ "y": 0 }, { - "id": "ROUTE_209_UNK_100_17", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_209_BERRY_SOIL_17", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -362,8 +362,8 @@ "y": 0 }, { - "id": "ROUTE_209_UNK_100_18", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_209_BERRY_SOIL_18", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -379,8 +379,8 @@ "y": 0 }, { - "id": "ROUTE_209_UNK_100_19", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_209_BERRY_SOIL_19", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -396,8 +396,8 @@ "y": 0 }, { - "id": "ROUTE_209_UNK_100_20", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_209_BERRY_SOIL_20", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_210_north.json b/res/field/events/events_route_210_north.json index 73cf6bec58..d5e58b1371 100644 --- a/res/field/events/events_route_210_north.json +++ b/res/field/events/events_route_210_north.json @@ -314,8 +314,8 @@ "y": 0 }, { - "id": "ROUTE_210_NORTH_UNK_100_18", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_210_NORTH_BERRY_SOIL_18", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -331,8 +331,8 @@ "y": 0 }, { - "id": "ROUTE_210_NORTH_UNK_100_19", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_210_NORTH_BERRY_SOIL_19", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -348,8 +348,8 @@ "y": 0 }, { - "id": "ROUTE_210_NORTH_UNK_100_20", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_210_NORTH_BERRY_SOIL_20", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -365,8 +365,8 @@ "y": 0 }, { - "id": "ROUTE_210_NORTH_UNK_100_21", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_210_NORTH_BERRY_SOIL_21", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_210_south.json b/res/field/events/events_route_210_south.json index c75288a951..e4c3bd02ee 100644 --- a/res/field/events/events_route_210_south.json +++ b/res/field/events/events_route_210_south.json @@ -294,8 +294,8 @@ "y": 0 }, { - "id": "ROUTE_210_SOUTH_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_210_SOUTH_BERRY_SOIL_15", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -311,8 +311,8 @@ "y": 0 }, { - "id": "ROUTE_210_SOUTH_UNK_100_16", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_210_SOUTH_BERRY_SOIL_16", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -328,8 +328,8 @@ "y": 0 }, { - "id": "ROUTE_210_SOUTH_UNK_100_17", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_210_SOUTH_BERRY_SOIL_17", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -345,8 +345,8 @@ "y": 0 }, { - "id": "ROUTE_210_SOUTH_UNK_100_18", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_210_SOUTH_BERRY_SOIL_18", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_211_east.json b/res/field/events/events_route_211_east.json index 4a4b4905a1..1f9dd2619c 100644 --- a/res/field/events/events_route_211_east.json +++ b/res/field/events/events_route_211_east.json @@ -214,8 +214,8 @@ "y": 0 }, { - "id": "ROUTE_211_EAST_UNK_100_13", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_211_EAST_BERRY_SOIL_13", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -231,8 +231,8 @@ "y": 0 }, { - "id": "ROUTE_211_EAST_UNK_100_14", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_211_EAST_BERRY_SOIL_14", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -248,8 +248,8 @@ "y": 0 }, { - "id": "ROUTE_211_EAST_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_211_EAST_BERRY_SOIL_15", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -265,8 +265,8 @@ "y": 0 }, { - "id": "ROUTE_211_EAST_UNK_100_16", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_211_EAST_BERRY_SOIL_16", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_212_north.json b/res/field/events/events_route_212_north.json index 976120018c..276b8df62e 100644 --- a/res/field/events/events_route_212_north.json +++ b/res/field/events/events_route_212_north.json @@ -248,8 +248,8 @@ "y": 0 }, { - "id": "ROUTE_212_NORTH_UNK_100_14", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_212_NORTH_BERRY_SOIL_14", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -265,8 +265,8 @@ "y": 0 }, { - "id": "ROUTE_212_NORTH_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_212_NORTH_BERRY_SOIL_15", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -282,8 +282,8 @@ "y": 0 }, { - "id": "ROUTE_212_NORTH_UNK_100_16", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_212_NORTH_BERRY_SOIL_16", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -299,8 +299,8 @@ "y": 0 }, { - "id": "ROUTE_212_NORTH_UNK_100_17", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_212_NORTH_BERRY_SOIL_17", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_212_south.json b/res/field/events/events_route_212_south.json index 7e10b9c31d..f11396603f 100644 --- a/res/field/events/events_route_212_south.json +++ b/res/field/events/events_route_212_south.json @@ -486,8 +486,8 @@ "y": 0 }, { - "id": "ROUTE_212_SOUTH_UNK_100_27", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_212_SOUTH_BERRY_SOIL_27", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -503,8 +503,8 @@ "y": 0 }, { - "id": "ROUTE_212_SOUTH_UNK_100_28", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_212_SOUTH_BERRY_SOIL_28", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -520,8 +520,8 @@ "y": 0 }, { - "id": "ROUTE_212_SOUTH_UNK_100_29", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_212_SOUTH_BERRY_SOIL_29", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -537,8 +537,8 @@ "y": 0 }, { - "id": "ROUTE_212_SOUTH_UNK_100_30", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_212_SOUTH_BERRY_SOIL_30", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_213.json b/res/field/events/events_route_213.json index 98a5c30d2e..3a8a401cf6 100644 --- a/res/field/events/events_route_213.json +++ b/res/field/events/events_route_213.json @@ -388,8 +388,8 @@ "y": 0 }, { - "id": "ROUTE_213_UNK_100_18", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_213_BERRY_SOIL_18", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -405,8 +405,8 @@ "y": 0 }, { - "id": "ROUTE_213_UNK_100_19", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_213_BERRY_SOIL_19", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -422,8 +422,8 @@ "y": 0 }, { - "id": "ROUTE_213_UNK_100_20", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_213_BERRY_SOIL_20", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -439,8 +439,8 @@ "y": 0 }, { - "id": "ROUTE_213_UNK_100_21", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_213_BERRY_SOIL_21", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_214.json b/res/field/events/events_route_214.json index e39e917658..e108311667 100644 --- a/res/field/events/events_route_214.json +++ b/res/field/events/events_route_214.json @@ -246,8 +246,8 @@ "y": 0 }, { - "id": "ROUTE_214_UNK_100_13", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_214_BERRY_SOIL_13", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -263,8 +263,8 @@ "y": 0 }, { - "id": "ROUTE_214_UNK_100_14", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_214_BERRY_SOIL_14", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -280,8 +280,8 @@ "y": 0 }, { - "id": "ROUTE_214_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_214_BERRY_SOIL_15", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -297,8 +297,8 @@ "y": 0 }, { - "id": "ROUTE_214_UNK_100_16", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_214_BERRY_SOIL_16", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_215.json b/res/field/events/events_route_215.json index 39192307f7..c3b0a5d29d 100644 --- a/res/field/events/events_route_215.json +++ b/res/field/events/events_route_215.json @@ -272,8 +272,8 @@ "y": 0 }, { - "id": "ROUTE_215_UNK_100_15", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_215_BERRY_SOIL_15", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -289,8 +289,8 @@ "y": 0 }, { - "id": "ROUTE_215_UNK_100_16", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_215_BERRY_SOIL_16", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -306,8 +306,8 @@ "y": 0 }, { - "id": "ROUTE_215_UNK_100_17", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_215_BERRY_SOIL_17", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -323,8 +323,8 @@ "y": 0 }, { - "id": "ROUTE_215_UNK_100_18", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_215_BERRY_SOIL_18", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_218.json b/res/field/events/events_route_218.json index 736eebb1d1..d684a452af 100644 --- a/res/field/events/events_route_218.json +++ b/res/field/events/events_route_218.json @@ -130,8 +130,8 @@ "y": 0 }, { - "id": "ROUTE_218_UNK_100_8", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_218_BERRY_SOIL_8", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -147,8 +147,8 @@ "y": 0 }, { - "id": "ROUTE_218_UNK_100_9", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_218_BERRY_SOIL_9", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -164,8 +164,8 @@ "y": 0 }, { - "id": "ROUTE_218_UNK_100_10", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_218_BERRY_SOIL_10", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -181,8 +181,8 @@ "y": 0 }, { - "id": "ROUTE_218_UNK_100_11", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_218_BERRY_SOIL_11", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_221.json b/res/field/events/events_route_221.json index ee6c1e5396..81c37e9868 100644 --- a/res/field/events/events_route_221.json +++ b/res/field/events/events_route_221.json @@ -203,8 +203,8 @@ "y": 0 }, { - "id": "ROUTE_221_UNK_100_10", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_221_BERRY_SOIL_10", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -220,8 +220,8 @@ "y": 0 }, { - "id": "ROUTE_221_UNK_100_11", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_221_BERRY_SOIL_11", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -237,8 +237,8 @@ "y": 0 }, { - "id": "ROUTE_221_UNK_100_12", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_221_BERRY_SOIL_12", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -254,8 +254,8 @@ "y": 0 }, { - "id": "ROUTE_221_UNK_100_13", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_221_BERRY_SOIL_13", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_222.json b/res/field/events/events_route_222.json index 4fd366e259..1dcf9518ec 100644 --- a/res/field/events/events_route_222.json +++ b/res/field/events/events_route_222.json @@ -401,8 +401,8 @@ "y": 0 }, { - "id": "ROUTE_222_UNK_100_21", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_222_BERRY_SOIL_21", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -418,8 +418,8 @@ "y": 0 }, { - "id": "ROUTE_222_UNK_100_22", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_222_BERRY_SOIL_22", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -435,8 +435,8 @@ "y": 0 }, { - "id": "ROUTE_222_UNK_100_23", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_222_BERRY_SOIL_23", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -452,8 +452,8 @@ "y": 0 }, { - "id": "ROUTE_222_UNK_100_24", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_222_BERRY_SOIL_24", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_224.json b/res/field/events/events_route_224.json index 072d976c02..329aad4c82 100644 --- a/res/field/events/events_route_224.json +++ b/res/field/events/events_route_224.json @@ -127,8 +127,8 @@ "y": 0 }, { - "id": "ROUTE_224_UNK_100_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_224_BERRY_SOIL_4", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -144,8 +144,8 @@ "y": 0 }, { - "id": "ROUTE_224_UNK_100_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_224_BERRY_SOIL_5", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -161,8 +161,8 @@ "y": 0 }, { - "id": "ROUTE_224_UNK_100_6", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_224_BERRY_SOIL_6", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -178,8 +178,8 @@ "y": 0 }, { - "id": "ROUTE_224_UNK_100_7", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_224_BERRY_SOIL_7", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_225.json b/res/field/events/events_route_225.json index 56f824b52f..325e03e05b 100644 --- a/res/field/events/events_route_225.json +++ b/res/field/events/events_route_225.json @@ -159,8 +159,8 @@ "y": 0 }, { - "id": "ROUTE_225_UNK_100_8", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_225_BERRY_SOIL_8", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -176,8 +176,8 @@ "y": 0 }, { - "id": "ROUTE_225_UNK_100_9", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_225_BERRY_SOIL_9", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -193,8 +193,8 @@ "y": 0 }, { - "id": "ROUTE_225_UNK_100_10", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_225_BERRY_SOIL_10", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -210,8 +210,8 @@ "y": 0 }, { - "id": "ROUTE_225_UNK_100_11", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_225_BERRY_SOIL_11", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_226.json b/res/field/events/events_route_226.json index d15e60dfbe..edb3bf4694 100644 --- a/res/field/events/events_route_226.json +++ b/res/field/events/events_route_226.json @@ -105,8 +105,8 @@ "y": 0 }, { - "id": "ROUTE_226_UNK_100_4", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_226_BERRY_SOIL_4", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -122,8 +122,8 @@ "y": 0 }, { - "id": "ROUTE_226_UNK_100_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_226_BERRY_SOIL_5", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -139,8 +139,8 @@ "y": 0 }, { - "id": "ROUTE_226_UNK_100_6", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_226_BERRY_SOIL_6", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -156,8 +156,8 @@ "y": 0 }, { - "id": "ROUTE_226_UNK_100_7", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_226_BERRY_SOIL_7", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_228.json b/res/field/events/events_route_228.json index 7d0604c852..7fc2dc5b1d 100644 --- a/res/field/events/events_route_228.json +++ b/res/field/events/events_route_228.json @@ -220,8 +220,8 @@ "y": 0 }, { - "id": "ROUTE_228_UNK_100_11", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_228_BERRY_SOIL_11", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -237,8 +237,8 @@ "y": 0 }, { - "id": "ROUTE_228_UNK_100_12", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_228_BERRY_SOIL_12", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -254,8 +254,8 @@ "y": 0 }, { - "id": "ROUTE_228_UNK_100_13", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_228_BERRY_SOIL_13", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -271,8 +271,8 @@ "y": 0 }, { - "id": "ROUTE_228_UNK_100_14", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_228_BERRY_SOIL_14", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_229.json b/res/field/events/events_route_229.json index c96d1a2375..d67867e1be 100644 --- a/res/field/events/events_route_229.json +++ b/res/field/events/events_route_229.json @@ -163,8 +163,8 @@ "y": 0 }, { - "id": "ROUTE_229_UNK_100_10", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_229_BERRY_SOIL_10", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -180,8 +180,8 @@ "y": 0 }, { - "id": "ROUTE_229_UNK_100_11", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_229_BERRY_SOIL_11", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -197,8 +197,8 @@ "y": 0 }, { - "id": "ROUTE_229_UNK_100_12", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_229_BERRY_SOIL_12", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -214,8 +214,8 @@ "y": 0 }, { - "id": "ROUTE_229_UNK_100_13", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_229_BERRY_SOIL_13", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_route_230.json b/res/field/events/events_route_230.json index f5a3f134dd..92a7ddeee2 100644 --- a/res/field/events/events_route_230.json +++ b/res/field/events/events_route_230.json @@ -94,8 +94,8 @@ "y": 0 }, { - "id": "ROUTE_230_UNK_100_5", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_230_BERRY_SOIL_5", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -111,8 +111,8 @@ "y": 0 }, { - "id": "ROUTE_230_UNK_100_6", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_230_BERRY_SOIL_6", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -128,8 +128,8 @@ "y": 0 }, { - "id": "ROUTE_230_UNK_100_7", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_230_BERRY_SOIL_7", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -145,8 +145,8 @@ "y": 0 }, { - "id": "ROUTE_230_UNK_100_8", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "ROUTE_230_BERRY_SOIL_8", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_solaceon_town.json b/res/field/events/events_solaceon_town.json index eccaa2c187..99700a4198 100644 --- a/res/field/events/events_solaceon_town.json +++ b/res/field/events/events_solaceon_town.json @@ -148,8 +148,8 @@ "y": 7 }, { - "id": "SOLACEON_TOWN_UNK_100_9", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "SOLACEON_TOWN_BERRY_SOIL_9", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -165,8 +165,8 @@ "y": 0 }, { - "id": "SOLACEON_TOWN_UNK_100_10", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "SOLACEON_TOWN_BERRY_SOIL_10", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -182,8 +182,8 @@ "y": 0 }, { - "id": "SOLACEON_TOWN_UNK_100_11", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "SOLACEON_TOWN_BERRY_SOIL_11", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", @@ -199,8 +199,8 @@ "y": 0 }, { - "id": "SOLACEON_TOWN_UNK_100_12", - "graphics_id": "OBJ_EVENT_GFX_UNK_100", + "id": "SOLACEON_TOWN_BERRY_SOIL_12", + "graphics_id": "OBJ_EVENT_GFX_BERRY_SOIL", "movement_type": "MOVEMENT_TYPE_BERRY_SOIL", "trainer_type": "TRAINER_TYPE_NONE", "hidden_flag": "0", diff --git a/res/field/events/events_valley_windworks_building.json b/res/field/events/events_valley_windworks_building.json index af518ebb9b..5824ce2ca9 100644 --- a/res/field/events/events_valley_windworks_building.json +++ b/res/field/events/events_valley_windworks_building.json @@ -19,11 +19,11 @@ ], "object_events": [ { - "id": "VALLEY_WINDWORKS_BUILDING_GRUNT_M_0", + "id": "LOCALID_GALACTIC_GRUNT_1", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01A4", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_GALACTIC_GRUNT_1", "script": 0, "initial_dir": 1, "data": [], @@ -34,11 +34,11 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_BUILDING_MARS_1", + "id": "LOCALID_MARS", "graphics_id": "OBJ_EVENT_GFX_MARS", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01A5", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_TEAM_GALACTIC", "script": 4, "initial_dir": 2, "data": [], @@ -49,7 +49,7 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_BUILDING_SCIENTIST_M_2", + "id": "LOCALID_SCIENTIST_PAPA", "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NONE", @@ -64,11 +64,11 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_BUILDING_GALACTIC_GRUNT_2", + "id": "LOCALID_GALACTIC_GRUNT_2", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_WEST", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x01A5", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_VALLEY_WINDWORKS_2", "initial_dir": 2, "data": [ @@ -81,11 +81,11 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_BUILDING_GALACTIC_GRUNT_3", + "id": "LOCALID_GALACTIC_GRUNT_3", "graphics_id": "OBJ_EVENT_GFX_GRUNT_M", "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH", "trainer_type": "TRAINER_TYPE_NORMAL", - "hidden_flag": "FLAG_UNK_0x01A5", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_TEAM_GALACTIC", "script": "TRAINER_GALACTIC_GRUNT_VALLEY_WINDWORKS_3", "initial_dir": 1, "data": [ @@ -98,11 +98,11 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_BUILDING_TWIN_5", + "id": "LOCALID_LITTLE_GIRL", "graphics_id": "OBJ_EVENT_GFX_TWIN", "movement_type": "MOVEMENT_TYPE_LOOK_EAST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01F9", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_LITTLE_GIRL", "script": 6, "initial_dir": 3, "data": [], @@ -113,11 +113,11 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_BUILDING_GALACTIC_GRUNT_1", + "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_0x01A5", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_TEAM_GALACTIC", "script": 3, "initial_dir": 1, "data": [], @@ -128,11 +128,11 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_BUILDING_CHARON_7", + "id": "LOCALID_CHARON", "graphics_id": "OBJ_EVENT_GFX_CHARON", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01A5", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_TEAM_GALACTIC", "script": 0, "initial_dir": 2, "data": [], @@ -159,7 +159,7 @@ "y": 0, "width": 1, "length": 2, - "var": "VAR_UNK_0x40CF", + "var": "VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE", "value": 1 } ] diff --git a/res/field/events/events_valley_windworks_outside.json b/res/field/events/events_valley_windworks_outside.json index f5eaad086a..10753a291e 100644 --- a/res/field/events/events_valley_windworks_outside.json +++ b/res/field/events/events_valley_windworks_outside.json @@ -19,11 +19,11 @@ ], "object_events": [ { - "id": "VALLEY_WINDWORKS_OUTSIDE_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_0x018E", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_GRUNT_M", "script": 3, "initial_dir": 1, "data": [ @@ -36,7 +36,7 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_OUTSIDE_SIGNBOARD_1", + "id": "LOCALID_SIGNBOARD", "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", @@ -51,12 +51,12 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_OUTSIDE_ARROW_SIGNPOST_2", + "id": "LOCALID_ARROW_SIGNPOST", "clone_id": 6, "graphics_id": "OBJ_EVENT_GFX_ARROW_SIGNPOST", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x015B", + "hidden_flag": "MAP_HEADER_ROUTE_205_SOUTH", "script": 65535, "initial_dir": 0, "data": [ @@ -84,11 +84,11 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_OUTSIDE_DRIFLOON_4", + "id": "LOCALID_DRIFLOON", "graphics_id": "OBJ_EVENT_GFX_DRIFLOON", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x020B", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON", "script": 6, "initial_dir": 1, "data": [ @@ -116,11 +116,11 @@ "y": 0 }, { - "id": "VALLEY_WINDWORKS_OUTSIDE_LOOKER_6", + "id": "LOCALID_LOOKER", "graphics_id": "OBJ_EVENT_GFX_LOOKER", "movement_type": "MOVEMENT_TYPE_LOOK_NORTH", "trainer_type": "TRAINER_TYPE_NONE", - "hidden_flag": "FLAG_UNK_0x01FA", + "hidden_flag": "FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_LOOKER", "script": 0, "initial_dir": 0, "data": [ diff --git a/res/field/scripts/scripts_canalave_city.s b/res/field/scripts/scripts_canalave_city.s index fe0fdbacde..6c73768a12 100644 --- a/res/field/scripts/scripts_canalave_city.s +++ b/res/field/scripts/scripts_canalave_city.s @@ -110,7 +110,7 @@ _01D2: End _01E7: - ScrCmd_18B 0, 58, 0x2C9 + SetBgEventPos 0, 58, 0x2C9 SetWarpEventPos 5, 59, 0x2C8 Return diff --git a/res/field/scripts/scripts_floaroma_meadow.s b/res/field/scripts/scripts_floaroma_meadow.s index 5d7042d8bb..fd522fc66e 100644 --- a/res/field/scripts/scripts_floaroma_meadow.s +++ b/res/field/scripts/scripts_floaroma_meadow.s @@ -1,53 +1,54 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_meadow.h" +#include "res/field/events/events_floaroma_meadow.h" - ScriptEntry _001E - ScriptEntry _0024 - ScriptEntry _01D8 - ScriptEntry _01D8 - ScriptEntry _01DA - ScriptEntry _02EF - ScriptEntry _0306 + ScriptEntry FloaromaMeadow_OnTransition + ScriptEntry FloaromaMeadow_TriggerGrunts + ScriptEntry FloaromaMeadow_UnusedGrunt + ScriptEntry FloaromaMeadow_UnusedGrunt + ScriptEntry FloaromaMeadow_PokefanM + ScriptEntry FloaromaMeadow_UnusedArrowSign + ScriptEntry FloaromaMeadow_ItemWorksKey ScriptEntryEnd -_001E: +FloaromaMeadow_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_FLOAROMA_MEADOW End -_0024: +FloaromaMeadow_TriggerGrunts: LockAll - Call _00CC + Call FloaromaMeadow_GruntsNoticePlayer StartTrainerBattle TRAINER_GALACTIC_GRUNT_FLOAROMA_MEADOW_1 CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _006E - Call _00EE + GoToIfEq VAR_RESULT, FALSE, FloaromaMeadow_BlackOut + Call FloaromaMeadow_DefeatedGrunt1 StartTrainerBattle TRAINER_GALACTIC_GRUNT_FLOAROMA_MEADOW_2 CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _006E - Call _010E + GoToIfEq VAR_RESULT, FALSE, FloaromaMeadow_BlackOut + Call FloaromaMeadow_DefeatedGrunts SetFlag FLAG_ALT_MUSIC_FLOAROMA_MEADOW ReleaseAll End -_006E: +FloaromaMeadow_BlackOut: BlackOutFromBattle ReleaseAll End .balign 4, 0 -_0074: +FloaromaMeadow_Movement_GruntNoticePlayer: WalkOnSpotNormalSouth EmoteExclamationMark EndMovement .balign 4, 0 -_0080: +FloaromaMeadow_Movement_GruntWestWalkOnSpotEast: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0088: +FloaromaMeadow_Movement_GruntWestWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement @@ -60,7 +61,7 @@ FloaromaMeadow_UnusedMovement2: EndMovement .balign 4, 0 -_00A0: +FloaromaMeadow_Movement_PokefanMWalkToPlayerX12: WalkNormalSouth WalkOnSpotNormalEast Delay8 3 @@ -68,7 +69,7 @@ _00A0: EndMovement .balign 4, 0 -_00B4: +FloaromaMeadow_Movement_PokefanMWalkToPlayerX13: WalkNormalSouth WalkOnSpotNormalEast Delay8 3 @@ -76,72 +77,72 @@ _00B4: WalkOnSpotNormalSouth EndMovement -_00CC: - Message 0 - Message 1 - ApplyMovement 0, _0074 - ApplyMovement 1, _0074 +FloaromaMeadow_GruntsNoticePlayer: + Message FloaromaMeadow_Text_EnoughArguingHandOverThatSweetHoney + Message FloaromaMeadow_Text_DoAsWeSayTeamGalacticWillHaveThatHoney + ApplyMovement LOCALID_GRUNT_M_WEST, FloaromaMeadow_Movement_GruntNoticePlayer + ApplyMovement LOCALID_GRUNT_M_EAST, FloaromaMeadow_Movement_GruntNoticePlayer WaitMovement - Message 2 - Message 3 + Message FloaromaMeadow_Text_HeyThisKidIsAWitnessWhatllWeDo + Message FloaromaMeadow_Text_TheSolutionsSimpleWeEnsureTheBratStaysQuiet CloseMessage Return -_00EE: - ApplyMovement 0, _0080 +FloaromaMeadow_DefeatedGrunt1: + ApplyMovement LOCALID_GRUNT_M_WEST, FloaromaMeadow_Movement_GruntWestWalkOnSpotEast WaitMovement - Message 4 + Message FloaromaMeadow_Text_ThisIsSoLameTheyreGoingToDockMyPay CloseMessage - ApplyMovement 0, _0088 + ApplyMovement LOCALID_GRUNT_M_WEST, FloaromaMeadow_Movement_GruntWestWalkOnSpotSouth WaitMovement - Message 5 + Message FloaromaMeadow_Text_ImUpNextHeheheh CloseMessage Return -_010E: - Message 6 +FloaromaMeadow_DefeatedGrunts: + Message FloaromaMeadow_Text_WereDoneForHereLetsGetBackToTheValleyWindworks CloseMessage FadeScreenOut WaitFadeScreen - RemoveObject 0 - RemoveObject 1 - SetVar VAR_UNK_0x40E9, 1 + RemoveObject LOCALID_GRUNT_M_WEST + RemoveObject LOCALID_GRUNT_M_EAST + SetVar VAR_FLOAROMA_MEADOW_STATE, 1 FadeScreenIn WaitFadeScreen - ClearFlag FLAG_UNK_0x019E - AddObject 3 + ClearFlag FLAG_HIDE_FLOAROMA_MEADOW_WORKS_KEY + AddObject LOCALID_ITEM_WORKS_KEY GetPlayerMapPos VAR_0x8004, VAR_0x8005 - CallIfEq VAR_0x8004, 12, _01BA - CallIfEq VAR_0x8004, 13, _01C6 - RemoveObject 3 - Message 7 + CallIfEq VAR_0x8004, 12, FloaromaMeadow_PokefanMWalkToPlayerX12 + CallIfEq VAR_0x8004, 13, FloaromaMeadow_PokefanMWalkToPlayerX13 + RemoveObject LOCALID_ITEM_WORKS_KEY + Message FloaromaMeadow_Text_ItsAWorksKeyItMustBeForTheValleyWindworks SetVar VAR_0x8004, ITEM_WORKS_KEY SetVar VAR_0x8005, 1 Common_GiveItemQuantity - SetFlag FLAG_UNK_0x009F - Message 8 + SetFlag FLAG_OBTAINED_FLOAROMA_MEADOW_WORKS_KEY + Message FloaromaMeadow_Text_INeedToThankYouThisSweetSweetHoneyGoOnTakeAWholeLot SetVar VAR_0x8004, ITEM_HONEY SetVar VAR_0x8005, 10 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _01AD + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, FloaromaMeadow_CantGiveHoneyBagIsFull Common_GiveItemQuantity - Message 9 - GoTo _01B0 + Message FloaromaMeadow_Text_SlatherThatHoneyOnASweetSmellingTree + GoTo FloaromaMeadow_DefeatedGruntsReturn -_01AD: - Message 12 -_01B0: - SetFlag FLAG_UNK_0x00A0 +FloaromaMeadow_CantGiveHoneyBagIsFull: + Message FloaromaMeadow_Text_OhTooBadSeemsToMeYourBagsFull +FloaromaMeadow_DefeatedGruntsReturn: + SetFlag FLAG_DEFEATED_FLOAROMA_MEADOW_GRUNTS WaitABXPadPress CloseMessage Return -_01BA: - ApplyMovement 2, _00A0 +FloaromaMeadow_PokefanMWalkToPlayerX12: + ApplyMovement LOCALID_POKEFAN_M, FloaromaMeadow_Movement_PokefanMWalkToPlayerX12 WaitMovement Return -_01C6: - ApplyMovement 2, _00B4 +FloaromaMeadow_PokefanMWalkToPlayerX13: + ApplyMovement LOCALID_POKEFAN_M, FloaromaMeadow_Movement_PokefanMWalkToPlayerX13 WaitMovement Return @@ -150,49 +151,49 @@ FloaromaMeadow_Unused: ReleaseAll End -_01D8: +FloaromaMeadow_UnusedGrunt: End -_01DA: +FloaromaMeadow_PokefanM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 10 + Message FloaromaMeadow_Text_WouldYouLikeToBuySomeHoneyForAttractingPokemon ShowMoney 20, 2 - GoTo _01F3 + GoTo FloaromaMeadow_ShowMenuHoney End -_01F3: +FloaromaMeadow_ShowMenuHoney: InitLocalTextMenu 30, 11, 0, VAR_RESULT SetMenuXOriginToRight - AddMenuEntryImm 15, 0 - AddMenuEntryImm 16, 1 - AddMenuEntryImm 17, 2 + AddMenuEntryImm FloaromaMeadow_Text_Times1, 0 + AddMenuEntryImm FloaromaMeadow_Text_Times10, 1 + AddMenuEntryImm FloaromaMeadow_Text_NoThanks, 2 ShowMenu SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _0241 - GoToIfEq VAR_0x8008, 1, _026A - GoToIfEq VAR_0x8008, 2, _02C8 - GoTo _02C8 + GoToIfEq VAR_0x8008, 0, FloaromaMeadow_TryBuy1Honey + GoToIfEq VAR_0x8008, 1, FloaromaMeadow_TryBuy10Honey + GoToIfEq VAR_0x8008, 2, FloaromaMeadow_OopsyWellComeAgain + GoTo FloaromaMeadow_OopsyWellComeAgain End -_0241: - GoToIfNotEnoughMoney 100, _02E2 +FloaromaMeadow_TryBuy1Honey: + GoToIfNotEnoughMoney 100, FloaromaMeadow_OopsyYouDontHaveEnoughMoney SetVar VAR_0x8005, 1 SetVar VAR_0x8006, 100 - GoTo _0293 + GoTo FloaromaMeadow_TryGiveHoney End -_026A: - GoToIfNotEnoughMoney 1000, _02E2 +FloaromaMeadow_TryBuy10Honey: + GoToIfNotEnoughMoney 1000, FloaromaMeadow_OopsyYouDontHaveEnoughMoney SetVar VAR_0x8005, 10 SetVar VAR_0x8006, 1000 - GoTo _0293 + GoTo FloaromaMeadow_TryGiveHoney End -_0293: +FloaromaMeadow_TryGiveHoney: SetVar VAR_0x8004, ITEM_HONEY - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _02D5 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, FloaromaMeadow_CantBuyHoneyBagIsFull RemoveMoney2 VAR_0x8006 UpdateMoneyDisplay PlayFanfare SEQ_SE_DP_REGI @@ -203,35 +204,35 @@ _0293: ReleaseAll End -_02C8: - Message 14 +FloaromaMeadow_OopsyWellComeAgain: + Message FloaromaMeadow_Text_OopsyWellComeAgain WaitABXPadPress HideMoney CloseMessage ReleaseAll End -_02D5: - Message 12 +FloaromaMeadow_CantBuyHoneyBagIsFull: + Message FloaromaMeadow_Text_OhTooBadSeemsToMeYourBagsFull WaitABXPadPress HideMoney CloseMessage ReleaseAll End -_02E2: - Message 13 +FloaromaMeadow_OopsyYouDontHaveEnoughMoney: + Message FloaromaMeadow_Text_OopsyYouDontHaveEnoughMoney WaitABXPadPress HideMoney CloseMessage ReleaseAll End -_02EF: - ShowArrowSign 18 +FloaromaMeadow_UnusedArrowSign: + ShowArrowSign FloaromaMeadow_Text_Dummy18 End -_0306: +FloaromaMeadow_ItemWorksKey: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer @@ -239,7 +240,7 @@ _0306: SetVar VAR_0x8005, 1 Common_GiveItemQuantity CloseMessage - SetFlag FLAG_UNK_0x009F - RemoveObject 3 + SetFlag FLAG_OBTAINED_FLOAROMA_MEADOW_WORKS_KEY + RemoveObject LOCALID_ITEM_WORKS_KEY ReleaseAll End diff --git a/res/field/scripts/scripts_floaroma_meadow_house.s b/res/field/scripts/scripts_floaroma_meadow_house.s index 9eba86a6de..f044af325a 100644 --- a/res/field/scripts/scripts_floaroma_meadow_house.s +++ b/res/field/scripts/scripts_floaroma_meadow_house.s @@ -2,14 +2,14 @@ #include "res/text/bank/floaroma_meadow_house.h" - ScriptEntry _000A - ScriptEntry _001D + ScriptEntry FloaromaMeadowHouse_Hiker + ScriptEntry FloaromaMeadowHouse_NinjaBoy ScriptEntryEnd -_000A: - NPCMessage 0 +FloaromaMeadowHouse_Hiker: + NPCMessage FloaromaMeadowHouse_Text_TheFlowersThatGrowInTheFieldsHereAreSpecial End -_001D: - NPCMessage 1 +FloaromaMeadowHouse_NinjaBoy: + NPCMessage FloaromaMeadowHouse_Text_IfYouPutHoneyOnATreeCheckBackLaterToSeeIfItsRustlings End diff --git a/res/field/scripts/scripts_floaroma_town.s b/res/field/scripts/scripts_floaroma_town.s index 7ba24be7a1..2efe7fd118 100644 --- a/res/field/scripts/scripts_floaroma_town.s +++ b/res/field/scripts/scripts_floaroma_town.s @@ -1,132 +1,132 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_town.h" +#include "res/field/events/events_floaroma_town.h" - - ScriptEntry _002E - ScriptEntry _0030 - ScriptEntry _006C - ScriptEntry _00B0 - ScriptEntry _00C3 - ScriptEntry _00D6 - ScriptEntry _00E9 - ScriptEntry _00FC - ScriptEntry _0113 - ScriptEntry _012A - ScriptEntry _0141 + ScriptEntry FloaromaTown_OnTransition + ScriptEntry FloaromaTown_Grunts + ScriptEntry FloaromaTown_SchoolKidM + ScriptEntry FloaromaTown_LassWest + ScriptEntry FloaromaTown_PokemonBreederF + ScriptEntry FloaromaTown_LassEast + ScriptEntry FloaromaTown_Camper + ScriptEntry FloaromaTown_MapSignpost + ScriptEntry FloaromaTown_LandmarkSignFlowerShop + ScriptEntry FloaromaTown_LandmarkSignFloaromaMeadow + ScriptEntry FloaromaTown_Beauty ScriptEntryEnd -_002E: +FloaromaTown_OnTransition: End -_0030: +FloaromaTown_Grunts: PlayFanfare SEQ_SE_CONFIRM LockAll - ApplyMovement 7, _005C + ApplyMovement LOCALID_GRUNT_M_WEST, FloaromaTown_Movement_WalkOnSpotEast WaitMovement - Message 0 + Message FloaromaTown_Text_ThisDoesntSeemAllThatCool CloseMessage - ApplyMovement 8, _0064 + ApplyMovement LOCALID_GRUNT_M_EAST, FloaromaTown_Movement_WalkOnSpotWest WaitMovement - Message 1 + Message FloaromaTown_Text_DontComplainThisIsAPrettyDecentAssignment WaitABXPadPress CloseMessage ReleaseAll End .balign 4, 0 -_005C: +FloaromaTown_Movement_WalkOnSpotEast: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0064: +FloaromaTown_Movement_WalkOnSpotWest: WalkOnSpotNormalWest EndMovement -_006C: +FloaromaTown_SchoolKidM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_UNK_0x40CF, 2, _0099 - Message 2 - ApplyMovement 2, _00A4 + GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 2, FloaromaTown_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood + Message FloaromaTown_Text_IWantedToGetSomeFlowersFromTheFloaromaMeadow + ApplyMovement LOCALID_SCHOOL_KID_M, FloaromaTown_Movement_SchoolKidMFaceNorth WaitMovement - Message 3 + Message FloaromaTown_Text_ThoseGalacticGuysWentToTheMeadowPastTheseFlowersHere WaitABXPadPress CloseMessage ReleaseAll End -_0099: - Message 4 +FloaromaTown_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood: + Message FloaromaTown_Text_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood WaitABXPadPress CloseMessage ReleaseAll End .balign 4, 0 -_00A4: +FloaromaTown_Movement_SchoolKidMFaceNorth: FaceNorth Delay8 3 EndMovement -_00B0: - NPCMessage 5 +FloaromaTown_LassWest: + NPCMessage FloaromaTown_Text_ISimplyLoveItHere End -_00C3: - NPCMessage 6 +FloaromaTown_PokemonBreederF: + NPCMessage FloaromaTown_Text_WelcomeToFloaromaTheTownOfFlowersFlowersAndMoreFlowers End -_00D6: - NPCMessage 7 +FloaromaTown_LassEast: + NPCMessage FloaromaTown_Text_TheBerriesYouPickCanBeUsedAsFoodForPokemon End -_00E9: - NPCMessage 8 +FloaromaTown_Camper: + NPCMessage FloaromaTown_Text_IGotDrawnHereByTheSweetScentOfHoney End -_00FC: - ShowMapSign 12 +FloaromaTown_MapSignpost: + ShowMapSign FloaromaTown_Text_MapSign End -_0113: - ShowLandmarkSign 13 +FloaromaTown_LandmarkSignFlowerShop: + ShowLandmarkSign FloaromaTown_Text_PickAPeckOfColorsFlowerShopFreeBerriesAvailable End -_012A: - ShowLandmarkSign 14 +FloaromaTown_LandmarkSignFloaromaMeadow: + ShowLandmarkSign FloaromaTown_Text_FloaromaMeadowAheadHoneyAvailable End -_0141: +FloaromaTown_Beauty: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer FindPartySlotWithFatefulEncounterSpecies VAR_RESULT, SPECIES_SHAYMIN - GoToIfEq VAR_RESULT, 0xFF, _019D + GoToIfEq VAR_RESULT, 0xFF, FloaromaTown_DoYouKnowAboutGracideaFlowers CheckPartyHasSpecies VAR_RESULT, SPECIES_SHAYMIN - GoToIfEq VAR_RESULT, 0, _019D + GoToIfEq VAR_RESULT, FALSE, FloaromaTown_DoYouKnowAboutGracideaFlowers CheckItem ITEM_GRACIDEA, 1, VAR_RESULT - GoToIfNe VAR_RESULT, 0, _01A8 - Message 9 - SetVar VAR_0x8004, 0x1D2 + GoToIfNe VAR_RESULT, FALSE, FloaromaTown_GracideaFlowersHaveBeenAroundALongTimeInThisRegion + Message FloaromaTown_Text_IfYouHaveAShayminThenYouAlsoShouldHaveSomeGracideaFlowers + SetVar VAR_0x8004, ITEM_GRACIDEA SetVar VAR_0x8005, 1 Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_019D: - Message 11 - GoTo _01B3 +FloaromaTown_DoYouKnowAboutGracideaFlowers: + Message FloaromaTown_Text_DoYouKnowAboutGracideaFlowers + GoTo FloaromaTown_BeautyEnd End -_01A8: - Message 10 - GoTo _01B3 +FloaromaTown_GracideaFlowersHaveBeenAroundALongTimeInThisRegion: + Message FloaromaTown_Text_GracideaFlowersHaveBeenAroundALongTimeInThisRegion + GoTo FloaromaTown_BeautyEnd End -_01B3: +FloaromaTown_BeautyEnd: WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_floaroma_town_middle_house.s b/res/field/scripts/scripts_floaroma_town_middle_house.s index 6d78916a34..c00621b7a6 100644 --- a/res/field/scripts/scripts_floaroma_town_middle_house.s +++ b/res/field/scripts/scripts_floaroma_town_middle_house.s @@ -2,57 +2,57 @@ #include "res/text/bank/floaroma_town_middle_house.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _00A9 + ScriptEntry FloaromaTownMiddleHouse_PokemonBreederF + ScriptEntry FloaromaTownMiddleHouse_Twin + ScriptEntry FloaromaTownMiddleHouse_Clefairy ScriptEntryEnd -_000E: - NPCMessage 0 +FloaromaTownMiddleHouse_PokemonBreederF: + NPCMessage FloaromaTownMiddleHouse_Text_FloaromaTownWasABarrenDesolateHillLongAgo End -_0021: +FloaromaTownMiddleHouse_Twin: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0083, _0094 - Message 1 + GoToIfSet FLAG_RECEIVED_FLOAROMA_TOWN_MIDDLE_HOUSE_TM88, FloaromaTownMiddleHouse_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe + Message FloaromaTownMiddleHouse_Text_DoYouThinkItsCuteHowPokemonPluckBerries ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0062 - GoToIfEq VAR_RESULT, MENU_NO, _0057 + GoToIfEq VAR_RESULT, MENU_YES, FloaromaTownMiddleHouse_HeresTheTMForTheMovePluck + GoToIfEq VAR_RESULT, MENU_NO, FloaromaTownMiddleHouse_OhIGuessIJustLikeWeirdThings End -_0057: - Message 3 +FloaromaTownMiddleHouse_OhIGuessIJustLikeWeirdThings: + Message FloaromaTownMiddleHouse_Text_OhIGuessIJustLikeWeirdThings WaitABXPadPress CloseMessage ReleaseAll End -_0062: - Message 2 +FloaromaTownMiddleHouse_HeresTheTMForTheMovePluck: + Message FloaromaTownMiddleHouse_Text_HeresTheTMForTheMovePluck SetVar VAR_0x8004, ITEM_TM88 SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _009F - SetFlag FLAG_UNK_0x0083 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, FloaromaTownMiddleHouse_BagIsFull + SetFlag FLAG_RECEIVED_FLOAROMA_TOWN_MIDDLE_HOUSE_TM88 Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_0094: - Message 4 +FloaromaTownMiddleHouse_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe: + Message FloaromaTownMiddleHouse_Text_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe WaitABXPadPress CloseMessage ReleaseAll End -_009F: +FloaromaTownMiddleHouse_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_00A9: - PokemonCryAndMessage SPECIES_CLEFAIRY, 5 +FloaromaTownMiddleHouse_Clefairy: + PokemonCryAndMessage SPECIES_CLEFAIRY, FloaromaTownMiddleHouse_Text_ClefairyRii End diff --git a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s index bcb0d11f37..dbd9827ffd 100644 --- a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s @@ -1,38 +1,39 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_town_pokecenter_1f.h" +#include "res/field/events/events_floaroma_town_pokecenter_1f.h" - ScriptEntry _0012 - ScriptEntry _001E - ScriptEntry _0031 - ScriptEntry _0044 + ScriptEntry FloaromaTownPokecenter1F_Nurse + ScriptEntry FloaromaTownPokecenter1F_PokefanM + ScriptEntry FloaromaTownPokecenter1F_BattleGirl + ScriptEntry FloaromaTownPokecenter1F_AceTrainerF ScriptEntryEnd -_0012: - Common_CallPokecenterNurse 2 +FloaromaTownPokecenter1F_Nurse: + Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE End -_001E: - NPCMessage 0 +FloaromaTownPokecenter1F_PokefanM: + NPCMessage FloaromaTownPokecenter1F_Text_IfYouveGotPokemonWithYouItsSafeToGoOffTravelingAlone End -_0031: - NPCMessage 1 +FloaromaTownPokecenter1F_BattleGirl: + NPCMessage FloaromaTownPokecenter1F_Text_IHadABattleTheOtherDayAndMyPokemonsHPGotLow End -_0044: +FloaromaTownPokecenter1F_AceTrainerF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_UNK_0x40CF, 2, _0064 - Message 2 + GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 2, FloaromaTownPokecenter1F_ItsALongWayFromHereToEternaCity + Message FloaromaTownPokecenter1F_Text_ThereveBeenProblemsWithTheElectricPowerLately WaitABXPadPress CloseMessage ReleaseAll End -_0064: - Message 3 +FloaromaTownPokecenter1F_ItsALongWayFromHereToEternaCity: + Message FloaromaTownPokecenter1F_Text_ItsALongWayFromHereToEternaCity WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_floaroma_town_southeast_house.s b/res/field/scripts/scripts_floaroma_town_southeast_house.s index bbd2f2ff58..13892e9516 100644 --- a/res/field/scripts/scripts_floaroma_town_southeast_house.s +++ b/res/field/scripts/scripts_floaroma_town_southeast_house.s @@ -2,14 +2,14 @@ #include "res/text/bank/floaroma_town_southeast_house.h" - ScriptEntry _000A - ScriptEntry _001D + ScriptEntry FloaromaTownSoutheastHouse_PokefanM + ScriptEntry FloaromaTownSoutheastHouse_PokefanF ScriptEntryEnd -_000A: - NPCMessage 0 +FloaromaTownSoutheastHouse_PokefanM: + NPCMessage FloaromaTownSoutheastHouse_Text_SomeKindsOfPokemonAppearOnlyIfTheyreAttractedByHoney End -_001D: - NPCMessage 1 +FloaromaTownSoutheastHouse_PokefanF: + NPCMessage FloaromaTownSoutheastHouse_Text_PokemonHaveAnAcuteSenseOfSmell End diff --git a/res/field/scripts/scripts_flower_paradise.s b/res/field/scripts/scripts_flower_paradise.s index ef11e7f059..407db64765 100644 --- a/res/field/scripts/scripts_flower_paradise.s +++ b/res/field/scripts/scripts_flower_paradise.s @@ -1,68 +1,69 @@ #include "macros/scrcmd.inc" #include "generated/distribution_events.h" #include "res/text/bank/flower_paradise.h" +#include "res/field/events/events_flower_paradise.h" - ScriptEntry _000E - ScriptEntry _0062 - ScriptEntry _007D + ScriptEntry FlowerParadise_OnTransition + ScriptEntry FlowerParadise_OnLoad + ScriptEntry FlowerParadise_Shaymin ScriptEntryEnd -_000E: +FlowerParadise_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_FLOWER_PARADISE GetNationalDexEnabled VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, 0, _005C + GoToIfEq VAR_MAP_LOCAL_0, FALSE, FlowerParadise_HideShaymin CheckItem ITEM_OAKS_LETTER, 1, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, FALSE, _005C + GoToIfEq VAR_MAP_LOCAL_0, FALSE, FlowerParadise_HideShaymin CheckDistributionEvent DISTRIBUTION_EVENT_SHAYMIN, VAR_MAP_LOCAL_0 - GoToIfEq VAR_MAP_LOCAL_0, FALSE, _005C - GoToIfSet FLAG_UNK_0x0123, _005C - ClearFlag FLAG_UNK_0x0251 + GoToIfEq VAR_MAP_LOCAL_0, FALSE, FlowerParadise_HideShaymin + GoToIfSet FLAG_CAUGHT_SHAYMIN, FlowerParadise_HideShaymin + ClearFlag FLAG_HIDE_FLOWER_PARADISE_SHAYMIN End -_005C: - SetFlag FLAG_UNK_0x0251 +FlowerParadise_HideShaymin: + SetFlag FLAG_HIDE_FLOWER_PARADISE_SHAYMIN End -_0062: - GoToIfSet FLAG_MAP_LOCAL, _006F +FlowerParadise_OnLoad: + GoToIfSet FLAG_MAP_LOCAL, FlowerParadise_RemoveShaymin End -_006F: - SetFlag FLAG_UNK_0x0251 - RemoveObject 0 +FlowerParadise_RemoveShaymin: + SetFlag FLAG_HIDE_FLOWER_PARADISE_SHAYMIN + RemoveObject LOCALID_SHAYMIN ClearFlag FLAG_MAP_LOCAL End -_007D: +FlowerParadise_Shaymin: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer PlayCry SPECIES_SHAYMIN - Message 0 + Message FlowerParadise_Text_KyuuUuhn CloseMessage SetFlag FLAG_MAP_LOCAL StartFatefulEncounter SPECIES_SHAYMIN, 30 ClearFlag FLAG_MAP_LOCAL CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _00D7 + GoToIfEq VAR_RESULT, FALSE, FlowerParadise_BlackOut CheckDidNotCapture VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, _00C8 - SetFlag FLAG_UNK_0x0123 + GoToIfEq VAR_RESULT, TRUE, FlowerParadise_ShayminDisappearedAmongTheFlowers + SetFlag FLAG_CAUGHT_SHAYMIN ReleaseAll End -_00C8: - Message 1 +FlowerParadise_ShayminDisappearedAmongTheFlowers: + Message FlowerParadise_Text_ShayminDisappearedAmongTheFlowers WaitABXPadPress CloseMessage - ClearFlag FLAG_UNK_0x0251 + ClearFlag FLAG_HIDE_FLOWER_PARADISE_SHAYMIN ReleaseAll End -_00D7: +FlowerParadise_BlackOut: BlackOutFromBattle - ClearFlag FLAG_UNK_0x0251 + ClearFlag FLAG_HIDE_FLOWER_PARADISE_SHAYMIN ReleaseAll End diff --git a/res/field/scripts/scripts_flower_shop.s b/res/field/scripts/scripts_flower_shop.s index 0b6feb6b06..b535e8cc7b 100644 --- a/res/field/scripts/scripts_flower_shop.s +++ b/res/field/scripts/scripts_flower_shop.s @@ -2,62 +2,62 @@ #include "res/text/bank/flower_shop.h" - ScriptEntry _000E - ScriptEntry _006E - ScriptEntry _00A9 + ScriptEntry FlowerShop_PokemonBreederF + ScriptEntry FlowerShop_Lass + ScriptEntry FlowerShop_Beauty ScriptEntryEnd -_000E: +FlowerShop_PokemonBreederF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0AAA, _0059 - Message 0 + GoToIfSet FLAG_OBTAINED_FLOWER_SHOP_BERRY, FlowerShop_PleasePlantThatBerryInSoftEarthySoil + Message FlowerShop_Text_ASingleBerryWillGrowIntoAPlantThatMakesSeveralBerries GetRandom VAR_0x8004, 5 AddVar VAR_0x8004, ITEM_CHERI_BERRY /* Cheri, Chesto, Pecha, Rawst or Aspear */ SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0064 - SetFlag FLAG_UNK_0x0AAA + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, FlowerShop_BagIsFull + SetFlag FLAG_OBTAINED_FLOWER_SHOP_BERRY Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_0059: - Message 1 +FlowerShop_PleasePlantThatBerryInSoftEarthySoil: + Message FlowerShop_Text_PleasePlantThatBerryInSoftEarthySoil WaitABXPadPress CloseMessage ReleaseAll End -_0064: +FlowerShop_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_006E: +FlowerShop_Lass: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0080, _009E - Message 2 - SetVar VAR_0x8004, 0x1C0 + GoToIfSet FLAG_RECEIVED_FLOWER_SHOP_SPRAYDUCK, FlowerShop_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries + Message FlowerShop_Text_TrainerPleaseWaterBerriesUsingThisSprayduckWateringCan + SetVar VAR_0x8004, ITEM_SPRAYDUCK SetVar VAR_0x8005, 1 - SetFlag FLAG_UNK_0x0080 + SetFlag FLAG_RECEIVED_FLOWER_SHOP_SPRAYDUCK Common_GiveItemQuantityNoLineFeed CloseMessage ReleaseAll End -_009E: - Message 3 +FlowerShop_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries: + Message FlowerShop_Text_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries WaitABXPadPress CloseMessage ReleaseAll End -_00A9: +FlowerShop_Beauty: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index 10935f6f3b..0aaf5686d9 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -25,8 +25,8 @@ _0006: SetFlag FLAG_HIDE_SANDGEM_TOWN_RIVAL SetFlag FLAG_HIDE_SANDGEM_TOWN_PROF_ROWAN SetFlag FLAG_HIDE_SANDGEM_TOWN_LAB_PROF_OAK - SetFlag FLAG_UNK_0x01F9 - SetFlag FLAG_UNK_0x01FA + SetFlag FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_LITTLE_GIRL + SetFlag FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_LOOKER SetFlag FLAG_UNK_0x01FC SetFlag FLAG_UNK_0x01BD SetFlag FLAG_UNK_0x029B @@ -77,7 +77,7 @@ _0006: SetFlag FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN SetFlag FLAG_UNK_0x01CC SetFlag FLAG_HIDE_POKEMON_LEAGUE_NORTH_POKECENTER_1F_RIVAL - SetFlag FLAG_UNK_0x019E + SetFlag FLAG_HIDE_FLOAROMA_MEADOW_WORKS_KEY SetFlag FLAG_UNK_0x01CB SetFlag FLAG_UNK_0x01E9 SetFlag FLAG_UNK_0x0276 @@ -117,7 +117,7 @@ _0006: SetFlag FLAG_UNK_0x0295 SetFlag FLAG_UNK_0x01CD SetFlag FLAG_UNK_0x02BA - SetFlag FLAG_UNK_0x017F + SetFlag FLAG_HIDE_ROUTE_205_SOUTH_YOUNGSTER SetFlag FLAG_UNK_0x0297 SetFlag FLAG_UNK_0x0255 SetFlag FLAG_UNK_0x01E3 diff --git a/res/field/scripts/scripts_init_valley_windworks_building.s b/res/field/scripts/scripts_init_valley_windworks_building.s index 303e8f12e9..ddc48c2705 100644 --- a/res/field/scripts/scripts_init_valley_windworks_building.s +++ b/res/field/scripts/scripts_init_valley_windworks_building.s @@ -6,7 +6,7 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x40CF, 0, 2 + InitScriptGoToIfEqual VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 0, 2 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_init_valley_windworks_outside.s b/res/field/scripts/scripts_init_valley_windworks_outside.s index e4645718cd..02e85b7d82 100644 --- a/res/field/scripts/scripts_init_valley_windworks_outside.s +++ b/res/field/scripts/scripts_init_valley_windworks_outside.s @@ -8,7 +8,7 @@ InitScriptEntryEnd InitScriptFrameTable: - InitScriptGoToIfEqual VAR_UNK_0x411E, 1, 8 + InitScriptGoToIfEqual VAR_VALLEY_WINDWORKS_LOOKER_STATE, 1, 8 InitScriptFrameTableEnd InitScriptEnd diff --git a/res/field/scripts/scripts_ravaged_path.s b/res/field/scripts/scripts_ravaged_path.s index 8f4773f09c..1dab8c286c 100644 --- a/res/field/scripts/scripts_ravaged_path.s +++ b/res/field/scripts/scripts_ravaged_path.s @@ -1,10 +1,10 @@ #include "macros/scrcmd.inc" - ScriptEntry _0006 + ScriptEntry RavagedPath_OnTransition ScriptEntryEnd -_0006: +RavagedPath_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_RAVAGED_PATH End diff --git a/res/field/scripts/scripts_rotoms_room.s b/res/field/scripts/scripts_rotoms_room.s index 8231b695b7..749056db04 100644 --- a/res/field/scripts/scripts_rotoms_room.s +++ b/res/field/scripts/scripts_rotoms_room.s @@ -41,11 +41,11 @@ RotomsRoom_InitFlags: End _00A5: - ScrCmd_18B 0, 4, 1 - ScrCmd_18B 1, 4, 1 - ScrCmd_18B 2, 4, 1 - ScrCmd_18B 3, 4, 1 - ScrCmd_18B 4, 4, 1 + SetBgEventPos 0, 4, 1 + SetBgEventPos 1, 4, 1 + SetBgEventPos 2, 4, 1 + SetBgEventPos 3, 4, 1 + SetBgEventPos 4, 4, 1 End RotomsRoom_InitShowMicrowaveOven: diff --git a/res/field/scripts/scripts_route_204_north.s b/res/field/scripts/scripts_route_204_north.s index 117316927f..0b5adf22a5 100644 --- a/res/field/scripts/scripts_route_204_north.s +++ b/res/field/scripts/scripts_route_204_north.s @@ -2,43 +2,43 @@ #include "res/text/bank/route_204_north.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _007B + ScriptEntry Route204North_Youngster + ScriptEntry Route204North_AceTrainerF + ScriptEntry Route204North_ArrowSignpostFloaromaTown ScriptEntryEnd -_000E: - NPCMessage 0 +Route204North_Youngster: + NPCMessage Route204North_Text_AreYouRaisingDifferentKindsOfPokemon End -_0021: +Route204North_AceTrainerF: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x00C5, _0066 - Message 1 + GoToIfSet FLAG_RECEIVED_ROUTE_204_NORTH_TM78, Route204North_CaptivateOnlyWorksAgainstTheOppositeGender + Message Route204North_Text_IdLikeYouToHaveThisTM SetVar VAR_0x8004, ITEM_TM78 SetVar VAR_0x8005, 1 - GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0071 + GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, Route204North_BagIsFull Common_GiveItemQuantity - SetFlag FLAG_UNK_0x00C5 - GoTo _0066 + SetFlag FLAG_RECEIVED_ROUTE_204_NORTH_TM78 + GoTo Route204North_CaptivateOnlyWorksAgainstTheOppositeGender -_0066: - Message 2 +Route204North_CaptivateOnlyWorksAgainstTheOppositeGender: + Message Route204North_Text_CaptivateOnlyWorksAgainstTheOppositeGender WaitABXPadPress CloseMessage ReleaseAll End -_0071: +Route204North_BagIsFull: Common_MessageBagIsFull CloseMessage ReleaseAll End -_007B: - ShowArrowSign 3 +Route204North_ArrowSignpostFloaromaTown: + ShowArrowSign Route204North_Text_Rt204FloaromaTown End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_204_south.s b/res/field/scripts/scripts_route_204_south.s index afc9118849..87ca2a0b17 100644 --- a/res/field/scripts/scripts_route_204_south.s +++ b/res/field/scripts/scripts_route_204_south.s @@ -2,21 +2,21 @@ #include "res/text/bank/route_204_south.h" - ScriptEntry _000E - ScriptEntry _0021 - ScriptEntry _0038 + ScriptEntry Route204South_Youngster + ScriptEntry Route204South_ArrowSignpostJubilifeCity + ScriptEntry Route204South_LandmarkSignRavagedPath ScriptEntryEnd -_000E: - NPCMessage 0 +Route204South_Youngster: + NPCMessage Route204South_Text_ThereAreBouldersBlockingTheWayInsideTheCavern End -_0021: - ShowArrowSign 1 +Route204South_ArrowSignpostJubilifeCity: + ShowArrowSign Route204South_Text_Rt204JubilifeCity End -_0038: - ShowLandmarkSign 2 +Route204South_LandmarkSignRavagedPath: + ShowLandmarkSign Route204South_Text_RavagedPath End .balign 4, 0 diff --git a/res/field/scripts/scripts_route_205_south.s b/res/field/scripts/scripts_route_205_south.s index 5f1c7a3e0f..82eecf374f 100644 --- a/res/field/scripts/scripts_route_205_south.s +++ b/res/field/scripts/scripts_route_205_south.s @@ -1,63 +1,64 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_205_south.h" +#include "res/field/events/events_route_205_south.h" - ScriptEntry _002A - ScriptEntry _00F8 - ScriptEntry _010B - ScriptEntry _002C - ScriptEntry _011E - ScriptEntry _015D - ScriptEntry _0070 - ScriptEntry _0280 - ScriptEntry _0297 - ScriptEntry _02AE + ScriptEntry Route205South_OnTransition + ScriptEntry Route205South_BugCatcher + ScriptEntry Route205South_Youngster + ScriptEntry Route205South_Grunts + ScriptEntry Route205South_LittleGirl + ScriptEntry Route205South_TriggerLittleGirl + ScriptEntry Route205South_TriggerGrunts + ScriptEntry Route205South_ArrowSignpostFloaromaTown + ScriptEntry Route205South_ArrowSignpostEternaForest + ScriptEntry Route205South_TrainerTipsSignpost ScriptEntryEnd -_002A: +Route205South_OnTransition: End -_002C: +Route205South_Grunts: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - ApplyMovement 13, _0060 + ApplyMovement LOCALID_GRUNT_M_WEST, Route205South_Movement_GruntMWestWalkOnSpotSouth WaitMovement - Message 2 + Message Route205South_Text_WeTeamGalacticAreConductingResearchInTheEternaForest CloseMessage - ApplyMovement 12, _0068 + ApplyMovement LOCALID_GRUNT_M_EAST, Route205South_Movement_GruntMEastWalkOnSpotSouth WaitMovement Call _00B6 - Message 4 + Message Route205South_Text_OurResearchInvolvesCatchingPokemonInTheFloweryMeadowsOfFloaroma2 WaitABXPadPress CloseMessage ReleaseAll End .balign 4, 0 -_0060: +Route205South_Movement_GruntMWestWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0068: +Route205South_Movement_GruntMEastWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement -_0070: +Route205South_TriggerGrunts: LockAll - ApplyMovement 13, _00BC + ApplyMovement LOCALID_GRUNT_M_WEST, Route205South_Movement_GruntMWestWalkOnSpotEast WaitMovement - Message 2 + Message Route205South_Text_WeTeamGalacticAreConductingResearchInTheEternaForest CloseMessage - ApplyMovement 12, _00C4 + ApplyMovement LOCALID_GRUNT_M_EAST, Route205South_Movement_GruntMEastWalkOnSpotWest WaitMovement - Message 3 + Message Route205South_Text_OurResearchInvolvesCatchingPokemonInTheFloweryMeadowsOfFloaroma1 CloseMessage - ApplyMovement 13, _00CC - ApplyMovement LOCALID_PLAYER, _00EC + ApplyMovement LOCALID_GRUNT_M_WEST, Route205South_Movement_GruntMWestPushBackPlayer + ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerGetPushedBack WaitMovement - ApplyMovement 12, _00E4 + ApplyMovement LOCALID_GRUNT_M_EAST, Route205South_Movement_GruntMEastTurnBackSouth WaitMovement Call _00B6 ReleaseAll @@ -68,17 +69,17 @@ _00B6: Return .balign 4, 0 -_00BC: +Route205South_Movement_GruntMWestWalkOnSpotEast: WalkOnSpotNormalEast EndMovement .balign 4, 0 -_00C4: +Route205South_Movement_GruntMEastWalkOnSpotWest: WalkOnSpotNormalWest EndMovement .balign 4, 0 -_00CC: +Route205South_Movement_GruntMWestPushBackPlayer: WalkFastEast WalkOnSpotFastSouth Delay8 2 @@ -87,110 +88,110 @@ _00CC: EndMovement .balign 4, 0 -_00E4: +Route205South_Movement_GruntMEastTurnBackSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_00EC: +Route205South_Movement_PlayerGetPushedBack: WalkNormalSouth WalkOnSpotFastNorth EndMovement -_00F8: - NPCMessage 5 +Route205South_BugCatcher: + NPCMessage Route205South_Text_ManyPoisonTypePokemonMakeTheEternaForestTheirHome End -_010B: - NPCMessage 6 +Route205South_Youngster: + NPCMessage Route205South_Text_IfYouSlatherSweetHoneyOnASweetSmellingTree End -_011E: +Route205South_LittleGirl: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfSet FLAG_UNK_0x0091, _0142 - Call _014D - Message 0 + GoToIfSet FLAG_TALKED_TO_ROUTE_205_SOUTH_LITTLE_GIRL, Route205South_IWantToSeeMyPapaHesAtTheValleyWindworks + Call Route205South_HideFloaromaTownGrunts + Message Route205South_Text_HelpHelpTrainerPleaseIWantToSeeMyPapa WaitABXPadPress CloseMessage ReleaseAll End -_0142: - Message 1 +Route205South_IWantToSeeMyPapaHesAtTheValleyWindworks: + Message Route205South_Text_IWantToSeeMyPapaHesAtTheValleyWindworks WaitABXPadPress CloseMessage ReleaseAll End -_014D: - SetFlag FLAG_UNK_0x01A1 - SetFlag FLAG_UNK_0x0091 - SetVar VAR_UNK_0x4089, 1 +Route205South_HideFloaromaTownGrunts: + SetFlag FLAG_HIDE_FLOAROMA_TOWN_GRUNTS + SetFlag FLAG_TALKED_TO_ROUTE_205_SOUTH_LITTLE_GIRL + SetVar VAR_VALLEY_WINDWORKS_STATE, 1 Return -_015D: +Route205South_TriggerLittleGirl: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 0x293, _01A8 - GoToIfEq VAR_0x8005, 0x294, _01C2 - GoToIfEq VAR_0x8005, 0x295, _01DC - GoToIfEq VAR_0x8005, 0x296, _01E2 - GoToIfEq VAR_0x8005, 0x297, _01FC + GoToIfEq VAR_0x8005, 659, Route205South_LittleGirlNoticePlayerZ659 + GoToIfEq VAR_0x8005, 660, Route205South_LittleGirlNoticePlayerZ660 + GoToIfEq VAR_0x8005, 661, Route205South_DummyZ661 @ unreachable position + GoToIfEq VAR_0x8005, 662, Route205South_LittleGirlNoticePlayerZ662 + GoToIfEq VAR_0x8005, 663, Route205South_LittleGirlNoticePlayerZ663 End -_01A8: - ApplyMovement 18, _0238 +Route205South_LittleGirlNoticePlayerZ659: + ApplyMovement LOCALID_LITTLE_GIRL, Route205South_Movement_TwinNoticePlayerZ659 WaitMovement - ApplyMovement LOCALID_PLAYER, _0228 + ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerWalkOnSpotSouth WaitMovement - GoTo _0216 + GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa -_01C2: - ApplyMovement 18, _024C +Route205South_LittleGirlNoticePlayerZ660: + ApplyMovement LOCALID_LITTLE_GIRL, Route205South_Movement_TwinNoticePlayerZ660 WaitMovement - ApplyMovement LOCALID_PLAYER, _0228 + ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerWalkOnSpotSouth WaitMovement - GoTo _0216 + GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa -_01DC: - GoTo _0216 +Route205South_DummyZ661: + GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa -_01E2: - ApplyMovement 18, _025C +Route205South_LittleGirlNoticePlayerZ662: + ApplyMovement LOCALID_LITTLE_GIRL, Route205South_Movement_TwinNoticePlayerZ662 WaitMovement - ApplyMovement LOCALID_PLAYER, _0230 + ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerWalkOnSpotNorth WaitMovement - GoTo _0216 + GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa -_01FC: - ApplyMovement 18, _026C +Route205South_LittleGirlNoticePlayerZ663: + ApplyMovement LOCALID_LITTLE_GIRL, Route205South_Movement_TwinNoticePlayerZ663 WaitMovement - ApplyMovement LOCALID_PLAYER, _0230 + ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerWalkOnSpotNorth WaitMovement - GoTo _0216 + GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa -_0216: - Call _014D - Message 0 +Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa: + Call Route205South_HideFloaromaTownGrunts + Message Route205South_Text_HelpHelpTrainerPleaseIWantToSeeMyPapa WaitABXPadPress CloseMessage ReleaseAll End .balign 4, 0 -_0228: +Route205South_Movement_PlayerWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_0230: +Route205South_Movement_PlayerWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0238: +Route205South_Movement_TwinNoticePlayerZ659: WalkOnSpotNormalNorth EmoteExclamationMark Delay8 @@ -198,37 +199,37 @@ _0238: EndMovement .balign 4, 0 -_024C: +Route205South_Movement_TwinNoticePlayerZ660: WalkOnSpotNormalNorth EmoteExclamationMark Delay8 EndMovement .balign 4, 0 -_025C: +Route205South_Movement_TwinNoticePlayerZ662: WalkOnSpotNormalSouth EmoteExclamationMark Delay8 EndMovement .balign 4, 0 -_026C: +Route205South_Movement_TwinNoticePlayerZ663: WalkOnSpotNormalSouth EmoteExclamationMark Delay8 WalkNormalSouth EndMovement -_0280: - ShowArrowSign 7 +Route205South_ArrowSignpostFloaromaTown: + ShowArrowSign Route205South_Text_Rt205FloaromaTown End -_0297: - ShowArrowSign 8 +Route205South_ArrowSignpostEternaForest: + ShowArrowSign Route205South_Text_Rt205EternaForest End -_02AE: - ShowScrollingSign 9 +Route205South_TrainerTipsSignpost: + ShowScrollingSign Route205South_Text_TrainerTipsTheItemsPlacedInYourBagAreAutomaticallySorted End .balign 4, 0 diff --git a/res/field/scripts/scripts_valley_windworks_building.s b/res/field/scripts/scripts_valley_windworks_building.s index 4082d817e8..eaaf3d15c5 100644 --- a/res/field/scripts/scripts_valley_windworks_building.s +++ b/res/field/scripts/scripts_valley_windworks_building.s @@ -1,199 +1,200 @@ #include "macros/scrcmd.inc" #include "res/text/bank/valley_windworks_building.h" +#include "res/field/events/events_valley_windworks_building.h" - ScriptEntry _0022 - ScriptEntry _005F - ScriptEntry _00AC - ScriptEntry _00BF - ScriptEntry _037C - ScriptEntry _03A7 - ScriptEntry _03D2 - ScriptEntry _03DA + ScriptEntry ValleyWindworksBuilding_OnTransition + ScriptEntry ValleyWindworksBuilding_OnFrameFirstEntry + ScriptEntry ValleyWindworksBuilding_GruntM + ScriptEntry ValleyWindworksBuilding_TriggerMars + ScriptEntry ValleyWindworksBuilding_ScientistPapa + ScriptEntry ValleyWindworksBuilding_Twin + ScriptEntry ValleyWindworksBuilding_PCWest + ScriptEntry ValleyWindworksBuilding_PCEast ScriptEntryEnd -_0022: +ValleyWindworksBuilding_OnTransition: SetFlag FLAG_FIRST_ARRIVAL_VALLEY_WINDWORKS - GoToIfGe VAR_UNK_0x4089, 2, _0035 + GoToIfGe VAR_VALLEY_WINDWORKS_STATE, 2, ValleyWindworksBuilding_SetLittleGirlAndScientistPapaPositions End -_0035: - SetObjectEventPos 5, 21, 5 - SetObjectEventDir 5, DIR_WEST - SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_WEST - SetObjectEventPos 2, 18, 4 - SetObjectEventDir 2, DIR_SOUTH - SetObjectEventMovementType 2, MOVEMENT_TYPE_LOOK_SOUTH +ValleyWindworksBuilding_SetLittleGirlAndScientistPapaPositions: + SetObjectEventPos LOCALID_LITTLE_GIRL, 21, 5 + SetObjectEventDir LOCALID_LITTLE_GIRL, DIR_WEST + SetObjectEventMovementType LOCALID_LITTLE_GIRL, MOVEMENT_TYPE_LOOK_WEST + SetObjectEventPos LOCALID_SCIENTIST_PAPA, 18, 4 + SetObjectEventDir LOCALID_SCIENTIST_PAPA, DIR_SOUTH + SetObjectEventMovementType LOCALID_SCIENTIST_PAPA, MOVEMENT_TYPE_LOOK_SOUTH End -_005F: +ValleyWindworksBuilding_OnFrameFirstEntry: LockAll - ApplyMovement 0, _0090 + ApplyMovement LOCALID_GALACTIC_GRUNT_1, ValleyWindworksBuilding_Movement_GalacticGrunt1NoticePlayer WaitMovement - Message 0 + Message ValleyWindworksBuilding_Text_YouHaveTheKeyIveGotToAlertTheCommander CloseMessage - ApplyMovement 0, _0098 - ApplyMovement LOCALID_PLAYER, _00A0 + ApplyMovement LOCALID_GALACTIC_GRUNT_1, ValleyWindworksBuilding_Movement_GalacticGrunt1Leave + ApplyMovement LOCALID_PLAYER, ValleyWindworksBuilding_Movement_PlayerWatchGalacticGrunt1Leave WaitMovement - RemoveObject 0 - SetVar VAR_UNK_0x40CF, 1 + RemoveObject LOCALID_GALACTIC_GRUNT_1 + SetVar VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 1 ReleaseAll End .balign 4, 0 -_0090: +ValleyWindworksBuilding_Movement_GalacticGrunt1NoticePlayer: EmoteExclamationMark EndMovement .balign 4, 0 -_0098: +ValleyWindworksBuilding_Movement_GalacticGrunt1Leave: WalkFastWest 9 EndMovement .balign 4, 0 -_00A0: +ValleyWindworksBuilding_Movement_PlayerWatchGalacticGrunt1Leave: Delay8 WalkOnSpotNormalWest EndMovement -_00AC: - NPCMessage 1 +ValleyWindworksBuilding_GruntM: + NPCMessage ValleyWindworksBuilding_Text_HumphJustYouWaitOurCommanderWillSmooshYou End -_00BF: +ValleyWindworksBuilding_TriggerMars: LockAll GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 6, _00E3 - GoToIfEq VAR_0x8005, 7, _00F5 + GoToIfEq VAR_0x8005, 6, ValleyWindworksBuilding_MarsNoticeAndWalkToPlayer + GoToIfEq VAR_0x8005, 7, ValleyWindworksBuilding_MarsNoticePlayer End -_00E3: - ApplyMovement 1, _0348 +ValleyWindworksBuilding_MarsNoticeAndWalkToPlayer: + ApplyMovement LOCALID_MARS, ValleyWindworksBuilding_Movement_MarsNoticeAndWalkToPlayer WaitMovement - GoTo _0107 + GoTo ValleyWindworksBuilding_Mars End -_00F5: - ApplyMovement 1, _0358 +ValleyWindworksBuilding_MarsNoticePlayer: + ApplyMovement LOCALID_MARS, ValleyWindworksBuilding_Movement_MarsNoticePlayer WaitMovement - GoTo _0107 + GoTo ValleyWindworksBuilding_Mars End -_0107: - Message 2 +ValleyWindworksBuilding_Mars: + Message ValleyWindworksBuilding_Text_MyNameIsMarsLetsHaveABattleToDecideWhatWeShouldDoNext CloseMessage StartTrainerBattle TRAINER_COMMANDER_MARS_VALLEY_WINDWORKS CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _02B9 - Message 3 + GoToIfEq VAR_RESULT, FALSE, ValleyWindworksBuilding_BlackOut + Message ValleyWindworksBuilding_Text_OopsIMessedThatOneUp CloseMessage - ApplyMovement 7, _0374 + ApplyMovement LOCALID_CHARON, ValleyWindworksBuilding_Movement_CharonWalkOnSpotSouth WaitMovement WaitTime 15, VAR_RESULT - Message 4 - ApplyMovement 1, _0364 + Message ValleyWindworksBuilding_Text_LoseToAChildWillYouNowMarsWeShouldBeGoing + ApplyMovement LOCALID_MARS, ValleyWindworksBuilding_Movement_MarsWalkOnSpotNorth WaitMovement - Message 5 - ApplyMovement 1, _036C + Message ValleyWindworksBuilding_Text_WillYouShutIt + ApplyMovement LOCALID_MARS, ValleyWindworksBuilding_Movement_MarsWalkOnSpotWest WaitMovement - Message 6 + Message ValleyWindworksBuilding_Text_IGuessItsTimeToSayGoodbyeAndLeaveForTheTimeBeing CloseMessage FadeScreenOut WaitFadeScreen - RemoveObject 1 - RemoveObject 7 - RemoveObject 6 - RemoveObject 3 - RemoveObject 4 - SetFlag FLAG_UNK_0x01A2 - ClearFlag FLAG_UNK_0x017F - SetVar VAR_UNK_0x4089, 2 - SetFlag FLAG_UNK_0x0AA8 + RemoveObject LOCALID_MARS + RemoveObject LOCALID_CHARON + RemoveObject LOCALID_GRUNT_M + RemoveObject LOCALID_GALACTIC_GRUNT_2 + RemoveObject LOCALID_GALACTIC_GRUNT_3 + SetFlag FLAG_HIDE_ROUTE_205_SOUTH_GRUNTS + ClearFlag FLAG_HIDE_ROUTE_205_SOUTH_YOUNGSTER + SetVar VAR_VALLEY_WINDWORKS_STATE, 2 + SetFlag FLAG_WON_AGAINST_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON FadeScreenIn WaitFadeScreen GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 6, _01B7 - GoToIfEq VAR_0x8005, 7, _01C9 + GoToIfEq VAR_0x8005, 6, ValleyWindworksBuilding_ScientistPapaWalkToPlayerZ6 + GoToIfEq VAR_0x8005, 7, ValleyWindworksBuilding_ScientistPapaWalkToPlayerZ7 End -_01B7: - ApplyMovement 2, _02E8 +ValleyWindworksBuilding_ScientistPapaWalkToPlayerZ6: + ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaWalkToPlayerZ6 WaitMovement - GoTo _01DB + GoTo ValleyWindworksBuilding_ICanFinallySeeMyLittleDaughterAgain End -_01C9: - ApplyMovement 2, _02F4 +ValleyWindworksBuilding_ScientistPapaWalkToPlayerZ7: + ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaWalkToPlayerZ7 WaitMovement - GoTo _01DB + GoTo ValleyWindworksBuilding_ICanFinallySeeMyLittleDaughterAgain End -_01DB: - Message 7 +ValleyWindworksBuilding_ICanFinallySeeMyLittleDaughterAgain: + Message ValleyWindworksBuilding_Text_ICanFinallySeeMyLittleDaughterAgain CloseMessage - SetFlag FLAG_UNK_0x01F8 - ClearFlag FLAG_UNK_0x01F9 - SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_WEST - AddObject 5 - LockObject 5 + SetFlag FLAG_HIDE_ROUTE_205_SOUTH_LITTLE_GIRL + ClearFlag FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_LITTLE_GIRL + SetObjectEventMovementType LOCALID_LITTLE_GIRL, MOVEMENT_TYPE_LOOK_WEST + AddObject LOCALID_LITTLE_GIRL + LockObject LOCALID_LITTLE_GIRL GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 6, _0218 - GoToIfEq VAR_0x8005, 7, _0232 + GoToIfEq VAR_0x8005, 6, ValleyWindworksBuilding_LittleGirlWalkToScientistPapaZ6 + GoToIfEq VAR_0x8005, 7, ValleyWindworksBuilding_LittleGirlWalkToScientistPapaZ7 End -_0218: - ApplyMovement 5, _02C0 - ApplyMovement 2, _0300 +ValleyWindworksBuilding_LittleGirlWalkToScientistPapaZ6: + ApplyMovement LOCALID_LITTLE_GIRL, ValleyWindworksBuilding_Movement_LittleGirlWalkToScientistPapaZ6 + ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaWalkOnSpotSouth WaitMovement - GoTo _024C + GoTo ValleyWindworksBuilding_YuckPapaYoureStinkyGoShowerNowStinky End -_0232: - ApplyMovement 5, _02D4 - ApplyMovement 2, _030C +ValleyWindworksBuilding_LittleGirlWalkToScientistPapaZ7: + ApplyMovement LOCALID_LITTLE_GIRL, ValleyWindworksBuilding_Movement_LittleGirlWalkToScientistPapaZ7 + ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaWalkOnSpotNorth WaitMovement - GoTo _024C + GoTo ValleyWindworksBuilding_YuckPapaYoureStinkyGoShowerNowStinky End -_024C: - Message 8 +ValleyWindworksBuilding_YuckPapaYoureStinkyGoShowerNowStinky: + Message ValleyWindworksBuilding_Text_YuckPapaYoureStinkyGoShowerNowStinky CloseMessage GetPlayerMapPos VAR_0x8004, VAR_0x8005 - GoToIfEq VAR_0x8005, 6, _0273 - GoToIfEq VAR_0x8005, 7, _0285 + GoToIfEq VAR_0x8005, 6, ValleyWindworksBuilding_ScientistPapaTurnInSpotFaceSouth + GoToIfEq VAR_0x8005, 7, ValleyWindworksBuilding_ScientistPapaTurnInSpotFaceNorth End -_0273: - ApplyMovement 2, _0318 +ValleyWindworksBuilding_ScientistPapaTurnInSpotFaceSouth: + ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaTurnInSpotFaceSouth WaitMovement - GoTo _0297 + GoTo ValleyWindworksBuilding_IThinkTheBalloonPokemonWillComeVisitingAgain End -_0285: - ApplyMovement 2, _0330 +ValleyWindworksBuilding_ScientistPapaTurnInSpotFaceNorth: + ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaTurnInSpotFaceNorth WaitMovement - GoTo _0297 + GoTo ValleyWindworksBuilding_IThinkTheBalloonPokemonWillComeVisitingAgain End -_0297: - Message 9 - Message 10 +ValleyWindworksBuilding_IThinkTheBalloonPokemonWillComeVisitingAgain: + Message ValleyWindworksBuilding_Text_OhSorryAhahaTheyHadMeWorkingNonstop + Message ValleyWindworksBuilding_Text_IThinkTheBalloonPokemonWillComeVisitingAgain WaitABXPadPress CloseMessage - SetVar VAR_UNK_0x411E, 1 - ClearFlag FLAG_UNK_0x01FA - SetVar VAR_UNK_0x40CF, 2 + SetVar VAR_VALLEY_WINDWORKS_LOOKER_STATE, 1 + ClearFlag FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_LOOKER + SetVar VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 2 SetFlag FLAG_ALT_MUSIC_VALLEY_WINDWORKS_BUILDING ReleaseAll End -_02B9: +ValleyWindworksBuilding_BlackOut: BlackOutFromBattle ReleaseAll End .balign 4, 0 -_02C0: +ValleyWindworksBuilding_Movement_LittleGirlWalkToScientistPapaZ6: WalkFastEast 4 WalkFastNorth WalkFastEast 6 @@ -201,7 +202,7 @@ _02C0: EndMovement .balign 4, 0 -_02D4: +ValleyWindworksBuilding_Movement_LittleGirlWalkToScientistPapaZ7: WalkFastEast 4 WalkFastNorth 2 WalkFastEast 6 @@ -209,31 +210,31 @@ _02D4: EndMovement .balign 4, 0 -_02E8: +ValleyWindworksBuilding_Movement_ScientistPapaWalkToPlayerZ6: WalkNormalSouth 3 WalkNormalWest EndMovement .balign 4, 0 -_02F4: +ValleyWindworksBuilding_Movement_ScientistPapaWalkToPlayerZ7: WalkNormalSouth 4 WalkNormalWest EndMovement .balign 4, 0 -_0300: +ValleyWindworksBuilding_Movement_ScientistPapaWalkOnSpotSouth: Delay8 6 WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_030C: +ValleyWindworksBuilding_Movement_ScientistPapaWalkOnSpotNorth: Delay8 6 WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0318: +ValleyWindworksBuilding_Movement_ScientistPapaTurnInSpotFaceSouth: FaceEast Delay8 2 FaceWest @@ -242,7 +243,7 @@ _0318: EndMovement .balign 4, 0 -_0330: +ValleyWindworksBuilding_Movement_ScientistPapaTurnInSpotFaceNorth: FaceEast Delay8 2 FaceWest @@ -251,91 +252,91 @@ _0330: EndMovement .balign 4, 0 -_0348: +ValleyWindworksBuilding_Movement_MarsNoticeAndWalkToPlayer: EmoteExclamationMark WalkNormalNorth WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0358: +ValleyWindworksBuilding_Movement_MarsNoticePlayer: EmoteExclamationMark WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0364: +ValleyWindworksBuilding_Movement_MarsWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_036C: +ValleyWindworksBuilding_Movement_MarsWalkOnSpotWest: WalkOnSpotNormalWest EndMovement .balign 4, 0 -_0374: +ValleyWindworksBuilding_Movement_CharonWalkOnSpotSouth: WalkOnSpotNormalSouth EndMovement -_037C: +ValleyWindworksBuilding_ScientistPapa: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_UNK_0x40CF, 3, _039C - Message 11 + GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 3, ValleyWindworksBuilding_TheValleyWindworksUsesTurbinesToCaptureEnergy + Message ValleyWindworksBuilding_Text_ABalloonPokemonAppearsInFrontOfTheWindworksItsAlwaysACertainDayOfTheWeek WaitABXPadPress CloseMessage ReleaseAll End -_039C: - Message 12 +ValleyWindworksBuilding_TheValleyWindworksUsesTurbinesToCaptureEnergy: + Message ValleyWindworksBuilding_Text_TheValleyWindworksUsesTurbinesToCaptureEnergy WaitABXPadPress CloseMessage ReleaseAll End -_03A7: +ValleyWindworksBuilding_Twin: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_UNK_0x40CF, 3, _03C7 - Message 10 + GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 3, ValleyWindworksBuilding_IfTheBalloonPokemonCameTheWindWouldBlowItAway + Message ValleyWindworksBuilding_Text_IThinkTheBalloonPokemonWillComeVisitingAgain WaitABXPadPress CloseMessage ReleaseAll End -_03C7: - Message 13 +ValleyWindworksBuilding_IfTheBalloonPokemonCameTheWindWouldBlowItAway: + Message ValleyWindworksBuilding_Text_IfTheBalloonPokemonCameTheWindWouldBlowItAway WaitABXPadPress CloseMessage ReleaseAll End -_03D2: - GoTo _03E2 +ValleyWindworksBuilding_PCWest: + GoTo ValleyWindworksBuilding_PC End -_03DA: - GoTo _03E2 +ValleyWindworksBuilding_PCEast: + GoTo ValleyWindworksBuilding_PC End -_03E2: +ValleyWindworksBuilding_PC: PlayFanfare SEQ_SE_CONFIRM LockAll - GoToIfGe VAR_EXITED_DISTORTION_WORLD_STATE, 2, _0400 - Message 14 - GoTo _040B + GoToIfGe VAR_EXITED_DISTORTION_WORLD_STATE, 2, ValleyWindworksBuilding_ThePCScreenIsFilledWithNumbersUponNumbers + Message ValleyWindworksBuilding_Text_BringersAndTargetsTeamGalactic + GoTo ValleyWindworksBuilding_PCEnd End -_0400: - Message 15 - GoTo _040B +ValleyWindworksBuilding_ThePCScreenIsFilledWithNumbersUponNumbers: + Message ValleyWindworksBuilding_Text_ThePCScreenIsFilledWithNumbersUponNumbers + GoTo ValleyWindworksBuilding_PCEnd End -_040B: +ValleyWindworksBuilding_PCEnd: WaitABXPadPress CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_valley_windworks_outside.s b/res/field/scripts/scripts_valley_windworks_outside.s index db555a1732..da3736e2f2 100644 --- a/res/field/scripts/scripts_valley_windworks_outside.s +++ b/res/field/scripts/scripts_valley_windworks_outside.s @@ -1,174 +1,175 @@ #include "macros/scrcmd.inc" #include "res/text/bank/valley_windworks_outside.h" +#include "res/field/events/events_valley_windworks_outside.h" - ScriptEntry _0024 - ScriptEntry _008A - ScriptEntry _00CF - ScriptEntry _0150 - ScriptEntry _01A8 - ScriptEntry _01BF - ScriptEntry _0022 - ScriptEntry _0201 + ScriptEntry ValleyWindworksOutside_OnTransition + ScriptEntry ValleyWindworksOutside_OnLoad + ScriptEntry ValleyWindworksOutside_GruntM + ScriptEntry ValleyWindworksOutside_Door + ScriptEntry ValleyWindworksOutside_LandmarkSignValleyWindworks + ScriptEntry ValleyWindworksOutside_Drifloon + ScriptEntry ValleyWindworksOutside_OnResume + ScriptEntry ValleyWindworksOutside_OnFrameLooker ScriptEntryEnd -_0022: +ValleyWindworksOutside_OnResume: End -_0024: - CallIfEq VAR_UNK_0x40CF, 2, _0082 - CallIfSet FLAG_UNK_0x010F, _00BB - CallIfUnset FLAG_UNK_0x010F, _00C5 - GoToIfLt VAR_UNK_0x4089, 2, _007C - GoToIfSet FLAG_UNK_0x0AA8, _007C +ValleyWindworksOutside_OnTransition: + CallIfEq VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 2, ValleyWindworksOutside_IncreaseTeamGalacticValleyWindworksState + CallIfSet FLAG_UNLOCKED_VALLEY_WINDWORKS_DOOR, ValleyWindworksOutside_SetDoorBgEvent + CallIfUnset FLAG_UNLOCKED_VALLEY_WINDWORKS_DOOR, ValleyWindworksOutside_SetDoorWarpEvent + GoToIfLt VAR_VALLEY_WINDWORKS_STATE, 2, ValleyWindworksOutside_HideDrifloon + GoToIfSet FLAG_WON_AGAINST_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON, ValleyWindworksOutside_HideDrifloon GetDayOfWeek VAR_MAP_LOCAL_0 - GoToIfNe VAR_MAP_LOCAL_0, 5, _007C - GoTo _0076 + GoToIfNe VAR_MAP_LOCAL_0, 5, ValleyWindworksOutside_HideDrifloon + GoTo ValleyWindworksOutside_ShowDrifloon -_0076: - ClearFlag FLAG_UNK_0x020B +ValleyWindworksOutside_ShowDrifloon: + ClearFlag FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON End -_007C: - SetFlag FLAG_UNK_0x020B +ValleyWindworksOutside_HideDrifloon: + SetFlag FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON End -_0082: - SetVar VAR_UNK_0x40CF, 3 +ValleyWindworksOutside_IncreaseTeamGalacticValleyWindworksState: + SetVar VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 3 Return -_008A: - CallIfSet FLAG_UNK_0x010F, _00BB - CallIfUnset FLAG_UNK_0x010F, _00C5 - GoToIfSet FLAG_MAP_LOCAL, _00AD +ValleyWindworksOutside_OnLoad: + CallIfSet FLAG_UNLOCKED_VALLEY_WINDWORKS_DOOR, ValleyWindworksOutside_SetDoorBgEvent + CallIfUnset FLAG_UNLOCKED_VALLEY_WINDWORKS_DOOR, ValleyWindworksOutside_SetDoorWarpEvent + GoToIfSet FLAG_MAP_LOCAL, ValleyWindworksOutside_RemoveDrifloon End -_00AD: - SetFlag FLAG_UNK_0x020B - RemoveObject 4 +ValleyWindworksOutside_RemoveDrifloon: + SetFlag FLAG_HIDE_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON + RemoveObject LOCALID_DRIFLOON ClearFlag FLAG_MAP_LOCAL End -_00BB: - ScrCmd_18B 1, 243, 0x28A +ValleyWindworksOutside_SetDoorBgEvent: + SetBgEventPos 1, 243, 650 Return -_00C5: - SetWarpEventPos 0, 243, 0x28A +ValleyWindworksOutside_SetDoorWarpEvent: + SetWarpEventPos 0, 243, 650 Return -_00CF: +ValleyWindworksOutside_GruntM: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer - Message 0 + Message ValleyWindworksOutside_Text_DontYouDareGoIntoTheValleyWindworksYoullHaveToBattleMeForIt CloseMessage StartTrainerBattle TRAINER_GALACTIC_GRUNT_VALLEY_WINDWORKS_1 CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _0133 - Message 1 + GoToIfEq VAR_RESULT, FALSE, ValleyWindworksOutside_BlackOutGrunt + Message ValleyWindworksOutside_Text_IsntThatJustGreatGettingOwnedBySomeKid CloseMessage - ApplyMovement 0, _013C + ApplyMovement LOCALID_GRUNT_M, ValleyWindworksOutside_Movement_GruntMWalkOnSpotNorth WaitMovement LoadDoorAnimation 7, 20, 19, 14, ANIMATION_TAG_DOOR_1 PlayDoorOpenAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 - ApplyMovement 0, _0144 + ApplyMovement LOCALID_GRUNT_M, ValleyWindworksOutside_Movement_GruntMEnterBuilding WaitMovement PlayDoorCloseAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 UnloadAnimation ANIMATION_TAG_DOOR_1 - Message 4 - RemoveObject 0 + Message ValleyWindworksOutside_Text_Kerchunk + RemoveObject LOCALID_GRUNT_M CloseMessage ReleaseAll End -_0133: +ValleyWindworksOutside_BlackOutGrunt: BlackOutFromBattle ReleaseAll End .balign 4, 0 -_013C: +ValleyWindworksOutside_Movement_GruntMWalkOnSpotNorth: WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_0144: +ValleyWindworksOutside_Movement_GruntMEnterBuilding: WalkNormalNorth SetInvisible EndMovement -_0150: +ValleyWindworksOutside_Door: PlayFanfare SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_UNK_0x009F, _016C - Message 5 + GoToIfSet FLAG_OBTAINED_FLOAROMA_MEADOW_WORKS_KEY, ValleyWindworksOutside_AskOpenDoor + Message ValleyWindworksOutside_Text_ItsLockedFromInside WaitABXPadPress CloseMessage ReleaseAll End -_016C: - BufferItemName 0, 0x1B6 - Message 6 +ValleyWindworksOutside_AskOpenDoor: + BufferItemName 0, ITEM_WORKS_KEY + Message ValleyWindworksOutside_Text_ItsLockedFromInsideUseTheWorksKey ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_NO, _01A2 - SetFlag FLAG_UNK_0x010F - Call _00BB - SetWarpEventPos 0, 243, 0x28E - Message 7 + GoToIfEq VAR_RESULT, MENU_NO, ValleyWindworksOutside_AskOpenDoorEnd + SetFlag FLAG_UNLOCKED_VALLEY_WINDWORKS_DOOR + Call ValleyWindworksOutside_SetDoorBgEvent + SetWarpEventPos 0, 243, 654 + Message ValleyWindworksOutside_Text_KerchunkTheDoorToValleyWindworksOpened WaitABXPadPress CloseMessage ReleaseAll End -_01A2: +ValleyWindworksOutside_AskOpenDoorEnd: CloseMessage ReleaseAll End -_01A8: - ShowLandmarkSign 9 +ValleyWindworksOutside_LandmarkSignValleyWindworks: + ShowLandmarkSign ValleyWindworksOutside_Text_ValleyWindworksEcologicalWindDrivenEnergy End -_01BF: +ValleyWindworksOutside_Drifloon: PlayFanfare SEQ_SE_CONFIRM LockAll FacePlayer PlayCry SPECIES_DRIFLOON - Message 8 + Message ValleyWindworksOutside_Text_Floooooon CloseMessage WaitCry SetFlag FLAG_MAP_LOCAL StartLegendaryBattle SPECIES_DRIFLOON, 15 ClearFlag FLAG_MAP_LOCAL CheckWonBattle VAR_RESULT - GoToIfEq VAR_RESULT, FALSE, _01FB - SetFlag FLAG_UNK_0x0AA8 + GoToIfEq VAR_RESULT, FALSE, ValleyWindworksOutside_BlackOutDrifloon + SetFlag FLAG_WON_AGAINST_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON ReleaseAll End -_01FB: +ValleyWindworksOutside_BlackOutDrifloon: BlackOutFromBattle ReleaseAll End -_0201: +ValleyWindworksOutside_OnFrameLooker: LockAll - ApplyMovement 6, _02D8 - ApplyMovement LOCALID_PLAYER, _02AC + ApplyMovement LOCALID_LOOKER, ValleyWindworksOutside_Movement_LookerNoticeAndWalkToPlayer + ApplyMovement LOCALID_PLAYER, ValleyWindworksOutside_Movement_PlayerFaceLookerWest WaitMovement - Message 2 + Message ValleyWindworksOutside_Text_IShallInvestigateInside CloseMessage - ApplyMovement LOCALID_PLAYER, _02BC - ApplyMovement 6, _02EC + ApplyMovement LOCALID_PLAYER, ValleyWindworksOutside_Movement_PlayerMoveAwayFromDoor + ApplyMovement LOCALID_LOOKER, ValleyWindworksOutside_Movement_LookerWalkToDoor WaitMovement LoadDoorAnimation 7, 20, 19, 14, ANIMATION_TAG_DOOR_1 PlayDoorOpenAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 - ApplyMovement 6, _0300 + ApplyMovement LOCALID_LOOKER, ValleyWindworksOutside_Movement_LookerEnterBuilding WaitMovement PlayDoorCloseAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 @@ -177,45 +178,45 @@ _0201: LoadDoorAnimation 7, 20, 19, 14, ANIMATION_TAG_DOOR_1 PlayDoorOpenAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 - ApplyMovement 6, _0310 + ApplyMovement LOCALID_LOOKER, ValleyWindworksOutside_Movement_LookerExitBuilding WaitMovement PlayDoorCloseAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 UnloadAnimation ANIMATION_TAG_DOOR_1 - ApplyMovement 6, _031C + ApplyMovement LOCALID_LOOKER, ValleyWindworksOutside_Movement_LookerWalkOnSpotSouth WaitMovement - Message 3 + Message ValleyWindworksOutside_Text_IHaveReceivedTipsThatTheTeamGalacticHideoutIsInEternaCity CloseMessage - ApplyMovement LOCALID_PLAYER, _02C8 - ApplyMovement 6, _0324 + ApplyMovement LOCALID_PLAYER, ValleyWindworksOutside_Movement_PlayerWatchLookerLeave + ApplyMovement LOCALID_LOOKER, ValleyWindworksOutside_Movement_LookerLeave WaitMovement - RemoveObject 6 - SetVar VAR_UNK_0x411E, 2 + RemoveObject LOCALID_LOOKER + SetVar VAR_VALLEY_WINDWORKS_LOOKER_STATE, 2 ReleaseAll End .balign 4, 0 -_02AC: +ValleyWindworksOutside_Movement_PlayerFaceLookerWest: Delay8 5 Delay4 WalkOnSpotNormalWest EndMovement .balign 4, 0 -_02BC: +ValleyWindworksOutside_Movement_PlayerMoveAwayFromDoor: WalkNormalSouth WalkOnSpotNormalNorth EndMovement .balign 4, 0 -_02C8: +ValleyWindworksOutside_Movement_PlayerWatchLookerLeave: Delay8 WalkOnSpotNormalWest WalkOnSpotNormalSouth EndMovement .balign 4, 0 -_02D8: +ValleyWindworksOutside_Movement_LookerNoticeAndWalkToPlayer: EmoteExclamationMark Delay8 WalkFastNorth 4 @@ -223,7 +224,7 @@ _02D8: EndMovement .balign 4, 0 -_02EC: +ValleyWindworksOutside_Movement_LookerWalkToDoor: Delay8 Delay4 WalkNormalEast @@ -231,25 +232,25 @@ _02EC: EndMovement .balign 4, 0 -_0300: +ValleyWindworksOutside_Movement_LookerEnterBuilding: WalkNormalNorth SetInvisible FaceSouth EndMovement .balign 4, 0 -_0310: +ValleyWindworksOutside_Movement_LookerExitBuilding: SetVisible WalkFastSouth EndMovement .balign 4, 0 -_031C: +ValleyWindworksOutside_Movement_LookerWalkOnSpotSouth: WalkOnSpotFastSouth EndMovement .balign 4, 0 -_0324: +ValleyWindworksOutside_Movement_LookerLeave: WalkFastWest WalkFastSouth WalkFastSouth 6 diff --git a/res/text/floaroma_meadow.json b/res/text/floaroma_meadow.json index eaef969894..0884d94d03 100644 --- a/res/text/floaroma_meadow.json +++ b/res/text/floaroma_meadow.json @@ -2,14 +2,14 @@ "key": 33827, "messages": [ { - "id": "pl_msg_00000255_00000", + "id": "FloaromaMeadow_Text_EnoughArguingHandOverThatSweetHoney", "en_US": [ "Grunt 1: Enough arguing!\n", "Hand over that sweet Honey!\r" ] }, { - "id": "pl_msg_00000255_00001", + "id": "FloaromaMeadow_Text_DoAsWeSayTeamGalacticWillHaveThatHoney", "en_US": [ "Grunt 2: Do as we say!\n", "Team Galactic will have that Honey!\r", @@ -18,14 +18,14 @@ ] }, { - "id": "pl_msg_00000255_00002", + "id": "FloaromaMeadow_Text_HeyThisKidIsAWitnessWhatllWeDo", "en_US": [ "Grunt 1: Hey! This kid is a witness!\n", "What’ll we do?\r" ] }, { - "id": "pl_msg_00000255_00003", + "id": "FloaromaMeadow_Text_TheSolutionsSimpleWeEnsureTheBratStaysQuiet", "en_US": [ "Grunt 2: We don’t need the brat\n", "running off to get help...\r", @@ -34,14 +34,14 @@ ] }, { - "id": "pl_msg_00000255_00004", + "id": "FloaromaMeadow_Text_ThisIsSoLameTheyreGoingToDockMyPay", "en_US": [ "Grunt 1: This is so lame...\n", "They’re going to dock my pay!\r" ] }, { - "id": "pl_msg_00000255_00005", + "id": "FloaromaMeadow_Text_ImUpNextHeheheh", "en_US": [ "Grunt 2: I’m up next!\n", "Heheheh...\r", @@ -50,7 +50,7 @@ ] }, { - "id": "pl_msg_00000255_00006", + "id": "FloaromaMeadow_Text_WereDoneForHereLetsGetBackToTheValleyWindworks", "en_US": [ "Grunt 1: This brat’s tough!\n", "Like, really, really tough!\r", @@ -61,7 +61,7 @@ ] }, { - "id": "pl_msg_00000255_00007", + "id": "FloaromaMeadow_Text_ItsAWorksKeyItMustBeForTheValleyWindworks", "en_US": [ "Oh, what’s this thing?\n", "They seem to have forgotten it...\r", @@ -72,7 +72,7 @@ ] }, { - "id": "pl_msg_00000255_00008", + "id": "FloaromaMeadow_Text_INeedToThankYouThisSweetSweetHoneyGoOnTakeAWholeLot", "en_US": [ "Thank you!\n", "You surely saved me.\r", @@ -88,25 +88,25 @@ ] }, { - "id": "pl_msg_00000255_00009", + "id": "FloaromaMeadow_Text_SlatherThatHoneyOnASweetSmellingTree", "en_US": [ "Slather that Honey on a sweet-smelling\n", "tree. It might attract Pokémon." ] }, { - "id": "pl_msg_00000255_00010", + "id": "FloaromaMeadow_Text_WouldYouLikeToBuySomeHoneyForAttractingPokemon", "en_US": [ "Would you like to buy some Honey for\n", "attracting Pokémon? Just $100 each!" ] }, { - "id": "pl_msg_00000255_00011", + "id": "FloaromaMeadow_Text_Dummy11", "garbage": 10 }, { - "id": "pl_msg_00000255_00012", + "id": "FloaromaMeadow_Text_OhTooBadSeemsToMeYourBagsFull", "en_US": [ "Oh, too bad!\n", "Seems to me your Bag’s full.\r", @@ -115,33 +115,33 @@ ] }, { - "id": "pl_msg_00000255_00013", + "id": "FloaromaMeadow_Text_OopsyYouDontHaveEnoughMoney", "en_US": [ "Oopsy!\n", "You don’t have enough money." ] }, { - "id": "pl_msg_00000255_00014", + "id": "FloaromaMeadow_Text_OopsyWellComeAgain", "en_US": [ "Oopsy!\n", "Well, come again." ] }, { - "id": "pl_msg_00000255_00015", + "id": "FloaromaMeadow_Text_Times1", "en_US": "X 1" }, { - "id": "pl_msg_00000255_00016", + "id": "FloaromaMeadow_Text_Times10", "en_US": "X 10" }, { - "id": "pl_msg_00000255_00017", + "id": "FloaromaMeadow_Text_NoThanks", "en_US": "NO THANKS" }, { - "id": "pl_msg_00000255_00018", + "id": "FloaromaMeadow_Text_Dummy18", "garbage": 27 } ] diff --git a/res/text/floaroma_meadow_house.json b/res/text/floaroma_meadow_house.json index 64defcc082..a4ed08c121 100644 --- a/res/text/floaroma_meadow_house.json +++ b/res/text/floaroma_meadow_house.json @@ -2,7 +2,7 @@ "key": 33839, "messages": [ { - "id": "pl_msg_00000256_00000", + "id": "FloaromaMeadowHouse_Text_TheFlowersThatGrowInTheFieldsHereAreSpecial", "en_US": [ "The flowers that grow in the fields\n", "here are special.\r", @@ -12,7 +12,7 @@ ] }, { - "id": "pl_msg_00000256_00001", + "id": "FloaromaMeadowHouse_Text_IfYouPutHoneyOnATreeCheckBackLaterToSeeIfItsRustlings", "en_US": [ "If you put Honey on a tree, check\n", "back later to see if it’s rustling.\r", diff --git a/res/text/floaroma_town.json b/res/text/floaroma_town.json index 04c7487306..8fb26cc642 100644 --- a/res/text/floaroma_town.json +++ b/res/text/floaroma_town.json @@ -2,7 +2,7 @@ "key": 18211, "messages": [ { - "id": "pl_msg_00000569_00000", + "id": "FloaromaTown_Text_ThisDoesntSeemAllThatCool", "en_US": [ "Grunt 1: Aren’t we Team Galactic?\n", "And we’re assigned here?\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000569_00001", + "id": "FloaromaTown_Text_DontComplainThisIsAPrettyDecentAssignment", "en_US": [ "Grunt 2: Hey now! Don’t complain.\n", "This is a pretty decent assignment.\r", @@ -21,7 +21,7 @@ ] }, { - "id": "pl_msg_00000569_00002", + "id": "FloaromaTown_Text_IWantedToGetSomeFlowersFromTheFloaromaMeadow", "en_US": [ "I wanted to get some flowers from\n", "the Floaroma Meadow...\r", @@ -30,21 +30,21 @@ ] }, { - "id": "pl_msg_00000569_00003", + "id": "FloaromaTown_Text_ThoseGalacticGuysWentToTheMeadowPastTheseFlowersHere", "en_US": [ "Those Galactic guys went to the\n", "meadow past these flowers here..." ] }, { - "id": "pl_msg_00000569_00004", + "id": "FloaromaTown_Text_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood", "en_US": [ "Being surrounded by flowers puts me\n", "in an oddly pleasant mood." ] }, { - "id": "pl_msg_00000569_00005", + "id": "FloaromaTown_Text_ISimplyLoveItHere", "en_US": [ "I simply love it here...\n", "The atmosphere is so uplifting.\r", @@ -53,7 +53,7 @@ ] }, { - "id": "pl_msg_00000569_00006", + "id": "FloaromaTown_Text_WelcomeToFloaromaTheTownOfFlowersFlowersAndMoreFlowers", "en_US": [ "Welcome to Floaroma, the town of\n", "flowers, flowers, and more flowers!\r", @@ -62,7 +62,7 @@ ] }, { - "id": "pl_msg_00000569_00007", + "id": "FloaromaTown_Text_TheBerriesYouPickCanBeUsedAsFoodForPokemon", "en_US": [ "The Berries you pick can be used as\n", "food for Pokémon.\r", @@ -73,7 +73,7 @@ ] }, { - "id": "pl_msg_00000569_00008", + "id": "FloaromaTown_Text_IGotDrawnHereByTheSweetScentOfHoney", "en_US": [ "I got drawn here by the sweet scent\n", "of Honey...\r", @@ -82,7 +82,7 @@ ] }, { - "id": "pl_msg_00000569_00009", + "id": "FloaromaTown_Text_IfYouHaveAShayminThenYouAlsoShouldHaveSomeGracideaFlowers", "en_US": [ "Oh, a SHAYMIN?\r", "If you have that Pokémon, then you\n", @@ -92,7 +92,7 @@ ] }, { - "id": "pl_msg_00000569_00010", + "id": "FloaromaTown_Text_GracideaFlowersHaveBeenAroundALongTimeInThisRegion", "en_US": [ "Gracidea flowers have been around a\n", "long time in this region.\r", @@ -106,7 +106,7 @@ ] }, { - "id": "pl_msg_00000569_00011", + "id": "FloaromaTown_Text_DoYouKnowAboutGracideaFlowers", "en_US": [ "Do you know about Gracidea flowers?\r", "They’re given as bouquets to express\n", @@ -116,21 +116,21 @@ ] }, { - "id": "pl_msg_00000569_00012", + "id": "FloaromaTown_Text_MapSign", "en_US": [ "Floaroma Town\n", "Vivid & Scented" ] }, { - "id": "pl_msg_00000569_00013", + "id": "FloaromaTown_Text_PickAPeckOfColorsFlowerShopFreeBerriesAvailable", "en_US": [ "Pick a Peck of Colors Flower Shop\n", "Free Berries Available" ] }, { - "id": "pl_msg_00000569_00014", + "id": "FloaromaTown_Text_FloaromaMeadowAheadHoneyAvailable", "en_US": [ "Floaroma Meadow Ahead\n", "Honey Available" diff --git a/res/text/floaroma_town_middle_house.json b/res/text/floaroma_town_middle_house.json index 630878e7f9..d0c5801ccb 100644 --- a/res/text/floaroma_town_middle_house.json +++ b/res/text/floaroma_town_middle_house.json @@ -2,7 +2,7 @@ "key": 33815, "messages": [ { - "id": "pl_msg_00000574_00000", + "id": "FloaromaTownMiddleHouse_Text_FloaromaTownWasABarrenDesolateHillLongAgo", "en_US": [ "Floaroma Town was a barren, desolate\n", "hill long ago, avoided even by Pokémon.\r", @@ -16,28 +16,28 @@ ] }, { - "id": "pl_msg_00000574_00001", + "id": "FloaromaTownMiddleHouse_Text_DoYouThinkItsCuteHowPokemonPluckBerries", "en_US": [ "Do you think it’s cute how\n", "Pokémon pluck Berries?" ] }, { - "id": "pl_msg_00000574_00002", + "id": "FloaromaTownMiddleHouse_Text_HeresTheTMForTheMovePluck", "en_US": [ "Yes! You agreed!\n", "Here’s the TM for the move Pluck!\r" ] }, { - "id": "pl_msg_00000574_00003", + "id": "FloaromaTownMiddleHouse_Text_OhIGuessIJustLikeWeirdThings", "en_US": [ "Oh...\n", "I guess I just like weird things..." ] }, { - "id": "pl_msg_00000574_00004", + "id": "FloaromaTownMiddleHouse_Text_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe", "en_US": [ "When a Pokémon uses Pluck, it eats\n", "a Berry held by its foe in battle.\r", @@ -46,7 +46,7 @@ ] }, { - "id": "pl_msg_00000574_00005", + "id": "FloaromaTownMiddleHouse_Text_ClefairyRii", "en_US": "CLEFAIRY: Rii?" } ] diff --git a/res/text/floaroma_town_pokecenter_1f.json b/res/text/floaroma_town_pokecenter_1f.json index 88383ab136..a238b9db97 100644 --- a/res/text/floaroma_town_pokecenter_1f.json +++ b/res/text/floaroma_town_pokecenter_1f.json @@ -2,7 +2,7 @@ "key": 44594, "messages": [ { - "id": "pl_msg_00000571_00000", + "id": "FloaromaTownPokecenter1F_Text_IfYouveGotPokemonWithYouItsSafeToGoOffTravelingAlone", "en_US": [ "If you’ve got Pokémon with you,\n", "it’s safe for even a kid like you\f", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000571_00001", + "id": "FloaromaTownPokecenter1F_Text_IHadABattleTheOtherDayAndMyPokemonsHPGotLow", "en_US": [ "I had a battle the other day, and my\n", "Pokémon’s HP got low.\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000571_00002", + "id": "FloaromaTownPokecenter1F_Text_ThereveBeenProblemsWithTheElectricPowerLately", "en_US": [ "There’ve been problems with the\n", "electric power lately.\r", @@ -29,7 +29,7 @@ ] }, { - "id": "pl_msg_00000571_00003", + "id": "FloaromaTownPokecenter1F_Text_ItsALongWayFromHereToEternaCity", "en_US": [ "It’s a long way from here to Eterna\n", "City.\r", @@ -38,7 +38,7 @@ ] }, { - "id": "pl_msg_00000571_00004", + "id": "FloaromaTownPokecenter1F_Text_PoPoPokemonIWantToBecomeMoreLikeAPikachu", "en_US": [ "Po-Po-Pokémon!\r", "I want to become more like a PIKACHU!\n", @@ -46,15 +46,15 @@ ] }, { - "id": "pl_msg_00000571_00005", + "id": "FloaromaTownPokecenter1F_Text_PiPikachu", "en_US": "Pi-Pikachu!\r" }, { - "id": "pl_msg_00000571_00006", + "id": "FloaromaTownPokecenter1F_Text_PiPikachu2", "en_US": "Pi-Pikachu!" }, { - "id": "pl_msg_00000571_00007", + "id": "FloaromaTownPokecenter1F_Text_ICanMakeStaticElectricityButImNotVeryMuchLikeAPokemonYet", "en_US": [ "I can make static electricity, but I’m\n", "not very much like a Pokémon yet.\r", diff --git a/res/text/floaroma_town_southeast_house.json b/res/text/floaroma_town_southeast_house.json index 4836ccded5..8b0b2f1592 100644 --- a/res/text/floaroma_town_southeast_house.json +++ b/res/text/floaroma_town_southeast_house.json @@ -2,7 +2,7 @@ "key": 1054, "messages": [ { - "id": "pl_msg_00000573_00000", + "id": "FloaromaTownSoutheastHouse_Text_SomeKindsOfPokemonAppearOnlyIfTheyreAttractedByHoney", "en_US": [ "Some kinds of Pokémon appear only\n", "if they’re attracted by the sweet\f", @@ -10,7 +10,7 @@ ] }, { - "id": "pl_msg_00000573_00001", + "id": "FloaromaTownSoutheastHouse_Text_PokemonHaveAnAcuteSenseOfSmell", "en_US": [ "Pokémon must have an acute sense\n", "of smell.\r", diff --git a/res/text/flower_paradise.json b/res/text/flower_paradise.json index 41cd3e341b..243a9e8671 100644 --- a/res/text/flower_paradise.json +++ b/res/text/flower_paradise.json @@ -2,11 +2,11 @@ "key": 50062, "messages": [ { - "id": "pl_msg_00000269_00000", + "id": "FlowerParadise_Text_KyuuUuhn", "en_US": "Kyuu uuhn.\r" }, { - "id": "pl_msg_00000269_00001", + "id": "FlowerParadise_Text_ShayminDisappearedAmongTheFlowers", "en_US": [ "SHAYMIN disappeared among\n", "the flowers..." diff --git a/res/text/flower_shop.json b/res/text/flower_shop.json index e4db27b8db..2b99acd638 100644 --- a/res/text/flower_shop.json +++ b/res/text/flower_shop.json @@ -2,7 +2,7 @@ "key": 1030, "messages": [ { - "id": "pl_msg_00000572_00000", + "id": "FlowerShop_Text_ASingleBerryWillGrowIntoAPlantThatMakesSeveralBerries", "en_US": [ "A single Berry will grow into a plant\n", "that makes several Berries.\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000572_00001", + "id": "FlowerShop_Text_PleasePlantThatBerryInSoftEarthySoil", "en_US": [ "Please plant that Berry in soft,\n", "earthy soil.\r", @@ -22,14 +22,14 @@ ] }, { - "id": "pl_msg_00000572_00002", + "id": "FlowerShop_Text_TrainerPleaseWaterBerriesUsingThisSprayduckWateringCan", "en_US": [ "Trainer, please water Berries using\n", "this Sprayduck watering can.\r" ] }, { - "id": "pl_msg_00000572_00003", + "id": "FlowerShop_Text_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries", "en_US": [ "Use that Sprayduck to water the soil\n", "where you’ve planted Berries.\r", diff --git a/res/text/route_204_north.json b/res/text/route_204_north.json index eec67b3f49..1c6cafcd5a 100644 --- a/res/text/route_204_north.json +++ b/res/text/route_204_north.json @@ -2,7 +2,7 @@ "key": 2418, "messages": [ { - "id": "pl_msg_00000470_00000", + "id": "Route204North_Text_AreYouRaisingDifferentKindsOfPokemon", "en_US": [ "Are you raising different kinds of\n", "Pokémon?\r", @@ -12,7 +12,7 @@ ] }, { - "id": "pl_msg_00000470_00001", + "id": "Route204North_Text_IdLikeYouToHaveThisTM", "en_US": [ "Hi, are you the flirty type?\n", "I’m asking you this to make a point.\r", @@ -23,7 +23,7 @@ ] }, { - "id": "pl_msg_00000470_00002", + "id": "Route204North_Text_CaptivateOnlyWorksAgainstTheOppositeGender", "en_US": [ "You know how Pokémon have genders?\n", "Like, there are males and females?\r", @@ -40,7 +40,7 @@ ] }, { - "id": "pl_msg_00000470_00003", + "id": "Route204North_Text_Rt204FloaromaTown", "en_US": [ "Rt. 204\n", "Floaroma Town" diff --git a/res/text/route_204_south.json b/res/text/route_204_south.json index 8ae67f2541..2be7181de5 100644 --- a/res/text/route_204_south.json +++ b/res/text/route_204_south.json @@ -2,7 +2,7 @@ "key": 2430, "messages": [ { - "id": "pl_msg_00000469_00000", + "id": "Route204South_Text_ThereAreBouldersBlockingTheWayInsideTheCavern", "en_US": [ "There are boulders blocking the way\n", "inside the cavern...\r", @@ -11,14 +11,14 @@ ] }, { - "id": "pl_msg_00000469_00001", + "id": "Route204South_Text_Rt204JubilifeCity", "en_US": [ "Rt. 204\n", "Jubilife City" ] }, { - "id": "pl_msg_00000469_00002", + "id": "Route204South_Text_RavagedPath", "en_US": "Ravaged Path" } ] diff --git a/res/text/route_205_south.json b/res/text/route_205_south.json index 06ada39f4a..802bedbe87 100644 --- a/res/text/route_205_south.json +++ b/res/text/route_205_south.json @@ -2,7 +2,7 @@ "key": 3454, "messages": [ { - "id": "pl_msg_00000471_00000", + "id": "Route205South_Text_HelpHelpTrainerPleaseIWantToSeeMyPapa", "en_US": [ "Help, help, Trainer!\n", "Please, I want to see my papa.\r", @@ -17,14 +17,14 @@ ] }, { - "id": "pl_msg_00000471_00001", + "id": "Route205South_Text_IWantToSeeMyPapaHesAtTheValleyWindworks", "en_US": [ "Please, Trainer! I want to see my papa.\n", "He’s at the Valley Windworks..." ] }, { - "id": "pl_msg_00000471_00002", + "id": "Route205South_Text_WeTeamGalacticAreConductingResearchInTheEternaForest", "en_US": [ "We, Team Galactic, are conducting\n", "research in the Eterna Forest!\r", @@ -32,7 +32,7 @@ ] }, { - "id": "pl_msg_00000471_00003", + "id": "Route205South_Text_OurResearchInvolvesCatchingPokemonInTheFloweryMeadowsOfFloaroma1", "en_US": [ "Our research involves catching Pokémon\n", "in the flowery meadows of Floaroma.\r", @@ -42,7 +42,7 @@ ] }, { - "id": "pl_msg_00000471_00004", + "id": "Route205South_Text_OurResearchInvolvesCatchingPokemonInTheFloweryMeadowsOfFloaroma2", "en_US": [ "Our research involves catching Pokémon\n", "in the flowery meadows of Floaroma.\r", @@ -52,7 +52,7 @@ ] }, { - "id": "pl_msg_00000471_00005", + "id": "Route205South_Text_ManyPoisonTypePokemonMakeTheEternaForestTheirHome", "en_US": [ "Many Poison-type Pokémon make the\n", "Eterna Forest their home.\r", @@ -62,7 +62,7 @@ ] }, { - "id": "pl_msg_00000471_00006", + "id": "Route205South_Text_IfYouSlatherSweetHoneyOnASweetSmellingTree", "en_US": [ "If you slather sweet Honey on\n", "a sweet-smelling tree...\r", @@ -71,21 +71,21 @@ ] }, { - "id": "pl_msg_00000471_00007", + "id": "Route205South_Text_Rt205FloaromaTown", "en_US": [ "Rt. 205\n", "Floaroma Town" ] }, { - "id": "pl_msg_00000471_00008", + "id": "Route205South_Text_Rt205EternaForest", "en_US": [ "Rt. 205\n", "Eterna Forest" ] }, { - "id": "pl_msg_00000471_00009", + "id": "Route205South_Text_TrainerTipsTheItemsPlacedInYourBagAreAutomaticallySorted", "en_US": [ "Trainer Tips!\r", "The items placed in your Bag are\n", diff --git a/res/text/valley_windworks_building.json b/res/text/valley_windworks_building.json index 74918d9625..7a138c4617 100644 --- a/res/text/valley_windworks_building.json +++ b/res/text/valley_windworks_building.json @@ -2,7 +2,7 @@ "key": 5122, "messages": [ { - "id": "pl_msg_00000225_00000", + "id": "ValleyWindworksBuilding_Text_YouHaveTheKeyIveGotToAlertTheCommander", "en_US": [ "What?! No way!\n", "You have the key?\r", @@ -13,7 +13,7 @@ ] }, { - "id": "pl_msg_00000225_00001", + "id": "ValleyWindworksBuilding_Text_HumphJustYouWaitOurCommanderWillSmooshYou", "en_US": [ "My Pokémon can’t battle anymore.\r", "They’re gonna take away my Pokémon\n", @@ -23,7 +23,7 @@ ] }, { - "id": "pl_msg_00000225_00002", + "id": "ValleyWindworksBuilding_Text_MyNameIsMarsLetsHaveABattleToDecideWhatWeShouldDoNext", "en_US": [ "I’m one of Team Galactic’s three\n", "Commanders.\r", @@ -44,7 +44,7 @@ ] }, { - "id": "pl_msg_00000225_00003", + "id": "ValleyWindworksBuilding_Text_OopsIMessedThatOneUp", "en_US": [ "Mars: Oops!\n", "I messed that one up!\r", @@ -53,7 +53,7 @@ ] }, { - "id": "pl_msg_00000225_00004", + "id": "ValleyWindworksBuilding_Text_LoseToAChildWillYouNowMarsWeShouldBeGoing", "en_US": [ "Charon: My, my.\n", "Lose to a child, will you?\r", @@ -67,7 +67,7 @@ ] }, { - "id": "pl_msg_00000225_00005", + "id": "ValleyWindworksBuilding_Text_WillYouShutIt", "en_US": [ "Mars: Will you shut it!\r", "The boss is the only person in the world\n", @@ -78,14 +78,14 @@ ] }, { - "id": "pl_msg_00000225_00006", + "id": "ValleyWindworksBuilding_Text_IGuessItsTimeToSayGoodbyeAndLeaveForTheTimeBeing", "en_US": [ "I guess it’s time to say good-bye\n", "and leave for the time being!\r" ] }, { - "id": "pl_msg_00000225_00007", + "id": "ValleyWindworksBuilding_Text_ICanFinallySeeMyLittleDaughterAgain", "en_US": [ "Team Galactic...\r", "They were saying they had to gather\n", @@ -101,7 +101,7 @@ ] }, { - "id": "pl_msg_00000225_00008", + "id": "ValleyWindworksBuilding_Text_YuckPapaYoureStinkyGoShowerNowStinky", "en_US": [ "Little girl: Papa!\r", "Yuck! Papa, you’re stinky!\n", @@ -109,14 +109,14 @@ ] }, { - "id": "pl_msg_00000225_00009", + "id": "ValleyWindworksBuilding_Text_OhSorryAhahaTheyHadMeWorkingNonstop", "en_US": [ "Papa: Oh, sorry! Ahaha!\n", "They had me working nonstop!\r" ] }, { - "id": "pl_msg_00000225_00010", + "id": "ValleyWindworksBuilding_Text_IThinkTheBalloonPokemonWillComeVisitingAgain", "en_US": [ "Little girl: Thank you, Trainer!\n", "You made those bad people go away!\r", @@ -125,7 +125,7 @@ ] }, { - "id": "pl_msg_00000225_00011", + "id": "ValleyWindworksBuilding_Text_ABalloonPokemonAppearsInFrontOfTheWindworksItsAlwaysACertainDayOfTheWeek", "en_US": [ "Papa: Oh, yes, a balloon Pokémon\n", "appears in front of the windworks.\r", @@ -137,7 +137,7 @@ ] }, { - "id": "pl_msg_00000225_00012", + "id": "ValleyWindworksBuilding_Text_TheValleyWindworksUsesTurbinesToCaptureEnergy", "en_US": [ "The Valley Windworks uses turbines\n", "to capture energy from winds driven\f", @@ -147,14 +147,14 @@ ] }, { - "id": "pl_msg_00000225_00013", + "id": "ValleyWindworksBuilding_Text_IfTheBalloonPokemonCameTheWindWouldBlowItAway", "en_US": [ "If the balloon Pokémon came,\n", "the wind would blow it away!" ] }, { - "id": "pl_msg_00000225_00014", + "id": "ValleyWindworksBuilding_Text_BringersAndTargetsTeamGalactic", "en_US": [ "The bringer of wars...\r", "Your target is the energy of the power\n", @@ -170,7 +170,7 @@ ] }, { - "id": "pl_msg_00000225_00015", + "id": "ValleyWindworksBuilding_Text_ThePCScreenIsFilledWithNumbersUponNumbers", "en_US": [ "The PC screen is filled with numbers\n", "upon numbers.\r", diff --git a/res/text/valley_windworks_outside.json b/res/text/valley_windworks_outside.json index 221e0143f8..c7d507b97c 100644 --- a/res/text/valley_windworks_outside.json +++ b/res/text/valley_windworks_outside.json @@ -2,7 +2,7 @@ "key": 51110, "messages": [ { - "id": "pl_msg_00000224_00000", + "id": "ValleyWindworksOutside_Text_DontYouDareGoIntoTheValleyWindworksYoullHaveToBattleMeForIt", "en_US": [ "Don’t you dare go into the Valley\n", "Windworks.\r", @@ -15,7 +15,7 @@ ] }, { - "id": "pl_msg_00000224_00001", + "id": "ValleyWindworksOutside_Text_IsntThatJustGreatGettingOwnedBySomeKid", "en_US": [ "Isn’t that just great.\n", "Getting owned by some kid.\r", @@ -30,7 +30,7 @@ ] }, { - "id": "pl_msg_00000224_00002", + "id": "ValleyWindworksOutside_Text_IShallInvestigateInside", "en_US": [ "Looker: Ah, yes.\n", "It is you, yes.\r", @@ -46,7 +46,7 @@ ] }, { - "id": "pl_msg_00000224_00003", + "id": "ValleyWindworksOutside_Text_IHaveReceivedTipsThatTheTeamGalacticHideoutIsInEternaCity", "en_US": [ "Looker: Magnificent! Yes, it is!\n", "What you have said, it is all true!\r", @@ -60,33 +60,33 @@ ] }, { - "id": "pl_msg_00000224_00004", + "id": "ValleyWindworksOutside_Text_Kerchunk", "en_US": "Ker-chunk!\r" }, { - "id": "pl_msg_00000224_00005", + "id": "ValleyWindworksOutside_Text_ItsLockedFromInside", "en_US": "It’s locked from inside!" }, { - "id": "pl_msg_00000224_00006", + "id": "ValleyWindworksOutside_Text_ItsLockedFromInsideUseTheWorksKey", "en_US": [ "It’s locked from inside!\r", "Use the Works Key?" ] }, { - "id": "pl_msg_00000224_00007", + "id": "ValleyWindworksOutside_Text_KerchunkTheDoorToValleyWindworksOpened", "en_US": [ "Ker-chunk!\r", "The door to Valley Windworks opened!" ] }, { - "id": "pl_msg_00000224_00008", + "id": "ValleyWindworksOutside_Text_Floooooon", "en_US": "Floooooon!\r" }, { - "id": "pl_msg_00000224_00009", + "id": "ValleyWindworksOutside_Text_ValleyWindworksEcologicalWindDrivenEnergy", "en_US": [ "Valley Windworks\n", "Ecological, Wind-Driven Energy" diff --git a/src/scrcmd.c b/src/scrcmd.c index e67a9ad21e..1b3588c90d 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -499,7 +499,7 @@ static BOOL ScrCmd_SetPosition(ScriptContext *ctx); static BOOL ScrCmd_SetObjectEventMovementType(ScriptContext *ctx); static BOOL ScrCmd_SetObjectEventDir(ScriptContext *ctx); static BOOL ScrCmd_SetWarpEventPos(ScriptContext *ctx); -static BOOL ScrCmd_18B(ScriptContext *ctx); +static BOOL ScrCmd_SetBgEventPos(ScriptContext *ctx); static BOOL ScrCmd_18C(ScriptContext *ctx); static BOOL ScrCmd_18F(ScriptContext *ctx); static BOOL ScrCmd_LoadDoorAnimation(ScriptContext *ctx); @@ -1160,7 +1160,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_SetObjectEventMovementType, ScrCmd_SetObjectEventDir, ScrCmd_SetWarpEventPos, - ScrCmd_18B, + ScrCmd_SetBgEventPos, ScrCmd_18C, ScrCmd_ShowSavingIcon, ScrCmd_HideSavingIcon, @@ -5461,13 +5461,13 @@ static BOOL ScrCmd_SetWarpEventPos(ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_18B(ScriptContext *ctx) +static BOOL ScrCmd_SetBgEventPos(ScriptContext *ctx) { - u16 v0 = ScriptContext_GetVar(ctx); - u16 v1 = ScriptContext_GetVar(ctx); - u16 v2 = ScriptContext_GetVar(ctx); + u16 index = ScriptContext_GetVar(ctx); + u16 x = ScriptContext_GetVar(ctx); + u16 z = ScriptContext_GetVar(ctx); - MapHeaderData_SetBgEventPos(ctx->fieldSystem, v0, v1, v2); + MapHeaderData_SetBgEventPos(ctx->fieldSystem, index, x, z); return FALSE; }