diff --git a/include/constants/field/map_prop.h b/include/constants/field/map_prop.h deleted file mode 100644 index a52de0515c..0000000000 --- a/include/constants/field/map_prop.h +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef POKEPLATINUM_CONSTANTS_FIELD_MAP_PROP_H -#define POKEPLATINUM_CONSTANTS_FIELD_MAP_PROP_H - -enum MapPropModelID { - // Model name: treeeff - MAP_PROP_MODEL_HONEY_TREE = 26, - // Model name: c2_s03a - MAP_PROP_MODEL_CANALAVE_BRIDGE_LEFT = 31, - // Model name: c2_s03b - MAP_PROP_MODEL_CANALAVE_BRIDGE_RIGHT = 32, - // Model name: c2_o02 - MAP_PROP_MODEL_REGULAR_SHIP = 34, - // Model name: door01 - MAP_PROP_MODEL_DOOR01 = 66, - // Model name: t1_door1 - MAP_PROP_MODEL_BROWN_WOODEN_DOOR = 67, - // Model name: t2_door1 - MAP_PROP_MODEL_GREEN_WOODEN_DOOR = 68, - // Model name: t2_door2 - MAP_PROP_MODEL_IRON_DOOR = 69, - // Model name: p_door - MAP_PROP_MODEL_POKECENTER_DOOR = 70, - // Model name: ele_door1 - MAP_PROP_MODEL_ELEVATOR_DOOR = 75, - // Model name: table_l01 - MAP_PROP_MODEL_DESK_DRAWER_LAPTOP = 112, - // Model name: table_l02 - MAP_PROP_MODEL_DESK_DRAWER_LAPTOP_FACING_RIGHT = 115, - // Model name: pc01 - MAP_PROP_MODEL_POKECENTER_PC = 119, - // Model name: machine_pc02 - MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE = 123, - // Model name: machine_pc03 - MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_TV = 124, - // Model name: counter_pc04 - MAP_PROP_MODEL_POKECENTER_INSIDE_COUNTER_DOOR = 128, - // Model name: stair_pc_u01 - MAP_PROP_MODEL_POKECENTER_STAIR_UP_LEFT = 130, - // Model name: stair_pc_d01 - MAP_PROP_MODEL_POKECENTER_STAIR_DOWN_LEFT = 131, - // Model name: r04_b1 - MAP_PROP_MODEL_PASTORIA_GYM_BLUE_BUTTON = 239, - // Model name: r04_b2 - MAP_PROP_MODEL_PASTORIA_GYM_GREEN_BUTTON = 240, - // Model name: r04_b3 - MAP_PROP_MODEL_PASTORIA_GYM_ORANGE_BUTTON = 241, - // Model name: r04_w - MAP_PROP_MODEL_PASTORIA_GYM_WATER_FLOOR = 242, - // Model name: c1_door1 - MAP_PROP_MODEL_JUBILIFE_CITY_BUILDING_DOOR = 246, - // Model name: table_l03 - MAP_PROP_MODEL_DESK_DRAWER_LAPTOP_FACING_LEFT = 248, - // Model name: lift_base01 - MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT = 258, - // Model name: gym_door01 - MAP_PROP_MODEL_HEARTHOME_GYM_INSIDE_DOOR = 260, - // Model name: gym_door00 - MAP_PROP_MODEL_GYM_DOOR = 298, - // Model name: cy_slope - MAP_PROP_MODEL_BIKE_MUDDY_SLOPE = 303, - // Model name: cy_slope_dun - MAP_PROP_MODEL_BIKE_DUNGEON_MUDDY_SLOPE = 304, - // Model name: c3_door1 - MAP_PROP_MODEL_BLUE_DOOR = 312, - // Model name: c3_door2 - MAP_PROP_MODEL_IRON_DOOR_2 = 313, - // Model name: ug_table_l01 - MAP_PROP_MODEL_SECRET_BASE_PC_NORMAL_FLAG = 316, - // Model name: ug_table_l02 - MAP_PROP_MODEL_SECRET_BASE_PC_BRONZE_FLAG = 317, - // Model name: ug_table_l03 - MAP_PROP_MODEL_SECRET_BASE_PC_SILVER_FLAG = 318, - // Model name: ug_table_l04 - MAP_PROP_MODEL_SECRET_BASE_PC_GOLD_FLAG = 319, - // Model name: ug_table_l05 - MAP_PROP_MODEL_SECRET_BASE_PC_PLATINUM_FLAG = 320, - // Model name: stair_pc_u02 - MAP_PROP_MODEL_POKECENTER_STAIR_UP_RIGHT = 425, - // Model name: stair_pc_d02 - MAP_PROP_MODEL_POKECENTER_STAIR_DOWN_RIGHT = 426, - // Model name: door_pc01 - MAP_PROP_MODEL_POKECENTER_INSIDE_DOOR = 427, - // Model name: ug_hole_b - MAP_PROP_MODEL_SECRET_BASE_ENTRANCE_NORTH = 429, - // Model name: ug_hole_f - MAP_PROP_MODEL_SECRET_BASE_ENTRANCE_SOUTH = 430, - // Model name: ug_hole_l - MAP_PROP_MODEL_SECRET_BASE_ENTRANCE_WEST = 431, - // Model name: ug_hole_r - MAP_PROP_MODEL_SECRET_BASE_ENTRANCE_EAST = 432, - // Model name: t3_door1 - MAP_PROP_MODEL_YELLOW_WOODEN_DOOR = 438, - // Model name: d3_door1 - MAP_PROP_MODEL_MANSION_DOOR = 441, - // Model name: c5_door_s - MAP_PROP_MODEL_VEILSTONE_DPT_STORE_DOOR = 442, - // Model name: c4_door1 - MAP_PROP_MODEL_BLUE_WOODEN_DOOR = 444, - // Model name: door_wi01 - MAP_PROP_MODEL_GTS_INSIDE_DOOR = 456, - // Model name: d6_train - MAP_PROP_MODEL_GREAT_MARSH_TRAIN = 475, - // Model name: card_door01 - MAP_PROP_MODEL_CARD_DOOR = 484, - // Model name: ev_o01 - MAP_PROP_MODEL_ELEVATOR_LIGHTS = 498, - // Model name: leage_lift - MAP_PROP_MODEL_POKEMON_LEAGUE_PLATFORM_LIFT = 502, - // Model name: leage_o03 - MAP_PROP_MODEL_POKEMON_LEAGUE_HALL_OF_FAME_MACHINE = 507, - // Model name: pc_mb - MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_MINI_POKEBALL = 517, - // Model name: l2_door1 - MAP_PROP_MODEL_HOTEL_GRAND_LAKE_DOOR = 527, - // Model name: c09_s02 - MAP_PROP_MODEL_SCREW_STEAMSHIP_SPIRAL = 538, -}; - -#endif // POKEPLATINUM_CONSTANTS_FIELD_MAP_PROP_H diff --git a/include/data/map_headers.h b/include/data/map_headers.h index a27d64d2ec..41dce3cb84 100644 --- a/include/data/map_headers.h +++ b/include/data/map_headers.h @@ -7,16 +7,18 @@ #include "map_header.h" +#include "res/field/area_data/area_data.naix.h" #include "res/field/encounters/pl_enc_data.naix.h" #include "res/field/events/zone_event.naix.h" +#include "res/field/matrices/map_matrix.naix.h" #include "res/field/scripts/scr_seq.naix.h" #include "res/text/bank/location_names.h" static const MapHeader sMapHeaders[] = { [MAP_HEADER_EVERYWHERE] = { - .areaDataArchiveID = 0x0, + .areaDataArchiveID = area_data_000, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -36,9 +38,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_NOTHING] = { - .areaDataArchiveID = 0x0, + .areaDataArchiveID = area_data_000, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -58,9 +60,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNDERGROUND] = { - .areaDataArchiveID = 0x2, + .areaDataArchiveID = area_data_002, .unk_01 = 0x2, - .mapMatrixID = 0x2, + .mapMatrixID = map_matrix_002, .scriptsArchiveID = scripts_underground, .initScriptsArchiveID = scripts_init_underground, .msgArchiveID = TEXT_BANK_UNDERGROUND, @@ -80,9 +82,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_jubilife_city, .initScriptsArchiveID = scripts_init_jubilife_city, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -102,9 +104,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_JUBILIFE_CITY_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_jubilife_city_mart, .initScriptsArchiveID = scripts_init_jubilife_city_mart, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_MART, @@ -124,9 +126,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_1] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0x14, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_jubilife_city_unknown_house_1, .initScriptsArchiveID = scripts_init_jubilife_city_unknown_house_1, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_1, @@ -146,9 +148,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_jubilife_city_pokecenter_1f, .initScriptsArchiveID = scripts_init_jubilife_city_pokecenter_1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_POKECENTER_1F, @@ -168,9 +170,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_jubilife_city_pokecenter_2f, .initScriptsArchiveID = scripts_init_jubilife_city_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -190,9 +192,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKETCH_CO_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 0x8D, + .mapMatrixID = map_matrix_141, .scriptsArchiveID = scripts_poketch_co_1f, .initScriptsArchiveID = scripts_init_poketch_co_1f, .msgArchiveID = TEXT_BANK_POKETCH_CO_1F, @@ -212,9 +214,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKETCH_CO_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 0x8E, + .mapMatrixID = map_matrix_142, .scriptsArchiveID = scripts_poketch_co_2f, .initScriptsArchiveID = scripts_init_poketch_co_2f, .msgArchiveID = TEXT_BANK_POKETCH_CO_2F, @@ -234,9 +236,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKETCH_CO_3F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 143, + .mapMatrixID = map_matrix_143, .scriptsArchiveID = scripts_poketch_co_3f, .initScriptsArchiveID = scripts_init_poketch_co_3f, .msgArchiveID = TEXT_BANK_POKETCH_CO_3F, @@ -256,9 +258,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_TV_1F] = { - .areaDataArchiveID = 34, + .areaDataArchiveID = area_data_034, .unk_01 = 0xF, - .mapMatrixID = 148, + .mapMatrixID = map_matrix_148, .scriptsArchiveID = scripts_jubilife_tv_1f, .initScriptsArchiveID = scripts_init_jubilife_tv_1f, .msgArchiveID = TEXT_BANK_JUBILIFE_TV_1F, @@ -278,9 +280,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_TV_2F] = { - .areaDataArchiveID = 34, + .areaDataArchiveID = area_data_034, .unk_01 = 0xF, - .mapMatrixID = 149, + .mapMatrixID = map_matrix_149, .scriptsArchiveID = scripts_jubilife_tv_2f, .initScriptsArchiveID = scripts_init_jubilife_tv_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_TV_2F, @@ -300,9 +302,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_TV_3F] = { - .areaDataArchiveID = 34, + .areaDataArchiveID = area_data_034, .unk_01 = 0xF, - .mapMatrixID = 150, + .mapMatrixID = map_matrix_150, .scriptsArchiveID = scripts_jubilife_tv_3f, .initScriptsArchiveID = scripts_init_jubilife_tv_3f, .msgArchiveID = TEXT_BANK_JUBILIFE_TV_3F, @@ -322,9 +324,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_TV_4F] = { - .areaDataArchiveID = 34, + .areaDataArchiveID = area_data_034, .unk_01 = 0xF, - .mapMatrixID = 151, + .mapMatrixID = map_matrix_151, .scriptsArchiveID = scripts_jubilife_tv_4f, .initScriptsArchiveID = scripts_init_jubilife_tv_4f, .msgArchiveID = TEXT_BANK_JUBILIFE_TV_4F, @@ -344,9 +346,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_TV_2F_GALLERY] = { - .areaDataArchiveID = 34, + .areaDataArchiveID = area_data_034, .unk_01 = 0xF, - .mapMatrixID = 152, + .mapMatrixID = map_matrix_152, .scriptsArchiveID = scripts_jubilife_tv_2f_gallery, .initScriptsArchiveID = scripts_init_jubilife_tv_2f_gallery, .msgArchiveID = TEXT_BANK_JUBILIFE_TV_2F_GALLERY, @@ -366,9 +368,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM] = { - .areaDataArchiveID = 34, + .areaDataArchiveID = area_data_034, .unk_01 = 0xF, - .mapMatrixID = 153, + .mapMatrixID = map_matrix_153, .scriptsArchiveID = scripts_jubilife_tv_3f_global_ranking_room, .initScriptsArchiveID = scripts_init_jubilife_tv_3f_global_ranking_room, .msgArchiveID = TEXT_BANK_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM, @@ -388,9 +390,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_TV_3F_GROUP_RANKING_ROOM] = { - .areaDataArchiveID = 34, + .areaDataArchiveID = area_data_034, .unk_01 = 0xF, - .mapMatrixID = 154, + .mapMatrixID = map_matrix_154, .scriptsArchiveID = scripts_jubilife_tv_3f_group_ranking_room, .initScriptsArchiveID = scripts_init_jubilife_tv_3f_group_ranking_room, .msgArchiveID = TEXT_BANK_JUBILIFE_TV_3F_GROUP_RANKING_ROOM, @@ -410,9 +412,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_TV_ELEVATOR] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 207, + .mapMatrixID = map_matrix_207, .scriptsArchiveID = scripts_jubilife_tv_elevator, .initScriptsArchiveID = scripts_init_jubilife_tv_elevator, .msgArchiveID = TEXT_BANK_JUBILIFE_TV_ELEVATOR, @@ -432,9 +434,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 132, + .mapMatrixID = map_matrix_132, .scriptsArchiveID = scripts_jubilife_city_south_house_1f, .initScriptsArchiveID = scripts_init_jubilife_city_south_house_1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_SOUTH_HOUSE_1F, @@ -454,9 +456,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_jubilife_city_south_house_2f, .initScriptsArchiveID = scripts_init_jubilife_city_south_house_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_SOUTH_HOUSE_2F, @@ -476,9 +478,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_3F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_jubilife_city_south_house_3f, .initScriptsArchiveID = scripts_init_jubilife_city_south_house_3f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_SOUTH_HOUSE_3F, @@ -498,9 +500,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_4F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -520,9 +522,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_2] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0x14, - .mapMatrixID = 125, + .mapMatrixID = map_matrix_125, .scriptsArchiveID = scripts_jubilife_city_unknown_house_2, .initScriptsArchiveID = scripts_init_jubilife_city_unknown_house_2, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_2, @@ -542,9 +544,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 132, + .mapMatrixID = map_matrix_132, .scriptsArchiveID = scripts_jubilife_city_condominiums_1f, .initScriptsArchiveID = scripts_init_jubilife_city_condominiums_1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_CONDOMINIUMS_1F, @@ -564,9 +566,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_jubilife_city_condominiums_2f, .initScriptsArchiveID = scripts_init_jubilife_city_condominiums_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_CONDOMINIUMS_2F, @@ -586,9 +588,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_3F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_jubilife_city_condominiums_3f, .initScriptsArchiveID = scripts_init_jubilife_city_condominiums_3f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_CONDOMINIUMS_3F, @@ -608,9 +610,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_4F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_jubilife_city_condominiums_4f, .initScriptsArchiveID = scripts_init_jubilife_city_condominiums_4f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_CONDOMINIUMS_4F, @@ -630,9 +632,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GLOBAL_TERMINAL_1F] = { - .areaDataArchiveID = 40, + .areaDataArchiveID = area_data_040, .unk_01 = 0xF, - .mapMatrixID = 205, + .mapMatrixID = map_matrix_205, .scriptsArchiveID = scripts_global_terminal_1f, .initScriptsArchiveID = scripts_init_global_terminal_1f, .msgArchiveID = TEXT_BANK_GLOBAL_TERMINAL_1F, @@ -652,9 +654,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TRAINERS_SCHOOL] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 140, + .mapMatrixID = map_matrix_140, .scriptsArchiveID = scripts_trainers_school, .initScriptsArchiveID = scripts_init_trainers_school, .msgArchiveID = TEXT_BANK_TRAINERS_SCHOOL, @@ -674,9 +676,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_SOUTHWEST_HOUSE_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 132, + .mapMatrixID = map_matrix_132, .scriptsArchiveID = scripts_jubilife_city_southwest_house_1f, .initScriptsArchiveID = scripts_init_jubilife_city_southwest_house_1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_SOUTHWEST_HOUSE_1F, @@ -696,9 +698,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_3] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0x14, - .mapMatrixID = 125, + .mapMatrixID = map_matrix_125, .scriptsArchiveID = scripts_jubilife_city_unknown_house_3, .initScriptsArchiveID = scripts_init_jubilife_city_unknown_house_3, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_3, @@ -718,9 +720,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_4] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0x14, - .mapMatrixID = 125, + .mapMatrixID = map_matrix_125, .scriptsArchiveID = scripts_jubilife_city_unknown_house_4, .initScriptsArchiveID = scripts_init_jubilife_city_unknown_house_4, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_4, @@ -740,9 +742,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY] = { - .areaDataArchiveID = 15, + .areaDataArchiveID = area_data_015, .unk_01 = 9, - .mapMatrixID = 0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_canalave_city, .initScriptsArchiveID = scripts_init_canalave_city, .msgArchiveID = TEXT_BANK_CANALAVE_CITY, @@ -762,9 +764,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_CANALAVE_CITY_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_canalave_city_mart, .initScriptsArchiveID = scripts_init_canalave_city_mart, .msgArchiveID = TEXT_BANK_CANALAVE_CITY_MART, @@ -784,9 +786,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY_GYM] = { - .areaDataArchiveID = 0x18, + .areaDataArchiveID = area_data_024, .unk_01 = 0xF, - .mapMatrixID = 112, + .mapMatrixID = map_matrix_112, .scriptsArchiveID = scripts_canalave_city_gym, .initScriptsArchiveID = scripts_init_canalave_city_gym, .msgArchiveID = TEXT_BANK_CANALAVE_CITY_GYM, @@ -806,9 +808,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_canalave_city_pokecenter_1f, .initScriptsArchiveID = scripts_init_canalave_city_pokecenter_1f, .msgArchiveID = TEXT_BANK_CANALAVE_CITY_POKECENTER_1F, @@ -828,9 +830,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_canalave_city_pokecenter_2f, .initScriptsArchiveID = scripts_init_canalave_city_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -850,9 +852,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_LIBRARY_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 217, + .mapMatrixID = map_matrix_217, .scriptsArchiveID = scripts_canalave_library_1f, .initScriptsArchiveID = scripts_init_canalave_library_1f, .msgArchiveID = TEXT_BANK_CANALAVE_LIBRARY_1F, @@ -872,9 +874,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_LIBRARY_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 218, + .mapMatrixID = map_matrix_218, .scriptsArchiveID = scripts_canalave_library_2f, .initScriptsArchiveID = scripts_init_canalave_library_2f, .msgArchiveID = TEXT_BANK_CANALAVE_LIBRARY_2F, @@ -894,9 +896,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_LIBRARY_3F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 219, + .mapMatrixID = map_matrix_219, .scriptsArchiveID = scripts_canalave_library_3f, .initScriptsArchiveID = scripts_init_canalave_library_3f, .msgArchiveID = TEXT_BANK_CANALAVE_LIBRARY_3F, @@ -916,9 +918,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY_SOUTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_canalave_city_southeast_house, .initScriptsArchiveID = scripts_init_canalave_city_southeast_house, .msgArchiveID = TEXT_BANK_CANALAVE_CITY_SOUTHEAST_HOUSE, @@ -938,9 +940,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY_EAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_canalave_city_east_house, .initScriptsArchiveID = scripts_init_canalave_city_east_house, .msgArchiveID = TEXT_BANK_CANALAVE_CITY_EAST_HOUSE, @@ -960,9 +962,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY_HARBOR_INN] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_canalave_city_harbor_inn, .initScriptsArchiveID = scripts_init_canalave_city_harbor_inn, .msgArchiveID = TEXT_BANK_CANALAVE_CITY_HARBOR_INN, @@ -982,9 +984,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_canalave_city_sailor_eldritch_house, .initScriptsArchiveID = scripts_init_canalave_city_sailor_eldritch_house, .msgArchiveID = TEXT_BANK_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE, @@ -1004,9 +1006,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY] = { - .areaDataArchiveID = 0x7, + .areaDataArchiveID = area_data_007, .unk_01 = 0x1, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_oreburgh_city, .initScriptsArchiveID = scripts_init_oreburgh_city, .msgArchiveID = TEXT_BANK_OREBURGH_CITY, @@ -1026,9 +1028,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_OREBURGH_CITY_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_oreburgh_city_mart, .initScriptsArchiveID = scripts_init_oreburgh_city_mart, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_MART, @@ -1048,9 +1050,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_GYM] = { - .areaDataArchiveID = 0x19, + .areaDataArchiveID = area_data_025, .unk_01 = 0xF, - .mapMatrixID = 113, + .mapMatrixID = map_matrix_113, .scriptsArchiveID = scripts_oreburgh_city_gym, .initScriptsArchiveID = scripts_init_oreburgh_city_gym, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_GYM, @@ -1070,9 +1072,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_oreburgh_city_pokecenter_1f, .initScriptsArchiveID = scripts_init_oreburgh_city_pokecenter_1f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_POKECENTER_1F, @@ -1092,9 +1094,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_oreburgh_city_pokecenter_2f, .initScriptsArchiveID = scripts_init_oreburgh_city_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -1114,9 +1116,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 132, + .mapMatrixID = map_matrix_132, .scriptsArchiveID = scripts_oreburgh_city_northwest_house_1f, .initScriptsArchiveID = scripts_init_oreburgh_city_northwest_house_1f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_NORTHWEST_HOUSE_1F, @@ -1136,9 +1138,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_oreburgh_city_northwest_house_2f, .initScriptsArchiveID = scripts_init_oreburgh_city_northwest_house_2f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_NORTHWEST_HOUSE_2F, @@ -1158,9 +1160,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_3F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 136, + .mapMatrixID = map_matrix_136, .scriptsArchiveID = scripts_oreburgh_city_northwest_house_3f, .initScriptsArchiveID = scripts_init_oreburgh_city_northwest_house_3f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_NORTHWEST_HOUSE_3F, @@ -1180,9 +1182,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_4F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_oreburgh_city_northwest_house_4f, .initScriptsArchiveID = scripts_init_oreburgh_city_northwest_house_4f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_NORTHWEST_HOUSE_4F, @@ -1202,9 +1204,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 132, + .mapMatrixID = map_matrix_132, .scriptsArchiveID = scripts_oreburgh_city_north_house_1f, .initScriptsArchiveID = scripts_init_oreburgh_city_north_house_1f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_NORTH_HOUSE_1F, @@ -1224,9 +1226,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_oreburgh_city_north_house_2f, .initScriptsArchiveID = scripts_init_oreburgh_city_north_house_2f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_NORTH_HOUSE_2F, @@ -1246,9 +1248,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_3F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 136, + .mapMatrixID = map_matrix_136, .scriptsArchiveID = scripts_oreburgh_city_north_house_3f, .initScriptsArchiveID = scripts_init_oreburgh_city_north_house_3f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_NORTH_HOUSE_3F, @@ -1268,9 +1270,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_4F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_oreburgh_city_north_house_4f, .initScriptsArchiveID = scripts_init_oreburgh_city_north_house_4f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_NORTH_HOUSE_4F, @@ -1290,9 +1292,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_MIDDLE_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_oreburgh_city_middle_house, .initScriptsArchiveID = scripts_init_oreburgh_city_middle_house, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_MIDDLE_HOUSE, @@ -1312,9 +1314,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MINING_MUSEUM] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 155, + .mapMatrixID = map_matrix_155, .scriptsArchiveID = scripts_mining_museum, .initScriptsArchiveID = scripts_init_mining_museum, .msgArchiveID = TEXT_BANK_MINING_MUSEUM, @@ -1334,9 +1336,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_WEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_oreburgh_city_west_house, .initScriptsArchiveID = scripts_init_oreburgh_city_west_house, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_WEST_HOUSE, @@ -1356,9 +1358,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 132, + .mapMatrixID = map_matrix_132, .scriptsArchiveID = scripts_oreburgh_city_east_house_1f, .initScriptsArchiveID = scripts_init_oreburgh_city_east_house_1f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_EAST_HOUSE_1F, @@ -1378,9 +1380,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_oreburgh_city_east_house_2f, .initScriptsArchiveID = scripts_init_oreburgh_city_east_house_2f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_EAST_HOUSE_2F, @@ -1400,9 +1402,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_3F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_oreburgh_city_east_house_3f, .initScriptsArchiveID = scripts_init_oreburgh_city_east_house_3f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_EAST_HOUSE_3F, @@ -1422,9 +1424,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_SOUTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_oreburgh_city_south_house, .initScriptsArchiveID = scripts_init_oreburgh_city_south_house, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_SOUTH_HOUSE, @@ -1444,9 +1446,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_eterna_city, .initScriptsArchiveID = scripts_init_eterna_city, .msgArchiveID = TEXT_BANK_ETERNA_CITY, @@ -1466,9 +1468,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ETERNA_CITY_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_eterna_city_mart, .initScriptsArchiveID = scripts_init_eterna_city_mart, .msgArchiveID = TEXT_BANK_ETERNA_CITY_MART, @@ -1488,9 +1490,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_GYM] = { - .areaDataArchiveID = 0x1A, + .areaDataArchiveID = area_data_026, .unk_01 = 0xF, - .mapMatrixID = 220, + .mapMatrixID = map_matrix_220, .scriptsArchiveID = scripts_eterna_city_gym, .initScriptsArchiveID = scripts_init_eterna_city_gym, .msgArchiveID = TEXT_BANK_ETERNA_CITY_GYM, @@ -1510,9 +1512,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_DP_GYM] = { - .areaDataArchiveID = 0x1A, + .areaDataArchiveID = area_data_026, .unk_01 = 0xF, - .mapMatrixID = 221, + .mapMatrixID = map_matrix_221, .scriptsArchiveID = scripts_eterna_city_dp_gym, .initScriptsArchiveID = scripts_init_eterna_city_dp_gym, .msgArchiveID = TEXT_BANK_ETERNA_CITY_DP_GYM, @@ -1532,9 +1534,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_eterna_city_pokecenter_1f, .initScriptsArchiveID = scripts_init_eterna_city_pokecenter_1f, .msgArchiveID = TEXT_BANK_ETERNA_CITY_POKECENTER_1F, @@ -1554,9 +1556,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_eterna_city_pokecenter_2f, .initScriptsArchiveID = scripts_init_eterna_city_pokecenter_2f, .msgArchiveID = TEXT_BANK_ETERNA_CITY_POKECENTER_2F, @@ -1576,9 +1578,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CYCLE_SHOP] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 138, + .mapMatrixID = map_matrix_138, .scriptsArchiveID = scripts_cycle_shop, .initScriptsArchiveID = scripts_init_cycle_shop, .msgArchiveID = TEXT_BANK_CYCLE_SHOP, @@ -1598,9 +1600,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_1F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 266, + .mapMatrixID = map_matrix_266, .scriptsArchiveID = scripts_team_galactic_eterna_building_1f, .initScriptsArchiveID = scripts_init_team_galactic_eterna_building_1f, .msgArchiveID = TEXT_BANK_TEAM_GALACTIC_ETERNA_BUILDING_1F, @@ -1620,9 +1622,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_2F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 162, + .mapMatrixID = map_matrix_162, .scriptsArchiveID = scripts_team_galactic_eterna_building_2f, .initScriptsArchiveID = scripts_init_team_galactic_eterna_building_2f, .msgArchiveID = TEXT_BANK_TEAM_GALACTIC_ETERNA_BUILDING_2F, @@ -1642,9 +1644,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_3F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 163, + .mapMatrixID = map_matrix_163, .scriptsArchiveID = scripts_team_galactic_eterna_building_3f, .initScriptsArchiveID = scripts_init_team_galactic_eterna_building_3f, .msgArchiveID = TEXT_BANK_TEAM_GALACTIC_ETERNA_BUILDING_3F, @@ -1664,9 +1666,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_4F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 164, + .mapMatrixID = map_matrix_164, .scriptsArchiveID = scripts_team_galactic_eterna_building_4f, .initScriptsArchiveID = scripts_init_team_galactic_eterna_building_4f, .msgArchiveID = TEXT_BANK_TEAM_GALACTIC_ETERNA_BUILDING_4F, @@ -1686,9 +1688,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 132, + .mapMatrixID = map_matrix_132, .scriptsArchiveID = scripts_eterna_city_condominiums_1f, .initScriptsArchiveID = scripts_init_eterna_city_condominiums_1f, .msgArchiveID = TEXT_BANK_ETERNA_CITY_CONDOMINIUMS_1F, @@ -1708,9 +1710,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 135, + .mapMatrixID = map_matrix_135, .scriptsArchiveID = scripts_eterna_city_condominiums_2f, .initScriptsArchiveID = scripts_init_eterna_city_condominiums_2f, .msgArchiveID = TEXT_BANK_ETERNA_CITY_CONDOMINIUMS_2F, @@ -1730,9 +1732,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_3F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_eterna_city_condominiums_3f, .initScriptsArchiveID = scripts_init_eterna_city_condominiums_3f, .msgArchiveID = TEXT_BANK_ETERNA_CITY_CONDOMINIUMS_3F, @@ -1752,9 +1754,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_4F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_eterna_city_condominiums_4f, .initScriptsArchiveID = scripts_init_eterna_city_condominiums_4f, .msgArchiveID = TEXT_BANK_ETERNA_CITY_CONDOMINIUMS_4F, @@ -1774,9 +1776,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_206_CYCLING_ROAD_NORTH_GATE] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 259, + .mapMatrixID = map_matrix_259, .scriptsArchiveID = scripts_route_206_cycling_road_north_gate, .initScriptsArchiveID = scripts_init_route_206_cycling_road_north_gate, .msgArchiveID = TEXT_BANK_ROUTE_206_CYCLING_ROAD_NORTH_GATE, @@ -1796,9 +1798,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_HERB_SHOP] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 170, + .mapMatrixID = map_matrix_170, .scriptsArchiveID = scripts_eterna_city_herb_shop, .initScriptsArchiveID = scripts_init_eterna_city_herb_shop, .msgArchiveID = TEXT_BANK_ETERNA_CITY_HERB_SHOP, @@ -1818,9 +1820,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_SOUTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 124, + .mapMatrixID = map_matrix_124, .scriptsArchiveID = scripts_eterna_city_south_house, .initScriptsArchiveID = scripts_init_eterna_city_south_house, .msgArchiveID = TEXT_BANK_ETERNA_CITY_SOUTH_HOUSE, @@ -1840,9 +1842,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_EAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 124, + .mapMatrixID = map_matrix_124, .scriptsArchiveID = scripts_eterna_city_east_house, .initScriptsArchiveID = scripts_init_eterna_city_east_house, .msgArchiveID = TEXT_BANK_ETERNA_CITY_EAST_HOUSE, @@ -1862,9 +1864,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_UNDERGROUND_MAN_HOUSE] = { - .areaDataArchiveID = 43, + .areaDataArchiveID = area_data_043, .unk_01 = 0xF, - .mapMatrixID = 248, + .mapMatrixID = map_matrix_248, .scriptsArchiveID = scripts_eterna_city_underground_man_house, .initScriptsArchiveID = scripts_init_eterna_city_underground_man_house, .msgArchiveID = TEXT_BANK_ETERNA_CITY_UNDERGROUND_MAN_HOUSE, @@ -1884,9 +1886,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_UNKNOWN_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0x14, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -1906,9 +1908,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY] = { - .areaDataArchiveID = 0x9, + .areaDataArchiveID = area_data_009, .unk_01 = 0x3, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_hearthome_city, .initScriptsArchiveID = scripts_init_hearthome_city, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY, @@ -1928,9 +1930,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_HEARTHOME_CITY_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_hearthome_city_mart, .initScriptsArchiveID = scripts_init_hearthome_city_mart, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_MART, @@ -1950,9 +1952,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_GYM_ENTRANCE_ROOM] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 222, + .mapMatrixID = map_matrix_222, .scriptsArchiveID = scripts_hearthome_city_gym_entrance_room, .initScriptsArchiveID = scripts_init_hearthome_city_gym_entrance_room, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_GYM_ENTRANCE_ROOM, @@ -1972,9 +1974,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_GYM_TRAINER_ROOM_1] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 223, + .mapMatrixID = map_matrix_223, .scriptsArchiveID = scripts_hearthome_city_gym_trainer_room_1, .initScriptsArchiveID = scripts_init_hearthome_city_gym_trainer_room_1, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -1994,9 +1996,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_GYM_TRAINER_ROOM_2] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 224, + .mapMatrixID = map_matrix_224, .scriptsArchiveID = scripts_hearthome_city_gym_trainer_room_2, .initScriptsArchiveID = scripts_init_hearthome_city_gym_trainer_room_2, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -2016,9 +2018,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_GYM_LEADER_ROOM] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 225, + .mapMatrixID = map_matrix_225, .scriptsArchiveID = scripts_hearthome_city_gym_leader_room, .initScriptsArchiveID = scripts_init_hearthome_city_gym_leader_room, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_GYM_LEADER_ROOM, @@ -2038,9 +2040,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_1] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 223, + .mapMatrixID = map_matrix_223, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -2060,9 +2062,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_1] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 224, + .mapMatrixID = map_matrix_224, .scriptsArchiveID = scripts_hearthome_city_dp_gym_elevator_room_1, .initScriptsArchiveID = scripts_init_hearthome_city_dp_gym_elevator_room_1, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_1, @@ -2082,9 +2084,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_2] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 223, + .mapMatrixID = map_matrix_223, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -2104,9 +2106,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_2] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 224, + .mapMatrixID = map_matrix_224, .scriptsArchiveID = scripts_hearthome_city_dp_gym_elevator_room_2, .initScriptsArchiveID = scripts_init_hearthome_city_dp_gym_elevator_room_2, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_2, @@ -2126,9 +2128,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_3] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 223, + .mapMatrixID = map_matrix_223, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -2148,9 +2150,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_4] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 223, + .mapMatrixID = map_matrix_223, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -2170,9 +2172,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_5] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 223, + .mapMatrixID = map_matrix_223, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -2192,9 +2194,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_6] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 223, + .mapMatrixID = map_matrix_223, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -2214,9 +2216,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_LEADER_ROOM] = { - .areaDataArchiveID = 0x1B, + .areaDataArchiveID = area_data_027, .unk_01 = 0xF, - .mapMatrixID = 225, + .mapMatrixID = map_matrix_225, .scriptsArchiveID = scripts_hearthome_city_dp_gym_leader_room, .initScriptsArchiveID = scripts_init_hearthome_city_dp_gym_leader_room, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_DP_GYM_LEADER_ROOM, @@ -2236,9 +2238,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_hearthome_city_pokecenter_1f, .initScriptsArchiveID = scripts_init_hearthome_city_pokecenter_1f, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_POKECENTER_1F, @@ -2258,9 +2260,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_hearthome_city_pokecenter_2f, .initScriptsArchiveID = scripts_init_hearthome_city_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -2280,9 +2282,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 209, + .mapMatrixID = map_matrix_209, .scriptsArchiveID = scripts_hearthome_city_southeast_house_1f, .initScriptsArchiveID = scripts_init_hearthome_city_southeast_house_1f, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_SOUTHEAST_HOUSE_1F, @@ -2302,9 +2304,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 210, + .mapMatrixID = map_matrix_210, .scriptsArchiveID = scripts_hearthome_city_southeast_house_2f, .initScriptsArchiveID = scripts_init_hearthome_city_southeast_house_2f, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_SOUTHEAST_HOUSE_2F, @@ -2324,9 +2326,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_ELEVATOR] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 207, + .mapMatrixID = map_matrix_207, .scriptsArchiveID = scripts_hearthome_city_southeast_house_elevator, .initScriptsArchiveID = scripts_init_hearthome_city_southeast_house_elevator, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_SOUTHEAST_HOUSE_ELEVATOR, @@ -2346,9 +2348,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_POKEMON_FAN_CLUB] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 156, + .mapMatrixID = map_matrix_156, .scriptsArchiveID = scripts_hearthome_city_pokemon_fan_club, .initScriptsArchiveID = scripts_init_hearthome_city_pokemon_fan_club, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_POKEMON_FAN_CLUB, @@ -2368,9 +2370,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_WEST_GATE_TO_AMITY_SQUARE] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 157, + .mapMatrixID = map_matrix_157, .scriptsArchiveID = scripts_hearthome_city_west_gate_to_amity_square, .initScriptsArchiveID = scripts_init_hearthome_city_west_gate_to_amity_square, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_WEST_GATE_TO_AMITY_SQUARE, @@ -2390,9 +2392,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_EAST_GATE_TO_AMITY_SQUARE] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 157, + .mapMatrixID = map_matrix_157, .scriptsArchiveID = scripts_hearthome_city_east_gate_to_amity_square, .initScriptsArchiveID = scripts_init_hearthome_city_east_gate_to_amity_square, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_EAST_GATE_TO_AMITY_SQUARE, @@ -2412,9 +2414,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_208_GATE_TO_HEARTHOME_CITY] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 258, + .mapMatrixID = map_matrix_258, .scriptsArchiveID = scripts_route_208_gate_to_hearthome_city, .initScriptsArchiveID = scripts_init_route_208_gate_to_hearthome_city, .msgArchiveID = TEXT_BANK_ROUTE_208_GATE_TO_HEARTHOME_CITY, @@ -2434,9 +2436,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_209_GATE_TO_HEARTHOME_CITY] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 258, + .mapMatrixID = map_matrix_258, .scriptsArchiveID = scripts_route_209_gate_to_hearthome_city, .initScriptsArchiveID = scripts_init_route_209_gate_to_hearthome_city, .msgArchiveID = TEXT_BANK_ROUTE_209_GATE_TO_HEARTHOME_CITY, @@ -2456,9 +2458,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_212_GATE_TO_HEARTHOME_CITY] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 257, + .mapMatrixID = map_matrix_257, .scriptsArchiveID = scripts_route_212_gate_to_hearthome_city, .initScriptsArchiveID = scripts_init_route_212_gate_to_hearthome_city, .msgArchiveID = TEXT_BANK_ROUTE_212_GATE_TO_HEARTHOME_CITY, @@ -2478,9 +2480,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_1F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 209, + .mapMatrixID = map_matrix_209, .scriptsArchiveID = scripts_hearthome_city_northeast_house_1f, .initScriptsArchiveID = scripts_init_hearthome_city_northeast_house_1f, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_NORTHEAST_HOUSE_1F, @@ -2500,9 +2502,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 210, + .mapMatrixID = map_matrix_210, .scriptsArchiveID = scripts_hearthome_city_northeast_house_2f, .initScriptsArchiveID = scripts_init_hearthome_city_northeast_house_2f, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_NORTHEAST_HOUSE_2F, @@ -2522,9 +2524,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_ELEVATOR] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 207, + .mapMatrixID = map_matrix_207, .scriptsArchiveID = scripts_hearthome_city_northeast_house_elevator, .initScriptsArchiveID = scripts_init_hearthome_city_northeast_house_elevator, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_NORTHEAST_HOUSE_ELEVATOR, @@ -2544,9 +2546,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_NORTHWEST_HOUSE] = { - .areaDataArchiveID = 43, + .areaDataArchiveID = area_data_043, .unk_01 = 0xF, - .mapMatrixID = 245, + .mapMatrixID = map_matrix_245, .scriptsArchiveID = scripts_hearthome_city_northwest_house, .initScriptsArchiveID = scripts_init_hearthome_city_northwest_house, .msgArchiveID = TEXT_BANK_HEARTHOME_CITY_NORTHWEST_HOUSE, @@ -2566,9 +2568,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POFFIN_HOUSE] = { - .areaDataArchiveID = 37, + .areaDataArchiveID = area_data_037, .unk_01 = 0xF, - .mapMatrixID = 0xED, + .mapMatrixID = map_matrix_237, .scriptsArchiveID = scripts_poffin_house, .initScriptsArchiveID = scripts_init_poffin_house, .msgArchiveID = TEXT_BANK_POFFIN_HOUSE, @@ -2588,9 +2590,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CONTEST_HALL_LOBBY] = { - .areaDataArchiveID = 32, + .areaDataArchiveID = area_data_032, .unk_01 = 0xF, - .mapMatrixID = 165, + .mapMatrixID = map_matrix_165, .scriptsArchiveID = scripts_contest_hall_lobby, .initScriptsArchiveID = scripts_init_contest_hall_lobby, .msgArchiveID = TEXT_BANK_CONTEST_HALL_LOBBY, @@ -2610,9 +2612,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CONTEST_HALL_STAGE_ONGOING_CONTEST] = { - .areaDataArchiveID = 32, + .areaDataArchiveID = area_data_032, .unk_01 = 0xF, - .mapMatrixID = 166, + .mapMatrixID = map_matrix_166, .scriptsArchiveID = scripts_contest_hall_stage_ongoing_contest, .initScriptsArchiveID = scripts_init_contest_hall_stage_ongoing_contest, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -2632,9 +2634,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FOREIGN_BUILDING] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 167, + .mapMatrixID = map_matrix_167, .scriptsArchiveID = scripts_foreign_building, .initScriptsArchiveID = scripts_init_foreign_building, .msgArchiveID = TEXT_BANK_FOREIGN_BUILDING, @@ -2654,9 +2656,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY] = { - .areaDataArchiveID = 0xC, + .areaDataArchiveID = area_data_012, .unk_01 = 0x6, - .mapMatrixID = 0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_pastoria_city, .initScriptsArchiveID = scripts_init_pastoria_city, .msgArchiveID = TEXT_BANK_PASTORIA_CITY, @@ -2676,9 +2678,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_PASTORIA_CITY_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 206, + .mapMatrixID = map_matrix_206, .scriptsArchiveID = scripts_pastoria_city_mart, .initScriptsArchiveID = scripts_init_pastoria_city_mart, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_MART, @@ -2698,9 +2700,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_GYM] = { - .areaDataArchiveID = 0x17, + .areaDataArchiveID = area_data_023, .unk_01 = 0xF, - .mapMatrixID = 111, + .mapMatrixID = map_matrix_111, .scriptsArchiveID = scripts_pastoria_city_gym, .initScriptsArchiveID = scripts_init_pastoria_city_gym, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_GYM, @@ -2720,9 +2722,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_pastoria_city_pokecenter_1f, .initScriptsArchiveID = scripts_init_pastoria_city_pokecenter_1f, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_POKECENTER_1F, @@ -2742,9 +2744,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_pastoria_city_pokecenter_2f, .initScriptsArchiveID = scripts_init_pastoria_city_pokecenter_2f, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_POKECENTER_2F, @@ -2764,9 +2766,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F] = { - .areaDataArchiveID = 39, + .areaDataArchiveID = area_data_039, .unk_01 = 0xF, - .mapMatrixID = 181, + .mapMatrixID = map_matrix_181, .scriptsArchiveID = scripts_pastoria_city_observatory_gate_1f, .initScriptsArchiveID = scripts_init_pastoria_city_observatory_gate_1f, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_OBSERVATORY_GATE_1F, @@ -2786,9 +2788,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_2F] = { - .areaDataArchiveID = 39, + .areaDataArchiveID = area_data_039, .unk_01 = 0xF, - .mapMatrixID = 182, + .mapMatrixID = map_matrix_182, .scriptsArchiveID = scripts_pastoria_city_observatory_gate_2f, .initScriptsArchiveID = scripts_init_pastoria_city_observatory_gate_2f, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_OBSERVATORY_GATE_2F, @@ -2808,9 +2810,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_SOUTHWEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_pastoria_city_southwest_house, .initScriptsArchiveID = scripts_init_pastoria_city_southwest_house, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_SOUTHWEST_HOUSE, @@ -2830,9 +2832,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_MIDDLE_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_pastoria_city_middle_house, .initScriptsArchiveID = scripts_init_pastoria_city_middle_house, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_MIDDLE_HOUSE, @@ -2852,9 +2854,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_EAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 125, + .mapMatrixID = map_matrix_125, .scriptsArchiveID = scripts_pastoria_city_east_house, .initScriptsArchiveID = scripts_init_pastoria_city_east_house, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_EAST_HOUSE, @@ -2874,9 +2876,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_NORTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_pastoria_city_north_house, .initScriptsArchiveID = scripts_init_pastoria_city_north_house, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_NORTH_HOUSE, @@ -2896,9 +2898,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_NORTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_pastoria_city_northeast_house, .initScriptsArchiveID = scripts_init_pastoria_city_northeast_house, .msgArchiveID = TEXT_BANK_PASTORIA_CITY_NORTHEAST_HOUSE, @@ -2918,9 +2920,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY] = { - .areaDataArchiveID = 11, + .areaDataArchiveID = area_data_011, .unk_01 = 0x5, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_veilstone_city, .initScriptsArchiveID = scripts_init_veilstone_city, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY, @@ -2940,9 +2942,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_VEILSTONE_CITY_GYM] = { - .areaDataArchiveID = 29, + .areaDataArchiveID = area_data_029, .unk_01 = 0xF, - .mapMatrixID = 115, + .mapMatrixID = map_matrix_115, .scriptsArchiveID = scripts_veilstone_city_gym, .initScriptsArchiveID = scripts_init_veilstone_city_gym, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY_GYM, @@ -2962,9 +2964,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_veilstone_city_pokecenter_1f, .initScriptsArchiveID = scripts_init_veilstone_city_pokecenter_1f, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY_POKECENTER_1F, @@ -2984,9 +2986,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_veilstone_city_pokecenter_2f, .initScriptsArchiveID = scripts_init_veilstone_city_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -3006,9 +3008,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GAME_CORNER] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 139, + .mapMatrixID = map_matrix_139, .scriptsArchiveID = scripts_game_corner, .initScriptsArchiveID = scripts_init_game_corner, .msgArchiveID = TEXT_BANK_GAME_CORNER, @@ -3028,9 +3030,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_STORE_1F] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 172, + .mapMatrixID = map_matrix_172, .scriptsArchiveID = scripts_veilstone_store_1f, .initScriptsArchiveID = scripts_init_veilstone_store_1f, .msgArchiveID = TEXT_BANK_VEILSTONE_STORE_1F, @@ -3050,9 +3052,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_STORE_2F] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 173, + .mapMatrixID = map_matrix_173, .scriptsArchiveID = scripts_veilstone_store_2f, .initScriptsArchiveID = scripts_init_veilstone_store_2f, .msgArchiveID = TEXT_BANK_VEILSTONE_STORE_2F, @@ -3072,9 +3074,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_STORE_3F] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 174, + .mapMatrixID = map_matrix_174, .scriptsArchiveID = scripts_veilstone_store_3f, .initScriptsArchiveID = scripts_init_veilstone_store_3f, .msgArchiveID = TEXT_BANK_VEILSTONE_STORE_3F, @@ -3094,9 +3096,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_STORE_4F] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 175, + .mapMatrixID = map_matrix_175, .scriptsArchiveID = scripts_veilstone_store_4f, .initScriptsArchiveID = scripts_init_veilstone_store_4f, .msgArchiveID = TEXT_BANK_VEILSTONE_STORE_4F, @@ -3116,9 +3118,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_STORE_5F] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 176, + .mapMatrixID = map_matrix_176, .scriptsArchiveID = scripts_veilstone_store_5f, .initScriptsArchiveID = scripts_init_veilstone_store_5f, .msgArchiveID = TEXT_BANK_VEILSTONE_STORE_5F, @@ -3138,9 +3140,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_STORE_ELEVATOR] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 207, + .mapMatrixID = map_matrix_207, .scriptsArchiveID = scripts_veilstone_store_elevator, .initScriptsArchiveID = scripts_init_veilstone_store_elevator, .msgArchiveID = TEXT_BANK_VEILSTONE_STORE_ELEVATOR, @@ -3160,9 +3162,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY_GALACTIC_WAREHOUSE] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 177, + .mapMatrixID = map_matrix_177, .scriptsArchiveID = scripts_veilstone_city_galactic_warehouse, .initScriptsArchiveID = scripts_init_veilstone_city_galactic_warehouse, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY_GALACTIC_WAREHOUSE, @@ -3182,9 +3184,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY_PRIZE_EXCHANGE] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 204, + .mapMatrixID = map_matrix_204, .scriptsArchiveID = scripts_veilstone_city_prize_exchange, .initScriptsArchiveID = scripts_init_veilstone_city_prize_exchange, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY_PRIZE_EXCHANGE, @@ -3204,9 +3206,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY_SOUTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 125, + .mapMatrixID = map_matrix_125, .scriptsArchiveID = scripts_veilstone_city_southeast_house, .initScriptsArchiveID = scripts_init_veilstone_city_southeast_house, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY_SOUTHEAST_HOUSE, @@ -3226,9 +3228,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY_NORTHWEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 125, + .mapMatrixID = map_matrix_125, .scriptsArchiveID = scripts_veilstone_city_northwest_house, .initScriptsArchiveID = scripts_init_veilstone_city_northwest_house, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY_NORTHWEST_HOUSE, @@ -3248,9 +3250,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY_NORTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_veilstone_city_northeast_house, .initScriptsArchiveID = scripts_init_veilstone_city_northeast_house, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY_NORTHEAST_HOUSE, @@ -3270,9 +3272,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY_SOUTHWEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_veilstone_city_southwest_house, .initScriptsArchiveID = scripts_init_veilstone_city_southwest_house, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY_SOUTHWEST_HOUSE, @@ -3292,9 +3294,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_215_GATE_TO_VEILSTONE_CITY] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 258, + .mapMatrixID = map_matrix_258, .scriptsArchiveID = scripts_route_215_gate_to_veilstone_city, .initScriptsArchiveID = scripts_init_route_215_gate_to_veilstone_city, .msgArchiveID = TEXT_BANK_ROUTE_215_GATE_TO_VEILSTONE_CITY, @@ -3314,9 +3316,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY] = { - .areaDataArchiveID = 0xD, + .areaDataArchiveID = area_data_013, .unk_01 = 0x7, - .mapMatrixID = 0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_sunyshore_city, .initScriptsArchiveID = scripts_init_sunyshore_city, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY, @@ -3336,9 +3338,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_SUNYSHORE_CITY_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_sunyshore_city_pokecenter_1f, .initScriptsArchiveID = scripts_init_sunyshore_city_pokecenter_1f, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_POKECENTER_1F, @@ -3358,9 +3360,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_sunyshore_city_pokecenter_2f, .initScriptsArchiveID = scripts_init_sunyshore_city_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -3380,9 +3382,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_sunyshore_city_mart, .initScriptsArchiveID = scripts_init_sunyshore_city_mart, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_MART, @@ -3402,9 +3404,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_1] = { - .areaDataArchiveID = 30, + .areaDataArchiveID = area_data_030, .unk_01 = 0xF, - .mapMatrixID = 226, + .mapMatrixID = map_matrix_226, .scriptsArchiveID = scripts_sunyshore_city_gym_room_1, .initScriptsArchiveID = scripts_init_sunyshore_city_gym_room_1, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_GYM_ROOM_1, @@ -3424,9 +3426,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_2] = { - .areaDataArchiveID = 30, + .areaDataArchiveID = area_data_030, .unk_01 = 0xF, - .mapMatrixID = 227, + .mapMatrixID = map_matrix_227, .scriptsArchiveID = scripts_sunyshore_city_gym_room_2, .initScriptsArchiveID = scripts_init_sunyshore_city_gym_room_2, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -3446,9 +3448,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_3] = { - .areaDataArchiveID = 30, + .areaDataArchiveID = area_data_030, .unk_01 = 0xF, - .mapMatrixID = 228, + .mapMatrixID = map_matrix_228, .scriptsArchiveID = scripts_sunyshore_city_gym_room_3, .initScriptsArchiveID = scripts_init_sunyshore_city_gym_room_3, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_GYM_ROOM_3, @@ -3468,9 +3470,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_MARKET] = { - .areaDataArchiveID = 38, + .areaDataArchiveID = area_data_038, .unk_01 = 0xF, - .mapMatrixID = 203, + .mapMatrixID = map_matrix_203, .scriptsArchiveID = scripts_sunyshore_market, .initScriptsArchiveID = scripts_init_sunyshore_market, .msgArchiveID = TEXT_BANK_SUNYSHORE_MARKET, @@ -3490,9 +3492,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_NORTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_sunyshore_city_northeast_house, .initScriptsArchiveID = scripts_init_sunyshore_city_northeast_house, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_NORTHEAST_HOUSE, @@ -3512,9 +3514,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_WEST_HOUSE] = { - .areaDataArchiveID = 43, + .areaDataArchiveID = area_data_043, .unk_01 = 0xF, - .mapMatrixID = 248, + .mapMatrixID = map_matrix_248, .scriptsArchiveID = scripts_sunyshore_city_west_house, .initScriptsArchiveID = scripts_init_sunyshore_city_west_house, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_WEST_HOUSE, @@ -3534,9 +3536,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_NORTHWEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_sunyshore_city_northwest_house, .initScriptsArchiveID = scripts_init_sunyshore_city_northwest_house, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_NORTHWEST_HOUSE, @@ -3556,9 +3558,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_1] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_sunyshore_city_unknown_house_1, .initScriptsArchiveID = scripts_init_sunyshore_city_unknown_house_1, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_UNKNOWN_HOUSE_1, @@ -3578,9 +3580,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_2] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_sunyshore_city_unknown_house_2, .initScriptsArchiveID = scripts_init_sunyshore_city_unknown_house_2, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_UNKNOWN_HOUSE_2, @@ -3600,9 +3602,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_EAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 125, + .mapMatrixID = map_matrix_125, .scriptsArchiveID = scripts_sunyshore_city_east_house, .initScriptsArchiveID = scripts_init_sunyshore_city_east_house, .msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_EAST_HOUSE, @@ -3622,9 +3624,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VISTA_LIGHTHOUSE] = { - .areaDataArchiveID = 39, + .areaDataArchiveID = area_data_039, .unk_01 = 0xF, - .mapMatrixID = 230, + .mapMatrixID = map_matrix_230, .scriptsArchiveID = scripts_vista_lighthouse, .initScriptsArchiveID = scripts_init_vista_lighthouse, .msgArchiveID = TEXT_BANK_VISTA_LIGHTHOUSE, @@ -3644,9 +3646,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_CITY] = { - .areaDataArchiveID = 0xE, + .areaDataArchiveID = area_data_014, .unk_01 = 0x8, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_snowpoint_city, .initScriptsArchiveID = scripts_init_snowpoint_city, .msgArchiveID = TEXT_BANK_SNOWPOINT_CITY, @@ -3666,9 +3668,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_SNOWPOINT_CITY_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_snowpoint_city_mart, .initScriptsArchiveID = scripts_init_snowpoint_city_mart, .msgArchiveID = TEXT_BANK_SNOWPOINT_CITY_MART, @@ -3688,9 +3690,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_CITY_GYM] = { - .areaDataArchiveID = 0x1C, + .areaDataArchiveID = area_data_028, .unk_01 = 0xF, - .mapMatrixID = 114, + .mapMatrixID = map_matrix_114, .scriptsArchiveID = scripts_snowpoint_city_gym, .initScriptsArchiveID = scripts_init_snowpoint_city_gym, .msgArchiveID = TEXT_BANK_SNOWPOINT_CITY_GYM, @@ -3710,9 +3712,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_CITY_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_snowpoint_city_pokecenter_1f, .initScriptsArchiveID = scripts_init_snowpoint_city_pokecenter_1f, .msgArchiveID = TEXT_BANK_SNOWPOINT_CITY_POKECENTER_1F, @@ -3732,9 +3734,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_CITY_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_snowpoint_city_pokecenter_2f, .initScriptsArchiveID = scripts_init_snowpoint_city_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -3754,9 +3756,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_CITY_WEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_snowpoint_city_west_house, .initScriptsArchiveID = scripts_init_snowpoint_city_west_house, .msgArchiveID = TEXT_BANK_SNOWPOINT_CITY_WEST_HOUSE, @@ -3776,9 +3778,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_CITY_EAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 244, + .mapMatrixID = map_matrix_244, .scriptsArchiveID = scripts_snowpoint_city_east_house, .initScriptsArchiveID = scripts_init_snowpoint_city_east_house, .msgArchiveID = TEXT_BANK_SNOWPOINT_CITY_EAST_HOUSE, @@ -3798,9 +3800,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE] = { - .areaDataArchiveID = 0xD, + .areaDataArchiveID = area_data_013, .unk_01 = 0xA, - .mapMatrixID = 0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_pokemon_league, .initScriptsArchiveID = scripts_init_pokemon_league, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE, @@ -3820,9 +3822,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_pokemon_league_south_pokecenter_1f, .initScriptsArchiveID = scripts_init_pokemon_league_south_pokecenter_1f, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE_SOUTH_POKECENTER_1F, @@ -3842,9 +3844,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_pokemon_league_south_pokecenter_2f, .initScriptsArchiveID = scripts_init_pokemon_league_south_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -3864,9 +3866,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 144, + .mapMatrixID = map_matrix_144, .scriptsArchiveID = scripts_pokemon_league_north_pokecenter_1f, .initScriptsArchiveID = scripts_init_pokemon_league_north_pokecenter_1f, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE_NORTH_POKECENTER_1F, @@ -3886,9 +3888,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_AARON_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 187, + .mapMatrixID = map_matrix_187, .scriptsArchiveID = scripts_pokemon_league_elevator_to_aaron_room, .initScriptsArchiveID = scripts_init_pokemon_league_elevator_to_aaron_room, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -3908,9 +3910,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_AARON_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 183, + .mapMatrixID = map_matrix_183, .scriptsArchiveID = scripts_pokemon_league_aaron_room, .initScriptsArchiveID = scripts_init_pokemon_league_aaron_room, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE_AARON_ROOM, @@ -3930,9 +3932,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_BERTHA_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 188, + .mapMatrixID = map_matrix_188, .scriptsArchiveID = scripts_pokemon_league_elevator_to_bertha_room, .initScriptsArchiveID = scripts_init_pokemon_league_elevator_to_bertha_room, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -3952,9 +3954,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_BERTHA_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 184, + .mapMatrixID = map_matrix_184, .scriptsArchiveID = scripts_pokemon_league_bertha_room, .initScriptsArchiveID = scripts_init_pokemon_league_bertha_room, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE_BERTHA_ROOM, @@ -3974,9 +3976,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_FLINT_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 188, + .mapMatrixID = map_matrix_188, .scriptsArchiveID = scripts_pokemon_league_elevator_to_flint_room, .initScriptsArchiveID = scripts_init_pokemon_league_elevator_to_flint_room, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -3996,9 +3998,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_FLINT_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 185, + .mapMatrixID = map_matrix_185, .scriptsArchiveID = scripts_pokemon_league_flint_room, .initScriptsArchiveID = scripts_init_pokemon_league_flint_room, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE_FLINT_ROOM, @@ -4018,9 +4020,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_LUCIAN_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 188, + .mapMatrixID = map_matrix_188, .scriptsArchiveID = scripts_pokemon_league_elevator_to_lucian_room, .initScriptsArchiveID = scripts_init_pokemon_league_elevator_to_lucian_room, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4040,9 +4042,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_LUCIAN_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 186, + .mapMatrixID = map_matrix_186, .scriptsArchiveID = scripts_pokemon_league_lucian_room, .initScriptsArchiveID = scripts_init_pokemon_league_lucian_room, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE_LUCIAN_ROOM, @@ -4062,9 +4064,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_CHAMPION_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 189, + .mapMatrixID = map_matrix_189, .scriptsArchiveID = scripts_pokemon_league_elevator_to_champion_room, .initScriptsArchiveID = scripts_init_pokemon_league_elevator_to_champion_room, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4084,9 +4086,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_CHAMPION_ROOM] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 190, + .mapMatrixID = map_matrix_190, .scriptsArchiveID = scripts_pokemon_league_champion_room, .initScriptsArchiveID = scripts_init_pokemon_league_champion_room, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE_CHAMPION_ROOM, @@ -4106,9 +4108,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 192, + .mapMatrixID = map_matrix_192, .scriptsArchiveID = scripts_pokemon_league_hallway_to_hall_of_fame, .initScriptsArchiveID = scripts_init_pokemon_league_hallway_to_hall_of_fame, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME, @@ -4128,9 +4130,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_HALL_OF_FAME] = { - .areaDataArchiveID = 36, + .areaDataArchiveID = area_data_036, .unk_01 = 0xF, - .mapMatrixID = 191, + .mapMatrixID = map_matrix_191, .scriptsArchiveID = scripts_pokemon_league_hall_of_fame, .initScriptsArchiveID = scripts_init_pokemon_league_hall_of_fame, .msgArchiveID = TEXT_BANK_POKEMON_LEAGUE_HALL_OF_FAME, @@ -4150,9 +4152,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FIGHT_AREA] = { - .areaDataArchiveID = 0x13, + .areaDataArchiveID = area_data_019, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_fight_area, .initScriptsArchiveID = scripts_init_fight_area, .msgArchiveID = TEXT_BANK_FIGHT_AREA, @@ -4172,9 +4174,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_FIGHT_AREA_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_fight_area_pokecenter_1f, .initScriptsArchiveID = scripts_init_fight_area_pokecenter_1f, .msgArchiveID = TEXT_BANK_FIGHT_AREA_POKECENTER_1F, @@ -4194,9 +4196,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FIGHT_AREA_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_fight_area_pokecenter_2f, .initScriptsArchiveID = scripts_init_fight_area_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4216,9 +4218,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FIGHT_AREA_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_fight_area_mart, .initScriptsArchiveID = scripts_init_fight_area_mart, .msgArchiveID = TEXT_BANK_FIGHT_AREA_MART, @@ -4238,9 +4240,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_PARK_GATE_TO_FIGHT_AREA] = { - .areaDataArchiveID = 44, + .areaDataArchiveID = area_data_044, .unk_01 = 0xF, - .mapMatrixID = 250, + .mapMatrixID = map_matrix_250, .scriptsArchiveID = scripts_battle_park_gate_to_fight_area, .initScriptsArchiveID = scripts_init_battle_park_gate_to_fight_area, .msgArchiveID = TEXT_BANK_BATTLE_PARK_GATE_TO_FIGHT_AREA, @@ -4260,9 +4262,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_225_GATE_TO_FIGHT_AREA] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 257, + .mapMatrixID = map_matrix_257, .scriptsArchiveID = scripts_route_225_gate_to_fight_area, .initScriptsArchiveID = scripts_init_route_225_gate_to_fight_area, .msgArchiveID = TEXT_BANK_ROUTE_225_GATE_TO_FIGHT_AREA, @@ -4282,9 +4284,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FIGHT_AREA_MIDDLE_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_fight_area_middle_house, .initScriptsArchiveID = scripts_init_fight_area_middle_house, .msgArchiveID = TEXT_BANK_FIGHT_AREA_MIDDLE_HOUSE, @@ -4304,9 +4306,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FIGHT_AREA_SOUTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_fight_area_south_house, .initScriptsArchiveID = scripts_init_fight_area_south_house, .msgArchiveID = TEXT_BANK_FIGHT_AREA_SOUTH_HOUSE, @@ -4326,9 +4328,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FIGHT_AREA_UNKNOWN_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4348,9 +4350,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_197] = { - .areaDataArchiveID = 55, + .areaDataArchiveID = area_data_055, .unk_01 = 55, - .mapMatrixID = 0x5, + .mapMatrixID = map_matrix_005, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4370,9 +4372,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_MINE_B1F] = { - .areaDataArchiveID = 55, + .areaDataArchiveID = area_data_055, .unk_01 = 0xF, - .mapMatrixID = 5, + .mapMatrixID = map_matrix_005, .scriptsArchiveID = scripts_oreburgh_mine_b1f, .initScriptsArchiveID = scripts_init_oreburgh_mine_b1f, .msgArchiveID = TEXT_BANK_OREBURGH_MINE_B1F, @@ -4392,9 +4394,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_MINE_B2F] = { - .areaDataArchiveID = 55, + .areaDataArchiveID = area_data_055, .unk_01 = 0xF, - .mapMatrixID = 6, + .mapMatrixID = map_matrix_006, .scriptsArchiveID = scripts_oreburgh_mine_b2f, .initScriptsArchiveID = scripts_init_oreburgh_mine_b2f, .msgArchiveID = TEXT_BANK_OREBURGH_MINE_B2F, @@ -4414,9 +4416,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VALLEY_WINDWORKS_OUTSIDE] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_valley_windworks_outside, .initScriptsArchiveID = scripts_init_valley_windworks_outside, .msgArchiveID = TEXT_BANK_VALLEY_WINDWORKS_OUTSIDE, @@ -4436,9 +4438,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_VALLEY_WINDWORKS_BUILDING] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 234, + .mapMatrixID = map_matrix_234, .scriptsArchiveID = scripts_valley_windworks_building, .initScriptsArchiveID = scripts_init_valley_windworks_building, .msgArchiveID = TEXT_BANK_VALLEY_WINDWORKS_BUILDING, @@ -4458,9 +4460,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_FOREST_OUTSIDE] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_eterna_forest_outside, .initScriptsArchiveID = scripts_init_eterna_forest_outside, .msgArchiveID = TEXT_BANK_ETERNA_FOREST_OUTSIDE, @@ -4480,9 +4482,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ETERNA_FOREST] = { - .areaDataArchiveID = 54, + .areaDataArchiveID = area_data_054, .unk_01 = 0xF, - .mapMatrixID = 7, + .mapMatrixID = map_matrix_007, .scriptsArchiveID = scripts_eterna_forest, .initScriptsArchiveID = scripts_init_eterna_forest, .msgArchiveID = TEXT_BANK_ETERNA_FOREST, @@ -4502,9 +4504,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_FUEGO_IRONWORKS_OUTSIDE] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_fuego_ironworks_outside, .initScriptsArchiveID = scripts_init_fuego_ironworks_outside, .msgArchiveID = TEXT_BANK_FUEGO_IRONWORKS_OUTSIDE, @@ -4524,9 +4526,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_FUEGO_IRONWORKS_BUILDING] = { - .areaDataArchiveID = 67, + .areaDataArchiveID = area_data_067, .unk_01 = 0xF, - .mapMatrixID = 0x8, + .mapMatrixID = map_matrix_008, .scriptsArchiveID = scripts_fuego_ironworks_building, .initScriptsArchiveID = scripts_init_fuego_ironworks_building, .msgArchiveID = TEXT_BANK_FUEGO_IRONWORKS_BUILDING, @@ -4546,9 +4548,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_206] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4568,9 +4570,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_1F_SOUTH] = { - .areaDataArchiveID = 0x45, + .areaDataArchiveID = area_data_069, .unk_01 = 0xF, - .mapMatrixID = 9, + .mapMatrixID = map_matrix_009, .scriptsArchiveID = scripts_mt_coronet_1f_south, .initScriptsArchiveID = scripts_init_mt_coronet_1f_south, .msgArchiveID = TEXT_BANK_MT_CORONET_1F_SOUTH, @@ -4590,9 +4592,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_2F] = { - .areaDataArchiveID = 0x45, + .areaDataArchiveID = area_data_069, .unk_01 = 0xF, - .mapMatrixID = 10, + .mapMatrixID = map_matrix_010, .scriptsArchiveID = scripts_mt_coronet_2f, .initScriptsArchiveID = scripts_init_mt_coronet_2f, .msgArchiveID = TEXT_BANK_MT_CORONET_2F, @@ -4612,9 +4614,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_3F] = { - .areaDataArchiveID = 0x45, + .areaDataArchiveID = area_data_069, .unk_01 = 0xF, - .mapMatrixID = 11, + .mapMatrixID = map_matrix_011, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4634,9 +4636,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_OUTSIDE_NORTH] = { - .areaDataArchiveID = 0xE, + .areaDataArchiveID = area_data_014, .unk_01 = 0x8, - .mapMatrixID = 12, + .mapMatrixID = map_matrix_012, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4656,9 +4658,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_MT_CORONET_OUTSIDE_SOUTH] = { - .areaDataArchiveID = 0xE, + .areaDataArchiveID = area_data_014, .unk_01 = 0x8, - .mapMatrixID = 13, + .mapMatrixID = map_matrix_013, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4678,9 +4680,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_MT_CORONET_4F_ROOMS_1_AND_2] = { - .areaDataArchiveID = 70, + .areaDataArchiveID = area_data_070, .unk_01 = 0xF, - .mapMatrixID = 14, + .mapMatrixID = map_matrix_014, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4700,9 +4702,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_4F_ROOM_3] = { - .areaDataArchiveID = 70, + .areaDataArchiveID = area_data_070, .unk_01 = 0xF, - .mapMatrixID = 15, + .mapMatrixID = map_matrix_015, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4722,9 +4724,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_5F] = { - .areaDataArchiveID = 70, + .areaDataArchiveID = area_data_070, .unk_01 = 15, - .mapMatrixID = 16, + .mapMatrixID = map_matrix_016, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4744,9 +4746,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_6F] = { - .areaDataArchiveID = 70, + .areaDataArchiveID = area_data_070, .unk_01 = 0xF, - .mapMatrixID = 17, + .mapMatrixID = map_matrix_017, .scriptsArchiveID = scripts_mt_coronet_6f, .initScriptsArchiveID = scripts_init_mt_coronet_6f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4766,9 +4768,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_1F_TUNNEL_ROOM] = { - .areaDataArchiveID = 0x45, + .areaDataArchiveID = area_data_069, .unk_01 = 0xF, - .mapMatrixID = 18, + .mapMatrixID = map_matrix_018, .scriptsArchiveID = scripts_mt_coronet_1f_tunnel_room, .initScriptsArchiveID = scripts_init_mt_coronet_1f_tunnel_room, .msgArchiveID = TEXT_BANK_MT_CORONET_1F_TUNNEL_ROOM, @@ -4788,9 +4790,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_2] = { - .areaDataArchiveID = 0x45, + .areaDataArchiveID = area_data_069, .unk_01 = 0xF, - .mapMatrixID = 19, + .mapMatrixID = map_matrix_019, .scriptsArchiveID = scripts_mt_coronet_1f_north_room_2, .initScriptsArchiveID = scripts_init_mt_coronet_1f_north_room_2, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4810,9 +4812,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_1] = { - .areaDataArchiveID = 0x45, + .areaDataArchiveID = area_data_069, .unk_01 = 0xF, - .mapMatrixID = 20, + .mapMatrixID = map_matrix_020, .scriptsArchiveID = scripts_mt_coronet_1f_north_room_1, .initScriptsArchiveID = scripts_init_mt_coronet_1f_north_room_1, .msgArchiveID = TEXT_BANK_MT_CORONET_1F_NORTH_ROOM_1, @@ -4832,9 +4834,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_B1F] = { - .areaDataArchiveID = 0x45, + .areaDataArchiveID = area_data_069, .unk_01 = 0xF, - .mapMatrixID = 21, + .mapMatrixID = map_matrix_021, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4854,9 +4856,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SPEAR_PILLAR] = { - .areaDataArchiveID = 0x3C, + .areaDataArchiveID = area_data_060, .unk_01 = 0xF, - .mapMatrixID = 22, + .mapMatrixID = map_matrix_022, .scriptsArchiveID = scripts_spear_pillar, .initScriptsArchiveID = scripts_init_spear_pillar, .msgArchiveID = TEXT_BANK_SPEAR_PILLAR, @@ -4876,9 +4878,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SPEAR_PILLAR_DISTORTED] = { - .areaDataArchiveID = 0x3C, + .areaDataArchiveID = area_data_060, .unk_01 = 0xF, - .mapMatrixID = 0x17, + .mapMatrixID = map_matrix_023, .scriptsArchiveID = scripts_spear_pillar_distorted, .initScriptsArchiveID = scripts_init_spear_pillar_distorted, .msgArchiveID = TEXT_BANK_SPEAR_PILLAR_DISTORTED, @@ -4898,9 +4900,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_222] = { - .areaDataArchiveID = 0xC, + .areaDataArchiveID = area_data_012, .unk_01 = 0x6, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4920,9 +4922,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_DP_GREAT_MARSH] = { - .areaDataArchiveID = 63, + .areaDataArchiveID = area_data_063, .unk_01 = 0xF, - .mapMatrixID = 0x18, + .mapMatrixID = map_matrix_024, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4942,9 +4944,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_224] = { - .areaDataArchiveID = 0xA, + .areaDataArchiveID = area_data_010, .unk_01 = 0x4, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -4964,9 +4966,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_MANIAC_TUNNEL_ROOM] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 0x19, + .mapMatrixID = map_matrix_025, .scriptsArchiveID = scripts_solaceon_ruins_maniac_tunnel_room, .initScriptsArchiveID = scripts_init_solaceon_ruins_maniac_tunnel_room, .msgArchiveID = TEXT_BANK_SOLACEON_RUINS_MANIAC_TUNNEL_ROOM, @@ -4986,9 +4988,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_1] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 0x1A, + .mapMatrixID = map_matrix_026, .scriptsArchiveID = scripts_solaceon_ruins_room_1, .initScriptsArchiveID = scripts_init_solaceon_ruins_room_1, .msgArchiveID = TEXT_BANK_SOLACEON_RUINS_ROOM_1, @@ -5008,9 +5010,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_2_NORTHEAST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 40, + .mapMatrixID = map_matrix_040, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5030,9 +5032,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_1_NORTHWEST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 35, + .mapMatrixID = map_matrix_035, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5052,9 +5054,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_2] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 39, + .mapMatrixID = map_matrix_039, .scriptsArchiveID = scripts_solaceon_ruins_room_2, .initScriptsArchiveID = scripts_init_solaceon_ruins_room_2, .msgArchiveID = TEXT_BANK_SOLACEON_RUINS_ROOM_2, @@ -5074,9 +5076,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_1_SOUTHEAST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 0x1F, + .mapMatrixID = map_matrix_031, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5096,9 +5098,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_3] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 34, + .mapMatrixID = map_matrix_034, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5118,9 +5120,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_2_SOUTHEAST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 0x1F, + .mapMatrixID = map_matrix_031, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5140,9 +5142,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_6_SOUTHEAST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 40, + .mapMatrixID = map_matrix_040, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5162,9 +5164,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_5_SOUTHWEST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 42, + .mapMatrixID = map_matrix_042, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5184,9 +5186,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_3_NORTHWEST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 35, + .mapMatrixID = map_matrix_035, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5206,9 +5208,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_3_SOUTHWEST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 35, + .mapMatrixID = map_matrix_035, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5228,9 +5230,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_4] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 36, + .mapMatrixID = map_matrix_036, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5250,9 +5252,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_6] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 34, + .mapMatrixID = map_matrix_034, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5272,9 +5274,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_5] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 30, + .mapMatrixID = map_matrix_030, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5294,9 +5296,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_7] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 41, + .mapMatrixID = map_matrix_041, .scriptsArchiveID = scripts_solaceon_ruins_room_7, .initScriptsArchiveID = scripts_init_solaceon_ruins_room_7, .msgArchiveID = TEXT_BANK_SOLACEON_RUINS_ROOM_7, @@ -5316,9 +5318,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_4_SOUTHEAST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 0x1F, + .mapMatrixID = map_matrix_031, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5338,9 +5340,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_6_NORTHWEST_DEAD_END] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 35, + .mapMatrixID = map_matrix_035, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5360,9 +5362,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_243] = { - .areaDataArchiveID = 0xE, + .areaDataArchiveID = area_data_014, .unk_01 = 0x8, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5382,9 +5384,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VICTORY_ROAD_1F] = { - .areaDataArchiveID = 71, + .areaDataArchiveID = area_data_071, .unk_01 = 0xF, - .mapMatrixID = 43, + .mapMatrixID = map_matrix_043, .scriptsArchiveID = scripts_victory_road_1f, .initScriptsArchiveID = scripts_init_victory_road_1f, .msgArchiveID = TEXT_BANK_VICTORY_ROAD_1F, @@ -5404,9 +5406,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VICTORY_ROAD_2F] = { - .areaDataArchiveID = 71, + .areaDataArchiveID = area_data_071, .unk_01 = 0xF, - .mapMatrixID = 44, + .mapMatrixID = map_matrix_044, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5426,9 +5428,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VICTORY_ROAD_B1F] = { - .areaDataArchiveID = 71, + .areaDataArchiveID = area_data_071, .unk_01 = 0xF, - .mapMatrixID = 45, + .mapMatrixID = map_matrix_045, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5448,9 +5450,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VICTORY_ROAD_1F_ROOM_2] = { - .areaDataArchiveID = 71, + .areaDataArchiveID = area_data_071, .unk_01 = 0xF, - .mapMatrixID = 46, + .mapMatrixID = map_matrix_046, .scriptsArchiveID = scripts_victory_road_1f_room_2, .initScriptsArchiveID = scripts_init_victory_road_1f_room_2, .msgArchiveID = TEXT_BANK_VICTORY_ROAD_1F_ROOM_2, @@ -5470,9 +5472,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VICTORY_ROAD_1F_ROOM_1] = { - .areaDataArchiveID = 71, + .areaDataArchiveID = area_data_071, .unk_01 = 0xF, - .mapMatrixID = 47, + .mapMatrixID = map_matrix_047, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5492,9 +5494,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VICTORY_ROAD_1F_ROOM_3] = { - .areaDataArchiveID = 71, + .areaDataArchiveID = area_data_071, .unk_01 = 0xF, - .mapMatrixID = 48, + .mapMatrixID = map_matrix_048, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5514,9 +5516,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_250] = { - .areaDataArchiveID = 0x4, + .areaDataArchiveID = area_data_004, .unk_01 = 0x4, - .mapMatrixID = 49, + .mapMatrixID = map_matrix_049, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5536,9 +5538,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PAL_PARK] = { - .areaDataArchiveID = 61, + .areaDataArchiveID = area_data_061, .unk_01 = 0xF, - .mapMatrixID = 49, + .mapMatrixID = map_matrix_049, .scriptsArchiveID = scripts_pal_park, .initScriptsArchiveID = scripts_init_pal_park, .msgArchiveID = TEXT_BANK_PAL_PARK, @@ -5558,9 +5560,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_252] = { - .areaDataArchiveID = 0x9, + .areaDataArchiveID = area_data_009, .unk_01 = 0x3, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5580,9 +5582,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_AMITY_SQUARE] = { - .areaDataArchiveID = 59, + .areaDataArchiveID = area_data_059, .unk_01 = 0xF, - .mapMatrixID = 50, + .mapMatrixID = map_matrix_050, .scriptsArchiveID = scripts_amity_square, .initScriptsArchiveID = scripts_init_amity_square, .msgArchiveID = TEXT_BANK_AMITY_SQUARE, @@ -5602,9 +5604,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RAVAGED_PATH] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 51, + .mapMatrixID = map_matrix_051, .scriptsArchiveID = scripts_ravaged_path, .initScriptsArchiveID = scripts_init_ravaged_path, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5624,9 +5626,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_255] = { - .areaDataArchiveID = 54, + .areaDataArchiveID = area_data_054, .unk_01 = 54, - .mapMatrixID = 52, + .mapMatrixID = map_matrix_052, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5646,9 +5648,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FLOAROMA_MEADOW] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 52, + .mapMatrixID = map_matrix_052, .scriptsArchiveID = scripts_floaroma_meadow, .initScriptsArchiveID = scripts_init_floaroma_meadow, .msgArchiveID = TEXT_BANK_FLOAROMA_MEADOW, @@ -5668,9 +5670,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_FLOAROMA_MEADOW_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_floaroma_meadow_house, .initScriptsArchiveID = scripts_init_floaroma_meadow_house, .msgArchiveID = TEXT_BANK_FLOAROMA_MEADOW_HOUSE, @@ -5690,9 +5692,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_GATE_1F] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 0x3, + .mapMatrixID = map_matrix_003, .scriptsArchiveID = scripts_oreburgh_gate_1f, .initScriptsArchiveID = scripts_init_oreburgh_gate_1f, .msgArchiveID = TEXT_BANK_OREBURGH_GATE_1F, @@ -5712,9 +5714,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_GATE_B1F] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 0x4, + .mapMatrixID = map_matrix_004, .scriptsArchiveID = scripts_oreburgh_gate_b1f, .initScriptsArchiveID = scripts_init_oreburgh_gate_b1f, .msgArchiveID = TEXT_BANK_OREBURGH_GATE_B1F, @@ -5734,9 +5736,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FULLMOON_ISLAND] = { - .areaDataArchiveID = 0xF, + .areaDataArchiveID = area_data_015, .unk_01 = 0xF, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_fullmoon_island, .initScriptsArchiveID = scripts_init_fullmoon_island, .msgArchiveID = TEXT_BANK_FULLMOON_ISLAND, @@ -5756,9 +5758,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FULLMOON_ISLAND_FOREST] = { - .areaDataArchiveID = 54, + .areaDataArchiveID = area_data_054, .unk_01 = 0xF, - .mapMatrixID = 53, + .mapMatrixID = map_matrix_053, .scriptsArchiveID = scripts_fullmoon_island_forest, .initScriptsArchiveID = scripts_init_fullmoon_island_forest, .msgArchiveID = TEXT_BANK_FULLMOON_ISLAND_FOREST, @@ -5778,9 +5780,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_STARK_MOUNTAIN_OUTSIDE] = { - .areaDataArchiveID = 0x11, + .areaDataArchiveID = area_data_017, .unk_01 = 0xF, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_stark_mountain_outside, .initScriptsArchiveID = scripts_init_stark_mountain_outside, .msgArchiveID = TEXT_BANK_STARK_MOUNTAIN_OUTSIDE, @@ -5800,9 +5802,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_STARK_MOUNTAIN_ROOM_1] = { - .areaDataArchiveID = 0x39, + .areaDataArchiveID = area_data_057, .unk_01 = 0xF, - .mapMatrixID = 0x39, + .mapMatrixID = map_matrix_057, .scriptsArchiveID = scripts_stark_mountain_room_1, .initScriptsArchiveID = scripts_init_stark_mountain_room_1, .msgArchiveID = TEXT_BANK_STARK_MOUNTAIN_ROOM_1, @@ -5822,9 +5824,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_STARK_MOUNTAIN_ROOM_2] = { - .areaDataArchiveID = 0x39, + .areaDataArchiveID = area_data_057, .unk_01 = 0xF, - .mapMatrixID = 58, + .mapMatrixID = map_matrix_058, .scriptsArchiveID = scripts_stark_mountain_room_2, .initScriptsArchiveID = scripts_init_stark_mountain_room_2, .msgArchiveID = TEXT_BANK_STARK_MOUNTAIN_ROOM_2, @@ -5844,9 +5846,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_STARK_MOUNTAIN_ROOM_3] = { - .areaDataArchiveID = 0x39, + .areaDataArchiveID = area_data_057, .unk_01 = 0xF, - .mapMatrixID = 59, + .mapMatrixID = map_matrix_059, .scriptsArchiveID = scripts_stark_mountain_room_3, .initScriptsArchiveID = scripts_init_stark_mountain_room_3, .msgArchiveID = TEXT_BANK_STARK_MOUNTAIN_ROOM_3, @@ -5866,9 +5868,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_266] = { - .areaDataArchiveID = 0x12, + .areaDataArchiveID = area_data_018, .unk_01 = 0xC, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5888,9 +5890,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SENDOFF_SPRING] = { - .areaDataArchiveID = 62, + .areaDataArchiveID = area_data_062, .unk_01 = 0xF, - .mapMatrixID = 0x3C, + .mapMatrixID = map_matrix_060, .scriptsArchiveID = scripts_sendoff_spring, .initScriptsArchiveID = scripts_init_sendoff_spring, .msgArchiveID = TEXT_BANK_SENDOFF_SPRING, @@ -5910,9 +5912,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_TURNBACK_CAVE_ENTRANCE] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 61, + .mapMatrixID = map_matrix_061, .scriptsArchiveID = scripts_turnback_cave_entrance, .initScriptsArchiveID = scripts_init_turnback_cave_entrance, .msgArchiveID = TEXT_BANK_TURNBACK_CAVE_ENTRANCE, @@ -5932,9 +5934,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_ROOM] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 62, + .mapMatrixID = map_matrix_062, .scriptsArchiveID = scripts_turnback_cave_pillar_room, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_room, .msgArchiveID = TEXT_BANK_TURNBACK_CAVE_PILLAR_ROOM, @@ -5954,9 +5956,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_GIRATINA_ROOM] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 63, + .mapMatrixID = map_matrix_063, .scriptsArchiveID = scripts_turnback_cave_giratina_room, .initScriptsArchiveID = scripts_init_turnback_cave_giratina_room, .msgArchiveID = TEXT_BANK_TURNBACK_CAVE_GIRATINA_ROOM, @@ -5976,9 +5978,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_1] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_1, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_1_room_1, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -5998,9 +6000,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_2] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_2, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_1_room_2, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6020,9 +6022,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_3] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_3, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_1_room_3, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6042,9 +6044,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FLOWER_PARADISE] = { - .areaDataArchiveID = 0xD, + .areaDataArchiveID = area_data_013, .unk_01 = 0xA, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_flower_paradise, .initScriptsArchiveID = scripts_init_flower_paradise, .msgArchiveID = TEXT_BANK_FLOWER_PARADISE, @@ -6064,9 +6066,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_UNKNOWN_275] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6086,9 +6088,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_276] = { - .areaDataArchiveID = 11, + .areaDataArchiveID = area_data_011, .unk_01 = 0x5, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6108,9 +6110,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_277] = { - .areaDataArchiveID = 11, + .areaDataArchiveID = area_data_011, .unk_01 = 0x5, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6130,9 +6132,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_TEMPLE_1F] = { - .areaDataArchiveID = 65, + .areaDataArchiveID = area_data_065, .unk_01 = 0xF, - .mapMatrixID = 68, + .mapMatrixID = map_matrix_068, .scriptsArchiveID = scripts_snowpoint_temple_1f, .initScriptsArchiveID = scripts_init_snowpoint_temple_1f, .msgArchiveID = TEXT_BANK_SNOWPOINT_TEMPLE_1F, @@ -6152,9 +6154,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B1F] = { - .areaDataArchiveID = 65, + .areaDataArchiveID = area_data_065, .unk_01 = 0xF, - .mapMatrixID = 0x45, + .mapMatrixID = map_matrix_069, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6174,9 +6176,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B2F] = { - .areaDataArchiveID = 65, + .areaDataArchiveID = area_data_065, .unk_01 = 0xF, - .mapMatrixID = 70, + .mapMatrixID = map_matrix_070, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6196,9 +6198,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B3F] = { - .areaDataArchiveID = 65, + .areaDataArchiveID = area_data_065, .unk_01 = 0xF, - .mapMatrixID = 71, + .mapMatrixID = map_matrix_071, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6218,9 +6220,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B4F] = { - .areaDataArchiveID = 65, + .areaDataArchiveID = area_data_065, .unk_01 = 0xF, - .mapMatrixID = 0x48, + .mapMatrixID = map_matrix_072, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6240,9 +6242,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B5F] = { - .areaDataArchiveID = 65, + .areaDataArchiveID = area_data_065, .unk_01 = 0xF, - .mapMatrixID = 73, + .mapMatrixID = map_matrix_073, .scriptsArchiveID = scripts_snowpoint_temple_b5f, .initScriptsArchiveID = scripts_init_snowpoint_temple_b5f, .msgArchiveID = TEXT_BANK_SNOWPOINT_TEMPLE_B5F, @@ -6262,9 +6264,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_WAYWARD_CAVE_1F] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 0x4A, + .mapMatrixID = map_matrix_074, .scriptsArchiveID = scripts_wayward_cave_1f, .initScriptsArchiveID = scripts_init_wayward_cave_1f, .msgArchiveID = TEXT_BANK_WAYWARD_CAVE_1F, @@ -6284,9 +6286,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_WAYWARD_CAVE_B1F] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 75, + .mapMatrixID = map_matrix_075, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6306,9 +6308,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RUIN_MANIAC_CAVE_SHORT] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 76, + .mapMatrixID = map_matrix_076, .scriptsArchiveID = scripts_ruin_maniac_cave_short, .initScriptsArchiveID = scripts_init_ruin_maniac_cave_short, .msgArchiveID = TEXT_BANK_RUIN_MANIAC_CAVE_SHORT, @@ -6328,9 +6330,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TROPHY_GARDEN] = { - .areaDataArchiveID = 0xC, + .areaDataArchiveID = area_data_012, .unk_01 = 0xF, - .mapMatrixID = 79, + .mapMatrixID = map_matrix_079, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6350,9 +6352,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_IRON_ISLAND] = { - .areaDataArchiveID = 0xF, + .areaDataArchiveID = area_data_015, .unk_01 = 0xF, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_iron_island, .initScriptsArchiveID = scripts_init_iron_island, .msgArchiveID = TEXT_BANK_IRON_ISLAND, @@ -6372,9 +6374,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_IRON_ISLAND_1F] = { - .areaDataArchiveID = 0x48, + .areaDataArchiveID = area_data_072, .unk_01 = 0xF, - .mapMatrixID = 80, + .mapMatrixID = map_matrix_080, .scriptsArchiveID = scripts_iron_island_1f, .initScriptsArchiveID = scripts_init_iron_island_1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6394,9 +6396,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_IRON_ISLAND_B1F_LEFT_ROOM] = { - .areaDataArchiveID = 0x48, + .areaDataArchiveID = area_data_072, .unk_01 = 0xF, - .mapMatrixID = 81, + .mapMatrixID = map_matrix_081, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6416,9 +6418,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_IRON_ISLAND_B1F_RIGHT_ROOM] = { - .areaDataArchiveID = 0x48, + .areaDataArchiveID = area_data_072, .unk_01 = 0xF, - .mapMatrixID = 82, + .mapMatrixID = map_matrix_082, .scriptsArchiveID = scripts_iron_island_b1f_right_room, .initScriptsArchiveID = scripts_init_iron_island_b1f_right_room, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6438,9 +6440,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_IRON_ISLAND_B2F_RIGHT_ROOM] = { - .areaDataArchiveID = 0x48, + .areaDataArchiveID = area_data_072, .unk_01 = 0xF, - .mapMatrixID = 83, + .mapMatrixID = map_matrix_083, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6460,9 +6462,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_IRON_ISLAND_B2F_LEFT_ROOM] = { - .areaDataArchiveID = 0x48, + .areaDataArchiveID = area_data_072, .unk_01 = 0xF, - .mapMatrixID = 84, + .mapMatrixID = map_matrix_084, .scriptsArchiveID = scripts_iron_island_b2f_left_room, .initScriptsArchiveID = scripts_init_iron_island_b2f_left_room, .msgArchiveID = TEXT_BANK_IRON_ISLAND_B2F_LEFT_ROOM, @@ -6482,9 +6484,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_IRON_ISLAND_B3F] = { - .areaDataArchiveID = 0x48, + .areaDataArchiveID = area_data_072, .unk_01 = 0xF, - .mapMatrixID = 85, + .mapMatrixID = map_matrix_085, .scriptsArchiveID = scripts_iron_island_b3f, .initScriptsArchiveID = scripts_init_iron_island_b3f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6504,9 +6506,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OLD_CHATEAU] = { - .areaDataArchiveID = 66, + .areaDataArchiveID = area_data_066, .unk_01 = 0xF, - .mapMatrixID = 86, + .mapMatrixID = map_matrix_086, .scriptsArchiveID = scripts_old_chateau, .initScriptsArchiveID = scripts_init_old_chateau, .msgArchiveID = TEXT_BANK_OLD_CHATEAU, @@ -6526,9 +6528,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OLD_CHATEAU_DINING_AREA] = { - .areaDataArchiveID = 66, + .areaDataArchiveID = area_data_066, .unk_01 = 0xF, - .mapMatrixID = 87, + .mapMatrixID = map_matrix_087, .scriptsArchiveID = scripts_old_chateau_dining_area, .initScriptsArchiveID = scripts_init_old_chateau_dining_area, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6548,9 +6550,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OLD_CHATEAU_SIDE_ROOMS] = { - .areaDataArchiveID = 66, + .areaDataArchiveID = area_data_066, .unk_01 = 0xF, - .mapMatrixID = 88, + .mapMatrixID = map_matrix_088, .scriptsArchiveID = scripts_old_chateau_side_rooms, .initScriptsArchiveID = scripts_init_old_chateau_side_rooms, .msgArchiveID = TEXT_BANK_OLD_CHATEAU_SIDE_ROOMS, @@ -6570,9 +6572,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OLD_CHATEAU_CORRIDOR] = { - .areaDataArchiveID = 66, + .areaDataArchiveID = area_data_066, .unk_01 = 0xF, - .mapMatrixID = 89, + .mapMatrixID = map_matrix_089, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6592,9 +6594,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OLD_CHATEAU_BACK_WEST_ROOM] = { - .areaDataArchiveID = 66, + .areaDataArchiveID = area_data_066, .unk_01 = 0xF, - .mapMatrixID = 90, + .mapMatrixID = map_matrix_090, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6614,9 +6616,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_WEST_ROOM] = { - .areaDataArchiveID = 66, + .areaDataArchiveID = area_data_066, .unk_01 = 0xF, - .mapMatrixID = 91, + .mapMatrixID = map_matrix_091, .scriptsArchiveID = scripts_old_chateau_back_middle_west_room, .initScriptsArchiveID = scripts_init_old_chateau_back_middle_west_room, .msgArchiveID = TEXT_BANK_OLD_CHATEAU_BACK_MIDDLE_WEST_ROOM, @@ -6636,9 +6638,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_ROOM] = { - .areaDataArchiveID = 66, + .areaDataArchiveID = area_data_066, .unk_01 = 0xF, - .mapMatrixID = 92, + .mapMatrixID = map_matrix_092, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6658,9 +6660,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_EAST_ROOM] = { - .areaDataArchiveID = 66, + .areaDataArchiveID = area_data_066, .unk_01 = 0xF, - .mapMatrixID = 93, + .mapMatrixID = map_matrix_093, .scriptsArchiveID = scripts_old_chateau_back_middle_east_room, .initScriptsArchiveID = scripts_init_old_chateau_back_middle_east_room, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6680,9 +6682,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OLD_CHATEAU_BACK_EAST_ROOM] = { - .areaDataArchiveID = 66, + .areaDataArchiveID = area_data_066, .unk_01 = 0xF, - .mapMatrixID = 94, + .mapMatrixID = map_matrix_094, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6702,9 +6704,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_304] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0x1F, - .mapMatrixID = 157, + .mapMatrixID = map_matrix_157, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -6724,9 +6726,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GALACTIC_HQ_1F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 95, + .mapMatrixID = map_matrix_095, .scriptsArchiveID = scripts_galactic_hq_1f, .initScriptsArchiveID = scripts_init_galactic_hq_1f, .msgArchiveID = TEXT_BANK_GALACTIC_HQ_1F, @@ -6746,9 +6748,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GALACTIC_HQ_2F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 96, + .mapMatrixID = map_matrix_096, .scriptsArchiveID = scripts_galactic_hq_2f, .initScriptsArchiveID = scripts_init_galactic_hq_2f, .msgArchiveID = TEXT_BANK_GALACTIC_HQ_2F, @@ -6768,9 +6770,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GALACTIC_HQ_3F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 97, + .mapMatrixID = map_matrix_097, .scriptsArchiveID = scripts_galactic_hq_3f, .initScriptsArchiveID = scripts_init_galactic_hq_3f, .msgArchiveID = TEXT_BANK_GALACTIC_HQ_3F, @@ -6790,9 +6792,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GALACTIC_HQ_4F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 98, + .mapMatrixID = map_matrix_098, .scriptsArchiveID = scripts_galactic_hq_4f, .initScriptsArchiveID = scripts_init_galactic_hq_4f, .msgArchiveID = TEXT_BANK_GALACTIC_HQ_4F, @@ -6812,9 +6814,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GALACTIC_HQ_B1F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 100, + .mapMatrixID = map_matrix_100, .scriptsArchiveID = scripts_galactic_hq_b1f, .initScriptsArchiveID = scripts_init_galactic_hq_b1f, .msgArchiveID = TEXT_BANK_GALACTIC_HQ_B1F, @@ -6834,9 +6836,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GALACTIC_HQ_B2F] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 99, + .mapMatrixID = map_matrix_099, .scriptsArchiveID = scripts_galactic_hq_b2f, .initScriptsArchiveID = scripts_init_galactic_hq_b2f, .msgArchiveID = TEXT_BANK_GALACTIC_HQ_B2F, @@ -6856,9 +6858,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_LAKE_VERITY_LOW_WATER] = { - .areaDataArchiveID = 62, + .areaDataArchiveID = area_data_062, .unk_01 = 0xF, - .mapMatrixID = 101, + .mapMatrixID = map_matrix_101, .scriptsArchiveID = scripts_lake_verity_low_water, .initScriptsArchiveID = scripts_init_lake_verity_low_water, .msgArchiveID = TEXT_BANK_LAKE_VERITY_LOW_WATER, @@ -6878,9 +6880,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_LAKE_VERITY] = { - .areaDataArchiveID = 62, + .areaDataArchiveID = area_data_062, .unk_01 = 0xF, - .mapMatrixID = 102, + .mapMatrixID = map_matrix_102, .scriptsArchiveID = scripts_lake_verity, .initScriptsArchiveID = scripts_init_lake_verity, .msgArchiveID = TEXT_BANK_LAKE_VERITY, @@ -6900,9 +6902,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_VERITY_CAVERN] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 103, + .mapMatrixID = map_matrix_103, .scriptsArchiveID = scripts_verity_cavern, .initScriptsArchiveID = scripts_init_verity_cavern, .msgArchiveID = TEXT_BANK_VERITY_CAVERN, @@ -6922,9 +6924,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_LAKE_VALOR_DRAINED] = { - .areaDataArchiveID = 62, + .areaDataArchiveID = area_data_062, .unk_01 = 0xF, - .mapMatrixID = 104, + .mapMatrixID = map_matrix_104, .scriptsArchiveID = scripts_lake_valor_drained, .initScriptsArchiveID = scripts_init_lake_valor_drained, .msgArchiveID = TEXT_BANK_LAKE_VALOR_DRAINED, @@ -6944,9 +6946,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_LAKE_VALOR] = { - .areaDataArchiveID = 62, + .areaDataArchiveID = area_data_062, .unk_01 = 0xF, - .mapMatrixID = 105, + .mapMatrixID = map_matrix_105, .scriptsArchiveID = scripts_lake_valor, .initScriptsArchiveID = scripts_init_lake_valor, .msgArchiveID = TEXT_BANK_LAKE_VALOR, @@ -6966,9 +6968,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_VALOR_CAVERN] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 106, + .mapMatrixID = map_matrix_106, .scriptsArchiveID = scripts_valor_cavern, .initScriptsArchiveID = scripts_init_valor_cavern, .msgArchiveID = TEXT_BANK_VALOR_CAVERN, @@ -6988,9 +6990,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_LAKE_ACUITY_LOW_WATER] = { - .areaDataArchiveID = 0xE, + .areaDataArchiveID = area_data_014, .unk_01 = 0xF, - .mapMatrixID = 107, + .mapMatrixID = map_matrix_107, .scriptsArchiveID = scripts_lake_acuity_low_water, .initScriptsArchiveID = scripts_init_lake_acuity_low_water, .msgArchiveID = TEXT_BANK_LAKE_ACUITY_LOW_WATER, @@ -7010,9 +7012,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_LAKE_ACUITY] = { - .areaDataArchiveID = 0xE, + .areaDataArchiveID = area_data_014, .unk_01 = 0xF, - .mapMatrixID = 108, + .mapMatrixID = map_matrix_108, .scriptsArchiveID = scripts_lake_acuity, .initScriptsArchiveID = scripts_init_lake_acuity, .msgArchiveID = TEXT_BANK_LAKE_ACUITY, @@ -7032,9 +7034,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ACUITY_CAVERN] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 109, + .mapMatrixID = map_matrix_109, .scriptsArchiveID = scripts_acuity_cavern, .initScriptsArchiveID = scripts_init_acuity_cavern, .msgArchiveID = TEXT_BANK_ACUITY_CAVERN, @@ -7054,9 +7056,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_NEWMOON_ISLAND] = { - .areaDataArchiveID = 0xF, + .areaDataArchiveID = area_data_015, .unk_01 = 0x9, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_newmoon_island, .initScriptsArchiveID = scripts_init_newmoon_island, .msgArchiveID = TEXT_BANK_NEWMOON_ISLAND, @@ -7076,9 +7078,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_NEWMOON_ISLAND_FOREST] = { - .areaDataArchiveID = 54, + .areaDataArchiveID = area_data_054, .unk_01 = 0xF, - .mapMatrixID = 110, + .mapMatrixID = map_matrix_110, .scriptsArchiveID = scripts_newmoon_island_forest, .initScriptsArchiveID = scripts_init_newmoon_island_forest, .msgArchiveID = TEXT_BANK_NEWMOON_ISLAND_FOREST, @@ -7098,9 +7100,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_PARK] = { - .areaDataArchiveID = 64, + .areaDataArchiveID = area_data_064, .unk_01 = 0xF, - .mapMatrixID = 229, + .mapMatrixID = map_matrix_229, .scriptsArchiveID = scripts_battle_park, .initScriptsArchiveID = scripts_init_battle_park, .msgArchiveID = TEXT_BANK_BATTLE_PARK, @@ -7120,9 +7122,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_BATTLE_PARK_EXCHANGE_SERVICE_CORNER] = { - .areaDataArchiveID = 41, + .areaDataArchiveID = area_data_041, .unk_01 = 0xF, - .mapMatrixID = 231, + .mapMatrixID = map_matrix_231, .scriptsArchiveID = scripts_battle_park_exchange_service_corner, .initScriptsArchiveID = scripts_init_battle_park_exchange_service_corner, .msgArchiveID = TEXT_BANK_BATTLE_PARK_EXCHANGE_SERVICE_CORNER, @@ -7142,9 +7144,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_324] = { - .areaDataArchiveID = 33, + .areaDataArchiveID = area_data_033, .unk_01 = 0xF, - .mapMatrixID = 232, + .mapMatrixID = map_matrix_232, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7164,9 +7166,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_325] = { - .areaDataArchiveID = 33, + .areaDataArchiveID = area_data_033, .unk_01 = 0xF, - .mapMatrixID = 233, + .mapMatrixID = map_matrix_233, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7186,9 +7188,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_TOWER] = { - .areaDataArchiveID = 33, + .areaDataArchiveID = area_data_033, .unk_01 = 0xF, - .mapMatrixID = 193, + .mapMatrixID = map_matrix_193, .scriptsArchiveID = scripts_battle_tower, .initScriptsArchiveID = scripts_init_battle_tower, .msgArchiveID = TEXT_BANK_BATTLE_TOWER, @@ -7208,9 +7210,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_TOWER_ELEVATOR] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 207, + .mapMatrixID = map_matrix_207, .scriptsArchiveID = scripts_battle_tower_elevator, .initScriptsArchiveID = scripts_init_battle_tower_elevator, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7230,9 +7232,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_TOWER_CORRIDOR] = { - .areaDataArchiveID = 33, + .areaDataArchiveID = area_data_033, .unk_01 = 0xF, - .mapMatrixID = 194, + .mapMatrixID = map_matrix_194, .scriptsArchiveID = scripts_battle_tower_corridor, .initScriptsArchiveID = scripts_init_battle_tower_corridor, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7252,9 +7254,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_TOWER_CORRIDOR_MULTI] = { - .areaDataArchiveID = 33, + .areaDataArchiveID = area_data_033, .unk_01 = 0xF, - .mapMatrixID = 195, + .mapMatrixID = map_matrix_195, .scriptsArchiveID = scripts_battle_tower_corridor_multi, .initScriptsArchiveID = scripts_init_battle_tower_corridor_multi, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7274,9 +7276,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_TOWER_BATTLE_ROOM] = { - .areaDataArchiveID = 33, + .areaDataArchiveID = area_data_033, .unk_01 = 0xF, - .mapMatrixID = 197, + .mapMatrixID = map_matrix_197, .scriptsArchiveID = scripts_battle_tower_battle_room, .initScriptsArchiveID = scripts_init_battle_tower_battle_room, .msgArchiveID = TEXT_BANK_BATTLE_TOWER_BATTLE_ROOM, @@ -7296,9 +7298,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_TOWER_MULTI_BATTLE_ROOM] = { - .areaDataArchiveID = 33, + .areaDataArchiveID = area_data_033, .unk_01 = 0xF, - .mapMatrixID = 198, + .mapMatrixID = map_matrix_198, .scriptsArchiveID = scripts_battle_tower_multi_battle_room, .initScriptsArchiveID = scripts_init_battle_tower_multi_battle_room, .msgArchiveID = TEXT_BANK_BATTLE_TOWER_MULTI_BATTLE_ROOM, @@ -7318,9 +7320,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_2P] = { - .areaDataArchiveID = 0x5, + .areaDataArchiveID = area_data_005, .unk_01 = 0xE, - .mapMatrixID = 118, + .mapMatrixID = map_matrix_118, .scriptsArchiveID = scripts_communication_club_colosseum_2p, .initScriptsArchiveID = scripts_init_communication_club_colosseum_2p, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7340,9 +7342,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_4P] = { - .areaDataArchiveID = 0x5, + .areaDataArchiveID = area_data_005, .unk_01 = 0xE, - .mapMatrixID = 121, + .mapMatrixID = map_matrix_121, .scriptsArchiveID = scripts_communication_club_colosseum_4p, .initScriptsArchiveID = scripts_init_communication_club_colosseum_4p, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7362,9 +7364,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VERITY_LAKEFRONT] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_verity_lakefront, .initScriptsArchiveID = scripts_init_verity_lakefront, .msgArchiveID = TEXT_BANK_VERITY_LAKEFRONT, @@ -7384,9 +7386,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_VERITY_LAKEFRONT_UNKNOWN_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0x14, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_verity_lakefront_unknown_house, .initScriptsArchiveID = scripts_init_verity_lakefront_unknown_house, .msgArchiveID = TEXT_BANK_VERITY_LAKEFRONT_UNKNOWN_HOUSE, @@ -7406,9 +7408,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VALOR_LAKEFRONT] = { - .areaDataArchiveID = 0x12, + .areaDataArchiveID = area_data_018, .unk_01 = 0xC, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_valor_lakefront, .initScriptsArchiveID = scripts_init_valor_lakefront, .msgArchiveID = TEXT_BANK_VALOR_LAKEFRONT, @@ -7428,9 +7430,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_RESTAURANT] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 147, + .mapMatrixID = map_matrix_147, .scriptsArchiveID = scripts_restaurant, .initScriptsArchiveID = scripts_init_restaurant, .msgArchiveID = TEXT_BANK_RESTAURANT, @@ -7450,9 +7452,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 146, + .mapMatrixID = map_matrix_146, .scriptsArchiveID = scripts_grand_lake_valor_lakefront_east_house, .initScriptsArchiveID = scripts_init_grand_lake_valor_lakefront_east_house, .msgArchiveID = TEXT_BANK_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE, @@ -7472,9 +7474,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GRAND_LAKE_VALOR_LAKEFRONT_WEST_HOUSE] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 146, + .mapMatrixID = map_matrix_146, .scriptsArchiveID = scripts_grand_lake_valor_lakefront_west_house, .initScriptsArchiveID = scripts_init_grand_lake_valor_lakefront_west_house, .msgArchiveID = TEXT_BANK_GRAND_LAKE_VALOR_LAKEFRONT_WEST_HOUSE, @@ -7494,9 +7496,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ACUITY_LAKEFRONT] = { - .areaDataArchiveID = 0xE, + .areaDataArchiveID = area_data_014, .unk_01 = 0x8, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_acuity_lakefront, .initScriptsArchiveID = scripts_init_acuity_lakefront, .msgArchiveID = TEXT_BANK_ACUITY_LAKEFRONT, @@ -7516,9 +7518,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_SPRING_PATH] = { - .areaDataArchiveID = 0x12, + .areaDataArchiveID = area_data_018, .unk_01 = 0xC, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7538,9 +7540,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_201] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_201, .initScriptsArchiveID = scripts_init_route_201, .msgArchiveID = TEXT_BANK_ROUTE_201, @@ -7560,9 +7562,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_202] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_202, .initScriptsArchiveID = scripts_init_route_202, .msgArchiveID = TEXT_BANK_ROUTE_202, @@ -7582,9 +7584,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_203] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_203, .initScriptsArchiveID = scripts_init_route_203, .msgArchiveID = TEXT_BANK_ROUTE_203, @@ -7604,9 +7606,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_204_SOUTH] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_204_south, .initScriptsArchiveID = scripts_init_route_204_south, .msgArchiveID = TEXT_BANK_ROUTE_204_SOUTH, @@ -7626,9 +7628,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_204_NORTH] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_204_north, .initScriptsArchiveID = scripts_init_route_204_north, .msgArchiveID = TEXT_BANK_ROUTE_204_NORTH, @@ -7648,9 +7650,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_205_SOUTH] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_205_south, .initScriptsArchiveID = scripts_init_route_205_south, .msgArchiveID = TEXT_BANK_ROUTE_205_SOUTH, @@ -7670,9 +7672,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_205_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_route_205_house, .initScriptsArchiveID = scripts_init_route_205_house, .msgArchiveID = TEXT_BANK_ROUTE_205_HOUSE, @@ -7692,9 +7694,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_205_NORTH] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_205_north, .initScriptsArchiveID = scripts_init_route_205_north, .msgArchiveID = TEXT_BANK_ROUTE_205_NORTH, @@ -7714,9 +7716,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_206] = { - .areaDataArchiveID = 0x7, + .areaDataArchiveID = area_data_007, .unk_01 = 0x1, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_206, .initScriptsArchiveID = scripts_init_route_206, .msgArchiveID = TEXT_BANK_ROUTE_206, @@ -7736,9 +7738,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_206_CYCLING_ROAD_SOUTH_GATE] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 260, + .mapMatrixID = map_matrix_260, .scriptsArchiveID = scripts_route_206_cycling_road_south_gate, .initScriptsArchiveID = scripts_init_route_206_cycling_road_south_gate, .msgArchiveID = TEXT_BANK_ROUTE_206_CYCLING_ROAD_SOUTH_GATE, @@ -7758,9 +7760,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GATE_BETWEEN_ETERNA_CITY_ROUTE_206] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0x1F, - .mapMatrixID = 157, + .mapMatrixID = map_matrix_157, .scriptsArchiveID = scripts_gate_between_eterna_city_route_206, .initScriptsArchiveID = scripts_init_gate_between_eterna_city_route_206, .msgArchiveID = TEXT_BANK_GATE_BETWEEN_ETERNA_CITY_ROUTE_206, @@ -7780,9 +7782,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_207] = { - .areaDataArchiveID = 0x7, + .areaDataArchiveID = area_data_007, .unk_01 = 0x1, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_207, .initScriptsArchiveID = scripts_init_route_207, .msgArchiveID = TEXT_BANK_ROUTE_207, @@ -7802,9 +7804,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_208] = { - .areaDataArchiveID = 0x9, + .areaDataArchiveID = area_data_009, .unk_01 = 0x3, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_208, .initScriptsArchiveID = scripts_init_route_208, .msgArchiveID = TEXT_BANK_ROUTE_208, @@ -7824,9 +7826,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_208_HOUSE] = { - .areaDataArchiveID = 43, + .areaDataArchiveID = area_data_043, .unk_01 = 0xF, - .mapMatrixID = 249, + .mapMatrixID = map_matrix_249, .scriptsArchiveID = scripts_route_208_house, .initScriptsArchiveID = scripts_init_route_208_house, .msgArchiveID = TEXT_BANK_ROUTE_208_HOUSE, @@ -7846,9 +7848,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_209] = { - .areaDataArchiveID = 0xA, + .areaDataArchiveID = area_data_010, .unk_01 = 0x4, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_209, .initScriptsArchiveID = scripts_init_route_209, .msgArchiveID = TEXT_BANK_ROUTE_209, @@ -7868,9 +7870,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_1F] = { - .areaDataArchiveID = 42, + .areaDataArchiveID = area_data_042, .unk_01 = 0xF, - .mapMatrixID = 212, + .mapMatrixID = map_matrix_212, .scriptsArchiveID = scripts_route_209_lost_tower_1f, .initScriptsArchiveID = scripts_init_route_209_lost_tower_1f, .msgArchiveID = TEXT_BANK_ROUTE_209_LOST_TOWER_1F, @@ -7890,9 +7892,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_2F] = { - .areaDataArchiveID = 42, + .areaDataArchiveID = area_data_042, .unk_01 = 0xF, - .mapMatrixID = 213, + .mapMatrixID = map_matrix_213, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7912,9 +7914,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_3F] = { - .areaDataArchiveID = 42, + .areaDataArchiveID = area_data_042, .unk_01 = 0xF, - .mapMatrixID = 214, + .mapMatrixID = map_matrix_214, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7934,9 +7936,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_4F] = { - .areaDataArchiveID = 42, + .areaDataArchiveID = area_data_042, .unk_01 = 0xF, - .mapMatrixID = 215, + .mapMatrixID = map_matrix_215, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -7956,9 +7958,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_5F] = { - .areaDataArchiveID = 42, + .areaDataArchiveID = area_data_042, .unk_01 = 0xF, - .mapMatrixID = 216, + .mapMatrixID = map_matrix_216, .scriptsArchiveID = scripts_route_209_lost_tower_5f, .initScriptsArchiveID = scripts_init_route_209_lost_tower_5f, .msgArchiveID = TEXT_BANK_ROUTE_209_LOST_TOWER_5F, @@ -7978,9 +7980,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_210_SOUTH] = { - .areaDataArchiveID = 0xA, + .areaDataArchiveID = area_data_010, .unk_01 = 0x4, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_210_south, .initScriptsArchiveID = scripts_init_route_210_south, .msgArchiveID = TEXT_BANK_ROUTE_210_SOUTH, @@ -8000,9 +8002,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_210_NORTH] = { - .areaDataArchiveID = 0xA, + .areaDataArchiveID = area_data_010, .unk_01 = 0x4, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_210_north, .initScriptsArchiveID = scripts_init_route_210_north, .msgArchiveID = TEXT_BANK_ROUTE_210_NORTH, @@ -8022,9 +8024,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_210_GRANDMA_WILMA_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_route_210_grandma_wilma_house, .initScriptsArchiveID = scripts_init_route_210_grandma_wilma_house, .msgArchiveID = TEXT_BANK_ROUTE_210_GRANDMA_WILMA_HOUSE, @@ -8044,9 +8046,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_211_WEST] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_211_west, .initScriptsArchiveID = scripts_init_route_211_west, .msgArchiveID = TEXT_BANK_ROUTE_211_WEST, @@ -8066,9 +8068,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_211_EAST] = { - .areaDataArchiveID = 0xA, + .areaDataArchiveID = area_data_010, .unk_01 = 0x4, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_211_east, .initScriptsArchiveID = scripts_init_route_211_east, .msgArchiveID = TEXT_BANK_ROUTE_211_EAST, @@ -8088,9 +8090,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_212_NORTH] = { - .areaDataArchiveID = 0xC, + .areaDataArchiveID = area_data_012, .unk_01 = 0x6, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_212_north, .initScriptsArchiveID = scripts_init_route_212_north, .msgArchiveID = TEXT_BANK_ROUTE_212_NORTH, @@ -8110,9 +8112,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_POKEMON_MANSION] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 178, + .mapMatrixID = map_matrix_178, .scriptsArchiveID = scripts_pokemon_mansion, .initScriptsArchiveID = scripts_init_pokemon_mansion, .msgArchiveID = TEXT_BANK_POKEMON_MANSION, @@ -8132,9 +8134,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_MANSION_MAIDS_ROOM] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 179, + .mapMatrixID = map_matrix_179, .scriptsArchiveID = scripts_pokemon_mansion_maids_room, .initScriptsArchiveID = scripts_init_pokemon_mansion_maids_room, .msgArchiveID = TEXT_BANK_POKEMON_MANSION_MAIDS_ROOM, @@ -8154,9 +8156,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_MANSION_OFFICE] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 180, + .mapMatrixID = map_matrix_180, .scriptsArchiveID = scripts_pokemon_mansion_office, .initScriptsArchiveID = scripts_init_pokemon_mansion_office, .msgArchiveID = TEXT_BANK_POKEMON_MANSION_OFFICE, @@ -8176,9 +8178,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_212_SOUTH] = { - .areaDataArchiveID = 0xC, + .areaDataArchiveID = area_data_012, .unk_01 = 0x6, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_212_south, .initScriptsArchiveID = scripts_init_route_212_south, .msgArchiveID = TEXT_BANK_ROUTE_212_SOUTH, @@ -8198,9 +8200,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_212_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 244, + .mapMatrixID = map_matrix_244, .scriptsArchiveID = scripts_route_212_house, .initScriptsArchiveID = scripts_init_route_212_house, .msgArchiveID = TEXT_BANK_ROUTE_212_HOUSE, @@ -8220,9 +8222,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_213] = { - .areaDataArchiveID = 0x12, + .areaDataArchiveID = area_data_018, .unk_01 = 0xC, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_213, .initScriptsArchiveID = scripts_init_route_213, .msgArchiveID = TEXT_BANK_ROUTE_213, @@ -8242,9 +8244,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_213_GATE_TO_PASTORIA_CITY] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 258, + .mapMatrixID = map_matrix_258, .scriptsArchiveID = scripts_route_213_gate_to_pastoria_city, .initScriptsArchiveID = scripts_init_route_213_gate_to_pastoria_city, .msgArchiveID = TEXT_BANK_ROUTE_213_GATE_TO_PASTORIA_CITY, @@ -8264,9 +8266,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FOOTSTEP_HOUSE] = { - .areaDataArchiveID = 43, + .areaDataArchiveID = area_data_043, .unk_01 = 0xF, - .mapMatrixID = 247, + .mapMatrixID = map_matrix_247, .scriptsArchiveID = scripts_footstep_house, .initScriptsArchiveID = scripts_init_footstep_house, .msgArchiveID = TEXT_BANK_FOOTSTEP_HOUSE, @@ -8286,9 +8288,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GRAND_LAKE_ROUTE_213_LOBBY] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 145, + .mapMatrixID = map_matrix_145, .scriptsArchiveID = scripts_grand_lake_route_213_lobby, .initScriptsArchiveID = scripts_init_grand_lake_route_213_lobby, .msgArchiveID = TEXT_BANK_GRAND_LAKE_ROUTE_213_LOBBY, @@ -8308,9 +8310,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GRAND_LAKE_ROUTE_213_EAST_HOUSE] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 146, + .mapMatrixID = map_matrix_146, .scriptsArchiveID = scripts_grand_lake_route_213_east_house, .initScriptsArchiveID = scripts_init_grand_lake_route_213_east_house, .msgArchiveID = TEXT_BANK_GRAND_LAKE_ROUTE_213_EAST_HOUSE, @@ -8330,9 +8332,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GRAND_LAKE_ROUTE_213_NORTHWEST_HOUSE] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 146, + .mapMatrixID = map_matrix_146, .scriptsArchiveID = scripts_grand_lake_route_213_northwest_house, .initScriptsArchiveID = scripts_init_grand_lake_route_213_northwest_house, .msgArchiveID = TEXT_BANK_GRAND_LAKE_ROUTE_213_NORTHWEST_HOUSE, @@ -8352,9 +8354,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GRAND_LAKE_ROUTE_213_NORTHEAST_HOUSE] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 146, + .mapMatrixID = map_matrix_146, .scriptsArchiveID = scripts_grand_lake_route_213_northeast_house, .initScriptsArchiveID = scripts_init_grand_lake_route_213_northeast_house, .msgArchiveID = TEXT_BANK_GRAND_LAKE_ROUTE_213_NORTHEAST_HOUSE, @@ -8374,9 +8376,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_214] = { - .areaDataArchiveID = 0x12, + .areaDataArchiveID = area_data_018, .unk_01 = 0xC, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_214, .initScriptsArchiveID = scripts_init_route_214, .msgArchiveID = TEXT_BANK_ROUTE_214, @@ -8396,9 +8398,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_214_GATE_TO_VEILSTONE_CITY] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 257, + .mapMatrixID = map_matrix_257, .scriptsArchiveID = scripts_route_214_gate_to_veilstone_city, .initScriptsArchiveID = scripts_init_route_214_gate_to_veilstone_city, .msgArchiveID = TEXT_BANK_ROUTE_214_GATE_TO_VEILSTONE_CITY, @@ -8418,9 +8420,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_215] = { - .areaDataArchiveID = 0xA, + .areaDataArchiveID = area_data_010, .unk_01 = 0x4, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_215, .initScriptsArchiveID = scripts_init_route_215, .msgArchiveID = TEXT_BANK_ROUTE_215, @@ -8440,9 +8442,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_216] = { - .areaDataArchiveID = 0xE, + .areaDataArchiveID = area_data_014, .unk_01 = 0x8, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_216, .initScriptsArchiveID = scripts_init_route_216, .msgArchiveID = TEXT_BANK_ROUTE_216, @@ -8462,9 +8464,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_216_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_route_216_house, .initScriptsArchiveID = scripts_init_route_216_house, .msgArchiveID = TEXT_BANK_ROUTE_216_HOUSE, @@ -8484,9 +8486,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_217] = { - .areaDataArchiveID = 0xE, + .areaDataArchiveID = area_data_014, .unk_01 = 0x8, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_217, .initScriptsArchiveID = scripts_init_route_217, .msgArchiveID = TEXT_BANK_ROUTE_217, @@ -8506,9 +8508,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_217_WEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 124, + .mapMatrixID = map_matrix_124, .scriptsArchiveID = scripts_route_217_west_house, .initScriptsArchiveID = scripts_init_route_217_west_house, .msgArchiveID = TEXT_BANK_ROUTE_217_WEST_HOUSE, @@ -8528,9 +8530,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_217_NORTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 124, + .mapMatrixID = map_matrix_124, .scriptsArchiveID = scripts_route_217_northeast_house, .initScriptsArchiveID = scripts_init_route_217_northeast_house, .msgArchiveID = TEXT_BANK_ROUTE_217_NORTHEAST_HOUSE, @@ -8550,9 +8552,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_218] = { - .areaDataArchiveID = 0xF, + .areaDataArchiveID = area_data_015, .unk_01 = 0x9, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_218, .initScriptsArchiveID = scripts_init_route_218, .msgArchiveID = TEXT_BANK_ROUTE_218, @@ -8572,9 +8574,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_218_GATE_TO_JUBILIFE_CITY] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 258, + .mapMatrixID = map_matrix_258, .scriptsArchiveID = scripts_route_218_gate_to_jubilife_city, .initScriptsArchiveID = scripts_init_route_218_gate_to_jubilife_city, .msgArchiveID = TEXT_BANK_ROUTE_218_GATE_TO_JUBILIFE_CITY, @@ -8594,9 +8596,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_218_GATE_TO_CANALAVE_CITY] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 258, + .mapMatrixID = map_matrix_258, .scriptsArchiveID = scripts_route_218_gate_to_canalave_city, .initScriptsArchiveID = scripts_init_route_218_gate_to_canalave_city, .msgArchiveID = TEXT_BANK_ROUTE_218_GATE_TO_CANALAVE_CITY, @@ -8616,9 +8618,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_219] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_219, .initScriptsArchiveID = scripts_init_route_219, .msgArchiveID = TEXT_BANK_ROUTE_219, @@ -8638,9 +8640,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_221] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_221, .initScriptsArchiveID = scripts_init_route_221, .msgArchiveID = TEXT_BANK_ROUTE_221, @@ -8660,9 +8662,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_PAL_PARK_LOBBY] = { - .areaDataArchiveID = 39, + .areaDataArchiveID = area_data_039, .unk_01 = 0xF, - .mapMatrixID = 201, + .mapMatrixID = map_matrix_201, .scriptsArchiveID = scripts_pal_park_lobby, .initScriptsArchiveID = scripts_init_pal_park_lobby, .msgArchiveID = TEXT_BANK_PAL_PARK_LOBBY, @@ -8682,9 +8684,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_221_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 244, + .mapMatrixID = map_matrix_244, .scriptsArchiveID = scripts_route_221_house, .initScriptsArchiveID = scripts_init_route_221_house, .msgArchiveID = TEXT_BANK_ROUTE_221_HOUSE, @@ -8704,9 +8706,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_222] = { - .areaDataArchiveID = 0x12, + .areaDataArchiveID = area_data_018, .unk_01 = 0xC, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_222, .initScriptsArchiveID = scripts_init_route_222, .msgArchiveID = TEXT_BANK_ROUTE_222, @@ -8726,9 +8728,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_222_WEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_route_222_west_house, .initScriptsArchiveID = scripts_init_route_222_west_house, .msgArchiveID = TEXT_BANK_ROUTE_222_WEST_HOUSE, @@ -8748,9 +8750,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_222_EAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_route_222_east_house, .initScriptsArchiveID = scripts_init_route_222_east_house, .msgArchiveID = TEXT_BANK_ROUTE_222_EAST_HOUSE, @@ -8770,9 +8772,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_222_GATE_TO_SUNYSHORE_CITY] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 258, + .mapMatrixID = map_matrix_258, .scriptsArchiveID = scripts_route_222_gate_to_sunyshore_city, .initScriptsArchiveID = scripts_init_route_222_gate_to_sunyshore_city, .msgArchiveID = TEXT_BANK_ROUTE_222_GATE_TO_SUNYSHORE_CITY, @@ -8792,9 +8794,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_224] = { - .areaDataArchiveID = 0xD, + .areaDataArchiveID = area_data_013, .unk_01 = 0xA, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_224, .initScriptsArchiveID = scripts_init_route_224, .msgArchiveID = TEXT_BANK_ROUTE_224, @@ -8814,9 +8816,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_225] = { - .areaDataArchiveID = 0x11, + .areaDataArchiveID = area_data_017, .unk_01 = 11, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_225, .initScriptsArchiveID = scripts_init_route_225, .msgArchiveID = TEXT_BANK_ROUTE_225, @@ -8836,9 +8838,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_UNKNOWN_401] = { - .areaDataArchiveID = 0x11, + .areaDataArchiveID = area_data_017, .unk_01 = 11, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -8858,9 +8860,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_402] = { - .areaDataArchiveID = 0x11, + .areaDataArchiveID = area_data_017, .unk_01 = 11, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -8880,9 +8882,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_227] = { - .areaDataArchiveID = 0x11, + .areaDataArchiveID = area_data_017, .unk_01 = 11, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_227, .initScriptsArchiveID = scripts_init_route_227, .msgArchiveID = TEXT_BANK_ROUTE_227, @@ -8902,9 +8904,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_UNKNOWN_404] = { - .areaDataArchiveID = 0x11, + .areaDataArchiveID = area_data_017, .unk_01 = 11, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -8924,9 +8926,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_405] = { - .areaDataArchiveID = 0x11, + .areaDataArchiveID = area_data_017, .unk_01 = 11, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -8946,9 +8948,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_228] = { - .areaDataArchiveID = 0x13, + .areaDataArchiveID = area_data_019, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_228, .initScriptsArchiveID = scripts_init_route_228, .msgArchiveID = TEXT_BANK_ROUTE_228, @@ -8968,9 +8970,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_229] = { - .areaDataArchiveID = 0x13, + .areaDataArchiveID = area_data_019, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_229, .initScriptsArchiveID = scripts_init_route_229, .msgArchiveID = TEXT_BANK_ROUTE_229, @@ -8990,9 +8992,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_UNKNOWN_408] = { - .areaDataArchiveID = 0x13, + .areaDataArchiveID = area_data_019, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -9012,9 +9014,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_409] = { - .areaDataArchiveID = 0x13, + .areaDataArchiveID = area_data_019, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -9034,9 +9036,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RECORD_MIXING_ROOM] = { - .areaDataArchiveID = 0x5, + .areaDataArchiveID = area_data_005, .unk_01 = 0xE, - .mapMatrixID = 119, + .mapMatrixID = map_matrix_119, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -9056,9 +9058,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TWINLEAF_TOWN] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_twinleaf_town, .initScriptsArchiveID = scripts_init_twinleaf_town, .msgArchiveID = TEXT_BANK_TWINLEAF_TOWN, @@ -9078,9 +9080,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_TWINLEAF_TOWN_RIVAL_HOUSE_1F] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 126, + .mapMatrixID = map_matrix_126, .scriptsArchiveID = scripts_twinleaf_town_rival_house_1f, .initScriptsArchiveID = scripts_init_twinleaf_town_rival_house_1f, .msgArchiveID = TEXT_BANK_TWINLEAF_TOWN_RIVAL_HOUSE_1F, @@ -9100,9 +9102,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TWINLEAF_TOWN_RIVAL_HOUSE_2F] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 127, + .mapMatrixID = map_matrix_127, .scriptsArchiveID = scripts_twinleaf_town_rival_house_2f, .initScriptsArchiveID = scripts_init_twinleaf_town_rival_house_2f, .msgArchiveID = TEXT_BANK_TWINLEAF_TOWN_RIVAL_HOUSE_2F, @@ -9122,9 +9124,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_1F] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 128, + .mapMatrixID = map_matrix_128, .scriptsArchiveID = scripts_twinleaf_town_player_house_1f, .initScriptsArchiveID = scripts_init_twinleaf_town_player_house_1f, .msgArchiveID = TEXT_BANK_TWINLEAF_TOWN_PLAYER_HOUSE_1F, @@ -9144,9 +9146,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_2F] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 129, + .mapMatrixID = map_matrix_129, .scriptsArchiveID = scripts_twinleaf_town_player_house_2f, .initScriptsArchiveID = scripts_init_twinleaf_town_player_house_2f, .msgArchiveID = TEXT_BANK_TWINLEAF_TOWN_PLAYER_HOUSE_2F, @@ -9166,9 +9168,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TWINLEAF_TOWN_NORTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_twinleaf_town_northeast_house, .initScriptsArchiveID = scripts_init_twinleaf_town_northeast_house, .msgArchiveID = TEXT_BANK_TWINLEAF_TOWN_NORTHEAST_HOUSE, @@ -9188,9 +9190,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TWINLEAF_TOWN_SOUTHWEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_twinleaf_town_southwest_house, .initScriptsArchiveID = scripts_init_twinleaf_town_southwest_house, .msgArchiveID = TEXT_BANK_TWINLEAF_TOWN_SOUTHWEST_HOUSE, @@ -9210,9 +9212,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SANDGEM_TOWN] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_sandgem_town, .initScriptsArchiveID = scripts_init_sandgem_town, .msgArchiveID = TEXT_BANK_SANDGEM_TOWN, @@ -9232,9 +9234,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_SANDGEM_TOWN_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_sandgem_town_mart, .initScriptsArchiveID = scripts_init_sandgem_town_mart, .msgArchiveID = TEXT_BANK_SANDGEM_TOWN_MART, @@ -9254,9 +9256,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SANDGEM_TOWN_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_sandgem_town_pokecenter_1f, .initScriptsArchiveID = scripts_init_sandgem_town_pokecenter_1f, .msgArchiveID = TEXT_BANK_SANDGEM_TOWN_POKECENTER_1F, @@ -9276,9 +9278,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SANDGEM_TOWN_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_sandgem_town_pokecenter_2f, .initScriptsArchiveID = scripts_init_sandgem_town_pokecenter_2f, .msgArchiveID = TEXT_BANK_SANDGEM_TOWN_POKECENTER_2F, @@ -9298,9 +9300,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SANDGEM_TOWN_POKEMON_RESEARCH_LAB] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 160, + .mapMatrixID = map_matrix_160, .scriptsArchiveID = scripts_sandgem_town_pokemon_research_lab, .initScriptsArchiveID = scripts_init_sandgem_town_pokemon_research_lab, .msgArchiveID = TEXT_BANK_SANDGEM_TOWN_POKEMON_RESEARCH_LAB, @@ -9320,9 +9322,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SANDGEM_TOWN_COUNTERPART_HOUSE_1F] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 130, + .mapMatrixID = map_matrix_130, .scriptsArchiveID = scripts_sandgem_town_counterpart_house_1f, .initScriptsArchiveID = scripts_init_sandgem_town_counterpart_house_1f, .msgArchiveID = TEXT_BANK_SANDGEM_TOWN_COUNTERPART_HOUSE_1F, @@ -9342,9 +9344,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SANDGEM_TOWN_COUNTERPART_HOUSE_2F] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 131, + .mapMatrixID = map_matrix_131, .scriptsArchiveID = scripts_sandgem_town_counterpart_house_2f, .initScriptsArchiveID = scripts_init_sandgem_town_counterpart_house_2f, .msgArchiveID = TEXT_BANK_SANDGEM_TOWN_COUNTERPART_HOUSE_2F, @@ -9364,9 +9366,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SANDGEM_TOWN_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_sandgem_town_house, .initScriptsArchiveID = scripts_init_sandgem_town_house, .msgArchiveID = TEXT_BANK_SANDGEM_TOWN_HOUSE, @@ -9386,9 +9388,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FLOAROMA_TOWN] = { - .areaDataArchiveID = 0x8, + .areaDataArchiveID = area_data_008, .unk_01 = 0x2, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_floaroma_town, .initScriptsArchiveID = scripts_init_floaroma_town, .msgArchiveID = TEXT_BANK_FLOAROMA_TOWN, @@ -9408,9 +9410,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_FLOAROMA_TOWN_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_floaroma_town_mart, .initScriptsArchiveID = scripts_init_floaroma_town_mart, .msgArchiveID = TEXT_BANK_FLOAROMA_TOWN_MART, @@ -9430,9 +9432,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FLOAROMA_TOWN_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_floaroma_town_pokecenter_1f, .initScriptsArchiveID = scripts_init_floaroma_town_pokecenter_1f, .msgArchiveID = TEXT_BANK_FLOAROMA_TOWN_POKECENTER_1F, @@ -9452,9 +9454,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FLOAROMA_TOWN_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_floaroma_town_pokecenter_2f, .initScriptsArchiveID = scripts_init_floaroma_town_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -9474,9 +9476,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FLOWER_SHOP] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 236, + .mapMatrixID = map_matrix_236, .scriptsArchiveID = scripts_flower_shop, .initScriptsArchiveID = scripts_init_flower_shop, .msgArchiveID = TEXT_BANK_FLOWER_SHOP, @@ -9496,9 +9498,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FLOAROMA_TOWN_SOUTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_floaroma_town_southeast_house, .initScriptsArchiveID = scripts_init_floaroma_town_southeast_house, .msgArchiveID = TEXT_BANK_FLOAROMA_TOWN_SOUTHEAST_HOUSE, @@ -9518,9 +9520,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FLOAROMA_TOWN_MIDDLE_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_floaroma_town_middle_house, .initScriptsArchiveID = scripts_init_floaroma_town_middle_house, .msgArchiveID = TEXT_BANK_FLOAROMA_TOWN_MIDDLE_HOUSE, @@ -9540,9 +9542,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_TOWN] = { - .areaDataArchiveID = 0xA, + .areaDataArchiveID = area_data_010, .unk_01 = 0x4, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_solaceon_town, .initScriptsArchiveID = scripts_init_solaceon_town, .msgArchiveID = TEXT_BANK_SOLACEON_TOWN, @@ -9562,9 +9564,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_SOLACEON_TOWN_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_solaceon_town_mart, .initScriptsArchiveID = scripts_init_solaceon_town_mart, .msgArchiveID = TEXT_BANK_SOLACEON_TOWN_MART, @@ -9584,9 +9586,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_TOWN_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_solaceon_town_pokecenter_1f, .initScriptsArchiveID = scripts_init_solaceon_town_pokecenter_1f, .msgArchiveID = TEXT_BANK_SOLACEON_TOWN_POKECENTER_1F, @@ -9606,9 +9608,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_TOWN_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_solaceon_town_pokecenter_2f, .initScriptsArchiveID = scripts_init_solaceon_town_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -9628,9 +9630,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_DAY_CARE] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 137, + .mapMatrixID = map_matrix_137, .scriptsArchiveID = scripts_pokemon_day_care, .initScriptsArchiveID = scripts_init_pokemon_day_care, .msgArchiveID = TEXT_BANK_POKEMON_DAY_CARE, @@ -9650,9 +9652,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_TOWN_NORTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_solaceon_town_northeast_house, .initScriptsArchiveID = scripts_init_solaceon_town_northeast_house, .msgArchiveID = TEXT_BANK_SOLACEON_TOWN_NORTHEAST_HOUSE, @@ -9672,9 +9674,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_TOWN_POKEMON_NEWS_PRESS] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 244, + .mapMatrixID = map_matrix_244, .scriptsArchiveID = scripts_solaceon_town_pokemon_news_press, .initScriptsArchiveID = scripts_init_solaceon_town_pokemon_news_press, .msgArchiveID = TEXT_BANK_SOLACEON_TOWN_POKEMON_NEWS_PRESS, @@ -9694,9 +9696,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_TOWN_NORTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_solaceon_town_north_house, .initScriptsArchiveID = scripts_init_solaceon_town_north_house, .msgArchiveID = TEXT_BANK_SOLACEON_TOWN_NORTH_HOUSE, @@ -9716,9 +9718,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_TOWN_EAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_solaceon_town_east_house, .initScriptsArchiveID = scripts_init_solaceon_town_east_house, .msgArchiveID = TEXT_BANK_SOLACEON_TOWN_EAST_HOUSE, @@ -9738,9 +9740,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CELESTIC_TOWN] = { - .areaDataArchiveID = 0xA, + .areaDataArchiveID = area_data_010, .unk_01 = 0x4, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_celestic_town, .initScriptsArchiveID = scripts_init_celestic_town, .msgArchiveID = TEXT_BANK_CELESTIC_TOWN, @@ -9760,9 +9762,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_CELESTIC_TOWN_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_celestic_town_pokecenter_1f, .initScriptsArchiveID = scripts_init_celestic_town_pokecenter_1f, .msgArchiveID = TEXT_BANK_CELESTIC_TOWN_POKECENTER_1F, @@ -9782,9 +9784,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CELESTIC_TOWN_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_celestic_town_pokecenter_2f, .initScriptsArchiveID = scripts_init_celestic_town_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -9804,9 +9806,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CELESTIC_TOWN_NORTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 168, + .mapMatrixID = map_matrix_168, .scriptsArchiveID = scripts_celestic_town_north_house, .initScriptsArchiveID = scripts_init_celestic_town_north_house, .msgArchiveID = TEXT_BANK_CELESTIC_TOWN_NORTH_HOUSE, @@ -9826,9 +9828,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CELESTIC_TOWN_NORTHWEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 170, + .mapMatrixID = map_matrix_170, .scriptsArchiveID = scripts_celestic_town_northwest_house, .initScriptsArchiveID = scripts_init_celestic_town_northwest_house, .msgArchiveID = TEXT_BANK_CELESTIC_TOWN_NORTHWEST_HOUSE, @@ -9848,9 +9850,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CELESTIC_TOWN_NORTHEAST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 124, + .mapMatrixID = map_matrix_124, .scriptsArchiveID = scripts_celestic_town_northeast_house, .initScriptsArchiveID = scripts_init_celestic_town_northeast_house, .msgArchiveID = TEXT_BANK_CELESTIC_TOWN_NORTHEAST_HOUSE, @@ -9870,9 +9872,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CELESTIC_TOWN_SOUTHWEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 124, + .mapMatrixID = map_matrix_124, .scriptsArchiveID = scripts_celestic_town_southwest_house, .initScriptsArchiveID = scripts_init_celestic_town_southwest_house, .msgArchiveID = TEXT_BANK_CELESTIC_TOWN_SOUTHWEST_HOUSE, @@ -9892,9 +9894,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CELESTIC_TOWN_CAVE] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 169, + .mapMatrixID = map_matrix_169, .scriptsArchiveID = scripts_celestic_town_cave, .initScriptsArchiveID = scripts_init_celestic_town_cave, .msgArchiveID = TEXT_BANK_CELESTIC_TOWN_CAVE, @@ -9914,9 +9916,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SURVIVAL_AREA] = { - .areaDataArchiveID = 0x11, + .areaDataArchiveID = area_data_017, .unk_01 = 11, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_survival_area, .initScriptsArchiveID = scripts_init_survival_area, .msgArchiveID = TEXT_BANK_SURVIVAL_AREA, @@ -9936,9 +9938,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_SURVIVAL_AREA_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_survival_area_mart, .initScriptsArchiveID = scripts_init_survival_area_mart, .msgArchiveID = TEXT_BANK_SURVIVAL_AREA_MART, @@ -9958,9 +9960,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SURVIVAL_AREA_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_survival_area_pokecenter_1f, .initScriptsArchiveID = scripts_init_survival_area_pokecenter_1f, .msgArchiveID = TEXT_BANK_SURVIVAL_AREA_POKECENTER_1F, @@ -9980,9 +9982,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SURVIVAL_AREA_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_survival_area_pokecenter_2f, .initScriptsArchiveID = scripts_init_survival_area_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10002,9 +10004,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLEGROUND] = { - .areaDataArchiveID = 52, + .areaDataArchiveID = area_data_052, .unk_01 = 0xF, - .mapMatrixID = 265, + .mapMatrixID = map_matrix_265, .scriptsArchiveID = scripts_battleground, .initScriptsArchiveID = scripts_init_battleground, .msgArchiveID = TEXT_BANK_BATTLEGROUND, @@ -10024,9 +10026,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SURVIVAL_AREA_SOUTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 125, + .mapMatrixID = map_matrix_125, .scriptsArchiveID = scripts_survival_area_south_house, .initScriptsArchiveID = scripts_init_survival_area_south_house, .msgArchiveID = TEXT_BANK_SURVIVAL_AREA_SOUTH_HOUSE, @@ -10046,9 +10048,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SURVIVAL_AREA_NORTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 244, + .mapMatrixID = map_matrix_244, .scriptsArchiveID = scripts_survival_area_north_house, .initScriptsArchiveID = scripts_init_survival_area_north_house, .msgArchiveID = TEXT_BANK_SURVIVAL_AREA_NORTH_HOUSE, @@ -10068,9 +10070,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RESORT_AREA] = { - .areaDataArchiveID = 0x13, + .areaDataArchiveID = area_data_019, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_resort_area, .initScriptsArchiveID = scripts_init_resort_area, .msgArchiveID = TEXT_BANK_RESORT_AREA, @@ -10090,9 +10092,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_RESORT_AREA_MART] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 122, + .mapMatrixID = map_matrix_122, .scriptsArchiveID = scripts_resort_area_mart, .initScriptsArchiveID = scripts_init_resort_area_mart, .msgArchiveID = TEXT_BANK_RESORT_AREA_MART, @@ -10112,9 +10114,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RESORT_AREA_POKECENTER_1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x74, + .mapMatrixID = map_matrix_116, .scriptsArchiveID = scripts_resort_area_pokecenter_1f, .initScriptsArchiveID = scripts_init_resort_area_pokecenter_1f, .msgArchiveID = TEXT_BANK_RESORT_AREA_POKECENTER_1F, @@ -10134,9 +10136,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RESORT_AREA_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_resort_area_pokecenter_2f, .initScriptsArchiveID = scripts_init_resort_area_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10156,9 +10158,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_1F] = { - .areaDataArchiveID = 38, + .areaDataArchiveID = area_data_038, .unk_01 = 0xF, - .mapMatrixID = 199, + .mapMatrixID = map_matrix_199, .scriptsArchiveID = scripts_resort_area_ribbon_syndicate_1f, .initScriptsArchiveID = scripts_init_resort_area_ribbon_syndicate_1f, .msgArchiveID = TEXT_BANK_RESORT_AREA_RIBBON_SYNDICATE_1F, @@ -10178,9 +10180,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_2F] = { - .areaDataArchiveID = 38, + .areaDataArchiveID = area_data_038, .unk_01 = 0xF, - .mapMatrixID = 200, + .mapMatrixID = map_matrix_200, .scriptsArchiveID = scripts_resort_area_ribbon_syndicate_2f, .initScriptsArchiveID = scripts_init_resort_area_ribbon_syndicate_2f, .msgArchiveID = TEXT_BANK_RESORT_AREA_RIBBON_SYNDICATE_2F, @@ -10200,9 +10202,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_ELEVATOR] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 207, + .mapMatrixID = map_matrix_207, .scriptsArchiveID = scripts_resort_area_ribbon_syndicate_elevator, .initScriptsArchiveID = scripts_init_resort_area_ribbon_syndicate_elevator, .msgArchiveID = TEXT_BANK_RESORT_AREA_RIBBON_SYNDICATE_ELEVATOR, @@ -10222,9 +10224,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VILLA] = { - .areaDataArchiveID = 51, + .areaDataArchiveID = area_data_051, .unk_01 = 0xF, - .mapMatrixID = 264, + .mapMatrixID = map_matrix_264, .scriptsArchiveID = scripts_villa, .initScriptsArchiveID = scripts_init_villa, .msgArchiveID = TEXT_BANK_VILLA, @@ -10244,9 +10246,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RESORT_AREA_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_resort_area_house, .initScriptsArchiveID = scripts_init_resort_area_house, .msgArchiveID = TEXT_BANK_RESORT_AREA_HOUSE, @@ -10266,9 +10268,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNION_ROOM] = { - .areaDataArchiveID = 0x5, + .areaDataArchiveID = area_data_005, .unk_01 = 0xE, - .mapMatrixID = 120, + .mapMatrixID = map_matrix_120, .scriptsArchiveID = scripts_union_room, .initScriptsArchiveID = scripts_init_union_room, .msgArchiveID = TEXT_BANK_UNION_ROOM, @@ -10288,9 +10290,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_220] = { - .areaDataArchiveID = 0x6, + .areaDataArchiveID = area_data_006, .unk_01 = 0x0, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10310,9 +10312,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_223] = { - .areaDataArchiveID = 0xD, + .areaDataArchiveID = area_data_013, .unk_01 = 0x7, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10332,9 +10334,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_ROUTE_226] = { - .areaDataArchiveID = 0x11, + .areaDataArchiveID = area_data_017, .unk_01 = 11, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_226, .initScriptsArchiveID = scripts_init_route_226, .msgArchiveID = TEXT_BANK_ROUTE_226, @@ -10354,9 +10356,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_UNKNOWN_470] = { - .areaDataArchiveID = 0x13, + .areaDataArchiveID = area_data_019, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10376,9 +10378,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_230] = { - .areaDataArchiveID = 0x13, + .areaDataArchiveID = area_data_019, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_route_230, .initScriptsArchiveID = scripts_init_route_230, .msgArchiveID = TEXT_BANK_ROUTE_230, @@ -10398,9 +10400,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_SEABREAK_PATH] = { - .areaDataArchiveID = 0xD, + .areaDataArchiveID = area_data_013, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10420,9 +10422,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_UNKNOWN_473] = { - .areaDataArchiveID = 0x13, + .areaDataArchiveID = area_data_019, .unk_01 = 0xD, - .mapMatrixID = 0x0, + .mapMatrixID = map_matrix_000, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10442,9 +10444,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_jubilife_city_pokecenter_b1f, .initScriptsArchiveID = scripts_init_jubilife_city_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10464,9 +10466,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_canalave_city_pokecenter_b1f, .initScriptsArchiveID = scripts_init_canalave_city_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10486,9 +10488,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_OREBURGH_CITY_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_oreburgh_city_pokecenter_b1f, .initScriptsArchiveID = scripts_init_oreburgh_city_pokecenter_b1f, .msgArchiveID = TEXT_BANK_OREBURGH_CITY_POKECENTER_B1F, @@ -10508,9 +10510,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ETERNA_CITY_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_eterna_city_pokecenter_b1f, .initScriptsArchiveID = scripts_init_eterna_city_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10530,9 +10532,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HEARTHOME_CITY_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_hearthome_city_pokecenter_b1f, .initScriptsArchiveID = scripts_init_hearthome_city_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10552,9 +10554,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_PASTORIA_CITY_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_pastoria_city_pokecenter_b1f, .initScriptsArchiveID = scripts_init_pastoria_city_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10574,9 +10576,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_CITY_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_veilstone_city_pokecenter_b1f, .initScriptsArchiveID = scripts_init_veilstone_city_pokecenter_b1f, .msgArchiveID = TEXT_BANK_VEILSTONE_CITY_POKECENTER_B1F, @@ -10596,9 +10598,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SUNYSHORE_CITY_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_sunyshore_city_pokecenter_b1f, .initScriptsArchiveID = scripts_init_sunyshore_city_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10618,9 +10620,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SNOWPOINT_CITY_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_snowpoint_city_pokecenter_b1f, .initScriptsArchiveID = scripts_init_snowpoint_city_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10640,9 +10642,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_pokemon_league_south_pokecenter_b1f, .initScriptsArchiveID = scripts_init_pokemon_league_south_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10662,9 +10664,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FIGHT_AREA_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_fight_area_pokecenter_b1f, .initScriptsArchiveID = scripts_init_fight_area_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10684,9 +10686,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SANDGEM_TOWN_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_sandgem_town_pokecenter_b1f, .initScriptsArchiveID = scripts_init_sandgem_town_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10706,9 +10708,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_FLOAROMA_TOWN_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_floaroma_town_pokecenter_b1f, .initScriptsArchiveID = scripts_init_floaroma_town_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10728,9 +10730,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_TOWN_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_solaceon_town_pokecenter_b1f, .initScriptsArchiveID = scripts_init_solaceon_town_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10750,9 +10752,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CELESTIC_TOWN_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_celestic_town_pokecenter_b1f, .initScriptsArchiveID = scripts_init_celestic_town_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10772,9 +10774,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SURVIVAL_AREA_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_survival_area_pokecenter_b1f, .initScriptsArchiveID = scripts_init_survival_area_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10794,9 +10796,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RESORT_AREA_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_resort_area_pokecenter_b1f, .initScriptsArchiveID = scripts_init_resort_area_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10816,9 +10818,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CANALAVE_CITY_WEST_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 124, + .mapMatrixID = map_matrix_124, .scriptsArchiveID = scripts_canalave_city_west_house, .initScriptsArchiveID = scripts_init_canalave_city_west_house, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10838,9 +10840,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CAFE] = { - .areaDataArchiveID = 35, + .areaDataArchiveID = area_data_035, .unk_01 = 0xF, - .mapMatrixID = 171, + .mapMatrixID = map_matrix_171, .scriptsArchiveID = scripts_cafe, .initScriptsArchiveID = scripts_init_cafe, .msgArchiveID = TEXT_BANK_CAFE, @@ -10860,9 +10862,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_TOWER_BATTLE_SALON] = { - .areaDataArchiveID = 33, + .areaDataArchiveID = area_data_033, .unk_01 = 0xF, - .mapMatrixID = 196, + .mapMatrixID = map_matrix_196, .scriptsArchiveID = scripts_battle_tower_battle_salon, .initScriptsArchiveID = scripts_init_battle_tower_battle_salon, .msgArchiveID = TEXT_BANK_BATTLE_TOWER_BATTLE_SALON, @@ -10882,9 +10884,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GALACTIC_HQ_CONTROL_ROOM] = { - .areaDataArchiveID = 68, + .areaDataArchiveID = area_data_068, .unk_01 = 0xF, - .mapMatrixID = 0xEE, + .mapMatrixID = map_matrix_238, .scriptsArchiveID = scripts_galactic_hq_control_room, .initScriptsArchiveID = scripts_init_galactic_hq_control_room, .msgArchiveID = TEXT_BANK_GALACTIC_HQ_CONTROL_ROOM, @@ -10904,9 +10906,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_2F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x75, + .mapMatrixID = map_matrix_117, .scriptsArchiveID = scripts_pokemon_league_north_pokecenter_2f, .initScriptsArchiveID = scripts_init_pokemon_league_north_pokecenter_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10926,9 +10928,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_B1F] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 235, + .mapMatrixID = map_matrix_235, .scriptsArchiveID = scripts_pokemon_league_north_pokecenter_b1f, .initScriptsArchiveID = scripts_init_pokemon_league_north_pokecenter_b1f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -10948,9 +10950,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GALACTIC_HQ_LABORATORY] = { - .areaDataArchiveID = 68, + .areaDataArchiveID = area_data_068, .unk_01 = 0xF, - .mapMatrixID = 0xEF, + .mapMatrixID = map_matrix_239, .scriptsArchiveID = scripts_galactic_hq_laboratory, .initScriptsArchiveID = scripts_init_galactic_hq_laboratory, .msgArchiveID = TEXT_BANK_GALACTIC_HQ_LABORATORY, @@ -10970,9 +10972,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_225_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 0x7B, + .mapMatrixID = map_matrix_123, .scriptsArchiveID = scripts_route_225_house, .initScriptsArchiveID = scripts_init_route_225_house, .msgArchiveID = TEXT_BANK_ROUTE_225_HOUSE, @@ -10992,9 +10994,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_226_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 244, + .mapMatrixID = map_matrix_244, .scriptsArchiveID = scripts_route_226_house, .initScriptsArchiveID = scripts_init_route_226_house, .msgArchiveID = TEXT_BANK_ROUTE_226_HOUSE, @@ -11014,9 +11016,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_227_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_route_227_house, .initScriptsArchiveID = scripts_init_route_227_house, .msgArchiveID = TEXT_BANK_ROUTE_227_HOUSE, @@ -11036,9 +11038,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_228_GATE_TO_ROUTE_226] = { - .areaDataArchiveID = 50, + .areaDataArchiveID = area_data_050, .unk_01 = 0xF, - .mapMatrixID = 258, + .mapMatrixID = map_matrix_258, .scriptsArchiveID = scripts_route_228_gate_to_route_226, .initScriptsArchiveID = scripts_init_route_228_gate_to_route_226, .msgArchiveID = TEXT_BANK_ROUTE_228_GATE_TO_ROUTE_226, @@ -11058,9 +11060,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_228_NORTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 244, + .mapMatrixID = map_matrix_244, .scriptsArchiveID = scripts_route_228_north_house, .initScriptsArchiveID = scripts_init_route_228_north_house, .msgArchiveID = TEXT_BANK_ROUTE_228_NORTH_HOUSE, @@ -11080,9 +11082,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_228_SOUTH_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 125, + .mapMatrixID = map_matrix_125, .scriptsArchiveID = scripts_route_228_south_house, .initScriptsArchiveID = scripts_init_route_228_south_house, .msgArchiveID = TEXT_BANK_ROUTE_228_SOUTH_HOUSE, @@ -11102,9 +11104,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GREAT_MARSH_1] = { - .areaDataArchiveID = 63, + .areaDataArchiveID = area_data_063, .unk_01 = 0xF, - .mapMatrixID = 240, + .mapMatrixID = map_matrix_240, .scriptsArchiveID = scripts_great_marsh_1, .initScriptsArchiveID = scripts_init_great_marsh_1, .msgArchiveID = TEXT_BANK_GREAT_MARSH_1, @@ -11124,9 +11126,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GREAT_MARSH_2] = { - .areaDataArchiveID = 63, + .areaDataArchiveID = area_data_063, .unk_01 = 0xF, - .mapMatrixID = 0xF0, + .mapMatrixID = map_matrix_240, .scriptsArchiveID = scripts_great_marsh_2, .initScriptsArchiveID = scripts_init_great_marsh_2, .msgArchiveID = TEXT_BANK_GREAT_MARSH_2, @@ -11146,9 +11148,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GREAT_MARSH_3] = { - .areaDataArchiveID = 63, + .areaDataArchiveID = area_data_063, .unk_01 = 0xF, - .mapMatrixID = 0xF0, + .mapMatrixID = map_matrix_240, .scriptsArchiveID = scripts_great_marsh_3, .initScriptsArchiveID = scripts_init_great_marsh_3, .msgArchiveID = TEXT_BANK_GREAT_MARSH_3, @@ -11168,9 +11170,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GREAT_MARSH_4] = { - .areaDataArchiveID = 63, + .areaDataArchiveID = area_data_063, .unk_01 = 0xF, - .mapMatrixID = 0xF0, + .mapMatrixID = map_matrix_240, .scriptsArchiveID = scripts_great_marsh_4, .initScriptsArchiveID = scripts_init_great_marsh_4, .msgArchiveID = TEXT_BANK_GREAT_MARSH_4, @@ -11190,9 +11192,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GREAT_MARSH_5] = { - .areaDataArchiveID = 63, + .areaDataArchiveID = area_data_063, .unk_01 = 0xF, - .mapMatrixID = 0xF0, + .mapMatrixID = map_matrix_240, .scriptsArchiveID = scripts_great_marsh_5, .initScriptsArchiveID = scripts_init_great_marsh_5, .msgArchiveID = TEXT_BANK_GREAT_MARSH_5, @@ -11212,9 +11214,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GREAT_MARSH_6] = { - .areaDataArchiveID = 63, + .areaDataArchiveID = area_data_063, .unk_01 = 0xF, - .mapMatrixID = 0xF0, + .mapMatrixID = map_matrix_240, .scriptsArchiveID = scripts_great_marsh_6, .initScriptsArchiveID = scripts_init_great_marsh_6, .msgArchiveID = TEXT_BANK_GREAT_MARSH_6, @@ -11234,9 +11236,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_HALL_OF_ORIGIN] = { - .areaDataArchiveID = 0x3C, + .areaDataArchiveID = area_data_060, .unk_01 = 0xF, - .mapMatrixID = 241, + .mapMatrixID = map_matrix_241, .scriptsArchiveID = scripts_hall_of_origin, .initScriptsArchiveID = scripts_init_hall_of_origin, .msgArchiveID = TEXT_BANK_HALL_OF_ORIGIN, @@ -11256,9 +11258,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_511] = { - .areaDataArchiveID = 0x3C, + .areaDataArchiveID = area_data_060, .unk_01 = 0xF, - .mapMatrixID = 242, + .mapMatrixID = map_matrix_242, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11278,9 +11280,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_RUIN_MANIAC_CAVE_LONG] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 77, + .mapMatrixID = map_matrix_077, .scriptsArchiveID = scripts_ruin_maniac_cave_long, .initScriptsArchiveID = scripts_init_ruin_maniac_cave_long, .msgArchiveID = TEXT_BANK_RUIN_MANIAC_CAVE_LONG, @@ -11300,9 +11302,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MANIAC_TUNNEL] = { - .areaDataArchiveID = 53, + .areaDataArchiveID = area_data_053, .unk_01 = 0xF, - .mapMatrixID = 78, + .mapMatrixID = map_matrix_078, .scriptsArchiveID = scripts_maniac_tunnel, .initScriptsArchiveID = scripts_init_maniac_tunnel, .msgArchiveID = TEXT_BANK_MANIAC_TUNNEL, @@ -11322,9 +11324,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_IRON_ISLAND_HOUSE] = { - .areaDataArchiveID = 0x14, + .areaDataArchiveID = area_data_020, .unk_01 = 0xF, - .mapMatrixID = 243, + .mapMatrixID = map_matrix_243, .scriptsArchiveID = scripts_iron_island_house, .initScriptsArchiveID = scripts_init_iron_island_house, .msgArchiveID = TEXT_BANK_IRON_ISLAND_HOUSE, @@ -11344,9 +11346,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_5_SOUTHEAST_DEADEND] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 0x1F, + .mapMatrixID = map_matrix_031, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11366,9 +11368,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VISTA_LIGHTHOUSE_ELEVATOR] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 207, + .mapMatrixID = map_matrix_207, .scriptsArchiveID = scripts_vista_lighthouse_elevator, .initScriptsArchiveID = scripts_init_vista_lighthouse_elevator, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11388,9 +11390,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_JUBILIFE_CITY_SOUTHWEST_HOUSE_2F] = { - .areaDataArchiveID = 0x1F, + .areaDataArchiveID = area_data_031, .unk_01 = 0xF, - .mapMatrixID = 208, + .mapMatrixID = map_matrix_208, .scriptsArchiveID = scripts_jubilife_city_southwest_house_2f, .initScriptsArchiveID = scripts_init_jubilife_city_southwest_house_2f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY_SOUTHWEST_HOUSE_2F, @@ -11410,9 +11412,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_4] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_4, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_1_room_4, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11432,9 +11434,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_5] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_5, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_1_room_5, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11454,9 +11456,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_6] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_6, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_1_room_6, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11476,9 +11478,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_1] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_1, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_2_room_1, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11498,9 +11500,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_2] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_2, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_2_room_2, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11520,9 +11522,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_3] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_3, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_2_room_3, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11542,9 +11544,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_4] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_4, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_2_room_4, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11564,9 +11566,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_5] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_5, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_2_room_5, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11586,9 +11588,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_6] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_6, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_2_room_6, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11608,9 +11610,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_1] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_1, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_3_room_1, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11630,9 +11632,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_2] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_2, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_3_room_2, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11652,9 +11654,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_3] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_3, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_3_room_3, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11674,9 +11676,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_4] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_4, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_3_room_4, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11696,9 +11698,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_5] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_5, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_3_room_5, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11718,9 +11720,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_6] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_6, .initScriptsArchiveID = scripts_init_turnback_cave_pillar_3_room_6, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11740,9 +11742,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_533] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11762,9 +11764,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_534] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11784,9 +11786,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_535] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11806,9 +11808,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_536] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11828,9 +11830,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_537] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11850,9 +11852,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_538] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11872,9 +11874,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_539] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11894,9 +11896,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_540] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11916,9 +11918,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_541] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11938,9 +11940,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_542] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11960,9 +11962,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_543] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -11982,9 +11984,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_544] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12004,9 +12006,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_545] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12026,9 +12028,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_546] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12048,9 +12050,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_547] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12070,9 +12072,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_548] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12092,9 +12094,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_549] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12114,9 +12116,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_550] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12136,9 +12138,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_551] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12158,9 +12160,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_552] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 64, + .mapMatrixID = map_matrix_064, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12180,9 +12182,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_553] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12202,9 +12204,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_554] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 65, + .mapMatrixID = map_matrix_065, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12224,9 +12226,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_555] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12246,9 +12248,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_556] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12268,9 +12270,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_557] = { - .areaDataArchiveID = 56, + .areaDataArchiveID = area_data_056, .unk_01 = 0xF, - .mapMatrixID = 66, + .mapMatrixID = map_matrix_066, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12290,9 +12292,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_CONTEST_HALL_STAGE_NO_CONTEST] = { - .areaDataArchiveID = 32, + .areaDataArchiveID = area_data_032, .unk_01 = 0xF, - .mapMatrixID = 166, + .mapMatrixID = map_matrix_166, .scriptsArchiveID = scripts_contest_hall_stage_no_contest, .initScriptsArchiveID = scripts_init_contest_hall_stage_no_contest, .msgArchiveID = TEXT_BANK_CONTEST_HALL_STAGE_NO_CONTEST, @@ -12312,9 +12314,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_FRONTIER] = { - .areaDataArchiveID = 73, + .areaDataArchiveID = area_data_073, .unk_01 = 0xF, - .mapMatrixID = 256, + .mapMatrixID = map_matrix_256, .scriptsArchiveID = scripts_battle_frontier, .initScriptsArchiveID = scripts_init_battle_frontier, .msgArchiveID = TEXT_BANK_BATTLE_FRONTIER, @@ -12334,9 +12336,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = TRUE, }, [MAP_HEADER_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA] = { - .areaDataArchiveID = 44, + .areaDataArchiveID = area_data_044, .unk_01 = 0xF, - .mapMatrixID = 250, + .mapMatrixID = map_matrix_250, .scriptsArchiveID = scripts_battle_frontier_gate_to_fight_area, .initScriptsArchiveID = scripts_init_battle_frontier_gate_to_fight_area, .msgArchiveID = TEXT_BANK_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA, @@ -12356,9 +12358,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_561] = { - .areaDataArchiveID = 45, + .areaDataArchiveID = area_data_045, .unk_01 = 0xF, - .mapMatrixID = 251, + .mapMatrixID = map_matrix_251, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12378,9 +12380,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_FACTORY] = { - .areaDataArchiveID = 46, + .areaDataArchiveID = area_data_046, .unk_01 = 0xF, - .mapMatrixID = 252, + .mapMatrixID = map_matrix_252, .scriptsArchiveID = scripts_battle_factory, .initScriptsArchiveID = scripts_init_battle_factory, .msgArchiveID = TEXT_BANK_BATTLE_FACTORY, @@ -12400,9 +12402,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_HALL] = { - .areaDataArchiveID = 47, + .areaDataArchiveID = area_data_047, .unk_01 = 0xF, - .mapMatrixID = 253, + .mapMatrixID = map_matrix_253, .scriptsArchiveID = scripts_battle_hall, .initScriptsArchiveID = scripts_init_battle_hall, .msgArchiveID = TEXT_BANK_BATTLE_HALL, @@ -12422,9 +12424,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_CASTLE] = { - .areaDataArchiveID = 48, + .areaDataArchiveID = area_data_048, .unk_01 = 0xF, - .mapMatrixID = 254, + .mapMatrixID = map_matrix_254, .scriptsArchiveID = scripts_battle_castle, .initScriptsArchiveID = scripts_init_battle_castle, .msgArchiveID = TEXT_BANK_BATTLE_CASTLE, @@ -12444,9 +12446,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_BATTLE_ARCADE] = { - .areaDataArchiveID = 49, + .areaDataArchiveID = area_data_049, .unk_01 = 0xF, - .mapMatrixID = 255, + .mapMatrixID = map_matrix_255, .scriptsArchiveID = scripts_battle_arcade, .initScriptsArchiveID = scripts_init_battle_arcade, .msgArchiveID = TEXT_BANK_BATTLE_ARCADE, @@ -12466,9 +12468,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_VEILSTONE_STORE_B1F] = { - .areaDataArchiveID = 0x16, + .areaDataArchiveID = area_data_022, .unk_01 = 0xF, - .mapMatrixID = 246, + .mapMatrixID = map_matrix_246, .scriptsArchiveID = scripts_veilstone_store_b1f, .initScriptsArchiveID = scripts_init_veilstone_store_b1f, .msgArchiveID = TEXT_BANK_VEILSTONE_STORE_B1F, @@ -12488,9 +12490,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GLOBAL_TERMINAL_2F] = { - .areaDataArchiveID = 40, + .areaDataArchiveID = area_data_040, .unk_01 = 0xF, - .mapMatrixID = 262, + .mapMatrixID = map_matrix_262, .scriptsArchiveID = scripts_global_terminal_2f, .initScriptsArchiveID = scripts_init_global_terminal_2f, .msgArchiveID = TEXT_BANK_GLOBAL_TERMINAL_2F, @@ -12510,9 +12512,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GLOBAL_TERMINAL_3F] = { - .areaDataArchiveID = 40, + .areaDataArchiveID = area_data_040, .unk_01 = 0xF, - .mapMatrixID = 263, + .mapMatrixID = map_matrix_263, .scriptsArchiveID = scripts_global_terminal_3f, .initScriptsArchiveID = scripts_init_global_terminal_3f, .msgArchiveID = TEXT_BANK_GLOBAL_TERMINAL_3F, @@ -12532,9 +12534,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_GALACTIC_HQ_HALL] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 261, + .mapMatrixID = map_matrix_261, .scriptsArchiveID = scripts_galactic_hq_hall, .initScriptsArchiveID = scripts_init_galactic_hq_hall, .msgArchiveID = TEXT_BANK_GALACTIC_HQ_HALL, @@ -12554,9 +12556,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_570] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 268, + .mapMatrixID = map_matrix_268, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12576,9 +12578,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROTOMS_ROOM] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 267, + .mapMatrixID = map_matrix_267, .scriptsArchiveID = scripts_rotoms_room, .initScriptsArchiveID = scripts_init_rotoms_room, .msgArchiveID = TEXT_BANK_ROTOMS_ROOM, @@ -12598,9 +12600,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_572] = { - .areaDataArchiveID = 58, + .areaDataArchiveID = area_data_058, .unk_01 = 0xF, - .mapMatrixID = 266, + .mapMatrixID = map_matrix_266, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12620,9 +12622,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_1F] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 269, + .mapMatrixID = map_matrix_269, .scriptsArchiveID = scripts_distortion_world_1f, .initScriptsArchiveID = scripts_init_distortion_world_1f, .msgArchiveID = TEXT_BANK_DISTORTION_WORLD_1F, @@ -12642,9 +12644,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_B1F] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 270, + .mapMatrixID = map_matrix_270, .scriptsArchiveID = scripts_distortion_world_b1f, .initScriptsArchiveID = scripts_init_distortion_world_b1f, .msgArchiveID = TEXT_BANK_DISTORTION_WORLD_B1F, @@ -12664,9 +12666,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_B2F] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 271, + .mapMatrixID = map_matrix_271, .scriptsArchiveID = scripts_distortion_world_b2f, .initScriptsArchiveID = scripts_init_distortion_world_b2f, .msgArchiveID = TEXT_BANK_DISTORTION_WORLD_B2F, @@ -12686,9 +12688,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_B3F] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 272, + .mapMatrixID = map_matrix_272, .scriptsArchiveID = scripts_distortion_world_b3f, .initScriptsArchiveID = scripts_init_distortion_world_b3f, .msgArchiveID = TEXT_BANK_DISTORTION_WORLD_B3F, @@ -12708,9 +12710,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_B4F] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 273, + .mapMatrixID = map_matrix_273, .scriptsArchiveID = scripts_distortion_world_b4f, .initScriptsArchiveID = scripts_init_distortion_world_b4f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12730,9 +12732,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_UNKNOWN_578] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 274, + .mapMatrixID = map_matrix_274, .scriptsArchiveID = scripts_map_header_unknown_578, .initScriptsArchiveID = scripts_init_unknown_578, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12752,9 +12754,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_B5F] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 275, + .mapMatrixID = map_matrix_275, .scriptsArchiveID = scripts_distortion_world_b5f, .initScriptsArchiveID = scripts_init_distortion_world_b5f, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12774,9 +12776,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_B6F] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 0x114, + .mapMatrixID = map_matrix_276, .scriptsArchiveID = scripts_distortion_world_b6f, .initScriptsArchiveID = scripts_init_distortion_world_b6f, .msgArchiveID = TEXT_BANK_DISTORTION_WORLD_B6F, @@ -12796,9 +12798,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_B7F] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 0x115, + .mapMatrixID = map_matrix_277, .scriptsArchiveID = scripts_distortion_world_b7f, .initScriptsArchiveID = scripts_init_distortion_world_b7f, .msgArchiveID = TEXT_BANK_DISTORTION_WORLD_B7F, @@ -12818,9 +12820,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_GIRATINA_ROOM] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 0x116, + .mapMatrixID = map_matrix_278, .scriptsArchiveID = scripts_distortion_world_giratina_room, .initScriptsArchiveID = scripts_init_distortion_world_giratina_room, .msgArchiveID = TEXT_BANK_DISTORTION_WORLD_GIRATINA_ROOM, @@ -12840,9 +12842,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_DISTORTION_WORLD_TURNBACK_CAVE_ROOM] = { - .areaDataArchiveID = 0x4A, + .areaDataArchiveID = area_data_074, .unk_01 = 0xF, - .mapMatrixID = 0x117, + .mapMatrixID = map_matrix_279, .scriptsArchiveID = scripts_distortion_world_turnback_cave_room, .initScriptsArchiveID = scripts_init_distortion_world_turnback_cave_room, .msgArchiveID = TEXT_BANK_DISTORTION_WORLD_TURNBACK_CAVE_ROOM, @@ -12862,9 +12864,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SPEAR_PILLAR_DIALGA] = { - .areaDataArchiveID = 0x3C, + .areaDataArchiveID = area_data_060, .unk_01 = 0xF, - .mapMatrixID = 0x118, + .mapMatrixID = map_matrix_280, .scriptsArchiveID = scripts_spear_pillar_dialga, .initScriptsArchiveID = scripts_init_spear_pillar_dialga, .msgArchiveID = TEXT_BANK_SPEAR_PILLAR_DIALGA, @@ -12884,9 +12886,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_SPEAR_PILLAR_PALKIA] = { - .areaDataArchiveID = 0x3C, + .areaDataArchiveID = area_data_060, .unk_01 = 0xF, - .mapMatrixID = 0x119, + .mapMatrixID = map_matrix_281, .scriptsArchiveID = scripts_spear_pillar_palkia, .initScriptsArchiveID = scripts_init_spear_pillar_palkia, .msgArchiveID = TEXT_BANK_SPEAR_PILLAR_PALKIA, @@ -12906,9 +12908,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_WIFI_PLAZA_ENTRANCE] = { - .areaDataArchiveID = 0x15, + .areaDataArchiveID = area_data_021, .unk_01 = 0xF, - .mapMatrixID = 0x11A, + .mapMatrixID = map_matrix_282, .scriptsArchiveID = scripts_wifi_plaza_entrance, .initScriptsArchiveID = scripts_init_wifi_plaza_entrance, .msgArchiveID = TEXT_BANK_WIFI_PLAZA_ENTRANCE, @@ -12928,9 +12930,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_IRON_ISLAND_IRON_RUINS] = { - .areaDataArchiveID = 0x48, + .areaDataArchiveID = area_data_072, .unk_01 = 0xF, - .mapMatrixID = 0x11B, + .mapMatrixID = map_matrix_283, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12950,9 +12952,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_IRON_RUINS] = { - .areaDataArchiveID = 0x48, + .areaDataArchiveID = area_data_072, .unk_01 = 0xF, - .mapMatrixID = 0x11C, + .mapMatrixID = map_matrix_284, .scriptsArchiveID = scripts_iron_ruins, .initScriptsArchiveID = scripts_init_iron_ruins, .msgArchiveID = TEXT_BANK_IRON_RUINS, @@ -12972,9 +12974,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_MT_CORONET_ICEBERG_RUINS] = { - .areaDataArchiveID = 0x45, + .areaDataArchiveID = area_data_069, .unk_01 = 0xF, - .mapMatrixID = 0x11D, + .mapMatrixID = map_matrix_285, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -12994,9 +12996,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ICEBERG_RUINS] = { - .areaDataArchiveID = 0x45, + .areaDataArchiveID = area_data_069, .unk_01 = 0xF, - .mapMatrixID = 0x11E, + .mapMatrixID = map_matrix_286, .scriptsArchiveID = scripts_iceberg_ruins, .initScriptsArchiveID = scripts_init_iceberg_ruins, .msgArchiveID = TEXT_BANK_ICEBERG_RUINS, @@ -13016,9 +13018,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROUTE_228_ROCK_PEAK_RUINS] = { - .areaDataArchiveID = 0x39, + .areaDataArchiveID = area_data_057, .unk_01 = 0xF, - .mapMatrixID = 0x11F, + .mapMatrixID = map_matrix_287, .scriptsArchiveID = scripts_empty, .initScriptsArchiveID = scripts_init_empty, .msgArchiveID = TEXT_BANK_JUBILIFE_CITY, @@ -13038,9 +13040,9 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = FALSE, }, [MAP_HEADER_ROCK_PEAK_RUINS] = { - .areaDataArchiveID = 0x39, + .areaDataArchiveID = area_data_057, .unk_01 = 0xF, - .mapMatrixID = 288, + .mapMatrixID = map_matrix_288, .scriptsArchiveID = scripts_rock_peak_ruins, .initScriptsArchiveID = scripts_init_rock_peak_ruins, .msgArchiveID = TEXT_BANK_ROCK_PEAK_RUINS, diff --git a/platinum.us/filesys.csv b/platinum.us/filesys.csv index 4fbab6df74..483db5ae68 100644 --- a/platinum.us/filesys.csv +++ b/platinum.us/filesys.csv @@ -1,6 +1,6 @@ Source File,Target File res/prebuilt/data/UTF16.dat,/data/UTF16.dat -res/prebuilt/data/arealight.narc,/data/arealight.narc +res/field/lighting/lighting.narc,/data/arealight.narc res/prebuilt/data/battle_win.NSCR,/data/battle_win.NSCR res/prebuilt/data/btower_canm.resdat,/data/btower_canm.resdat res/prebuilt/data/btower_celact.cldat,/data/btower_celact.cldat @@ -260,12 +260,12 @@ res/field/events/zone_event.narc,/fielddata/eventdata/zone_event.narc res/prebuilt/fielddata/encountdata/d_enc_data.narc,/fielddata/encountdata/d_enc_data.narc res/prebuilt/fielddata/encountdata/p_enc_data.narc,/fielddata/encountdata/p_enc_data.narc res/field/encounters/pl_enc_data.narc,/fielddata/encountdata/pl_enc_data.narc -res/prebuilt/fielddata/build_model/build_model.narc,/fielddata/build_model/build_model.narc +res/field/props/models/prop_models.narc,/fielddata/build_model/build_model.narc res/prebuilt/fielddata/build_model/build_model_matshp.dat,/fielddata/build_model/build_model_matshp.dat -res/field/maps/matrices/map_matrix.narc,/fielddata/mapmatrix/map_matrix.narc -res/prebuilt/fielddata/areadata/area_data.narc,/fielddata/areadata/area_data.narc -res/prebuilt/fielddata/areadata/area_build_model/area_build.narc,/fielddata/areadata/area_build_model/area_build.narc -res/prebuilt/fielddata/areadata/area_build_model/areabm_texset.narc,/fielddata/areadata/area_build_model/areabm_texset.narc +res/field/matrices/map_matrix.narc,/fielddata/mapmatrix/map_matrix.narc +res/field/area_data/area_data.narc,/fielddata/areadata/area_data.narc +res/field/props/model_sets/prop_model_sets.narc,/fielddata/areadata/area_build_model/area_build.narc +res/field/props/texture_sets/prop_texture_sets.narc,/fielddata/areadata/area_build_model/areabm_texset.narc res/field/maps/texture_sets/map_tex_set.narc,/fielddata/areadata/area_map_tex/map_tex_set.narc res/prebuilt/fielddata/areadata/area_move_model/move_model_list.narc,/fielddata/areadata/area_move_model/move_model_list.narc res/field/maps/data/land_data.narc,/fielddata/land_data/land_data.narc @@ -284,7 +284,7 @@ res/pokemon_anims/pokemon_anims.narc,/pokeanime/pl_poke_anm.narc res/prebuilt/battle/tr_ai/tr_ai_seq.narc,/battle/tr_ai/tr_ai_seq.narc res/prebuilt/arc/area_win_gra.narc,/arc/area_win_gra.narc res/prebuilt/arc/balance_ball_gra.narc,/arc/balance_ball_gra.narc -res/prebuilt/arc/bm_anime.narc,/arc/bm_anime.narc +res/field/props/animations/prop_animations.narc,/arc/bm_anime.narc res/prebuilt/arc/bm_anime_list.narc,/arc/bm_anime_list.narc res/prebuilt/arc/codein_gra.narc,/arc/codein_gra.narc res/prebuilt/arc/demo_tengan_gra.narc,/arc/demo_tengan_gra.narc diff --git a/platinum.us/filesys.sha1 b/platinum.us/filesys.sha1 index ae716d6d3e..c313d2e346 100644 --- a/platinum.us/filesys.sha1 +++ b/platinum.us/filesys.sha1 @@ -1,5 +1,5 @@ dd9f06b78e2a187fb62f2d3ad5d781a8a74d3d1b *res/prebuilt/data/UTF16.dat -cea2ad20f4550dcf648aeb6f2bc118dcec7570d9 *res/prebuilt/data/arealight.narc +cea2ad20f4550dcf648aeb6f2bc118dcec7570d9 *res/field/lighting/lighting.narc a0c8ba8987d30f0c9930dfe109b7ee8c325582b9 *res/prebuilt/data/battle_win.NSCR 09f94a65e5581ef1cf30066be8786c185aa9b2b2 *res/prebuilt/data/btower_canm.resdat 89951491d6b76b65098917872397e0b11c7bb9de *res/prebuilt/data/btower_celact.cldat @@ -259,12 +259,12 @@ e484a4ea105e16977b9f39b965aaad014a4ec923 *res/field/events/zone_event.narc bda5c8e66cfa121c2d518d4388bd6f742746cda0 *res/prebuilt/fielddata/encountdata/d_enc_data.narc 4bcbf53d522ed962160b85af588816f7257fb1c3 *res/prebuilt/fielddata/encountdata/p_enc_data.narc d9bf534c175c3c991e77fff985c099723499e1eb *res/field/encounters/pl_enc_data.narc -7eca91aaa5f7ef816f51a884e2f42a26f51f8bbd *res/prebuilt/fielddata/build_model/build_model.narc +7eca91aaa5f7ef816f51a884e2f42a26f51f8bbd *res/field/props/models/prop_models.narc f49c6992b8caf5fea13831789fe4bfb026beb967 *res/prebuilt/fielddata/build_model/build_model_matshp.dat -992f33f6450613066830606d28e94b91031caddb *res/field/maps/matrices/map_matrix.narc -2df833d8f0145f29f21b23c06ba3561dec3f5180 *res/prebuilt/fielddata/areadata/area_data.narc -a2cd6f636960544440b489e827e5e16dcaa7f014 *res/prebuilt/fielddata/areadata/area_build_model/area_build.narc -8174da67845c24f377f56e84a0f5f0e890e765ec *res/prebuilt/fielddata/areadata/area_build_model/areabm_texset.narc +992f33f6450613066830606d28e94b91031caddb *res/field/matrices/map_matrix.narc +2df833d8f0145f29f21b23c06ba3561dec3f5180 *res/field/area_data/area_data.narc +a2cd6f636960544440b489e827e5e16dcaa7f014 *res/field/props/model_sets/prop_model_sets.narc +8174da67845c24f377f56e84a0f5f0e890e765ec *res/field/props/texture_sets/prop_texture_sets.narc 74aded294b971d68f10554f86fd795b072a0b01f *res/field/maps/texture_sets/map_tex_set.narc 2fb9b73d29f2577fdbd385daf961749794969d72 *res/prebuilt/fielddata/areadata/area_move_model/move_model_list.narc fa044bf2e0599ed2bf42d3b632776af3b7e8452e *res/field/maps/data/land_data.narc @@ -283,7 +283,7 @@ dc6caed3c4b1a0b04bebfcf6627a668e37ae6f2c *res/pokemon_anims/pokemon_anims.narc e8c96b0f5b6d59820e7201f7881183e3aff1b35f *res/prebuilt/battle/tr_ai/tr_ai_seq.narc b54b704c20f35cb66eb2790086dc47cd9ac612f7 *res/prebuilt/arc/area_win_gra.narc 7d5eac7006f041f4da9f9baf04ee61cc187f4580 *res/prebuilt/arc/balance_ball_gra.narc -99295a6e74067238dbbc23105cad1679687c6d86 *res/prebuilt/arc/bm_anime.narc +99295a6e74067238dbbc23105cad1679687c6d86 *res/field/props/animations/prop_animations.narc afd2be309c09733b33ec9b73b793518b41153828 *res/prebuilt/arc/bm_anime_list.narc 6a403c707b8737e4f19644ffe51606838fe43456 *res/prebuilt/arc/codein_gra.narc f1ef036922af5a593650d6a52f56fb3ec59d3d83 *res/prebuilt/arc/demo_tengan_gra.narc diff --git a/res/battle/moves/meson.build b/res/battle/moves/meson.build index e2f88dc9d3..3cf254bb1b 100644 --- a/res/battle/moves/meson.build +++ b/res/battle/moves/meson.build @@ -61,7 +61,7 @@ endforeach pl_waza_tbl_narc = custom_target('pl_waza_tbl.narc', output: 'pl_waza_tbl.narc', input: pl_waza_tbl_data_srcs, - env: json2bin_env, + env: jsoncnv_env, depends: [ py_consts_generators ], command: [ movedata_py, diff --git a/res/field/area_data/area_data.order b/res/field/area_data/area_data.order new file mode 100644 index 0000000000..ecf0d59660 --- /dev/null +++ b/res/field/area_data/area_data.order @@ -0,0 +1,75 @@ +area_data_000 +area_data_001 +area_data_002 +area_data_003 +area_data_004 +area_data_005 +area_data_006 +area_data_007 +area_data_008 +area_data_009 +area_data_010 +area_data_011 +area_data_012 +area_data_013 +area_data_014 +area_data_015 +area_data_016 +area_data_017 +area_data_018 +area_data_019 +area_data_020 +area_data_021 +area_data_022 +area_data_023 +area_data_024 +area_data_025 +area_data_026 +area_data_027 +area_data_028 +area_data_029 +area_data_030 +area_data_031 +area_data_032 +area_data_033 +area_data_034 +area_data_035 +area_data_036 +area_data_037 +area_data_038 +area_data_039 +area_data_040 +area_data_041 +area_data_042 +area_data_043 +area_data_044 +area_data_045 +area_data_046 +area_data_047 +area_data_048 +area_data_049 +area_data_050 +area_data_051 +area_data_052 +area_data_053 +area_data_054 +area_data_055 +area_data_056 +area_data_057 +area_data_058 +area_data_059 +area_data_060 +area_data_061 +area_data_062 +area_data_063 +area_data_064 +area_data_065 +area_data_066 +area_data_067 +area_data_068 +area_data_069 +area_data_070 +area_data_071 +area_data_072 +area_data_073 +area_data_074 diff --git a/res/field/area_data/area_data_000.json b/res/field/area_data/area_data_000.json new file mode 100644 index 0000000000..79359b7368 --- /dev/null +++ b/res/field/area_data/area_data_000.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_000", + "mapTextureSet": "map_texture_set_000", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_001.json b/res/field/area_data/area_data_001.json new file mode 100644 index 0000000000..83b5f29ae8 --- /dev/null +++ b/res/field/area_data/area_data_001.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_001", + "mapTextureSet": "map_texture_set_001", + "lightingSet": "lighting_set_001", + "dummy": 1 +} diff --git a/res/field/area_data/area_data_002.json b/res/field/area_data/area_data_002.json new file mode 100644 index 0000000000..7841ef74a0 --- /dev/null +++ b/res/field/area_data/area_data_002.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_002", + "mapTextureSet": "map_texture_set_002", + "lightingSet": "lighting_set_001", + "dummy": 2 +} diff --git a/res/field/area_data/area_data_003.json b/res/field/area_data/area_data_003.json new file mode 100644 index 0000000000..5c069a4297 --- /dev/null +++ b/res/field/area_data/area_data_003.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_001", + "mapTextureSet": "map_texture_set_003", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_004.json b/res/field/area_data/area_data_004.json new file mode 100644 index 0000000000..fe226dc770 --- /dev/null +++ b/res/field/area_data/area_data_004.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_003", + "mapTextureSet": "map_texture_set_004", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_005.json b/res/field/area_data/area_data_005.json new file mode 100644 index 0000000000..975d95cfd8 --- /dev/null +++ b/res/field/area_data/area_data_005.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_001", + "mapTextureSet": "map_texture_set_005", + "lightingSet": "lighting_set_001", + "dummy": 1 +} diff --git a/res/field/area_data/area_data_006.json b/res/field/area_data/area_data_006.json new file mode 100644 index 0000000000..cbb82fa95d --- /dev/null +++ b/res/field/area_data/area_data_006.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_000", + "mapTextureSet": "map_texture_set_006", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_007.json b/res/field/area_data/area_data_007.json new file mode 100644 index 0000000000..2b727315a5 --- /dev/null +++ b/res/field/area_data/area_data_007.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_003", + "mapTextureSet": "map_texture_set_007", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_008.json b/res/field/area_data/area_data_008.json new file mode 100644 index 0000000000..e66f592e91 --- /dev/null +++ b/res/field/area_data/area_data_008.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_004", + "mapTextureSet": "map_texture_set_008", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_009.json b/res/field/area_data/area_data_009.json new file mode 100644 index 0000000000..cef18226fc --- /dev/null +++ b/res/field/area_data/area_data_009.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_005", + "mapTextureSet": "map_texture_set_009", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_010.json b/res/field/area_data/area_data_010.json new file mode 100644 index 0000000000..9c4e67f85f --- /dev/null +++ b/res/field/area_data/area_data_010.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_006", + "mapTextureSet": "map_texture_set_010", + "lightingSet": "lighting_set_000", + "dummy": 4 +} diff --git a/res/field/area_data/area_data_011.json b/res/field/area_data/area_data_011.json new file mode 100644 index 0000000000..c96b014220 --- /dev/null +++ b/res/field/area_data/area_data_011.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_007", + "mapTextureSet": "map_texture_set_011", + "lightingSet": "lighting_set_000", + "dummy": 5 +} diff --git a/res/field/area_data/area_data_012.json b/res/field/area_data/area_data_012.json new file mode 100644 index 0000000000..5c84ba97ce --- /dev/null +++ b/res/field/area_data/area_data_012.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_008", + "mapTextureSet": "map_texture_set_012", + "lightingSet": "lighting_set_000", + "dummy": 6 +} diff --git a/res/field/area_data/area_data_013.json b/res/field/area_data/area_data_013.json new file mode 100644 index 0000000000..d6ba2a1c9d --- /dev/null +++ b/res/field/area_data/area_data_013.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_009", + "mapTextureSet": "map_texture_set_013", + "lightingSet": "lighting_set_000", + "dummy": 7 +} diff --git a/res/field/area_data/area_data_014.json b/res/field/area_data/area_data_014.json new file mode 100644 index 0000000000..9106a838ba --- /dev/null +++ b/res/field/area_data/area_data_014.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_010", + "mapTextureSet": "map_texture_set_014", + "lightingSet": "lighting_set_000", + "dummy": 8 +} diff --git a/res/field/area_data/area_data_015.json b/res/field/area_data/area_data_015.json new file mode 100644 index 0000000000..a4ad53d94e --- /dev/null +++ b/res/field/area_data/area_data_015.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_011", + "mapTextureSet": "map_texture_set_015", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_016.json b/res/field/area_data/area_data_016.json new file mode 100644 index 0000000000..5b6296fa96 --- /dev/null +++ b/res/field/area_data/area_data_016.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_012", + "mapTextureSet": "map_texture_set_016", + "lightingSet": "lighting_set_000", + "dummy": 6 +} diff --git a/res/field/area_data/area_data_017.json b/res/field/area_data/area_data_017.json new file mode 100644 index 0000000000..892388a907 --- /dev/null +++ b/res/field/area_data/area_data_017.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_013", + "mapTextureSet": "map_texture_set_017", + "lightingSet": "lighting_set_000", + "dummy": 7 +} diff --git a/res/field/area_data/area_data_018.json b/res/field/area_data/area_data_018.json new file mode 100644 index 0000000000..1b013f03e8 --- /dev/null +++ b/res/field/area_data/area_data_018.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_014", + "mapTextureSet": "map_texture_set_018", + "lightingSet": "lighting_set_000", + "dummy": 8 +} diff --git a/res/field/area_data/area_data_019.json b/res/field/area_data/area_data_019.json new file mode 100644 index 0000000000..2fe563618d --- /dev/null +++ b/res/field/area_data/area_data_019.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_015", + "mapTextureSet": "map_texture_set_019", + "lightingSet": "lighting_set_000", + "dummy": 9 +} diff --git a/res/field/area_data/area_data_020.json b/res/field/area_data/area_data_020.json new file mode 100644 index 0000000000..2a527339d2 --- /dev/null +++ b/res/field/area_data/area_data_020.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_016", + "mapTextureSet": "map_texture_set_020", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_021.json b/res/field/area_data/area_data_021.json new file mode 100644 index 0000000000..54ac2afdef --- /dev/null +++ b/res/field/area_data/area_data_021.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_017", + "mapTextureSet": "map_texture_set_005", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_022.json b/res/field/area_data/area_data_022.json new file mode 100644 index 0000000000..458a320ac3 --- /dev/null +++ b/res/field/area_data/area_data_022.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_018", + "mapTextureSet": "map_texture_set_021", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_023.json b/res/field/area_data/area_data_023.json new file mode 100644 index 0000000000..c291c2df5a --- /dev/null +++ b/res/field/area_data/area_data_023.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_019", + "mapTextureSet": "map_texture_set_022", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_024.json b/res/field/area_data/area_data_024.json new file mode 100644 index 0000000000..a53104fbd1 --- /dev/null +++ b/res/field/area_data/area_data_024.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_020", + "mapTextureSet": "map_texture_set_023", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_025.json b/res/field/area_data/area_data_025.json new file mode 100644 index 0000000000..08d265ef2c --- /dev/null +++ b/res/field/area_data/area_data_025.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_021", + "mapTextureSet": "map_texture_set_024", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_026.json b/res/field/area_data/area_data_026.json new file mode 100644 index 0000000000..13b1f69092 --- /dev/null +++ b/res/field/area_data/area_data_026.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_022", + "mapTextureSet": "map_texture_set_025", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_027.json b/res/field/area_data/area_data_027.json new file mode 100644 index 0000000000..41d25f9a86 --- /dev/null +++ b/res/field/area_data/area_data_027.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_023", + "mapTextureSet": "map_texture_set_026", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_028.json b/res/field/area_data/area_data_028.json new file mode 100644 index 0000000000..9aeb363ac6 --- /dev/null +++ b/res/field/area_data/area_data_028.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_024", + "mapTextureSet": "map_texture_set_027", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_029.json b/res/field/area_data/area_data_029.json new file mode 100644 index 0000000000..4637f2c087 --- /dev/null +++ b/res/field/area_data/area_data_029.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_025", + "mapTextureSet": "map_texture_set_028", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_030.json b/res/field/area_data/area_data_030.json new file mode 100644 index 0000000000..7ae83da5a7 --- /dev/null +++ b/res/field/area_data/area_data_030.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_026", + "mapTextureSet": "map_texture_set_029", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_031.json b/res/field/area_data/area_data_031.json new file mode 100644 index 0000000000..f03b269dd7 --- /dev/null +++ b/res/field/area_data/area_data_031.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_027", + "mapTextureSet": "map_texture_set_030", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_032.json b/res/field/area_data/area_data_032.json new file mode 100644 index 0000000000..e32b93cc56 --- /dev/null +++ b/res/field/area_data/area_data_032.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_028", + "mapTextureSet": "map_texture_set_031", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_033.json b/res/field/area_data/area_data_033.json new file mode 100644 index 0000000000..ccd2d49fab --- /dev/null +++ b/res/field/area_data/area_data_033.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_029", + "mapTextureSet": "map_texture_set_032", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_034.json b/res/field/area_data/area_data_034.json new file mode 100644 index 0000000000..1e235ec9aa --- /dev/null +++ b/res/field/area_data/area_data_034.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_030", + "mapTextureSet": "map_texture_set_033", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_035.json b/res/field/area_data/area_data_035.json new file mode 100644 index 0000000000..dbd3175809 --- /dev/null +++ b/res/field/area_data/area_data_035.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_031", + "mapTextureSet": "map_texture_set_034", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_036.json b/res/field/area_data/area_data_036.json new file mode 100644 index 0000000000..1b60949fef --- /dev/null +++ b/res/field/area_data/area_data_036.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_032", + "mapTextureSet": "map_texture_set_035", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_037.json b/res/field/area_data/area_data_037.json new file mode 100644 index 0000000000..b1e74b39d6 --- /dev/null +++ b/res/field/area_data/area_data_037.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_033", + "mapTextureSet": "map_texture_set_036", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_038.json b/res/field/area_data/area_data_038.json new file mode 100644 index 0000000000..2369968f33 --- /dev/null +++ b/res/field/area_data/area_data_038.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_034", + "mapTextureSet": "map_texture_set_037", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_039.json b/res/field/area_data/area_data_039.json new file mode 100644 index 0000000000..dba6d86cdb --- /dev/null +++ b/res/field/area_data/area_data_039.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_035", + "mapTextureSet": "map_texture_set_038", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_040.json b/res/field/area_data/area_data_040.json new file mode 100644 index 0000000000..5241cfac4e --- /dev/null +++ b/res/field/area_data/area_data_040.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_036", + "mapTextureSet": "map_texture_set_039", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_041.json b/res/field/area_data/area_data_041.json new file mode 100644 index 0000000000..4a57e91a23 --- /dev/null +++ b/res/field/area_data/area_data_041.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_037", + "mapTextureSet": "map_texture_set_040", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_042.json b/res/field/area_data/area_data_042.json new file mode 100644 index 0000000000..dffa0076f9 --- /dev/null +++ b/res/field/area_data/area_data_042.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_038", + "mapTextureSet": "map_texture_set_041", + "lightingSet": "lighting_set_002", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_043.json b/res/field/area_data/area_data_043.json new file mode 100644 index 0000000000..32803f6292 --- /dev/null +++ b/res/field/area_data/area_data_043.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_039", + "mapTextureSet": "map_texture_set_042", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_044.json b/res/field/area_data/area_data_044.json new file mode 100644 index 0000000000..8c6482578a --- /dev/null +++ b/res/field/area_data/area_data_044.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_040", + "mapTextureSet": "map_texture_set_043", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_045.json b/res/field/area_data/area_data_045.json new file mode 100644 index 0000000000..108e8316e1 --- /dev/null +++ b/res/field/area_data/area_data_045.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_041", + "mapTextureSet": "map_texture_set_044", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_046.json b/res/field/area_data/area_data_046.json new file mode 100644 index 0000000000..15fd614c15 --- /dev/null +++ b/res/field/area_data/area_data_046.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_042", + "mapTextureSet": "map_texture_set_045", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_047.json b/res/field/area_data/area_data_047.json new file mode 100644 index 0000000000..fe33fd8563 --- /dev/null +++ b/res/field/area_data/area_data_047.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_043", + "mapTextureSet": "map_texture_set_046", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_048.json b/res/field/area_data/area_data_048.json new file mode 100644 index 0000000000..88edc564db --- /dev/null +++ b/res/field/area_data/area_data_048.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_044", + "mapTextureSet": "map_texture_set_047", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_049.json b/res/field/area_data/area_data_049.json new file mode 100644 index 0000000000..3fd3d4c6a4 --- /dev/null +++ b/res/field/area_data/area_data_049.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_045", + "mapTextureSet": "map_texture_set_048", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_050.json b/res/field/area_data/area_data_050.json new file mode 100644 index 0000000000..2cdb4a2ec6 --- /dev/null +++ b/res/field/area_data/area_data_050.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_046", + "mapTextureSet": "map_texture_set_049", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_051.json b/res/field/area_data/area_data_051.json new file mode 100644 index 0000000000..d313e78e0d --- /dev/null +++ b/res/field/area_data/area_data_051.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_047", + "mapTextureSet": "map_texture_set_050", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_052.json b/res/field/area_data/area_data_052.json new file mode 100644 index 0000000000..10fa226c52 --- /dev/null +++ b/res/field/area_data/area_data_052.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_048", + "mapTextureSet": "map_texture_set_051", + "lightingSet": "lighting_set_001", + "dummy": 3 +} diff --git a/res/field/area_data/area_data_053.json b/res/field/area_data/area_data_053.json new file mode 100644 index 0000000000..2e79045f72 --- /dev/null +++ b/res/field/area_data/area_data_053.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_049", + "mapTextureSet": "map_texture_set_052", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_054.json b/res/field/area_data/area_data_054.json new file mode 100644 index 0000000000..c98c99b9c7 --- /dev/null +++ b/res/field/area_data/area_data_054.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_050", + "mapTextureSet": "map_texture_set_053", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_055.json b/res/field/area_data/area_data_055.json new file mode 100644 index 0000000000..5d879eb2a7 --- /dev/null +++ b/res/field/area_data/area_data_055.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_051", + "mapTextureSet": "map_texture_set_054", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_056.json b/res/field/area_data/area_data_056.json new file mode 100644 index 0000000000..6b7fbb61e2 --- /dev/null +++ b/res/field/area_data/area_data_056.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_052", + "mapTextureSet": "map_texture_set_055", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_057.json b/res/field/area_data/area_data_057.json new file mode 100644 index 0000000000..c10b98d693 --- /dev/null +++ b/res/field/area_data/area_data_057.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_053", + "mapTextureSet": "map_texture_set_056", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_058.json b/res/field/area_data/area_data_058.json new file mode 100644 index 0000000000..4152a182fd --- /dev/null +++ b/res/field/area_data/area_data_058.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_054", + "mapTextureSet": "map_texture_set_057", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_059.json b/res/field/area_data/area_data_059.json new file mode 100644 index 0000000000..801ad48cdf --- /dev/null +++ b/res/field/area_data/area_data_059.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_055", + "mapTextureSet": "map_texture_set_058", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_060.json b/res/field/area_data/area_data_060.json new file mode 100644 index 0000000000..082c311b3f --- /dev/null +++ b/res/field/area_data/area_data_060.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_056", + "mapTextureSet": "map_texture_set_059", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_061.json b/res/field/area_data/area_data_061.json new file mode 100644 index 0000000000..6c1d2e872f --- /dev/null +++ b/res/field/area_data/area_data_061.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_057", + "mapTextureSet": "map_texture_set_060", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_062.json b/res/field/area_data/area_data_062.json new file mode 100644 index 0000000000..8501332232 --- /dev/null +++ b/res/field/area_data/area_data_062.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_058", + "mapTextureSet": "map_texture_set_061", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_063.json b/res/field/area_data/area_data_063.json new file mode 100644 index 0000000000..be3a3ac061 --- /dev/null +++ b/res/field/area_data/area_data_063.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_059", + "mapTextureSet": "map_texture_set_062", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_064.json b/res/field/area_data/area_data_064.json new file mode 100644 index 0000000000..01e4d12121 --- /dev/null +++ b/res/field/area_data/area_data_064.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_060", + "mapTextureSet": "map_texture_set_063", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_065.json b/res/field/area_data/area_data_065.json new file mode 100644 index 0000000000..c53982b05a --- /dev/null +++ b/res/field/area_data/area_data_065.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_061", + "mapTextureSet": "map_texture_set_064", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_066.json b/res/field/area_data/area_data_066.json new file mode 100644 index 0000000000..7afdcf0db6 --- /dev/null +++ b/res/field/area_data/area_data_066.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_062", + "mapTextureSet": "map_texture_set_065", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_067.json b/res/field/area_data/area_data_067.json new file mode 100644 index 0000000000..768c5a6c63 --- /dev/null +++ b/res/field/area_data/area_data_067.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_063", + "mapTextureSet": "map_texture_set_066", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_068.json b/res/field/area_data/area_data_068.json new file mode 100644 index 0000000000..09f446a3d0 --- /dev/null +++ b/res/field/area_data/area_data_068.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_064", + "mapTextureSet": "map_texture_set_067", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_069.json b/res/field/area_data/area_data_069.json new file mode 100644 index 0000000000..b3a09063b8 --- /dev/null +++ b/res/field/area_data/area_data_069.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_065", + "mapTextureSet": "map_texture_set_068", + "lightingSet": "lighting_set_002", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_070.json b/res/field/area_data/area_data_070.json new file mode 100644 index 0000000000..81f6be6b42 --- /dev/null +++ b/res/field/area_data/area_data_070.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_066", + "mapTextureSet": "map_texture_set_069", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_071.json b/res/field/area_data/area_data_071.json new file mode 100644 index 0000000000..2ed1d5d462 --- /dev/null +++ b/res/field/area_data/area_data_071.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_067", + "mapTextureSet": "map_texture_set_070", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_072.json b/res/field/area_data/area_data_072.json new file mode 100644 index 0000000000..ef53b10a75 --- /dev/null +++ b/res/field/area_data/area_data_072.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_068", + "mapTextureSet": "map_texture_set_071", + "lightingSet": "lighting_set_002", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_073.json b/res/field/area_data/area_data_073.json new file mode 100644 index 0000000000..072a4ecd44 --- /dev/null +++ b/res/field/area_data/area_data_073.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_069", + "mapTextureSet": "map_texture_set_072", + "lightingSet": "lighting_set_000", + "dummy": 0 +} diff --git a/res/field/area_data/area_data_074.json b/res/field/area_data/area_data_074.json new file mode 100644 index 0000000000..821e05a2fc --- /dev/null +++ b/res/field/area_data/area_data_074.json @@ -0,0 +1,6 @@ +{ + "mapPropSet": "prop_model_set_070", + "mapTextureSet": "map_texture_set_073", + "lightingSet": "lighting_set_001", + "dummy": 0 +} diff --git a/res/field/area_data/meson.build b/res/field/area_data/meson.build new file mode 100644 index 0000000000..8751e8b98a --- /dev/null +++ b/res/field/area_data/meson.build @@ -0,0 +1,122 @@ +area_data_bin_gen = generator( + area_data_py, + arguments: [ '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@', ], + output: '@BASENAME@' +) + +area_data_srcs = files( + 'area_data_000.json', + 'area_data_001.json', + 'area_data_002.json', + 'area_data_003.json', + 'area_data_004.json', + 'area_data_005.json', + 'area_data_006.json', + 'area_data_007.json', + 'area_data_008.json', + 'area_data_009.json', + 'area_data_010.json', + 'area_data_011.json', + 'area_data_012.json', + 'area_data_013.json', + 'area_data_014.json', + 'area_data_015.json', + 'area_data_016.json', + 'area_data_017.json', + 'area_data_018.json', + 'area_data_019.json', + 'area_data_020.json', + 'area_data_021.json', + 'area_data_022.json', + 'area_data_023.json', + 'area_data_024.json', + 'area_data_025.json', + 'area_data_026.json', + 'area_data_027.json', + 'area_data_028.json', + 'area_data_029.json', + 'area_data_030.json', + 'area_data_031.json', + 'area_data_032.json', + 'area_data_033.json', + 'area_data_034.json', + 'area_data_035.json', + 'area_data_036.json', + 'area_data_037.json', + 'area_data_038.json', + 'area_data_039.json', + 'area_data_040.json', + 'area_data_041.json', + 'area_data_042.json', + 'area_data_043.json', + 'area_data_044.json', + 'area_data_045.json', + 'area_data_046.json', + 'area_data_047.json', + 'area_data_048.json', + 'area_data_049.json', + 'area_data_050.json', + 'area_data_051.json', + 'area_data_052.json', + 'area_data_053.json', + 'area_data_054.json', + 'area_data_055.json', + 'area_data_056.json', + 'area_data_057.json', + 'area_data_058.json', + 'area_data_059.json', + 'area_data_060.json', + 'area_data_061.json', + 'area_data_062.json', + 'area_data_063.json', + 'area_data_064.json', + 'area_data_065.json', + 'area_data_066.json', + 'area_data_067.json', + 'area_data_068.json', + 'area_data_069.json', + 'area_data_070.json', + 'area_data_071.json', + 'area_data_072.json', + 'area_data_073.json', + 'area_data_074.json', +) + +area_data_order = files('area_data.order') + +area_data_deps = [ + prop_model_set_narc, + map_texture_set_narc, + lighting_narc +] + +area_data_narc = custom_target('area_data.narc', + output: [ + 'area_data.narc', + 'area_data.naix', + ], + input: [ + area_data_bin_gen.process(area_data_srcs, + env: jsoncnv_env, + extra_args: [ + '--map-prop-set-naix', prop_model_set_narc[1].full_path() + '.h', + '--map-texture-set-naix', map_texture_set_narc[1].full_path() + '.h', + '--lighting-set-naix', lighting_narc[1].full_path() + '.h', + ], + ), + area_data_order, + ], + depends: [ + py_consts_generators, + area_data_deps + ], + command: [ + narc_exe, 'create', + '--naix', + '--order', area_data_order, + '--output', '@OUTPUT0@', + '@PRIVATE_DIR@', + ] +) + +nitrofs_files += area_data_narc diff --git a/res/field/encounters/meson.build b/res/field/encounters/meson.build index 05ea51cba3..634bd3badc 100644 --- a/res/field/encounters/meson.build +++ b/res/field/encounters/meson.build @@ -199,7 +199,7 @@ pl_enc_tbl_narc = custom_target('pl_enc_data.narc', 'pl_enc_data.naix.h', ], input: [ - enc_bin_gen.process(pl_enc_data_srcs, env: json2bin_env), + enc_bin_gen.process(pl_enc_data_srcs, env: jsoncnv_env), pl_enc_data_order ], depends: [ py_consts_generators ], @@ -260,13 +260,13 @@ encdata_ex_order = files('encdata_ex.order') encdata_ex_narc = custom_target('encdata_ex.narc', output: 'encdata_ex.narc', input: [ - enc_ex_er_bin_gen.process(encdata_ex_elusive_rod_src, env: json2bin_env), - enc_ex_ht_bin_gen.process(encdata_ex_honey_trees_src, env: json2bin_env), - enc_ex_tg_bin_gen.process(encdata_ex_trophy_garden_src, env: json2bin_env), - enc_ex_gm_bin_gen.process(encdata_ex_great_marsh_src, env: json2bin_env), + enc_ex_er_bin_gen.process(encdata_ex_elusive_rod_src, env: jsoncnv_env), + enc_ex_ht_bin_gen.process(encdata_ex_honey_trees_src, env: jsoncnv_env), + enc_ex_tg_bin_gen.process(encdata_ex_trophy_garden_src, env: jsoncnv_env), + enc_ex_gm_bin_gen.process(encdata_ex_great_marsh_src, env: jsoncnv_env), encdata_ex_order ], - env: json2bin_env, + env: jsoncnv_env, depends: [ py_consts_generators ], command: [ narc_exe, 'create', @@ -285,7 +285,7 @@ zukan_enc_platinum_srcs += pl_enc_data_srcs pokedex_enc_platinum_narc = custom_target('zukan_enc_platinum.narc', output: 'zukan_enc_platinum.narc', input: zukan_enc_platinum_srcs, - env: json2bin_env, + env: jsoncnv_env, depends: [ py_consts_generators ], command: [ make_pokedex_enc_platinum_py, diff --git a/res/field/events/meson.build b/res/field/events/meson.build index 321057f5c4..b7bbb17471 100644 --- a/res/field/events/meson.build +++ b/res/field/events/meson.build @@ -563,7 +563,7 @@ events_narc = custom_target('zone_event.narc', 'zone_event.narc', 'zone_event.naix.h', ], - input: event_bin_gen.process(events_files, env: json2bin_env), + input: event_bin_gen.process(events_files, env: jsoncnv_env), depends: [ py_consts_generators, events_headers ], command: [ narc_exe, 'create', diff --git a/res/field/lighting/lighting_set_000.json b/res/field/lighting/lighting_set_000.json new file mode 100644 index 0000000000..8b91158847 --- /dev/null +++ b/res/field/lighting/lighting_set_000.json @@ -0,0 +1,1157 @@ +[ + { + "endTime": 0, + "lights": [ + { + "enabled": true, + "color": { + "red": 11, + "green": 11, + "blue": 16 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 7200, + "lights": [ + { + "enabled": true, + "color": { + "red": 11, + "green": 11, + "blue": 16 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 0, + "green": 0, + "blue": 8 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 8100, + "lights": [ + { + "enabled": true, + "color": { + "red": 12, + "green": 12, + "blue": 18 + }, + "direction": { + "x": 0.1689453125, + "y": -0.875, + "z": -0.166015625 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 0, + "green": 4, + "blue": 8 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 10, + "green": 10, + "blue": 14 + }, + "ambientColor": { + "red": 13, + "green": 13, + "blue": 13 + }, + "specularColor": { + "red": 8, + "green": 8, + "blue": 14 + }, + "emissionColor": { + "red": 10, + "green": 10, + "blue": 12 + } + }, + { + "endTime": 9000, + "lights": [ + { + "enabled": true, + "color": { + "red": 12, + "green": 12, + "blue": 22 + }, + "direction": { + "x": -0.125244140625, + "y": -0.87109375, + "z": -0.21826171875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 0, + "green": 2, + "blue": 10 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 11, + "green": 11, + "blue": 13 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 10, + "green": 10, + "blue": 14 + }, + "emissionColor": { + "red": 13, + "green": 13, + "blue": 14 + } + }, + { + "endTime": 14400, + "lights": [ + { + "enabled": true, + "color": { + "red": 15, + "green": 15, + "blue": 22 + }, + "direction": { + "x": -0.41943359375, + "y": -0.866943359375, + "z": -0.2705078125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 0, + "green": 0, + "blue": 10 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 12, + "green": 12, + "blue": 12 + }, + "ambientColor": { + "red": 8, + "green": 8, + "blue": 8 + }, + "specularColor": { + "red": 12, + "green": 12, + "blue": 14 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 18 + } + }, + { + "endTime": 20700, + "lights": [ + { + "enabled": true, + "color": { + "red": 18, + "green": 18, + "blue": 21 + }, + "direction": { + "x": -0.44580078125, + "y": -0.8662109375, + "z": -0.17138671875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 1, + "green": 1, + "blue": 11 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 13, + "green": 13, + "blue": 13 + }, + "ambientColor": { + "red": 9, + "green": 9, + "blue": 9 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 15 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 16 + } + }, + { + "endTime": 21600, + "lights": [ + { + "enabled": true, + "color": { + "red": 22, + "green": 22, + "blue": 20 + }, + "direction": { + "x": -0.47216796875, + "y": -0.8662109375, + "z": -0.072265625 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 15, + "green": 15, + "blue": 15 + }, + "ambientColor": { + "red": 9, + "green": 11, + "blue": 11 + }, + "specularColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 27000, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 20 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 13 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 27900, + "lights": [ + { + "enabled": true, + "color": { + "red": 22, + "green": 22, + "blue": 18 + }, + "direction": { + "x": -0.17822265625, + "y": -0.869140625, + "z": -0.02001953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 10 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 15, + "green": 15, + "blue": 15 + }, + "ambientColor": { + "red": 11, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 17, + "green": 17, + "blue": 17 + }, + "emissionColor": { + "red": 13, + "green": 13, + "blue": 13 + } + }, + { + "endTime": 30600, + "lights": [ + { + "enabled": true, + "color": { + "red": 20, + "green": 18, + "blue": 16 + }, + "direction": { + "x": -0.17822265625, + "y": -0.869140625, + "z": -0.02001953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 3, + "green": 4, + "blue": 10 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 15, + "green": 15, + "blue": 15 + }, + "ambientColor": { + "red": 11, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 17, + "green": 17, + "blue": 17 + }, + "emissionColor": { + "red": 12, + "green": 11, + "blue": 11 + } + }, + { + "endTime": 32400, + "lights": [ + { + "enabled": true, + "color": { + "red": 19, + "green": 16, + "blue": 12 + }, + "direction": { + "x": 0.142333984375, + "y": -0.8740234375, + "z": 0.06689453125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 3, + "green": 5, + "blue": 8 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 15, + "green": 15, + "blue": 15 + }, + "ambientColor": { + "red": 11, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 17, + "green": 17, + "blue": 17 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 7 + } + }, + { + "endTime": 33300, + "lights": [ + { + "enabled": true, + "color": { + "red": 17, + "green": 13, + "blue": 10 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 14, + "green": 6, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "ambientColor": { + "red": 12, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "emissionColor": { + "red": 9, + "green": 7, + "blue": 7 + } + }, + { + "endTime": 34200, + "lights": [ + { + "enabled": true, + "color": { + "red": 16, + "green": 13, + "blue": 10 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 10, + "green": 4, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "ambientColor": { + "red": 12, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 9, + "green": 8, + "blue": 7 + } + }, + { + "endTime": 36000, + "lights": [ + { + "enabled": true, + "color": { + "red": 11, + "green": 12, + "blue": 15 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 10, + "green": 4, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "ambientColor": { + "red": 12, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 9 + } + }, + { + "endTime": 43200, + "lights": [ + { + "enabled": true, + "color": { + "red": 11, + "green": 11, + "blue": 16 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + } +] diff --git a/res/field/lighting/lighting_set_001.json b/res/field/lighting/lighting_set_001.json new file mode 100644 index 0000000000..e405902b39 --- /dev/null +++ b/res/field/lighting/lighting_set_001.json @@ -0,0 +1,1157 @@ +[ + { + "endTime": 900, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 1800, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 7200, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 8100, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 9000, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 19800, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 20700, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 21600, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 28800, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 29700, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 30600, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 34200, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 35100, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 36000, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + }, + { + "endTime": 43200, + "lights": [ + { + "enabled": true, + "color": { + "red": 23, + "green": 23, + "blue": 25 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 4, + "green": 4, + "blue": 16 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 14, + "green": 14, + "blue": 14 + }, + "specularColor": { + "red": 20, + "green": 20, + "blue": 20 + }, + "emissionColor": { + "red": 16, + "green": 16, + "blue": 16 + } + } +] diff --git a/res/field/lighting/lighting_set_002.json b/res/field/lighting/lighting_set_002.json new file mode 100644 index 0000000000..720e202bd0 --- /dev/null +++ b/res/field/lighting/lighting_set_002.json @@ -0,0 +1,1157 @@ +[ + { + "endTime": 0, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 7200, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 8100, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 9000, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 14400, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 20700, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 21600, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 27000, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 27900, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 30600, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 32400, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 33300, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 34200, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 36000, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + }, + { + "endTime": 43200, + "lights": [ + { + "enabled": true, + "color": { + "red": 7, + "green": 7, + "blue": 12 + }, + "direction": { + "x": 0.463134765625, + "y": -0.87890625, + "z": -0.11376953125 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 22, + "green": 18, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 10, + "blue": 10 + }, + "specularColor": { + "red": 14, + "green": 14, + "blue": 16 + }, + "emissionColor": { + "red": 8, + "green": 8, + "blue": 11 + } + } +] diff --git a/res/field/lighting/lighting_set_003.json b/res/field/lighting/lighting_set_003.json new file mode 100644 index 0000000000..5a5f8a51d4 --- /dev/null +++ b/res/field/lighting/lighting_set_003.json @@ -0,0 +1,1157 @@ +[ + { + "endTime": 900, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 1800, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 7200, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 8100, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 9000, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 19800, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 20700, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 21600, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 28800, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 29700, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 30600, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 34200, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 35100, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 36000, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + }, + { + "endTime": 43200, + "lights": [ + { + "enabled": true, + "color": { + "red": 24, + "green": 24, + "blue": 18 + }, + "direction": { + "x": -0.498779296875, + "y": -0.8662109375, + "z": 0.02685546875 + } + }, + { + "enabled": false, + "color": { + "red": 0, + "green": 0, + "blue": 0 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "enabled": true, + "color": { + "red": 2, + "green": 2, + "blue": 12 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + }, + { + "enabled": true, + "color": { + "red": 31, + "green": 31, + "blue": 31 + }, + "direction": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + } + } + ], + "diffuseColor": { + "red": 16, + "green": 16, + "blue": 16 + }, + "ambientColor": { + "red": 10, + "green": 12, + "blue": 12 + }, + "specularColor": { + "red": 18, + "green": 18, + "blue": 18 + }, + "emissionColor": { + "red": 14, + "green": 14, + "blue": 14 + } + } +] diff --git a/res/field/lighting/lighting_sets.order b/res/field/lighting/lighting_sets.order new file mode 100644 index 0000000000..297547fda8 --- /dev/null +++ b/res/field/lighting/lighting_sets.order @@ -0,0 +1,4 @@ +lighting_set_000 +lighting_set_001 +lighting_set_002 +lighting_set_003 diff --git a/res/field/lighting/meson.build b/res/field/lighting/meson.build new file mode 100644 index 0000000000..3b5c61444b --- /dev/null +++ b/res/field/lighting/meson.build @@ -0,0 +1,45 @@ +lighting_txt_gen = generator( + lighting_py, + arguments: [ '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@', ], + output: '@BASENAME@', + depends: [ py_consts_generators ], +) + +lighting_data_srcs = lighting_txt_gen.process(files( + 'lighting_set_000.json', + 'lighting_set_002.json'), + env: jsoncnv_env, +) + +lighting_data_newline_srcs = lighting_txt_gen.process(files( + 'lighting_set_001.json', + 'lighting_set_003.json'), + env: jsoncnv_env, + extra_args: [ + '--eofnewline', + ], +) + +lighting_data_order = files('lighting_sets.order') + +lighting_narc = custom_target('lighting.narc', + output: [ + 'lighting.narc', + 'lighting.naix', + ], + input: [ + lighting_data_srcs, + lighting_data_newline_srcs, + lighting_data_order + ], + depends: [ py_consts_generators ], + command: [ + narc_exe, 'create', + '--naix', + '--order', lighting_data_order, + '--output', '@OUTPUT0@', + '@PRIVATE_DIR@', + ] +) + +nitrofs_files += lighting_narc diff --git a/res/field/maps/matrices/map_matrices.order b/res/field/maps/matrices/map_matrices.order deleted file mode 100644 index 1750fec08c..0000000000 --- a/res/field/maps/matrices/map_matrices.order +++ /dev/null @@ -1,289 +0,0 @@ -map_matrix_000.bin -map_matrix_001.bin -map_matrix_002.bin -map_matrix_003.bin -map_matrix_004.bin -map_matrix_005.bin -map_matrix_006.bin -map_matrix_007.bin -map_matrix_008.bin -map_matrix_009.bin -map_matrix_010.bin -map_matrix_011.bin -map_matrix_012.bin -map_matrix_013.bin -map_matrix_014.bin -map_matrix_015.bin -map_matrix_016.bin -map_matrix_017.bin -map_matrix_018.bin -map_matrix_019.bin -map_matrix_020.bin -map_matrix_021.bin -map_matrix_022.bin -map_matrix_023.bin -map_matrix_024.bin -map_matrix_025.bin -map_matrix_026.bin -map_matrix_027.bin -map_matrix_028.bin -map_matrix_029.bin -map_matrix_030.bin -map_matrix_031.bin -map_matrix_032.bin -map_matrix_033.bin -map_matrix_034.bin -map_matrix_035.bin -map_matrix_036.bin -map_matrix_037.bin -map_matrix_038.bin -map_matrix_039.bin -map_matrix_040.bin -map_matrix_041.bin -map_matrix_042.bin -map_matrix_043.bin -map_matrix_044.bin -map_matrix_045.bin -map_matrix_046.bin -map_matrix_047.bin -map_matrix_048.bin -map_matrix_049.bin -map_matrix_050.bin -map_matrix_051.bin -map_matrix_052.bin -map_matrix_053.bin -map_matrix_054.bin -map_matrix_055.bin -map_matrix_056.bin -map_matrix_057.bin -map_matrix_058.bin -map_matrix_059.bin -map_matrix_060.bin -map_matrix_061.bin -map_matrix_062.bin -map_matrix_063.bin -map_matrix_064.bin -map_matrix_065.bin -map_matrix_066.bin -map_matrix_067.bin -map_matrix_068.bin -map_matrix_069.bin -map_matrix_070.bin -map_matrix_071.bin -map_matrix_072.bin -map_matrix_073.bin -map_matrix_074.bin -map_matrix_075.bin -map_matrix_076.bin -map_matrix_077.bin -map_matrix_078.bin -map_matrix_079.bin -map_matrix_080.bin -map_matrix_081.bin -map_matrix_082.bin -map_matrix_083.bin -map_matrix_084.bin -map_matrix_085.bin -map_matrix_086.bin -map_matrix_087.bin -map_matrix_088.bin -map_matrix_089.bin -map_matrix_090.bin -map_matrix_091.bin -map_matrix_092.bin -map_matrix_093.bin -map_matrix_094.bin -map_matrix_095.bin -map_matrix_096.bin -map_matrix_097.bin -map_matrix_098.bin -map_matrix_099.bin -map_matrix_100.bin -map_matrix_101.bin -map_matrix_102.bin -map_matrix_103.bin -map_matrix_104.bin -map_matrix_105.bin -map_matrix_106.bin -map_matrix_107.bin -map_matrix_108.bin -map_matrix_109.bin -map_matrix_110.bin -map_matrix_111.bin -map_matrix_112.bin -map_matrix_113.bin -map_matrix_114.bin -map_matrix_115.bin -map_matrix_116.bin -map_matrix_117.bin -map_matrix_118.bin -map_matrix_119.bin -map_matrix_120.bin -map_matrix_121.bin -map_matrix_122.bin -map_matrix_123.bin -map_matrix_124.bin -map_matrix_125.bin -map_matrix_126.bin -map_matrix_127.bin -map_matrix_128.bin -map_matrix_129.bin -map_matrix_130.bin -map_matrix_131.bin -map_matrix_132.bin -map_matrix_133.bin -map_matrix_134.bin -map_matrix_135.bin -map_matrix_136.bin -map_matrix_137.bin -map_matrix_138.bin -map_matrix_139.bin -map_matrix_140.bin -map_matrix_141.bin -map_matrix_142.bin -map_matrix_143.bin -map_matrix_144.bin -map_matrix_145.bin -map_matrix_146.bin -map_matrix_147.bin -map_matrix_148.bin -map_matrix_149.bin -map_matrix_150.bin -map_matrix_151.bin -map_matrix_152.bin -map_matrix_153.bin -map_matrix_154.bin -map_matrix_155.bin -map_matrix_156.bin -map_matrix_157.bin -map_matrix_158.bin -map_matrix_159.bin -map_matrix_160.bin -map_matrix_161.bin -map_matrix_162.bin -map_matrix_163.bin -map_matrix_164.bin -map_matrix_165.bin -map_matrix_166.bin -map_matrix_167.bin -map_matrix_168.bin -map_matrix_169.bin -map_matrix_170.bin -map_matrix_171.bin -map_matrix_172.bin -map_matrix_173.bin -map_matrix_174.bin -map_matrix_175.bin -map_matrix_176.bin -map_matrix_177.bin -map_matrix_178.bin -map_matrix_179.bin -map_matrix_180.bin -map_matrix_181.bin -map_matrix_182.bin -map_matrix_183.bin -map_matrix_184.bin -map_matrix_185.bin -map_matrix_186.bin -map_matrix_187.bin -map_matrix_188.bin -map_matrix_189.bin -map_matrix_190.bin -map_matrix_191.bin -map_matrix_192.bin -map_matrix_193.bin -map_matrix_194.bin -map_matrix_195.bin -map_matrix_196.bin -map_matrix_197.bin -map_matrix_198.bin -map_matrix_199.bin -map_matrix_200.bin -map_matrix_201.bin -map_matrix_202.bin -map_matrix_203.bin -map_matrix_204.bin -map_matrix_205.bin -map_matrix_206.bin -map_matrix_207.bin -map_matrix_208.bin -map_matrix_209.bin -map_matrix_210.bin -map_matrix_211.bin -map_matrix_212.bin -map_matrix_213.bin -map_matrix_214.bin -map_matrix_215.bin -map_matrix_216.bin -map_matrix_217.bin -map_matrix_218.bin -map_matrix_219.bin -map_matrix_220.bin -map_matrix_221.bin -map_matrix_222.bin -map_matrix_223.bin -map_matrix_224.bin -map_matrix_225.bin -map_matrix_226.bin -map_matrix_227.bin -map_matrix_228.bin -map_matrix_229.bin -map_matrix_230.bin -map_matrix_231.bin -map_matrix_232.bin -map_matrix_233.bin -map_matrix_234.bin -map_matrix_235.bin -map_matrix_236.bin -map_matrix_237.bin -map_matrix_238.bin -map_matrix_239.bin -map_matrix_240.bin -map_matrix_241.bin -map_matrix_242.bin -map_matrix_243.bin -map_matrix_244.bin -map_matrix_245.bin -map_matrix_246.bin -map_matrix_247.bin -map_matrix_248.bin -map_matrix_249.bin -map_matrix_250.bin -map_matrix_251.bin -map_matrix_252.bin -map_matrix_253.bin -map_matrix_254.bin -map_matrix_255.bin -map_matrix_256.bin -map_matrix_257.bin -map_matrix_258.bin -map_matrix_259.bin -map_matrix_260.bin -map_matrix_261.bin -map_matrix_262.bin -map_matrix_263.bin -map_matrix_264.bin -map_matrix_265.bin -map_matrix_266.bin -map_matrix_267.bin -map_matrix_268.bin -map_matrix_269.bin -map_matrix_270.bin -map_matrix_271.bin -map_matrix_272.bin -map_matrix_273.bin -map_matrix_274.bin -map_matrix_275.bin -map_matrix_276.bin -map_matrix_277.bin -map_matrix_278.bin -map_matrix_279.bin -map_matrix_280.bin -map_matrix_281.bin -map_matrix_282.bin -map_matrix_283.bin -map_matrix_284.bin -map_matrix_285.bin -map_matrix_286.bin -map_matrix_287.bin -map_matrix_288.bin diff --git a/res/field/maps/meson.build b/res/field/maps/meson.build index 3b74497750..cf06004596 100644 --- a/res/field/maps/meson.build +++ b/res/field/maps/meson.build @@ -1,3 +1,2 @@ subdir('data') -subdir('matrices') subdir('texture_sets') diff --git a/res/field/maps/texture_sets/map_texture_set.order b/res/field/maps/texture_sets/map_texture_set.order deleted file mode 100644 index e1e72424df..0000000000 --- a/res/field/maps/texture_sets/map_texture_set.order +++ /dev/null @@ -1,74 +0,0 @@ -map_texture_set_000.nsbtx -map_texture_set_001.nsbtx -map_texture_set_002.nsbtx -map_texture_set_003.nsbtx -map_texture_set_004.nsbtx -map_texture_set_005.nsbtx -map_texture_set_006.nsbtx -map_texture_set_007.nsbtx -map_texture_set_008.nsbtx -map_texture_set_009.nsbtx -map_texture_set_010.nsbtx -map_texture_set_011.nsbtx -map_texture_set_012.nsbtx -map_texture_set_013.nsbtx -map_texture_set_014.nsbtx -map_texture_set_015.nsbtx -map_texture_set_016.nsbtx -map_texture_set_017.nsbtx -map_texture_set_018.nsbtx -map_texture_set_019.nsbtx -map_texture_set_020.nsbtx -map_texture_set_021.nsbtx -map_texture_set_022.nsbtx -map_texture_set_023.nsbtx -map_texture_set_024.nsbtx -map_texture_set_025.nsbtx -map_texture_set_026.nsbtx -map_texture_set_027.nsbtx -map_texture_set_028.nsbtx -map_texture_set_029.nsbtx -map_texture_set_030.nsbtx -map_texture_set_031.nsbtx -map_texture_set_032.nsbtx -map_texture_set_033.nsbtx -map_texture_set_034.nsbtx -map_texture_set_035.nsbtx -map_texture_set_036.nsbtx -map_texture_set_037.nsbtx -map_texture_set_038.nsbtx -map_texture_set_039.nsbtx -map_texture_set_040.nsbtx -map_texture_set_041.nsbtx -map_texture_set_042.nsbtx -map_texture_set_043.nsbtx -map_texture_set_044.nsbtx -map_texture_set_045.nsbtx -map_texture_set_046.nsbtx -map_texture_set_047.nsbtx -map_texture_set_048.nsbtx -map_texture_set_049.nsbtx -map_texture_set_050.nsbtx -map_texture_set_051.nsbtx -map_texture_set_052.nsbtx -map_texture_set_053.nsbtx -map_texture_set_054.nsbtx -map_texture_set_055.nsbtx -map_texture_set_056.nsbtx -map_texture_set_057.nsbtx -map_texture_set_058.nsbtx -map_texture_set_059.nsbtx -map_texture_set_060.nsbtx -map_texture_set_061.nsbtx -map_texture_set_062.nsbtx -map_texture_set_063.nsbtx -map_texture_set_064.nsbtx -map_texture_set_065.nsbtx -map_texture_set_066.nsbtx -map_texture_set_067.nsbtx -map_texture_set_068.nsbtx -map_texture_set_069.nsbtx -map_texture_set_070.nsbtx -map_texture_set_071.nsbtx -map_texture_set_072.nsbtx -map_texture_set_073.nsbtx diff --git a/res/field/maps/texture_sets/map_texture_sets.order b/res/field/maps/texture_sets/map_texture_sets.order new file mode 100644 index 0000000000..82f956858d --- /dev/null +++ b/res/field/maps/texture_sets/map_texture_sets.order @@ -0,0 +1,74 @@ +map_texture_set_000 +map_texture_set_001 +map_texture_set_002 +map_texture_set_003 +map_texture_set_004 +map_texture_set_005 +map_texture_set_006 +map_texture_set_007 +map_texture_set_008 +map_texture_set_009 +map_texture_set_010 +map_texture_set_011 +map_texture_set_012 +map_texture_set_013 +map_texture_set_014 +map_texture_set_015 +map_texture_set_016 +map_texture_set_017 +map_texture_set_018 +map_texture_set_019 +map_texture_set_020 +map_texture_set_021 +map_texture_set_022 +map_texture_set_023 +map_texture_set_024 +map_texture_set_025 +map_texture_set_026 +map_texture_set_027 +map_texture_set_028 +map_texture_set_029 +map_texture_set_030 +map_texture_set_031 +map_texture_set_032 +map_texture_set_033 +map_texture_set_034 +map_texture_set_035 +map_texture_set_036 +map_texture_set_037 +map_texture_set_038 +map_texture_set_039 +map_texture_set_040 +map_texture_set_041 +map_texture_set_042 +map_texture_set_043 +map_texture_set_044 +map_texture_set_045 +map_texture_set_046 +map_texture_set_047 +map_texture_set_048 +map_texture_set_049 +map_texture_set_050 +map_texture_set_051 +map_texture_set_052 +map_texture_set_053 +map_texture_set_054 +map_texture_set_055 +map_texture_set_056 +map_texture_set_057 +map_texture_set_058 +map_texture_set_059 +map_texture_set_060 +map_texture_set_061 +map_texture_set_062 +map_texture_set_063 +map_texture_set_064 +map_texture_set_065 +map_texture_set_066 +map_texture_set_067 +map_texture_set_068 +map_texture_set_069 +map_texture_set_070 +map_texture_set_071 +map_texture_set_072 +map_texture_set_073 diff --git a/res/field/maps/texture_sets/meson.build b/res/field/maps/texture_sets/meson.build index 72ba53fea1..8106715dcb 100644 --- a/res/field/maps/texture_sets/meson.build +++ b/res/field/maps/texture_sets/meson.build @@ -1,4 +1,9 @@ -map_texture_set_files = copy_gen.process(files( +map_texture_set_gen = generator(find_program('cp'), + arguments: [ '@INPUT@', '@OUTPUT@', ], + output: '@BASENAME@' +) + +map_texture_set_files = map_texture_set_gen.process(files( 'map_texture_set_000.nsbtx', 'map_texture_set_001.nsbtx', 'map_texture_set_002.nsbtx', @@ -75,10 +80,11 @@ map_texture_set_files = copy_gen.process(files( 'map_texture_set_073.nsbtx' )) -map_texture_set_order = files('map_texture_set.order') +map_texture_set_order = files('map_texture_sets.order') map_texture_set_narc = custom_target('map_tex_set.narc', output: [ 'map_tex_set.narc', + 'map_tex_set.naix', ], input: [ map_texture_set_files, @@ -86,6 +92,7 @@ map_texture_set_narc = custom_target('map_tex_set.narc', ], command: [ narc_exe, 'create', + '--naix', '--order', map_texture_set_order, '--output', '@OUTPUT0@', '@PRIVATE_DIR@', diff --git a/res/field/matrices/map_matrices.order b/res/field/matrices/map_matrices.order new file mode 100644 index 0000000000..5a0d338da8 --- /dev/null +++ b/res/field/matrices/map_matrices.order @@ -0,0 +1,289 @@ +map_matrix_000 +map_matrix_001 +map_matrix_002 +map_matrix_003 +map_matrix_004 +map_matrix_005 +map_matrix_006 +map_matrix_007 +map_matrix_008 +map_matrix_009 +map_matrix_010 +map_matrix_011 +map_matrix_012 +map_matrix_013 +map_matrix_014 +map_matrix_015 +map_matrix_016 +map_matrix_017 +map_matrix_018 +map_matrix_019 +map_matrix_020 +map_matrix_021 +map_matrix_022 +map_matrix_023 +map_matrix_024 +map_matrix_025 +map_matrix_026 +map_matrix_027 +map_matrix_028 +map_matrix_029 +map_matrix_030 +map_matrix_031 +map_matrix_032 +map_matrix_033 +map_matrix_034 +map_matrix_035 +map_matrix_036 +map_matrix_037 +map_matrix_038 +map_matrix_039 +map_matrix_040 +map_matrix_041 +map_matrix_042 +map_matrix_043 +map_matrix_044 +map_matrix_045 +map_matrix_046 +map_matrix_047 +map_matrix_048 +map_matrix_049 +map_matrix_050 +map_matrix_051 +map_matrix_052 +map_matrix_053 +map_matrix_054 +map_matrix_055 +map_matrix_056 +map_matrix_057 +map_matrix_058 +map_matrix_059 +map_matrix_060 +map_matrix_061 +map_matrix_062 +map_matrix_063 +map_matrix_064 +map_matrix_065 +map_matrix_066 +map_matrix_067 +map_matrix_068 +map_matrix_069 +map_matrix_070 +map_matrix_071 +map_matrix_072 +map_matrix_073 +map_matrix_074 +map_matrix_075 +map_matrix_076 +map_matrix_077 +map_matrix_078 +map_matrix_079 +map_matrix_080 +map_matrix_081 +map_matrix_082 +map_matrix_083 +map_matrix_084 +map_matrix_085 +map_matrix_086 +map_matrix_087 +map_matrix_088 +map_matrix_089 +map_matrix_090 +map_matrix_091 +map_matrix_092 +map_matrix_093 +map_matrix_094 +map_matrix_095 +map_matrix_096 +map_matrix_097 +map_matrix_098 +map_matrix_099 +map_matrix_100 +map_matrix_101 +map_matrix_102 +map_matrix_103 +map_matrix_104 +map_matrix_105 +map_matrix_106 +map_matrix_107 +map_matrix_108 +map_matrix_109 +map_matrix_110 +map_matrix_111 +map_matrix_112 +map_matrix_113 +map_matrix_114 +map_matrix_115 +map_matrix_116 +map_matrix_117 +map_matrix_118 +map_matrix_119 +map_matrix_120 +map_matrix_121 +map_matrix_122 +map_matrix_123 +map_matrix_124 +map_matrix_125 +map_matrix_126 +map_matrix_127 +map_matrix_128 +map_matrix_129 +map_matrix_130 +map_matrix_131 +map_matrix_132 +map_matrix_133 +map_matrix_134 +map_matrix_135 +map_matrix_136 +map_matrix_137 +map_matrix_138 +map_matrix_139 +map_matrix_140 +map_matrix_141 +map_matrix_142 +map_matrix_143 +map_matrix_144 +map_matrix_145 +map_matrix_146 +map_matrix_147 +map_matrix_148 +map_matrix_149 +map_matrix_150 +map_matrix_151 +map_matrix_152 +map_matrix_153 +map_matrix_154 +map_matrix_155 +map_matrix_156 +map_matrix_157 +map_matrix_158 +map_matrix_159 +map_matrix_160 +map_matrix_161 +map_matrix_162 +map_matrix_163 +map_matrix_164 +map_matrix_165 +map_matrix_166 +map_matrix_167 +map_matrix_168 +map_matrix_169 +map_matrix_170 +map_matrix_171 +map_matrix_172 +map_matrix_173 +map_matrix_174 +map_matrix_175 +map_matrix_176 +map_matrix_177 +map_matrix_178 +map_matrix_179 +map_matrix_180 +map_matrix_181 +map_matrix_182 +map_matrix_183 +map_matrix_184 +map_matrix_185 +map_matrix_186 +map_matrix_187 +map_matrix_188 +map_matrix_189 +map_matrix_190 +map_matrix_191 +map_matrix_192 +map_matrix_193 +map_matrix_194 +map_matrix_195 +map_matrix_196 +map_matrix_197 +map_matrix_198 +map_matrix_199 +map_matrix_200 +map_matrix_201 +map_matrix_202 +map_matrix_203 +map_matrix_204 +map_matrix_205 +map_matrix_206 +map_matrix_207 +map_matrix_208 +map_matrix_209 +map_matrix_210 +map_matrix_211 +map_matrix_212 +map_matrix_213 +map_matrix_214 +map_matrix_215 +map_matrix_216 +map_matrix_217 +map_matrix_218 +map_matrix_219 +map_matrix_220 +map_matrix_221 +map_matrix_222 +map_matrix_223 +map_matrix_224 +map_matrix_225 +map_matrix_226 +map_matrix_227 +map_matrix_228 +map_matrix_229 +map_matrix_230 +map_matrix_231 +map_matrix_232 +map_matrix_233 +map_matrix_234 +map_matrix_235 +map_matrix_236 +map_matrix_237 +map_matrix_238 +map_matrix_239 +map_matrix_240 +map_matrix_241 +map_matrix_242 +map_matrix_243 +map_matrix_244 +map_matrix_245 +map_matrix_246 +map_matrix_247 +map_matrix_248 +map_matrix_249 +map_matrix_250 +map_matrix_251 +map_matrix_252 +map_matrix_253 +map_matrix_254 +map_matrix_255 +map_matrix_256 +map_matrix_257 +map_matrix_258 +map_matrix_259 +map_matrix_260 +map_matrix_261 +map_matrix_262 +map_matrix_263 +map_matrix_264 +map_matrix_265 +map_matrix_266 +map_matrix_267 +map_matrix_268 +map_matrix_269 +map_matrix_270 +map_matrix_271 +map_matrix_272 +map_matrix_273 +map_matrix_274 +map_matrix_275 +map_matrix_276 +map_matrix_277 +map_matrix_278 +map_matrix_279 +map_matrix_280 +map_matrix_281 +map_matrix_282 +map_matrix_283 +map_matrix_284 +map_matrix_285 +map_matrix_286 +map_matrix_287 +map_matrix_288 diff --git a/res/field/maps/matrices/map_matrix_000.json b/res/field/matrices/map_matrix_000.json similarity index 100% rename from res/field/maps/matrices/map_matrix_000.json rename to res/field/matrices/map_matrix_000.json diff --git a/res/field/maps/matrices/map_matrix_001.json b/res/field/matrices/map_matrix_001.json similarity index 100% rename from res/field/maps/matrices/map_matrix_001.json rename to res/field/matrices/map_matrix_001.json diff --git a/res/field/maps/matrices/map_matrix_002.json b/res/field/matrices/map_matrix_002.json similarity index 100% rename from res/field/maps/matrices/map_matrix_002.json rename to res/field/matrices/map_matrix_002.json diff --git a/res/field/maps/matrices/map_matrix_003.json b/res/field/matrices/map_matrix_003.json similarity index 100% rename from res/field/maps/matrices/map_matrix_003.json rename to res/field/matrices/map_matrix_003.json diff --git a/res/field/maps/matrices/map_matrix_004.json b/res/field/matrices/map_matrix_004.json similarity index 100% rename from res/field/maps/matrices/map_matrix_004.json rename to res/field/matrices/map_matrix_004.json diff --git a/res/field/maps/matrices/map_matrix_005.json b/res/field/matrices/map_matrix_005.json similarity index 100% rename from res/field/maps/matrices/map_matrix_005.json rename to res/field/matrices/map_matrix_005.json diff --git a/res/field/maps/matrices/map_matrix_006.json b/res/field/matrices/map_matrix_006.json similarity index 100% rename from res/field/maps/matrices/map_matrix_006.json rename to res/field/matrices/map_matrix_006.json diff --git a/res/field/maps/matrices/map_matrix_007.json b/res/field/matrices/map_matrix_007.json similarity index 100% rename from res/field/maps/matrices/map_matrix_007.json rename to res/field/matrices/map_matrix_007.json diff --git a/res/field/maps/matrices/map_matrix_008.json b/res/field/matrices/map_matrix_008.json similarity index 100% rename from res/field/maps/matrices/map_matrix_008.json rename to res/field/matrices/map_matrix_008.json diff --git a/res/field/maps/matrices/map_matrix_009.json b/res/field/matrices/map_matrix_009.json similarity index 100% rename from res/field/maps/matrices/map_matrix_009.json rename to res/field/matrices/map_matrix_009.json diff --git a/res/field/maps/matrices/map_matrix_010.json b/res/field/matrices/map_matrix_010.json similarity index 100% rename from res/field/maps/matrices/map_matrix_010.json rename to res/field/matrices/map_matrix_010.json diff --git a/res/field/maps/matrices/map_matrix_011.json b/res/field/matrices/map_matrix_011.json similarity index 100% rename from res/field/maps/matrices/map_matrix_011.json rename to res/field/matrices/map_matrix_011.json diff --git a/res/field/maps/matrices/map_matrix_012.json b/res/field/matrices/map_matrix_012.json similarity index 100% rename from res/field/maps/matrices/map_matrix_012.json rename to res/field/matrices/map_matrix_012.json diff --git a/res/field/maps/matrices/map_matrix_013.json b/res/field/matrices/map_matrix_013.json similarity index 100% rename from res/field/maps/matrices/map_matrix_013.json rename to res/field/matrices/map_matrix_013.json diff --git a/res/field/maps/matrices/map_matrix_014.json b/res/field/matrices/map_matrix_014.json similarity index 100% rename from res/field/maps/matrices/map_matrix_014.json rename to res/field/matrices/map_matrix_014.json diff --git a/res/field/maps/matrices/map_matrix_015.json b/res/field/matrices/map_matrix_015.json similarity index 100% rename from res/field/maps/matrices/map_matrix_015.json rename to res/field/matrices/map_matrix_015.json diff --git a/res/field/maps/matrices/map_matrix_016.json b/res/field/matrices/map_matrix_016.json similarity index 100% rename from res/field/maps/matrices/map_matrix_016.json rename to res/field/matrices/map_matrix_016.json diff --git a/res/field/maps/matrices/map_matrix_017.json b/res/field/matrices/map_matrix_017.json similarity index 100% rename from res/field/maps/matrices/map_matrix_017.json rename to res/field/matrices/map_matrix_017.json diff --git a/res/field/maps/matrices/map_matrix_018.json b/res/field/matrices/map_matrix_018.json similarity index 100% rename from res/field/maps/matrices/map_matrix_018.json rename to res/field/matrices/map_matrix_018.json diff --git a/res/field/maps/matrices/map_matrix_019.json b/res/field/matrices/map_matrix_019.json similarity index 100% rename from res/field/maps/matrices/map_matrix_019.json rename to res/field/matrices/map_matrix_019.json diff --git a/res/field/maps/matrices/map_matrix_020.json b/res/field/matrices/map_matrix_020.json similarity index 100% rename from res/field/maps/matrices/map_matrix_020.json rename to res/field/matrices/map_matrix_020.json diff --git a/res/field/maps/matrices/map_matrix_021.json b/res/field/matrices/map_matrix_021.json similarity index 100% rename from res/field/maps/matrices/map_matrix_021.json rename to res/field/matrices/map_matrix_021.json diff --git a/res/field/maps/matrices/map_matrix_022.json b/res/field/matrices/map_matrix_022.json similarity index 100% rename from res/field/maps/matrices/map_matrix_022.json rename to res/field/matrices/map_matrix_022.json diff --git a/res/field/maps/matrices/map_matrix_023.json b/res/field/matrices/map_matrix_023.json similarity index 100% rename from res/field/maps/matrices/map_matrix_023.json rename to res/field/matrices/map_matrix_023.json diff --git a/res/field/maps/matrices/map_matrix_024.json b/res/field/matrices/map_matrix_024.json similarity index 100% rename from res/field/maps/matrices/map_matrix_024.json rename to res/field/matrices/map_matrix_024.json diff --git a/res/field/maps/matrices/map_matrix_025.json b/res/field/matrices/map_matrix_025.json similarity index 100% rename from res/field/maps/matrices/map_matrix_025.json rename to res/field/matrices/map_matrix_025.json diff --git a/res/field/maps/matrices/map_matrix_026.json b/res/field/matrices/map_matrix_026.json similarity index 100% rename from res/field/maps/matrices/map_matrix_026.json rename to res/field/matrices/map_matrix_026.json diff --git a/res/field/maps/matrices/map_matrix_027.json b/res/field/matrices/map_matrix_027.json similarity index 100% rename from res/field/maps/matrices/map_matrix_027.json rename to res/field/matrices/map_matrix_027.json diff --git a/res/field/maps/matrices/map_matrix_028.json b/res/field/matrices/map_matrix_028.json similarity index 100% rename from res/field/maps/matrices/map_matrix_028.json rename to res/field/matrices/map_matrix_028.json diff --git a/res/field/maps/matrices/map_matrix_029.json b/res/field/matrices/map_matrix_029.json similarity index 100% rename from res/field/maps/matrices/map_matrix_029.json rename to res/field/matrices/map_matrix_029.json diff --git a/res/field/maps/matrices/map_matrix_030.json b/res/field/matrices/map_matrix_030.json similarity index 100% rename from res/field/maps/matrices/map_matrix_030.json rename to res/field/matrices/map_matrix_030.json diff --git a/res/field/maps/matrices/map_matrix_031.json b/res/field/matrices/map_matrix_031.json similarity index 100% rename from res/field/maps/matrices/map_matrix_031.json rename to res/field/matrices/map_matrix_031.json diff --git a/res/field/maps/matrices/map_matrix_032.json b/res/field/matrices/map_matrix_032.json similarity index 100% rename from res/field/maps/matrices/map_matrix_032.json rename to res/field/matrices/map_matrix_032.json diff --git a/res/field/maps/matrices/map_matrix_033.json b/res/field/matrices/map_matrix_033.json similarity index 100% rename from res/field/maps/matrices/map_matrix_033.json rename to res/field/matrices/map_matrix_033.json diff --git a/res/field/maps/matrices/map_matrix_034.json b/res/field/matrices/map_matrix_034.json similarity index 100% rename from res/field/maps/matrices/map_matrix_034.json rename to res/field/matrices/map_matrix_034.json diff --git a/res/field/maps/matrices/map_matrix_035.json b/res/field/matrices/map_matrix_035.json similarity index 100% rename from res/field/maps/matrices/map_matrix_035.json rename to res/field/matrices/map_matrix_035.json diff --git a/res/field/maps/matrices/map_matrix_036.json b/res/field/matrices/map_matrix_036.json similarity index 100% rename from res/field/maps/matrices/map_matrix_036.json rename to res/field/matrices/map_matrix_036.json diff --git a/res/field/maps/matrices/map_matrix_037.json b/res/field/matrices/map_matrix_037.json similarity index 100% rename from res/field/maps/matrices/map_matrix_037.json rename to res/field/matrices/map_matrix_037.json diff --git a/res/field/maps/matrices/map_matrix_038.json b/res/field/matrices/map_matrix_038.json similarity index 100% rename from res/field/maps/matrices/map_matrix_038.json rename to res/field/matrices/map_matrix_038.json diff --git a/res/field/maps/matrices/map_matrix_039.json b/res/field/matrices/map_matrix_039.json similarity index 100% rename from res/field/maps/matrices/map_matrix_039.json rename to res/field/matrices/map_matrix_039.json diff --git a/res/field/maps/matrices/map_matrix_040.json b/res/field/matrices/map_matrix_040.json similarity index 100% rename from res/field/maps/matrices/map_matrix_040.json rename to res/field/matrices/map_matrix_040.json diff --git a/res/field/maps/matrices/map_matrix_041.json b/res/field/matrices/map_matrix_041.json similarity index 100% rename from res/field/maps/matrices/map_matrix_041.json rename to res/field/matrices/map_matrix_041.json diff --git a/res/field/maps/matrices/map_matrix_042.json b/res/field/matrices/map_matrix_042.json similarity index 100% rename from res/field/maps/matrices/map_matrix_042.json rename to res/field/matrices/map_matrix_042.json diff --git a/res/field/maps/matrices/map_matrix_043.json b/res/field/matrices/map_matrix_043.json similarity index 100% rename from res/field/maps/matrices/map_matrix_043.json rename to res/field/matrices/map_matrix_043.json diff --git a/res/field/maps/matrices/map_matrix_044.json b/res/field/matrices/map_matrix_044.json similarity index 100% rename from res/field/maps/matrices/map_matrix_044.json rename to res/field/matrices/map_matrix_044.json diff --git a/res/field/maps/matrices/map_matrix_045.json b/res/field/matrices/map_matrix_045.json similarity index 100% rename from res/field/maps/matrices/map_matrix_045.json rename to res/field/matrices/map_matrix_045.json diff --git a/res/field/maps/matrices/map_matrix_046.json b/res/field/matrices/map_matrix_046.json similarity index 100% rename from res/field/maps/matrices/map_matrix_046.json rename to res/field/matrices/map_matrix_046.json diff --git a/res/field/maps/matrices/map_matrix_047.json b/res/field/matrices/map_matrix_047.json similarity index 100% rename from res/field/maps/matrices/map_matrix_047.json rename to res/field/matrices/map_matrix_047.json diff --git a/res/field/maps/matrices/map_matrix_048.json b/res/field/matrices/map_matrix_048.json similarity index 100% rename from res/field/maps/matrices/map_matrix_048.json rename to res/field/matrices/map_matrix_048.json diff --git a/res/field/maps/matrices/map_matrix_049.json b/res/field/matrices/map_matrix_049.json similarity index 100% rename from res/field/maps/matrices/map_matrix_049.json rename to res/field/matrices/map_matrix_049.json diff --git a/res/field/maps/matrices/map_matrix_050.json b/res/field/matrices/map_matrix_050.json similarity index 100% rename from res/field/maps/matrices/map_matrix_050.json rename to res/field/matrices/map_matrix_050.json diff --git a/res/field/maps/matrices/map_matrix_051.json b/res/field/matrices/map_matrix_051.json similarity index 100% rename from res/field/maps/matrices/map_matrix_051.json rename to res/field/matrices/map_matrix_051.json diff --git a/res/field/maps/matrices/map_matrix_052.json b/res/field/matrices/map_matrix_052.json similarity index 100% rename from res/field/maps/matrices/map_matrix_052.json rename to res/field/matrices/map_matrix_052.json diff --git a/res/field/maps/matrices/map_matrix_053.json b/res/field/matrices/map_matrix_053.json similarity index 100% rename from res/field/maps/matrices/map_matrix_053.json rename to res/field/matrices/map_matrix_053.json diff --git a/res/field/maps/matrices/map_matrix_054.json b/res/field/matrices/map_matrix_054.json similarity index 100% rename from res/field/maps/matrices/map_matrix_054.json rename to res/field/matrices/map_matrix_054.json diff --git a/res/field/maps/matrices/map_matrix_055.json b/res/field/matrices/map_matrix_055.json similarity index 100% rename from res/field/maps/matrices/map_matrix_055.json rename to res/field/matrices/map_matrix_055.json diff --git a/res/field/maps/matrices/map_matrix_056.json b/res/field/matrices/map_matrix_056.json similarity index 100% rename from res/field/maps/matrices/map_matrix_056.json rename to res/field/matrices/map_matrix_056.json diff --git a/res/field/maps/matrices/map_matrix_057.json b/res/field/matrices/map_matrix_057.json similarity index 100% rename from res/field/maps/matrices/map_matrix_057.json rename to res/field/matrices/map_matrix_057.json diff --git a/res/field/maps/matrices/map_matrix_058.json b/res/field/matrices/map_matrix_058.json similarity index 100% rename from res/field/maps/matrices/map_matrix_058.json rename to res/field/matrices/map_matrix_058.json diff --git a/res/field/maps/matrices/map_matrix_059.json b/res/field/matrices/map_matrix_059.json similarity index 100% rename from res/field/maps/matrices/map_matrix_059.json rename to res/field/matrices/map_matrix_059.json diff --git a/res/field/maps/matrices/map_matrix_060.json b/res/field/matrices/map_matrix_060.json similarity index 100% rename from res/field/maps/matrices/map_matrix_060.json rename to res/field/matrices/map_matrix_060.json diff --git a/res/field/maps/matrices/map_matrix_061.json b/res/field/matrices/map_matrix_061.json similarity index 100% rename from res/field/maps/matrices/map_matrix_061.json rename to res/field/matrices/map_matrix_061.json diff --git a/res/field/maps/matrices/map_matrix_062.json b/res/field/matrices/map_matrix_062.json similarity index 100% rename from res/field/maps/matrices/map_matrix_062.json rename to res/field/matrices/map_matrix_062.json diff --git a/res/field/maps/matrices/map_matrix_063.json b/res/field/matrices/map_matrix_063.json similarity index 100% rename from res/field/maps/matrices/map_matrix_063.json rename to res/field/matrices/map_matrix_063.json diff --git a/res/field/maps/matrices/map_matrix_064.json b/res/field/matrices/map_matrix_064.json similarity index 100% rename from res/field/maps/matrices/map_matrix_064.json rename to res/field/matrices/map_matrix_064.json diff --git a/res/field/maps/matrices/map_matrix_065.json b/res/field/matrices/map_matrix_065.json similarity index 100% rename from res/field/maps/matrices/map_matrix_065.json rename to res/field/matrices/map_matrix_065.json diff --git a/res/field/maps/matrices/map_matrix_066.json b/res/field/matrices/map_matrix_066.json similarity index 100% rename from res/field/maps/matrices/map_matrix_066.json rename to res/field/matrices/map_matrix_066.json diff --git a/res/field/maps/matrices/map_matrix_067.json b/res/field/matrices/map_matrix_067.json similarity index 100% rename from res/field/maps/matrices/map_matrix_067.json rename to res/field/matrices/map_matrix_067.json diff --git a/res/field/maps/matrices/map_matrix_068.json b/res/field/matrices/map_matrix_068.json similarity index 100% rename from res/field/maps/matrices/map_matrix_068.json rename to res/field/matrices/map_matrix_068.json diff --git a/res/field/maps/matrices/map_matrix_069.json b/res/field/matrices/map_matrix_069.json similarity index 100% rename from res/field/maps/matrices/map_matrix_069.json rename to res/field/matrices/map_matrix_069.json diff --git a/res/field/maps/matrices/map_matrix_070.json b/res/field/matrices/map_matrix_070.json similarity index 100% rename from res/field/maps/matrices/map_matrix_070.json rename to res/field/matrices/map_matrix_070.json diff --git a/res/field/maps/matrices/map_matrix_071.json b/res/field/matrices/map_matrix_071.json similarity index 100% rename from res/field/maps/matrices/map_matrix_071.json rename to res/field/matrices/map_matrix_071.json diff --git a/res/field/maps/matrices/map_matrix_072.json b/res/field/matrices/map_matrix_072.json similarity index 100% rename from res/field/maps/matrices/map_matrix_072.json rename to res/field/matrices/map_matrix_072.json diff --git a/res/field/maps/matrices/map_matrix_073.json b/res/field/matrices/map_matrix_073.json similarity index 100% rename from res/field/maps/matrices/map_matrix_073.json rename to res/field/matrices/map_matrix_073.json diff --git a/res/field/maps/matrices/map_matrix_074.json b/res/field/matrices/map_matrix_074.json similarity index 100% rename from res/field/maps/matrices/map_matrix_074.json rename to res/field/matrices/map_matrix_074.json diff --git a/res/field/maps/matrices/map_matrix_075.json b/res/field/matrices/map_matrix_075.json similarity index 100% rename from res/field/maps/matrices/map_matrix_075.json rename to res/field/matrices/map_matrix_075.json diff --git a/res/field/maps/matrices/map_matrix_076.json b/res/field/matrices/map_matrix_076.json similarity index 100% rename from res/field/maps/matrices/map_matrix_076.json rename to res/field/matrices/map_matrix_076.json diff --git a/res/field/maps/matrices/map_matrix_077.json b/res/field/matrices/map_matrix_077.json similarity index 100% rename from res/field/maps/matrices/map_matrix_077.json rename to res/field/matrices/map_matrix_077.json diff --git a/res/field/maps/matrices/map_matrix_078.json b/res/field/matrices/map_matrix_078.json similarity index 100% rename from res/field/maps/matrices/map_matrix_078.json rename to res/field/matrices/map_matrix_078.json diff --git a/res/field/maps/matrices/map_matrix_079.json b/res/field/matrices/map_matrix_079.json similarity index 100% rename from res/field/maps/matrices/map_matrix_079.json rename to res/field/matrices/map_matrix_079.json diff --git a/res/field/maps/matrices/map_matrix_080.json b/res/field/matrices/map_matrix_080.json similarity index 100% rename from res/field/maps/matrices/map_matrix_080.json rename to res/field/matrices/map_matrix_080.json diff --git a/res/field/maps/matrices/map_matrix_081.json b/res/field/matrices/map_matrix_081.json similarity index 100% rename from res/field/maps/matrices/map_matrix_081.json rename to res/field/matrices/map_matrix_081.json diff --git a/res/field/maps/matrices/map_matrix_082.json b/res/field/matrices/map_matrix_082.json similarity index 100% rename from res/field/maps/matrices/map_matrix_082.json rename to res/field/matrices/map_matrix_082.json diff --git a/res/field/maps/matrices/map_matrix_083.json b/res/field/matrices/map_matrix_083.json similarity index 100% rename from res/field/maps/matrices/map_matrix_083.json rename to res/field/matrices/map_matrix_083.json diff --git a/res/field/maps/matrices/map_matrix_084.json b/res/field/matrices/map_matrix_084.json similarity index 100% rename from res/field/maps/matrices/map_matrix_084.json rename to res/field/matrices/map_matrix_084.json diff --git a/res/field/maps/matrices/map_matrix_085.json b/res/field/matrices/map_matrix_085.json similarity index 100% rename from res/field/maps/matrices/map_matrix_085.json rename to res/field/matrices/map_matrix_085.json diff --git a/res/field/maps/matrices/map_matrix_086.json b/res/field/matrices/map_matrix_086.json similarity index 100% rename from res/field/maps/matrices/map_matrix_086.json rename to res/field/matrices/map_matrix_086.json diff --git a/res/field/maps/matrices/map_matrix_087.json b/res/field/matrices/map_matrix_087.json similarity index 100% rename from res/field/maps/matrices/map_matrix_087.json rename to res/field/matrices/map_matrix_087.json diff --git a/res/field/maps/matrices/map_matrix_088.json b/res/field/matrices/map_matrix_088.json similarity index 100% rename from res/field/maps/matrices/map_matrix_088.json rename to res/field/matrices/map_matrix_088.json diff --git a/res/field/maps/matrices/map_matrix_089.json b/res/field/matrices/map_matrix_089.json similarity index 100% rename from res/field/maps/matrices/map_matrix_089.json rename to res/field/matrices/map_matrix_089.json diff --git a/res/field/maps/matrices/map_matrix_090.json b/res/field/matrices/map_matrix_090.json similarity index 100% rename from res/field/maps/matrices/map_matrix_090.json rename to res/field/matrices/map_matrix_090.json diff --git a/res/field/maps/matrices/map_matrix_091.json b/res/field/matrices/map_matrix_091.json similarity index 100% rename from res/field/maps/matrices/map_matrix_091.json rename to res/field/matrices/map_matrix_091.json diff --git a/res/field/maps/matrices/map_matrix_092.json b/res/field/matrices/map_matrix_092.json similarity index 100% rename from res/field/maps/matrices/map_matrix_092.json rename to res/field/matrices/map_matrix_092.json diff --git a/res/field/maps/matrices/map_matrix_093.json b/res/field/matrices/map_matrix_093.json similarity index 100% rename from res/field/maps/matrices/map_matrix_093.json rename to res/field/matrices/map_matrix_093.json diff --git a/res/field/maps/matrices/map_matrix_094.json b/res/field/matrices/map_matrix_094.json similarity index 100% rename from res/field/maps/matrices/map_matrix_094.json rename to res/field/matrices/map_matrix_094.json diff --git a/res/field/maps/matrices/map_matrix_095.json b/res/field/matrices/map_matrix_095.json similarity index 100% rename from res/field/maps/matrices/map_matrix_095.json rename to res/field/matrices/map_matrix_095.json diff --git a/res/field/maps/matrices/map_matrix_096.json b/res/field/matrices/map_matrix_096.json similarity index 100% rename from res/field/maps/matrices/map_matrix_096.json rename to res/field/matrices/map_matrix_096.json diff --git a/res/field/maps/matrices/map_matrix_097.json b/res/field/matrices/map_matrix_097.json similarity index 100% rename from res/field/maps/matrices/map_matrix_097.json rename to res/field/matrices/map_matrix_097.json diff --git a/res/field/maps/matrices/map_matrix_098.json b/res/field/matrices/map_matrix_098.json similarity index 100% rename from res/field/maps/matrices/map_matrix_098.json rename to res/field/matrices/map_matrix_098.json diff --git a/res/field/maps/matrices/map_matrix_099.json b/res/field/matrices/map_matrix_099.json similarity index 100% rename from res/field/maps/matrices/map_matrix_099.json rename to res/field/matrices/map_matrix_099.json diff --git a/res/field/maps/matrices/map_matrix_100.json b/res/field/matrices/map_matrix_100.json similarity index 100% rename from res/field/maps/matrices/map_matrix_100.json rename to res/field/matrices/map_matrix_100.json diff --git a/res/field/maps/matrices/map_matrix_101.json b/res/field/matrices/map_matrix_101.json similarity index 100% rename from res/field/maps/matrices/map_matrix_101.json rename to res/field/matrices/map_matrix_101.json diff --git a/res/field/maps/matrices/map_matrix_102.json b/res/field/matrices/map_matrix_102.json similarity index 100% rename from res/field/maps/matrices/map_matrix_102.json rename to res/field/matrices/map_matrix_102.json diff --git a/res/field/maps/matrices/map_matrix_103.json b/res/field/matrices/map_matrix_103.json similarity index 100% rename from res/field/maps/matrices/map_matrix_103.json rename to res/field/matrices/map_matrix_103.json diff --git a/res/field/maps/matrices/map_matrix_104.json b/res/field/matrices/map_matrix_104.json similarity index 100% rename from res/field/maps/matrices/map_matrix_104.json rename to res/field/matrices/map_matrix_104.json diff --git a/res/field/maps/matrices/map_matrix_105.json b/res/field/matrices/map_matrix_105.json similarity index 100% rename from res/field/maps/matrices/map_matrix_105.json rename to res/field/matrices/map_matrix_105.json diff --git a/res/field/maps/matrices/map_matrix_106.json b/res/field/matrices/map_matrix_106.json similarity index 100% rename from res/field/maps/matrices/map_matrix_106.json rename to res/field/matrices/map_matrix_106.json diff --git a/res/field/maps/matrices/map_matrix_107.json b/res/field/matrices/map_matrix_107.json similarity index 100% rename from res/field/maps/matrices/map_matrix_107.json rename to res/field/matrices/map_matrix_107.json diff --git a/res/field/maps/matrices/map_matrix_108.json b/res/field/matrices/map_matrix_108.json similarity index 100% rename from res/field/maps/matrices/map_matrix_108.json rename to res/field/matrices/map_matrix_108.json diff --git a/res/field/maps/matrices/map_matrix_109.json b/res/field/matrices/map_matrix_109.json similarity index 100% rename from res/field/maps/matrices/map_matrix_109.json rename to res/field/matrices/map_matrix_109.json diff --git a/res/field/maps/matrices/map_matrix_110.json b/res/field/matrices/map_matrix_110.json similarity index 100% rename from res/field/maps/matrices/map_matrix_110.json rename to res/field/matrices/map_matrix_110.json diff --git a/res/field/maps/matrices/map_matrix_111.json b/res/field/matrices/map_matrix_111.json similarity index 100% rename from res/field/maps/matrices/map_matrix_111.json rename to res/field/matrices/map_matrix_111.json diff --git a/res/field/maps/matrices/map_matrix_112.json b/res/field/matrices/map_matrix_112.json similarity index 100% rename from res/field/maps/matrices/map_matrix_112.json rename to res/field/matrices/map_matrix_112.json diff --git a/res/field/maps/matrices/map_matrix_113.json b/res/field/matrices/map_matrix_113.json similarity index 100% rename from res/field/maps/matrices/map_matrix_113.json rename to res/field/matrices/map_matrix_113.json diff --git a/res/field/maps/matrices/map_matrix_114.json b/res/field/matrices/map_matrix_114.json similarity index 100% rename from res/field/maps/matrices/map_matrix_114.json rename to res/field/matrices/map_matrix_114.json diff --git a/res/field/maps/matrices/map_matrix_115.json b/res/field/matrices/map_matrix_115.json similarity index 100% rename from res/field/maps/matrices/map_matrix_115.json rename to res/field/matrices/map_matrix_115.json diff --git a/res/field/maps/matrices/map_matrix_116.json b/res/field/matrices/map_matrix_116.json similarity index 100% rename from res/field/maps/matrices/map_matrix_116.json rename to res/field/matrices/map_matrix_116.json diff --git a/res/field/maps/matrices/map_matrix_117.json b/res/field/matrices/map_matrix_117.json similarity index 100% rename from res/field/maps/matrices/map_matrix_117.json rename to res/field/matrices/map_matrix_117.json diff --git a/res/field/maps/matrices/map_matrix_118.json b/res/field/matrices/map_matrix_118.json similarity index 100% rename from res/field/maps/matrices/map_matrix_118.json rename to res/field/matrices/map_matrix_118.json diff --git a/res/field/maps/matrices/map_matrix_119.json b/res/field/matrices/map_matrix_119.json similarity index 100% rename from res/field/maps/matrices/map_matrix_119.json rename to res/field/matrices/map_matrix_119.json diff --git a/res/field/maps/matrices/map_matrix_120.json b/res/field/matrices/map_matrix_120.json similarity index 100% rename from res/field/maps/matrices/map_matrix_120.json rename to res/field/matrices/map_matrix_120.json diff --git a/res/field/maps/matrices/map_matrix_121.json b/res/field/matrices/map_matrix_121.json similarity index 100% rename from res/field/maps/matrices/map_matrix_121.json rename to res/field/matrices/map_matrix_121.json diff --git a/res/field/maps/matrices/map_matrix_122.json b/res/field/matrices/map_matrix_122.json similarity index 100% rename from res/field/maps/matrices/map_matrix_122.json rename to res/field/matrices/map_matrix_122.json diff --git a/res/field/maps/matrices/map_matrix_123.json b/res/field/matrices/map_matrix_123.json similarity index 100% rename from res/field/maps/matrices/map_matrix_123.json rename to res/field/matrices/map_matrix_123.json diff --git a/res/field/maps/matrices/map_matrix_124.json b/res/field/matrices/map_matrix_124.json similarity index 100% rename from res/field/maps/matrices/map_matrix_124.json rename to res/field/matrices/map_matrix_124.json diff --git a/res/field/maps/matrices/map_matrix_125.json b/res/field/matrices/map_matrix_125.json similarity index 100% rename from res/field/maps/matrices/map_matrix_125.json rename to res/field/matrices/map_matrix_125.json diff --git a/res/field/maps/matrices/map_matrix_126.json b/res/field/matrices/map_matrix_126.json similarity index 100% rename from res/field/maps/matrices/map_matrix_126.json rename to res/field/matrices/map_matrix_126.json diff --git a/res/field/maps/matrices/map_matrix_127.json b/res/field/matrices/map_matrix_127.json similarity index 100% rename from res/field/maps/matrices/map_matrix_127.json rename to res/field/matrices/map_matrix_127.json diff --git a/res/field/maps/matrices/map_matrix_128.json b/res/field/matrices/map_matrix_128.json similarity index 100% rename from res/field/maps/matrices/map_matrix_128.json rename to res/field/matrices/map_matrix_128.json diff --git a/res/field/maps/matrices/map_matrix_129.json b/res/field/matrices/map_matrix_129.json similarity index 100% rename from res/field/maps/matrices/map_matrix_129.json rename to res/field/matrices/map_matrix_129.json diff --git a/res/field/maps/matrices/map_matrix_130.json b/res/field/matrices/map_matrix_130.json similarity index 100% rename from res/field/maps/matrices/map_matrix_130.json rename to res/field/matrices/map_matrix_130.json diff --git a/res/field/maps/matrices/map_matrix_131.json b/res/field/matrices/map_matrix_131.json similarity index 100% rename from res/field/maps/matrices/map_matrix_131.json rename to res/field/matrices/map_matrix_131.json diff --git a/res/field/maps/matrices/map_matrix_132.json b/res/field/matrices/map_matrix_132.json similarity index 100% rename from res/field/maps/matrices/map_matrix_132.json rename to res/field/matrices/map_matrix_132.json diff --git a/res/field/maps/matrices/map_matrix_133.json b/res/field/matrices/map_matrix_133.json similarity index 100% rename from res/field/maps/matrices/map_matrix_133.json rename to res/field/matrices/map_matrix_133.json diff --git a/res/field/maps/matrices/map_matrix_134.json b/res/field/matrices/map_matrix_134.json similarity index 100% rename from res/field/maps/matrices/map_matrix_134.json rename to res/field/matrices/map_matrix_134.json diff --git a/res/field/maps/matrices/map_matrix_135.json b/res/field/matrices/map_matrix_135.json similarity index 100% rename from res/field/maps/matrices/map_matrix_135.json rename to res/field/matrices/map_matrix_135.json diff --git a/res/field/maps/matrices/map_matrix_136.json b/res/field/matrices/map_matrix_136.json similarity index 100% rename from res/field/maps/matrices/map_matrix_136.json rename to res/field/matrices/map_matrix_136.json diff --git a/res/field/maps/matrices/map_matrix_137.json b/res/field/matrices/map_matrix_137.json similarity index 100% rename from res/field/maps/matrices/map_matrix_137.json rename to res/field/matrices/map_matrix_137.json diff --git a/res/field/maps/matrices/map_matrix_138.json b/res/field/matrices/map_matrix_138.json similarity index 100% rename from res/field/maps/matrices/map_matrix_138.json rename to res/field/matrices/map_matrix_138.json diff --git a/res/field/maps/matrices/map_matrix_139.json b/res/field/matrices/map_matrix_139.json similarity index 100% rename from res/field/maps/matrices/map_matrix_139.json rename to res/field/matrices/map_matrix_139.json diff --git a/res/field/maps/matrices/map_matrix_140.json b/res/field/matrices/map_matrix_140.json similarity index 100% rename from res/field/maps/matrices/map_matrix_140.json rename to res/field/matrices/map_matrix_140.json diff --git a/res/field/maps/matrices/map_matrix_141.json b/res/field/matrices/map_matrix_141.json similarity index 100% rename from res/field/maps/matrices/map_matrix_141.json rename to res/field/matrices/map_matrix_141.json diff --git a/res/field/maps/matrices/map_matrix_142.json b/res/field/matrices/map_matrix_142.json similarity index 100% rename from res/field/maps/matrices/map_matrix_142.json rename to res/field/matrices/map_matrix_142.json diff --git a/res/field/maps/matrices/map_matrix_143.json b/res/field/matrices/map_matrix_143.json similarity index 100% rename from res/field/maps/matrices/map_matrix_143.json rename to res/field/matrices/map_matrix_143.json diff --git a/res/field/maps/matrices/map_matrix_144.json b/res/field/matrices/map_matrix_144.json similarity index 100% rename from res/field/maps/matrices/map_matrix_144.json rename to res/field/matrices/map_matrix_144.json diff --git a/res/field/maps/matrices/map_matrix_145.json b/res/field/matrices/map_matrix_145.json similarity index 100% rename from res/field/maps/matrices/map_matrix_145.json rename to res/field/matrices/map_matrix_145.json diff --git a/res/field/maps/matrices/map_matrix_146.json b/res/field/matrices/map_matrix_146.json similarity index 100% rename from res/field/maps/matrices/map_matrix_146.json rename to res/field/matrices/map_matrix_146.json diff --git a/res/field/maps/matrices/map_matrix_147.json b/res/field/matrices/map_matrix_147.json similarity index 100% rename from res/field/maps/matrices/map_matrix_147.json rename to res/field/matrices/map_matrix_147.json diff --git a/res/field/maps/matrices/map_matrix_148.json b/res/field/matrices/map_matrix_148.json similarity index 100% rename from res/field/maps/matrices/map_matrix_148.json rename to res/field/matrices/map_matrix_148.json diff --git a/res/field/maps/matrices/map_matrix_149.json b/res/field/matrices/map_matrix_149.json similarity index 100% rename from res/field/maps/matrices/map_matrix_149.json rename to res/field/matrices/map_matrix_149.json diff --git a/res/field/maps/matrices/map_matrix_150.json b/res/field/matrices/map_matrix_150.json similarity index 100% rename from res/field/maps/matrices/map_matrix_150.json rename to res/field/matrices/map_matrix_150.json diff --git a/res/field/maps/matrices/map_matrix_151.json b/res/field/matrices/map_matrix_151.json similarity index 100% rename from res/field/maps/matrices/map_matrix_151.json rename to res/field/matrices/map_matrix_151.json diff --git a/res/field/maps/matrices/map_matrix_152.json b/res/field/matrices/map_matrix_152.json similarity index 100% rename from res/field/maps/matrices/map_matrix_152.json rename to res/field/matrices/map_matrix_152.json diff --git a/res/field/maps/matrices/map_matrix_153.json b/res/field/matrices/map_matrix_153.json similarity index 100% rename from res/field/maps/matrices/map_matrix_153.json rename to res/field/matrices/map_matrix_153.json diff --git a/res/field/maps/matrices/map_matrix_154.json b/res/field/matrices/map_matrix_154.json similarity index 100% rename from res/field/maps/matrices/map_matrix_154.json rename to res/field/matrices/map_matrix_154.json diff --git a/res/field/maps/matrices/map_matrix_155.json b/res/field/matrices/map_matrix_155.json similarity index 100% rename from res/field/maps/matrices/map_matrix_155.json rename to res/field/matrices/map_matrix_155.json diff --git a/res/field/maps/matrices/map_matrix_156.json b/res/field/matrices/map_matrix_156.json similarity index 100% rename from res/field/maps/matrices/map_matrix_156.json rename to res/field/matrices/map_matrix_156.json diff --git a/res/field/maps/matrices/map_matrix_157.json b/res/field/matrices/map_matrix_157.json similarity index 100% rename from res/field/maps/matrices/map_matrix_157.json rename to res/field/matrices/map_matrix_157.json diff --git a/res/field/maps/matrices/map_matrix_158.json b/res/field/matrices/map_matrix_158.json similarity index 100% rename from res/field/maps/matrices/map_matrix_158.json rename to res/field/matrices/map_matrix_158.json diff --git a/res/field/maps/matrices/map_matrix_159.json b/res/field/matrices/map_matrix_159.json similarity index 100% rename from res/field/maps/matrices/map_matrix_159.json rename to res/field/matrices/map_matrix_159.json diff --git a/res/field/maps/matrices/map_matrix_160.json b/res/field/matrices/map_matrix_160.json similarity index 100% rename from res/field/maps/matrices/map_matrix_160.json rename to res/field/matrices/map_matrix_160.json diff --git a/res/field/maps/matrices/map_matrix_161.json b/res/field/matrices/map_matrix_161.json similarity index 100% rename from res/field/maps/matrices/map_matrix_161.json rename to res/field/matrices/map_matrix_161.json diff --git a/res/field/maps/matrices/map_matrix_162.json b/res/field/matrices/map_matrix_162.json similarity index 100% rename from res/field/maps/matrices/map_matrix_162.json rename to res/field/matrices/map_matrix_162.json diff --git a/res/field/maps/matrices/map_matrix_163.json b/res/field/matrices/map_matrix_163.json similarity index 100% rename from res/field/maps/matrices/map_matrix_163.json rename to res/field/matrices/map_matrix_163.json diff --git a/res/field/maps/matrices/map_matrix_164.json b/res/field/matrices/map_matrix_164.json similarity index 100% rename from res/field/maps/matrices/map_matrix_164.json rename to res/field/matrices/map_matrix_164.json diff --git a/res/field/maps/matrices/map_matrix_165.json b/res/field/matrices/map_matrix_165.json similarity index 100% rename from res/field/maps/matrices/map_matrix_165.json rename to res/field/matrices/map_matrix_165.json diff --git a/res/field/maps/matrices/map_matrix_166.json b/res/field/matrices/map_matrix_166.json similarity index 100% rename from res/field/maps/matrices/map_matrix_166.json rename to res/field/matrices/map_matrix_166.json diff --git a/res/field/maps/matrices/map_matrix_167.json b/res/field/matrices/map_matrix_167.json similarity index 100% rename from res/field/maps/matrices/map_matrix_167.json rename to res/field/matrices/map_matrix_167.json diff --git a/res/field/maps/matrices/map_matrix_168.json b/res/field/matrices/map_matrix_168.json similarity index 100% rename from res/field/maps/matrices/map_matrix_168.json rename to res/field/matrices/map_matrix_168.json diff --git a/res/field/maps/matrices/map_matrix_169.json b/res/field/matrices/map_matrix_169.json similarity index 100% rename from res/field/maps/matrices/map_matrix_169.json rename to res/field/matrices/map_matrix_169.json diff --git a/res/field/maps/matrices/map_matrix_170.json b/res/field/matrices/map_matrix_170.json similarity index 100% rename from res/field/maps/matrices/map_matrix_170.json rename to res/field/matrices/map_matrix_170.json diff --git a/res/field/maps/matrices/map_matrix_171.json b/res/field/matrices/map_matrix_171.json similarity index 100% rename from res/field/maps/matrices/map_matrix_171.json rename to res/field/matrices/map_matrix_171.json diff --git a/res/field/maps/matrices/map_matrix_172.json b/res/field/matrices/map_matrix_172.json similarity index 100% rename from res/field/maps/matrices/map_matrix_172.json rename to res/field/matrices/map_matrix_172.json diff --git a/res/field/maps/matrices/map_matrix_173.json b/res/field/matrices/map_matrix_173.json similarity index 100% rename from res/field/maps/matrices/map_matrix_173.json rename to res/field/matrices/map_matrix_173.json diff --git a/res/field/maps/matrices/map_matrix_174.json b/res/field/matrices/map_matrix_174.json similarity index 100% rename from res/field/maps/matrices/map_matrix_174.json rename to res/field/matrices/map_matrix_174.json diff --git a/res/field/maps/matrices/map_matrix_175.json b/res/field/matrices/map_matrix_175.json similarity index 100% rename from res/field/maps/matrices/map_matrix_175.json rename to res/field/matrices/map_matrix_175.json diff --git a/res/field/maps/matrices/map_matrix_176.json b/res/field/matrices/map_matrix_176.json similarity index 100% rename from res/field/maps/matrices/map_matrix_176.json rename to res/field/matrices/map_matrix_176.json diff --git a/res/field/maps/matrices/map_matrix_177.json b/res/field/matrices/map_matrix_177.json similarity index 100% rename from res/field/maps/matrices/map_matrix_177.json rename to res/field/matrices/map_matrix_177.json diff --git a/res/field/maps/matrices/map_matrix_178.json b/res/field/matrices/map_matrix_178.json similarity index 100% rename from res/field/maps/matrices/map_matrix_178.json rename to res/field/matrices/map_matrix_178.json diff --git a/res/field/maps/matrices/map_matrix_179.json b/res/field/matrices/map_matrix_179.json similarity index 100% rename from res/field/maps/matrices/map_matrix_179.json rename to res/field/matrices/map_matrix_179.json diff --git a/res/field/maps/matrices/map_matrix_180.json b/res/field/matrices/map_matrix_180.json similarity index 100% rename from res/field/maps/matrices/map_matrix_180.json rename to res/field/matrices/map_matrix_180.json diff --git a/res/field/maps/matrices/map_matrix_181.json b/res/field/matrices/map_matrix_181.json similarity index 100% rename from res/field/maps/matrices/map_matrix_181.json rename to res/field/matrices/map_matrix_181.json diff --git a/res/field/maps/matrices/map_matrix_182.json b/res/field/matrices/map_matrix_182.json similarity index 100% rename from res/field/maps/matrices/map_matrix_182.json rename to res/field/matrices/map_matrix_182.json diff --git a/res/field/maps/matrices/map_matrix_183.json b/res/field/matrices/map_matrix_183.json similarity index 100% rename from res/field/maps/matrices/map_matrix_183.json rename to res/field/matrices/map_matrix_183.json diff --git a/res/field/maps/matrices/map_matrix_184.json b/res/field/matrices/map_matrix_184.json similarity index 100% rename from res/field/maps/matrices/map_matrix_184.json rename to res/field/matrices/map_matrix_184.json diff --git a/res/field/maps/matrices/map_matrix_185.json b/res/field/matrices/map_matrix_185.json similarity index 100% rename from res/field/maps/matrices/map_matrix_185.json rename to res/field/matrices/map_matrix_185.json diff --git a/res/field/maps/matrices/map_matrix_186.json b/res/field/matrices/map_matrix_186.json similarity index 100% rename from res/field/maps/matrices/map_matrix_186.json rename to res/field/matrices/map_matrix_186.json diff --git a/res/field/maps/matrices/map_matrix_187.json b/res/field/matrices/map_matrix_187.json similarity index 100% rename from res/field/maps/matrices/map_matrix_187.json rename to res/field/matrices/map_matrix_187.json diff --git a/res/field/maps/matrices/map_matrix_188.json b/res/field/matrices/map_matrix_188.json similarity index 100% rename from res/field/maps/matrices/map_matrix_188.json rename to res/field/matrices/map_matrix_188.json diff --git a/res/field/maps/matrices/map_matrix_189.json b/res/field/matrices/map_matrix_189.json similarity index 100% rename from res/field/maps/matrices/map_matrix_189.json rename to res/field/matrices/map_matrix_189.json diff --git a/res/field/maps/matrices/map_matrix_190.json b/res/field/matrices/map_matrix_190.json similarity index 100% rename from res/field/maps/matrices/map_matrix_190.json rename to res/field/matrices/map_matrix_190.json diff --git a/res/field/maps/matrices/map_matrix_191.json b/res/field/matrices/map_matrix_191.json similarity index 100% rename from res/field/maps/matrices/map_matrix_191.json rename to res/field/matrices/map_matrix_191.json diff --git a/res/field/maps/matrices/map_matrix_192.json b/res/field/matrices/map_matrix_192.json similarity index 100% rename from res/field/maps/matrices/map_matrix_192.json rename to res/field/matrices/map_matrix_192.json diff --git a/res/field/maps/matrices/map_matrix_193.json b/res/field/matrices/map_matrix_193.json similarity index 100% rename from res/field/maps/matrices/map_matrix_193.json rename to res/field/matrices/map_matrix_193.json diff --git a/res/field/maps/matrices/map_matrix_194.json b/res/field/matrices/map_matrix_194.json similarity index 100% rename from res/field/maps/matrices/map_matrix_194.json rename to res/field/matrices/map_matrix_194.json diff --git a/res/field/maps/matrices/map_matrix_195.json b/res/field/matrices/map_matrix_195.json similarity index 100% rename from res/field/maps/matrices/map_matrix_195.json rename to res/field/matrices/map_matrix_195.json diff --git a/res/field/maps/matrices/map_matrix_196.json b/res/field/matrices/map_matrix_196.json similarity index 100% rename from res/field/maps/matrices/map_matrix_196.json rename to res/field/matrices/map_matrix_196.json diff --git a/res/field/maps/matrices/map_matrix_197.json b/res/field/matrices/map_matrix_197.json similarity index 100% rename from res/field/maps/matrices/map_matrix_197.json rename to res/field/matrices/map_matrix_197.json diff --git a/res/field/maps/matrices/map_matrix_198.json b/res/field/matrices/map_matrix_198.json similarity index 100% rename from res/field/maps/matrices/map_matrix_198.json rename to res/field/matrices/map_matrix_198.json diff --git a/res/field/maps/matrices/map_matrix_199.json b/res/field/matrices/map_matrix_199.json similarity index 100% rename from res/field/maps/matrices/map_matrix_199.json rename to res/field/matrices/map_matrix_199.json diff --git a/res/field/maps/matrices/map_matrix_200.json b/res/field/matrices/map_matrix_200.json similarity index 100% rename from res/field/maps/matrices/map_matrix_200.json rename to res/field/matrices/map_matrix_200.json diff --git a/res/field/maps/matrices/map_matrix_201.json b/res/field/matrices/map_matrix_201.json similarity index 100% rename from res/field/maps/matrices/map_matrix_201.json rename to res/field/matrices/map_matrix_201.json diff --git a/res/field/maps/matrices/map_matrix_202.json b/res/field/matrices/map_matrix_202.json similarity index 100% rename from res/field/maps/matrices/map_matrix_202.json rename to res/field/matrices/map_matrix_202.json diff --git a/res/field/maps/matrices/map_matrix_203.json b/res/field/matrices/map_matrix_203.json similarity index 100% rename from res/field/maps/matrices/map_matrix_203.json rename to res/field/matrices/map_matrix_203.json diff --git a/res/field/maps/matrices/map_matrix_204.json b/res/field/matrices/map_matrix_204.json similarity index 100% rename from res/field/maps/matrices/map_matrix_204.json rename to res/field/matrices/map_matrix_204.json diff --git a/res/field/maps/matrices/map_matrix_205.json b/res/field/matrices/map_matrix_205.json similarity index 100% rename from res/field/maps/matrices/map_matrix_205.json rename to res/field/matrices/map_matrix_205.json diff --git a/res/field/maps/matrices/map_matrix_206.json b/res/field/matrices/map_matrix_206.json similarity index 100% rename from res/field/maps/matrices/map_matrix_206.json rename to res/field/matrices/map_matrix_206.json diff --git a/res/field/maps/matrices/map_matrix_207.json b/res/field/matrices/map_matrix_207.json similarity index 100% rename from res/field/maps/matrices/map_matrix_207.json rename to res/field/matrices/map_matrix_207.json diff --git a/res/field/maps/matrices/map_matrix_208.json b/res/field/matrices/map_matrix_208.json similarity index 100% rename from res/field/maps/matrices/map_matrix_208.json rename to res/field/matrices/map_matrix_208.json diff --git a/res/field/maps/matrices/map_matrix_209.json b/res/field/matrices/map_matrix_209.json similarity index 100% rename from res/field/maps/matrices/map_matrix_209.json rename to res/field/matrices/map_matrix_209.json diff --git a/res/field/maps/matrices/map_matrix_210.json b/res/field/matrices/map_matrix_210.json similarity index 100% rename from res/field/maps/matrices/map_matrix_210.json rename to res/field/matrices/map_matrix_210.json diff --git a/res/field/maps/matrices/map_matrix_211.json b/res/field/matrices/map_matrix_211.json similarity index 100% rename from res/field/maps/matrices/map_matrix_211.json rename to res/field/matrices/map_matrix_211.json diff --git a/res/field/maps/matrices/map_matrix_212.json b/res/field/matrices/map_matrix_212.json similarity index 100% rename from res/field/maps/matrices/map_matrix_212.json rename to res/field/matrices/map_matrix_212.json diff --git a/res/field/maps/matrices/map_matrix_213.json b/res/field/matrices/map_matrix_213.json similarity index 100% rename from res/field/maps/matrices/map_matrix_213.json rename to res/field/matrices/map_matrix_213.json diff --git a/res/field/maps/matrices/map_matrix_214.json b/res/field/matrices/map_matrix_214.json similarity index 100% rename from res/field/maps/matrices/map_matrix_214.json rename to res/field/matrices/map_matrix_214.json diff --git a/res/field/maps/matrices/map_matrix_215.json b/res/field/matrices/map_matrix_215.json similarity index 100% rename from res/field/maps/matrices/map_matrix_215.json rename to res/field/matrices/map_matrix_215.json diff --git a/res/field/maps/matrices/map_matrix_216.json b/res/field/matrices/map_matrix_216.json similarity index 100% rename from res/field/maps/matrices/map_matrix_216.json rename to res/field/matrices/map_matrix_216.json diff --git a/res/field/maps/matrices/map_matrix_217.json b/res/field/matrices/map_matrix_217.json similarity index 100% rename from res/field/maps/matrices/map_matrix_217.json rename to res/field/matrices/map_matrix_217.json diff --git a/res/field/maps/matrices/map_matrix_218.json b/res/field/matrices/map_matrix_218.json similarity index 100% rename from res/field/maps/matrices/map_matrix_218.json rename to res/field/matrices/map_matrix_218.json diff --git a/res/field/maps/matrices/map_matrix_219.json b/res/field/matrices/map_matrix_219.json similarity index 100% rename from res/field/maps/matrices/map_matrix_219.json rename to res/field/matrices/map_matrix_219.json diff --git a/res/field/maps/matrices/map_matrix_220.json b/res/field/matrices/map_matrix_220.json similarity index 100% rename from res/field/maps/matrices/map_matrix_220.json rename to res/field/matrices/map_matrix_220.json diff --git a/res/field/maps/matrices/map_matrix_221.json b/res/field/matrices/map_matrix_221.json similarity index 100% rename from res/field/maps/matrices/map_matrix_221.json rename to res/field/matrices/map_matrix_221.json diff --git a/res/field/maps/matrices/map_matrix_222.json b/res/field/matrices/map_matrix_222.json similarity index 100% rename from res/field/maps/matrices/map_matrix_222.json rename to res/field/matrices/map_matrix_222.json diff --git a/res/field/maps/matrices/map_matrix_223.json b/res/field/matrices/map_matrix_223.json similarity index 100% rename from res/field/maps/matrices/map_matrix_223.json rename to res/field/matrices/map_matrix_223.json diff --git a/res/field/maps/matrices/map_matrix_224.json b/res/field/matrices/map_matrix_224.json similarity index 100% rename from res/field/maps/matrices/map_matrix_224.json rename to res/field/matrices/map_matrix_224.json diff --git a/res/field/maps/matrices/map_matrix_225.json b/res/field/matrices/map_matrix_225.json similarity index 100% rename from res/field/maps/matrices/map_matrix_225.json rename to res/field/matrices/map_matrix_225.json diff --git a/res/field/maps/matrices/map_matrix_226.json b/res/field/matrices/map_matrix_226.json similarity index 100% rename from res/field/maps/matrices/map_matrix_226.json rename to res/field/matrices/map_matrix_226.json diff --git a/res/field/maps/matrices/map_matrix_227.json b/res/field/matrices/map_matrix_227.json similarity index 100% rename from res/field/maps/matrices/map_matrix_227.json rename to res/field/matrices/map_matrix_227.json diff --git a/res/field/maps/matrices/map_matrix_228.json b/res/field/matrices/map_matrix_228.json similarity index 100% rename from res/field/maps/matrices/map_matrix_228.json rename to res/field/matrices/map_matrix_228.json diff --git a/res/field/maps/matrices/map_matrix_229.json b/res/field/matrices/map_matrix_229.json similarity index 100% rename from res/field/maps/matrices/map_matrix_229.json rename to res/field/matrices/map_matrix_229.json diff --git a/res/field/maps/matrices/map_matrix_230.json b/res/field/matrices/map_matrix_230.json similarity index 100% rename from res/field/maps/matrices/map_matrix_230.json rename to res/field/matrices/map_matrix_230.json diff --git a/res/field/maps/matrices/map_matrix_231.json b/res/field/matrices/map_matrix_231.json similarity index 100% rename from res/field/maps/matrices/map_matrix_231.json rename to res/field/matrices/map_matrix_231.json diff --git a/res/field/maps/matrices/map_matrix_232.json b/res/field/matrices/map_matrix_232.json similarity index 100% rename from res/field/maps/matrices/map_matrix_232.json rename to res/field/matrices/map_matrix_232.json diff --git a/res/field/maps/matrices/map_matrix_233.json b/res/field/matrices/map_matrix_233.json similarity index 100% rename from res/field/maps/matrices/map_matrix_233.json rename to res/field/matrices/map_matrix_233.json diff --git a/res/field/maps/matrices/map_matrix_234.json b/res/field/matrices/map_matrix_234.json similarity index 100% rename from res/field/maps/matrices/map_matrix_234.json rename to res/field/matrices/map_matrix_234.json diff --git a/res/field/maps/matrices/map_matrix_235.json b/res/field/matrices/map_matrix_235.json similarity index 100% rename from res/field/maps/matrices/map_matrix_235.json rename to res/field/matrices/map_matrix_235.json diff --git a/res/field/maps/matrices/map_matrix_236.json b/res/field/matrices/map_matrix_236.json similarity index 100% rename from res/field/maps/matrices/map_matrix_236.json rename to res/field/matrices/map_matrix_236.json diff --git a/res/field/maps/matrices/map_matrix_237.json b/res/field/matrices/map_matrix_237.json similarity index 100% rename from res/field/maps/matrices/map_matrix_237.json rename to res/field/matrices/map_matrix_237.json diff --git a/res/field/maps/matrices/map_matrix_238.json b/res/field/matrices/map_matrix_238.json similarity index 100% rename from res/field/maps/matrices/map_matrix_238.json rename to res/field/matrices/map_matrix_238.json diff --git a/res/field/maps/matrices/map_matrix_239.json b/res/field/matrices/map_matrix_239.json similarity index 100% rename from res/field/maps/matrices/map_matrix_239.json rename to res/field/matrices/map_matrix_239.json diff --git a/res/field/maps/matrices/map_matrix_240.json b/res/field/matrices/map_matrix_240.json similarity index 100% rename from res/field/maps/matrices/map_matrix_240.json rename to res/field/matrices/map_matrix_240.json diff --git a/res/field/maps/matrices/map_matrix_241.json b/res/field/matrices/map_matrix_241.json similarity index 100% rename from res/field/maps/matrices/map_matrix_241.json rename to res/field/matrices/map_matrix_241.json diff --git a/res/field/maps/matrices/map_matrix_242.json b/res/field/matrices/map_matrix_242.json similarity index 100% rename from res/field/maps/matrices/map_matrix_242.json rename to res/field/matrices/map_matrix_242.json diff --git a/res/field/maps/matrices/map_matrix_243.json b/res/field/matrices/map_matrix_243.json similarity index 100% rename from res/field/maps/matrices/map_matrix_243.json rename to res/field/matrices/map_matrix_243.json diff --git a/res/field/maps/matrices/map_matrix_244.json b/res/field/matrices/map_matrix_244.json similarity index 100% rename from res/field/maps/matrices/map_matrix_244.json rename to res/field/matrices/map_matrix_244.json diff --git a/res/field/maps/matrices/map_matrix_245.json b/res/field/matrices/map_matrix_245.json similarity index 100% rename from res/field/maps/matrices/map_matrix_245.json rename to res/field/matrices/map_matrix_245.json diff --git a/res/field/maps/matrices/map_matrix_246.json b/res/field/matrices/map_matrix_246.json similarity index 100% rename from res/field/maps/matrices/map_matrix_246.json rename to res/field/matrices/map_matrix_246.json diff --git a/res/field/maps/matrices/map_matrix_247.json b/res/field/matrices/map_matrix_247.json similarity index 100% rename from res/field/maps/matrices/map_matrix_247.json rename to res/field/matrices/map_matrix_247.json diff --git a/res/field/maps/matrices/map_matrix_248.json b/res/field/matrices/map_matrix_248.json similarity index 100% rename from res/field/maps/matrices/map_matrix_248.json rename to res/field/matrices/map_matrix_248.json diff --git a/res/field/maps/matrices/map_matrix_249.json b/res/field/matrices/map_matrix_249.json similarity index 100% rename from res/field/maps/matrices/map_matrix_249.json rename to res/field/matrices/map_matrix_249.json diff --git a/res/field/maps/matrices/map_matrix_250.json b/res/field/matrices/map_matrix_250.json similarity index 100% rename from res/field/maps/matrices/map_matrix_250.json rename to res/field/matrices/map_matrix_250.json diff --git a/res/field/maps/matrices/map_matrix_251.json b/res/field/matrices/map_matrix_251.json similarity index 100% rename from res/field/maps/matrices/map_matrix_251.json rename to res/field/matrices/map_matrix_251.json diff --git a/res/field/maps/matrices/map_matrix_252.json b/res/field/matrices/map_matrix_252.json similarity index 100% rename from res/field/maps/matrices/map_matrix_252.json rename to res/field/matrices/map_matrix_252.json diff --git a/res/field/maps/matrices/map_matrix_253.json b/res/field/matrices/map_matrix_253.json similarity index 100% rename from res/field/maps/matrices/map_matrix_253.json rename to res/field/matrices/map_matrix_253.json diff --git a/res/field/maps/matrices/map_matrix_254.json b/res/field/matrices/map_matrix_254.json similarity index 100% rename from res/field/maps/matrices/map_matrix_254.json rename to res/field/matrices/map_matrix_254.json diff --git a/res/field/maps/matrices/map_matrix_255.json b/res/field/matrices/map_matrix_255.json similarity index 100% rename from res/field/maps/matrices/map_matrix_255.json rename to res/field/matrices/map_matrix_255.json diff --git a/res/field/maps/matrices/map_matrix_256.json b/res/field/matrices/map_matrix_256.json similarity index 100% rename from res/field/maps/matrices/map_matrix_256.json rename to res/field/matrices/map_matrix_256.json diff --git a/res/field/maps/matrices/map_matrix_257.json b/res/field/matrices/map_matrix_257.json similarity index 100% rename from res/field/maps/matrices/map_matrix_257.json rename to res/field/matrices/map_matrix_257.json diff --git a/res/field/maps/matrices/map_matrix_258.json b/res/field/matrices/map_matrix_258.json similarity index 100% rename from res/field/maps/matrices/map_matrix_258.json rename to res/field/matrices/map_matrix_258.json diff --git a/res/field/maps/matrices/map_matrix_259.json b/res/field/matrices/map_matrix_259.json similarity index 100% rename from res/field/maps/matrices/map_matrix_259.json rename to res/field/matrices/map_matrix_259.json diff --git a/res/field/maps/matrices/map_matrix_260.json b/res/field/matrices/map_matrix_260.json similarity index 100% rename from res/field/maps/matrices/map_matrix_260.json rename to res/field/matrices/map_matrix_260.json diff --git a/res/field/maps/matrices/map_matrix_261.json b/res/field/matrices/map_matrix_261.json similarity index 100% rename from res/field/maps/matrices/map_matrix_261.json rename to res/field/matrices/map_matrix_261.json diff --git a/res/field/maps/matrices/map_matrix_262.json b/res/field/matrices/map_matrix_262.json similarity index 100% rename from res/field/maps/matrices/map_matrix_262.json rename to res/field/matrices/map_matrix_262.json diff --git a/res/field/maps/matrices/map_matrix_263.json b/res/field/matrices/map_matrix_263.json similarity index 100% rename from res/field/maps/matrices/map_matrix_263.json rename to res/field/matrices/map_matrix_263.json diff --git a/res/field/maps/matrices/map_matrix_264.json b/res/field/matrices/map_matrix_264.json similarity index 100% rename from res/field/maps/matrices/map_matrix_264.json rename to res/field/matrices/map_matrix_264.json diff --git a/res/field/maps/matrices/map_matrix_265.json b/res/field/matrices/map_matrix_265.json similarity index 100% rename from res/field/maps/matrices/map_matrix_265.json rename to res/field/matrices/map_matrix_265.json diff --git a/res/field/maps/matrices/map_matrix_266.json b/res/field/matrices/map_matrix_266.json similarity index 100% rename from res/field/maps/matrices/map_matrix_266.json rename to res/field/matrices/map_matrix_266.json diff --git a/res/field/maps/matrices/map_matrix_267.json b/res/field/matrices/map_matrix_267.json similarity index 100% rename from res/field/maps/matrices/map_matrix_267.json rename to res/field/matrices/map_matrix_267.json diff --git a/res/field/maps/matrices/map_matrix_268.json b/res/field/matrices/map_matrix_268.json similarity index 100% rename from res/field/maps/matrices/map_matrix_268.json rename to res/field/matrices/map_matrix_268.json diff --git a/res/field/maps/matrices/map_matrix_269.json b/res/field/matrices/map_matrix_269.json similarity index 100% rename from res/field/maps/matrices/map_matrix_269.json rename to res/field/matrices/map_matrix_269.json diff --git a/res/field/maps/matrices/map_matrix_270.json b/res/field/matrices/map_matrix_270.json similarity index 100% rename from res/field/maps/matrices/map_matrix_270.json rename to res/field/matrices/map_matrix_270.json diff --git a/res/field/maps/matrices/map_matrix_271.json b/res/field/matrices/map_matrix_271.json similarity index 100% rename from res/field/maps/matrices/map_matrix_271.json rename to res/field/matrices/map_matrix_271.json diff --git a/res/field/maps/matrices/map_matrix_272.json b/res/field/matrices/map_matrix_272.json similarity index 100% rename from res/field/maps/matrices/map_matrix_272.json rename to res/field/matrices/map_matrix_272.json diff --git a/res/field/maps/matrices/map_matrix_273.json b/res/field/matrices/map_matrix_273.json similarity index 100% rename from res/field/maps/matrices/map_matrix_273.json rename to res/field/matrices/map_matrix_273.json diff --git a/res/field/maps/matrices/map_matrix_274.json b/res/field/matrices/map_matrix_274.json similarity index 100% rename from res/field/maps/matrices/map_matrix_274.json rename to res/field/matrices/map_matrix_274.json diff --git a/res/field/maps/matrices/map_matrix_275.json b/res/field/matrices/map_matrix_275.json similarity index 100% rename from res/field/maps/matrices/map_matrix_275.json rename to res/field/matrices/map_matrix_275.json diff --git a/res/field/maps/matrices/map_matrix_276.json b/res/field/matrices/map_matrix_276.json similarity index 100% rename from res/field/maps/matrices/map_matrix_276.json rename to res/field/matrices/map_matrix_276.json diff --git a/res/field/maps/matrices/map_matrix_277.json b/res/field/matrices/map_matrix_277.json similarity index 100% rename from res/field/maps/matrices/map_matrix_277.json rename to res/field/matrices/map_matrix_277.json diff --git a/res/field/maps/matrices/map_matrix_278.json b/res/field/matrices/map_matrix_278.json similarity index 100% rename from res/field/maps/matrices/map_matrix_278.json rename to res/field/matrices/map_matrix_278.json diff --git a/res/field/maps/matrices/map_matrix_279.json b/res/field/matrices/map_matrix_279.json similarity index 100% rename from res/field/maps/matrices/map_matrix_279.json rename to res/field/matrices/map_matrix_279.json diff --git a/res/field/maps/matrices/map_matrix_280.json b/res/field/matrices/map_matrix_280.json similarity index 100% rename from res/field/maps/matrices/map_matrix_280.json rename to res/field/matrices/map_matrix_280.json diff --git a/res/field/maps/matrices/map_matrix_281.json b/res/field/matrices/map_matrix_281.json similarity index 100% rename from res/field/maps/matrices/map_matrix_281.json rename to res/field/matrices/map_matrix_281.json diff --git a/res/field/maps/matrices/map_matrix_282.json b/res/field/matrices/map_matrix_282.json similarity index 100% rename from res/field/maps/matrices/map_matrix_282.json rename to res/field/matrices/map_matrix_282.json diff --git a/res/field/maps/matrices/map_matrix_283.json b/res/field/matrices/map_matrix_283.json similarity index 100% rename from res/field/maps/matrices/map_matrix_283.json rename to res/field/matrices/map_matrix_283.json diff --git a/res/field/maps/matrices/map_matrix_284.json b/res/field/matrices/map_matrix_284.json similarity index 100% rename from res/field/maps/matrices/map_matrix_284.json rename to res/field/matrices/map_matrix_284.json diff --git a/res/field/maps/matrices/map_matrix_285.json b/res/field/matrices/map_matrix_285.json similarity index 100% rename from res/field/maps/matrices/map_matrix_285.json rename to res/field/matrices/map_matrix_285.json diff --git a/res/field/maps/matrices/map_matrix_286.json b/res/field/matrices/map_matrix_286.json similarity index 100% rename from res/field/maps/matrices/map_matrix_286.json rename to res/field/matrices/map_matrix_286.json diff --git a/res/field/maps/matrices/map_matrix_287.json b/res/field/matrices/map_matrix_287.json similarity index 100% rename from res/field/maps/matrices/map_matrix_287.json rename to res/field/matrices/map_matrix_287.json diff --git a/res/field/maps/matrices/map_matrix_288.json b/res/field/matrices/map_matrix_288.json similarity index 100% rename from res/field/maps/matrices/map_matrix_288.json rename to res/field/matrices/map_matrix_288.json diff --git a/res/field/maps/matrices/meson.build b/res/field/matrices/meson.build similarity index 98% rename from res/field/maps/matrices/meson.build rename to res/field/matrices/meson.build index 00089a9cbb..bff61ce26b 100644 --- a/res/field/maps/matrices/meson.build +++ b/res/field/matrices/meson.build @@ -1,7 +1,7 @@ matrix_bin_gen = generator( map_matrix_py, arguments: [ '@INPUT@', '@OUTPUT@', ], - output: '@BASENAME@.bin', + output: '@BASENAME@', depends: [ py_consts_generators ], ) @@ -303,12 +303,13 @@ matrix_data_order = files('map_matrices.order') map_matrix_narc = custom_target('map_matrix.narc', output: 'map_matrix.narc', input: [ - matrix_bin_gen.process(matrix_data_srcs, env: json2bin_env), + matrix_bin_gen.process(matrix_data_srcs, env: jsoncnv_env), matrix_data_order ], depends: [ py_consts_generators ], command: [ narc_exe, 'create', + '--naix', '--order', matrix_data_order, '--output', '@OUTPUT@', '@PRIVATE_DIR@', diff --git a/res/field/meson.build b/res/field/meson.build index 8ca69e890a..dad78e7e89 100644 --- a/res/field/meson.build +++ b/res/field/meson.build @@ -1,6 +1,10 @@ subdir('encounters') subdir('events') subdir('frontier_scripts') +subdir('lighting') subdir('maps') +subdir('matrices') +subdir('props') +subdir('area_data') subdir('scripts') subdir('trades') diff --git a/res/field/props/animations/meson.build b/res/field/props/animations/meson.build new file mode 100644 index 0000000000..0e4b37edb3 --- /dev/null +++ b/res/field/props/animations/meson.build @@ -0,0 +1,119 @@ +prop_animation_files = copy_gen.process(files( + 'prop_animation_000.nsbta', + 'prop_animation_001.nsbca', + 'prop_animation_002.nsbca', + 'prop_animation_003.nsbca', + 'prop_animation_004.nsbta', + 'prop_animation_005.nsbca', + 'prop_animation_006.nsbca', + 'prop_animation_007.nsbca', + 'prop_animation_008.nsbca', + 'prop_animation_009.nsbca', + 'prop_animation_010.nsbca', + 'prop_animation_011.nsbtp', + 'prop_animation_012.nsbtp', + 'prop_animation_013.nsbtp', + 'prop_animation_014.nsbta', + 'prop_animation_015.nsbtp', + 'prop_animation_016.nsbtp', + 'prop_animation_017.nsbtp', + 'prop_animation_018.nsbta', + 'prop_animation_019.nsbta', + 'prop_animation_020.nsbta', + 'prop_animation_021.nsbta', + 'prop_animation_022.nsbta', + 'prop_animation_023.nsbtp', + 'prop_animation_024.nsbtp', + 'prop_animation_025.nsbca', + 'prop_animation_026.nsbca', + 'prop_animation_027.nsbca', + 'prop_animation_028.nsbca', + 'prop_animation_029.nsbca', + 'prop_animation_030.nsbca', + 'prop_animation_031.nsbtp', + 'prop_animation_032.nsbtp', + 'prop_animation_033.nsbca', + 'prop_animation_034.nsbca', + 'prop_animation_035.nsbta', + 'prop_animation_036.nsbta', + 'prop_animation_037.nsbta', + 'prop_animation_038.nsbta', + 'prop_animation_039.nsbca', + 'prop_animation_040.nsbca', + 'prop_animation_041.nsbtp', + 'prop_animation_042.nsbtp', + 'prop_animation_043.nsbta', + 'prop_animation_044.nsbta', + 'prop_animation_045.nsbta', + 'prop_animation_046.nsbta', + 'prop_animation_047.nsbta', + 'prop_animation_048.nsbta', + 'prop_animation_049.nsbca', + 'prop_animation_050.nsbtp', + 'prop_animation_051.nsbtp', + 'prop_animation_052.nsbtp', + 'prop_animation_053.nsbta', + 'prop_animation_054.nsbca', + 'prop_animation_055.nsbta', + 'prop_animation_056.nsbta', + 'prop_animation_057.nsbta', + 'prop_animation_058.nsbta', + 'prop_animation_059.nsbta', + 'prop_animation_060.nsbta', + 'prop_animation_061.nsbta', + 'prop_animation_062.nsbta', + 'prop_animation_063.nsbta', + 'prop_animation_064.nsbtp', + 'prop_animation_065.nsbca', + 'prop_animation_066.nsbca', + 'prop_animation_067.nsbca', + 'prop_animation_068.nsbta', + 'prop_animation_069.nsbca', + 'prop_animation_070.nsbca', + 'prop_animation_071.nsbta', + 'prop_animation_072.nsbtp', + 'prop_animation_073.nsbca', + 'prop_animation_074.nsbta', + 'prop_animation_075.nsbta', + 'prop_animation_076.nsbca', + 'prop_animation_077.nsbta', + 'prop_animation_078.nsbta', + 'prop_animation_079.nsbta', + 'prop_animation_080.nsbca', + 'prop_animation_081.nsbca', + 'prop_animation_082.nsbta', + 'prop_animation_083.nsbta', + 'prop_animation_084.nsbtp', + 'prop_animation_085.nsbta', + 'prop_animation_086.nsbta', + 'prop_animation_087.nsbtp', + 'prop_animation_088.nsbta', + 'prop_animation_089.nsbta', + 'prop_animation_090.nsbta', + 'prop_animation_091.nsbtp', + 'prop_animation_092.nsbtp', + 'prop_animation_093.nsbca', + 'prop_animation_094.nsbtp', + 'prop_animation_095.nsbta', + 'prop_animation_096.nsbca', + 'prop_animation_097.nsbtp', +)) + +prop_animation_order = files('prop_animations.order') +prop_animation_narc = custom_target('prop_animations.narc', + output: [ + 'prop_animations.narc', + ], + input: [ + prop_animation_files, + prop_animation_order, + ], + command: [ + narc_exe, 'create', + '--order', prop_animation_order, + '--output', '@OUTPUT0@', + '@PRIVATE_DIR@', + ] +) + +nitrofs_files += prop_animation_narc diff --git a/res/field/props/animations/prop_animation_000.nsbta b/res/field/props/animations/prop_animation_000.nsbta new file mode 100644 index 0000000000..11818a8738 Binary files /dev/null and b/res/field/props/animations/prop_animation_000.nsbta differ diff --git a/res/field/props/animations/prop_animation_001.nsbca b/res/field/props/animations/prop_animation_001.nsbca new file mode 100644 index 0000000000..1ddce3aae2 Binary files /dev/null and b/res/field/props/animations/prop_animation_001.nsbca differ diff --git a/res/field/props/animations/prop_animation_002.nsbca b/res/field/props/animations/prop_animation_002.nsbca new file mode 100644 index 0000000000..56a6b31692 Binary files /dev/null and b/res/field/props/animations/prop_animation_002.nsbca differ diff --git a/res/field/props/animations/prop_animation_003.nsbca b/res/field/props/animations/prop_animation_003.nsbca new file mode 100644 index 0000000000..9f2685fd07 Binary files /dev/null and b/res/field/props/animations/prop_animation_003.nsbca differ diff --git a/res/field/props/animations/prop_animation_004.nsbta b/res/field/props/animations/prop_animation_004.nsbta new file mode 100644 index 0000000000..6527d5b10d Binary files /dev/null and b/res/field/props/animations/prop_animation_004.nsbta differ diff --git a/res/field/props/animations/prop_animation_005.nsbca b/res/field/props/animations/prop_animation_005.nsbca new file mode 100644 index 0000000000..9c1b272917 Binary files /dev/null and b/res/field/props/animations/prop_animation_005.nsbca differ diff --git a/res/field/props/animations/prop_animation_006.nsbca b/res/field/props/animations/prop_animation_006.nsbca new file mode 100644 index 0000000000..06964c87c5 Binary files /dev/null and b/res/field/props/animations/prop_animation_006.nsbca differ diff --git a/res/field/props/animations/prop_animation_007.nsbca b/res/field/props/animations/prop_animation_007.nsbca new file mode 100644 index 0000000000..92153c3ce4 Binary files /dev/null and b/res/field/props/animations/prop_animation_007.nsbca differ diff --git a/res/field/props/animations/prop_animation_008.nsbca b/res/field/props/animations/prop_animation_008.nsbca new file mode 100644 index 0000000000..97e7532c53 Binary files /dev/null and b/res/field/props/animations/prop_animation_008.nsbca differ diff --git a/res/field/props/animations/prop_animation_009.nsbca b/res/field/props/animations/prop_animation_009.nsbca new file mode 100644 index 0000000000..9879230f9e Binary files /dev/null and b/res/field/props/animations/prop_animation_009.nsbca differ diff --git a/res/field/props/animations/prop_animation_010.nsbca b/res/field/props/animations/prop_animation_010.nsbca new file mode 100644 index 0000000000..2aab22a2a0 Binary files /dev/null and b/res/field/props/animations/prop_animation_010.nsbca differ diff --git a/res/field/props/animations/prop_animation_011.nsbtp b/res/field/props/animations/prop_animation_011.nsbtp new file mode 100644 index 0000000000..d1b76b1562 Binary files /dev/null and b/res/field/props/animations/prop_animation_011.nsbtp differ diff --git a/res/field/props/animations/prop_animation_012.nsbtp b/res/field/props/animations/prop_animation_012.nsbtp new file mode 100644 index 0000000000..8ce1b536af Binary files /dev/null and b/res/field/props/animations/prop_animation_012.nsbtp differ diff --git a/res/field/props/animations/prop_animation_013.nsbtp b/res/field/props/animations/prop_animation_013.nsbtp new file mode 100644 index 0000000000..e33c59dcc1 Binary files /dev/null and b/res/field/props/animations/prop_animation_013.nsbtp differ diff --git a/res/field/props/animations/prop_animation_014.nsbta b/res/field/props/animations/prop_animation_014.nsbta new file mode 100644 index 0000000000..af75d5f3d4 Binary files /dev/null and b/res/field/props/animations/prop_animation_014.nsbta differ diff --git a/res/field/props/animations/prop_animation_015.nsbtp b/res/field/props/animations/prop_animation_015.nsbtp new file mode 100644 index 0000000000..54a4ceba5d Binary files /dev/null and b/res/field/props/animations/prop_animation_015.nsbtp differ diff --git a/res/field/props/animations/prop_animation_016.nsbtp b/res/field/props/animations/prop_animation_016.nsbtp new file mode 100644 index 0000000000..d99e5a2977 Binary files /dev/null and b/res/field/props/animations/prop_animation_016.nsbtp differ diff --git a/res/field/props/animations/prop_animation_017.nsbtp b/res/field/props/animations/prop_animation_017.nsbtp new file mode 100644 index 0000000000..1ab3031337 Binary files /dev/null and b/res/field/props/animations/prop_animation_017.nsbtp differ diff --git a/res/field/props/animations/prop_animation_018.nsbta b/res/field/props/animations/prop_animation_018.nsbta new file mode 100644 index 0000000000..fc8beb5616 Binary files /dev/null and b/res/field/props/animations/prop_animation_018.nsbta differ diff --git a/res/field/props/animations/prop_animation_019.nsbta b/res/field/props/animations/prop_animation_019.nsbta new file mode 100644 index 0000000000..41854d2f48 Binary files /dev/null and b/res/field/props/animations/prop_animation_019.nsbta differ diff --git a/res/field/props/animations/prop_animation_020.nsbta b/res/field/props/animations/prop_animation_020.nsbta new file mode 100644 index 0000000000..70688eb399 Binary files /dev/null and b/res/field/props/animations/prop_animation_020.nsbta differ diff --git a/res/field/props/animations/prop_animation_021.nsbta b/res/field/props/animations/prop_animation_021.nsbta new file mode 100644 index 0000000000..1f56bb8705 Binary files /dev/null and b/res/field/props/animations/prop_animation_021.nsbta differ diff --git a/res/field/props/animations/prop_animation_022.nsbta b/res/field/props/animations/prop_animation_022.nsbta new file mode 100644 index 0000000000..d7e718036d Binary files /dev/null and b/res/field/props/animations/prop_animation_022.nsbta differ diff --git a/res/field/props/animations/prop_animation_023.nsbtp b/res/field/props/animations/prop_animation_023.nsbtp new file mode 100644 index 0000000000..76666fb236 Binary files /dev/null and b/res/field/props/animations/prop_animation_023.nsbtp differ diff --git a/res/field/props/animations/prop_animation_024.nsbtp b/res/field/props/animations/prop_animation_024.nsbtp new file mode 100644 index 0000000000..b7f0c14c38 Binary files /dev/null and b/res/field/props/animations/prop_animation_024.nsbtp differ diff --git a/res/field/props/animations/prop_animation_025.nsbca b/res/field/props/animations/prop_animation_025.nsbca new file mode 100644 index 0000000000..8ae2070183 Binary files /dev/null and b/res/field/props/animations/prop_animation_025.nsbca differ diff --git a/res/field/props/animations/prop_animation_026.nsbca b/res/field/props/animations/prop_animation_026.nsbca new file mode 100644 index 0000000000..e3b6ff54ec Binary files /dev/null and b/res/field/props/animations/prop_animation_026.nsbca differ diff --git a/res/field/props/animations/prop_animation_027.nsbca b/res/field/props/animations/prop_animation_027.nsbca new file mode 100644 index 0000000000..60586a4ab9 Binary files /dev/null and b/res/field/props/animations/prop_animation_027.nsbca differ diff --git a/res/field/props/animations/prop_animation_028.nsbca b/res/field/props/animations/prop_animation_028.nsbca new file mode 100644 index 0000000000..6b66d0e0b1 Binary files /dev/null and b/res/field/props/animations/prop_animation_028.nsbca differ diff --git a/res/field/props/animations/prop_animation_029.nsbca b/res/field/props/animations/prop_animation_029.nsbca new file mode 100644 index 0000000000..f203640928 Binary files /dev/null and b/res/field/props/animations/prop_animation_029.nsbca differ diff --git a/res/field/props/animations/prop_animation_030.nsbca b/res/field/props/animations/prop_animation_030.nsbca new file mode 100644 index 0000000000..a9a4b6476e Binary files /dev/null and b/res/field/props/animations/prop_animation_030.nsbca differ diff --git a/res/field/props/animations/prop_animation_031.nsbtp b/res/field/props/animations/prop_animation_031.nsbtp new file mode 100644 index 0000000000..9ed8a5061e Binary files /dev/null and b/res/field/props/animations/prop_animation_031.nsbtp differ diff --git a/res/field/props/animations/prop_animation_032.nsbtp b/res/field/props/animations/prop_animation_032.nsbtp new file mode 100644 index 0000000000..0b03cb5e5f Binary files /dev/null and b/res/field/props/animations/prop_animation_032.nsbtp differ diff --git a/res/field/props/animations/prop_animation_033.nsbca b/res/field/props/animations/prop_animation_033.nsbca new file mode 100644 index 0000000000..4239f54638 Binary files /dev/null and b/res/field/props/animations/prop_animation_033.nsbca differ diff --git a/res/field/props/animations/prop_animation_034.nsbca b/res/field/props/animations/prop_animation_034.nsbca new file mode 100644 index 0000000000..f281c392b2 Binary files /dev/null and b/res/field/props/animations/prop_animation_034.nsbca differ diff --git a/res/field/props/animations/prop_animation_035.nsbta b/res/field/props/animations/prop_animation_035.nsbta new file mode 100644 index 0000000000..377d1732c6 Binary files /dev/null and b/res/field/props/animations/prop_animation_035.nsbta differ diff --git a/res/field/props/animations/prop_animation_036.nsbta b/res/field/props/animations/prop_animation_036.nsbta new file mode 100644 index 0000000000..ea15db6965 Binary files /dev/null and b/res/field/props/animations/prop_animation_036.nsbta differ diff --git a/res/field/props/animations/prop_animation_037.nsbta b/res/field/props/animations/prop_animation_037.nsbta new file mode 100644 index 0000000000..9cf0984483 Binary files /dev/null and b/res/field/props/animations/prop_animation_037.nsbta differ diff --git a/res/field/props/animations/prop_animation_038.nsbta b/res/field/props/animations/prop_animation_038.nsbta new file mode 100644 index 0000000000..1e5bfc343a Binary files /dev/null and b/res/field/props/animations/prop_animation_038.nsbta differ diff --git a/res/field/props/animations/prop_animation_039.nsbca b/res/field/props/animations/prop_animation_039.nsbca new file mode 100644 index 0000000000..af3b7b710c Binary files /dev/null and b/res/field/props/animations/prop_animation_039.nsbca differ diff --git a/res/field/props/animations/prop_animation_040.nsbca b/res/field/props/animations/prop_animation_040.nsbca new file mode 100644 index 0000000000..806b22343a Binary files /dev/null and b/res/field/props/animations/prop_animation_040.nsbca differ diff --git a/res/field/props/animations/prop_animation_041.nsbtp b/res/field/props/animations/prop_animation_041.nsbtp new file mode 100644 index 0000000000..1ee424e0ae Binary files /dev/null and b/res/field/props/animations/prop_animation_041.nsbtp differ diff --git a/res/field/props/animations/prop_animation_042.nsbtp b/res/field/props/animations/prop_animation_042.nsbtp new file mode 100644 index 0000000000..3a0b0e7cda Binary files /dev/null and b/res/field/props/animations/prop_animation_042.nsbtp differ diff --git a/res/field/props/animations/prop_animation_043.nsbta b/res/field/props/animations/prop_animation_043.nsbta new file mode 100644 index 0000000000..0294f60e6e Binary files /dev/null and b/res/field/props/animations/prop_animation_043.nsbta differ diff --git a/res/field/props/animations/prop_animation_044.nsbta b/res/field/props/animations/prop_animation_044.nsbta new file mode 100644 index 0000000000..05e945c65d Binary files /dev/null and b/res/field/props/animations/prop_animation_044.nsbta differ diff --git a/res/field/props/animations/prop_animation_045.nsbta b/res/field/props/animations/prop_animation_045.nsbta new file mode 100644 index 0000000000..2cf798b6aa Binary files /dev/null and b/res/field/props/animations/prop_animation_045.nsbta differ diff --git a/res/field/props/animations/prop_animation_046.nsbta b/res/field/props/animations/prop_animation_046.nsbta new file mode 100644 index 0000000000..7f492a0ad1 Binary files /dev/null and b/res/field/props/animations/prop_animation_046.nsbta differ diff --git a/res/field/props/animations/prop_animation_047.nsbta b/res/field/props/animations/prop_animation_047.nsbta new file mode 100644 index 0000000000..6d1792b484 Binary files /dev/null and b/res/field/props/animations/prop_animation_047.nsbta differ diff --git a/res/field/props/animations/prop_animation_048.nsbta b/res/field/props/animations/prop_animation_048.nsbta new file mode 100644 index 0000000000..4264ee5441 Binary files /dev/null and b/res/field/props/animations/prop_animation_048.nsbta differ diff --git a/res/field/props/animations/prop_animation_049.nsbca b/res/field/props/animations/prop_animation_049.nsbca new file mode 100644 index 0000000000..15842b92d1 Binary files /dev/null and b/res/field/props/animations/prop_animation_049.nsbca differ diff --git a/res/field/props/animations/prop_animation_050.nsbtp b/res/field/props/animations/prop_animation_050.nsbtp new file mode 100644 index 0000000000..74652ea80b Binary files /dev/null and b/res/field/props/animations/prop_animation_050.nsbtp differ diff --git a/res/field/props/animations/prop_animation_051.nsbtp b/res/field/props/animations/prop_animation_051.nsbtp new file mode 100644 index 0000000000..99d52dd38c Binary files /dev/null and b/res/field/props/animations/prop_animation_051.nsbtp differ diff --git a/res/field/props/animations/prop_animation_052.nsbtp b/res/field/props/animations/prop_animation_052.nsbtp new file mode 100644 index 0000000000..c84aebbd4b Binary files /dev/null and b/res/field/props/animations/prop_animation_052.nsbtp differ diff --git a/res/field/props/animations/prop_animation_053.nsbta b/res/field/props/animations/prop_animation_053.nsbta new file mode 100644 index 0000000000..37eb979562 Binary files /dev/null and b/res/field/props/animations/prop_animation_053.nsbta differ diff --git a/res/field/props/animations/prop_animation_054.nsbca b/res/field/props/animations/prop_animation_054.nsbca new file mode 100644 index 0000000000..e150c3c9dd Binary files /dev/null and b/res/field/props/animations/prop_animation_054.nsbca differ diff --git a/res/field/props/animations/prop_animation_055.nsbta b/res/field/props/animations/prop_animation_055.nsbta new file mode 100644 index 0000000000..6b16ca6175 Binary files /dev/null and b/res/field/props/animations/prop_animation_055.nsbta differ diff --git a/res/field/props/animations/prop_animation_056.nsbta b/res/field/props/animations/prop_animation_056.nsbta new file mode 100644 index 0000000000..092fbb2833 Binary files /dev/null and b/res/field/props/animations/prop_animation_056.nsbta differ diff --git a/res/field/props/animations/prop_animation_057.nsbta b/res/field/props/animations/prop_animation_057.nsbta new file mode 100644 index 0000000000..96b53314f3 Binary files /dev/null and b/res/field/props/animations/prop_animation_057.nsbta differ diff --git a/res/field/props/animations/prop_animation_058.nsbta b/res/field/props/animations/prop_animation_058.nsbta new file mode 100644 index 0000000000..281ae41d06 Binary files /dev/null and b/res/field/props/animations/prop_animation_058.nsbta differ diff --git a/res/field/props/animations/prop_animation_059.nsbta b/res/field/props/animations/prop_animation_059.nsbta new file mode 100644 index 0000000000..13aef50399 Binary files /dev/null and b/res/field/props/animations/prop_animation_059.nsbta differ diff --git a/res/field/props/animations/prop_animation_060.nsbta b/res/field/props/animations/prop_animation_060.nsbta new file mode 100644 index 0000000000..4ed432cedc Binary files /dev/null and b/res/field/props/animations/prop_animation_060.nsbta differ diff --git a/res/field/props/animations/prop_animation_061.nsbta b/res/field/props/animations/prop_animation_061.nsbta new file mode 100644 index 0000000000..0d69a9dd7e Binary files /dev/null and b/res/field/props/animations/prop_animation_061.nsbta differ diff --git a/res/field/props/animations/prop_animation_062.nsbta b/res/field/props/animations/prop_animation_062.nsbta new file mode 100644 index 0000000000..2fc99418e5 Binary files /dev/null and b/res/field/props/animations/prop_animation_062.nsbta differ diff --git a/res/field/props/animations/prop_animation_063.nsbta b/res/field/props/animations/prop_animation_063.nsbta new file mode 100644 index 0000000000..ea020d4241 Binary files /dev/null and b/res/field/props/animations/prop_animation_063.nsbta differ diff --git a/res/field/props/animations/prop_animation_064.nsbtp b/res/field/props/animations/prop_animation_064.nsbtp new file mode 100644 index 0000000000..1afdde356f Binary files /dev/null and b/res/field/props/animations/prop_animation_064.nsbtp differ diff --git a/res/field/props/animations/prop_animation_065.nsbca b/res/field/props/animations/prop_animation_065.nsbca new file mode 100644 index 0000000000..967dbf9416 Binary files /dev/null and b/res/field/props/animations/prop_animation_065.nsbca differ diff --git a/res/field/props/animations/prop_animation_066.nsbca b/res/field/props/animations/prop_animation_066.nsbca new file mode 100644 index 0000000000..11be867c1c Binary files /dev/null and b/res/field/props/animations/prop_animation_066.nsbca differ diff --git a/res/field/props/animations/prop_animation_067.nsbca b/res/field/props/animations/prop_animation_067.nsbca new file mode 100644 index 0000000000..ccdbe1039e Binary files /dev/null and b/res/field/props/animations/prop_animation_067.nsbca differ diff --git a/res/field/props/animations/prop_animation_068.nsbta b/res/field/props/animations/prop_animation_068.nsbta new file mode 100644 index 0000000000..cd086e04a4 Binary files /dev/null and b/res/field/props/animations/prop_animation_068.nsbta differ diff --git a/res/field/props/animations/prop_animation_069.nsbca b/res/field/props/animations/prop_animation_069.nsbca new file mode 100644 index 0000000000..71383cda30 Binary files /dev/null and b/res/field/props/animations/prop_animation_069.nsbca differ diff --git a/res/field/props/animations/prop_animation_070.nsbca b/res/field/props/animations/prop_animation_070.nsbca new file mode 100644 index 0000000000..9878fb2eec Binary files /dev/null and b/res/field/props/animations/prop_animation_070.nsbca differ diff --git a/res/field/props/animations/prop_animation_071.nsbta b/res/field/props/animations/prop_animation_071.nsbta new file mode 100644 index 0000000000..d01179253a Binary files /dev/null and b/res/field/props/animations/prop_animation_071.nsbta differ diff --git a/res/field/props/animations/prop_animation_072.nsbtp b/res/field/props/animations/prop_animation_072.nsbtp new file mode 100644 index 0000000000..21fbb6354d Binary files /dev/null and b/res/field/props/animations/prop_animation_072.nsbtp differ diff --git a/res/field/props/animations/prop_animation_073.nsbca b/res/field/props/animations/prop_animation_073.nsbca new file mode 100644 index 0000000000..5103949c88 Binary files /dev/null and b/res/field/props/animations/prop_animation_073.nsbca differ diff --git a/res/field/props/animations/prop_animation_074.nsbta b/res/field/props/animations/prop_animation_074.nsbta new file mode 100644 index 0000000000..ba2f5499c2 Binary files /dev/null and b/res/field/props/animations/prop_animation_074.nsbta differ diff --git a/res/field/props/animations/prop_animation_075.nsbta b/res/field/props/animations/prop_animation_075.nsbta new file mode 100644 index 0000000000..80e8c766b5 Binary files /dev/null and b/res/field/props/animations/prop_animation_075.nsbta differ diff --git a/res/field/props/animations/prop_animation_076.nsbca b/res/field/props/animations/prop_animation_076.nsbca new file mode 100644 index 0000000000..83e9471a84 Binary files /dev/null and b/res/field/props/animations/prop_animation_076.nsbca differ diff --git a/res/field/props/animations/prop_animation_077.nsbta b/res/field/props/animations/prop_animation_077.nsbta new file mode 100644 index 0000000000..d7bc3a6847 Binary files /dev/null and b/res/field/props/animations/prop_animation_077.nsbta differ diff --git a/res/field/props/animations/prop_animation_078.nsbta b/res/field/props/animations/prop_animation_078.nsbta new file mode 100644 index 0000000000..2e5d6bba1d Binary files /dev/null and b/res/field/props/animations/prop_animation_078.nsbta differ diff --git a/res/field/props/animations/prop_animation_079.nsbta b/res/field/props/animations/prop_animation_079.nsbta new file mode 100644 index 0000000000..a3ecd10f76 Binary files /dev/null and b/res/field/props/animations/prop_animation_079.nsbta differ diff --git a/res/field/props/animations/prop_animation_080.nsbca b/res/field/props/animations/prop_animation_080.nsbca new file mode 100644 index 0000000000..ca6ab8997a Binary files /dev/null and b/res/field/props/animations/prop_animation_080.nsbca differ diff --git a/res/field/props/animations/prop_animation_081.nsbca b/res/field/props/animations/prop_animation_081.nsbca new file mode 100644 index 0000000000..5dc8e4c615 Binary files /dev/null and b/res/field/props/animations/prop_animation_081.nsbca differ diff --git a/res/field/props/animations/prop_animation_082.nsbta b/res/field/props/animations/prop_animation_082.nsbta new file mode 100644 index 0000000000..fa53527c64 Binary files /dev/null and b/res/field/props/animations/prop_animation_082.nsbta differ diff --git a/res/field/props/animations/prop_animation_083.nsbta b/res/field/props/animations/prop_animation_083.nsbta new file mode 100644 index 0000000000..949bcf3e4f Binary files /dev/null and b/res/field/props/animations/prop_animation_083.nsbta differ diff --git a/res/field/props/animations/prop_animation_084.nsbtp b/res/field/props/animations/prop_animation_084.nsbtp new file mode 100644 index 0000000000..f10b577b27 Binary files /dev/null and b/res/field/props/animations/prop_animation_084.nsbtp differ diff --git a/res/field/props/animations/prop_animation_085.nsbta b/res/field/props/animations/prop_animation_085.nsbta new file mode 100644 index 0000000000..29ddcc8dc0 Binary files /dev/null and b/res/field/props/animations/prop_animation_085.nsbta differ diff --git a/res/field/props/animations/prop_animation_086.nsbta b/res/field/props/animations/prop_animation_086.nsbta new file mode 100644 index 0000000000..7b107b8768 Binary files /dev/null and b/res/field/props/animations/prop_animation_086.nsbta differ diff --git a/res/field/props/animations/prop_animation_087.nsbtp b/res/field/props/animations/prop_animation_087.nsbtp new file mode 100644 index 0000000000..e0c1c915ea Binary files /dev/null and b/res/field/props/animations/prop_animation_087.nsbtp differ diff --git a/res/field/props/animations/prop_animation_088.nsbta b/res/field/props/animations/prop_animation_088.nsbta new file mode 100644 index 0000000000..42919190a0 Binary files /dev/null and b/res/field/props/animations/prop_animation_088.nsbta differ diff --git a/res/field/props/animations/prop_animation_089.nsbta b/res/field/props/animations/prop_animation_089.nsbta new file mode 100644 index 0000000000..53638e66a6 Binary files /dev/null and b/res/field/props/animations/prop_animation_089.nsbta differ diff --git a/res/field/props/animations/prop_animation_090.nsbta b/res/field/props/animations/prop_animation_090.nsbta new file mode 100644 index 0000000000..0226535698 Binary files /dev/null and b/res/field/props/animations/prop_animation_090.nsbta differ diff --git a/res/field/props/animations/prop_animation_091.nsbtp b/res/field/props/animations/prop_animation_091.nsbtp new file mode 100644 index 0000000000..4ffe344cac Binary files /dev/null and b/res/field/props/animations/prop_animation_091.nsbtp differ diff --git a/res/field/props/animations/prop_animation_092.nsbtp b/res/field/props/animations/prop_animation_092.nsbtp new file mode 100644 index 0000000000..1d25b69225 Binary files /dev/null and b/res/field/props/animations/prop_animation_092.nsbtp differ diff --git a/res/field/props/animations/prop_animation_093.nsbca b/res/field/props/animations/prop_animation_093.nsbca new file mode 100644 index 0000000000..bb4a589871 Binary files /dev/null and b/res/field/props/animations/prop_animation_093.nsbca differ diff --git a/res/field/props/animations/prop_animation_094.nsbtp b/res/field/props/animations/prop_animation_094.nsbtp new file mode 100644 index 0000000000..87ff251700 Binary files /dev/null and b/res/field/props/animations/prop_animation_094.nsbtp differ diff --git a/res/field/props/animations/prop_animation_095.nsbta b/res/field/props/animations/prop_animation_095.nsbta new file mode 100644 index 0000000000..93fd517a92 Binary files /dev/null and b/res/field/props/animations/prop_animation_095.nsbta differ diff --git a/res/field/props/animations/prop_animation_096.nsbca b/res/field/props/animations/prop_animation_096.nsbca new file mode 100644 index 0000000000..34e8ed5acd Binary files /dev/null and b/res/field/props/animations/prop_animation_096.nsbca differ diff --git a/res/field/props/animations/prop_animation_097.nsbtp b/res/field/props/animations/prop_animation_097.nsbtp new file mode 100644 index 0000000000..2e2aadfe8b Binary files /dev/null and b/res/field/props/animations/prop_animation_097.nsbtp differ diff --git a/res/field/props/animations/prop_animations.order b/res/field/props/animations/prop_animations.order new file mode 100644 index 0000000000..59d72b9404 --- /dev/null +++ b/res/field/props/animations/prop_animations.order @@ -0,0 +1,98 @@ +prop_animation_000.nsbta +prop_animation_001.nsbca +prop_animation_002.nsbca +prop_animation_003.nsbca +prop_animation_004.nsbta +prop_animation_005.nsbca +prop_animation_006.nsbca +prop_animation_007.nsbca +prop_animation_008.nsbca +prop_animation_009.nsbca +prop_animation_010.nsbca +prop_animation_011.nsbtp +prop_animation_012.nsbtp +prop_animation_013.nsbtp +prop_animation_014.nsbta +prop_animation_015.nsbtp +prop_animation_016.nsbtp +prop_animation_017.nsbtp +prop_animation_018.nsbta +prop_animation_019.nsbta +prop_animation_020.nsbta +prop_animation_021.nsbta +prop_animation_022.nsbta +prop_animation_023.nsbtp +prop_animation_024.nsbtp +prop_animation_025.nsbca +prop_animation_026.nsbca +prop_animation_027.nsbca +prop_animation_028.nsbca +prop_animation_029.nsbca +prop_animation_030.nsbca +prop_animation_031.nsbtp +prop_animation_032.nsbtp +prop_animation_033.nsbca +prop_animation_034.nsbca +prop_animation_035.nsbta +prop_animation_036.nsbta +prop_animation_037.nsbta +prop_animation_038.nsbta +prop_animation_039.nsbca +prop_animation_040.nsbca +prop_animation_041.nsbtp +prop_animation_042.nsbtp +prop_animation_043.nsbta +prop_animation_044.nsbta +prop_animation_045.nsbta +prop_animation_046.nsbta +prop_animation_047.nsbta +prop_animation_048.nsbta +prop_animation_049.nsbca +prop_animation_050.nsbtp +prop_animation_051.nsbtp +prop_animation_052.nsbtp +prop_animation_053.nsbta +prop_animation_054.nsbca +prop_animation_055.nsbta +prop_animation_056.nsbta +prop_animation_057.nsbta +prop_animation_058.nsbta +prop_animation_059.nsbta +prop_animation_060.nsbta +prop_animation_061.nsbta +prop_animation_062.nsbta +prop_animation_063.nsbta +prop_animation_064.nsbtp +prop_animation_065.nsbca +prop_animation_066.nsbca +prop_animation_067.nsbca +prop_animation_068.nsbta +prop_animation_069.nsbca +prop_animation_070.nsbca +prop_animation_071.nsbta +prop_animation_072.nsbtp +prop_animation_073.nsbca +prop_animation_074.nsbta +prop_animation_075.nsbta +prop_animation_076.nsbca +prop_animation_077.nsbta +prop_animation_078.nsbta +prop_animation_079.nsbta +prop_animation_080.nsbca +prop_animation_081.nsbca +prop_animation_082.nsbta +prop_animation_083.nsbta +prop_animation_084.nsbtp +prop_animation_085.nsbta +prop_animation_086.nsbta +prop_animation_087.nsbtp +prop_animation_088.nsbta +prop_animation_089.nsbta +prop_animation_090.nsbta +prop_animation_091.nsbtp +prop_animation_092.nsbtp +prop_animation_093.nsbca +prop_animation_094.nsbtp +prop_animation_095.nsbta +prop_animation_096.nsbca +prop_animation_097.nsbtp diff --git a/res/field/props/meson.build b/res/field/props/meson.build new file mode 100644 index 0000000000..23007b3704 --- /dev/null +++ b/res/field/props/meson.build @@ -0,0 +1,4 @@ +subdir('animations') +subdir('models') +subdir('model_sets') +subdir('texture_sets') diff --git a/res/field/props/model_sets/meson.build b/res/field/props/model_sets/meson.build new file mode 100644 index 0000000000..99bd3730b9 --- /dev/null +++ b/res/field/props/model_sets/meson.build @@ -0,0 +1,110 @@ +prop_model_set_bin_gen = generator( + prop_model_set_py, + arguments: [ '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@', ], + output: '@BASENAME@' +) + +prop_model_set_data_srcs = files( + 'prop_model_set_000.json', + 'prop_model_set_001.json', + 'prop_model_set_002.json', + 'prop_model_set_003.json', + 'prop_model_set_004.json', + 'prop_model_set_005.json', + 'prop_model_set_006.json', + 'prop_model_set_007.json', + 'prop_model_set_008.json', + 'prop_model_set_009.json', + 'prop_model_set_010.json', + 'prop_model_set_011.json', + 'prop_model_set_012.json', + 'prop_model_set_013.json', + 'prop_model_set_014.json', + 'prop_model_set_015.json', + 'prop_model_set_016.json', + 'prop_model_set_017.json', + 'prop_model_set_018.json', + 'prop_model_set_019.json', + 'prop_model_set_020.json', + 'prop_model_set_021.json', + 'prop_model_set_022.json', + 'prop_model_set_023.json', + 'prop_model_set_024.json', + 'prop_model_set_025.json', + 'prop_model_set_026.json', + 'prop_model_set_027.json', + 'prop_model_set_028.json', + 'prop_model_set_029.json', + 'prop_model_set_030.json', + 'prop_model_set_031.json', + 'prop_model_set_032.json', + 'prop_model_set_033.json', + 'prop_model_set_034.json', + 'prop_model_set_035.json', + 'prop_model_set_036.json', + 'prop_model_set_037.json', + 'prop_model_set_038.json', + 'prop_model_set_039.json', + 'prop_model_set_040.json', + 'prop_model_set_041.json', + 'prop_model_set_042.json', + 'prop_model_set_043.json', + 'prop_model_set_044.json', + 'prop_model_set_045.json', + 'prop_model_set_046.json', + 'prop_model_set_047.json', + 'prop_model_set_048.json', + 'prop_model_set_049.json', + 'prop_model_set_050.json', + 'prop_model_set_051.json', + 'prop_model_set_052.json', + 'prop_model_set_053.json', + 'prop_model_set_054.json', + 'prop_model_set_055.json', + 'prop_model_set_056.json', + 'prop_model_set_057.json', + 'prop_model_set_058.json', + 'prop_model_set_059.json', + 'prop_model_set_060.json', + 'prop_model_set_061.json', + 'prop_model_set_062.json', + 'prop_model_set_063.json', + 'prop_model_set_064.json', + 'prop_model_set_065.json', + 'prop_model_set_066.json', + 'prop_model_set_067.json', + 'prop_model_set_068.json', + 'prop_model_set_069.json', + 'prop_model_set_070.json' +) + +prop_model_set_data_order = files('prop_model_sets.order') + +prop_model_set_narc = custom_target('prop_model_sets.narc', + output: [ + 'prop_model_sets.narc', + 'prop_model_sets.naix', + ], + input: [ + prop_model_set_bin_gen.process(prop_model_set_data_srcs, + env: jsoncnv_env, + extra_args: [ + '--map-prop-model-naix', map_prop_model_narc[1].full_path() + '.h', + ], + ), + prop_model_set_data_order + ], + depends: [ + py_consts_generators, + map_prop_model_narc + ], + command: [ + narc_exe, 'create', + '--naix', + '--order', prop_model_set_data_order, + '--output', '@OUTPUT0@', + '@PRIVATE_DIR@', + ] +) + +nitrofs_files += prop_model_set_narc diff --git a/res/field/props/model_sets/prop_model_set_000.json b/res/field/props/model_sets/prop_model_set_000.json new file mode 100644 index 0000000000..d003d6df0c --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_000.json @@ -0,0 +1,36 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "prop_model_003_nsbmd", + "prop_model_009_nsbmd", + "prop_model_011_nsbmd", + "prop_model_012_nsbmd", + "prop_model_013_nsbmd", + "prop_model_014_nsbmd", + "prop_model_016_nsbmd", + "prop_model_017_nsbmd", + "prop_model_020_nsbmd", + "prop_model_021_nsbmd", + "prop_model_022_nsbmd", + "prop_model_023_nsbmd", + "prop_model_071_nsbmd", + "prop_model_024_nsbmd", + "prop_model_025_nsbmd", + "door01_nsbmd", + "brown_wooden_door_nsbmd", + "green_wooden_door_nsbmd", + "iron_door_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_236_nsbmd", + "prop_model_186_nsbmd", + "prop_model_245_nsbmd", + "jubilife_city_building_door_nsbmd", + "prop_model_262_nsbmd", + "gym_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_001.json b/res/field/props/model_sets/prop_model_set_001.json new file mode 100644 index 0000000000..5fe30bc05d --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_001.json @@ -0,0 +1,90 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_087_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_091_nsbmd", + "prop_model_092_nsbmd", + "prop_model_093_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_102_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_120_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "prop_model_125_nsbmd", + "prop_model_126_nsbmd", + "prop_model_127_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_129_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_132_nsbmd", + "prop_model_133_nsbmd", + "prop_model_134_nsbmd", + "prop_model_135_nsbmd", + "prop_model_136_nsbmd", + "prop_model_137_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_141_nsbmd", + "prop_model_142_nsbmd", + "prop_model_143_nsbmd", + "prop_model_144_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_152_nsbmd", + "prop_model_153_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_158_nsbmd", + "prop_model_159_nsbmd", + "prop_model_160_nsbmd", + "prop_model_161_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_002.json b/res/field/props/model_sets/prop_model_set_002.json new file mode 100644 index 0000000000..e2c0a07d83 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_002.json @@ -0,0 +1,142 @@ +{ + "mapPropModels": [ + "secret_base_pc_normal_flag_nsbmd", + "secret_base_pc_bronze_flag_nsbmd", + "secret_base_pc_silver_flag_nsbmd", + "secret_base_pc_gold_flag_nsbmd", + "secret_base_pc_platinum_flag_nsbmd", + "prop_model_272_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "prop_model_180_nsbmd", + "prop_model_173_nsbmd", + "prop_model_168_nsbmd", + "prop_model_163_nsbmd", + "prop_model_171_nsbmd", + "prop_model_165_nsbmd", + "prop_model_116_nsbmd", + "prop_model_089_nsbmd", + "prop_model_081_nsbmd", + "prop_model_237_nsbmd", + "prop_model_256_nsbmd", + "prop_model_161_nsbmd", + "prop_model_179_nsbmd", + "prop_model_182_nsbmd", + "prop_model_080_nsbmd", + "prop_model_183_nsbmd", + "prop_model_082_nsbmd", + "prop_model_084_nsbmd", + "prop_model_083_nsbmd", + "prop_model_106_nsbmd", + "prop_model_086_nsbmd", + "prop_model_094_nsbmd", + "prop_model_250_nsbmd", + "prop_model_251_nsbmd", + "prop_model_253_nsbmd", + "prop_model_252_nsbmd", + "prop_model_257_nsbmd", + "prop_model_085_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_healing_machine_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "prop_model_111_nsbmd", + "prop_model_419_nsbmd", + "prop_model_254_nsbmd", + "prop_model_255_nsbmd", + "prop_model_421_nsbmd", + "prop_model_424_nsbmd", + "prop_model_152_nsbmd", + "prop_model_329_nsbmd", + "prop_model_330_nsbmd", + "prop_model_331_nsbmd", + "prop_model_332_nsbmd", + "prop_model_333_nsbmd", + "prop_model_334_nsbmd", + "prop_model_335_nsbmd", + "prop_model_336_nsbmd", + "prop_model_339_nsbmd", + "prop_model_340_nsbmd", + "prop_model_346_nsbmd", + "prop_model_347_nsbmd", + "prop_model_348_nsbmd", + "prop_model_349_nsbmd", + "prop_model_350_nsbmd", + "prop_model_351_nsbmd", + "prop_model_352_nsbmd", + "prop_model_353_nsbmd", + "prop_model_354_nsbmd", + "prop_model_355_nsbmd", + "prop_model_356_nsbmd", + "prop_model_357_nsbmd", + "prop_model_358_nsbmd", + "prop_model_359_nsbmd", + "prop_model_361_nsbmd", + "prop_model_362_nsbmd", + "prop_model_363_nsbmd", + "prop_model_364_nsbmd", + "prop_model_365_nsbmd", + "prop_model_366_nsbmd", + "prop_model_367_nsbmd", + "prop_model_368_nsbmd", + "prop_model_369_nsbmd", + "prop_model_370_nsbmd", + "prop_model_371_nsbmd", + "prop_model_372_nsbmd", + "prop_model_373_nsbmd", + "prop_model_374_nsbmd", + "prop_model_375_nsbmd", + "prop_model_376_nsbmd", + "prop_model_377_nsbmd", + "prop_model_378_nsbmd", + "prop_model_379_nsbmd", + "prop_model_380_nsbmd", + "prop_model_381_nsbmd", + "prop_model_382_nsbmd", + "prop_model_383_nsbmd", + "prop_model_384_nsbmd", + "prop_model_385_nsbmd", + "prop_model_386_nsbmd", + "prop_model_387_nsbmd", + "prop_model_388_nsbmd", + "prop_model_389_nsbmd", + "prop_model_390_nsbmd", + "prop_model_391_nsbmd", + "prop_model_392_nsbmd", + "prop_model_393_nsbmd", + "prop_model_394_nsbmd", + "prop_model_395_nsbmd", + "prop_model_396_nsbmd", + "prop_model_397_nsbmd", + "prop_model_398_nsbmd", + "prop_model_399_nsbmd", + "prop_model_400_nsbmd", + "prop_model_401_nsbmd", + "prop_model_402_nsbmd", + "prop_model_403_nsbmd", + "prop_model_404_nsbmd", + "prop_model_405_nsbmd", + "prop_model_406_nsbmd", + "prop_model_407_nsbmd", + "prop_model_408_nsbmd", + "prop_model_409_nsbmd", + "prop_model_410_nsbmd", + "prop_model_411_nsbmd", + "prop_model_412_nsbmd", + "prop_model_413_nsbmd", + "prop_model_414_nsbmd", + "prop_model_415_nsbmd", + "prop_model_416_nsbmd", + "prop_model_417_nsbmd", + "secret_base_entrance_north_nsbmd", + "secret_base_entrance_south_nsbmd", + "secret_base_entrance_west_nsbmd", + "secret_base_entrance_east_nsbmd", + "prop_model_267_nsbmd", + "prop_model_285_nsbmd", + "prop_model_436_nsbmd", + "prop_model_434_nsbmd", + "prop_model_435_nsbmd", + "prop_model_433_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_003.json b/res/field/props/model_sets/prop_model_set_003.json new file mode 100644 index 0000000000..d4f21f3b34 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_003.json @@ -0,0 +1,25 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "prop_model_047_nsbmd", + "prop_model_048_nsbmd", + "prop_model_049_nsbmd", + "prop_model_051_nsbmd", + "prop_model_052_nsbmd", + "prop_model_053_nsbmd", + "prop_model_054_nsbmd", + "prop_model_055_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_263_nsbmd", + "gym_door_nsbmd", + "prop_model_299_nsbmd", + "bike_muddy_slope_nsbmd", + "blue_door_nsbmd", + "iron_door_2_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_004.json b/res/field/props/model_sets/prop_model_set_004.json new file mode 100644 index 0000000000..a1c8f7dde8 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_004.json @@ -0,0 +1,32 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "prop_model_037_nsbmd", + "prop_model_038_nsbmd", + "prop_model_056_nsbmd", + "prop_model_057_nsbmd", + "prop_model_020_nsbmd", + "prop_model_245_nsbmd", + "prop_model_061_nsbmd", + "prop_model_062_nsbmd", + "prop_model_063_nsbmd", + "prop_model_064_nsbmd", + "prop_model_065_nsbmd", + "prop_model_146_nsbmd", + "prop_model_148_nsbmd", + "prop_model_265_nsbmd", + "pokecenter_door_nsbmd", + "gym_door_nsbmd", + "yellow_wooden_door_nsbmd", + "prop_model_439_nsbmd", + "prop_model_440_nsbmd", + "blue_wooden_door_nsbmd", + "iron_door_nsbmd", + "jubilife_city_building_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_005.json b/res/field/props/model_sets/prop_model_set_005.json new file mode 100644 index 0000000000..d002354453 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_005.json @@ -0,0 +1,25 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_188_nsbmd", + "prop_model_189_nsbmd", + "prop_model_190_nsbmd", + "prop_model_191_nsbmd", + "prop_model_264_nsbmd", + "prop_model_193_nsbmd", + "prop_model_194_nsbmd", + "gym_door_nsbmd", + "prop_model_306_nsbmd", + "veilstone_dpt_store_door_nsbmd", + "prop_model_443_nsbmd", + "brown_wooden_door_nsbmd", + "blue_wooden_door_nsbmd", + "blue_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_006.json b/res/field/props/model_sets/prop_model_set_006.json new file mode 100644 index 0000000000..af80fae80d --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_006.json @@ -0,0 +1,27 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_197_nsbmd", + "prop_model_198_nsbmd", + "prop_model_203_nsbmd", + "prop_model_205_nsbmd", + "prop_model_445_nsbmd", + "prop_model_446_nsbmd", + "gym_door_nsbmd", + "bike_muddy_slope_nsbmd", + "prop_model_305_nsbmd", + "prop_model_056_nsbmd", + "blue_wooden_door_nsbmd", + "prop_model_202_nsbmd", + "prop_model_468_nsbmd", + "prop_model_515_nsbmd", + "jubilife_city_building_door_nsbmd", + "brown_wooden_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_007.json b/res/field/props/model_sets/prop_model_set_007.json new file mode 100644 index 0000000000..d0dae7950d --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_007.json @@ -0,0 +1,23 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_206_nsbmd", + "prop_model_207_nsbmd", + "prop_model_208_nsbmd", + "prop_model_209_nsbmd", + "prop_model_210_nsbmd", + "prop_model_211_nsbmd", + "prop_model_212_nsbmd", + "prop_model_213_nsbmd", + "prop_model_214_nsbmd", + "gym_door_nsbmd", + "veilstone_dpt_store_door_nsbmd", + "blue_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_008.json b/res/field/props/model_sets/prop_model_set_008.json new file mode 100644 index 0000000000..54bd88deab --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_008.json @@ -0,0 +1,21 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_216_nsbmd", + "prop_model_217_nsbmd", + "prop_model_449_nsbmd", + "prop_model_244_nsbmd", + "prop_model_447_nsbmd", + "prop_model_448_nsbmd", + "gym_door_nsbmd", + "green_wooden_door_nsbmd", + "mansion_door_nsbmd", + "prop_model_101_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_009.json b/res/field/props/model_sets/prop_model_set_009.json new file mode 100644 index 0000000000..f15f65a496 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_009.json @@ -0,0 +1,23 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_219_nsbmd", + "prop_model_220_nsbmd", + "prop_model_221_nsbmd", + "prop_model_223_nsbmd", + "prop_model_224_nsbmd", + "gym_door_nsbmd", + "blue_door_nsbmd", + "prop_model_452_nsbmd", + "prop_model_453_nsbmd", + "prop_model_501_nsbmd", + "prop_model_307_nsbmd", + "prop_model_308_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_010.json b/res/field/props/model_sets/prop_model_set_010.json new file mode 100644 index 0000000000..21d06cf44e --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_010.json @@ -0,0 +1,22 @@ +{ + "mapPropModels": [ + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_226_nsbmd", + "prop_model_227_nsbmd", + "prop_model_228_nsbmd", + "prop_model_229_nsbmd", + "prop_model_230_nsbmd", + "prop_model_243_nsbmd", + "prop_model_450_nsbmd", + "prop_model_451_nsbmd", + "gym_door_nsbmd", + "prop_model_311_nsbmd", + "prop_model_449_nsbmd", + "brown_wooden_door_nsbmd", + "screw_steamship_spiral_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_011.json b/res/field/props/model_sets/prop_model_set_011.json new file mode 100644 index 0000000000..06d782fff7 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_011.json @@ -0,0 +1,25 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "prop_model_027_nsbmd", + "prop_model_030_nsbmd", + "canalave_bridge_left_nsbmd", + "canalave_bridge_right_nsbmd", + "regular_ship_nsbmd", + "prop_model_035_nsbmd", + "prop_model_036_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_244_nsbmd", + "prop_model_191_nsbmd", + "prop_model_264_nsbmd", + "prop_model_029_nsbmd", + "gym_door_nsbmd", + "blue_door_nsbmd", + "veilstone_dpt_store_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_012.json b/res/field/props/model_sets/prop_model_set_012.json new file mode 100644 index 0000000000..18952a3dda --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_012.json @@ -0,0 +1,17 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "gym_door_nsbmd", + "prop_model_307_nsbmd", + "prop_model_308_nsbmd", + "prop_model_452_nsbmd", + "prop_model_453_nsbmd", + "prop_model_501_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_013.json b/res/field/props/model_sets/prop_model_set_013.json new file mode 100644 index 0000000000..063c969d62 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_013.json @@ -0,0 +1,19 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "gym_door_nsbmd", + "bike_muddy_slope_nsbmd", + "prop_model_499_nsbmd", + "blue_wooden_door_nsbmd", + "prop_model_557_nsbmd", + "yellow_wooden_door_nsbmd", + "prop_model_584_nsbmd", + "prop_model_585_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_014.json b/res/field/props/model_sets/prop_model_set_014.json new file mode 100644 index 0000000000..b7ae5c64f3 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_014.json @@ -0,0 +1,21 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "prop_model_219_nsbmd", + "prop_model_217_nsbmd", + "prop_model_233_nsbmd", + "prop_model_234_nsbmd", + "prop_model_454_nsbmd", + "prop_model_455_nsbmd", + "gym_door_nsbmd", + "hotel_grand_lake_door_nsbmd", + "green_wooden_door_nsbmd", + "blue_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_015.json b/res/field/props/model_sets/prop_model_set_015.json new file mode 100644 index 0000000000..b6f99c0ac1 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_015.json @@ -0,0 +1,26 @@ +{ + "mapPropModels": [ + "prop_model_004_nsbmd", + "prop_model_005_nsbmd", + "prop_model_008_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "honey_tree_nsbmd", + "pokecenter_door_nsbmd", + "gym_door_nsbmd", + "bike_muddy_slope_nsbmd", + "prop_model_499_nsbmd", + "prop_model_500_nsbmd", + "prop_model_455_nsbmd", + "prop_model_210_nsbmd", + "prop_model_211_nsbmd", + "screw_steamship_spiral_nsbmd", + "blue_wooden_door_nsbmd", + "prop_model_449_nsbmd", + "prop_model_544_nsbmd", + "prop_model_556_nsbmd", + "yellow_wooden_door_nsbmd", + "prop_model_586_nsbmd", + "prop_model_587_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_016.json b/res/field/props/model_sets/prop_model_set_016.json new file mode 100644 index 0000000000..9a2731da65 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_016.json @@ -0,0 +1,77 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "prop_model_121_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_017.json b/res/field/props/model_sets/prop_model_set_017.json new file mode 100644 index 0000000000..82aac6ef6c --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_017.json @@ -0,0 +1,41 @@ +{ + "mapPropModels": [ + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_176_nsbmd", + "prop_model_085_nsbmd", + "prop_model_120_nsbmd", + "prop_model_095_nsbmd", + "prop_model_078_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_094_nsbmd", + "prop_model_151_nsbmd", + "prop_model_137_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_157_nsbmd", + "prop_model_152_nsbmd", + "prop_model_135_nsbmd", + "prop_model_159_nsbmd", + "elevator_lights_nsbmd", + "pokecenter_healing_machine_mini_pokeball_nsbmd", + "prop_model_588_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_018.json b/res/field/props/model_sets/prop_model_set_018.json new file mode 100644 index 0000000000..4323267deb --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_018.json @@ -0,0 +1,56 @@ +{ + "mapPropModels": [ + "prop_model_085_nsbmd", + "prop_model_132_nsbmd", + "prop_model_159_nsbmd", + "prop_model_135_nsbmd", + "prop_model_136_nsbmd", + "prop_model_160_nsbmd", + "prop_model_161_nsbmd", + "prop_model_177_nsbmd", + "prop_model_178_nsbmd", + "prop_model_078_nsbmd", + "prop_model_179_nsbmd", + "prop_model_094_nsbmd", + "prop_model_249_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_168_nsbmd", + "prop_model_092_nsbmd", + "prop_model_138_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_254_nsbmd", + "prop_model_255_nsbmd", + "prop_model_256_nsbmd", + "prop_model_176_nsbmd", + "prop_model_137_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "prop_model_433_nsbmd", + "prop_model_434_nsbmd", + "prop_model_435_nsbmd", + "prop_model_436_nsbmd", + "prop_model_437_nsbmd", + "prop_model_083_nsbmd", + "prop_model_086_nsbmd", + "prop_model_079_nsbmd", + "prop_model_151_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_419_nsbmd", + "prop_model_157_nsbmd", + "prop_model_121_nsbmd", + "elevator_door_nsbmd", + "prop_model_187_nsbmd", + "prop_model_134_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_019.json b/res/field/props/model_sets/prop_model_set_019.json new file mode 100644 index 0000000000..c32f7a6f7b --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_019.json @@ -0,0 +1,10 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "pastoria_gym_blue_button_nsbmd", + "pastoria_gym_green_button_nsbmd", + "pastoria_gym_orange_button_nsbmd", + "pastoria_gym_water_floor_nsbmd", + "prop_model_152_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_020.json b/res/field/props/model_sets/prop_model_set_020.json new file mode 100644 index 0000000000..c489cad202 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_020.json @@ -0,0 +1,13 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_152_nsbmd", + "prop_model_294_nsbmd", + "prop_model_295_nsbmd", + "prop_model_296_nsbmd", + "prop_model_297_nsbmd", + "prop_model_300_nsbmd", + "prop_model_301_nsbmd", + "prop_model_302_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_021.json b/res/field/props/model_sets/prop_model_set_021.json new file mode 100644 index 0000000000..d879991ee7 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_021.json @@ -0,0 +1,6 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_152_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_022.json b/res/field/props/model_sets/prop_model_set_022.json new file mode 100644 index 0000000000..81f99eee35 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_022.json @@ -0,0 +1,8 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_152_nsbmd", + "prop_model_536_nsbmd", + "prop_model_537_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_023.json b/res/field/props/model_sets/prop_model_set_023.json new file mode 100644 index 0000000000..d623d62e5a --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_023.json @@ -0,0 +1,11 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "iron_island_platform_lift_nsbmd", + "prop_model_259_nsbmd", + "hearthome_gym_inside_door_nsbmd", + "prop_model_261_nsbmd", + "prop_model_152_nsbmd", + "prop_model_486_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_024.json b/res/field/props/model_sets/prop_model_set_024.json new file mode 100644 index 0000000000..7cde4faf94 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_024.json @@ -0,0 +1,7 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_247_nsbmd", + "prop_model_152_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_025.json b/res/field/props/model_sets/prop_model_set_025.json new file mode 100644 index 0000000000..d879991ee7 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_025.json @@ -0,0 +1,6 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_152_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_026.json b/res/field/props/model_sets/prop_model_set_026.json new file mode 100644 index 0000000000..a0b6c12888 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_026.json @@ -0,0 +1,20 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_152_nsbmd", + "prop_model_457_nsbmd", + "prop_model_458_nsbmd", + "prop_model_459_nsbmd", + "prop_model_460_nsbmd", + "prop_model_461_nsbmd", + "prop_model_462_nsbmd", + "prop_model_463_nsbmd", + "prop_model_464_nsbmd", + "prop_model_465_nsbmd", + "prop_model_466_nsbmd", + "prop_model_467_nsbmd", + "prop_model_097_nsbmd", + "prop_model_098_nsbmd", + "prop_model_099_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_027.json b/res/field/props/model_sets/prop_model_set_027.json new file mode 100644 index 0000000000..e43b2f4f62 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_027.json @@ -0,0 +1,85 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_103_nsbmd", + "prop_model_154_nsbmd", + "prop_model_157_nsbmd", + "prop_model_085_nsbmd", + "prop_model_079_nsbmd", + "prop_model_096_nsbmd", + "prop_model_095_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_089_nsbmd", + "prop_model_149_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_092_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_086_nsbmd", + "prop_model_106_nsbmd", + "prop_model_082_nsbmd", + "prop_model_084_nsbmd", + "prop_model_083_nsbmd", + "prop_model_104_nsbmd", + "prop_model_155_nsbmd", + "prop_model_105_nsbmd", + "prop_model_156_nsbmd", + "desk_drawer_laptop_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "desk_drawer_laptop_facing_left_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_266_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_150_nsbmd", + "prop_model_176_nsbmd", + "prop_model_121_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_275_nsbmd", + "prop_model_276_nsbmd", + "prop_model_277_nsbmd", + "prop_model_278_nsbmd", + "prop_model_279_nsbmd", + "prop_model_280_nsbmd", + "prop_model_151_nsbmd", + "prop_model_137_nsbmd", + "prop_model_094_nsbmd", + "prop_model_250_nsbmd", + "prop_model_251_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_113_nsbmd", + "prop_model_158_nsbmd", + "prop_model_116_nsbmd", + "prop_model_314_nsbmd", + "prop_model_178_nsbmd", + "prop_model_249_nsbmd", + "prop_model_491_nsbmd", + "elevator_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_028.json b/res/field/props/model_sets/prop_model_set_028.json new file mode 100644 index 0000000000..ea2d10cf97 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_028.json @@ -0,0 +1,95 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_029.json b/res/field/props/model_sets/prop_model_set_029.json new file mode 100644 index 0000000000..94dd33b317 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_029.json @@ -0,0 +1,103 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_526_nsbmd", + "elevator_door_nsbmd", + "prop_model_100_nsbmd", + "prop_model_552_nsbmd", + "prop_model_548_nsbmd", + "prop_model_545_nsbmd", + "prop_model_555_nsbmd", + "prop_model_553_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_030.json b/res/field/props/model_sets/prop_model_set_030.json new file mode 100644 index 0000000000..4c9e774b9a --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_030.json @@ -0,0 +1,102 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "card_door_nsbmd", + "prop_model_485_nsbmd", + "prop_model_486_nsbmd", + "prop_model_487_nsbmd", + "prop_model_488_nsbmd", + "prop_model_489_nsbmd", + "elevator_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_031.json b/res/field/props/model_sets/prop_model_set_031.json new file mode 100644 index 0000000000..ea2d10cf97 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_031.json @@ -0,0 +1,95 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_032.json b/res/field/props/model_sets/prop_model_set_032.json new file mode 100644 index 0000000000..105908cc99 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_032.json @@ -0,0 +1,16 @@ +{ + "mapPropModels": [ + "prop_model_152_nsbmd", + "pokemon_league_platform_lift_nsbmd", + "prop_model_503_nsbmd", + "prop_model_504_nsbmd", + "prop_model_505_nsbmd", + "prop_model_506_nsbmd", + "pokemon_league_hall_of_fame_machine_nsbmd", + "pokecenter_healing_machine_mini_pokeball_nsbmd", + "prop_model_107_nsbmd", + "prop_model_108_nsbmd", + "prop_model_109_nsbmd", + "prop_model_110_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_033.json b/res/field/props/model_sets/prop_model_set_033.json new file mode 100644 index 0000000000..6a1f2f3dfb --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_033.json @@ -0,0 +1,96 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_525_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_034.json b/res/field/props/model_sets/prop_model_set_034.json new file mode 100644 index 0000000000..7ce968d1c2 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_034.json @@ -0,0 +1,96 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "elevator_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_035.json b/res/field/props/model_sets/prop_model_set_035.json new file mode 100644 index 0000000000..0366e7a33a --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_035.json @@ -0,0 +1,102 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_178_nsbmd", + "prop_model_249_nsbmd", + "prop_model_421_nsbmd", + "prop_model_490_nsbmd", + "prop_model_491_nsbmd", + "prop_model_275_nsbmd", + "elevator_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_036.json b/res/field/props/model_sets/prop_model_set_036.json new file mode 100644 index 0000000000..5fb5d44099 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_036.json @@ -0,0 +1,24 @@ +{ + "mapPropModels": [ + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_085_nsbmd", + "prop_model_078_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_428_nsbmd", + "gts_inside_door_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_137_nsbmd", + "prop_model_424_nsbmd", + "prop_model_092_nsbmd", + "prop_model_138_nsbmd", + "prop_model_549_nsbmd", + "prop_model_550_nsbmd", + "prop_model_551_nsbmd", + "prop_model_164_nsbmd", + "prop_model_553_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_037.json b/res/field/props/model_sets/prop_model_set_037.json new file mode 100644 index 0000000000..ea2d10cf97 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_037.json @@ -0,0 +1,95 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_038.json b/res/field/props/model_sets/prop_model_set_038.json new file mode 100644 index 0000000000..76c42fcdf1 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_038.json @@ -0,0 +1,98 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_492_nsbmd", + "prop_model_493_nsbmd", + "prop_model_261_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_039.json b/res/field/props/model_sets/prop_model_set_039.json new file mode 100644 index 0000000000..d310304fc5 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_039.json @@ -0,0 +1,26 @@ +{ + "mapPropModels": [ + "prop_model_092_nsbmd", + "prop_model_078_nsbmd", + "prop_model_082_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_279_nsbmd", + "prop_model_278_nsbmd", + "prop_model_094_nsbmd", + "prop_model_086_nsbmd", + "prop_model_137_nsbmd", + "prop_model_089_nsbmd", + "prop_model_083_nsbmd", + "prop_model_150_nsbmd", + "prop_model_183_nsbmd", + "prop_model_167_nsbmd", + "prop_model_079_nsbmd", + "prop_model_436_nsbmd", + "prop_model_081_nsbmd", + "prop_model_114_nsbmd", + "prop_model_080_nsbmd", + "prop_model_168_nsbmd", + "prop_model_434_nsbmd", + "prop_model_435_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_040.json b/res/field/props/model_sets/prop_model_set_040.json new file mode 100644 index 0000000000..727ae9074b --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_040.json @@ -0,0 +1,100 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_545_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "desk_drawer_laptop_facing_left_nsbmd", + "prop_model_548_nsbmd", + "prop_model_249_nsbmd", + "prop_model_178_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_041.json b/res/field/props/model_sets/prop_model_set_041.json new file mode 100644 index 0000000000..2a9f875ad7 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_041.json @@ -0,0 +1,102 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_526_nsbmd", + "elevator_door_nsbmd", + "prop_model_100_nsbmd", + "prop_model_092_nsbmd", + "prop_model_140_nsbmd", + "prop_model_555_nsbmd", + "prop_model_548_nsbmd", + "prop_model_546_nsbmd", + "prop_model_553_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_042.json b/res/field/props/model_sets/prop_model_set_042.json new file mode 100644 index 0000000000..ca29068d13 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_042.json @@ -0,0 +1,102 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_526_nsbmd", + "elevator_door_nsbmd", + "prop_model_100_nsbmd", + "prop_model_546_nsbmd", + "prop_model_555_nsbmd", + "prop_model_548_nsbmd", + "prop_model_558_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_043.json b/res/field/props/model_sets/prop_model_set_043.json new file mode 100644 index 0000000000..d21c0e13cb --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_043.json @@ -0,0 +1,101 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_526_nsbmd", + "elevator_door_nsbmd", + "prop_model_100_nsbmd", + "prop_model_547_nsbmd", + "prop_model_555_nsbmd", + "prop_model_548_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_044.json b/res/field/props/model_sets/prop_model_set_044.json new file mode 100644 index 0000000000..6fcfd9afab --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_044.json @@ -0,0 +1,102 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_526_nsbmd", + "elevator_door_nsbmd", + "prop_model_100_nsbmd", + "prop_model_547_nsbmd", + "prop_model_555_nsbmd", + "prop_model_554_nsbmd", + "prop_model_548_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_045.json b/res/field/props/model_sets/prop_model_set_045.json new file mode 100644 index 0000000000..c6f90db95b --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_045.json @@ -0,0 +1,101 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_526_nsbmd", + "elevator_door_nsbmd", + "prop_model_100_nsbmd", + "prop_model_546_nsbmd", + "prop_model_555_nsbmd", + "prop_model_548_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_046.json b/res/field/props/model_sets/prop_model_set_046.json new file mode 100644 index 0000000000..f98b2a04d7 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_046.json @@ -0,0 +1,6 @@ +{ + "mapPropModels": [ + "prop_model_085_nsbmd", + "prop_model_095_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_047.json b/res/field/props/model_sets/prop_model_set_047.json new file mode 100644 index 0000000000..dc53c059a2 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_047.json @@ -0,0 +1,25 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_559_nsbmd", + "prop_model_560_nsbmd", + "prop_model_561_nsbmd", + "prop_model_562_nsbmd", + "prop_model_563_nsbmd", + "prop_model_564_nsbmd", + "prop_model_565_nsbmd", + "prop_model_566_nsbmd", + "prop_model_567_nsbmd", + "prop_model_568_nsbmd", + "prop_model_569_nsbmd", + "prop_model_570_nsbmd", + "prop_model_571_nsbmd", + "prop_model_572_nsbmd", + "prop_model_573_nsbmd", + "prop_model_574_nsbmd", + "prop_model_575_nsbmd", + "prop_model_576_nsbmd", + "prop_model_577_nsbmd", + "prop_model_578_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_048.json b/res/field/props/model_sets/prop_model_set_048.json new file mode 100644 index 0000000000..6969ced380 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_048.json @@ -0,0 +1,100 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_526_nsbmd", + "elevator_door_nsbmd", + "prop_model_100_nsbmd", + "prop_model_159_nsbmd", + "prop_model_136_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_049.json b/res/field/props/model_sets/prop_model_set_049.json new file mode 100644 index 0000000000..e769c76e9d --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_049.json @@ -0,0 +1,7 @@ +{ + "mapPropModels": [ + "bike_dungeon_muddy_slope_nsbmd", + "prop_model_309_nsbmd", + "prop_model_310_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_050.json b/res/field/props/model_sets/prop_model_set_050.json new file mode 100644 index 0000000000..b03bf94557 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_050.json @@ -0,0 +1,6 @@ +{ + "mapPropModels": [ + "prop_model_147_nsbmd", + "mansion_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_051.json b/res/field/props/model_sets/prop_model_set_051.json new file mode 100644 index 0000000000..b6ead45d1a --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_051.json @@ -0,0 +1,11 @@ +{ + "mapPropModels": [ + "prop_model_250_nsbmd", + "prop_model_252_nsbmd", + "prop_model_257_nsbmd", + "prop_model_315_nsbmd", + "prop_model_494_nsbmd", + "iron_island_platform_lift_nsbmd", + "prop_model_253_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_052.json b/res/field/props/model_sets/prop_model_set_052.json new file mode 100644 index 0000000000..566de29876 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_052.json @@ -0,0 +1,11 @@ +{ + "mapPropModels": [ + "prop_model_469_nsbmd", + "prop_model_470_nsbmd", + "prop_model_479_nsbmd", + "prop_model_480_nsbmd", + "prop_model_516_nsbmd", + "prop_model_076_nsbmd", + "prop_model_589_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_053.json b/res/field/props/model_sets/prop_model_set_053.json new file mode 100644 index 0000000000..5ab380345c --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_053.json @@ -0,0 +1,5 @@ +{ + "mapPropModels": [ + "prop_model_470_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_054.json b/res/field/props/model_sets/prop_model_set_054.json new file mode 100644 index 0000000000..bb217b036c --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_054.json @@ -0,0 +1,109 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "card_door_nsbmd", + "prop_model_485_nsbmd", + "prop_model_486_nsbmd", + "prop_model_487_nsbmd", + "prop_model_488_nsbmd", + "prop_model_489_nsbmd", + "prop_model_250_nsbmd", + "prop_model_135_nsbmd", + "prop_model_495_nsbmd", + "prop_model_496_nsbmd", + "prop_model_497_nsbmd", + "prop_model_314_nsbmd", + "prop_model_073_nsbmd", + "prop_model_535_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_055.json b/res/field/props/model_sets/prop_model_set_055.json new file mode 100644 index 0000000000..a2ddba2981 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_055.json @@ -0,0 +1,12 @@ +{ + "mapPropModels": [ + "prop_model_195_nsbmd", + "prop_model_193_nsbmd", + "prop_model_471_nsbmd", + "prop_model_472_nsbmd", + "prop_model_481_nsbmd", + "prop_model_482_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_056.json b/res/field/props/model_sets/prop_model_set_056.json new file mode 100644 index 0000000000..541dd68ae4 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_056.json @@ -0,0 +1,21 @@ +{ + "mapPropModels": [ + "prop_model_508_nsbmd", + "prop_model_509_nsbmd", + "prop_model_510_nsbmd", + "prop_model_511_nsbmd", + "prop_model_512_nsbmd", + "prop_model_513_nsbmd", + "prop_model_514_nsbmd", + "prop_model_528_nsbmd", + "prop_model_529_nsbmd", + "prop_model_530_nsbmd", + "prop_model_531_nsbmd", + "prop_model_532_nsbmd", + "prop_model_533_nsbmd", + "prop_model_534_nsbmd", + "prop_model_579_nsbmd", + "prop_model_580_nsbmd", + "prop_model_581_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_057.json b/res/field/props/model_sets/prop_model_set_057.json new file mode 100644 index 0000000000..d840deb417 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_057.json @@ -0,0 +1,5 @@ +{ + "mapPropModels": [ + "prop_model_262_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_058.json b/res/field/props/model_sets/prop_model_set_058.json new file mode 100644 index 0000000000..d39d8735df --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_058.json @@ -0,0 +1,7 @@ +{ + "mapPropModels": [ + "prop_model_311_nsbmd", + "prop_model_072_nsbmd", + "prop_model_074_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_059.json b/res/field/props/model_sets/prop_model_set_059.json new file mode 100644 index 0000000000..3e7f366877 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_059.json @@ -0,0 +1,8 @@ +{ + "mapPropModels": [ + "prop_model_448_nsbmd", + "prop_model_473_nsbmd", + "prop_model_474_nsbmd", + "great_marsh_train_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_060.json b/res/field/props/model_sets/prop_model_set_060.json new file mode 100644 index 0000000000..a425d92eb6 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_060.json @@ -0,0 +1,11 @@ +{ + "mapPropModels": [ + "prop_model_193_nsbmd", + "prop_model_476_nsbmd", + "prop_model_477_nsbmd", + "prop_model_478_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "gym_door_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_061.json b/res/field/props/model_sets/prop_model_set_061.json new file mode 100644 index 0000000000..44db29918c --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_061.json @@ -0,0 +1,7 @@ +{ + "mapPropModels": [ + "prop_model_469_nsbmd", + "prop_model_479_nsbmd", + "prop_model_470_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_062.json b/res/field/props/model_sets/prop_model_set_062.json new file mode 100644 index 0000000000..5f7b7ff4ec --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_062.json @@ -0,0 +1,107 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "prop_model_178_nsbmd", + "prop_model_249_nsbmd", + "prop_model_421_nsbmd", + "prop_model_490_nsbmd", + "prop_model_491_nsbmd", + "prop_model_275_nsbmd", + "prop_model_518_nsbmd", + "prop_model_519_nsbmd", + "prop_model_520_nsbmd", + "prop_model_521_nsbmd", + "prop_model_522_nsbmd", + "prop_model_523_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_063.json b/res/field/props/model_sets/prop_model_set_063.json new file mode 100644 index 0000000000..554bda6138 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_063.json @@ -0,0 +1,10 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_250_nsbmd", + "prop_model_251_nsbmd", + "prop_model_252_nsbmd", + "prop_model_253_nsbmd", + "prop_model_524_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_064.json b/res/field/props/model_sets/prop_model_set_064.json new file mode 100644 index 0000000000..2fb15ba16c --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_064.json @@ -0,0 +1,108 @@ +{ + "mapPropModels": [ + "prop_model_078_nsbmd", + "prop_model_079_nsbmd", + "prop_model_080_nsbmd", + "prop_model_081_nsbmd", + "prop_model_082_nsbmd", + "prop_model_083_nsbmd", + "prop_model_084_nsbmd", + "prop_model_085_nsbmd", + "prop_model_086_nsbmd", + "prop_model_088_nsbmd", + "prop_model_089_nsbmd", + "prop_model_090_nsbmd", + "prop_model_092_nsbmd", + "prop_model_094_nsbmd", + "prop_model_095_nsbmd", + "prop_model_096_nsbmd", + "prop_model_103_nsbmd", + "prop_model_104_nsbmd", + "prop_model_105_nsbmd", + "prop_model_106_nsbmd", + "prop_model_111_nsbmd", + "desk_drawer_laptop_nsbmd", + "prop_model_138_nsbmd", + "prop_model_139_nsbmd", + "prop_model_140_nsbmd", + "prop_model_149_nsbmd", + "prop_model_150_nsbmd", + "prop_model_151_nsbmd", + "prop_model_154_nsbmd", + "prop_model_155_nsbmd", + "prop_model_156_nsbmd", + "prop_model_157_nsbmd", + "prop_model_162_nsbmd", + "prop_model_163_nsbmd", + "prop_model_164_nsbmd", + "prop_model_165_nsbmd", + "prop_model_166_nsbmd", + "prop_model_167_nsbmd", + "prop_model_168_nsbmd", + "prop_model_169_nsbmd", + "prop_model_170_nsbmd", + "prop_model_171_nsbmd", + "prop_model_172_nsbmd", + "prop_model_173_nsbmd", + "prop_model_174_nsbmd", + "prop_model_180_nsbmd", + "prop_model_181_nsbmd", + "prop_model_113_nsbmd", + "prop_model_114_nsbmd", + "prop_model_158_nsbmd", + "desk_drawer_laptop_facing_right_nsbmd", + "prop_model_182_nsbmd", + "prop_model_183_nsbmd", + "prop_model_184_nsbmd", + "prop_model_185_nsbmd", + "prop_model_237_nsbmd", + "prop_model_238_nsbmd", + "prop_model_271_nsbmd", + "prop_model_267_nsbmd", + "prop_model_268_nsbmd", + "prop_model_269_nsbmd", + "prop_model_270_nsbmd", + "prop_model_273_nsbmd", + "prop_model_274_nsbmd", + "prop_model_176_nsbmd", + "pokecenter_inside_counter_door_nsbmd", + "prop_model_281_nsbmd", + "prop_model_282_nsbmd", + "prop_model_283_nsbmd", + "prop_model_137_nsbmd", + "prop_model_284_nsbmd", + "prop_model_285_nsbmd", + "prop_model_116_nsbmd", + "prop_model_117_nsbmd", + "prop_model_118_nsbmd", + "pokecenter_pc_nsbmd", + "prop_model_121_nsbmd", + "prop_model_122_nsbmd", + "pokecenter_healing_machine_nsbmd", + "pokecenter_healing_machine_tv_nsbmd", + "pokecenter_stair_up_left_nsbmd", + "pokecenter_stair_down_left_nsbmd", + "prop_model_175_nsbmd", + "prop_model_120_nsbmd", + "pokecenter_stair_up_right_nsbmd", + "pokecenter_stair_down_right_nsbmd", + "pokecenter_inside_door_nsbmd", + "prop_model_428_nsbmd", + "prop_model_152_nsbmd", + "prop_model_423_nsbmd", + "prop_model_483_nsbmd", + "card_door_nsbmd", + "prop_model_485_nsbmd", + "prop_model_486_nsbmd", + "prop_model_487_nsbmd", + "prop_model_488_nsbmd", + "prop_model_489_nsbmd", + "prop_model_250_nsbmd", + "prop_model_135_nsbmd", + "prop_model_495_nsbmd", + "prop_model_496_nsbmd", + "prop_model_497_nsbmd", + "prop_model_314_nsbmd", + "prop_model_073_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_065.json b/res/field/props/model_sets/prop_model_set_065.json new file mode 100644 index 0000000000..aadce0ba8f --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_065.json @@ -0,0 +1,8 @@ +{ + "mapPropModels": [ + "bike_dungeon_muddy_slope_nsbmd", + "prop_model_309_nsbmd", + "prop_model_310_nsbmd", + "prop_model_470_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_066.json b/res/field/props/model_sets/prop_model_set_066.json new file mode 100644 index 0000000000..e769c76e9d --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_066.json @@ -0,0 +1,7 @@ +{ + "mapPropModels": [ + "bike_dungeon_muddy_slope_nsbmd", + "prop_model_309_nsbmd", + "prop_model_310_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_067.json b/res/field/props/model_sets/prop_model_set_067.json new file mode 100644 index 0000000000..e769c76e9d --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_067.json @@ -0,0 +1,7 @@ +{ + "mapPropModels": [ + "bike_dungeon_muddy_slope_nsbmd", + "prop_model_309_nsbmd", + "prop_model_310_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_068.json b/res/field/props/model_sets/prop_model_set_068.json new file mode 100644 index 0000000000..0956d8b1b5 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_068.json @@ -0,0 +1,12 @@ +{ + "mapPropModels": [ + "prop_model_250_nsbmd", + "prop_model_252_nsbmd", + "prop_model_257_nsbmd", + "prop_model_315_nsbmd", + "prop_model_494_nsbmd", + "iron_island_platform_lift_nsbmd", + "prop_model_253_nsbmd", + "prop_model_470_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_069.json b/res/field/props/model_sets/prop_model_set_069.json new file mode 100644 index 0000000000..771e319356 --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_069.json @@ -0,0 +1,16 @@ +{ + "mapPropModels": [ + "prop_model_193_nsbmd", + "prop_model_476_nsbmd", + "prop_model_477_nsbmd", + "prop_model_478_nsbmd", + "prop_model_039_nsbmd", + "prop_model_040_nsbmd", + "gym_door_nsbmd", + "prop_model_539_nsbmd", + "prop_model_540_nsbmd", + "prop_model_541_nsbmd", + "prop_model_542_nsbmd", + "prop_model_543_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_set_070.json b/res/field/props/model_sets/prop_model_set_070.json new file mode 100644 index 0000000000..07325e270d --- /dev/null +++ b/res/field/props/model_sets/prop_model_set_070.json @@ -0,0 +1,6 @@ +{ + "mapPropModels": [ + "prop_model_582_nsbmd", + "prop_model_583_nsbmd" + ] +} diff --git a/res/field/props/model_sets/prop_model_sets.order b/res/field/props/model_sets/prop_model_sets.order new file mode 100644 index 0000000000..a710aa0b8d --- /dev/null +++ b/res/field/props/model_sets/prop_model_sets.order @@ -0,0 +1,71 @@ +prop_model_set_000 +prop_model_set_001 +prop_model_set_002 +prop_model_set_003 +prop_model_set_004 +prop_model_set_005 +prop_model_set_006 +prop_model_set_007 +prop_model_set_008 +prop_model_set_009 +prop_model_set_010 +prop_model_set_011 +prop_model_set_012 +prop_model_set_013 +prop_model_set_014 +prop_model_set_015 +prop_model_set_016 +prop_model_set_017 +prop_model_set_018 +prop_model_set_019 +prop_model_set_020 +prop_model_set_021 +prop_model_set_022 +prop_model_set_023 +prop_model_set_024 +prop_model_set_025 +prop_model_set_026 +prop_model_set_027 +prop_model_set_028 +prop_model_set_029 +prop_model_set_030 +prop_model_set_031 +prop_model_set_032 +prop_model_set_033 +prop_model_set_034 +prop_model_set_035 +prop_model_set_036 +prop_model_set_037 +prop_model_set_038 +prop_model_set_039 +prop_model_set_040 +prop_model_set_041 +prop_model_set_042 +prop_model_set_043 +prop_model_set_044 +prop_model_set_045 +prop_model_set_046 +prop_model_set_047 +prop_model_set_048 +prop_model_set_049 +prop_model_set_050 +prop_model_set_051 +prop_model_set_052 +prop_model_set_053 +prop_model_set_054 +prop_model_set_055 +prop_model_set_056 +prop_model_set_057 +prop_model_set_058 +prop_model_set_059 +prop_model_set_060 +prop_model_set_061 +prop_model_set_062 +prop_model_set_063 +prop_model_set_064 +prop_model_set_065 +prop_model_set_066 +prop_model_set_067 +prop_model_set_068 +prop_model_set_069 +prop_model_set_070 diff --git a/res/field/props/models/bike_dungeon_muddy_slope.nsbmd b/res/field/props/models/bike_dungeon_muddy_slope.nsbmd new file mode 100644 index 0000000000..1c1ab5f1e3 Binary files /dev/null and b/res/field/props/models/bike_dungeon_muddy_slope.nsbmd differ diff --git a/res/field/props/models/bike_muddy_slope.nsbmd b/res/field/props/models/bike_muddy_slope.nsbmd new file mode 100644 index 0000000000..31beb627a7 Binary files /dev/null and b/res/field/props/models/bike_muddy_slope.nsbmd differ diff --git a/res/field/props/models/blue_door.nsbmd b/res/field/props/models/blue_door.nsbmd new file mode 100644 index 0000000000..f08112e8b4 Binary files /dev/null and b/res/field/props/models/blue_door.nsbmd differ diff --git a/res/field/props/models/blue_wooden_door.nsbmd b/res/field/props/models/blue_wooden_door.nsbmd new file mode 100644 index 0000000000..0d898f2733 Binary files /dev/null and b/res/field/props/models/blue_wooden_door.nsbmd differ diff --git a/res/field/props/models/brown_wooden_door.nsbmd b/res/field/props/models/brown_wooden_door.nsbmd new file mode 100644 index 0000000000..f9e31cd69f Binary files /dev/null and b/res/field/props/models/brown_wooden_door.nsbmd differ diff --git a/res/field/props/models/canalave_bridge_left.nsbmd b/res/field/props/models/canalave_bridge_left.nsbmd new file mode 100644 index 0000000000..fd60b414f2 Binary files /dev/null and b/res/field/props/models/canalave_bridge_left.nsbmd differ diff --git a/res/field/props/models/canalave_bridge_right.nsbmd b/res/field/props/models/canalave_bridge_right.nsbmd new file mode 100644 index 0000000000..a359666bd7 Binary files /dev/null and b/res/field/props/models/canalave_bridge_right.nsbmd differ diff --git a/res/field/props/models/card_door.nsbmd b/res/field/props/models/card_door.nsbmd new file mode 100644 index 0000000000..749df2d852 Binary files /dev/null and b/res/field/props/models/card_door.nsbmd differ diff --git a/res/field/props/models/desk_drawer_laptop.nsbmd b/res/field/props/models/desk_drawer_laptop.nsbmd new file mode 100644 index 0000000000..0fdd30fc36 Binary files /dev/null and b/res/field/props/models/desk_drawer_laptop.nsbmd differ diff --git a/res/field/props/models/desk_drawer_laptop_facing_left.nsbmd b/res/field/props/models/desk_drawer_laptop_facing_left.nsbmd new file mode 100644 index 0000000000..d5f92f6ef5 Binary files /dev/null and b/res/field/props/models/desk_drawer_laptop_facing_left.nsbmd differ diff --git a/res/field/props/models/desk_drawer_laptop_facing_right.nsbmd b/res/field/props/models/desk_drawer_laptop_facing_right.nsbmd new file mode 100644 index 0000000000..fbff659ddb Binary files /dev/null and b/res/field/props/models/desk_drawer_laptop_facing_right.nsbmd differ diff --git a/res/field/props/models/door01.nsbmd b/res/field/props/models/door01.nsbmd new file mode 100644 index 0000000000..f0ac4f4476 Binary files /dev/null and b/res/field/props/models/door01.nsbmd differ diff --git a/res/field/props/models/elevator_door.nsbmd b/res/field/props/models/elevator_door.nsbmd new file mode 100644 index 0000000000..a7d43b7c3a Binary files /dev/null and b/res/field/props/models/elevator_door.nsbmd differ diff --git a/res/field/props/models/elevator_lights.nsbmd b/res/field/props/models/elevator_lights.nsbmd new file mode 100644 index 0000000000..186251cb05 Binary files /dev/null and b/res/field/props/models/elevator_lights.nsbmd differ diff --git a/res/field/props/models/great_marsh_train.nsbmd b/res/field/props/models/great_marsh_train.nsbmd new file mode 100644 index 0000000000..9c655cbc9f Binary files /dev/null and b/res/field/props/models/great_marsh_train.nsbmd differ diff --git a/res/field/props/models/green_wooden_door.nsbmd b/res/field/props/models/green_wooden_door.nsbmd new file mode 100644 index 0000000000..0ffe32ce2e Binary files /dev/null and b/res/field/props/models/green_wooden_door.nsbmd differ diff --git a/res/field/props/models/gts_inside_door.nsbmd b/res/field/props/models/gts_inside_door.nsbmd new file mode 100644 index 0000000000..2a2c89dec7 Binary files /dev/null and b/res/field/props/models/gts_inside_door.nsbmd differ diff --git a/res/field/props/models/gym_door.nsbmd b/res/field/props/models/gym_door.nsbmd new file mode 100644 index 0000000000..7abf128a3c Binary files /dev/null and b/res/field/props/models/gym_door.nsbmd differ diff --git a/res/field/props/models/hearthome_gym_inside_door.nsbmd b/res/field/props/models/hearthome_gym_inside_door.nsbmd new file mode 100644 index 0000000000..76d66b99ac Binary files /dev/null and b/res/field/props/models/hearthome_gym_inside_door.nsbmd differ diff --git a/res/field/props/models/honey_tree.nsbmd b/res/field/props/models/honey_tree.nsbmd new file mode 100644 index 0000000000..2c017f8f12 Binary files /dev/null and b/res/field/props/models/honey_tree.nsbmd differ diff --git a/res/field/props/models/hotel_grand_lake_door.nsbmd b/res/field/props/models/hotel_grand_lake_door.nsbmd new file mode 100644 index 0000000000..26a9a5f1a6 Binary files /dev/null and b/res/field/props/models/hotel_grand_lake_door.nsbmd differ diff --git a/res/field/props/models/iron_door.nsbmd b/res/field/props/models/iron_door.nsbmd new file mode 100644 index 0000000000..a383aaf4bc Binary files /dev/null and b/res/field/props/models/iron_door.nsbmd differ diff --git a/res/field/props/models/iron_door_2.nsbmd b/res/field/props/models/iron_door_2.nsbmd new file mode 100644 index 0000000000..e710641759 Binary files /dev/null and b/res/field/props/models/iron_door_2.nsbmd differ diff --git a/res/field/props/models/iron_island_platform_lift.nsbmd b/res/field/props/models/iron_island_platform_lift.nsbmd new file mode 100644 index 0000000000..4b2ef44fcb Binary files /dev/null and b/res/field/props/models/iron_island_platform_lift.nsbmd differ diff --git a/res/field/props/models/jubilife_city_building_door.nsbmd b/res/field/props/models/jubilife_city_building_door.nsbmd new file mode 100644 index 0000000000..0708cad5cd Binary files /dev/null and b/res/field/props/models/jubilife_city_building_door.nsbmd differ diff --git a/res/field/props/models/mansion_door.nsbmd b/res/field/props/models/mansion_door.nsbmd new file mode 100644 index 0000000000..bf6893c71b Binary files /dev/null and b/res/field/props/models/mansion_door.nsbmd differ diff --git a/res/field/props/models/map_prop_models.order b/res/field/props/models/map_prop_models.order new file mode 100644 index 0000000000..90a8b54427 --- /dev/null +++ b/res/field/props/models/map_prop_models.order @@ -0,0 +1,590 @@ +prop_model_000.nsbmd +prop_model_001.nsbmd +prop_model_002.nsbmd +prop_model_003.nsbmd +prop_model_004.nsbmd +prop_model_005.nsbmd +prop_model_006.nsbmd +prop_model_007.nsbmd +prop_model_008.nsbmd +prop_model_009.nsbmd +prop_model_010.nsbmd +prop_model_011.nsbmd +prop_model_012.nsbmd +prop_model_013.nsbmd +prop_model_014.nsbmd +prop_model_015.nsbmd +prop_model_016.nsbmd +prop_model_017.nsbmd +prop_model_018.nsbmd +prop_model_019.nsbmd +prop_model_020.nsbmd +prop_model_021.nsbmd +prop_model_022.nsbmd +prop_model_023.nsbmd +prop_model_024.nsbmd +prop_model_025.nsbmd +honey_tree.nsbmd +prop_model_027.nsbmd +prop_model_028.nsbmd +prop_model_029.nsbmd +prop_model_030.nsbmd +canalave_bridge_left.nsbmd +canalave_bridge_right.nsbmd +prop_model_033.nsbmd +regular_ship.nsbmd +prop_model_035.nsbmd +prop_model_036.nsbmd +prop_model_037.nsbmd +prop_model_038.nsbmd +prop_model_039.nsbmd +prop_model_040.nsbmd +prop_model_041.nsbmd +prop_model_042.nsbmd +prop_model_043.nsbmd +prop_model_044.nsbmd +prop_model_045.nsbmd +prop_model_046.nsbmd +prop_model_047.nsbmd +prop_model_048.nsbmd +prop_model_049.nsbmd +prop_model_050.nsbmd +prop_model_051.nsbmd +prop_model_052.nsbmd +prop_model_053.nsbmd +prop_model_054.nsbmd +prop_model_055.nsbmd +prop_model_056.nsbmd +prop_model_057.nsbmd +prop_model_058.nsbmd +prop_model_059.nsbmd +prop_model_060.nsbmd +prop_model_061.nsbmd +prop_model_062.nsbmd +prop_model_063.nsbmd +prop_model_064.nsbmd +prop_model_065.nsbmd +door01.nsbmd +brown_wooden_door.nsbmd +green_wooden_door.nsbmd +iron_door.nsbmd +pokecenter_door.nsbmd +prop_model_071.nsbmd +prop_model_072.nsbmd +prop_model_073.nsbmd +prop_model_074.nsbmd +elevator_door.nsbmd +prop_model_076.nsbmd +prop_model_077.nsbmd +prop_model_078.nsbmd +prop_model_079.nsbmd +prop_model_080.nsbmd +prop_model_081.nsbmd +prop_model_082.nsbmd +prop_model_083.nsbmd +prop_model_084.nsbmd +prop_model_085.nsbmd +prop_model_086.nsbmd +prop_model_087.nsbmd +prop_model_088.nsbmd +prop_model_089.nsbmd +prop_model_090.nsbmd +prop_model_091.nsbmd +prop_model_092.nsbmd +prop_model_093.nsbmd +prop_model_094.nsbmd +prop_model_095.nsbmd +prop_model_096.nsbmd +prop_model_097.nsbmd +prop_model_098.nsbmd +prop_model_099.nsbmd +prop_model_100.nsbmd +prop_model_101.nsbmd +prop_model_102.nsbmd +prop_model_103.nsbmd +prop_model_104.nsbmd +prop_model_105.nsbmd +prop_model_106.nsbmd +prop_model_107.nsbmd +prop_model_108.nsbmd +prop_model_109.nsbmd +prop_model_110.nsbmd +prop_model_111.nsbmd +desk_drawer_laptop.nsbmd +prop_model_113.nsbmd +prop_model_114.nsbmd +desk_drawer_laptop_facing_right.nsbmd +prop_model_116.nsbmd +prop_model_117.nsbmd +prop_model_118.nsbmd +pokecenter_pc.nsbmd +prop_model_120.nsbmd +prop_model_121.nsbmd +prop_model_122.nsbmd +pokecenter_healing_machine.nsbmd +pokecenter_healing_machine_tv.nsbmd +prop_model_125.nsbmd +prop_model_126.nsbmd +prop_model_127.nsbmd +pokecenter_inside_counter_door.nsbmd +prop_model_129.nsbmd +pokecenter_stair_up_left.nsbmd +pokecenter_stair_down_left.nsbmd +prop_model_132.nsbmd +prop_model_133.nsbmd +prop_model_134.nsbmd +prop_model_135.nsbmd +prop_model_136.nsbmd +prop_model_137.nsbmd +prop_model_138.nsbmd +prop_model_139.nsbmd +prop_model_140.nsbmd +prop_model_141.nsbmd +prop_model_142.nsbmd +prop_model_143.nsbmd +prop_model_144.nsbmd +prop_model_145.nsbmd +prop_model_146.nsbmd +prop_model_147.nsbmd +prop_model_148.nsbmd +prop_model_149.nsbmd +prop_model_150.nsbmd +prop_model_151.nsbmd +prop_model_152.nsbmd +prop_model_153.nsbmd +prop_model_154.nsbmd +prop_model_155.nsbmd +prop_model_156.nsbmd +prop_model_157.nsbmd +prop_model_158.nsbmd +prop_model_159.nsbmd +prop_model_160.nsbmd +prop_model_161.nsbmd +prop_model_162.nsbmd +prop_model_163.nsbmd +prop_model_164.nsbmd +prop_model_165.nsbmd +prop_model_166.nsbmd +prop_model_167.nsbmd +prop_model_168.nsbmd +prop_model_169.nsbmd +prop_model_170.nsbmd +prop_model_171.nsbmd +prop_model_172.nsbmd +prop_model_173.nsbmd +prop_model_174.nsbmd +prop_model_175.nsbmd +prop_model_176.nsbmd +prop_model_177.nsbmd +prop_model_178.nsbmd +prop_model_179.nsbmd +prop_model_180.nsbmd +prop_model_181.nsbmd +prop_model_182.nsbmd +prop_model_183.nsbmd +prop_model_184.nsbmd +prop_model_185.nsbmd +prop_model_186.nsbmd +prop_model_187.nsbmd +prop_model_188.nsbmd +prop_model_189.nsbmd +prop_model_190.nsbmd +prop_model_191.nsbmd +prop_model_192.nsbmd +prop_model_193.nsbmd +prop_model_194.nsbmd +prop_model_195.nsbmd +prop_model_196.nsbmd +prop_model_197.nsbmd +prop_model_198.nsbmd +prop_model_199.nsbmd +prop_model_200.nsbmd +prop_model_201.nsbmd +prop_model_202.nsbmd +prop_model_203.nsbmd +prop_model_204.nsbmd +prop_model_205.nsbmd +prop_model_206.nsbmd +prop_model_207.nsbmd +prop_model_208.nsbmd +prop_model_209.nsbmd +prop_model_210.nsbmd +prop_model_211.nsbmd +prop_model_212.nsbmd +prop_model_213.nsbmd +prop_model_214.nsbmd +prop_model_215.nsbmd +prop_model_216.nsbmd +prop_model_217.nsbmd +prop_model_218.nsbmd +prop_model_219.nsbmd +prop_model_220.nsbmd +prop_model_221.nsbmd +prop_model_222.nsbmd +prop_model_223.nsbmd +prop_model_224.nsbmd +prop_model_225.nsbmd +prop_model_226.nsbmd +prop_model_227.nsbmd +prop_model_228.nsbmd +prop_model_229.nsbmd +prop_model_230.nsbmd +prop_model_231.nsbmd +prop_model_232.nsbmd +prop_model_233.nsbmd +prop_model_234.nsbmd +prop_model_235.nsbmd +prop_model_236.nsbmd +prop_model_237.nsbmd +prop_model_238.nsbmd +pastoria_gym_blue_button.nsbmd +pastoria_gym_green_button.nsbmd +pastoria_gym_orange_button.nsbmd +pastoria_gym_water_floor.nsbmd +prop_model_243.nsbmd +prop_model_244.nsbmd +prop_model_245.nsbmd +jubilife_city_building_door.nsbmd +prop_model_247.nsbmd +desk_drawer_laptop_facing_left.nsbmd +prop_model_249.nsbmd +prop_model_250.nsbmd +prop_model_251.nsbmd +prop_model_252.nsbmd +prop_model_253.nsbmd +prop_model_254.nsbmd +prop_model_255.nsbmd +prop_model_256.nsbmd +prop_model_257.nsbmd +iron_island_platform_lift.nsbmd +prop_model_259.nsbmd +hearthome_gym_inside_door.nsbmd +prop_model_261.nsbmd +prop_model_262.nsbmd +prop_model_263.nsbmd +prop_model_264.nsbmd +prop_model_265.nsbmd +prop_model_266.nsbmd +prop_model_267.nsbmd +prop_model_268.nsbmd +prop_model_269.nsbmd +prop_model_270.nsbmd +prop_model_271.nsbmd +prop_model_272.nsbmd +prop_model_273.nsbmd +prop_model_274.nsbmd +prop_model_275.nsbmd +prop_model_276.nsbmd +prop_model_277.nsbmd +prop_model_278.nsbmd +prop_model_279.nsbmd +prop_model_280.nsbmd +prop_model_281.nsbmd +prop_model_282.nsbmd +prop_model_283.nsbmd +prop_model_284.nsbmd +prop_model_285.nsbmd +prop_model_286.nsbmd +prop_model_287.nsbmd +prop_model_288.nsbmd +prop_model_289.nsbmd +prop_model_290.nsbmd +prop_model_291.nsbmd +prop_model_292.nsbmd +prop_model_293.nsbmd +prop_model_294.nsbmd +prop_model_295.nsbmd +prop_model_296.nsbmd +prop_model_297.nsbmd +gym_door.nsbmd +prop_model_299.nsbmd +prop_model_300.nsbmd +prop_model_301.nsbmd +prop_model_302.nsbmd +bike_muddy_slope.nsbmd +bike_dungeon_muddy_slope.nsbmd +prop_model_305.nsbmd +prop_model_306.nsbmd +prop_model_307.nsbmd +prop_model_308.nsbmd +prop_model_309.nsbmd +prop_model_310.nsbmd +prop_model_311.nsbmd +blue_door.nsbmd +iron_door_2.nsbmd +prop_model_314.nsbmd +prop_model_315.nsbmd +secret_base_pc_normal_flag.nsbmd +secret_base_pc_bronze_flag.nsbmd +secret_base_pc_silver_flag.nsbmd +secret_base_pc_gold_flag.nsbmd +secret_base_pc_platinum_flag.nsbmd +prop_model_321.nsbmd +prop_model_322.nsbmd +prop_model_323.nsbmd +prop_model_324.nsbmd +prop_model_325.nsbmd +prop_model_326.nsbmd +prop_model_327.nsbmd +prop_model_328.nsbmd +prop_model_329.nsbmd +prop_model_330.nsbmd +prop_model_331.nsbmd +prop_model_332.nsbmd +prop_model_333.nsbmd +prop_model_334.nsbmd +prop_model_335.nsbmd +prop_model_336.nsbmd +prop_model_337.nsbmd +prop_model_338.nsbmd +prop_model_339.nsbmd +prop_model_340.nsbmd +prop_model_341.nsbmd +prop_model_342.nsbmd +prop_model_343.nsbmd +prop_model_344.nsbmd +prop_model_345.nsbmd +prop_model_346.nsbmd +prop_model_347.nsbmd +prop_model_348.nsbmd +prop_model_349.nsbmd +prop_model_350.nsbmd +prop_model_351.nsbmd +prop_model_352.nsbmd +prop_model_353.nsbmd +prop_model_354.nsbmd +prop_model_355.nsbmd +prop_model_356.nsbmd +prop_model_357.nsbmd +prop_model_358.nsbmd +prop_model_359.nsbmd +prop_model_360.nsbmd +prop_model_361.nsbmd +prop_model_362.nsbmd +prop_model_363.nsbmd +prop_model_364.nsbmd +prop_model_365.nsbmd +prop_model_366.nsbmd +prop_model_367.nsbmd +prop_model_368.nsbmd +prop_model_369.nsbmd +prop_model_370.nsbmd +prop_model_371.nsbmd +prop_model_372.nsbmd +prop_model_373.nsbmd +prop_model_374.nsbmd +prop_model_375.nsbmd +prop_model_376.nsbmd +prop_model_377.nsbmd +prop_model_378.nsbmd +prop_model_379.nsbmd +prop_model_380.nsbmd +prop_model_381.nsbmd +prop_model_382.nsbmd +prop_model_383.nsbmd +prop_model_384.nsbmd +prop_model_385.nsbmd +prop_model_386.nsbmd +prop_model_387.nsbmd +prop_model_388.nsbmd +prop_model_389.nsbmd +prop_model_390.nsbmd +prop_model_391.nsbmd +prop_model_392.nsbmd +prop_model_393.nsbmd +prop_model_394.nsbmd +prop_model_395.nsbmd +prop_model_396.nsbmd +prop_model_397.nsbmd +prop_model_398.nsbmd +prop_model_399.nsbmd +prop_model_400.nsbmd +prop_model_401.nsbmd +prop_model_402.nsbmd +prop_model_403.nsbmd +prop_model_404.nsbmd +prop_model_405.nsbmd +prop_model_406.nsbmd +prop_model_407.nsbmd +prop_model_408.nsbmd +prop_model_409.nsbmd +prop_model_410.nsbmd +prop_model_411.nsbmd +prop_model_412.nsbmd +prop_model_413.nsbmd +prop_model_414.nsbmd +prop_model_415.nsbmd +prop_model_416.nsbmd +prop_model_417.nsbmd +prop_model_418.nsbmd +prop_model_419.nsbmd +prop_model_420.nsbmd +prop_model_421.nsbmd +prop_model_422.nsbmd +prop_model_423.nsbmd +prop_model_424.nsbmd +pokecenter_stair_up_right.nsbmd +pokecenter_stair_down_right.nsbmd +pokecenter_inside_door.nsbmd +prop_model_428.nsbmd +secret_base_entrance_north.nsbmd +secret_base_entrance_south.nsbmd +secret_base_entrance_west.nsbmd +secret_base_entrance_east.nsbmd +prop_model_433.nsbmd +prop_model_434.nsbmd +prop_model_435.nsbmd +prop_model_436.nsbmd +prop_model_437.nsbmd +yellow_wooden_door.nsbmd +prop_model_439.nsbmd +prop_model_440.nsbmd +mansion_door.nsbmd +veilstone_dpt_store_door.nsbmd +prop_model_443.nsbmd +blue_wooden_door.nsbmd +prop_model_445.nsbmd +prop_model_446.nsbmd +prop_model_447.nsbmd +prop_model_448.nsbmd +prop_model_449.nsbmd +prop_model_450.nsbmd +prop_model_451.nsbmd +prop_model_452.nsbmd +prop_model_453.nsbmd +prop_model_454.nsbmd +prop_model_455.nsbmd +gts_inside_door.nsbmd +prop_model_457.nsbmd +prop_model_458.nsbmd +prop_model_459.nsbmd +prop_model_460.nsbmd +prop_model_461.nsbmd +prop_model_462.nsbmd +prop_model_463.nsbmd +prop_model_464.nsbmd +prop_model_465.nsbmd +prop_model_466.nsbmd +prop_model_467.nsbmd +prop_model_468.nsbmd +prop_model_469.nsbmd +prop_model_470.nsbmd +prop_model_471.nsbmd +prop_model_472.nsbmd +prop_model_473.nsbmd +prop_model_474.nsbmd +great_marsh_train.nsbmd +prop_model_476.nsbmd +prop_model_477.nsbmd +prop_model_478.nsbmd +prop_model_479.nsbmd +prop_model_480.nsbmd +prop_model_481.nsbmd +prop_model_482.nsbmd +prop_model_483.nsbmd +card_door.nsbmd +prop_model_485.nsbmd +prop_model_486.nsbmd +prop_model_487.nsbmd +prop_model_488.nsbmd +prop_model_489.nsbmd +prop_model_490.nsbmd +prop_model_491.nsbmd +prop_model_492.nsbmd +prop_model_493.nsbmd +prop_model_494.nsbmd +prop_model_495.nsbmd +prop_model_496.nsbmd +prop_model_497.nsbmd +elevator_lights.nsbmd +prop_model_499.nsbmd +prop_model_500.nsbmd +prop_model_501.nsbmd +pokemon_league_platform_lift.nsbmd +prop_model_503.nsbmd +prop_model_504.nsbmd +prop_model_505.nsbmd +prop_model_506.nsbmd +pokemon_league_hall_of_fame_machine.nsbmd +prop_model_508.nsbmd +prop_model_509.nsbmd +prop_model_510.nsbmd +prop_model_511.nsbmd +prop_model_512.nsbmd +prop_model_513.nsbmd +prop_model_514.nsbmd +prop_model_515.nsbmd +prop_model_516.nsbmd +pokecenter_healing_machine_mini_pokeball.nsbmd +prop_model_518.nsbmd +prop_model_519.nsbmd +prop_model_520.nsbmd +prop_model_521.nsbmd +prop_model_522.nsbmd +prop_model_523.nsbmd +prop_model_524.nsbmd +prop_model_525.nsbmd +prop_model_526.nsbmd +hotel_grand_lake_door.nsbmd +prop_model_528.nsbmd +prop_model_529.nsbmd +prop_model_530.nsbmd +prop_model_531.nsbmd +prop_model_532.nsbmd +prop_model_533.nsbmd +prop_model_534.nsbmd +prop_model_535.nsbmd +prop_model_536.nsbmd +prop_model_537.nsbmd +screw_steamship_spiral.nsbmd +prop_model_539.nsbmd +prop_model_540.nsbmd +prop_model_541.nsbmd +prop_model_542.nsbmd +prop_model_543.nsbmd +prop_model_544.nsbmd +prop_model_545.nsbmd +prop_model_546.nsbmd +prop_model_547.nsbmd +prop_model_548.nsbmd +prop_model_549.nsbmd +prop_model_550.nsbmd +prop_model_551.nsbmd +prop_model_552.nsbmd +prop_model_553.nsbmd +prop_model_554.nsbmd +prop_model_555.nsbmd +prop_model_556.nsbmd +prop_model_557.nsbmd +prop_model_558.nsbmd +prop_model_559.nsbmd +prop_model_560.nsbmd +prop_model_561.nsbmd +prop_model_562.nsbmd +prop_model_563.nsbmd +prop_model_564.nsbmd +prop_model_565.nsbmd +prop_model_566.nsbmd +prop_model_567.nsbmd +prop_model_568.nsbmd +prop_model_569.nsbmd +prop_model_570.nsbmd +prop_model_571.nsbmd +prop_model_572.nsbmd +prop_model_573.nsbmd +prop_model_574.nsbmd +prop_model_575.nsbmd +prop_model_576.nsbmd +prop_model_577.nsbmd +prop_model_578.nsbmd +prop_model_579.nsbmd +prop_model_580.nsbmd +prop_model_581.nsbmd +prop_model_582.nsbmd +prop_model_583.nsbmd +prop_model_584.nsbmd +prop_model_585.nsbmd +prop_model_586.nsbmd +prop_model_587.nsbmd +prop_model_588.nsbmd +prop_model_589.nsbmd diff --git a/res/field/props/models/meson.build b/res/field/props/models/meson.build new file mode 100644 index 0000000000..f0101304e3 --- /dev/null +++ b/res/field/props/models/meson.build @@ -0,0 +1,613 @@ +map_prop_model_files = copy_gen.process(files( + 'prop_model_000.nsbmd', + 'prop_model_001.nsbmd', + 'prop_model_002.nsbmd', + 'prop_model_003.nsbmd', + 'prop_model_004.nsbmd', + 'prop_model_005.nsbmd', + 'prop_model_006.nsbmd', + 'prop_model_007.nsbmd', + 'prop_model_008.nsbmd', + 'prop_model_009.nsbmd', + 'prop_model_010.nsbmd', + 'prop_model_011.nsbmd', + 'prop_model_012.nsbmd', + 'prop_model_013.nsbmd', + 'prop_model_014.nsbmd', + 'prop_model_015.nsbmd', + 'prop_model_016.nsbmd', + 'prop_model_017.nsbmd', + 'prop_model_018.nsbmd', + 'prop_model_019.nsbmd', + 'prop_model_020.nsbmd', + 'prop_model_021.nsbmd', + 'prop_model_022.nsbmd', + 'prop_model_023.nsbmd', + 'prop_model_024.nsbmd', + 'prop_model_025.nsbmd', + 'honey_tree.nsbmd', + 'prop_model_027.nsbmd', + 'prop_model_028.nsbmd', + 'prop_model_029.nsbmd', + 'prop_model_030.nsbmd', + 'canalave_bridge_left.nsbmd', + 'canalave_bridge_right.nsbmd', + 'prop_model_033.nsbmd', + 'regular_ship.nsbmd', + 'prop_model_035.nsbmd', + 'prop_model_036.nsbmd', + 'prop_model_037.nsbmd', + 'prop_model_038.nsbmd', + 'prop_model_039.nsbmd', + 'prop_model_040.nsbmd', + 'prop_model_041.nsbmd', + 'prop_model_042.nsbmd', + 'prop_model_043.nsbmd', + 'prop_model_044.nsbmd', + 'prop_model_045.nsbmd', + 'prop_model_046.nsbmd', + 'prop_model_047.nsbmd', + 'prop_model_048.nsbmd', + 'prop_model_049.nsbmd', + 'prop_model_050.nsbmd', + 'prop_model_051.nsbmd', + 'prop_model_052.nsbmd', + 'prop_model_053.nsbmd', + 'prop_model_054.nsbmd', + 'prop_model_055.nsbmd', + 'prop_model_056.nsbmd', + 'prop_model_057.nsbmd', + 'prop_model_058.nsbmd', + 'prop_model_059.nsbmd', + 'prop_model_060.nsbmd', + 'prop_model_061.nsbmd', + 'prop_model_062.nsbmd', + 'prop_model_063.nsbmd', + 'prop_model_064.nsbmd', + 'prop_model_065.nsbmd', + 'door01.nsbmd', + 'brown_wooden_door.nsbmd', + 'green_wooden_door.nsbmd', + 'iron_door.nsbmd', + 'pokecenter_door.nsbmd', + 'prop_model_071.nsbmd', + 'prop_model_072.nsbmd', + 'prop_model_073.nsbmd', + 'prop_model_074.nsbmd', + 'elevator_door.nsbmd', + 'prop_model_076.nsbmd', + 'prop_model_077.nsbmd', + 'prop_model_078.nsbmd', + 'prop_model_079.nsbmd', + 'prop_model_080.nsbmd', + 'prop_model_081.nsbmd', + 'prop_model_082.nsbmd', + 'prop_model_083.nsbmd', + 'prop_model_084.nsbmd', + 'prop_model_085.nsbmd', + 'prop_model_086.nsbmd', + 'prop_model_087.nsbmd', + 'prop_model_088.nsbmd', + 'prop_model_089.nsbmd', + 'prop_model_090.nsbmd', + 'prop_model_091.nsbmd', + 'prop_model_092.nsbmd', + 'prop_model_093.nsbmd', + 'prop_model_094.nsbmd', + 'prop_model_095.nsbmd', + 'prop_model_096.nsbmd', + 'prop_model_097.nsbmd', + 'prop_model_098.nsbmd', + 'prop_model_099.nsbmd', + 'prop_model_100.nsbmd', + 'prop_model_101.nsbmd', + 'prop_model_102.nsbmd', + 'prop_model_103.nsbmd', + 'prop_model_104.nsbmd', + 'prop_model_105.nsbmd', + 'prop_model_106.nsbmd', + 'prop_model_107.nsbmd', + 'prop_model_108.nsbmd', + 'prop_model_109.nsbmd', + 'prop_model_110.nsbmd', + 'prop_model_111.nsbmd', + 'desk_drawer_laptop.nsbmd', + 'prop_model_113.nsbmd', + 'prop_model_114.nsbmd', + 'desk_drawer_laptop_facing_right.nsbmd', + 'prop_model_116.nsbmd', + 'prop_model_117.nsbmd', + 'prop_model_118.nsbmd', + 'pokecenter_pc.nsbmd', + 'prop_model_120.nsbmd', + 'prop_model_121.nsbmd', + 'prop_model_122.nsbmd', + 'pokecenter_healing_machine.nsbmd', + 'pokecenter_healing_machine_tv.nsbmd', + 'prop_model_125.nsbmd', + 'prop_model_126.nsbmd', + 'prop_model_127.nsbmd', + 'pokecenter_inside_counter_door.nsbmd', + 'prop_model_129.nsbmd', + 'pokecenter_stair_up_left.nsbmd', + 'pokecenter_stair_down_left.nsbmd', + 'prop_model_132.nsbmd', + 'prop_model_133.nsbmd', + 'prop_model_134.nsbmd', + 'prop_model_135.nsbmd', + 'prop_model_136.nsbmd', + 'prop_model_137.nsbmd', + 'prop_model_138.nsbmd', + 'prop_model_139.nsbmd', + 'prop_model_140.nsbmd', + 'prop_model_141.nsbmd', + 'prop_model_142.nsbmd', + 'prop_model_143.nsbmd', + 'prop_model_144.nsbmd', + 'prop_model_145.nsbmd', + 'prop_model_146.nsbmd', + 'prop_model_147.nsbmd', + 'prop_model_148.nsbmd', + 'prop_model_149.nsbmd', + 'prop_model_150.nsbmd', + 'prop_model_151.nsbmd', + 'prop_model_152.nsbmd', + 'prop_model_153.nsbmd', + 'prop_model_154.nsbmd', + 'prop_model_155.nsbmd', + 'prop_model_156.nsbmd', + 'prop_model_157.nsbmd', + 'prop_model_158.nsbmd', + 'prop_model_159.nsbmd', + 'prop_model_160.nsbmd', + 'prop_model_161.nsbmd', + 'prop_model_162.nsbmd', + 'prop_model_163.nsbmd', + 'prop_model_164.nsbmd', + 'prop_model_165.nsbmd', + 'prop_model_166.nsbmd', + 'prop_model_167.nsbmd', + 'prop_model_168.nsbmd', + 'prop_model_169.nsbmd', + 'prop_model_170.nsbmd', + 'prop_model_171.nsbmd', + 'prop_model_172.nsbmd', + 'prop_model_173.nsbmd', + 'prop_model_174.nsbmd', + 'prop_model_175.nsbmd', + 'prop_model_176.nsbmd', + 'prop_model_177.nsbmd', + 'prop_model_178.nsbmd', + 'prop_model_179.nsbmd', + 'prop_model_180.nsbmd', + 'prop_model_181.nsbmd', + 'prop_model_182.nsbmd', + 'prop_model_183.nsbmd', + 'prop_model_184.nsbmd', + 'prop_model_185.nsbmd', + 'prop_model_186.nsbmd', + 'prop_model_187.nsbmd', + 'prop_model_188.nsbmd', + 'prop_model_189.nsbmd', + 'prop_model_190.nsbmd', + 'prop_model_191.nsbmd', + 'prop_model_192.nsbmd', + 'prop_model_193.nsbmd', + 'prop_model_194.nsbmd', + 'prop_model_195.nsbmd', + 'prop_model_196.nsbmd', + 'prop_model_197.nsbmd', + 'prop_model_198.nsbmd', + 'prop_model_199.nsbmd', + 'prop_model_200.nsbmd', + 'prop_model_201.nsbmd', + 'prop_model_202.nsbmd', + 'prop_model_203.nsbmd', + 'prop_model_204.nsbmd', + 'prop_model_205.nsbmd', + 'prop_model_206.nsbmd', + 'prop_model_207.nsbmd', + 'prop_model_208.nsbmd', + 'prop_model_209.nsbmd', + 'prop_model_210.nsbmd', + 'prop_model_211.nsbmd', + 'prop_model_212.nsbmd', + 'prop_model_213.nsbmd', + 'prop_model_214.nsbmd', + 'prop_model_215.nsbmd', + 'prop_model_216.nsbmd', + 'prop_model_217.nsbmd', + 'prop_model_218.nsbmd', + 'prop_model_219.nsbmd', + 'prop_model_220.nsbmd', + 'prop_model_221.nsbmd', + 'prop_model_222.nsbmd', + 'prop_model_223.nsbmd', + 'prop_model_224.nsbmd', + 'prop_model_225.nsbmd', + 'prop_model_226.nsbmd', + 'prop_model_227.nsbmd', + 'prop_model_228.nsbmd', + 'prop_model_229.nsbmd', + 'prop_model_230.nsbmd', + 'prop_model_231.nsbmd', + 'prop_model_232.nsbmd', + 'prop_model_233.nsbmd', + 'prop_model_234.nsbmd', + 'prop_model_235.nsbmd', + 'prop_model_236.nsbmd', + 'prop_model_237.nsbmd', + 'prop_model_238.nsbmd', + 'pastoria_gym_blue_button.nsbmd', + 'pastoria_gym_green_button.nsbmd', + 'pastoria_gym_orange_button.nsbmd', + 'pastoria_gym_water_floor.nsbmd', + 'prop_model_243.nsbmd', + 'prop_model_244.nsbmd', + 'prop_model_245.nsbmd', + 'jubilife_city_building_door.nsbmd', + 'prop_model_247.nsbmd', + 'desk_drawer_laptop_facing_left.nsbmd', + 'prop_model_249.nsbmd', + 'prop_model_250.nsbmd', + 'prop_model_251.nsbmd', + 'prop_model_252.nsbmd', + 'prop_model_253.nsbmd', + 'prop_model_254.nsbmd', + 'prop_model_255.nsbmd', + 'prop_model_256.nsbmd', + 'prop_model_257.nsbmd', + 'iron_island_platform_lift.nsbmd', + 'prop_model_259.nsbmd', + 'hearthome_gym_inside_door.nsbmd', + 'prop_model_261.nsbmd', + 'prop_model_262.nsbmd', + 'prop_model_263.nsbmd', + 'prop_model_264.nsbmd', + 'prop_model_265.nsbmd', + 'prop_model_266.nsbmd', + 'prop_model_267.nsbmd', + 'prop_model_268.nsbmd', + 'prop_model_269.nsbmd', + 'prop_model_270.nsbmd', + 'prop_model_271.nsbmd', + 'prop_model_272.nsbmd', + 'prop_model_273.nsbmd', + 'prop_model_274.nsbmd', + 'prop_model_275.nsbmd', + 'prop_model_276.nsbmd', + 'prop_model_277.nsbmd', + 'prop_model_278.nsbmd', + 'prop_model_279.nsbmd', + 'prop_model_280.nsbmd', + 'prop_model_281.nsbmd', + 'prop_model_282.nsbmd', + 'prop_model_283.nsbmd', + 'prop_model_284.nsbmd', + 'prop_model_285.nsbmd', + 'prop_model_286.nsbmd', + 'prop_model_287.nsbmd', + 'prop_model_288.nsbmd', + 'prop_model_289.nsbmd', + 'prop_model_290.nsbmd', + 'prop_model_291.nsbmd', + 'prop_model_292.nsbmd', + 'prop_model_293.nsbmd', + 'prop_model_294.nsbmd', + 'prop_model_295.nsbmd', + 'prop_model_296.nsbmd', + 'prop_model_297.nsbmd', + 'gym_door.nsbmd', + 'prop_model_299.nsbmd', + 'prop_model_300.nsbmd', + 'prop_model_301.nsbmd', + 'prop_model_302.nsbmd', + 'bike_muddy_slope.nsbmd', + 'bike_dungeon_muddy_slope.nsbmd', + 'prop_model_305.nsbmd', + 'prop_model_306.nsbmd', + 'prop_model_307.nsbmd', + 'prop_model_308.nsbmd', + 'prop_model_309.nsbmd', + 'prop_model_310.nsbmd', + 'prop_model_311.nsbmd', + 'blue_door.nsbmd', + 'iron_door_2.nsbmd', + 'prop_model_314.nsbmd', + 'prop_model_315.nsbmd', + 'secret_base_pc_normal_flag.nsbmd', + 'secret_base_pc_bronze_flag.nsbmd', + 'secret_base_pc_silver_flag.nsbmd', + 'secret_base_pc_gold_flag.nsbmd', + 'secret_base_pc_platinum_flag.nsbmd', + 'prop_model_321.nsbmd', + 'prop_model_322.nsbmd', + 'prop_model_323.nsbmd', + 'prop_model_324.nsbmd', + 'prop_model_325.nsbmd', + 'prop_model_326.nsbmd', + 'prop_model_327.nsbmd', + 'prop_model_328.nsbmd', + 'prop_model_329.nsbmd', + 'prop_model_330.nsbmd', + 'prop_model_331.nsbmd', + 'prop_model_332.nsbmd', + 'prop_model_333.nsbmd', + 'prop_model_334.nsbmd', + 'prop_model_335.nsbmd', + 'prop_model_336.nsbmd', + 'prop_model_337.nsbmd', + 'prop_model_338.nsbmd', + 'prop_model_339.nsbmd', + 'prop_model_340.nsbmd', + 'prop_model_341.nsbmd', + 'prop_model_342.nsbmd', + 'prop_model_343.nsbmd', + 'prop_model_344.nsbmd', + 'prop_model_345.nsbmd', + 'prop_model_346.nsbmd', + 'prop_model_347.nsbmd', + 'prop_model_348.nsbmd', + 'prop_model_349.nsbmd', + 'prop_model_350.nsbmd', + 'prop_model_351.nsbmd', + 'prop_model_352.nsbmd', + 'prop_model_353.nsbmd', + 'prop_model_354.nsbmd', + 'prop_model_355.nsbmd', + 'prop_model_356.nsbmd', + 'prop_model_357.nsbmd', + 'prop_model_358.nsbmd', + 'prop_model_359.nsbmd', + 'prop_model_360.nsbmd', + 'prop_model_361.nsbmd', + 'prop_model_362.nsbmd', + 'prop_model_363.nsbmd', + 'prop_model_364.nsbmd', + 'prop_model_365.nsbmd', + 'prop_model_366.nsbmd', + 'prop_model_367.nsbmd', + 'prop_model_368.nsbmd', + 'prop_model_369.nsbmd', + 'prop_model_370.nsbmd', + 'prop_model_371.nsbmd', + 'prop_model_372.nsbmd', + 'prop_model_373.nsbmd', + 'prop_model_374.nsbmd', + 'prop_model_375.nsbmd', + 'prop_model_376.nsbmd', + 'prop_model_377.nsbmd', + 'prop_model_378.nsbmd', + 'prop_model_379.nsbmd', + 'prop_model_380.nsbmd', + 'prop_model_381.nsbmd', + 'prop_model_382.nsbmd', + 'prop_model_383.nsbmd', + 'prop_model_384.nsbmd', + 'prop_model_385.nsbmd', + 'prop_model_386.nsbmd', + 'prop_model_387.nsbmd', + 'prop_model_388.nsbmd', + 'prop_model_389.nsbmd', + 'prop_model_390.nsbmd', + 'prop_model_391.nsbmd', + 'prop_model_392.nsbmd', + 'prop_model_393.nsbmd', + 'prop_model_394.nsbmd', + 'prop_model_395.nsbmd', + 'prop_model_396.nsbmd', + 'prop_model_397.nsbmd', + 'prop_model_398.nsbmd', + 'prop_model_399.nsbmd', + 'prop_model_400.nsbmd', + 'prop_model_401.nsbmd', + 'prop_model_402.nsbmd', + 'prop_model_403.nsbmd', + 'prop_model_404.nsbmd', + 'prop_model_405.nsbmd', + 'prop_model_406.nsbmd', + 'prop_model_407.nsbmd', + 'prop_model_408.nsbmd', + 'prop_model_409.nsbmd', + 'prop_model_410.nsbmd', + 'prop_model_411.nsbmd', + 'prop_model_412.nsbmd', + 'prop_model_413.nsbmd', + 'prop_model_414.nsbmd', + 'prop_model_415.nsbmd', + 'prop_model_416.nsbmd', + 'prop_model_417.nsbmd', + 'prop_model_418.nsbmd', + 'prop_model_419.nsbmd', + 'prop_model_420.nsbmd', + 'prop_model_421.nsbmd', + 'prop_model_422.nsbmd', + 'prop_model_423.nsbmd', + 'prop_model_424.nsbmd', + 'pokecenter_stair_up_right.nsbmd', + 'pokecenter_stair_down_right.nsbmd', + 'pokecenter_inside_door.nsbmd', + 'prop_model_428.nsbmd', + 'secret_base_entrance_north.nsbmd', + 'secret_base_entrance_south.nsbmd', + 'secret_base_entrance_west.nsbmd', + 'secret_base_entrance_east.nsbmd', + 'prop_model_433.nsbmd', + 'prop_model_434.nsbmd', + 'prop_model_435.nsbmd', + 'prop_model_436.nsbmd', + 'prop_model_437.nsbmd', + 'yellow_wooden_door.nsbmd', + 'prop_model_439.nsbmd', + 'prop_model_440.nsbmd', + 'mansion_door.nsbmd', + 'veilstone_dpt_store_door.nsbmd', + 'prop_model_443.nsbmd', + 'blue_wooden_door.nsbmd', + 'prop_model_445.nsbmd', + 'prop_model_446.nsbmd', + 'prop_model_447.nsbmd', + 'prop_model_448.nsbmd', + 'prop_model_449.nsbmd', + 'prop_model_450.nsbmd', + 'prop_model_451.nsbmd', + 'prop_model_452.nsbmd', + 'prop_model_453.nsbmd', + 'prop_model_454.nsbmd', + 'prop_model_455.nsbmd', + 'gts_inside_door.nsbmd', + 'prop_model_457.nsbmd', + 'prop_model_458.nsbmd', + 'prop_model_459.nsbmd', + 'prop_model_460.nsbmd', + 'prop_model_461.nsbmd', + 'prop_model_462.nsbmd', + 'prop_model_463.nsbmd', + 'prop_model_464.nsbmd', + 'prop_model_465.nsbmd', + 'prop_model_466.nsbmd', + 'prop_model_467.nsbmd', + 'prop_model_468.nsbmd', + 'prop_model_469.nsbmd', + 'prop_model_470.nsbmd', + 'prop_model_471.nsbmd', + 'prop_model_472.nsbmd', + 'prop_model_473.nsbmd', + 'prop_model_474.nsbmd', + 'great_marsh_train.nsbmd', + 'prop_model_476.nsbmd', + 'prop_model_477.nsbmd', + 'prop_model_478.nsbmd', + 'prop_model_479.nsbmd', + 'prop_model_480.nsbmd', + 'prop_model_481.nsbmd', + 'prop_model_482.nsbmd', + 'prop_model_483.nsbmd', + 'card_door.nsbmd', + 'prop_model_485.nsbmd', + 'prop_model_486.nsbmd', + 'prop_model_487.nsbmd', + 'prop_model_488.nsbmd', + 'prop_model_489.nsbmd', + 'prop_model_490.nsbmd', + 'prop_model_491.nsbmd', + 'prop_model_492.nsbmd', + 'prop_model_493.nsbmd', + 'prop_model_494.nsbmd', + 'prop_model_495.nsbmd', + 'prop_model_496.nsbmd', + 'prop_model_497.nsbmd', + 'elevator_lights.nsbmd', + 'prop_model_499.nsbmd', + 'prop_model_500.nsbmd', + 'prop_model_501.nsbmd', + 'pokemon_league_platform_lift.nsbmd', + 'prop_model_503.nsbmd', + 'prop_model_504.nsbmd', + 'prop_model_505.nsbmd', + 'prop_model_506.nsbmd', + 'pokemon_league_hall_of_fame_machine.nsbmd', + 'prop_model_508.nsbmd', + 'prop_model_509.nsbmd', + 'prop_model_510.nsbmd', + 'prop_model_511.nsbmd', + 'prop_model_512.nsbmd', + 'prop_model_513.nsbmd', + 'prop_model_514.nsbmd', + 'prop_model_515.nsbmd', + 'prop_model_516.nsbmd', + 'pokecenter_healing_machine_mini_pokeball.nsbmd', + 'prop_model_518.nsbmd', + 'prop_model_519.nsbmd', + 'prop_model_520.nsbmd', + 'prop_model_521.nsbmd', + 'prop_model_522.nsbmd', + 'prop_model_523.nsbmd', + 'prop_model_524.nsbmd', + 'prop_model_525.nsbmd', + 'prop_model_526.nsbmd', + 'hotel_grand_lake_door.nsbmd', + 'prop_model_528.nsbmd', + 'prop_model_529.nsbmd', + 'prop_model_530.nsbmd', + 'prop_model_531.nsbmd', + 'prop_model_532.nsbmd', + 'prop_model_533.nsbmd', + 'prop_model_534.nsbmd', + 'prop_model_535.nsbmd', + 'prop_model_536.nsbmd', + 'prop_model_537.nsbmd', + 'screw_steamship_spiral.nsbmd', + 'prop_model_539.nsbmd', + 'prop_model_540.nsbmd', + 'prop_model_541.nsbmd', + 'prop_model_542.nsbmd', + 'prop_model_543.nsbmd', + 'prop_model_544.nsbmd', + 'prop_model_545.nsbmd', + 'prop_model_546.nsbmd', + 'prop_model_547.nsbmd', + 'prop_model_548.nsbmd', + 'prop_model_549.nsbmd', + 'prop_model_550.nsbmd', + 'prop_model_551.nsbmd', + 'prop_model_552.nsbmd', + 'prop_model_553.nsbmd', + 'prop_model_554.nsbmd', + 'prop_model_555.nsbmd', + 'prop_model_556.nsbmd', + 'prop_model_557.nsbmd', + 'prop_model_558.nsbmd', + 'prop_model_559.nsbmd', + 'prop_model_560.nsbmd', + 'prop_model_561.nsbmd', + 'prop_model_562.nsbmd', + 'prop_model_563.nsbmd', + 'prop_model_564.nsbmd', + 'prop_model_565.nsbmd', + 'prop_model_566.nsbmd', + 'prop_model_567.nsbmd', + 'prop_model_568.nsbmd', + 'prop_model_569.nsbmd', + 'prop_model_570.nsbmd', + 'prop_model_571.nsbmd', + 'prop_model_572.nsbmd', + 'prop_model_573.nsbmd', + 'prop_model_574.nsbmd', + 'prop_model_575.nsbmd', + 'prop_model_576.nsbmd', + 'prop_model_577.nsbmd', + 'prop_model_578.nsbmd', + 'prop_model_579.nsbmd', + 'prop_model_580.nsbmd', + 'prop_model_581.nsbmd', + 'prop_model_582.nsbmd', + 'prop_model_583.nsbmd', + 'prop_model_584.nsbmd', + 'prop_model_585.nsbmd', + 'prop_model_586.nsbmd', + 'prop_model_587.nsbmd', + 'prop_model_588.nsbmd', + 'prop_model_589.nsbmd', +)) + +map_prop_model_order = files('map_prop_models.order') +map_prop_model_narc = custom_target('prop_models.narc', + output: [ + 'prop_models.narc', + 'prop_models.naix', + ], + input: [ + map_prop_model_files, + map_prop_model_order, + ], + command: [ + narc_exe, 'create', + '--naix', + '--order', map_prop_model_order, + '--output', '@OUTPUT0@', + '@PRIVATE_DIR@', + ] +) + +nitrofs_files += map_prop_model_narc diff --git a/res/field/props/models/pastoria_gym_blue_button.nsbmd b/res/field/props/models/pastoria_gym_blue_button.nsbmd new file mode 100644 index 0000000000..2bfa2e5b49 Binary files /dev/null and b/res/field/props/models/pastoria_gym_blue_button.nsbmd differ diff --git a/res/field/props/models/pastoria_gym_green_button.nsbmd b/res/field/props/models/pastoria_gym_green_button.nsbmd new file mode 100644 index 0000000000..e521f0040a Binary files /dev/null and b/res/field/props/models/pastoria_gym_green_button.nsbmd differ diff --git a/res/field/props/models/pastoria_gym_orange_button.nsbmd b/res/field/props/models/pastoria_gym_orange_button.nsbmd new file mode 100644 index 0000000000..f76f6e2588 Binary files /dev/null and b/res/field/props/models/pastoria_gym_orange_button.nsbmd differ diff --git a/res/field/props/models/pastoria_gym_water_floor.nsbmd b/res/field/props/models/pastoria_gym_water_floor.nsbmd new file mode 100644 index 0000000000..ace5c37fe3 Binary files /dev/null and b/res/field/props/models/pastoria_gym_water_floor.nsbmd differ diff --git a/res/field/props/models/pokecenter_door.nsbmd b/res/field/props/models/pokecenter_door.nsbmd new file mode 100644 index 0000000000..9317821531 Binary files /dev/null and b/res/field/props/models/pokecenter_door.nsbmd differ diff --git a/res/field/props/models/pokecenter_healing_machine.nsbmd b/res/field/props/models/pokecenter_healing_machine.nsbmd new file mode 100644 index 0000000000..7f0a4dafd1 Binary files /dev/null and b/res/field/props/models/pokecenter_healing_machine.nsbmd differ diff --git a/res/field/props/models/pokecenter_healing_machine_mini_pokeball.nsbmd b/res/field/props/models/pokecenter_healing_machine_mini_pokeball.nsbmd new file mode 100644 index 0000000000..4c354f6772 Binary files /dev/null and b/res/field/props/models/pokecenter_healing_machine_mini_pokeball.nsbmd differ diff --git a/res/field/props/models/pokecenter_healing_machine_tv.nsbmd b/res/field/props/models/pokecenter_healing_machine_tv.nsbmd new file mode 100644 index 0000000000..644a0349fa Binary files /dev/null and b/res/field/props/models/pokecenter_healing_machine_tv.nsbmd differ diff --git a/res/field/props/models/pokecenter_inside_counter_door.nsbmd b/res/field/props/models/pokecenter_inside_counter_door.nsbmd new file mode 100644 index 0000000000..acac46b63d Binary files /dev/null and b/res/field/props/models/pokecenter_inside_counter_door.nsbmd differ diff --git a/res/field/props/models/pokecenter_inside_door.nsbmd b/res/field/props/models/pokecenter_inside_door.nsbmd new file mode 100644 index 0000000000..920b1e37a0 Binary files /dev/null and b/res/field/props/models/pokecenter_inside_door.nsbmd differ diff --git a/res/field/props/models/pokecenter_pc.nsbmd b/res/field/props/models/pokecenter_pc.nsbmd new file mode 100644 index 0000000000..96597f7bc7 Binary files /dev/null and b/res/field/props/models/pokecenter_pc.nsbmd differ diff --git a/res/field/props/models/pokecenter_stair_down_left.nsbmd b/res/field/props/models/pokecenter_stair_down_left.nsbmd new file mode 100644 index 0000000000..17eeeda56f Binary files /dev/null and b/res/field/props/models/pokecenter_stair_down_left.nsbmd differ diff --git a/res/field/props/models/pokecenter_stair_down_right.nsbmd b/res/field/props/models/pokecenter_stair_down_right.nsbmd new file mode 100644 index 0000000000..7e06df4a41 Binary files /dev/null and b/res/field/props/models/pokecenter_stair_down_right.nsbmd differ diff --git a/res/field/props/models/pokecenter_stair_up_left.nsbmd b/res/field/props/models/pokecenter_stair_up_left.nsbmd new file mode 100644 index 0000000000..df9334a206 Binary files /dev/null and b/res/field/props/models/pokecenter_stair_up_left.nsbmd differ diff --git a/res/field/props/models/pokecenter_stair_up_right.nsbmd b/res/field/props/models/pokecenter_stair_up_right.nsbmd new file mode 100644 index 0000000000..8e2b09c45a Binary files /dev/null and b/res/field/props/models/pokecenter_stair_up_right.nsbmd differ diff --git a/res/field/props/models/pokemon_league_hall_of_fame_machine.nsbmd b/res/field/props/models/pokemon_league_hall_of_fame_machine.nsbmd new file mode 100644 index 0000000000..9dde6b6a82 Binary files /dev/null and b/res/field/props/models/pokemon_league_hall_of_fame_machine.nsbmd differ diff --git a/res/field/props/models/pokemon_league_platform_lift.nsbmd b/res/field/props/models/pokemon_league_platform_lift.nsbmd new file mode 100644 index 0000000000..e6ca830a34 Binary files /dev/null and b/res/field/props/models/pokemon_league_platform_lift.nsbmd differ diff --git a/res/field/props/models/prop_model_000.nsbmd b/res/field/props/models/prop_model_000.nsbmd new file mode 100644 index 0000000000..df429436c2 Binary files /dev/null and b/res/field/props/models/prop_model_000.nsbmd differ diff --git a/res/field/props/models/prop_model_001.nsbmd b/res/field/props/models/prop_model_001.nsbmd new file mode 100644 index 0000000000..fed4005f8a Binary files /dev/null and b/res/field/props/models/prop_model_001.nsbmd differ diff --git a/res/field/props/models/prop_model_002.nsbmd b/res/field/props/models/prop_model_002.nsbmd new file mode 100644 index 0000000000..69993312fd Binary files /dev/null and b/res/field/props/models/prop_model_002.nsbmd differ diff --git a/res/field/props/models/prop_model_003.nsbmd b/res/field/props/models/prop_model_003.nsbmd new file mode 100644 index 0000000000..e908385dc4 Binary files /dev/null and b/res/field/props/models/prop_model_003.nsbmd differ diff --git a/res/field/props/models/prop_model_004.nsbmd b/res/field/props/models/prop_model_004.nsbmd new file mode 100644 index 0000000000..147bf45b59 Binary files /dev/null and b/res/field/props/models/prop_model_004.nsbmd differ diff --git a/res/field/props/models/prop_model_005.nsbmd b/res/field/props/models/prop_model_005.nsbmd new file mode 100644 index 0000000000..944dc2bd41 Binary files /dev/null and b/res/field/props/models/prop_model_005.nsbmd differ diff --git a/res/field/props/models/prop_model_006.nsbmd b/res/field/props/models/prop_model_006.nsbmd new file mode 100644 index 0000000000..933c5d1d1a Binary files /dev/null and b/res/field/props/models/prop_model_006.nsbmd differ diff --git a/res/field/props/models/prop_model_007.nsbmd b/res/field/props/models/prop_model_007.nsbmd new file mode 100644 index 0000000000..2d7b5f91fd Binary files /dev/null and b/res/field/props/models/prop_model_007.nsbmd differ diff --git a/res/field/props/models/prop_model_008.nsbmd b/res/field/props/models/prop_model_008.nsbmd new file mode 100644 index 0000000000..ef7885295a Binary files /dev/null and b/res/field/props/models/prop_model_008.nsbmd differ diff --git a/res/field/props/models/prop_model_009.nsbmd b/res/field/props/models/prop_model_009.nsbmd new file mode 100644 index 0000000000..745fede912 Binary files /dev/null and b/res/field/props/models/prop_model_009.nsbmd differ diff --git a/res/field/props/models/prop_model_010.nsbmd b/res/field/props/models/prop_model_010.nsbmd new file mode 100644 index 0000000000..15f9af3813 Binary files /dev/null and b/res/field/props/models/prop_model_010.nsbmd differ diff --git a/res/field/props/models/prop_model_011.nsbmd b/res/field/props/models/prop_model_011.nsbmd new file mode 100644 index 0000000000..4f43158859 Binary files /dev/null and b/res/field/props/models/prop_model_011.nsbmd differ diff --git a/res/field/props/models/prop_model_012.nsbmd b/res/field/props/models/prop_model_012.nsbmd new file mode 100644 index 0000000000..83f9613ce5 Binary files /dev/null and b/res/field/props/models/prop_model_012.nsbmd differ diff --git a/res/field/props/models/prop_model_013.nsbmd b/res/field/props/models/prop_model_013.nsbmd new file mode 100644 index 0000000000..f56bf50de7 Binary files /dev/null and b/res/field/props/models/prop_model_013.nsbmd differ diff --git a/res/field/props/models/prop_model_014.nsbmd b/res/field/props/models/prop_model_014.nsbmd new file mode 100644 index 0000000000..30ee932272 Binary files /dev/null and b/res/field/props/models/prop_model_014.nsbmd differ diff --git a/res/field/props/models/prop_model_015.nsbmd b/res/field/props/models/prop_model_015.nsbmd new file mode 100644 index 0000000000..426cd69d72 Binary files /dev/null and b/res/field/props/models/prop_model_015.nsbmd differ diff --git a/res/field/props/models/prop_model_016.nsbmd b/res/field/props/models/prop_model_016.nsbmd new file mode 100644 index 0000000000..6e097fa367 Binary files /dev/null and b/res/field/props/models/prop_model_016.nsbmd differ diff --git a/res/field/props/models/prop_model_017.nsbmd b/res/field/props/models/prop_model_017.nsbmd new file mode 100644 index 0000000000..6290f481c6 Binary files /dev/null and b/res/field/props/models/prop_model_017.nsbmd differ diff --git a/res/field/props/models/prop_model_018.nsbmd b/res/field/props/models/prop_model_018.nsbmd new file mode 100644 index 0000000000..674451c6a7 Binary files /dev/null and b/res/field/props/models/prop_model_018.nsbmd differ diff --git a/res/field/props/models/prop_model_019.nsbmd b/res/field/props/models/prop_model_019.nsbmd new file mode 100644 index 0000000000..c18c32dd48 Binary files /dev/null and b/res/field/props/models/prop_model_019.nsbmd differ diff --git a/res/field/props/models/prop_model_020.nsbmd b/res/field/props/models/prop_model_020.nsbmd new file mode 100644 index 0000000000..445738e606 Binary files /dev/null and b/res/field/props/models/prop_model_020.nsbmd differ diff --git a/res/field/props/models/prop_model_021.nsbmd b/res/field/props/models/prop_model_021.nsbmd new file mode 100644 index 0000000000..14e8353970 Binary files /dev/null and b/res/field/props/models/prop_model_021.nsbmd differ diff --git a/res/field/props/models/prop_model_022.nsbmd b/res/field/props/models/prop_model_022.nsbmd new file mode 100644 index 0000000000..383950cc4f Binary files /dev/null and b/res/field/props/models/prop_model_022.nsbmd differ diff --git a/res/field/props/models/prop_model_023.nsbmd b/res/field/props/models/prop_model_023.nsbmd new file mode 100644 index 0000000000..2193c2fad1 Binary files /dev/null and b/res/field/props/models/prop_model_023.nsbmd differ diff --git a/res/field/props/models/prop_model_024.nsbmd b/res/field/props/models/prop_model_024.nsbmd new file mode 100644 index 0000000000..43908a4f53 Binary files /dev/null and b/res/field/props/models/prop_model_024.nsbmd differ diff --git a/res/field/props/models/prop_model_025.nsbmd b/res/field/props/models/prop_model_025.nsbmd new file mode 100644 index 0000000000..2553bc10ee Binary files /dev/null and b/res/field/props/models/prop_model_025.nsbmd differ diff --git a/res/field/props/models/prop_model_027.nsbmd b/res/field/props/models/prop_model_027.nsbmd new file mode 100644 index 0000000000..fc15569bf2 Binary files /dev/null and b/res/field/props/models/prop_model_027.nsbmd differ diff --git a/res/field/props/models/prop_model_028.nsbmd b/res/field/props/models/prop_model_028.nsbmd new file mode 100644 index 0000000000..a24242d8ed Binary files /dev/null and b/res/field/props/models/prop_model_028.nsbmd differ diff --git a/res/field/props/models/prop_model_029.nsbmd b/res/field/props/models/prop_model_029.nsbmd new file mode 100644 index 0000000000..7779fd6663 Binary files /dev/null and b/res/field/props/models/prop_model_029.nsbmd differ diff --git a/res/field/props/models/prop_model_030.nsbmd b/res/field/props/models/prop_model_030.nsbmd new file mode 100644 index 0000000000..ffcc9daaae Binary files /dev/null and b/res/field/props/models/prop_model_030.nsbmd differ diff --git a/res/field/props/models/prop_model_033.nsbmd b/res/field/props/models/prop_model_033.nsbmd new file mode 100644 index 0000000000..3e18de9da7 Binary files /dev/null and b/res/field/props/models/prop_model_033.nsbmd differ diff --git a/res/field/props/models/prop_model_035.nsbmd b/res/field/props/models/prop_model_035.nsbmd new file mode 100644 index 0000000000..7d9eed9f7c Binary files /dev/null and b/res/field/props/models/prop_model_035.nsbmd differ diff --git a/res/field/props/models/prop_model_036.nsbmd b/res/field/props/models/prop_model_036.nsbmd new file mode 100644 index 0000000000..3bac73aeb6 Binary files /dev/null and b/res/field/props/models/prop_model_036.nsbmd differ diff --git a/res/field/props/models/prop_model_037.nsbmd b/res/field/props/models/prop_model_037.nsbmd new file mode 100644 index 0000000000..f63d39d3aa Binary files /dev/null and b/res/field/props/models/prop_model_037.nsbmd differ diff --git a/res/field/props/models/prop_model_038.nsbmd b/res/field/props/models/prop_model_038.nsbmd new file mode 100644 index 0000000000..febfd6516a Binary files /dev/null and b/res/field/props/models/prop_model_038.nsbmd differ diff --git a/res/field/props/models/prop_model_039.nsbmd b/res/field/props/models/prop_model_039.nsbmd new file mode 100644 index 0000000000..950b6e274d Binary files /dev/null and b/res/field/props/models/prop_model_039.nsbmd differ diff --git a/res/field/props/models/prop_model_040.nsbmd b/res/field/props/models/prop_model_040.nsbmd new file mode 100644 index 0000000000..e17876de14 Binary files /dev/null and b/res/field/props/models/prop_model_040.nsbmd differ diff --git a/res/field/props/models/prop_model_041.nsbmd b/res/field/props/models/prop_model_041.nsbmd new file mode 100644 index 0000000000..8d9b7ee8ee Binary files /dev/null and b/res/field/props/models/prop_model_041.nsbmd differ diff --git a/res/field/props/models/prop_model_042.nsbmd b/res/field/props/models/prop_model_042.nsbmd new file mode 100644 index 0000000000..9a9a6dde6b Binary files /dev/null and b/res/field/props/models/prop_model_042.nsbmd differ diff --git a/res/field/props/models/prop_model_043.nsbmd b/res/field/props/models/prop_model_043.nsbmd new file mode 100644 index 0000000000..2b2ca2f86b Binary files /dev/null and b/res/field/props/models/prop_model_043.nsbmd differ diff --git a/res/field/props/models/prop_model_044.nsbmd b/res/field/props/models/prop_model_044.nsbmd new file mode 100644 index 0000000000..ceb60570ee Binary files /dev/null and b/res/field/props/models/prop_model_044.nsbmd differ diff --git a/res/field/props/models/prop_model_045.nsbmd b/res/field/props/models/prop_model_045.nsbmd new file mode 100644 index 0000000000..82e8f4c127 Binary files /dev/null and b/res/field/props/models/prop_model_045.nsbmd differ diff --git a/res/field/props/models/prop_model_046.nsbmd b/res/field/props/models/prop_model_046.nsbmd new file mode 100644 index 0000000000..8e662071f9 Binary files /dev/null and b/res/field/props/models/prop_model_046.nsbmd differ diff --git a/res/field/props/models/prop_model_047.nsbmd b/res/field/props/models/prop_model_047.nsbmd new file mode 100644 index 0000000000..e29e14af48 Binary files /dev/null and b/res/field/props/models/prop_model_047.nsbmd differ diff --git a/res/field/props/models/prop_model_048.nsbmd b/res/field/props/models/prop_model_048.nsbmd new file mode 100644 index 0000000000..8d6666b50b Binary files /dev/null and b/res/field/props/models/prop_model_048.nsbmd differ diff --git a/res/field/props/models/prop_model_049.nsbmd b/res/field/props/models/prop_model_049.nsbmd new file mode 100644 index 0000000000..ed0a20dd11 Binary files /dev/null and b/res/field/props/models/prop_model_049.nsbmd differ diff --git a/res/field/props/models/prop_model_050.nsbmd b/res/field/props/models/prop_model_050.nsbmd new file mode 100644 index 0000000000..0415315ad6 Binary files /dev/null and b/res/field/props/models/prop_model_050.nsbmd differ diff --git a/res/field/props/models/prop_model_051.nsbmd b/res/field/props/models/prop_model_051.nsbmd new file mode 100644 index 0000000000..ae20ac8d04 Binary files /dev/null and b/res/field/props/models/prop_model_051.nsbmd differ diff --git a/res/field/props/models/prop_model_052.nsbmd b/res/field/props/models/prop_model_052.nsbmd new file mode 100644 index 0000000000..6a94b8dd71 Binary files /dev/null and b/res/field/props/models/prop_model_052.nsbmd differ diff --git a/res/field/props/models/prop_model_053.nsbmd b/res/field/props/models/prop_model_053.nsbmd new file mode 100644 index 0000000000..456bbd80ce Binary files /dev/null and b/res/field/props/models/prop_model_053.nsbmd differ diff --git a/res/field/props/models/prop_model_054.nsbmd b/res/field/props/models/prop_model_054.nsbmd new file mode 100644 index 0000000000..2c3d1afaf7 Binary files /dev/null and b/res/field/props/models/prop_model_054.nsbmd differ diff --git a/res/field/props/models/prop_model_055.nsbmd b/res/field/props/models/prop_model_055.nsbmd new file mode 100644 index 0000000000..869ba68a95 Binary files /dev/null and b/res/field/props/models/prop_model_055.nsbmd differ diff --git a/res/field/props/models/prop_model_056.nsbmd b/res/field/props/models/prop_model_056.nsbmd new file mode 100644 index 0000000000..436431208e Binary files /dev/null and b/res/field/props/models/prop_model_056.nsbmd differ diff --git a/res/field/props/models/prop_model_057.nsbmd b/res/field/props/models/prop_model_057.nsbmd new file mode 100644 index 0000000000..8030ee7538 Binary files /dev/null and b/res/field/props/models/prop_model_057.nsbmd differ diff --git a/res/field/props/models/prop_model_058.nsbmd b/res/field/props/models/prop_model_058.nsbmd new file mode 100644 index 0000000000..ae54061a2a Binary files /dev/null and b/res/field/props/models/prop_model_058.nsbmd differ diff --git a/res/field/props/models/prop_model_059.nsbmd b/res/field/props/models/prop_model_059.nsbmd new file mode 100644 index 0000000000..b4d384476e Binary files /dev/null and b/res/field/props/models/prop_model_059.nsbmd differ diff --git a/res/field/props/models/prop_model_060.nsbmd b/res/field/props/models/prop_model_060.nsbmd new file mode 100644 index 0000000000..0db9ecb391 Binary files /dev/null and b/res/field/props/models/prop_model_060.nsbmd differ diff --git a/res/field/props/models/prop_model_061.nsbmd b/res/field/props/models/prop_model_061.nsbmd new file mode 100644 index 0000000000..6138d40e35 Binary files /dev/null and b/res/field/props/models/prop_model_061.nsbmd differ diff --git a/res/field/props/models/prop_model_062.nsbmd b/res/field/props/models/prop_model_062.nsbmd new file mode 100644 index 0000000000..3122ffff7a Binary files /dev/null and b/res/field/props/models/prop_model_062.nsbmd differ diff --git a/res/field/props/models/prop_model_063.nsbmd b/res/field/props/models/prop_model_063.nsbmd new file mode 100644 index 0000000000..6fbe6ce103 Binary files /dev/null and b/res/field/props/models/prop_model_063.nsbmd differ diff --git a/res/field/props/models/prop_model_064.nsbmd b/res/field/props/models/prop_model_064.nsbmd new file mode 100644 index 0000000000..dd80f8005e Binary files /dev/null and b/res/field/props/models/prop_model_064.nsbmd differ diff --git a/res/field/props/models/prop_model_065.nsbmd b/res/field/props/models/prop_model_065.nsbmd new file mode 100644 index 0000000000..3045dcce5e Binary files /dev/null and b/res/field/props/models/prop_model_065.nsbmd differ diff --git a/res/field/props/models/prop_model_071.nsbmd b/res/field/props/models/prop_model_071.nsbmd new file mode 100644 index 0000000000..c447f2aba7 Binary files /dev/null and b/res/field/props/models/prop_model_071.nsbmd differ diff --git a/res/field/props/models/prop_model_072.nsbmd b/res/field/props/models/prop_model_072.nsbmd new file mode 100644 index 0000000000..01fbd623b1 Binary files /dev/null and b/res/field/props/models/prop_model_072.nsbmd differ diff --git a/res/field/props/models/prop_model_073.nsbmd b/res/field/props/models/prop_model_073.nsbmd new file mode 100644 index 0000000000..10ca4f31d4 Binary files /dev/null and b/res/field/props/models/prop_model_073.nsbmd differ diff --git a/res/field/props/models/prop_model_074.nsbmd b/res/field/props/models/prop_model_074.nsbmd new file mode 100644 index 0000000000..93ee9f0d50 Binary files /dev/null and b/res/field/props/models/prop_model_074.nsbmd differ diff --git a/res/field/props/models/prop_model_076.nsbmd b/res/field/props/models/prop_model_076.nsbmd new file mode 100644 index 0000000000..7924bc060d Binary files /dev/null and b/res/field/props/models/prop_model_076.nsbmd differ diff --git a/res/field/props/models/prop_model_077.nsbmd b/res/field/props/models/prop_model_077.nsbmd new file mode 100644 index 0000000000..6223c8f403 Binary files /dev/null and b/res/field/props/models/prop_model_077.nsbmd differ diff --git a/res/field/props/models/prop_model_078.nsbmd b/res/field/props/models/prop_model_078.nsbmd new file mode 100644 index 0000000000..1445c55726 Binary files /dev/null and b/res/field/props/models/prop_model_078.nsbmd differ diff --git a/res/field/props/models/prop_model_079.nsbmd b/res/field/props/models/prop_model_079.nsbmd new file mode 100644 index 0000000000..b3b4455f83 Binary files /dev/null and b/res/field/props/models/prop_model_079.nsbmd differ diff --git a/res/field/props/models/prop_model_080.nsbmd b/res/field/props/models/prop_model_080.nsbmd new file mode 100644 index 0000000000..9a94cbe8c9 Binary files /dev/null and b/res/field/props/models/prop_model_080.nsbmd differ diff --git a/res/field/props/models/prop_model_081.nsbmd b/res/field/props/models/prop_model_081.nsbmd new file mode 100644 index 0000000000..f01bab3449 Binary files /dev/null and b/res/field/props/models/prop_model_081.nsbmd differ diff --git a/res/field/props/models/prop_model_082.nsbmd b/res/field/props/models/prop_model_082.nsbmd new file mode 100644 index 0000000000..c25451f392 Binary files /dev/null and b/res/field/props/models/prop_model_082.nsbmd differ diff --git a/res/field/props/models/prop_model_083.nsbmd b/res/field/props/models/prop_model_083.nsbmd new file mode 100644 index 0000000000..c7669c2317 Binary files /dev/null and b/res/field/props/models/prop_model_083.nsbmd differ diff --git a/res/field/props/models/prop_model_084.nsbmd b/res/field/props/models/prop_model_084.nsbmd new file mode 100644 index 0000000000..5fa1b727e1 Binary files /dev/null and b/res/field/props/models/prop_model_084.nsbmd differ diff --git a/res/field/props/models/prop_model_085.nsbmd b/res/field/props/models/prop_model_085.nsbmd new file mode 100644 index 0000000000..74eadf0ee7 Binary files /dev/null and b/res/field/props/models/prop_model_085.nsbmd differ diff --git a/res/field/props/models/prop_model_086.nsbmd b/res/field/props/models/prop_model_086.nsbmd new file mode 100644 index 0000000000..a29e249c03 Binary files /dev/null and b/res/field/props/models/prop_model_086.nsbmd differ diff --git a/res/field/props/models/prop_model_087.nsbmd b/res/field/props/models/prop_model_087.nsbmd new file mode 100644 index 0000000000..7db5a7de60 Binary files /dev/null and b/res/field/props/models/prop_model_087.nsbmd differ diff --git a/res/field/props/models/prop_model_088.nsbmd b/res/field/props/models/prop_model_088.nsbmd new file mode 100644 index 0000000000..e4cef65fbc Binary files /dev/null and b/res/field/props/models/prop_model_088.nsbmd differ diff --git a/res/field/props/models/prop_model_089.nsbmd b/res/field/props/models/prop_model_089.nsbmd new file mode 100644 index 0000000000..42520f11cb Binary files /dev/null and b/res/field/props/models/prop_model_089.nsbmd differ diff --git a/res/field/props/models/prop_model_090.nsbmd b/res/field/props/models/prop_model_090.nsbmd new file mode 100644 index 0000000000..bc82de6fd4 Binary files /dev/null and b/res/field/props/models/prop_model_090.nsbmd differ diff --git a/res/field/props/models/prop_model_091.nsbmd b/res/field/props/models/prop_model_091.nsbmd new file mode 100644 index 0000000000..b92e1535f0 Binary files /dev/null and b/res/field/props/models/prop_model_091.nsbmd differ diff --git a/res/field/props/models/prop_model_092.nsbmd b/res/field/props/models/prop_model_092.nsbmd new file mode 100644 index 0000000000..97b8b47ec5 Binary files /dev/null and b/res/field/props/models/prop_model_092.nsbmd differ diff --git a/res/field/props/models/prop_model_093.nsbmd b/res/field/props/models/prop_model_093.nsbmd new file mode 100644 index 0000000000..2e58d12763 Binary files /dev/null and b/res/field/props/models/prop_model_093.nsbmd differ diff --git a/res/field/props/models/prop_model_094.nsbmd b/res/field/props/models/prop_model_094.nsbmd new file mode 100644 index 0000000000..095e094879 Binary files /dev/null and b/res/field/props/models/prop_model_094.nsbmd differ diff --git a/res/field/props/models/prop_model_095.nsbmd b/res/field/props/models/prop_model_095.nsbmd new file mode 100644 index 0000000000..7f6dcfe5fb Binary files /dev/null and b/res/field/props/models/prop_model_095.nsbmd differ diff --git a/res/field/props/models/prop_model_096.nsbmd b/res/field/props/models/prop_model_096.nsbmd new file mode 100644 index 0000000000..0c95a14bf2 Binary files /dev/null and b/res/field/props/models/prop_model_096.nsbmd differ diff --git a/res/field/props/models/prop_model_097.nsbmd b/res/field/props/models/prop_model_097.nsbmd new file mode 100644 index 0000000000..b3ce98a040 Binary files /dev/null and b/res/field/props/models/prop_model_097.nsbmd differ diff --git a/res/field/props/models/prop_model_098.nsbmd b/res/field/props/models/prop_model_098.nsbmd new file mode 100644 index 0000000000..befe0bf3f0 Binary files /dev/null and b/res/field/props/models/prop_model_098.nsbmd differ diff --git a/res/field/props/models/prop_model_099.nsbmd b/res/field/props/models/prop_model_099.nsbmd new file mode 100644 index 0000000000..dae4abe7b2 Binary files /dev/null and b/res/field/props/models/prop_model_099.nsbmd differ diff --git a/res/field/props/models/prop_model_100.nsbmd b/res/field/props/models/prop_model_100.nsbmd new file mode 100644 index 0000000000..560a438758 Binary files /dev/null and b/res/field/props/models/prop_model_100.nsbmd differ diff --git a/res/field/props/models/prop_model_101.nsbmd b/res/field/props/models/prop_model_101.nsbmd new file mode 100644 index 0000000000..8684743167 Binary files /dev/null and b/res/field/props/models/prop_model_101.nsbmd differ diff --git a/res/field/props/models/prop_model_102.nsbmd b/res/field/props/models/prop_model_102.nsbmd new file mode 100644 index 0000000000..d439d4ef35 Binary files /dev/null and b/res/field/props/models/prop_model_102.nsbmd differ diff --git a/res/field/props/models/prop_model_103.nsbmd b/res/field/props/models/prop_model_103.nsbmd new file mode 100644 index 0000000000..196f48ad83 Binary files /dev/null and b/res/field/props/models/prop_model_103.nsbmd differ diff --git a/res/field/props/models/prop_model_104.nsbmd b/res/field/props/models/prop_model_104.nsbmd new file mode 100644 index 0000000000..3239961e75 Binary files /dev/null and b/res/field/props/models/prop_model_104.nsbmd differ diff --git a/res/field/props/models/prop_model_105.nsbmd b/res/field/props/models/prop_model_105.nsbmd new file mode 100644 index 0000000000..3f36d9c6e6 Binary files /dev/null and b/res/field/props/models/prop_model_105.nsbmd differ diff --git a/res/field/props/models/prop_model_106.nsbmd b/res/field/props/models/prop_model_106.nsbmd new file mode 100644 index 0000000000..b2f8ef07a4 Binary files /dev/null and b/res/field/props/models/prop_model_106.nsbmd differ diff --git a/res/field/props/models/prop_model_107.nsbmd b/res/field/props/models/prop_model_107.nsbmd new file mode 100644 index 0000000000..69e900419e Binary files /dev/null and b/res/field/props/models/prop_model_107.nsbmd differ diff --git a/res/field/props/models/prop_model_108.nsbmd b/res/field/props/models/prop_model_108.nsbmd new file mode 100644 index 0000000000..fc37e09de8 Binary files /dev/null and b/res/field/props/models/prop_model_108.nsbmd differ diff --git a/res/field/props/models/prop_model_109.nsbmd b/res/field/props/models/prop_model_109.nsbmd new file mode 100644 index 0000000000..74eaaceb6e Binary files /dev/null and b/res/field/props/models/prop_model_109.nsbmd differ diff --git a/res/field/props/models/prop_model_110.nsbmd b/res/field/props/models/prop_model_110.nsbmd new file mode 100644 index 0000000000..85183c6aaf Binary files /dev/null and b/res/field/props/models/prop_model_110.nsbmd differ diff --git a/res/field/props/models/prop_model_111.nsbmd b/res/field/props/models/prop_model_111.nsbmd new file mode 100644 index 0000000000..4cee14b094 Binary files /dev/null and b/res/field/props/models/prop_model_111.nsbmd differ diff --git a/res/field/props/models/prop_model_113.nsbmd b/res/field/props/models/prop_model_113.nsbmd new file mode 100644 index 0000000000..1662fd1655 Binary files /dev/null and b/res/field/props/models/prop_model_113.nsbmd differ diff --git a/res/field/props/models/prop_model_114.nsbmd b/res/field/props/models/prop_model_114.nsbmd new file mode 100644 index 0000000000..a0a27ac5d9 Binary files /dev/null and b/res/field/props/models/prop_model_114.nsbmd differ diff --git a/res/field/props/models/prop_model_116.nsbmd b/res/field/props/models/prop_model_116.nsbmd new file mode 100644 index 0000000000..891867e39a Binary files /dev/null and b/res/field/props/models/prop_model_116.nsbmd differ diff --git a/res/field/props/models/prop_model_117.nsbmd b/res/field/props/models/prop_model_117.nsbmd new file mode 100644 index 0000000000..924126a356 Binary files /dev/null and b/res/field/props/models/prop_model_117.nsbmd differ diff --git a/res/field/props/models/prop_model_118.nsbmd b/res/field/props/models/prop_model_118.nsbmd new file mode 100644 index 0000000000..de35e7d964 Binary files /dev/null and b/res/field/props/models/prop_model_118.nsbmd differ diff --git a/res/field/props/models/prop_model_120.nsbmd b/res/field/props/models/prop_model_120.nsbmd new file mode 100644 index 0000000000..399fb5c279 Binary files /dev/null and b/res/field/props/models/prop_model_120.nsbmd differ diff --git a/res/field/props/models/prop_model_121.nsbmd b/res/field/props/models/prop_model_121.nsbmd new file mode 100644 index 0000000000..c021e9c425 Binary files /dev/null and b/res/field/props/models/prop_model_121.nsbmd differ diff --git a/res/field/props/models/prop_model_122.nsbmd b/res/field/props/models/prop_model_122.nsbmd new file mode 100644 index 0000000000..f74ab94082 Binary files /dev/null and b/res/field/props/models/prop_model_122.nsbmd differ diff --git a/res/field/props/models/prop_model_125.nsbmd b/res/field/props/models/prop_model_125.nsbmd new file mode 100644 index 0000000000..4ee3865f8f Binary files /dev/null and b/res/field/props/models/prop_model_125.nsbmd differ diff --git a/res/field/props/models/prop_model_126.nsbmd b/res/field/props/models/prop_model_126.nsbmd new file mode 100644 index 0000000000..6a8de389ee Binary files /dev/null and b/res/field/props/models/prop_model_126.nsbmd differ diff --git a/res/field/props/models/prop_model_127.nsbmd b/res/field/props/models/prop_model_127.nsbmd new file mode 100644 index 0000000000..c26edd9821 Binary files /dev/null and b/res/field/props/models/prop_model_127.nsbmd differ diff --git a/res/field/props/models/prop_model_129.nsbmd b/res/field/props/models/prop_model_129.nsbmd new file mode 100644 index 0000000000..b59ee2996a Binary files /dev/null and b/res/field/props/models/prop_model_129.nsbmd differ diff --git a/res/field/props/models/prop_model_132.nsbmd b/res/field/props/models/prop_model_132.nsbmd new file mode 100644 index 0000000000..a68ce5dcee Binary files /dev/null and b/res/field/props/models/prop_model_132.nsbmd differ diff --git a/res/field/props/models/prop_model_133.nsbmd b/res/field/props/models/prop_model_133.nsbmd new file mode 100644 index 0000000000..77d2a8f862 Binary files /dev/null and b/res/field/props/models/prop_model_133.nsbmd differ diff --git a/res/field/props/models/prop_model_134.nsbmd b/res/field/props/models/prop_model_134.nsbmd new file mode 100644 index 0000000000..eb61d6504f Binary files /dev/null and b/res/field/props/models/prop_model_134.nsbmd differ diff --git a/res/field/props/models/prop_model_135.nsbmd b/res/field/props/models/prop_model_135.nsbmd new file mode 100644 index 0000000000..2f6682ed8d Binary files /dev/null and b/res/field/props/models/prop_model_135.nsbmd differ diff --git a/res/field/props/models/prop_model_136.nsbmd b/res/field/props/models/prop_model_136.nsbmd new file mode 100644 index 0000000000..a42d0bec19 Binary files /dev/null and b/res/field/props/models/prop_model_136.nsbmd differ diff --git a/res/field/props/models/prop_model_137.nsbmd b/res/field/props/models/prop_model_137.nsbmd new file mode 100644 index 0000000000..a800166c58 Binary files /dev/null and b/res/field/props/models/prop_model_137.nsbmd differ diff --git a/res/field/props/models/prop_model_138.nsbmd b/res/field/props/models/prop_model_138.nsbmd new file mode 100644 index 0000000000..8cfac19dbb Binary files /dev/null and b/res/field/props/models/prop_model_138.nsbmd differ diff --git a/res/field/props/models/prop_model_139.nsbmd b/res/field/props/models/prop_model_139.nsbmd new file mode 100644 index 0000000000..39e8e3e881 Binary files /dev/null and b/res/field/props/models/prop_model_139.nsbmd differ diff --git a/res/field/props/models/prop_model_140.nsbmd b/res/field/props/models/prop_model_140.nsbmd new file mode 100644 index 0000000000..3f70267454 Binary files /dev/null and b/res/field/props/models/prop_model_140.nsbmd differ diff --git a/res/field/props/models/prop_model_141.nsbmd b/res/field/props/models/prop_model_141.nsbmd new file mode 100644 index 0000000000..424a7abc34 Binary files /dev/null and b/res/field/props/models/prop_model_141.nsbmd differ diff --git a/res/field/props/models/prop_model_142.nsbmd b/res/field/props/models/prop_model_142.nsbmd new file mode 100644 index 0000000000..65860965d4 Binary files /dev/null and b/res/field/props/models/prop_model_142.nsbmd differ diff --git a/res/field/props/models/prop_model_143.nsbmd b/res/field/props/models/prop_model_143.nsbmd new file mode 100644 index 0000000000..822de90f28 Binary files /dev/null and b/res/field/props/models/prop_model_143.nsbmd differ diff --git a/res/field/props/models/prop_model_144.nsbmd b/res/field/props/models/prop_model_144.nsbmd new file mode 100644 index 0000000000..a86944f3f8 Binary files /dev/null and b/res/field/props/models/prop_model_144.nsbmd differ diff --git a/res/field/props/models/prop_model_145.nsbmd b/res/field/props/models/prop_model_145.nsbmd new file mode 100644 index 0000000000..e7a1d25742 Binary files /dev/null and b/res/field/props/models/prop_model_145.nsbmd differ diff --git a/res/field/props/models/prop_model_146.nsbmd b/res/field/props/models/prop_model_146.nsbmd new file mode 100644 index 0000000000..a025491c71 Binary files /dev/null and b/res/field/props/models/prop_model_146.nsbmd differ diff --git a/res/field/props/models/prop_model_147.nsbmd b/res/field/props/models/prop_model_147.nsbmd new file mode 100644 index 0000000000..9a63d392b3 Binary files /dev/null and b/res/field/props/models/prop_model_147.nsbmd differ diff --git a/res/field/props/models/prop_model_148.nsbmd b/res/field/props/models/prop_model_148.nsbmd new file mode 100644 index 0000000000..f74c2d22c1 Binary files /dev/null and b/res/field/props/models/prop_model_148.nsbmd differ diff --git a/res/field/props/models/prop_model_149.nsbmd b/res/field/props/models/prop_model_149.nsbmd new file mode 100644 index 0000000000..faedf986b3 Binary files /dev/null and b/res/field/props/models/prop_model_149.nsbmd differ diff --git a/res/field/props/models/prop_model_150.nsbmd b/res/field/props/models/prop_model_150.nsbmd new file mode 100644 index 0000000000..4f4dc6ce7d Binary files /dev/null and b/res/field/props/models/prop_model_150.nsbmd differ diff --git a/res/field/props/models/prop_model_151.nsbmd b/res/field/props/models/prop_model_151.nsbmd new file mode 100644 index 0000000000..d9a97f52fd Binary files /dev/null and b/res/field/props/models/prop_model_151.nsbmd differ diff --git a/res/field/props/models/prop_model_152.nsbmd b/res/field/props/models/prop_model_152.nsbmd new file mode 100644 index 0000000000..4be64e68a4 Binary files /dev/null and b/res/field/props/models/prop_model_152.nsbmd differ diff --git a/res/field/props/models/prop_model_153.nsbmd b/res/field/props/models/prop_model_153.nsbmd new file mode 100644 index 0000000000..e50ab36d90 Binary files /dev/null and b/res/field/props/models/prop_model_153.nsbmd differ diff --git a/res/field/props/models/prop_model_154.nsbmd b/res/field/props/models/prop_model_154.nsbmd new file mode 100644 index 0000000000..93c66aa22f Binary files /dev/null and b/res/field/props/models/prop_model_154.nsbmd differ diff --git a/res/field/props/models/prop_model_155.nsbmd b/res/field/props/models/prop_model_155.nsbmd new file mode 100644 index 0000000000..e0794e3c7f Binary files /dev/null and b/res/field/props/models/prop_model_155.nsbmd differ diff --git a/res/field/props/models/prop_model_156.nsbmd b/res/field/props/models/prop_model_156.nsbmd new file mode 100644 index 0000000000..09f2f1ccad Binary files /dev/null and b/res/field/props/models/prop_model_156.nsbmd differ diff --git a/res/field/props/models/prop_model_157.nsbmd b/res/field/props/models/prop_model_157.nsbmd new file mode 100644 index 0000000000..9337d17da7 Binary files /dev/null and b/res/field/props/models/prop_model_157.nsbmd differ diff --git a/res/field/props/models/prop_model_158.nsbmd b/res/field/props/models/prop_model_158.nsbmd new file mode 100644 index 0000000000..b09dfed316 Binary files /dev/null and b/res/field/props/models/prop_model_158.nsbmd differ diff --git a/res/field/props/models/prop_model_159.nsbmd b/res/field/props/models/prop_model_159.nsbmd new file mode 100644 index 0000000000..511c940e2b Binary files /dev/null and b/res/field/props/models/prop_model_159.nsbmd differ diff --git a/res/field/props/models/prop_model_160.nsbmd b/res/field/props/models/prop_model_160.nsbmd new file mode 100644 index 0000000000..87e51c04c3 Binary files /dev/null and b/res/field/props/models/prop_model_160.nsbmd differ diff --git a/res/field/props/models/prop_model_161.nsbmd b/res/field/props/models/prop_model_161.nsbmd new file mode 100644 index 0000000000..35c7143a86 Binary files /dev/null and b/res/field/props/models/prop_model_161.nsbmd differ diff --git a/res/field/props/models/prop_model_162.nsbmd b/res/field/props/models/prop_model_162.nsbmd new file mode 100644 index 0000000000..a97f18afef Binary files /dev/null and b/res/field/props/models/prop_model_162.nsbmd differ diff --git a/res/field/props/models/prop_model_163.nsbmd b/res/field/props/models/prop_model_163.nsbmd new file mode 100644 index 0000000000..71b40bac43 Binary files /dev/null and b/res/field/props/models/prop_model_163.nsbmd differ diff --git a/res/field/props/models/prop_model_164.nsbmd b/res/field/props/models/prop_model_164.nsbmd new file mode 100644 index 0000000000..271f18fe0b Binary files /dev/null and b/res/field/props/models/prop_model_164.nsbmd differ diff --git a/res/field/props/models/prop_model_165.nsbmd b/res/field/props/models/prop_model_165.nsbmd new file mode 100644 index 0000000000..a6a99248ab Binary files /dev/null and b/res/field/props/models/prop_model_165.nsbmd differ diff --git a/res/field/props/models/prop_model_166.nsbmd b/res/field/props/models/prop_model_166.nsbmd new file mode 100644 index 0000000000..401658982b Binary files /dev/null and b/res/field/props/models/prop_model_166.nsbmd differ diff --git a/res/field/props/models/prop_model_167.nsbmd b/res/field/props/models/prop_model_167.nsbmd new file mode 100644 index 0000000000..63c5ab725b Binary files /dev/null and b/res/field/props/models/prop_model_167.nsbmd differ diff --git a/res/field/props/models/prop_model_168.nsbmd b/res/field/props/models/prop_model_168.nsbmd new file mode 100644 index 0000000000..1885f68a3a Binary files /dev/null and b/res/field/props/models/prop_model_168.nsbmd differ diff --git a/res/field/props/models/prop_model_169.nsbmd b/res/field/props/models/prop_model_169.nsbmd new file mode 100644 index 0000000000..920c743c28 Binary files /dev/null and b/res/field/props/models/prop_model_169.nsbmd differ diff --git a/res/field/props/models/prop_model_170.nsbmd b/res/field/props/models/prop_model_170.nsbmd new file mode 100644 index 0000000000..5124042531 Binary files /dev/null and b/res/field/props/models/prop_model_170.nsbmd differ diff --git a/res/field/props/models/prop_model_171.nsbmd b/res/field/props/models/prop_model_171.nsbmd new file mode 100644 index 0000000000..6faca81f0a Binary files /dev/null and b/res/field/props/models/prop_model_171.nsbmd differ diff --git a/res/field/props/models/prop_model_172.nsbmd b/res/field/props/models/prop_model_172.nsbmd new file mode 100644 index 0000000000..3f5f82c1c4 Binary files /dev/null and b/res/field/props/models/prop_model_172.nsbmd differ diff --git a/res/field/props/models/prop_model_173.nsbmd b/res/field/props/models/prop_model_173.nsbmd new file mode 100644 index 0000000000..b3c91dfacf Binary files /dev/null and b/res/field/props/models/prop_model_173.nsbmd differ diff --git a/res/field/props/models/prop_model_174.nsbmd b/res/field/props/models/prop_model_174.nsbmd new file mode 100644 index 0000000000..d70d6803dc Binary files /dev/null and b/res/field/props/models/prop_model_174.nsbmd differ diff --git a/res/field/props/models/prop_model_175.nsbmd b/res/field/props/models/prop_model_175.nsbmd new file mode 100644 index 0000000000..4404f2e771 Binary files /dev/null and b/res/field/props/models/prop_model_175.nsbmd differ diff --git a/res/field/props/models/prop_model_176.nsbmd b/res/field/props/models/prop_model_176.nsbmd new file mode 100644 index 0000000000..8ff6aabcb3 Binary files /dev/null and b/res/field/props/models/prop_model_176.nsbmd differ diff --git a/res/field/props/models/prop_model_177.nsbmd b/res/field/props/models/prop_model_177.nsbmd new file mode 100644 index 0000000000..994474e78f Binary files /dev/null and b/res/field/props/models/prop_model_177.nsbmd differ diff --git a/res/field/props/models/prop_model_178.nsbmd b/res/field/props/models/prop_model_178.nsbmd new file mode 100644 index 0000000000..9aa8e427ce Binary files /dev/null and b/res/field/props/models/prop_model_178.nsbmd differ diff --git a/res/field/props/models/prop_model_179.nsbmd b/res/field/props/models/prop_model_179.nsbmd new file mode 100644 index 0000000000..b874896c67 Binary files /dev/null and b/res/field/props/models/prop_model_179.nsbmd differ diff --git a/res/field/props/models/prop_model_180.nsbmd b/res/field/props/models/prop_model_180.nsbmd new file mode 100644 index 0000000000..eba7ef876a Binary files /dev/null and b/res/field/props/models/prop_model_180.nsbmd differ diff --git a/res/field/props/models/prop_model_181.nsbmd b/res/field/props/models/prop_model_181.nsbmd new file mode 100644 index 0000000000..c6f0f78aca Binary files /dev/null and b/res/field/props/models/prop_model_181.nsbmd differ diff --git a/res/field/props/models/prop_model_182.nsbmd b/res/field/props/models/prop_model_182.nsbmd new file mode 100644 index 0000000000..4dba06f782 Binary files /dev/null and b/res/field/props/models/prop_model_182.nsbmd differ diff --git a/res/field/props/models/prop_model_183.nsbmd b/res/field/props/models/prop_model_183.nsbmd new file mode 100644 index 0000000000..682cb1633a Binary files /dev/null and b/res/field/props/models/prop_model_183.nsbmd differ diff --git a/res/field/props/models/prop_model_184.nsbmd b/res/field/props/models/prop_model_184.nsbmd new file mode 100644 index 0000000000..5fa4e6ed25 Binary files /dev/null and b/res/field/props/models/prop_model_184.nsbmd differ diff --git a/res/field/props/models/prop_model_185.nsbmd b/res/field/props/models/prop_model_185.nsbmd new file mode 100644 index 0000000000..fa508b82e8 Binary files /dev/null and b/res/field/props/models/prop_model_185.nsbmd differ diff --git a/res/field/props/models/prop_model_186.nsbmd b/res/field/props/models/prop_model_186.nsbmd new file mode 100644 index 0000000000..9044f7c501 Binary files /dev/null and b/res/field/props/models/prop_model_186.nsbmd differ diff --git a/res/field/props/models/prop_model_187.nsbmd b/res/field/props/models/prop_model_187.nsbmd new file mode 100644 index 0000000000..4665affb55 Binary files /dev/null and b/res/field/props/models/prop_model_187.nsbmd differ diff --git a/res/field/props/models/prop_model_188.nsbmd b/res/field/props/models/prop_model_188.nsbmd new file mode 100644 index 0000000000..fe00dfe67c Binary files /dev/null and b/res/field/props/models/prop_model_188.nsbmd differ diff --git a/res/field/props/models/prop_model_189.nsbmd b/res/field/props/models/prop_model_189.nsbmd new file mode 100644 index 0000000000..e4718046b0 Binary files /dev/null and b/res/field/props/models/prop_model_189.nsbmd differ diff --git a/res/field/props/models/prop_model_190.nsbmd b/res/field/props/models/prop_model_190.nsbmd new file mode 100644 index 0000000000..7615c14d21 Binary files /dev/null and b/res/field/props/models/prop_model_190.nsbmd differ diff --git a/res/field/props/models/prop_model_191.nsbmd b/res/field/props/models/prop_model_191.nsbmd new file mode 100644 index 0000000000..d221e97c2a Binary files /dev/null and b/res/field/props/models/prop_model_191.nsbmd differ diff --git a/res/field/props/models/prop_model_192.nsbmd b/res/field/props/models/prop_model_192.nsbmd new file mode 100644 index 0000000000..8523f76622 Binary files /dev/null and b/res/field/props/models/prop_model_192.nsbmd differ diff --git a/res/field/props/models/prop_model_193.nsbmd b/res/field/props/models/prop_model_193.nsbmd new file mode 100644 index 0000000000..2565f46530 Binary files /dev/null and b/res/field/props/models/prop_model_193.nsbmd differ diff --git a/res/field/props/models/prop_model_194.nsbmd b/res/field/props/models/prop_model_194.nsbmd new file mode 100644 index 0000000000..549f977caf Binary files /dev/null and b/res/field/props/models/prop_model_194.nsbmd differ diff --git a/res/field/props/models/prop_model_195.nsbmd b/res/field/props/models/prop_model_195.nsbmd new file mode 100644 index 0000000000..b7b216511f Binary files /dev/null and b/res/field/props/models/prop_model_195.nsbmd differ diff --git a/res/field/props/models/prop_model_196.nsbmd b/res/field/props/models/prop_model_196.nsbmd new file mode 100644 index 0000000000..054ce91424 Binary files /dev/null and b/res/field/props/models/prop_model_196.nsbmd differ diff --git a/res/field/props/models/prop_model_197.nsbmd b/res/field/props/models/prop_model_197.nsbmd new file mode 100644 index 0000000000..8f80683d7a Binary files /dev/null and b/res/field/props/models/prop_model_197.nsbmd differ diff --git a/res/field/props/models/prop_model_198.nsbmd b/res/field/props/models/prop_model_198.nsbmd new file mode 100644 index 0000000000..4aea0206d2 Binary files /dev/null and b/res/field/props/models/prop_model_198.nsbmd differ diff --git a/res/field/props/models/prop_model_199.nsbmd b/res/field/props/models/prop_model_199.nsbmd new file mode 100644 index 0000000000..ce8df41827 Binary files /dev/null and b/res/field/props/models/prop_model_199.nsbmd differ diff --git a/res/field/props/models/prop_model_200.nsbmd b/res/field/props/models/prop_model_200.nsbmd new file mode 100644 index 0000000000..3248e9f4f7 Binary files /dev/null and b/res/field/props/models/prop_model_200.nsbmd differ diff --git a/res/field/props/models/prop_model_201.nsbmd b/res/field/props/models/prop_model_201.nsbmd new file mode 100644 index 0000000000..98cbd02179 Binary files /dev/null and b/res/field/props/models/prop_model_201.nsbmd differ diff --git a/res/field/props/models/prop_model_202.nsbmd b/res/field/props/models/prop_model_202.nsbmd new file mode 100644 index 0000000000..d5414c5b5a Binary files /dev/null and b/res/field/props/models/prop_model_202.nsbmd differ diff --git a/res/field/props/models/prop_model_203.nsbmd b/res/field/props/models/prop_model_203.nsbmd new file mode 100644 index 0000000000..d7037ebae5 Binary files /dev/null and b/res/field/props/models/prop_model_203.nsbmd differ diff --git a/res/field/props/models/prop_model_204.nsbmd b/res/field/props/models/prop_model_204.nsbmd new file mode 100644 index 0000000000..4f4fbf4d02 Binary files /dev/null and b/res/field/props/models/prop_model_204.nsbmd differ diff --git a/res/field/props/models/prop_model_205.nsbmd b/res/field/props/models/prop_model_205.nsbmd new file mode 100644 index 0000000000..7a53d72d45 Binary files /dev/null and b/res/field/props/models/prop_model_205.nsbmd differ diff --git a/res/field/props/models/prop_model_206.nsbmd b/res/field/props/models/prop_model_206.nsbmd new file mode 100644 index 0000000000..37be4ac93d Binary files /dev/null and b/res/field/props/models/prop_model_206.nsbmd differ diff --git a/res/field/props/models/prop_model_207.nsbmd b/res/field/props/models/prop_model_207.nsbmd new file mode 100644 index 0000000000..1a111e9777 Binary files /dev/null and b/res/field/props/models/prop_model_207.nsbmd differ diff --git a/res/field/props/models/prop_model_208.nsbmd b/res/field/props/models/prop_model_208.nsbmd new file mode 100644 index 0000000000..d8c34c8ca6 Binary files /dev/null and b/res/field/props/models/prop_model_208.nsbmd differ diff --git a/res/field/props/models/prop_model_209.nsbmd b/res/field/props/models/prop_model_209.nsbmd new file mode 100644 index 0000000000..c613daf981 Binary files /dev/null and b/res/field/props/models/prop_model_209.nsbmd differ diff --git a/res/field/props/models/prop_model_210.nsbmd b/res/field/props/models/prop_model_210.nsbmd new file mode 100644 index 0000000000..75a537b8e3 Binary files /dev/null and b/res/field/props/models/prop_model_210.nsbmd differ diff --git a/res/field/props/models/prop_model_211.nsbmd b/res/field/props/models/prop_model_211.nsbmd new file mode 100644 index 0000000000..4629e38021 Binary files /dev/null and b/res/field/props/models/prop_model_211.nsbmd differ diff --git a/res/field/props/models/prop_model_212.nsbmd b/res/field/props/models/prop_model_212.nsbmd new file mode 100644 index 0000000000..da2beb0e75 Binary files /dev/null and b/res/field/props/models/prop_model_212.nsbmd differ diff --git a/res/field/props/models/prop_model_213.nsbmd b/res/field/props/models/prop_model_213.nsbmd new file mode 100644 index 0000000000..faef79bd32 Binary files /dev/null and b/res/field/props/models/prop_model_213.nsbmd differ diff --git a/res/field/props/models/prop_model_214.nsbmd b/res/field/props/models/prop_model_214.nsbmd new file mode 100644 index 0000000000..3c9907c7a7 Binary files /dev/null and b/res/field/props/models/prop_model_214.nsbmd differ diff --git a/res/field/props/models/prop_model_215.nsbmd b/res/field/props/models/prop_model_215.nsbmd new file mode 100644 index 0000000000..003012d099 Binary files /dev/null and b/res/field/props/models/prop_model_215.nsbmd differ diff --git a/res/field/props/models/prop_model_216.nsbmd b/res/field/props/models/prop_model_216.nsbmd new file mode 100644 index 0000000000..6f60816f69 Binary files /dev/null and b/res/field/props/models/prop_model_216.nsbmd differ diff --git a/res/field/props/models/prop_model_217.nsbmd b/res/field/props/models/prop_model_217.nsbmd new file mode 100644 index 0000000000..1fdf95cc21 Binary files /dev/null and b/res/field/props/models/prop_model_217.nsbmd differ diff --git a/res/field/props/models/prop_model_218.nsbmd b/res/field/props/models/prop_model_218.nsbmd new file mode 100644 index 0000000000..6e01290c7f Binary files /dev/null and b/res/field/props/models/prop_model_218.nsbmd differ diff --git a/res/field/props/models/prop_model_219.nsbmd b/res/field/props/models/prop_model_219.nsbmd new file mode 100644 index 0000000000..f1bac15c61 Binary files /dev/null and b/res/field/props/models/prop_model_219.nsbmd differ diff --git a/res/field/props/models/prop_model_220.nsbmd b/res/field/props/models/prop_model_220.nsbmd new file mode 100644 index 0000000000..0a32680886 Binary files /dev/null and b/res/field/props/models/prop_model_220.nsbmd differ diff --git a/res/field/props/models/prop_model_221.nsbmd b/res/field/props/models/prop_model_221.nsbmd new file mode 100644 index 0000000000..7f1208b7ec Binary files /dev/null and b/res/field/props/models/prop_model_221.nsbmd differ diff --git a/res/field/props/models/prop_model_222.nsbmd b/res/field/props/models/prop_model_222.nsbmd new file mode 100644 index 0000000000..5a21564eab Binary files /dev/null and b/res/field/props/models/prop_model_222.nsbmd differ diff --git a/res/field/props/models/prop_model_223.nsbmd b/res/field/props/models/prop_model_223.nsbmd new file mode 100644 index 0000000000..ad095394fb Binary files /dev/null and b/res/field/props/models/prop_model_223.nsbmd differ diff --git a/res/field/props/models/prop_model_224.nsbmd b/res/field/props/models/prop_model_224.nsbmd new file mode 100644 index 0000000000..bca2d09344 Binary files /dev/null and b/res/field/props/models/prop_model_224.nsbmd differ diff --git a/res/field/props/models/prop_model_225.nsbmd b/res/field/props/models/prop_model_225.nsbmd new file mode 100644 index 0000000000..3b696c60fa Binary files /dev/null and b/res/field/props/models/prop_model_225.nsbmd differ diff --git a/res/field/props/models/prop_model_226.nsbmd b/res/field/props/models/prop_model_226.nsbmd new file mode 100644 index 0000000000..99fbe8f276 Binary files /dev/null and b/res/field/props/models/prop_model_226.nsbmd differ diff --git a/res/field/props/models/prop_model_227.nsbmd b/res/field/props/models/prop_model_227.nsbmd new file mode 100644 index 0000000000..d6ce84b24c Binary files /dev/null and b/res/field/props/models/prop_model_227.nsbmd differ diff --git a/res/field/props/models/prop_model_228.nsbmd b/res/field/props/models/prop_model_228.nsbmd new file mode 100644 index 0000000000..e299c6a964 Binary files /dev/null and b/res/field/props/models/prop_model_228.nsbmd differ diff --git a/res/field/props/models/prop_model_229.nsbmd b/res/field/props/models/prop_model_229.nsbmd new file mode 100644 index 0000000000..9c2735ddc1 Binary files /dev/null and b/res/field/props/models/prop_model_229.nsbmd differ diff --git a/res/field/props/models/prop_model_230.nsbmd b/res/field/props/models/prop_model_230.nsbmd new file mode 100644 index 0000000000..008d4c13ee Binary files /dev/null and b/res/field/props/models/prop_model_230.nsbmd differ diff --git a/res/field/props/models/prop_model_231.nsbmd b/res/field/props/models/prop_model_231.nsbmd new file mode 100644 index 0000000000..fe2d2f3a72 Binary files /dev/null and b/res/field/props/models/prop_model_231.nsbmd differ diff --git a/res/field/props/models/prop_model_232.nsbmd b/res/field/props/models/prop_model_232.nsbmd new file mode 100644 index 0000000000..7c08c1b061 Binary files /dev/null and b/res/field/props/models/prop_model_232.nsbmd differ diff --git a/res/field/props/models/prop_model_233.nsbmd b/res/field/props/models/prop_model_233.nsbmd new file mode 100644 index 0000000000..5825f98d61 Binary files /dev/null and b/res/field/props/models/prop_model_233.nsbmd differ diff --git a/res/field/props/models/prop_model_234.nsbmd b/res/field/props/models/prop_model_234.nsbmd new file mode 100644 index 0000000000..0b78d6c8d0 Binary files /dev/null and b/res/field/props/models/prop_model_234.nsbmd differ diff --git a/res/field/props/models/prop_model_235.nsbmd b/res/field/props/models/prop_model_235.nsbmd new file mode 100644 index 0000000000..7eb8df225a Binary files /dev/null and b/res/field/props/models/prop_model_235.nsbmd differ diff --git a/res/field/props/models/prop_model_236.nsbmd b/res/field/props/models/prop_model_236.nsbmd new file mode 100644 index 0000000000..c571e7437f Binary files /dev/null and b/res/field/props/models/prop_model_236.nsbmd differ diff --git a/res/field/props/models/prop_model_237.nsbmd b/res/field/props/models/prop_model_237.nsbmd new file mode 100644 index 0000000000..cfecb99b46 Binary files /dev/null and b/res/field/props/models/prop_model_237.nsbmd differ diff --git a/res/field/props/models/prop_model_238.nsbmd b/res/field/props/models/prop_model_238.nsbmd new file mode 100644 index 0000000000..69025bfbc3 Binary files /dev/null and b/res/field/props/models/prop_model_238.nsbmd differ diff --git a/res/field/props/models/prop_model_243.nsbmd b/res/field/props/models/prop_model_243.nsbmd new file mode 100644 index 0000000000..a25d1000bc Binary files /dev/null and b/res/field/props/models/prop_model_243.nsbmd differ diff --git a/res/field/props/models/prop_model_244.nsbmd b/res/field/props/models/prop_model_244.nsbmd new file mode 100644 index 0000000000..28e92f2c1f Binary files /dev/null and b/res/field/props/models/prop_model_244.nsbmd differ diff --git a/res/field/props/models/prop_model_245.nsbmd b/res/field/props/models/prop_model_245.nsbmd new file mode 100644 index 0000000000..d7ea224b18 Binary files /dev/null and b/res/field/props/models/prop_model_245.nsbmd differ diff --git a/res/field/props/models/prop_model_247.nsbmd b/res/field/props/models/prop_model_247.nsbmd new file mode 100644 index 0000000000..8cb3c15175 Binary files /dev/null and b/res/field/props/models/prop_model_247.nsbmd differ diff --git a/res/field/props/models/prop_model_249.nsbmd b/res/field/props/models/prop_model_249.nsbmd new file mode 100644 index 0000000000..3785a59307 Binary files /dev/null and b/res/field/props/models/prop_model_249.nsbmd differ diff --git a/res/field/props/models/prop_model_250.nsbmd b/res/field/props/models/prop_model_250.nsbmd new file mode 100644 index 0000000000..d8b0dbb7b2 Binary files /dev/null and b/res/field/props/models/prop_model_250.nsbmd differ diff --git a/res/field/props/models/prop_model_251.nsbmd b/res/field/props/models/prop_model_251.nsbmd new file mode 100644 index 0000000000..f7e12d4847 Binary files /dev/null and b/res/field/props/models/prop_model_251.nsbmd differ diff --git a/res/field/props/models/prop_model_252.nsbmd b/res/field/props/models/prop_model_252.nsbmd new file mode 100644 index 0000000000..6e6efafff6 Binary files /dev/null and b/res/field/props/models/prop_model_252.nsbmd differ diff --git a/res/field/props/models/prop_model_253.nsbmd b/res/field/props/models/prop_model_253.nsbmd new file mode 100644 index 0000000000..4cdce8e24d Binary files /dev/null and b/res/field/props/models/prop_model_253.nsbmd differ diff --git a/res/field/props/models/prop_model_254.nsbmd b/res/field/props/models/prop_model_254.nsbmd new file mode 100644 index 0000000000..70df05334c Binary files /dev/null and b/res/field/props/models/prop_model_254.nsbmd differ diff --git a/res/field/props/models/prop_model_255.nsbmd b/res/field/props/models/prop_model_255.nsbmd new file mode 100644 index 0000000000..1a891c50d2 Binary files /dev/null and b/res/field/props/models/prop_model_255.nsbmd differ diff --git a/res/field/props/models/prop_model_256.nsbmd b/res/field/props/models/prop_model_256.nsbmd new file mode 100644 index 0000000000..44142570d9 Binary files /dev/null and b/res/field/props/models/prop_model_256.nsbmd differ diff --git a/res/field/props/models/prop_model_257.nsbmd b/res/field/props/models/prop_model_257.nsbmd new file mode 100644 index 0000000000..821905b8ff Binary files /dev/null and b/res/field/props/models/prop_model_257.nsbmd differ diff --git a/res/field/props/models/prop_model_259.nsbmd b/res/field/props/models/prop_model_259.nsbmd new file mode 100644 index 0000000000..1346d9da26 Binary files /dev/null and b/res/field/props/models/prop_model_259.nsbmd differ diff --git a/res/field/props/models/prop_model_261.nsbmd b/res/field/props/models/prop_model_261.nsbmd new file mode 100644 index 0000000000..e3f7f04cd9 Binary files /dev/null and b/res/field/props/models/prop_model_261.nsbmd differ diff --git a/res/field/props/models/prop_model_262.nsbmd b/res/field/props/models/prop_model_262.nsbmd new file mode 100644 index 0000000000..7eed306455 Binary files /dev/null and b/res/field/props/models/prop_model_262.nsbmd differ diff --git a/res/field/props/models/prop_model_263.nsbmd b/res/field/props/models/prop_model_263.nsbmd new file mode 100644 index 0000000000..e575e13466 Binary files /dev/null and b/res/field/props/models/prop_model_263.nsbmd differ diff --git a/res/field/props/models/prop_model_264.nsbmd b/res/field/props/models/prop_model_264.nsbmd new file mode 100644 index 0000000000..762cd9a1d4 Binary files /dev/null and b/res/field/props/models/prop_model_264.nsbmd differ diff --git a/res/field/props/models/prop_model_265.nsbmd b/res/field/props/models/prop_model_265.nsbmd new file mode 100644 index 0000000000..64adeac0e9 Binary files /dev/null and b/res/field/props/models/prop_model_265.nsbmd differ diff --git a/res/field/props/models/prop_model_266.nsbmd b/res/field/props/models/prop_model_266.nsbmd new file mode 100644 index 0000000000..e30db01e36 Binary files /dev/null and b/res/field/props/models/prop_model_266.nsbmd differ diff --git a/res/field/props/models/prop_model_267.nsbmd b/res/field/props/models/prop_model_267.nsbmd new file mode 100644 index 0000000000..b95fb48574 Binary files /dev/null and b/res/field/props/models/prop_model_267.nsbmd differ diff --git a/res/field/props/models/prop_model_268.nsbmd b/res/field/props/models/prop_model_268.nsbmd new file mode 100644 index 0000000000..3fc86fd814 Binary files /dev/null and b/res/field/props/models/prop_model_268.nsbmd differ diff --git a/res/field/props/models/prop_model_269.nsbmd b/res/field/props/models/prop_model_269.nsbmd new file mode 100644 index 0000000000..95b81ca3b4 Binary files /dev/null and b/res/field/props/models/prop_model_269.nsbmd differ diff --git a/res/field/props/models/prop_model_270.nsbmd b/res/field/props/models/prop_model_270.nsbmd new file mode 100644 index 0000000000..80c48d202e Binary files /dev/null and b/res/field/props/models/prop_model_270.nsbmd differ diff --git a/res/field/props/models/prop_model_271.nsbmd b/res/field/props/models/prop_model_271.nsbmd new file mode 100644 index 0000000000..443ec2d1b4 Binary files /dev/null and b/res/field/props/models/prop_model_271.nsbmd differ diff --git a/res/field/props/models/prop_model_272.nsbmd b/res/field/props/models/prop_model_272.nsbmd new file mode 100644 index 0000000000..e464cfc952 Binary files /dev/null and b/res/field/props/models/prop_model_272.nsbmd differ diff --git a/res/field/props/models/prop_model_273.nsbmd b/res/field/props/models/prop_model_273.nsbmd new file mode 100644 index 0000000000..5a6fec36f4 Binary files /dev/null and b/res/field/props/models/prop_model_273.nsbmd differ diff --git a/res/field/props/models/prop_model_274.nsbmd b/res/field/props/models/prop_model_274.nsbmd new file mode 100644 index 0000000000..54e048f9b3 Binary files /dev/null and b/res/field/props/models/prop_model_274.nsbmd differ diff --git a/res/field/props/models/prop_model_275.nsbmd b/res/field/props/models/prop_model_275.nsbmd new file mode 100644 index 0000000000..479d7133e8 Binary files /dev/null and b/res/field/props/models/prop_model_275.nsbmd differ diff --git a/res/field/props/models/prop_model_276.nsbmd b/res/field/props/models/prop_model_276.nsbmd new file mode 100644 index 0000000000..7e50bee956 Binary files /dev/null and b/res/field/props/models/prop_model_276.nsbmd differ diff --git a/res/field/props/models/prop_model_277.nsbmd b/res/field/props/models/prop_model_277.nsbmd new file mode 100644 index 0000000000..88d4c5fd6d Binary files /dev/null and b/res/field/props/models/prop_model_277.nsbmd differ diff --git a/res/field/props/models/prop_model_278.nsbmd b/res/field/props/models/prop_model_278.nsbmd new file mode 100644 index 0000000000..d35676439d Binary files /dev/null and b/res/field/props/models/prop_model_278.nsbmd differ diff --git a/res/field/props/models/prop_model_279.nsbmd b/res/field/props/models/prop_model_279.nsbmd new file mode 100644 index 0000000000..3e9d83b1bc Binary files /dev/null and b/res/field/props/models/prop_model_279.nsbmd differ diff --git a/res/field/props/models/prop_model_280.nsbmd b/res/field/props/models/prop_model_280.nsbmd new file mode 100644 index 0000000000..04b9532cc3 Binary files /dev/null and b/res/field/props/models/prop_model_280.nsbmd differ diff --git a/res/field/props/models/prop_model_281.nsbmd b/res/field/props/models/prop_model_281.nsbmd new file mode 100644 index 0000000000..9e06e2b6e8 Binary files /dev/null and b/res/field/props/models/prop_model_281.nsbmd differ diff --git a/res/field/props/models/prop_model_282.nsbmd b/res/field/props/models/prop_model_282.nsbmd new file mode 100644 index 0000000000..d4cc1a2756 Binary files /dev/null and b/res/field/props/models/prop_model_282.nsbmd differ diff --git a/res/field/props/models/prop_model_283.nsbmd b/res/field/props/models/prop_model_283.nsbmd new file mode 100644 index 0000000000..314977b0da Binary files /dev/null and b/res/field/props/models/prop_model_283.nsbmd differ diff --git a/res/field/props/models/prop_model_284.nsbmd b/res/field/props/models/prop_model_284.nsbmd new file mode 100644 index 0000000000..3f6818ed97 Binary files /dev/null and b/res/field/props/models/prop_model_284.nsbmd differ diff --git a/res/field/props/models/prop_model_285.nsbmd b/res/field/props/models/prop_model_285.nsbmd new file mode 100644 index 0000000000..cab25a2dc6 Binary files /dev/null and b/res/field/props/models/prop_model_285.nsbmd differ diff --git a/res/field/props/models/prop_model_286.nsbmd b/res/field/props/models/prop_model_286.nsbmd new file mode 100644 index 0000000000..1d131a6d59 Binary files /dev/null and b/res/field/props/models/prop_model_286.nsbmd differ diff --git a/res/field/props/models/prop_model_287.nsbmd b/res/field/props/models/prop_model_287.nsbmd new file mode 100644 index 0000000000..5b991ed42b Binary files /dev/null and b/res/field/props/models/prop_model_287.nsbmd differ diff --git a/res/field/props/models/prop_model_288.nsbmd b/res/field/props/models/prop_model_288.nsbmd new file mode 100644 index 0000000000..325d94a416 Binary files /dev/null and b/res/field/props/models/prop_model_288.nsbmd differ diff --git a/res/field/props/models/prop_model_289.nsbmd b/res/field/props/models/prop_model_289.nsbmd new file mode 100644 index 0000000000..ee40e2ca13 Binary files /dev/null and b/res/field/props/models/prop_model_289.nsbmd differ diff --git a/res/field/props/models/prop_model_290.nsbmd b/res/field/props/models/prop_model_290.nsbmd new file mode 100644 index 0000000000..c79b95ed93 Binary files /dev/null and b/res/field/props/models/prop_model_290.nsbmd differ diff --git a/res/field/props/models/prop_model_291.nsbmd b/res/field/props/models/prop_model_291.nsbmd new file mode 100644 index 0000000000..973040d3eb Binary files /dev/null and b/res/field/props/models/prop_model_291.nsbmd differ diff --git a/res/field/props/models/prop_model_292.nsbmd b/res/field/props/models/prop_model_292.nsbmd new file mode 100644 index 0000000000..303b2925d2 Binary files /dev/null and b/res/field/props/models/prop_model_292.nsbmd differ diff --git a/res/field/props/models/prop_model_293.nsbmd b/res/field/props/models/prop_model_293.nsbmd new file mode 100644 index 0000000000..f2184c6f82 Binary files /dev/null and b/res/field/props/models/prop_model_293.nsbmd differ diff --git a/res/field/props/models/prop_model_294.nsbmd b/res/field/props/models/prop_model_294.nsbmd new file mode 100644 index 0000000000..d5f77a5195 Binary files /dev/null and b/res/field/props/models/prop_model_294.nsbmd differ diff --git a/res/field/props/models/prop_model_295.nsbmd b/res/field/props/models/prop_model_295.nsbmd new file mode 100644 index 0000000000..4c4ded461b Binary files /dev/null and b/res/field/props/models/prop_model_295.nsbmd differ diff --git a/res/field/props/models/prop_model_296.nsbmd b/res/field/props/models/prop_model_296.nsbmd new file mode 100644 index 0000000000..cb5a8fe73e Binary files /dev/null and b/res/field/props/models/prop_model_296.nsbmd differ diff --git a/res/field/props/models/prop_model_297.nsbmd b/res/field/props/models/prop_model_297.nsbmd new file mode 100644 index 0000000000..800ace94e5 Binary files /dev/null and b/res/field/props/models/prop_model_297.nsbmd differ diff --git a/res/field/props/models/prop_model_299.nsbmd b/res/field/props/models/prop_model_299.nsbmd new file mode 100644 index 0000000000..330475729c Binary files /dev/null and b/res/field/props/models/prop_model_299.nsbmd differ diff --git a/res/field/props/models/prop_model_300.nsbmd b/res/field/props/models/prop_model_300.nsbmd new file mode 100644 index 0000000000..2794761cc3 Binary files /dev/null and b/res/field/props/models/prop_model_300.nsbmd differ diff --git a/res/field/props/models/prop_model_301.nsbmd b/res/field/props/models/prop_model_301.nsbmd new file mode 100644 index 0000000000..bb72f0560d Binary files /dev/null and b/res/field/props/models/prop_model_301.nsbmd differ diff --git a/res/field/props/models/prop_model_302.nsbmd b/res/field/props/models/prop_model_302.nsbmd new file mode 100644 index 0000000000..f6acabf7da Binary files /dev/null and b/res/field/props/models/prop_model_302.nsbmd differ diff --git a/res/field/props/models/prop_model_305.nsbmd b/res/field/props/models/prop_model_305.nsbmd new file mode 100644 index 0000000000..7bd3863999 Binary files /dev/null and b/res/field/props/models/prop_model_305.nsbmd differ diff --git a/res/field/props/models/prop_model_306.nsbmd b/res/field/props/models/prop_model_306.nsbmd new file mode 100644 index 0000000000..d28cda0c90 Binary files /dev/null and b/res/field/props/models/prop_model_306.nsbmd differ diff --git a/res/field/props/models/prop_model_307.nsbmd b/res/field/props/models/prop_model_307.nsbmd new file mode 100644 index 0000000000..5ac3b05d29 Binary files /dev/null and b/res/field/props/models/prop_model_307.nsbmd differ diff --git a/res/field/props/models/prop_model_308.nsbmd b/res/field/props/models/prop_model_308.nsbmd new file mode 100644 index 0000000000..908df91151 Binary files /dev/null and b/res/field/props/models/prop_model_308.nsbmd differ diff --git a/res/field/props/models/prop_model_309.nsbmd b/res/field/props/models/prop_model_309.nsbmd new file mode 100644 index 0000000000..451370f6a0 Binary files /dev/null and b/res/field/props/models/prop_model_309.nsbmd differ diff --git a/res/field/props/models/prop_model_310.nsbmd b/res/field/props/models/prop_model_310.nsbmd new file mode 100644 index 0000000000..c1d9ec670b Binary files /dev/null and b/res/field/props/models/prop_model_310.nsbmd differ diff --git a/res/field/props/models/prop_model_311.nsbmd b/res/field/props/models/prop_model_311.nsbmd new file mode 100644 index 0000000000..7cf1747ca6 Binary files /dev/null and b/res/field/props/models/prop_model_311.nsbmd differ diff --git a/res/field/props/models/prop_model_314.nsbmd b/res/field/props/models/prop_model_314.nsbmd new file mode 100644 index 0000000000..12209f2e17 Binary files /dev/null and b/res/field/props/models/prop_model_314.nsbmd differ diff --git a/res/field/props/models/prop_model_315.nsbmd b/res/field/props/models/prop_model_315.nsbmd new file mode 100644 index 0000000000..c165e35adc Binary files /dev/null and b/res/field/props/models/prop_model_315.nsbmd differ diff --git a/res/field/props/models/prop_model_321.nsbmd b/res/field/props/models/prop_model_321.nsbmd new file mode 100644 index 0000000000..cf1483afbb Binary files /dev/null and b/res/field/props/models/prop_model_321.nsbmd differ diff --git a/res/field/props/models/prop_model_322.nsbmd b/res/field/props/models/prop_model_322.nsbmd new file mode 100644 index 0000000000..f4f32b4cae Binary files /dev/null and b/res/field/props/models/prop_model_322.nsbmd differ diff --git a/res/field/props/models/prop_model_323.nsbmd b/res/field/props/models/prop_model_323.nsbmd new file mode 100644 index 0000000000..99314a8017 Binary files /dev/null and b/res/field/props/models/prop_model_323.nsbmd differ diff --git a/res/field/props/models/prop_model_324.nsbmd b/res/field/props/models/prop_model_324.nsbmd new file mode 100644 index 0000000000..3f80d33abc Binary files /dev/null and b/res/field/props/models/prop_model_324.nsbmd differ diff --git a/res/field/props/models/prop_model_325.nsbmd b/res/field/props/models/prop_model_325.nsbmd new file mode 100644 index 0000000000..69743c0855 Binary files /dev/null and b/res/field/props/models/prop_model_325.nsbmd differ diff --git a/res/field/props/models/prop_model_326.nsbmd b/res/field/props/models/prop_model_326.nsbmd new file mode 100644 index 0000000000..133fe44ee6 Binary files /dev/null and b/res/field/props/models/prop_model_326.nsbmd differ diff --git a/res/field/props/models/prop_model_327.nsbmd b/res/field/props/models/prop_model_327.nsbmd new file mode 100644 index 0000000000..4b4f88ef82 Binary files /dev/null and b/res/field/props/models/prop_model_327.nsbmd differ diff --git a/res/field/props/models/prop_model_328.nsbmd b/res/field/props/models/prop_model_328.nsbmd new file mode 100644 index 0000000000..51864d88c0 Binary files /dev/null and b/res/field/props/models/prop_model_328.nsbmd differ diff --git a/res/field/props/models/prop_model_329.nsbmd b/res/field/props/models/prop_model_329.nsbmd new file mode 100644 index 0000000000..9858d69218 Binary files /dev/null and b/res/field/props/models/prop_model_329.nsbmd differ diff --git a/res/field/props/models/prop_model_330.nsbmd b/res/field/props/models/prop_model_330.nsbmd new file mode 100644 index 0000000000..28d1a29ee2 Binary files /dev/null and b/res/field/props/models/prop_model_330.nsbmd differ diff --git a/res/field/props/models/prop_model_331.nsbmd b/res/field/props/models/prop_model_331.nsbmd new file mode 100644 index 0000000000..3a975d1af8 Binary files /dev/null and b/res/field/props/models/prop_model_331.nsbmd differ diff --git a/res/field/props/models/prop_model_332.nsbmd b/res/field/props/models/prop_model_332.nsbmd new file mode 100644 index 0000000000..962fedbe03 Binary files /dev/null and b/res/field/props/models/prop_model_332.nsbmd differ diff --git a/res/field/props/models/prop_model_333.nsbmd b/res/field/props/models/prop_model_333.nsbmd new file mode 100644 index 0000000000..99995fcb17 Binary files /dev/null and b/res/field/props/models/prop_model_333.nsbmd differ diff --git a/res/field/props/models/prop_model_334.nsbmd b/res/field/props/models/prop_model_334.nsbmd new file mode 100644 index 0000000000..362b370725 Binary files /dev/null and b/res/field/props/models/prop_model_334.nsbmd differ diff --git a/res/field/props/models/prop_model_335.nsbmd b/res/field/props/models/prop_model_335.nsbmd new file mode 100644 index 0000000000..a35ec265a3 Binary files /dev/null and b/res/field/props/models/prop_model_335.nsbmd differ diff --git a/res/field/props/models/prop_model_336.nsbmd b/res/field/props/models/prop_model_336.nsbmd new file mode 100644 index 0000000000..d0fcc18bf9 Binary files /dev/null and b/res/field/props/models/prop_model_336.nsbmd differ diff --git a/res/field/props/models/prop_model_337.nsbmd b/res/field/props/models/prop_model_337.nsbmd new file mode 100644 index 0000000000..888961631e Binary files /dev/null and b/res/field/props/models/prop_model_337.nsbmd differ diff --git a/res/field/props/models/prop_model_338.nsbmd b/res/field/props/models/prop_model_338.nsbmd new file mode 100644 index 0000000000..e6d69fd27b Binary files /dev/null and b/res/field/props/models/prop_model_338.nsbmd differ diff --git a/res/field/props/models/prop_model_339.nsbmd b/res/field/props/models/prop_model_339.nsbmd new file mode 100644 index 0000000000..1735ef19ca Binary files /dev/null and b/res/field/props/models/prop_model_339.nsbmd differ diff --git a/res/field/props/models/prop_model_340.nsbmd b/res/field/props/models/prop_model_340.nsbmd new file mode 100644 index 0000000000..a3252bc95f Binary files /dev/null and b/res/field/props/models/prop_model_340.nsbmd differ diff --git a/res/field/props/models/prop_model_341.nsbmd b/res/field/props/models/prop_model_341.nsbmd new file mode 100644 index 0000000000..6935b2f579 Binary files /dev/null and b/res/field/props/models/prop_model_341.nsbmd differ diff --git a/res/field/props/models/prop_model_342.nsbmd b/res/field/props/models/prop_model_342.nsbmd new file mode 100644 index 0000000000..ba2e366d6a Binary files /dev/null and b/res/field/props/models/prop_model_342.nsbmd differ diff --git a/res/field/props/models/prop_model_343.nsbmd b/res/field/props/models/prop_model_343.nsbmd new file mode 100644 index 0000000000..3c36eeaa9d Binary files /dev/null and b/res/field/props/models/prop_model_343.nsbmd differ diff --git a/res/field/props/models/prop_model_344.nsbmd b/res/field/props/models/prop_model_344.nsbmd new file mode 100644 index 0000000000..cd375f725d Binary files /dev/null and b/res/field/props/models/prop_model_344.nsbmd differ diff --git a/res/field/props/models/prop_model_345.nsbmd b/res/field/props/models/prop_model_345.nsbmd new file mode 100644 index 0000000000..771183cd6a Binary files /dev/null and b/res/field/props/models/prop_model_345.nsbmd differ diff --git a/res/field/props/models/prop_model_346.nsbmd b/res/field/props/models/prop_model_346.nsbmd new file mode 100644 index 0000000000..c9bae7440f Binary files /dev/null and b/res/field/props/models/prop_model_346.nsbmd differ diff --git a/res/field/props/models/prop_model_347.nsbmd b/res/field/props/models/prop_model_347.nsbmd new file mode 100644 index 0000000000..9b23b71eda Binary files /dev/null and b/res/field/props/models/prop_model_347.nsbmd differ diff --git a/res/field/props/models/prop_model_348.nsbmd b/res/field/props/models/prop_model_348.nsbmd new file mode 100644 index 0000000000..41740455ad Binary files /dev/null and b/res/field/props/models/prop_model_348.nsbmd differ diff --git a/res/field/props/models/prop_model_349.nsbmd b/res/field/props/models/prop_model_349.nsbmd new file mode 100644 index 0000000000..42baaa8159 Binary files /dev/null and b/res/field/props/models/prop_model_349.nsbmd differ diff --git a/res/field/props/models/prop_model_350.nsbmd b/res/field/props/models/prop_model_350.nsbmd new file mode 100644 index 0000000000..7526f62c43 Binary files /dev/null and b/res/field/props/models/prop_model_350.nsbmd differ diff --git a/res/field/props/models/prop_model_351.nsbmd b/res/field/props/models/prop_model_351.nsbmd new file mode 100644 index 0000000000..53b9773d72 Binary files /dev/null and b/res/field/props/models/prop_model_351.nsbmd differ diff --git a/res/field/props/models/prop_model_352.nsbmd b/res/field/props/models/prop_model_352.nsbmd new file mode 100644 index 0000000000..01ced435c2 Binary files /dev/null and b/res/field/props/models/prop_model_352.nsbmd differ diff --git a/res/field/props/models/prop_model_353.nsbmd b/res/field/props/models/prop_model_353.nsbmd new file mode 100644 index 0000000000..1a47d15426 Binary files /dev/null and b/res/field/props/models/prop_model_353.nsbmd differ diff --git a/res/field/props/models/prop_model_354.nsbmd b/res/field/props/models/prop_model_354.nsbmd new file mode 100644 index 0000000000..997e779df3 Binary files /dev/null and b/res/field/props/models/prop_model_354.nsbmd differ diff --git a/res/field/props/models/prop_model_355.nsbmd b/res/field/props/models/prop_model_355.nsbmd new file mode 100644 index 0000000000..9e35b550bf Binary files /dev/null and b/res/field/props/models/prop_model_355.nsbmd differ diff --git a/res/field/props/models/prop_model_356.nsbmd b/res/field/props/models/prop_model_356.nsbmd new file mode 100644 index 0000000000..b6a29d2884 Binary files /dev/null and b/res/field/props/models/prop_model_356.nsbmd differ diff --git a/res/field/props/models/prop_model_357.nsbmd b/res/field/props/models/prop_model_357.nsbmd new file mode 100644 index 0000000000..e280fa635d Binary files /dev/null and b/res/field/props/models/prop_model_357.nsbmd differ diff --git a/res/field/props/models/prop_model_358.nsbmd b/res/field/props/models/prop_model_358.nsbmd new file mode 100644 index 0000000000..1f9c28375e Binary files /dev/null and b/res/field/props/models/prop_model_358.nsbmd differ diff --git a/res/field/props/models/prop_model_359.nsbmd b/res/field/props/models/prop_model_359.nsbmd new file mode 100644 index 0000000000..ac1b8aa768 Binary files /dev/null and b/res/field/props/models/prop_model_359.nsbmd differ diff --git a/res/field/props/models/prop_model_360.nsbmd b/res/field/props/models/prop_model_360.nsbmd new file mode 100644 index 0000000000..9e23aadab9 Binary files /dev/null and b/res/field/props/models/prop_model_360.nsbmd differ diff --git a/res/field/props/models/prop_model_361.nsbmd b/res/field/props/models/prop_model_361.nsbmd new file mode 100644 index 0000000000..b1c462dede Binary files /dev/null and b/res/field/props/models/prop_model_361.nsbmd differ diff --git a/res/field/props/models/prop_model_362.nsbmd b/res/field/props/models/prop_model_362.nsbmd new file mode 100644 index 0000000000..02799e969f Binary files /dev/null and b/res/field/props/models/prop_model_362.nsbmd differ diff --git a/res/field/props/models/prop_model_363.nsbmd b/res/field/props/models/prop_model_363.nsbmd new file mode 100644 index 0000000000..31492bcdfa Binary files /dev/null and b/res/field/props/models/prop_model_363.nsbmd differ diff --git a/res/field/props/models/prop_model_364.nsbmd b/res/field/props/models/prop_model_364.nsbmd new file mode 100644 index 0000000000..0e5c93e658 Binary files /dev/null and b/res/field/props/models/prop_model_364.nsbmd differ diff --git a/res/field/props/models/prop_model_365.nsbmd b/res/field/props/models/prop_model_365.nsbmd new file mode 100644 index 0000000000..f21c58a873 Binary files /dev/null and b/res/field/props/models/prop_model_365.nsbmd differ diff --git a/res/field/props/models/prop_model_366.nsbmd b/res/field/props/models/prop_model_366.nsbmd new file mode 100644 index 0000000000..d5b26a985e Binary files /dev/null and b/res/field/props/models/prop_model_366.nsbmd differ diff --git a/res/field/props/models/prop_model_367.nsbmd b/res/field/props/models/prop_model_367.nsbmd new file mode 100644 index 0000000000..9a8a5678f5 Binary files /dev/null and b/res/field/props/models/prop_model_367.nsbmd differ diff --git a/res/field/props/models/prop_model_368.nsbmd b/res/field/props/models/prop_model_368.nsbmd new file mode 100644 index 0000000000..3f11929dba Binary files /dev/null and b/res/field/props/models/prop_model_368.nsbmd differ diff --git a/res/field/props/models/prop_model_369.nsbmd b/res/field/props/models/prop_model_369.nsbmd new file mode 100644 index 0000000000..26be0b4f84 Binary files /dev/null and b/res/field/props/models/prop_model_369.nsbmd differ diff --git a/res/field/props/models/prop_model_370.nsbmd b/res/field/props/models/prop_model_370.nsbmd new file mode 100644 index 0000000000..26a2822815 Binary files /dev/null and b/res/field/props/models/prop_model_370.nsbmd differ diff --git a/res/field/props/models/prop_model_371.nsbmd b/res/field/props/models/prop_model_371.nsbmd new file mode 100644 index 0000000000..a7494262de Binary files /dev/null and b/res/field/props/models/prop_model_371.nsbmd differ diff --git a/res/field/props/models/prop_model_372.nsbmd b/res/field/props/models/prop_model_372.nsbmd new file mode 100644 index 0000000000..e664336a44 Binary files /dev/null and b/res/field/props/models/prop_model_372.nsbmd differ diff --git a/res/field/props/models/prop_model_373.nsbmd b/res/field/props/models/prop_model_373.nsbmd new file mode 100644 index 0000000000..5d4cc321d4 Binary files /dev/null and b/res/field/props/models/prop_model_373.nsbmd differ diff --git a/res/field/props/models/prop_model_374.nsbmd b/res/field/props/models/prop_model_374.nsbmd new file mode 100644 index 0000000000..1dd4727689 Binary files /dev/null and b/res/field/props/models/prop_model_374.nsbmd differ diff --git a/res/field/props/models/prop_model_375.nsbmd b/res/field/props/models/prop_model_375.nsbmd new file mode 100644 index 0000000000..815a8d1f44 Binary files /dev/null and b/res/field/props/models/prop_model_375.nsbmd differ diff --git a/res/field/props/models/prop_model_376.nsbmd b/res/field/props/models/prop_model_376.nsbmd new file mode 100644 index 0000000000..80ea704d76 Binary files /dev/null and b/res/field/props/models/prop_model_376.nsbmd differ diff --git a/res/field/props/models/prop_model_377.nsbmd b/res/field/props/models/prop_model_377.nsbmd new file mode 100644 index 0000000000..08ab357ecb Binary files /dev/null and b/res/field/props/models/prop_model_377.nsbmd differ diff --git a/res/field/props/models/prop_model_378.nsbmd b/res/field/props/models/prop_model_378.nsbmd new file mode 100644 index 0000000000..60c81c4c91 Binary files /dev/null and b/res/field/props/models/prop_model_378.nsbmd differ diff --git a/res/field/props/models/prop_model_379.nsbmd b/res/field/props/models/prop_model_379.nsbmd new file mode 100644 index 0000000000..35c5778437 Binary files /dev/null and b/res/field/props/models/prop_model_379.nsbmd differ diff --git a/res/field/props/models/prop_model_380.nsbmd b/res/field/props/models/prop_model_380.nsbmd new file mode 100644 index 0000000000..c91584bf63 Binary files /dev/null and b/res/field/props/models/prop_model_380.nsbmd differ diff --git a/res/field/props/models/prop_model_381.nsbmd b/res/field/props/models/prop_model_381.nsbmd new file mode 100644 index 0000000000..2aedea9c09 Binary files /dev/null and b/res/field/props/models/prop_model_381.nsbmd differ diff --git a/res/field/props/models/prop_model_382.nsbmd b/res/field/props/models/prop_model_382.nsbmd new file mode 100644 index 0000000000..c09172becf Binary files /dev/null and b/res/field/props/models/prop_model_382.nsbmd differ diff --git a/res/field/props/models/prop_model_383.nsbmd b/res/field/props/models/prop_model_383.nsbmd new file mode 100644 index 0000000000..8bda548ff6 Binary files /dev/null and b/res/field/props/models/prop_model_383.nsbmd differ diff --git a/res/field/props/models/prop_model_384.nsbmd b/res/field/props/models/prop_model_384.nsbmd new file mode 100644 index 0000000000..ad4969438f Binary files /dev/null and b/res/field/props/models/prop_model_384.nsbmd differ diff --git a/res/field/props/models/prop_model_385.nsbmd b/res/field/props/models/prop_model_385.nsbmd new file mode 100644 index 0000000000..cdbd549529 Binary files /dev/null and b/res/field/props/models/prop_model_385.nsbmd differ diff --git a/res/field/props/models/prop_model_386.nsbmd b/res/field/props/models/prop_model_386.nsbmd new file mode 100644 index 0000000000..85ceee7416 Binary files /dev/null and b/res/field/props/models/prop_model_386.nsbmd differ diff --git a/res/field/props/models/prop_model_387.nsbmd b/res/field/props/models/prop_model_387.nsbmd new file mode 100644 index 0000000000..602c103bb0 Binary files /dev/null and b/res/field/props/models/prop_model_387.nsbmd differ diff --git a/res/field/props/models/prop_model_388.nsbmd b/res/field/props/models/prop_model_388.nsbmd new file mode 100644 index 0000000000..4e7e4d9902 Binary files /dev/null and b/res/field/props/models/prop_model_388.nsbmd differ diff --git a/res/field/props/models/prop_model_389.nsbmd b/res/field/props/models/prop_model_389.nsbmd new file mode 100644 index 0000000000..76b5b673a2 Binary files /dev/null and b/res/field/props/models/prop_model_389.nsbmd differ diff --git a/res/field/props/models/prop_model_390.nsbmd b/res/field/props/models/prop_model_390.nsbmd new file mode 100644 index 0000000000..dfb49ab555 Binary files /dev/null and b/res/field/props/models/prop_model_390.nsbmd differ diff --git a/res/field/props/models/prop_model_391.nsbmd b/res/field/props/models/prop_model_391.nsbmd new file mode 100644 index 0000000000..2e5a87c5e5 Binary files /dev/null and b/res/field/props/models/prop_model_391.nsbmd differ diff --git a/res/field/props/models/prop_model_392.nsbmd b/res/field/props/models/prop_model_392.nsbmd new file mode 100644 index 0000000000..eb273767b4 Binary files /dev/null and b/res/field/props/models/prop_model_392.nsbmd differ diff --git a/res/field/props/models/prop_model_393.nsbmd b/res/field/props/models/prop_model_393.nsbmd new file mode 100644 index 0000000000..ed8f10dd2c Binary files /dev/null and b/res/field/props/models/prop_model_393.nsbmd differ diff --git a/res/field/props/models/prop_model_394.nsbmd b/res/field/props/models/prop_model_394.nsbmd new file mode 100644 index 0000000000..ae3f2a7763 Binary files /dev/null and b/res/field/props/models/prop_model_394.nsbmd differ diff --git a/res/field/props/models/prop_model_395.nsbmd b/res/field/props/models/prop_model_395.nsbmd new file mode 100644 index 0000000000..6c53c96273 Binary files /dev/null and b/res/field/props/models/prop_model_395.nsbmd differ diff --git a/res/field/props/models/prop_model_396.nsbmd b/res/field/props/models/prop_model_396.nsbmd new file mode 100644 index 0000000000..a277c7d24b Binary files /dev/null and b/res/field/props/models/prop_model_396.nsbmd differ diff --git a/res/field/props/models/prop_model_397.nsbmd b/res/field/props/models/prop_model_397.nsbmd new file mode 100644 index 0000000000..e633c3ba7f Binary files /dev/null and b/res/field/props/models/prop_model_397.nsbmd differ diff --git a/res/field/props/models/prop_model_398.nsbmd b/res/field/props/models/prop_model_398.nsbmd new file mode 100644 index 0000000000..239610cc4e Binary files /dev/null and b/res/field/props/models/prop_model_398.nsbmd differ diff --git a/res/field/props/models/prop_model_399.nsbmd b/res/field/props/models/prop_model_399.nsbmd new file mode 100644 index 0000000000..bfdab3f763 Binary files /dev/null and b/res/field/props/models/prop_model_399.nsbmd differ diff --git a/res/field/props/models/prop_model_400.nsbmd b/res/field/props/models/prop_model_400.nsbmd new file mode 100644 index 0000000000..7ab14e8a5e Binary files /dev/null and b/res/field/props/models/prop_model_400.nsbmd differ diff --git a/res/field/props/models/prop_model_401.nsbmd b/res/field/props/models/prop_model_401.nsbmd new file mode 100644 index 0000000000..a6e688189b Binary files /dev/null and b/res/field/props/models/prop_model_401.nsbmd differ diff --git a/res/field/props/models/prop_model_402.nsbmd b/res/field/props/models/prop_model_402.nsbmd new file mode 100644 index 0000000000..3fe3e27ec4 Binary files /dev/null and b/res/field/props/models/prop_model_402.nsbmd differ diff --git a/res/field/props/models/prop_model_403.nsbmd b/res/field/props/models/prop_model_403.nsbmd new file mode 100644 index 0000000000..cabfbd93a8 Binary files /dev/null and b/res/field/props/models/prop_model_403.nsbmd differ diff --git a/res/field/props/models/prop_model_404.nsbmd b/res/field/props/models/prop_model_404.nsbmd new file mode 100644 index 0000000000..e1692363d7 Binary files /dev/null and b/res/field/props/models/prop_model_404.nsbmd differ diff --git a/res/field/props/models/prop_model_405.nsbmd b/res/field/props/models/prop_model_405.nsbmd new file mode 100644 index 0000000000..43e5b0ed71 Binary files /dev/null and b/res/field/props/models/prop_model_405.nsbmd differ diff --git a/res/field/props/models/prop_model_406.nsbmd b/res/field/props/models/prop_model_406.nsbmd new file mode 100644 index 0000000000..de91fdde34 Binary files /dev/null and b/res/field/props/models/prop_model_406.nsbmd differ diff --git a/res/field/props/models/prop_model_407.nsbmd b/res/field/props/models/prop_model_407.nsbmd new file mode 100644 index 0000000000..e209eaf568 Binary files /dev/null and b/res/field/props/models/prop_model_407.nsbmd differ diff --git a/res/field/props/models/prop_model_408.nsbmd b/res/field/props/models/prop_model_408.nsbmd new file mode 100644 index 0000000000..d99787660d Binary files /dev/null and b/res/field/props/models/prop_model_408.nsbmd differ diff --git a/res/field/props/models/prop_model_409.nsbmd b/res/field/props/models/prop_model_409.nsbmd new file mode 100644 index 0000000000..0c54694be3 Binary files /dev/null and b/res/field/props/models/prop_model_409.nsbmd differ diff --git a/res/field/props/models/prop_model_410.nsbmd b/res/field/props/models/prop_model_410.nsbmd new file mode 100644 index 0000000000..ecb38c6b67 Binary files /dev/null and b/res/field/props/models/prop_model_410.nsbmd differ diff --git a/res/field/props/models/prop_model_411.nsbmd b/res/field/props/models/prop_model_411.nsbmd new file mode 100644 index 0000000000..bbc71ad24d Binary files /dev/null and b/res/field/props/models/prop_model_411.nsbmd differ diff --git a/res/field/props/models/prop_model_412.nsbmd b/res/field/props/models/prop_model_412.nsbmd new file mode 100644 index 0000000000..1e87d97015 Binary files /dev/null and b/res/field/props/models/prop_model_412.nsbmd differ diff --git a/res/field/props/models/prop_model_413.nsbmd b/res/field/props/models/prop_model_413.nsbmd new file mode 100644 index 0000000000..2021879a80 Binary files /dev/null and b/res/field/props/models/prop_model_413.nsbmd differ diff --git a/res/field/props/models/prop_model_414.nsbmd b/res/field/props/models/prop_model_414.nsbmd new file mode 100644 index 0000000000..bd44f2efa0 Binary files /dev/null and b/res/field/props/models/prop_model_414.nsbmd differ diff --git a/res/field/props/models/prop_model_415.nsbmd b/res/field/props/models/prop_model_415.nsbmd new file mode 100644 index 0000000000..2f02ac4081 Binary files /dev/null and b/res/field/props/models/prop_model_415.nsbmd differ diff --git a/res/field/props/models/prop_model_416.nsbmd b/res/field/props/models/prop_model_416.nsbmd new file mode 100644 index 0000000000..1afda1ec77 Binary files /dev/null and b/res/field/props/models/prop_model_416.nsbmd differ diff --git a/res/field/props/models/prop_model_417.nsbmd b/res/field/props/models/prop_model_417.nsbmd new file mode 100644 index 0000000000..69754f0b8b Binary files /dev/null and b/res/field/props/models/prop_model_417.nsbmd differ diff --git a/res/field/props/models/prop_model_418.nsbmd b/res/field/props/models/prop_model_418.nsbmd new file mode 100644 index 0000000000..620e256db8 Binary files /dev/null and b/res/field/props/models/prop_model_418.nsbmd differ diff --git a/res/field/props/models/prop_model_419.nsbmd b/res/field/props/models/prop_model_419.nsbmd new file mode 100644 index 0000000000..6d28dc5e4b Binary files /dev/null and b/res/field/props/models/prop_model_419.nsbmd differ diff --git a/res/field/props/models/prop_model_420.nsbmd b/res/field/props/models/prop_model_420.nsbmd new file mode 100644 index 0000000000..62b0cf9c0d Binary files /dev/null and b/res/field/props/models/prop_model_420.nsbmd differ diff --git a/res/field/props/models/prop_model_421.nsbmd b/res/field/props/models/prop_model_421.nsbmd new file mode 100644 index 0000000000..367cfead41 Binary files /dev/null and b/res/field/props/models/prop_model_421.nsbmd differ diff --git a/res/field/props/models/prop_model_422.nsbmd b/res/field/props/models/prop_model_422.nsbmd new file mode 100644 index 0000000000..f060566273 Binary files /dev/null and b/res/field/props/models/prop_model_422.nsbmd differ diff --git a/res/field/props/models/prop_model_423.nsbmd b/res/field/props/models/prop_model_423.nsbmd new file mode 100644 index 0000000000..d2288e1b02 Binary files /dev/null and b/res/field/props/models/prop_model_423.nsbmd differ diff --git a/res/field/props/models/prop_model_424.nsbmd b/res/field/props/models/prop_model_424.nsbmd new file mode 100644 index 0000000000..4ac0b793fc Binary files /dev/null and b/res/field/props/models/prop_model_424.nsbmd differ diff --git a/res/field/props/models/prop_model_428.nsbmd b/res/field/props/models/prop_model_428.nsbmd new file mode 100644 index 0000000000..1e8cbcccf5 Binary files /dev/null and b/res/field/props/models/prop_model_428.nsbmd differ diff --git a/res/field/props/models/prop_model_433.nsbmd b/res/field/props/models/prop_model_433.nsbmd new file mode 100644 index 0000000000..35a4c6c5a9 Binary files /dev/null and b/res/field/props/models/prop_model_433.nsbmd differ diff --git a/res/field/props/models/prop_model_434.nsbmd b/res/field/props/models/prop_model_434.nsbmd new file mode 100644 index 0000000000..3087b8d68f Binary files /dev/null and b/res/field/props/models/prop_model_434.nsbmd differ diff --git a/res/field/props/models/prop_model_435.nsbmd b/res/field/props/models/prop_model_435.nsbmd new file mode 100644 index 0000000000..27703dc0a2 Binary files /dev/null and b/res/field/props/models/prop_model_435.nsbmd differ diff --git a/res/field/props/models/prop_model_436.nsbmd b/res/field/props/models/prop_model_436.nsbmd new file mode 100644 index 0000000000..e17f3cc983 Binary files /dev/null and b/res/field/props/models/prop_model_436.nsbmd differ diff --git a/res/field/props/models/prop_model_437.nsbmd b/res/field/props/models/prop_model_437.nsbmd new file mode 100644 index 0000000000..c2870f6d26 Binary files /dev/null and b/res/field/props/models/prop_model_437.nsbmd differ diff --git a/res/field/props/models/prop_model_439.nsbmd b/res/field/props/models/prop_model_439.nsbmd new file mode 100644 index 0000000000..858800ccd0 Binary files /dev/null and b/res/field/props/models/prop_model_439.nsbmd differ diff --git a/res/field/props/models/prop_model_440.nsbmd b/res/field/props/models/prop_model_440.nsbmd new file mode 100644 index 0000000000..e631dbda61 Binary files /dev/null and b/res/field/props/models/prop_model_440.nsbmd differ diff --git a/res/field/props/models/prop_model_443.nsbmd b/res/field/props/models/prop_model_443.nsbmd new file mode 100644 index 0000000000..e09f3ead88 Binary files /dev/null and b/res/field/props/models/prop_model_443.nsbmd differ diff --git a/res/field/props/models/prop_model_445.nsbmd b/res/field/props/models/prop_model_445.nsbmd new file mode 100644 index 0000000000..6d2be1bb28 Binary files /dev/null and b/res/field/props/models/prop_model_445.nsbmd differ diff --git a/res/field/props/models/prop_model_446.nsbmd b/res/field/props/models/prop_model_446.nsbmd new file mode 100644 index 0000000000..fab76fd948 Binary files /dev/null and b/res/field/props/models/prop_model_446.nsbmd differ diff --git a/res/field/props/models/prop_model_447.nsbmd b/res/field/props/models/prop_model_447.nsbmd new file mode 100644 index 0000000000..0809fb7c38 Binary files /dev/null and b/res/field/props/models/prop_model_447.nsbmd differ diff --git a/res/field/props/models/prop_model_448.nsbmd b/res/field/props/models/prop_model_448.nsbmd new file mode 100644 index 0000000000..dc1c02bba5 Binary files /dev/null and b/res/field/props/models/prop_model_448.nsbmd differ diff --git a/res/field/props/models/prop_model_449.nsbmd b/res/field/props/models/prop_model_449.nsbmd new file mode 100644 index 0000000000..515adf40cb Binary files /dev/null and b/res/field/props/models/prop_model_449.nsbmd differ diff --git a/res/field/props/models/prop_model_450.nsbmd b/res/field/props/models/prop_model_450.nsbmd new file mode 100644 index 0000000000..f2220c5f03 Binary files /dev/null and b/res/field/props/models/prop_model_450.nsbmd differ diff --git a/res/field/props/models/prop_model_451.nsbmd b/res/field/props/models/prop_model_451.nsbmd new file mode 100644 index 0000000000..c9508c3044 Binary files /dev/null and b/res/field/props/models/prop_model_451.nsbmd differ diff --git a/res/field/props/models/prop_model_452.nsbmd b/res/field/props/models/prop_model_452.nsbmd new file mode 100644 index 0000000000..ab0992c3c3 Binary files /dev/null and b/res/field/props/models/prop_model_452.nsbmd differ diff --git a/res/field/props/models/prop_model_453.nsbmd b/res/field/props/models/prop_model_453.nsbmd new file mode 100644 index 0000000000..db426a0a31 Binary files /dev/null and b/res/field/props/models/prop_model_453.nsbmd differ diff --git a/res/field/props/models/prop_model_454.nsbmd b/res/field/props/models/prop_model_454.nsbmd new file mode 100644 index 0000000000..1fa9fdd022 Binary files /dev/null and b/res/field/props/models/prop_model_454.nsbmd differ diff --git a/res/field/props/models/prop_model_455.nsbmd b/res/field/props/models/prop_model_455.nsbmd new file mode 100644 index 0000000000..054a2b8978 Binary files /dev/null and b/res/field/props/models/prop_model_455.nsbmd differ diff --git a/res/field/props/models/prop_model_457.nsbmd b/res/field/props/models/prop_model_457.nsbmd new file mode 100644 index 0000000000..a906c71184 Binary files /dev/null and b/res/field/props/models/prop_model_457.nsbmd differ diff --git a/res/field/props/models/prop_model_458.nsbmd b/res/field/props/models/prop_model_458.nsbmd new file mode 100644 index 0000000000..1a431dbde1 Binary files /dev/null and b/res/field/props/models/prop_model_458.nsbmd differ diff --git a/res/field/props/models/prop_model_459.nsbmd b/res/field/props/models/prop_model_459.nsbmd new file mode 100644 index 0000000000..1704f573b1 Binary files /dev/null and b/res/field/props/models/prop_model_459.nsbmd differ diff --git a/res/field/props/models/prop_model_460.nsbmd b/res/field/props/models/prop_model_460.nsbmd new file mode 100644 index 0000000000..e3555e0166 Binary files /dev/null and b/res/field/props/models/prop_model_460.nsbmd differ diff --git a/res/field/props/models/prop_model_461.nsbmd b/res/field/props/models/prop_model_461.nsbmd new file mode 100644 index 0000000000..4afa1590b9 Binary files /dev/null and b/res/field/props/models/prop_model_461.nsbmd differ diff --git a/res/field/props/models/prop_model_462.nsbmd b/res/field/props/models/prop_model_462.nsbmd new file mode 100644 index 0000000000..fe16c47bb9 Binary files /dev/null and b/res/field/props/models/prop_model_462.nsbmd differ diff --git a/res/field/props/models/prop_model_463.nsbmd b/res/field/props/models/prop_model_463.nsbmd new file mode 100644 index 0000000000..deccb3154b Binary files /dev/null and b/res/field/props/models/prop_model_463.nsbmd differ diff --git a/res/field/props/models/prop_model_464.nsbmd b/res/field/props/models/prop_model_464.nsbmd new file mode 100644 index 0000000000..7542d6e964 Binary files /dev/null and b/res/field/props/models/prop_model_464.nsbmd differ diff --git a/res/field/props/models/prop_model_465.nsbmd b/res/field/props/models/prop_model_465.nsbmd new file mode 100644 index 0000000000..11a8fd63f4 Binary files /dev/null and b/res/field/props/models/prop_model_465.nsbmd differ diff --git a/res/field/props/models/prop_model_466.nsbmd b/res/field/props/models/prop_model_466.nsbmd new file mode 100644 index 0000000000..48fc32e961 Binary files /dev/null and b/res/field/props/models/prop_model_466.nsbmd differ diff --git a/res/field/props/models/prop_model_467.nsbmd b/res/field/props/models/prop_model_467.nsbmd new file mode 100644 index 0000000000..0009d6bb38 Binary files /dev/null and b/res/field/props/models/prop_model_467.nsbmd differ diff --git a/res/field/props/models/prop_model_468.nsbmd b/res/field/props/models/prop_model_468.nsbmd new file mode 100644 index 0000000000..b0ff669fea Binary files /dev/null and b/res/field/props/models/prop_model_468.nsbmd differ diff --git a/res/field/props/models/prop_model_469.nsbmd b/res/field/props/models/prop_model_469.nsbmd new file mode 100644 index 0000000000..e1cfa1adc9 Binary files /dev/null and b/res/field/props/models/prop_model_469.nsbmd differ diff --git a/res/field/props/models/prop_model_470.nsbmd b/res/field/props/models/prop_model_470.nsbmd new file mode 100644 index 0000000000..1a4c3695c1 Binary files /dev/null and b/res/field/props/models/prop_model_470.nsbmd differ diff --git a/res/field/props/models/prop_model_471.nsbmd b/res/field/props/models/prop_model_471.nsbmd new file mode 100644 index 0000000000..af0a9b37bf Binary files /dev/null and b/res/field/props/models/prop_model_471.nsbmd differ diff --git a/res/field/props/models/prop_model_472.nsbmd b/res/field/props/models/prop_model_472.nsbmd new file mode 100644 index 0000000000..2b941c3205 Binary files /dev/null and b/res/field/props/models/prop_model_472.nsbmd differ diff --git a/res/field/props/models/prop_model_473.nsbmd b/res/field/props/models/prop_model_473.nsbmd new file mode 100644 index 0000000000..12eec95c22 Binary files /dev/null and b/res/field/props/models/prop_model_473.nsbmd differ diff --git a/res/field/props/models/prop_model_474.nsbmd b/res/field/props/models/prop_model_474.nsbmd new file mode 100644 index 0000000000..771c393ecb Binary files /dev/null and b/res/field/props/models/prop_model_474.nsbmd differ diff --git a/res/field/props/models/prop_model_476.nsbmd b/res/field/props/models/prop_model_476.nsbmd new file mode 100644 index 0000000000..d7533b16f1 Binary files /dev/null and b/res/field/props/models/prop_model_476.nsbmd differ diff --git a/res/field/props/models/prop_model_477.nsbmd b/res/field/props/models/prop_model_477.nsbmd new file mode 100644 index 0000000000..94ca1415d2 Binary files /dev/null and b/res/field/props/models/prop_model_477.nsbmd differ diff --git a/res/field/props/models/prop_model_478.nsbmd b/res/field/props/models/prop_model_478.nsbmd new file mode 100644 index 0000000000..aa3ed8bca2 Binary files /dev/null and b/res/field/props/models/prop_model_478.nsbmd differ diff --git a/res/field/props/models/prop_model_479.nsbmd b/res/field/props/models/prop_model_479.nsbmd new file mode 100644 index 0000000000..56f13c6dbd Binary files /dev/null and b/res/field/props/models/prop_model_479.nsbmd differ diff --git a/res/field/props/models/prop_model_480.nsbmd b/res/field/props/models/prop_model_480.nsbmd new file mode 100644 index 0000000000..dc5e0d88e7 Binary files /dev/null and b/res/field/props/models/prop_model_480.nsbmd differ diff --git a/res/field/props/models/prop_model_481.nsbmd b/res/field/props/models/prop_model_481.nsbmd new file mode 100644 index 0000000000..b4c84dc4a6 Binary files /dev/null and b/res/field/props/models/prop_model_481.nsbmd differ diff --git a/res/field/props/models/prop_model_482.nsbmd b/res/field/props/models/prop_model_482.nsbmd new file mode 100644 index 0000000000..0dcfb6f582 Binary files /dev/null and b/res/field/props/models/prop_model_482.nsbmd differ diff --git a/res/field/props/models/prop_model_483.nsbmd b/res/field/props/models/prop_model_483.nsbmd new file mode 100644 index 0000000000..691f1169cd Binary files /dev/null and b/res/field/props/models/prop_model_483.nsbmd differ diff --git a/res/field/props/models/prop_model_485.nsbmd b/res/field/props/models/prop_model_485.nsbmd new file mode 100644 index 0000000000..98409288a8 Binary files /dev/null and b/res/field/props/models/prop_model_485.nsbmd differ diff --git a/res/field/props/models/prop_model_486.nsbmd b/res/field/props/models/prop_model_486.nsbmd new file mode 100644 index 0000000000..99b9fdbdd7 Binary files /dev/null and b/res/field/props/models/prop_model_486.nsbmd differ diff --git a/res/field/props/models/prop_model_487.nsbmd b/res/field/props/models/prop_model_487.nsbmd new file mode 100644 index 0000000000..3263cc2454 Binary files /dev/null and b/res/field/props/models/prop_model_487.nsbmd differ diff --git a/res/field/props/models/prop_model_488.nsbmd b/res/field/props/models/prop_model_488.nsbmd new file mode 100644 index 0000000000..b8383ce0fb Binary files /dev/null and b/res/field/props/models/prop_model_488.nsbmd differ diff --git a/res/field/props/models/prop_model_489.nsbmd b/res/field/props/models/prop_model_489.nsbmd new file mode 100644 index 0000000000..18ea247dd3 Binary files /dev/null and b/res/field/props/models/prop_model_489.nsbmd differ diff --git a/res/field/props/models/prop_model_490.nsbmd b/res/field/props/models/prop_model_490.nsbmd new file mode 100644 index 0000000000..2673822675 Binary files /dev/null and b/res/field/props/models/prop_model_490.nsbmd differ diff --git a/res/field/props/models/prop_model_491.nsbmd b/res/field/props/models/prop_model_491.nsbmd new file mode 100644 index 0000000000..23bd124dea Binary files /dev/null and b/res/field/props/models/prop_model_491.nsbmd differ diff --git a/res/field/props/models/prop_model_492.nsbmd b/res/field/props/models/prop_model_492.nsbmd new file mode 100644 index 0000000000..d9a0970f74 Binary files /dev/null and b/res/field/props/models/prop_model_492.nsbmd differ diff --git a/res/field/props/models/prop_model_493.nsbmd b/res/field/props/models/prop_model_493.nsbmd new file mode 100644 index 0000000000..0a90ea7545 Binary files /dev/null and b/res/field/props/models/prop_model_493.nsbmd differ diff --git a/res/field/props/models/prop_model_494.nsbmd b/res/field/props/models/prop_model_494.nsbmd new file mode 100644 index 0000000000..ff1f38488a Binary files /dev/null and b/res/field/props/models/prop_model_494.nsbmd differ diff --git a/res/field/props/models/prop_model_495.nsbmd b/res/field/props/models/prop_model_495.nsbmd new file mode 100644 index 0000000000..f8690b729b Binary files /dev/null and b/res/field/props/models/prop_model_495.nsbmd differ diff --git a/res/field/props/models/prop_model_496.nsbmd b/res/field/props/models/prop_model_496.nsbmd new file mode 100644 index 0000000000..920d0b8a98 Binary files /dev/null and b/res/field/props/models/prop_model_496.nsbmd differ diff --git a/res/field/props/models/prop_model_497.nsbmd b/res/field/props/models/prop_model_497.nsbmd new file mode 100644 index 0000000000..9cf5f00a60 Binary files /dev/null and b/res/field/props/models/prop_model_497.nsbmd differ diff --git a/res/field/props/models/prop_model_499.nsbmd b/res/field/props/models/prop_model_499.nsbmd new file mode 100644 index 0000000000..e11d26c8db Binary files /dev/null and b/res/field/props/models/prop_model_499.nsbmd differ diff --git a/res/field/props/models/prop_model_500.nsbmd b/res/field/props/models/prop_model_500.nsbmd new file mode 100644 index 0000000000..7708760f38 Binary files /dev/null and b/res/field/props/models/prop_model_500.nsbmd differ diff --git a/res/field/props/models/prop_model_501.nsbmd b/res/field/props/models/prop_model_501.nsbmd new file mode 100644 index 0000000000..11e203acb5 Binary files /dev/null and b/res/field/props/models/prop_model_501.nsbmd differ diff --git a/res/field/props/models/prop_model_503.nsbmd b/res/field/props/models/prop_model_503.nsbmd new file mode 100644 index 0000000000..27fd548e00 Binary files /dev/null and b/res/field/props/models/prop_model_503.nsbmd differ diff --git a/res/field/props/models/prop_model_504.nsbmd b/res/field/props/models/prop_model_504.nsbmd new file mode 100644 index 0000000000..7cb5339c24 Binary files /dev/null and b/res/field/props/models/prop_model_504.nsbmd differ diff --git a/res/field/props/models/prop_model_505.nsbmd b/res/field/props/models/prop_model_505.nsbmd new file mode 100644 index 0000000000..c23891c084 Binary files /dev/null and b/res/field/props/models/prop_model_505.nsbmd differ diff --git a/res/field/props/models/prop_model_506.nsbmd b/res/field/props/models/prop_model_506.nsbmd new file mode 100644 index 0000000000..aca5ca8d5e Binary files /dev/null and b/res/field/props/models/prop_model_506.nsbmd differ diff --git a/res/field/props/models/prop_model_508.nsbmd b/res/field/props/models/prop_model_508.nsbmd new file mode 100644 index 0000000000..393939e77f Binary files /dev/null and b/res/field/props/models/prop_model_508.nsbmd differ diff --git a/res/field/props/models/prop_model_509.nsbmd b/res/field/props/models/prop_model_509.nsbmd new file mode 100644 index 0000000000..beb78aa4f0 Binary files /dev/null and b/res/field/props/models/prop_model_509.nsbmd differ diff --git a/res/field/props/models/prop_model_510.nsbmd b/res/field/props/models/prop_model_510.nsbmd new file mode 100644 index 0000000000..ee03a346d6 Binary files /dev/null and b/res/field/props/models/prop_model_510.nsbmd differ diff --git a/res/field/props/models/prop_model_511.nsbmd b/res/field/props/models/prop_model_511.nsbmd new file mode 100644 index 0000000000..d6c61a366c Binary files /dev/null and b/res/field/props/models/prop_model_511.nsbmd differ diff --git a/res/field/props/models/prop_model_512.nsbmd b/res/field/props/models/prop_model_512.nsbmd new file mode 100644 index 0000000000..f50123a618 Binary files /dev/null and b/res/field/props/models/prop_model_512.nsbmd differ diff --git a/res/field/props/models/prop_model_513.nsbmd b/res/field/props/models/prop_model_513.nsbmd new file mode 100644 index 0000000000..befe4ea305 Binary files /dev/null and b/res/field/props/models/prop_model_513.nsbmd differ diff --git a/res/field/props/models/prop_model_514.nsbmd b/res/field/props/models/prop_model_514.nsbmd new file mode 100644 index 0000000000..a78f539938 Binary files /dev/null and b/res/field/props/models/prop_model_514.nsbmd differ diff --git a/res/field/props/models/prop_model_515.nsbmd b/res/field/props/models/prop_model_515.nsbmd new file mode 100644 index 0000000000..78cc3f9890 Binary files /dev/null and b/res/field/props/models/prop_model_515.nsbmd differ diff --git a/res/field/props/models/prop_model_516.nsbmd b/res/field/props/models/prop_model_516.nsbmd new file mode 100644 index 0000000000..f5eee7fee7 Binary files /dev/null and b/res/field/props/models/prop_model_516.nsbmd differ diff --git a/res/field/props/models/prop_model_518.nsbmd b/res/field/props/models/prop_model_518.nsbmd new file mode 100644 index 0000000000..531f4fc249 Binary files /dev/null and b/res/field/props/models/prop_model_518.nsbmd differ diff --git a/res/field/props/models/prop_model_519.nsbmd b/res/field/props/models/prop_model_519.nsbmd new file mode 100644 index 0000000000..e60fd25b82 Binary files /dev/null and b/res/field/props/models/prop_model_519.nsbmd differ diff --git a/res/field/props/models/prop_model_520.nsbmd b/res/field/props/models/prop_model_520.nsbmd new file mode 100644 index 0000000000..728b73625a Binary files /dev/null and b/res/field/props/models/prop_model_520.nsbmd differ diff --git a/res/field/props/models/prop_model_521.nsbmd b/res/field/props/models/prop_model_521.nsbmd new file mode 100644 index 0000000000..e6fd89eaa6 Binary files /dev/null and b/res/field/props/models/prop_model_521.nsbmd differ diff --git a/res/field/props/models/prop_model_522.nsbmd b/res/field/props/models/prop_model_522.nsbmd new file mode 100644 index 0000000000..2e78905aea Binary files /dev/null and b/res/field/props/models/prop_model_522.nsbmd differ diff --git a/res/field/props/models/prop_model_523.nsbmd b/res/field/props/models/prop_model_523.nsbmd new file mode 100644 index 0000000000..e010bb4c50 Binary files /dev/null and b/res/field/props/models/prop_model_523.nsbmd differ diff --git a/res/field/props/models/prop_model_524.nsbmd b/res/field/props/models/prop_model_524.nsbmd new file mode 100644 index 0000000000..5e0f433c3e Binary files /dev/null and b/res/field/props/models/prop_model_524.nsbmd differ diff --git a/res/field/props/models/prop_model_525.nsbmd b/res/field/props/models/prop_model_525.nsbmd new file mode 100644 index 0000000000..862842065e Binary files /dev/null and b/res/field/props/models/prop_model_525.nsbmd differ diff --git a/res/field/props/models/prop_model_526.nsbmd b/res/field/props/models/prop_model_526.nsbmd new file mode 100644 index 0000000000..4f27949435 Binary files /dev/null and b/res/field/props/models/prop_model_526.nsbmd differ diff --git a/res/field/props/models/prop_model_528.nsbmd b/res/field/props/models/prop_model_528.nsbmd new file mode 100644 index 0000000000..89c31377ad Binary files /dev/null and b/res/field/props/models/prop_model_528.nsbmd differ diff --git a/res/field/props/models/prop_model_529.nsbmd b/res/field/props/models/prop_model_529.nsbmd new file mode 100644 index 0000000000..a18de6f00d Binary files /dev/null and b/res/field/props/models/prop_model_529.nsbmd differ diff --git a/res/field/props/models/prop_model_530.nsbmd b/res/field/props/models/prop_model_530.nsbmd new file mode 100644 index 0000000000..5ef6fcb3dd Binary files /dev/null and b/res/field/props/models/prop_model_530.nsbmd differ diff --git a/res/field/props/models/prop_model_531.nsbmd b/res/field/props/models/prop_model_531.nsbmd new file mode 100644 index 0000000000..031788efe3 Binary files /dev/null and b/res/field/props/models/prop_model_531.nsbmd differ diff --git a/res/field/props/models/prop_model_532.nsbmd b/res/field/props/models/prop_model_532.nsbmd new file mode 100644 index 0000000000..5d482b2fb6 Binary files /dev/null and b/res/field/props/models/prop_model_532.nsbmd differ diff --git a/res/field/props/models/prop_model_533.nsbmd b/res/field/props/models/prop_model_533.nsbmd new file mode 100644 index 0000000000..201d3c4337 Binary files /dev/null and b/res/field/props/models/prop_model_533.nsbmd differ diff --git a/res/field/props/models/prop_model_534.nsbmd b/res/field/props/models/prop_model_534.nsbmd new file mode 100644 index 0000000000..fe130eaed1 Binary files /dev/null and b/res/field/props/models/prop_model_534.nsbmd differ diff --git a/res/field/props/models/prop_model_535.nsbmd b/res/field/props/models/prop_model_535.nsbmd new file mode 100644 index 0000000000..64fa94b4a0 Binary files /dev/null and b/res/field/props/models/prop_model_535.nsbmd differ diff --git a/res/field/props/models/prop_model_536.nsbmd b/res/field/props/models/prop_model_536.nsbmd new file mode 100644 index 0000000000..40482896f7 Binary files /dev/null and b/res/field/props/models/prop_model_536.nsbmd differ diff --git a/res/field/props/models/prop_model_537.nsbmd b/res/field/props/models/prop_model_537.nsbmd new file mode 100644 index 0000000000..9a6458bae6 Binary files /dev/null and b/res/field/props/models/prop_model_537.nsbmd differ diff --git a/res/field/props/models/prop_model_539.nsbmd b/res/field/props/models/prop_model_539.nsbmd new file mode 100644 index 0000000000..65324d93fe Binary files /dev/null and b/res/field/props/models/prop_model_539.nsbmd differ diff --git a/res/field/props/models/prop_model_540.nsbmd b/res/field/props/models/prop_model_540.nsbmd new file mode 100644 index 0000000000..43c170227e Binary files /dev/null and b/res/field/props/models/prop_model_540.nsbmd differ diff --git a/res/field/props/models/prop_model_541.nsbmd b/res/field/props/models/prop_model_541.nsbmd new file mode 100644 index 0000000000..5f069e77a6 Binary files /dev/null and b/res/field/props/models/prop_model_541.nsbmd differ diff --git a/res/field/props/models/prop_model_542.nsbmd b/res/field/props/models/prop_model_542.nsbmd new file mode 100644 index 0000000000..8ab4abf340 Binary files /dev/null and b/res/field/props/models/prop_model_542.nsbmd differ diff --git a/res/field/props/models/prop_model_543.nsbmd b/res/field/props/models/prop_model_543.nsbmd new file mode 100644 index 0000000000..154f2a99c2 Binary files /dev/null and b/res/field/props/models/prop_model_543.nsbmd differ diff --git a/res/field/props/models/prop_model_544.nsbmd b/res/field/props/models/prop_model_544.nsbmd new file mode 100644 index 0000000000..522e9c0024 Binary files /dev/null and b/res/field/props/models/prop_model_544.nsbmd differ diff --git a/res/field/props/models/prop_model_545.nsbmd b/res/field/props/models/prop_model_545.nsbmd new file mode 100644 index 0000000000..b97eea9264 Binary files /dev/null and b/res/field/props/models/prop_model_545.nsbmd differ diff --git a/res/field/props/models/prop_model_546.nsbmd b/res/field/props/models/prop_model_546.nsbmd new file mode 100644 index 0000000000..0fb6f9cb64 Binary files /dev/null and b/res/field/props/models/prop_model_546.nsbmd differ diff --git a/res/field/props/models/prop_model_547.nsbmd b/res/field/props/models/prop_model_547.nsbmd new file mode 100644 index 0000000000..7f9c7fd11a Binary files /dev/null and b/res/field/props/models/prop_model_547.nsbmd differ diff --git a/res/field/props/models/prop_model_548.nsbmd b/res/field/props/models/prop_model_548.nsbmd new file mode 100644 index 0000000000..6903a4d8c9 Binary files /dev/null and b/res/field/props/models/prop_model_548.nsbmd differ diff --git a/res/field/props/models/prop_model_549.nsbmd b/res/field/props/models/prop_model_549.nsbmd new file mode 100644 index 0000000000..d840ca4fc0 Binary files /dev/null and b/res/field/props/models/prop_model_549.nsbmd differ diff --git a/res/field/props/models/prop_model_550.nsbmd b/res/field/props/models/prop_model_550.nsbmd new file mode 100644 index 0000000000..84c7655faa Binary files /dev/null and b/res/field/props/models/prop_model_550.nsbmd differ diff --git a/res/field/props/models/prop_model_551.nsbmd b/res/field/props/models/prop_model_551.nsbmd new file mode 100644 index 0000000000..4865e4a8c1 Binary files /dev/null and b/res/field/props/models/prop_model_551.nsbmd differ diff --git a/res/field/props/models/prop_model_552.nsbmd b/res/field/props/models/prop_model_552.nsbmd new file mode 100644 index 0000000000..2b40ecaeed Binary files /dev/null and b/res/field/props/models/prop_model_552.nsbmd differ diff --git a/res/field/props/models/prop_model_553.nsbmd b/res/field/props/models/prop_model_553.nsbmd new file mode 100644 index 0000000000..292d52cf2a Binary files /dev/null and b/res/field/props/models/prop_model_553.nsbmd differ diff --git a/res/field/props/models/prop_model_554.nsbmd b/res/field/props/models/prop_model_554.nsbmd new file mode 100644 index 0000000000..34c6f72984 Binary files /dev/null and b/res/field/props/models/prop_model_554.nsbmd differ diff --git a/res/field/props/models/prop_model_555.nsbmd b/res/field/props/models/prop_model_555.nsbmd new file mode 100644 index 0000000000..81ff2822b6 Binary files /dev/null and b/res/field/props/models/prop_model_555.nsbmd differ diff --git a/res/field/props/models/prop_model_556.nsbmd b/res/field/props/models/prop_model_556.nsbmd new file mode 100644 index 0000000000..a539eadabf Binary files /dev/null and b/res/field/props/models/prop_model_556.nsbmd differ diff --git a/res/field/props/models/prop_model_557.nsbmd b/res/field/props/models/prop_model_557.nsbmd new file mode 100644 index 0000000000..f7195434ac Binary files /dev/null and b/res/field/props/models/prop_model_557.nsbmd differ diff --git a/res/field/props/models/prop_model_558.nsbmd b/res/field/props/models/prop_model_558.nsbmd new file mode 100644 index 0000000000..9979370cf0 Binary files /dev/null and b/res/field/props/models/prop_model_558.nsbmd differ diff --git a/res/field/props/models/prop_model_559.nsbmd b/res/field/props/models/prop_model_559.nsbmd new file mode 100644 index 0000000000..1a37c71aa8 Binary files /dev/null and b/res/field/props/models/prop_model_559.nsbmd differ diff --git a/res/field/props/models/prop_model_560.nsbmd b/res/field/props/models/prop_model_560.nsbmd new file mode 100644 index 0000000000..94f550684d Binary files /dev/null and b/res/field/props/models/prop_model_560.nsbmd differ diff --git a/res/field/props/models/prop_model_561.nsbmd b/res/field/props/models/prop_model_561.nsbmd new file mode 100644 index 0000000000..f5f51f246c Binary files /dev/null and b/res/field/props/models/prop_model_561.nsbmd differ diff --git a/res/field/props/models/prop_model_562.nsbmd b/res/field/props/models/prop_model_562.nsbmd new file mode 100644 index 0000000000..68f2e953fd Binary files /dev/null and b/res/field/props/models/prop_model_562.nsbmd differ diff --git a/res/field/props/models/prop_model_563.nsbmd b/res/field/props/models/prop_model_563.nsbmd new file mode 100644 index 0000000000..2af88ea7a5 Binary files /dev/null and b/res/field/props/models/prop_model_563.nsbmd differ diff --git a/res/field/props/models/prop_model_564.nsbmd b/res/field/props/models/prop_model_564.nsbmd new file mode 100644 index 0000000000..7540dc0ba2 Binary files /dev/null and b/res/field/props/models/prop_model_564.nsbmd differ diff --git a/res/field/props/models/prop_model_565.nsbmd b/res/field/props/models/prop_model_565.nsbmd new file mode 100644 index 0000000000..3dd5032cd7 Binary files /dev/null and b/res/field/props/models/prop_model_565.nsbmd differ diff --git a/res/field/props/models/prop_model_566.nsbmd b/res/field/props/models/prop_model_566.nsbmd new file mode 100644 index 0000000000..7b9cb646cf Binary files /dev/null and b/res/field/props/models/prop_model_566.nsbmd differ diff --git a/res/field/props/models/prop_model_567.nsbmd b/res/field/props/models/prop_model_567.nsbmd new file mode 100644 index 0000000000..59b45b14b9 Binary files /dev/null and b/res/field/props/models/prop_model_567.nsbmd differ diff --git a/res/field/props/models/prop_model_568.nsbmd b/res/field/props/models/prop_model_568.nsbmd new file mode 100644 index 0000000000..c0c30c47f9 Binary files /dev/null and b/res/field/props/models/prop_model_568.nsbmd differ diff --git a/res/field/props/models/prop_model_569.nsbmd b/res/field/props/models/prop_model_569.nsbmd new file mode 100644 index 0000000000..3b877815cc Binary files /dev/null and b/res/field/props/models/prop_model_569.nsbmd differ diff --git a/res/field/props/models/prop_model_570.nsbmd b/res/field/props/models/prop_model_570.nsbmd new file mode 100644 index 0000000000..ee37da5787 Binary files /dev/null and b/res/field/props/models/prop_model_570.nsbmd differ diff --git a/res/field/props/models/prop_model_571.nsbmd b/res/field/props/models/prop_model_571.nsbmd new file mode 100644 index 0000000000..90a5e1fbb3 Binary files /dev/null and b/res/field/props/models/prop_model_571.nsbmd differ diff --git a/res/field/props/models/prop_model_572.nsbmd b/res/field/props/models/prop_model_572.nsbmd new file mode 100644 index 0000000000..7b056e01ce Binary files /dev/null and b/res/field/props/models/prop_model_572.nsbmd differ diff --git a/res/field/props/models/prop_model_573.nsbmd b/res/field/props/models/prop_model_573.nsbmd new file mode 100644 index 0000000000..b911d52e17 Binary files /dev/null and b/res/field/props/models/prop_model_573.nsbmd differ diff --git a/res/field/props/models/prop_model_574.nsbmd b/res/field/props/models/prop_model_574.nsbmd new file mode 100644 index 0000000000..d7ebcf78c6 Binary files /dev/null and b/res/field/props/models/prop_model_574.nsbmd differ diff --git a/res/field/props/models/prop_model_575.nsbmd b/res/field/props/models/prop_model_575.nsbmd new file mode 100644 index 0000000000..bdff3aec2c Binary files /dev/null and b/res/field/props/models/prop_model_575.nsbmd differ diff --git a/res/field/props/models/prop_model_576.nsbmd b/res/field/props/models/prop_model_576.nsbmd new file mode 100644 index 0000000000..cccd6e8775 Binary files /dev/null and b/res/field/props/models/prop_model_576.nsbmd differ diff --git a/res/field/props/models/prop_model_577.nsbmd b/res/field/props/models/prop_model_577.nsbmd new file mode 100644 index 0000000000..b4e5d698c4 Binary files /dev/null and b/res/field/props/models/prop_model_577.nsbmd differ diff --git a/res/field/props/models/prop_model_578.nsbmd b/res/field/props/models/prop_model_578.nsbmd new file mode 100644 index 0000000000..3e0838ca6a Binary files /dev/null and b/res/field/props/models/prop_model_578.nsbmd differ diff --git a/res/field/props/models/prop_model_579.nsbmd b/res/field/props/models/prop_model_579.nsbmd new file mode 100644 index 0000000000..7949cc4846 Binary files /dev/null and b/res/field/props/models/prop_model_579.nsbmd differ diff --git a/res/field/props/models/prop_model_580.nsbmd b/res/field/props/models/prop_model_580.nsbmd new file mode 100644 index 0000000000..3731b44ed3 Binary files /dev/null and b/res/field/props/models/prop_model_580.nsbmd differ diff --git a/res/field/props/models/prop_model_581.nsbmd b/res/field/props/models/prop_model_581.nsbmd new file mode 100644 index 0000000000..cb22c23919 Binary files /dev/null and b/res/field/props/models/prop_model_581.nsbmd differ diff --git a/res/field/props/models/prop_model_582.nsbmd b/res/field/props/models/prop_model_582.nsbmd new file mode 100644 index 0000000000..a8727a7d37 Binary files /dev/null and b/res/field/props/models/prop_model_582.nsbmd differ diff --git a/res/field/props/models/prop_model_583.nsbmd b/res/field/props/models/prop_model_583.nsbmd new file mode 100644 index 0000000000..da9f3c61ea Binary files /dev/null and b/res/field/props/models/prop_model_583.nsbmd differ diff --git a/res/field/props/models/prop_model_584.nsbmd b/res/field/props/models/prop_model_584.nsbmd new file mode 100644 index 0000000000..8cd9c01d3a Binary files /dev/null and b/res/field/props/models/prop_model_584.nsbmd differ diff --git a/res/field/props/models/prop_model_585.nsbmd b/res/field/props/models/prop_model_585.nsbmd new file mode 100644 index 0000000000..288b82b0cc Binary files /dev/null and b/res/field/props/models/prop_model_585.nsbmd differ diff --git a/res/field/props/models/prop_model_586.nsbmd b/res/field/props/models/prop_model_586.nsbmd new file mode 100644 index 0000000000..28db6582d5 Binary files /dev/null and b/res/field/props/models/prop_model_586.nsbmd differ diff --git a/res/field/props/models/prop_model_587.nsbmd b/res/field/props/models/prop_model_587.nsbmd new file mode 100644 index 0000000000..db393c203e Binary files /dev/null and b/res/field/props/models/prop_model_587.nsbmd differ diff --git a/res/field/props/models/prop_model_588.nsbmd b/res/field/props/models/prop_model_588.nsbmd new file mode 100644 index 0000000000..35e8206476 Binary files /dev/null and b/res/field/props/models/prop_model_588.nsbmd differ diff --git a/res/field/props/models/prop_model_589.nsbmd b/res/field/props/models/prop_model_589.nsbmd new file mode 100644 index 0000000000..463100218c Binary files /dev/null and b/res/field/props/models/prop_model_589.nsbmd differ diff --git a/res/field/props/models/regular_ship.nsbmd b/res/field/props/models/regular_ship.nsbmd new file mode 100644 index 0000000000..246c258dfe Binary files /dev/null and b/res/field/props/models/regular_ship.nsbmd differ diff --git a/res/field/props/models/screw_steamship_spiral.nsbmd b/res/field/props/models/screw_steamship_spiral.nsbmd new file mode 100644 index 0000000000..647ad966f0 Binary files /dev/null and b/res/field/props/models/screw_steamship_spiral.nsbmd differ diff --git a/res/field/props/models/secret_base_entrance_east.nsbmd b/res/field/props/models/secret_base_entrance_east.nsbmd new file mode 100644 index 0000000000..cb76d8004c Binary files /dev/null and b/res/field/props/models/secret_base_entrance_east.nsbmd differ diff --git a/res/field/props/models/secret_base_entrance_north.nsbmd b/res/field/props/models/secret_base_entrance_north.nsbmd new file mode 100644 index 0000000000..6618c6a87e Binary files /dev/null and b/res/field/props/models/secret_base_entrance_north.nsbmd differ diff --git a/res/field/props/models/secret_base_entrance_south.nsbmd b/res/field/props/models/secret_base_entrance_south.nsbmd new file mode 100644 index 0000000000..37759c4f16 Binary files /dev/null and b/res/field/props/models/secret_base_entrance_south.nsbmd differ diff --git a/res/field/props/models/secret_base_entrance_west.nsbmd b/res/field/props/models/secret_base_entrance_west.nsbmd new file mode 100644 index 0000000000..3cda5b51db Binary files /dev/null and b/res/field/props/models/secret_base_entrance_west.nsbmd differ diff --git a/res/field/props/models/secret_base_pc_bronze_flag.nsbmd b/res/field/props/models/secret_base_pc_bronze_flag.nsbmd new file mode 100644 index 0000000000..22719b099c Binary files /dev/null and b/res/field/props/models/secret_base_pc_bronze_flag.nsbmd differ diff --git a/res/field/props/models/secret_base_pc_gold_flag.nsbmd b/res/field/props/models/secret_base_pc_gold_flag.nsbmd new file mode 100644 index 0000000000..85386a9a70 Binary files /dev/null and b/res/field/props/models/secret_base_pc_gold_flag.nsbmd differ diff --git a/res/field/props/models/secret_base_pc_normal_flag.nsbmd b/res/field/props/models/secret_base_pc_normal_flag.nsbmd new file mode 100644 index 0000000000..ff06820f1f Binary files /dev/null and b/res/field/props/models/secret_base_pc_normal_flag.nsbmd differ diff --git a/res/field/props/models/secret_base_pc_platinum_flag.nsbmd b/res/field/props/models/secret_base_pc_platinum_flag.nsbmd new file mode 100644 index 0000000000..b61ff8cd75 Binary files /dev/null and b/res/field/props/models/secret_base_pc_platinum_flag.nsbmd differ diff --git a/res/field/props/models/secret_base_pc_silver_flag.nsbmd b/res/field/props/models/secret_base_pc_silver_flag.nsbmd new file mode 100644 index 0000000000..f2959403c9 Binary files /dev/null and b/res/field/props/models/secret_base_pc_silver_flag.nsbmd differ diff --git a/res/field/props/models/veilstone_dpt_store_door.nsbmd b/res/field/props/models/veilstone_dpt_store_door.nsbmd new file mode 100644 index 0000000000..6c0497391a Binary files /dev/null and b/res/field/props/models/veilstone_dpt_store_door.nsbmd differ diff --git a/res/field/props/models/yellow_wooden_door.nsbmd b/res/field/props/models/yellow_wooden_door.nsbmd new file mode 100644 index 0000000000..fddc408d94 Binary files /dev/null and b/res/field/props/models/yellow_wooden_door.nsbmd differ diff --git a/res/field/props/texture_sets/meson.build b/res/field/props/texture_sets/meson.build new file mode 100644 index 0000000000..e6be144569 --- /dev/null +++ b/res/field/props/texture_sets/meson.build @@ -0,0 +1,92 @@ +prop_texture_set_files = copy_gen.process(files( + 'prop_texture_set_000.nsbtx', + 'prop_texture_set_001.nsbtx', + 'prop_texture_set_002.nsbtx', + 'prop_texture_set_003.nsbtx', + 'prop_texture_set_004.nsbtx', + 'prop_texture_set_005.nsbtx', + 'prop_texture_set_006.nsbtx', + 'prop_texture_set_007.nsbtx', + 'prop_texture_set_008.nsbtx', + 'prop_texture_set_009.nsbtx', + 'prop_texture_set_010.nsbtx', + 'prop_texture_set_011.nsbtx', + 'prop_texture_set_012.nsbtx', + 'prop_texture_set_013.nsbtx', + 'prop_texture_set_014.nsbtx', + 'prop_texture_set_015.nsbtx', + 'prop_texture_set_016.nsbtx', + 'prop_texture_set_017.nsbtx', + 'prop_texture_set_018.nsbtx', + 'prop_texture_set_019.nsbtx', + 'prop_texture_set_020.nsbtx', + 'prop_texture_set_021.nsbtx', + 'prop_texture_set_022.nsbtx', + 'prop_texture_set_023.nsbtx', + 'prop_texture_set_024.nsbtx', + 'prop_texture_set_025.nsbtx', + 'prop_texture_set_026.nsbtx', + 'prop_texture_set_027.nsbtx', + 'prop_texture_set_028.nsbtx', + 'prop_texture_set_029.nsbtx', + 'prop_texture_set_030.nsbtx', + 'prop_texture_set_031.nsbtx', + 'prop_texture_set_032.nsbtx', + 'prop_texture_set_033.nsbtx', + 'prop_texture_set_034.nsbtx', + 'prop_texture_set_035.nsbtx', + 'prop_texture_set_036.nsbtx', + 'prop_texture_set_037.nsbtx', + 'prop_texture_set_038.nsbtx', + 'prop_texture_set_039.nsbtx', + 'prop_texture_set_040.nsbtx', + 'prop_texture_set_041.nsbtx', + 'prop_texture_set_042.nsbtx', + 'prop_texture_set_043.nsbtx', + 'prop_texture_set_044.nsbtx', + 'prop_texture_set_045.nsbtx', + 'prop_texture_set_046.nsbtx', + 'prop_texture_set_047.nsbtx', + 'prop_texture_set_048.nsbtx', + 'prop_texture_set_049.nsbtx', + 'prop_texture_set_050.nsbtx', + 'prop_texture_set_051.nsbtx', + 'prop_texture_set_052.nsbtx', + 'prop_texture_set_053.nsbtx', + 'prop_texture_set_054.nsbtx', + 'prop_texture_set_055.nsbtx', + 'prop_texture_set_056.nsbtx', + 'prop_texture_set_057.nsbtx', + 'prop_texture_set_058.nsbtx', + 'prop_texture_set_059.nsbtx', + 'prop_texture_set_060.nsbtx', + 'prop_texture_set_061.nsbtx', + 'prop_texture_set_062.nsbtx', + 'prop_texture_set_063.nsbtx', + 'prop_texture_set_064.nsbtx', + 'prop_texture_set_065.nsbtx', + 'prop_texture_set_066.nsbtx', + 'prop_texture_set_067.nsbtx', + 'prop_texture_set_068.nsbtx', + 'prop_texture_set_069.nsbtx', + 'prop_texture_set_070.nsbtx' +)) + +prop_texture_set_order = files('prop_texture_sets.order') +prop_texture_set_narc = custom_target('prop_texture_sets.narc', + output: [ + 'prop_texture_sets.narc', + ], + input: [ + prop_texture_set_files, + prop_texture_set_order, + ], + command: [ + narc_exe, 'create', + '--order', prop_texture_set_order, + '--output', '@OUTPUT0@', + '@PRIVATE_DIR@', + ] +) + +nitrofs_files += prop_texture_set_narc diff --git a/res/field/props/texture_sets/prop_texture_set_000.nsbtx b/res/field/props/texture_sets/prop_texture_set_000.nsbtx new file mode 100644 index 0000000000..6ee8b0fba8 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_000.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_001.nsbtx b/res/field/props/texture_sets/prop_texture_set_001.nsbtx new file mode 100644 index 0000000000..4b32aea8f0 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_001.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_002.nsbtx b/res/field/props/texture_sets/prop_texture_set_002.nsbtx new file mode 100644 index 0000000000..41ac6773b5 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_002.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_003.nsbtx b/res/field/props/texture_sets/prop_texture_set_003.nsbtx new file mode 100644 index 0000000000..da469f67a5 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_003.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_004.nsbtx b/res/field/props/texture_sets/prop_texture_set_004.nsbtx new file mode 100644 index 0000000000..52d4708569 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_004.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_005.nsbtx b/res/field/props/texture_sets/prop_texture_set_005.nsbtx new file mode 100644 index 0000000000..ef603e0fd9 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_005.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_006.nsbtx b/res/field/props/texture_sets/prop_texture_set_006.nsbtx new file mode 100644 index 0000000000..6a6b6a35a6 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_006.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_007.nsbtx b/res/field/props/texture_sets/prop_texture_set_007.nsbtx new file mode 100644 index 0000000000..b90b30a36a Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_007.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_008.nsbtx b/res/field/props/texture_sets/prop_texture_set_008.nsbtx new file mode 100644 index 0000000000..5ccb1b6e45 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_008.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_009.nsbtx b/res/field/props/texture_sets/prop_texture_set_009.nsbtx new file mode 100644 index 0000000000..3237fb65f3 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_009.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_010.nsbtx b/res/field/props/texture_sets/prop_texture_set_010.nsbtx new file mode 100644 index 0000000000..a8c39b93ae Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_010.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_011.nsbtx b/res/field/props/texture_sets/prop_texture_set_011.nsbtx new file mode 100644 index 0000000000..af11dc205d Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_011.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_012.nsbtx b/res/field/props/texture_sets/prop_texture_set_012.nsbtx new file mode 100644 index 0000000000..70354f0425 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_012.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_013.nsbtx b/res/field/props/texture_sets/prop_texture_set_013.nsbtx new file mode 100644 index 0000000000..cf4b18cf0d Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_013.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_014.nsbtx b/res/field/props/texture_sets/prop_texture_set_014.nsbtx new file mode 100644 index 0000000000..b1a3c054b2 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_014.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_015.nsbtx b/res/field/props/texture_sets/prop_texture_set_015.nsbtx new file mode 100644 index 0000000000..97af0bc493 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_015.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_016.nsbtx b/res/field/props/texture_sets/prop_texture_set_016.nsbtx new file mode 100644 index 0000000000..b47800fcdb Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_016.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_017.nsbtx b/res/field/props/texture_sets/prop_texture_set_017.nsbtx new file mode 100644 index 0000000000..5f34dd0d63 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_017.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_018.nsbtx b/res/field/props/texture_sets/prop_texture_set_018.nsbtx new file mode 100644 index 0000000000..2c952416b8 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_018.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_019.nsbtx b/res/field/props/texture_sets/prop_texture_set_019.nsbtx new file mode 100644 index 0000000000..0b20ae2443 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_019.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_020.nsbtx b/res/field/props/texture_sets/prop_texture_set_020.nsbtx new file mode 100644 index 0000000000..3729db1611 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_020.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_021.nsbtx b/res/field/props/texture_sets/prop_texture_set_021.nsbtx new file mode 100644 index 0000000000..962bc3834a Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_021.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_022.nsbtx b/res/field/props/texture_sets/prop_texture_set_022.nsbtx new file mode 100644 index 0000000000..f4d6730b5b Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_022.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_023.nsbtx b/res/field/props/texture_sets/prop_texture_set_023.nsbtx new file mode 100644 index 0000000000..6f6ad6eec7 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_023.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_024.nsbtx b/res/field/props/texture_sets/prop_texture_set_024.nsbtx new file mode 100644 index 0000000000..a372395f1b Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_024.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_025.nsbtx b/res/field/props/texture_sets/prop_texture_set_025.nsbtx new file mode 100644 index 0000000000..962bc3834a Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_025.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_026.nsbtx b/res/field/props/texture_sets/prop_texture_set_026.nsbtx new file mode 100644 index 0000000000..0ebc330d3a Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_026.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_027.nsbtx b/res/field/props/texture_sets/prop_texture_set_027.nsbtx new file mode 100644 index 0000000000..c6f2059dea Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_027.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_028.nsbtx b/res/field/props/texture_sets/prop_texture_set_028.nsbtx new file mode 100644 index 0000000000..6cd9ba7904 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_028.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_029.nsbtx b/res/field/props/texture_sets/prop_texture_set_029.nsbtx new file mode 100644 index 0000000000..18dd4dfc9e Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_029.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_030.nsbtx b/res/field/props/texture_sets/prop_texture_set_030.nsbtx new file mode 100644 index 0000000000..da1a775880 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_030.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_031.nsbtx b/res/field/props/texture_sets/prop_texture_set_031.nsbtx new file mode 100644 index 0000000000..6cd9ba7904 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_031.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_032.nsbtx b/res/field/props/texture_sets/prop_texture_set_032.nsbtx new file mode 100644 index 0000000000..18e8987cb4 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_032.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_033.nsbtx b/res/field/props/texture_sets/prop_texture_set_033.nsbtx new file mode 100644 index 0000000000..74ec171a2c Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_033.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_034.nsbtx b/res/field/props/texture_sets/prop_texture_set_034.nsbtx new file mode 100644 index 0000000000..250761e94e Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_034.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_035.nsbtx b/res/field/props/texture_sets/prop_texture_set_035.nsbtx new file mode 100644 index 0000000000..efc18f6f46 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_035.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_036.nsbtx b/res/field/props/texture_sets/prop_texture_set_036.nsbtx new file mode 100644 index 0000000000..ab32c386c3 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_036.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_037.nsbtx b/res/field/props/texture_sets/prop_texture_set_037.nsbtx new file mode 100644 index 0000000000..6cd9ba7904 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_037.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_038.nsbtx b/res/field/props/texture_sets/prop_texture_set_038.nsbtx new file mode 100644 index 0000000000..58a99aafd9 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_038.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_039.nsbtx b/res/field/props/texture_sets/prop_texture_set_039.nsbtx new file mode 100644 index 0000000000..cf9bc599f0 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_039.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_040.nsbtx b/res/field/props/texture_sets/prop_texture_set_040.nsbtx new file mode 100644 index 0000000000..56c6991d67 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_040.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_041.nsbtx b/res/field/props/texture_sets/prop_texture_set_041.nsbtx new file mode 100644 index 0000000000..6650e7525f Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_041.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_042.nsbtx b/res/field/props/texture_sets/prop_texture_set_042.nsbtx new file mode 100644 index 0000000000..294014390a Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_042.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_043.nsbtx b/res/field/props/texture_sets/prop_texture_set_043.nsbtx new file mode 100644 index 0000000000..c07a0ccdcc Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_043.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_044.nsbtx b/res/field/props/texture_sets/prop_texture_set_044.nsbtx new file mode 100644 index 0000000000..a38315f9c2 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_044.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_045.nsbtx b/res/field/props/texture_sets/prop_texture_set_045.nsbtx new file mode 100644 index 0000000000..c07a0ccdcc Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_045.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_046.nsbtx b/res/field/props/texture_sets/prop_texture_set_046.nsbtx new file mode 100644 index 0000000000..eee8b6f97e Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_046.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_047.nsbtx b/res/field/props/texture_sets/prop_texture_set_047.nsbtx new file mode 100644 index 0000000000..bb9663836a Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_047.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_048.nsbtx b/res/field/props/texture_sets/prop_texture_set_048.nsbtx new file mode 100644 index 0000000000..a1ab0a038f Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_048.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_049.nsbtx b/res/field/props/texture_sets/prop_texture_set_049.nsbtx new file mode 100644 index 0000000000..e87bd1ace6 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_049.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_050.nsbtx b/res/field/props/texture_sets/prop_texture_set_050.nsbtx new file mode 100644 index 0000000000..24f7780326 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_050.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_051.nsbtx b/res/field/props/texture_sets/prop_texture_set_051.nsbtx new file mode 100644 index 0000000000..f2969b1803 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_051.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_052.nsbtx b/res/field/props/texture_sets/prop_texture_set_052.nsbtx new file mode 100644 index 0000000000..0926d57609 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_052.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_053.nsbtx b/res/field/props/texture_sets/prop_texture_set_053.nsbtx new file mode 100644 index 0000000000..699150c4b8 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_053.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_054.nsbtx b/res/field/props/texture_sets/prop_texture_set_054.nsbtx new file mode 100644 index 0000000000..85f2c11f14 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_054.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_055.nsbtx b/res/field/props/texture_sets/prop_texture_set_055.nsbtx new file mode 100644 index 0000000000..0febc83a06 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_055.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_056.nsbtx b/res/field/props/texture_sets/prop_texture_set_056.nsbtx new file mode 100644 index 0000000000..6f1c89b5de Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_056.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_057.nsbtx b/res/field/props/texture_sets/prop_texture_set_057.nsbtx new file mode 100644 index 0000000000..9cd1c1f9d5 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_057.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_058.nsbtx b/res/field/props/texture_sets/prop_texture_set_058.nsbtx new file mode 100644 index 0000000000..3607b8ded2 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_058.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_059.nsbtx b/res/field/props/texture_sets/prop_texture_set_059.nsbtx new file mode 100644 index 0000000000..593ac335b1 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_059.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_060.nsbtx b/res/field/props/texture_sets/prop_texture_set_060.nsbtx new file mode 100644 index 0000000000..dfa8f1c11a Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_060.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_061.nsbtx b/res/field/props/texture_sets/prop_texture_set_061.nsbtx new file mode 100644 index 0000000000..b822d10cbe Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_061.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_062.nsbtx b/res/field/props/texture_sets/prop_texture_set_062.nsbtx new file mode 100644 index 0000000000..4926bec4a0 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_062.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_063.nsbtx b/res/field/props/texture_sets/prop_texture_set_063.nsbtx new file mode 100644 index 0000000000..0f86914618 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_063.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_064.nsbtx b/res/field/props/texture_sets/prop_texture_set_064.nsbtx new file mode 100644 index 0000000000..919831080d Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_064.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_065.nsbtx b/res/field/props/texture_sets/prop_texture_set_065.nsbtx new file mode 100644 index 0000000000..ae202178b1 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_065.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_066.nsbtx b/res/field/props/texture_sets/prop_texture_set_066.nsbtx new file mode 100644 index 0000000000..e87bd1ace6 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_066.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_067.nsbtx b/res/field/props/texture_sets/prop_texture_set_067.nsbtx new file mode 100644 index 0000000000..e87bd1ace6 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_067.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_068.nsbtx b/res/field/props/texture_sets/prop_texture_set_068.nsbtx new file mode 100644 index 0000000000..fa2a332408 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_068.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_069.nsbtx b/res/field/props/texture_sets/prop_texture_set_069.nsbtx new file mode 100644 index 0000000000..a1c826f7d0 Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_069.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_set_070.nsbtx b/res/field/props/texture_sets/prop_texture_set_070.nsbtx new file mode 100644 index 0000000000..1c59c2604f Binary files /dev/null and b/res/field/props/texture_sets/prop_texture_set_070.nsbtx differ diff --git a/res/field/props/texture_sets/prop_texture_sets.order b/res/field/props/texture_sets/prop_texture_sets.order new file mode 100644 index 0000000000..43e9324e63 --- /dev/null +++ b/res/field/props/texture_sets/prop_texture_sets.order @@ -0,0 +1,71 @@ +prop_texture_set_000.nsbtx +prop_texture_set_001.nsbtx +prop_texture_set_002.nsbtx +prop_texture_set_003.nsbtx +prop_texture_set_004.nsbtx +prop_texture_set_005.nsbtx +prop_texture_set_006.nsbtx +prop_texture_set_007.nsbtx +prop_texture_set_008.nsbtx +prop_texture_set_009.nsbtx +prop_texture_set_010.nsbtx +prop_texture_set_011.nsbtx +prop_texture_set_012.nsbtx +prop_texture_set_013.nsbtx +prop_texture_set_014.nsbtx +prop_texture_set_015.nsbtx +prop_texture_set_016.nsbtx +prop_texture_set_017.nsbtx +prop_texture_set_018.nsbtx +prop_texture_set_019.nsbtx +prop_texture_set_020.nsbtx +prop_texture_set_021.nsbtx +prop_texture_set_022.nsbtx +prop_texture_set_023.nsbtx +prop_texture_set_024.nsbtx +prop_texture_set_025.nsbtx +prop_texture_set_026.nsbtx +prop_texture_set_027.nsbtx +prop_texture_set_028.nsbtx +prop_texture_set_029.nsbtx +prop_texture_set_030.nsbtx +prop_texture_set_031.nsbtx +prop_texture_set_032.nsbtx +prop_texture_set_033.nsbtx +prop_texture_set_034.nsbtx +prop_texture_set_035.nsbtx +prop_texture_set_036.nsbtx +prop_texture_set_037.nsbtx +prop_texture_set_038.nsbtx +prop_texture_set_039.nsbtx +prop_texture_set_040.nsbtx +prop_texture_set_041.nsbtx +prop_texture_set_042.nsbtx +prop_texture_set_043.nsbtx +prop_texture_set_044.nsbtx +prop_texture_set_045.nsbtx +prop_texture_set_046.nsbtx +prop_texture_set_047.nsbtx +prop_texture_set_048.nsbtx +prop_texture_set_049.nsbtx +prop_texture_set_050.nsbtx +prop_texture_set_051.nsbtx +prop_texture_set_052.nsbtx +prop_texture_set_053.nsbtx +prop_texture_set_054.nsbtx +prop_texture_set_055.nsbtx +prop_texture_set_056.nsbtx +prop_texture_set_057.nsbtx +prop_texture_set_058.nsbtx +prop_texture_set_059.nsbtx +prop_texture_set_060.nsbtx +prop_texture_set_061.nsbtx +prop_texture_set_062.nsbtx +prop_texture_set_063.nsbtx +prop_texture_set_064.nsbtx +prop_texture_set_065.nsbtx +prop_texture_set_066.nsbtx +prop_texture_set_067.nsbtx +prop_texture_set_068.nsbtx +prop_texture_set_069.nsbtx +prop_texture_set_070.nsbtx diff --git a/res/field/trades/meson.build b/res/field/trades/meson.build index 96ca7abfa3..bd738056ba 100644 --- a/res/field/trades/meson.build +++ b/res/field/trades/meson.build @@ -17,7 +17,7 @@ endforeach npc_trades_order = files('npc_trades.order') npc_trades_narc = custom_target('fld_trade.narc', output: 'fld_trade.narc', - input: npc_trades_bin_gen.process(npc_trades_files, env: json2bin_env), + input: npc_trades_bin_gen.process(npc_trades_files, env: jsoncnv_env), depends: [ py_consts_generators ], command: [ narc_exe, 'create', diff --git a/res/prebuilt/arc/bm_anime.narc b/res/prebuilt/arc/bm_anime.narc deleted file mode 100644 index b5f4b06290..0000000000 Binary files a/res/prebuilt/arc/bm_anime.narc and /dev/null differ diff --git a/res/prebuilt/arc/meson.build b/res/prebuilt/arc/meson.build index 19c4e21154..7ba8313166 100644 --- a/res/prebuilt/arc/meson.build +++ b/res/prebuilt/arc/meson.build @@ -2,7 +2,6 @@ prebuilt_files = [ 'area_win_gra.narc', 'balance_ball_gra.narc', 'bm_anime_list.narc', - 'bm_anime.narc', 'codein_gra.narc', 'demo_tengan_gra.narc', 'email_gra.narc', diff --git a/res/prebuilt/data/arealight.narc b/res/prebuilt/data/arealight.narc deleted file mode 100644 index ad1ef45dd1..0000000000 Binary files a/res/prebuilt/data/arealight.narc and /dev/null differ diff --git a/res/prebuilt/data/meson.build b/res/prebuilt/data/meson.build index 5f2aeed223..04d5abab4a 100644 --- a/res/prebuilt/data/meson.build +++ b/res/prebuilt/data/meson.build @@ -2,7 +2,6 @@ subdir('mmodel') subdir('sound') prebuilt_files = [ - 'arealight.narc', 'battle_win.NSCR', 'btower_canm.resdat', 'btower_celact.cldat', diff --git a/res/prebuilt/fielddata/areadata/area_build_model/area_build.narc b/res/prebuilt/fielddata/areadata/area_build_model/area_build.narc deleted file mode 100644 index 1e68601d8d..0000000000 Binary files a/res/prebuilt/fielddata/areadata/area_build_model/area_build.narc and /dev/null differ diff --git a/res/prebuilt/fielddata/areadata/area_build_model/areabm_texset.narc b/res/prebuilt/fielddata/areadata/area_build_model/areabm_texset.narc deleted file mode 100644 index 91dac5c49e..0000000000 Binary files a/res/prebuilt/fielddata/areadata/area_build_model/areabm_texset.narc and /dev/null differ diff --git a/res/prebuilt/fielddata/areadata/area_build_model/meson.build b/res/prebuilt/fielddata/areadata/area_build_model/meson.build deleted file mode 100644 index c7820f13a2..0000000000 --- a/res/prebuilt/fielddata/areadata/area_build_model/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -prebuilt_files = [ - 'area_build.narc', - 'areabm_texset.narc' -] - -foreach f : prebuilt_files - nitrofs_files += fs.copyfile(f) -endforeach \ No newline at end of file diff --git a/res/prebuilt/fielddata/areadata/area_data.narc b/res/prebuilt/fielddata/areadata/area_data.narc deleted file mode 100644 index 7509bf9ea4..0000000000 Binary files a/res/prebuilt/fielddata/areadata/area_data.narc and /dev/null differ diff --git a/res/prebuilt/fielddata/areadata/meson.build b/res/prebuilt/fielddata/areadata/meson.build index 322aa9ecf1..bb7771cff8 100644 --- a/res/prebuilt/fielddata/areadata/meson.build +++ b/res/prebuilt/fielddata/areadata/meson.build @@ -1,10 +1 @@ -subdir('area_build_model') subdir('area_move_model') - -prebuilt_files = [ - 'area_data.narc' -] - -foreach f : prebuilt_files - nitrofs_files += fs.copyfile(f) -endforeach diff --git a/res/prebuilt/fielddata/build_model/build_model.narc b/res/prebuilt/fielddata/build_model/build_model.narc deleted file mode 100644 index 799059665c..0000000000 Binary files a/res/prebuilt/fielddata/build_model/build_model.narc and /dev/null differ diff --git a/res/prebuilt/fielddata/build_model/meson.build b/res/prebuilt/fielddata/build_model/meson.build index efa8dffeda..5b48e4fb32 100644 --- a/res/prebuilt/fielddata/build_model/meson.build +++ b/res/prebuilt/fielddata/build_model/meson.build @@ -1,6 +1,5 @@ prebuilt_files = [ - 'build_model_matshp.dat', - 'build_model.narc' + 'build_model_matshp.dat' ] foreach f : prebuilt_files diff --git a/src/cutscenes/boat_cutscene/boat_cutscene.c b/src/cutscenes/boat_cutscene/boat_cutscene.c index 6d494ae928..a8c8e85420 100644 --- a/src/cutscenes/boat_cutscene/boat_cutscene.c +++ b/src/cutscenes/boat_cutscene/boat_cutscene.c @@ -3,7 +3,6 @@ #include #include -#include "constants/field/map_prop.h" #include "constants/map_object.h" #include "field/field_system.h" @@ -25,6 +24,8 @@ #include "unk_0203D1B8.h" #include "unk_020553DC.h" +#include "res/field/props/models/prop_models.naix.h" + #define BOAT_CUTSCENE_STATE_START_WITHOUT_BRIDGE 0 #define BOAT_CUTSCENE_STATE_START_WITH_BRIDGE 1 #define BOAT_CUTSCENE_STATE_FADE_OUT_START 2 @@ -97,13 +98,13 @@ void FieldSystem_PlayBoatCutscene(FieldSystem *fieldSystem, const u8 travelDir, Sound_SetSceneAndPlayBGM(SOUND_SCENE_SUB_64, SEQ_NONE, 0); if (travelDir == BOAT_TRAVEL_DIR_NORTH_TO_SOUTH) { - targetMapPropModelID = MAP_PROP_MODEL_REGULAR_SHIP; + targetMapPropModelID = regular_ship_nsbmd; TerrainCollisionHitbox_Init(Player_GetXPos(fieldSystem->playerAvatar), Player_GetZPos(fieldSystem->playerAvatar), 1, -3, 3, 6, &hitbox); moveBeforeFadeOut = TRUE; goalDistance = (25 * MAP_OBJECT_TILE_SIZE); boatCutscene->bridgeDistance = (14 * MAP_OBJECT_TILE_SIZE); } else if (travelDir == BOAT_TRAVEL_DIR_WEST_TO_EAST) { - targetMapPropModelID = MAP_PROP_MODEL_SCREW_STEAMSHIP_SPIRAL; + targetMapPropModelID = screw_steamship_spiral_nsbmd; TerrainCollisionHitbox_Init(Player_GetXPos(fieldSystem->playerAvatar), Player_GetZPos(fieldSystem->playerAvatar), -2, 2, 6, 3, &hitbox); moveBeforeFadeOut = TRUE; goalDistance = (12 * MAP_OBJECT_TILE_SIZE); @@ -313,8 +314,8 @@ static void FieldSystem_LoadCanalaveBridgeAnimation(FieldSystem *fieldSystem) u8 bridgeIndex; BOOL mapPropLoaded; int bridgeIDs[2] = { - MAP_PROP_MODEL_CANALAVE_BRIDGE_LEFT, - MAP_PROP_MODEL_CANALAVE_BRIDGE_RIGHT + canalave_bridge_left_nsbmd, + canalave_bridge_right_nsbmd }; int tags[2] = { BOAT_CUTSCENE_BRIDGE_ANIMATION_TAG_LEFT, diff --git a/src/overlay005/honey_tree.c b/src/overlay005/honey_tree.c index 744f5f82da..945f9594d4 100644 --- a/src/overlay005/honey_tree.c +++ b/src/overlay005/honey_tree.c @@ -3,7 +3,6 @@ #include #include -#include "constants/field/map_prop.h" #include "constants/map_object.h" #include "generated/map_headers.h" @@ -22,6 +21,8 @@ #include "terrain_collision_manager.h" #include "trainer_info.h" +#include "res/field/props/models/prop_models.naix.h" + #define TREE_GROUP_NO_ENCOUNTER 0 #define TREE_GROUP_A 1 #define TREE_GROUP_B 2 @@ -106,7 +107,7 @@ BOOL HoneyTree_TryInteract(FieldSystem *fieldSystem, int *eventId) if (PlayerAvatar_GetDir(fieldSystem->playerAvatar) == DIR_NORTH) { // Honey Trees can only be interacted with from below. TerrainCollisionHitbox_Init(x, z, 0, -1, 1, 1, &v0); - isFacingHoneyTree = FieldSystem_FindCollidingLoadedMapPropByModelID(fieldSystem, MAP_PROP_MODEL_HONEY_TREE, &v0, NULL); + isFacingHoneyTree = FieldSystem_FindCollidingLoadedMapPropByModelID(fieldSystem, honey_tree_nsbmd, &v0, NULL); } else { isFacingHoneyTree = FALSE; } @@ -194,11 +195,11 @@ void HoneyTree_StopShaking(FieldSystem *fieldSystem) LandDataManager_GetLoadedMapPropManager(v1, fieldSystem->landDataMan, &v3); - v2 = MapPropManager_FindLoadedPropByModelID(v3, MAP_PROP_MODEL_HONEY_TREE); + v2 = MapPropManager_FindLoadedPropByModelID(v3, honey_tree_nsbmd); v4 = MapProp_GetRenderObj(v2); if (v2 != NULL) { - MapPropAnimationManager_RemoveAnimationFromRenderObj(fieldSystem->mapPropAnimMan, v4, MAP_PROP_MODEL_HONEY_TREE, fieldSystem->unk_A8->trees[treeId].shakeValue); + MapPropAnimationManager_RemoveAnimationFromRenderObj(fieldSystem->mapPropAnimMan, v4, honey_tree_nsbmd, fieldSystem->unk_A8->trees[treeId].shakeValue); } fieldSystem->unk_A8->trees[treeId].isShaking = FALSE; @@ -364,19 +365,19 @@ static void DoTreeShakingAnimation(FieldSystem *fieldSystem, MapPropManager *par return; } - v4 = MapPropManager_FindLoadedPropByModelID(param1, MAP_PROP_MODEL_HONEY_TREE); + v4 = MapPropManager_FindLoadedPropByModelID(param1, honey_tree_nsbmd); if (v4 != NULL) { NNSG3dRenderObj *v7; v7 = MapProp_GetRenderObj(v4); - MapPropAnimationManager_RemoveAnimationFromRenderObj(fieldSystem->mapPropAnimMan, v7, MAP_PROP_MODEL_HONEY_TREE, fieldSystem->unk_A8->trees[treeId].shakeValue); + MapPropAnimationManager_RemoveAnimationFromRenderObj(fieldSystem->mapPropAnimMan, v7, honey_tree_nsbmd, fieldSystem->unk_A8->trees[treeId].shakeValue); fieldSystem->unk_A8->trees[treeId].shakeValue = shakeValue; fieldSystem->unk_A8->trees[treeId].isShaking = isShaking; - MapPropAnimationManager_AddAnimationToRenderObj(MAP_PROP_MODEL_HONEY_TREE, shakeValue, 1, v7, fieldSystem->mapPropAnimMan); + MapPropAnimationManager_AddAnimationToRenderObj(honey_tree_nsbmd, shakeValue, 1, v7, fieldSystem->mapPropAnimMan); } } } diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c index e9139a1d95..159143a9c9 100644 --- a/src/overlay005/ov5_021D431C.c +++ b/src/overlay005/ov5_021D431C.c @@ -3,7 +3,6 @@ #include #include -#include "constants/field/map_prop.h" #include "generated/movement_actions.h" #include "struct_decls/struct_02061AB4_decl.h" @@ -25,6 +24,8 @@ #include "unk_02056B30.h" #include "unk_020655F4.h" +#include "res/field/props/models/prop_models.naix.h" + typedef struct UnkStruct_ov5_021D432C_t { int unk_00; TerrainCollisionHitbox unk_04; @@ -78,26 +79,26 @@ BOOL ov5_021D433C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1) TerrainCollisionHitbox v3; int v4; int v5[] = { - MAP_PROP_MODEL_DOOR01, - MAP_PROP_MODEL_BROWN_WOODEN_DOOR, - MAP_PROP_MODEL_GREEN_WOODEN_DOOR, - MAP_PROP_MODEL_IRON_DOOR, - MAP_PROP_MODEL_JUBILIFE_CITY_BUILDING_DOOR, - MAP_PROP_MODEL_POKECENTER_DOOR, - MAP_PROP_MODEL_POKECENTER_INSIDE_DOOR, - MAP_PROP_MODEL_GTS_INSIDE_DOOR, - MAP_PROP_MODEL_HEARTHOME_GYM_INSIDE_DOOR, - MAP_PROP_MODEL_BLUE_DOOR, - MAP_PROP_MODEL_IRON_DOOR_2, - MAP_PROP_MODEL_YELLOW_WOODEN_DOOR, - MAP_PROP_MODEL_BLUE_WOODEN_DOOR, - MAP_PROP_MODEL_MANSION_DOOR, - MAP_PROP_MODEL_VEILSTONE_DPT_STORE_DOOR, - MAP_PROP_MODEL_GYM_DOOR, - MAP_PROP_MODEL_CARD_DOOR, - MAP_PROP_MODEL_POKECENTER_INSIDE_COUNTER_DOOR, - MAP_PROP_MODEL_HOTEL_GRAND_LAKE_DOOR, - MAP_PROP_MODEL_ELEVATOR_DOOR + door01_nsbmd, + brown_wooden_door_nsbmd, + green_wooden_door_nsbmd, + iron_door_nsbmd, + jubilife_city_building_door_nsbmd, + pokecenter_door_nsbmd, + pokecenter_inside_door_nsbmd, + gts_inside_door_nsbmd, + hearthome_gym_inside_door_nsbmd, + blue_door_nsbmd, + iron_door_2_nsbmd, + yellow_wooden_door_nsbmd, + blue_wooden_door_nsbmd, + mansion_door_nsbmd, + veilstone_dpt_store_door_nsbmd, + gym_door_nsbmd, + card_door_nsbmd, + pokecenter_inside_counter_door_nsbmd, + hotel_grand_lake_door_nsbmd, + elevator_door_nsbmd }; param1->unk_20 = 0; @@ -237,26 +238,26 @@ BOOL ov5_021D453C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1) TerrainCollisionHitbox v3; int v4; int v5[] = { - MAP_PROP_MODEL_DOOR01, - MAP_PROP_MODEL_BROWN_WOODEN_DOOR, - MAP_PROP_MODEL_GREEN_WOODEN_DOOR, - MAP_PROP_MODEL_IRON_DOOR, - MAP_PROP_MODEL_JUBILIFE_CITY_BUILDING_DOOR, - MAP_PROP_MODEL_POKECENTER_DOOR, - MAP_PROP_MODEL_POKECENTER_INSIDE_DOOR, - MAP_PROP_MODEL_GTS_INSIDE_DOOR, - MAP_PROP_MODEL_HEARTHOME_GYM_INSIDE_DOOR, - MAP_PROP_MODEL_BLUE_DOOR, - MAP_PROP_MODEL_IRON_DOOR_2, - MAP_PROP_MODEL_YELLOW_WOODEN_DOOR, - MAP_PROP_MODEL_BLUE_WOODEN_DOOR, - MAP_PROP_MODEL_MANSION_DOOR, - MAP_PROP_MODEL_VEILSTONE_DPT_STORE_DOOR, - MAP_PROP_MODEL_GYM_DOOR, - MAP_PROP_MODEL_CARD_DOOR, - MAP_PROP_MODEL_POKECENTER_INSIDE_COUNTER_DOOR, - MAP_PROP_MODEL_HOTEL_GRAND_LAKE_DOOR, - MAP_PROP_MODEL_ELEVATOR_DOOR + door01_nsbmd, + brown_wooden_door_nsbmd, + green_wooden_door_nsbmd, + iron_door_nsbmd, + jubilife_city_building_door_nsbmd, + pokecenter_door_nsbmd, + pokecenter_inside_door_nsbmd, + gts_inside_door_nsbmd, + hearthome_gym_inside_door_nsbmd, + blue_door_nsbmd, + iron_door_2_nsbmd, + yellow_wooden_door_nsbmd, + blue_wooden_door_nsbmd, + mansion_door_nsbmd, + veilstone_dpt_store_door_nsbmd, + gym_door_nsbmd, + card_door_nsbmd, + pokecenter_inside_counter_door_nsbmd, + hotel_grand_lake_door_nsbmd, + elevator_door_nsbmd }; param1->unk_20 = 0; @@ -464,11 +465,11 @@ static void ov5_021D47DC(Camera *camera, u8 *param1) static u8 DoorAnimation_GetSoundEffectType(const int doorModelID) { - if (doorModelID == MAP_PROP_MODEL_VEILSTONE_DPT_STORE_DOOR) { + if (doorModelID == veilstone_dpt_store_door_nsbmd) { return DOOR_SOUND_EFFECT_TYPE_VEILSTONE_DPT_STORE_CHIME; } - if ((doorModelID == MAP_PROP_MODEL_POKECENTER_DOOR) || (doorModelID == MAP_PROP_MODEL_GYM_DOOR) || (doorModelID == MAP_PROP_MODEL_GTS_INSIDE_DOOR) || (doorModelID == MAP_PROP_MODEL_POKECENTER_INSIDE_DOOR) || (doorModelID == MAP_PROP_MODEL_CARD_DOOR) || (doorModelID == MAP_PROP_MODEL_ELEVATOR_DOOR)) { + if ((doorModelID == pokecenter_door_nsbmd) || (doorModelID == gym_door_nsbmd) || (doorModelID == gts_inside_door_nsbmd) || (doorModelID == pokecenter_inside_door_nsbmd) || (doorModelID == card_door_nsbmd) || (doorModelID == elevator_door_nsbmd)) { return DOOR_SOUND_EFFECT_TYPE_SLIDING; } @@ -486,10 +487,10 @@ BOOL ov5_021D4858(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, cons TerrainCollisionHitbox v3; int v4; int v5[] = { - MAP_PROP_MODEL_POKECENTER_STAIR_UP_LEFT, - MAP_PROP_MODEL_POKECENTER_STAIR_DOWN_LEFT, - MAP_PROP_MODEL_POKECENTER_STAIR_UP_RIGHT, - MAP_PROP_MODEL_POKECENTER_STAIR_DOWN_RIGHT + pokecenter_stair_up_left_nsbmd, + pokecenter_stair_down_left_nsbmd, + pokecenter_stair_up_right_nsbmd, + pokecenter_stair_down_right_nsbmd }; if (param2 == 2) { @@ -603,10 +604,10 @@ BOOL ov5_021D4A24(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, cons TerrainCollisionHitbox v3; int v4; int v5[] = { - MAP_PROP_MODEL_POKECENTER_STAIR_UP_LEFT, - MAP_PROP_MODEL_POKECENTER_STAIR_DOWN_LEFT, - MAP_PROP_MODEL_POKECENTER_STAIR_UP_RIGHT, - MAP_PROP_MODEL_POKECENTER_STAIR_DOWN_RIGHT + pokecenter_stair_up_left_nsbmd, + pokecenter_stair_down_left_nsbmd, + pokecenter_stair_up_right_nsbmd, + pokecenter_stair_down_right_nsbmd }; if (param2 == 2) { @@ -717,26 +718,26 @@ void DoorAnimation_FindDoorAndLoad(FieldSystem *fieldSystem, const int x, const TerrainCollisionHitbox hitbox; int doorModelID; int doorModelIDs[] = { - MAP_PROP_MODEL_DOOR01, - MAP_PROP_MODEL_BROWN_WOODEN_DOOR, - MAP_PROP_MODEL_GREEN_WOODEN_DOOR, - MAP_PROP_MODEL_IRON_DOOR, - MAP_PROP_MODEL_JUBILIFE_CITY_BUILDING_DOOR, - MAP_PROP_MODEL_POKECENTER_DOOR, - MAP_PROP_MODEL_POKECENTER_INSIDE_DOOR, - MAP_PROP_MODEL_GTS_INSIDE_DOOR, - MAP_PROP_MODEL_HEARTHOME_GYM_INSIDE_DOOR, - MAP_PROP_MODEL_BLUE_DOOR, - MAP_PROP_MODEL_IRON_DOOR_2, - MAP_PROP_MODEL_YELLOW_WOODEN_DOOR, - MAP_PROP_MODEL_BLUE_WOODEN_DOOR, - MAP_PROP_MODEL_MANSION_DOOR, - MAP_PROP_MODEL_VEILSTONE_DPT_STORE_DOOR, - MAP_PROP_MODEL_GYM_DOOR, - MAP_PROP_MODEL_CARD_DOOR, - MAP_PROP_MODEL_POKECENTER_INSIDE_COUNTER_DOOR, - MAP_PROP_MODEL_HOTEL_GRAND_LAKE_DOOR, - MAP_PROP_MODEL_ELEVATOR_DOOR + door01_nsbmd, + brown_wooden_door_nsbmd, + green_wooden_door_nsbmd, + iron_door_nsbmd, + jubilife_city_building_door_nsbmd, + pokecenter_door_nsbmd, + pokecenter_inside_door_nsbmd, + gts_inside_door_nsbmd, + hearthome_gym_inside_door_nsbmd, + blue_door_nsbmd, + iron_door_2_nsbmd, + yellow_wooden_door_nsbmd, + blue_wooden_door_nsbmd, + mansion_door_nsbmd, + veilstone_dpt_store_door_nsbmd, + gym_door_nsbmd, + card_door_nsbmd, + pokecenter_inside_counter_door_nsbmd, + hotel_grand_lake_door_nsbmd, + elevator_door_nsbmd }; TerrainCollisionHitbox_Init(x, z, -1, 0, 3, 1, &hitbox); @@ -836,8 +837,8 @@ void ov5_021D4D78(const int param0, const int param1, const int param2, FieldSys TerrainCollisionHitbox v2; int v3; int v4[] = { - MAP_PROP_MODEL_BIKE_MUDDY_SLOPE, - MAP_PROP_MODEL_BIKE_DUNGEON_MUDDY_SLOPE + bike_muddy_slope_nsbmd, + bike_dungeon_muddy_slope_nsbmd }; TerrainCollisionHitbox_Init(param0, param1, 0, -1, 1, 3, &v2); diff --git a/src/overlay006/elevator_animation.c b/src/overlay006/elevator_animation.c index 628bcde3ee..98d5401b3d 100644 --- a/src/overlay006/elevator_animation.c +++ b/src/overlay006/elevator_animation.c @@ -4,7 +4,6 @@ #include #include "constants/elevator_dirs.h" -#include "constants/field/map_prop.h" #include "field/field_system.h" #include "overlay005/area_data.h" @@ -16,6 +15,8 @@ #include "sound_playback.h" #include "terrain_collision_manager.h" +#include "res/field/props/models/prop_models.naix.h" + #define ELEVATOR_ANIMATION_TAG 0x1 #define ELEVATOR_ANIMATION_STATE_LOAD 0 @@ -35,7 +36,7 @@ static BOOL FieldTask_PlayElevatorAnimation(FieldTask *fieldSystem); void FieldSystem_PlayElevatorAnimation(FieldSystem *fieldSystem, const u8 elevatorDir, const u8 animationLoopCount) { - BOOL mapPropLoaded = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, MAP_PROP_MODEL_ELEVATOR_LIGHTS, NULL, NULL); + BOOL mapPropLoaded = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, elevator_lights_nsbmd, NULL, NULL); if (mapPropLoaded) { ElevatorAnimation *animation = Heap_AllocAtEnd(HEAP_ID_FIELD1, sizeof(ElevatorAnimation)); @@ -63,14 +64,14 @@ static BOOL FieldTask_PlayElevatorAnimation(FieldTask *fieldTask) NNSG3dRenderObj *renderObj; BOOL mapPropLoaded; - modelFile = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_ELEVATOR_LIGHTS, fieldSystem->areaDataManager); + modelFile = AreaDataManager_GetMapPropModelFile(elevator_lights_nsbmd, fieldSystem->areaDataManager); model = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*modelFile), 0); - mapPropLoaded = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, MAP_PROP_MODEL_ELEVATOR_LIGHTS, &mapProp, NULL); + mapPropLoaded = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, elevator_lights_nsbmd, &mapProp, NULL); GF_ASSERT(mapPropLoaded); renderObj = MapProp_GetRenderObj(mapProp); - MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, ELEVATOR_ANIMATION_TAG, MAP_PROP_MODEL_ELEVATOR_LIGHTS, renderObj, model, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 2, animation->loopCount, 0); + MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, ELEVATOR_ANIMATION_TAG, elevator_lights_nsbmd, renderObj, model, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 2, animation->loopCount, 0); } (animation->state)++; break; diff --git a/src/overlay006/healing_machine_animation/hall_of_fame.c b/src/overlay006/healing_machine_animation/hall_of_fame.c index 91546c6341..b4ac9140e5 100644 --- a/src/overlay006/healing_machine_animation/hall_of_fame.c +++ b/src/overlay006/healing_machine_animation/hall_of_fame.c @@ -1,7 +1,6 @@ #include #include -#include "constants/field/map_prop.h" #include "constants/pokemon.h" #include "field/field_system.h" @@ -16,6 +15,8 @@ #include "party.h" #include "terrain_collision_manager.h" +#include "res/field/props/models/prop_models.naix.h" + typedef struct HallOfFameHealingAnimation { VecFx32 position; u8 pokeballCount; @@ -41,7 +42,7 @@ void FieldSystem_PlayHealingAnimation_HallOfFame(FieldSystem *fieldSystem, const BOOL mapPropFound; MapProp *healingMachine; int mapMatrixIndex; - int healingMachineID = MAP_PROP_MODEL_POKEMON_LEAGUE_HALL_OF_FAME_MACHINE; + int healingMachineID = pokemon_league_hall_of_fame_machine_nsbmd; mapPropFound = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, healingMachineID, &healingMachine, &mapMatrixIndex); @@ -76,10 +77,10 @@ static BOOL FieldTask_PlayHealingAnimation_HallOfFame(FieldTask *param0) NNSG3dResFileHeader **pokeballModelFile; NNSG3dRenderObj *unused; - pokeballModelFile = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_MINI_POKEBALL, fieldSystem->areaDataManager); + pokeballModelFile = AreaDataManager_GetMapPropModelFile(pokecenter_healing_machine_mini_pokeball_nsbmd, fieldSystem->areaDataManager); pokeballModel = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*pokeballModelFile), 0); - MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, HEALING_MACHINE_ANIMATION_POKEBALL_TAG, MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_MINI_POKEBALL, NULL, pokeballModel, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); + MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, HEALING_MACHINE_ANIMATION_POKEBALL_TAG, pokecenter_healing_machine_mini_pokeball_nsbmd, NULL, pokeballModel, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); (animation->state)++; break; } @@ -93,7 +94,7 @@ static BOOL FieldTask_PlayHealingAnimation_HallOfFame(FieldTask *param0) pokeballPosition.y = animation->position.y + HallOfFameHealingAnimation_PokeballOffsets[animation->currentPokeballIndex].y; pokeballPosition.z = animation->position.z + HallOfFameHealingAnimation_PokeballOffsets[animation->currentPokeballIndex].z; - animation->pokeballLoadedPropIDs[animation->currentPokeballIndex] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_MINI_POKEBALL, &pokeballPosition, &pokeballRotation, fieldSystem->mapPropAnimMan); + animation->pokeballLoadedPropIDs[animation->currentPokeballIndex] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, pokecenter_healing_machine_mini_pokeball_nsbmd, &pokeballPosition, &pokeballRotation, fieldSystem->mapPropAnimMan); pokeballMapProp = MapPropManager_GetLoadedPropSafely(fieldSystem->mapPropManager, animation->pokeballLoadedPropIDs[animation->currentPokeballIndex]); pokeballRenderObj = MapProp_GetRenderObj(pokeballMapProp); diff --git a/src/overlay006/healing_machine_animation/pokecenter.c b/src/overlay006/healing_machine_animation/pokecenter.c index d9ddf86d86..f81672a103 100644 --- a/src/overlay006/healing_machine_animation/pokecenter.c +++ b/src/overlay006/healing_machine_animation/pokecenter.c @@ -1,7 +1,6 @@ #include #include -#include "constants/field/map_prop.h" #include "constants/pokemon.h" #include "field/field_system.h" @@ -17,6 +16,8 @@ #include "sound_playback.h" #include "terrain_collision_manager.h" +#include "res/field/props/models/prop_models.naix.h" + typedef struct PokecenterHealingAnimation { VecFx32 position; u8 pokeballCount; @@ -42,7 +43,7 @@ void FieldSystem_PlayHealingAnimation_Pokecenter(FieldSystem *fieldSystem, const BOOL mapPropFound; MapProp *healingMachine; int mapMatrixIndex; - int healingMachineID = MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE; + int healingMachineID = pokecenter_healing_machine_nsbmd; mapPropFound = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, healingMachineID, &healingMachine, &mapMatrixIndex); @@ -81,18 +82,18 @@ static BOOL FieldTask_PlayHealingAnimation_Pokecenter(FieldTask *param0) NNSG3dRenderObj *screenRenderObj; BOOL screenFound; - pokeballModelFile = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_MINI_POKEBALL, fieldSystem->areaDataManager); - screenModelFile = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_TV, fieldSystem->areaDataManager); + pokeballModelFile = AreaDataManager_GetMapPropModelFile(pokecenter_healing_machine_mini_pokeball_nsbmd, fieldSystem->areaDataManager); + screenModelFile = AreaDataManager_GetMapPropModelFile(pokecenter_healing_machine_tv_nsbmd, fieldSystem->areaDataManager); pokeballModel = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*pokeballModelFile), 0); screenModel = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*screenModelFile), 0); - MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, HEALING_MACHINE_ANIMATION_POKEBALL_TAG, MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_MINI_POKEBALL, NULL, pokeballModel, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); + MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, HEALING_MACHINE_ANIMATION_POKEBALL_TAG, pokecenter_healing_machine_mini_pokeball_nsbmd, NULL, pokeballModel, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); - screenFound = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_TV, &screenMapProp, NULL); + screenFound = FieldSystem_FindLoadedMapPropByModelID(fieldSystem, pokecenter_healing_machine_tv_nsbmd, &screenMapProp, NULL); GF_ASSERT(screenFound); screenRenderObj = MapProp_GetRenderObj(screenMapProp); - MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, HEALING_MACHINE_ANIMATION_SCREEN_TAG, MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_TV, screenRenderObj, screenModel, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); + MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, HEALING_MACHINE_ANIMATION_SCREEN_TAG, pokecenter_healing_machine_tv_nsbmd, screenRenderObj, screenModel, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); (animation->state)++; break; } @@ -108,7 +109,7 @@ static BOOL FieldTask_PlayHealingAnimation_Pokecenter(FieldTask *param0) Sound_PlayEffect(SEQ_SE_DP_BOWA); - animation->pokeballLoadedPropIDs[animation->currentPokeballIndex] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, MAP_PROP_MODEL_POKECENTER_HEALING_MACHINE_MINI_POKEBALL, &pokeballPosition, &pokeballRotation, fieldSystem->mapPropAnimMan); + animation->pokeballLoadedPropIDs[animation->currentPokeballIndex] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, pokecenter_healing_machine_mini_pokeball_nsbmd, &pokeballPosition, &pokeballRotation, fieldSystem->mapPropAnimMan); pokeballMapProp = MapPropManager_GetLoadedPropSafely(fieldSystem->mapPropManager, animation->pokeballLoadedPropIDs[animation->currentPokeballIndex]); pokeballRenderObj = MapProp_GetRenderObj(pokeballMapProp); diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c index e1e983570f..192acca790 100644 --- a/src/overlay006/ov6_02242AF0.c +++ b/src/overlay006/ov6_02242AF0.c @@ -4,7 +4,6 @@ #include #include "constants/field/dynamic_map_features.h" -#include "constants/field/map_prop.h" #include "constants/great_marsh_tram.h" #include "struct_decls/struct_02061AB4_decl.h" @@ -23,6 +22,8 @@ #include "sound_playback.h" #include "unk_020655F4.h" +#include "res/field/props/models/prop_models.naix.h" + typedef struct UnkStruct_ov6_02242B58_t UnkStruct_ov6_02242B58; typedef BOOL (*UnkFuncPtr_ov6_02242B58)(FieldSystem *, UnkStruct_ov6_02242B58 *, const fx32 *, VecFx32 *); @@ -198,12 +199,12 @@ static BOOL ov6_02242C5C(FieldTask *taskMan) MapProp *v4; NNSG3dRenderObj *v5; - v4 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_GREAT_MARSH_TRAIN); + v4 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, great_marsh_train_nsbmd); v5 = MapProp_GetRenderObj(v4); - v3 = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_GREAT_MARSH_TRAIN, fieldSystem->areaDataManager); + v3 = AreaDataManager_GetMapPropModelFile(great_marsh_train_nsbmd, fieldSystem->areaDataManager); v2 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v3), 0); - MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, 16, MAP_PROP_MODEL_GREAT_MARSH_TRAIN, v5, v2, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, -1, 0); + MapPropOneShotAnimationManager_LoadPropAnimations(fieldSystem->mapPropAnimMan, fieldSystem->mapPropOneShotAnimMan, 16, great_marsh_train_nsbmd, v5, v2, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, -1, 0); MapPropOneShotAnimationManager_PlayAnimation(fieldSystem->mapPropOneShotAnimMan, 16, 0); } (v1->unk_05)++; @@ -225,7 +226,7 @@ static BOOL ov6_02242C5C(FieldTask *taskMan) MapProp *v6; VecFx32 v7; - v6 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_GREAT_MARSH_TRAIN); + v6 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, great_marsh_train_nsbmd); v7 = MapProp_GetPosition(v6); if (v1->unk_00(fieldSystem, v1, &v1->unk_0C, &v7)) { diff --git a/src/overlay006/pc_animation.c b/src/overlay006/pc_animation.c index 8612e37551..16db3a103e 100644 --- a/src/overlay006/pc_animation.c +++ b/src/overlay006/pc_animation.c @@ -3,8 +3,6 @@ #include #include -#include "constants/field/map_prop.h" - #include "field/field_system.h" #include "overlay005/area_data.h" #include "overlay005/map_prop.h" @@ -12,6 +10,8 @@ #include "terrain_collision_manager.h" +#include "res/field/props/models/prop_models.naix.h" + void FieldSystem_LoadPCAnimation(FieldSystem *fieldSystem, const u8 tag) { BOOL pcFound; @@ -19,10 +19,10 @@ void FieldSystem_LoadPCAnimation(FieldSystem *fieldSystem, const u8 tag) TerrainCollisionHitbox unused; int modelID; int pcMapProps[] = { - MAP_PROP_MODEL_POKECENTER_PC, - MAP_PROP_MODEL_DESK_DRAWER_LAPTOP, - MAP_PROP_MODEL_DESK_DRAWER_LAPTOP_FACING_RIGHT, - MAP_PROP_MODEL_DESK_DRAWER_LAPTOP_FACING_LEFT + pokecenter_pc_nsbmd, + desk_drawer_laptop_nsbmd, + desk_drawer_laptop_facing_right_nsbmd, + desk_drawer_laptop_facing_left_nsbmd }; pcFound = FieldSystem_FindLoadedMapPropByModelIDs(fieldSystem, pcMapProps, 4, &mapProp, &modelID); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 1769c3415b..280efdefd3 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -5,7 +5,6 @@ #include "constants/field/dynamic_map_features.h" #include "constants/field/map.h" -#include "constants/field/map_prop.h" #include "generated/movement_actions.h" #include "generated/movement_types.h" @@ -66,6 +65,7 @@ #include "unk_02067A84.h" #include "vars_flags.h" +#include "res/field/props/models/prop_models.naix.h" #include "res/text/bank/eterna_city_gym.h" typedef struct { @@ -345,9 +345,9 @@ void PastoriaGym_PressButton(FieldSystem *fieldSystem) BOOL hasCollisionHit; int mapPropModelID; int pastoriaButtonTypes[] = { - MAP_PROP_MODEL_PASTORIA_GYM_BLUE_BUTTON, - MAP_PROP_MODEL_PASTORIA_GYM_GREEN_BUTTON, - MAP_PROP_MODEL_PASTORIA_GYM_ORANGE_BUTTON + pastoria_gym_blue_button_nsbmd, + pastoria_gym_green_button_nsbmd, + pastoria_gym_orange_button_nsbmd }; int playerX = Player_GetXPos(fieldSystem->playerAvatar); @@ -368,13 +368,13 @@ void PastoriaGym_PressButton(FieldSystem *fieldSystem) v6 = Heap_AllocAtEnd(HEAP_ID_FIELD2, sizeof(UnkStruct_ov8_0224997C)); v6->unk_00 = 0; - if (mapPropModelID == MAP_PROP_MODEL_PASTORIA_GYM_BLUE_BUTTON) { + if (mapPropModelID == pastoria_gym_blue_button_nsbmd) { FieldTask_InitCall(fieldSystem->task, ov8_02249CD8, v6); v8->unk_00 = 2; - } else if (mapPropModelID == MAP_PROP_MODEL_PASTORIA_GYM_GREEN_BUTTON) { + } else if (mapPropModelID == pastoria_gym_green_button_nsbmd) { FieldTask_InitCall(fieldSystem->task, ov8_02249B74, v6); v8->unk_00 = 1; - } else if (mapPropModelID == MAP_PROP_MODEL_PASTORIA_GYM_ORANGE_BUTTON) { + } else if (mapPropModelID == pastoria_gym_orange_button_nsbmd) { FieldTask_InitCall(fieldSystem->task, ov8_02249A94, v6); v8->unk_00 = 0; } else { @@ -430,7 +430,7 @@ static BOOL ov8_02249A94(FieldTask *taskMan) v5 = MapPropAnimationManager_GetAnimationByPastoriaGymButtonGroup(3, fieldSystem->mapPropAnimMan); if (MapPropAnimation_IsLoopFinished(v3) && MapPropAnimation_IsLoopFinished(v4) && MapPropAnimation_IsLoopFinished(v5)) { - v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_PASTORIA_GYM_WATER_FLOOR); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, pastoria_gym_water_floor_nsbmd); { VecFx32 v6; @@ -481,7 +481,7 @@ static BOOL ov8_02249B74(FieldTask *taskMan) v5 = MapPropAnimationManager_GetAnimationByPastoriaGymButtonGroup(3, fieldSystem->mapPropAnimMan); if (MapPropAnimation_IsLoopFinished(v3) && MapPropAnimation_IsLoopFinished(v4) && MapPropAnimation_IsLoopFinished(v5)) { - v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_PASTORIA_GYM_WATER_FLOOR); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, pastoria_gym_water_floor_nsbmd); { VecFx32 v6; @@ -501,7 +501,7 @@ static BOOL ov8_02249B74(FieldTask *taskMan) } } break; case 2: - v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_PASTORIA_GYM_WATER_FLOOR); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, pastoria_gym_water_floor_nsbmd); { VecFx32 v7; @@ -518,7 +518,7 @@ static BOOL ov8_02249B74(FieldTask *taskMan) } break; case 3: - v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_PASTORIA_GYM_WATER_FLOOR); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, pastoria_gym_water_floor_nsbmd); { VecFx32 v8; @@ -568,7 +568,7 @@ static BOOL ov8_02249CD8(FieldTask *taskMan) v5 = MapPropAnimationManager_GetAnimationByPastoriaGymButtonGroup(3, fieldSystem->mapPropAnimMan); if (MapPropAnimation_IsLoopFinished(v3) && MapPropAnimation_IsLoopFinished(v4) && MapPropAnimation_IsLoopFinished(v5)) { - v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_PASTORIA_GYM_WATER_FLOOR); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, pastoria_gym_water_floor_nsbmd); { VecFx32 v6; @@ -648,7 +648,7 @@ void PastoriaGym_DynamicMapFeaturesInit(FieldSystem *fieldSystem) v6 = 0; } - v1 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_PASTORIA_GYM_WATER_FLOOR); + v1 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, pastoria_gym_water_floor_nsbmd); { VecFx32 v10; @@ -779,7 +779,7 @@ static BOOL ov8_0224A018(FieldTask *taskMan) (v2->unk_00)++; break; case 1: { - v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, iron_island_platform_lift_nsbmd); { VecFx32 v3; @@ -825,7 +825,7 @@ static BOOL ov8_0224A0E8(FieldTask *taskMan) (v2->unk_00)++; break; case 1: { - v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, iron_island_platform_lift_nsbmd); { VecFx32 v3; diff --git a/src/platform_lift.c b/src/platform_lift.c index 3136ef67b8..17f5f10ede 100644 --- a/src/platform_lift.c +++ b/src/platform_lift.c @@ -5,7 +5,6 @@ #include "constants/field/dynamic_map_features.h" #include "constants/field/map.h" -#include "constants/field/map_prop.h" #include "constants/heap.h" #include "generated/map_headers.h" @@ -23,6 +22,8 @@ #include "sound_playback.h" #include "terrain_collision_manager.h" +#include "res/field/props/models/prop_models.naix.h" + #define PLATFORM_LIFT_SIZE_X 3 #define PLATFORM_LIFT_SIZE_Y 2 @@ -179,12 +180,12 @@ void PlatformLift_DynamicMapFeaturesInit(FieldSystem *fieldSystem) }; platformLiftInitialPosition.y = currentHeight; - MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT, &platformLiftInitialPosition, NULL, fieldSystem->mapPropAnimMan); - platformLiftMapProp = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT); + MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, iron_island_platform_lift_nsbmd, &platformLiftInitialPosition, NULL, fieldSystem->mapPropAnimMan); + platformLiftMapProp = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, iron_island_platform_lift_nsbmd); } else { const int platformLiftModels[2] = { - MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT, - MAP_PROP_MODEL_POKEMON_LEAGUE_PLATFORM_LIFT + iron_island_platform_lift_nsbmd, + pokemon_league_platform_lift_nsbmd }; BOOL platformLiftFound = FieldSystem_FindLoadedMapPropByModelIDs(fieldSystem, platformLiftModels, NELEMS(platformLiftModels), &platformLiftMapProp, NULL); @@ -366,11 +367,11 @@ static BOOL FieldTask_PlatformLiftGoUp(FieldTask *taskMan) MapProp *platformLiftMapProp; if (taskEnv->isIronIslandB2FLeftRoom) { - platformLiftMapProp = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT); + platformLiftMapProp = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, iron_island_platform_lift_nsbmd); } else { const int platformLiftModels[2] = { - MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT, - MAP_PROP_MODEL_POKEMON_LEAGUE_PLATFORM_LIFT + iron_island_platform_lift_nsbmd, + pokemon_league_platform_lift_nsbmd }; BOOL platformLiftFound = FieldSystem_FindLoadedMapPropByModelIDs(fieldSystem, platformLiftModels, NELEMS(platformLiftModels), &platformLiftMapProp, NULL); @@ -435,11 +436,11 @@ static BOOL FieldTask_PlatformLiftGoDown(FieldTask *taskMan) MapProp *platformLiftMapProp; if (taskEnv->isIronIslandB2FLeftRoom) { - platformLiftMapProp = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT); + platformLiftMapProp = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, iron_island_platform_lift_nsbmd); } else { const int platformLiftModels[2] = { - MAP_PROP_MODEL_IRON_ISLAND_PLATFORM_LIFT, - MAP_PROP_MODEL_POKEMON_LEAGUE_PLATFORM_LIFT + iron_island_platform_lift_nsbmd, + pokemon_league_platform_lift_nsbmd }; BOOL platformLiftFound = FieldSystem_FindLoadedMapPropByModelIDs(fieldSystem, platformLiftModels, NELEMS(platformLiftModels), &platformLiftMapProp, NULL); diff --git a/src/underground/secret_bases.c b/src/underground/secret_bases.c index 41d93bb0bc..782f911b4e 100644 --- a/src/underground/secret_bases.c +++ b/src/underground/secret_bases.c @@ -3,7 +3,6 @@ #include #include -#include "constants/field/map_prop.h" #include "constants/field_base_tiles.h" #include "constants/heap.h" #include "constants/map_object.h" @@ -68,6 +67,7 @@ #include "unk_020655F4.h" #include "vars_flags.h" +#include "res/field/props/models/prop_models.naix.h" #include "res/graphics/trap_effects/trap_effects.naix.h" #include "res/text/bank/underground_capture_flag.h" #include "res/text/bank/underground_common.h" @@ -1545,7 +1545,7 @@ static void SecretBases_DrawBaseEntrancesTask(SysTask *unused, void *unused1) position.y = 0; position.z = entranceZ * MAP_OBJECT_TILE_SIZE + MAP_OBJECT_TILE_SIZE / 2; - secretBasesEnv->baseEntrancePropIdxs[netID] = MapPropManager_LoadOne(secretBasesEnv->fieldSystem->mapPropManager, secretBasesEnv->fieldSystem->areaDataManager, MAP_PROP_MODEL_SECRET_BASE_ENTRANCE_NORTH + dir, &position, NULL, secretBasesEnv->fieldSystem->mapPropAnimMan); + secretBasesEnv->baseEntrancePropIdxs[netID] = MapPropManager_LoadOne(secretBasesEnv->fieldSystem->mapPropManager, secretBasesEnv->fieldSystem->areaDataManager, secret_base_entrance_north_nsbmd + dir, &position, NULL, secretBasesEnv->fieldSystem->mapPropAnimMan); } } } @@ -2377,7 +2377,7 @@ static void SecretBases_UpdatePCMapProp(FlagRankUpContext *ctx) position = MapProp_GetPosition(mapProp); MapPropManager_ClearOne(0, secretBasesEnv->fieldSystem->mapPropManager); - MapPropManager_LoadOne(secretBasesEnv->fieldSystem->mapPropManager, secretBasesEnv->fieldSystem->areaDataManager, MAP_PROP_MODEL_SECRET_BASE_PC_BRONZE_FLAG + ctx->prevFlagRank, &position, NULL, secretBasesEnv->fieldSystem->mapPropAnimMan); + MapPropManager_LoadOne(secretBasesEnv->fieldSystem->mapPropManager, secretBasesEnv->fieldSystem->areaDataManager, secret_base_pc_bronze_flag_nsbmd + ctx->prevFlagRank, &position, NULL, secretBasesEnv->fieldSystem->mapPropAnimMan); } static void SecretBases_EndFlagRankUpTask(SysTask *sysTask, void *ctx) diff --git a/tools/jsoncnv/area_data.py b/tools/jsoncnv/area_data.py new file mode 100755 index 0000000000..cd861160ef --- /dev/null +++ b/tools/jsoncnv/area_data.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python3 +import argparse +import json +import pathlib +import sys + +from convert import parse_naix, u16 + +def try_get_naix_value(naix_dict: dict, json_key: str, data: dict) -> int: + try: + return naix_dict[data[json_key]] + except KeyError as err: + err.add_note(json_key) + raise err + +def parse_area_data(data) -> bytes: + return b''.join([ + u16(try_get_naix_value(map_prop_sets, 'mapPropSet', data)), + u16(try_get_naix_value(map_texture_sets, 'mapTextureSet', data)), + u16(data['dummy'] if 'dummy' in data else 0), + u16(try_get_naix_value(lighting_sets, 'lightingSet', data)), + ]) + +parser = argparse.ArgumentParser() +parser.add_argument('input') +parser.add_argument('output') +parser.add_argument('--map-prop-set-naix') +parser.add_argument('--map-texture-set-naix') +parser.add_argument('--lighting-set-naix') +args = parser.parse_args() + +input_path = pathlib.Path(args.input) +output_path = pathlib.Path(args.output) +map_prop_sets = parse_naix(pathlib.Path(args.map_prop_set_naix)) +map_texture_sets = parse_naix(pathlib.Path(args.map_texture_set_naix)) +lighting_sets = parse_naix(pathlib.Path(args.lighting_set_naix)) + +data = {} +with open(input_path, 'r', encoding='utf-8') as input_file: + data = json.load(input_file) + +with open(output_path, 'wb') as output_file: + try: + output_file.write(parse_area_data(data)) + except KeyError as err: + print(f'Error parsing {args.input}: {err.__notes__[0]} constant {err.args[0]} not found.', file=sys.stderr) + exit(1) diff --git a/tools/json2bin/convert.py b/tools/jsoncnv/convert.py similarity index 84% rename from tools/json2bin/convert.py rename to tools/jsoncnv/convert.py index 2c74c3c537..3e96563cf4 100755 --- a/tools/json2bin/convert.py +++ b/tools/jsoncnv/convert.py @@ -1,6 +1,9 @@ #!/usr/bin/env python3 import collections import functools +import math +import pathlib +import re from generated import ( ai_flags, @@ -34,6 +37,12 @@ def u32(i: int) -> bytes: def ascii(i: str) -> bytes: return str.encode(i, 'ascii') +def float_to_fx16(f: float) -> int: + if (f > 0): + return math.ceil(f * (1 << 12)) + else: + return math.floor(f * (1 << 12)) + def from_item(s: str) -> int: return items.Item[s].value @@ -96,3 +105,10 @@ def derive_data_flags(party: list[dict]) -> TrainerDataFlags: has_items |= bool(mon.get('item', None)) return TrainerDataFlags(has_moves, has_items) + +def parse_naix(filepath: pathlib.Path) -> dict[str, int]: + with open(filepath, 'r') as file: + return { + match['ident']: int(match['value']) + for match in re.finditer(r'#define (?P\w+) (?P\d+)', file.read()) + } diff --git a/tools/json2bin/encdata_ex_elusive_rod.py b/tools/jsoncnv/encdata_ex_elusive_rod.py similarity index 100% rename from tools/json2bin/encdata_ex_elusive_rod.py rename to tools/jsoncnv/encdata_ex_elusive_rod.py diff --git a/tools/json2bin/encdata_ex_great_marsh.py b/tools/jsoncnv/encdata_ex_great_marsh.py similarity index 100% rename from tools/json2bin/encdata_ex_great_marsh.py rename to tools/jsoncnv/encdata_ex_great_marsh.py diff --git a/tools/json2bin/encdata_ex_honey_trees.py b/tools/jsoncnv/encdata_ex_honey_trees.py similarity index 100% rename from tools/json2bin/encdata_ex_honey_trees.py rename to tools/jsoncnv/encdata_ex_honey_trees.py diff --git a/tools/json2bin/encdata_ex_trophy_garden.py b/tools/jsoncnv/encdata_ex_trophy_garden.py similarity index 100% rename from tools/json2bin/encdata_ex_trophy_garden.py rename to tools/jsoncnv/encdata_ex_trophy_garden.py diff --git a/tools/json2bin/encounter.py b/tools/jsoncnv/encounter.py similarity index 100% rename from tools/json2bin/encounter.py rename to tools/jsoncnv/encounter.py diff --git a/tools/json2bin/event.py b/tools/jsoncnv/event.py similarity index 100% rename from tools/json2bin/event.py rename to tools/jsoncnv/event.py diff --git a/tools/json2bin/json2bin.py b/tools/jsoncnv/jsoncnv.py similarity index 99% rename from tools/json2bin/json2bin.py rename to tools/jsoncnv/jsoncnv.py index cf0844b292..e252a0a619 100644 --- a/tools/json2bin/json2bin.py +++ b/tools/jsoncnv/jsoncnv.py @@ -11,7 +11,7 @@ from types import FunctionType, LambdaType ARGPARSER = ArgumentParser( - prog='json2bin.py', + prog='jsoncnv.py', description='Tool for converting a collection of JSON documents into\na NARC via a constructed parsing schema' ) ARGPARSER.add_argument('--narc', required=True, @@ -200,7 +200,7 @@ def _process(fname_in: str, return (output_idx, output_bin) -def json2bin(target: str, +def jsoncnv(target: str, schema: Parser, private_dir: Optional[str], output_dir: Optional[str], diff --git a/tools/jsoncnv/lighting.py b/tools/jsoncnv/lighting.py new file mode 100755 index 0000000000..cbaf248167 --- /dev/null +++ b/tools/jsoncnv/lighting.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python3 +import json +import pathlib +import argparse + +from convert import float_to_fx16 + +def commajoin(list): + return ','.join([str(val) for val in list]) + +def parse_color(color): + return commajoin(color.values()) + ',\r\n' + +def parse_light(light): + ret_list = [] + ret_list.append(int(light["enabled"])) + ret_list.append(commajoin(light["color"].values())) + ret_list.append(commajoin([float_to_fx16(float(dir)) for dir in light["direction"].values()])) + return commajoin(ret_list) + ',\r\n' + +def parse_lighting(lighting): + ret = str(lighting["endTime"]) + ',\r\n' + for light in lighting["lights"]: + ret += parse_light(light) + ret += parse_color(lighting["diffuseColor"]) + ret += parse_color(lighting["ambientColor"]) + ret += parse_color(lighting["specularColor"]) + ret += parse_color(lighting["emissionColor"]) + return ret + +def parse_lighting_file(data): + output = "" + + for lighting in data: + output += parse_lighting(lighting) + output += '\r\n' + + output += "EOF" + + if (eof_newline): + output += '\r\n' + + return output + +parser = argparse.ArgumentParser() +parser.add_argument('input') +parser.add_argument('output') +parser.add_argument('--eofnewline', action='store_true') +args = parser.parse_args() + +input_path = pathlib.Path(args.input) +output_path = pathlib.Path(args.output) +eof_newline = args.eofnewline + +data = {} +with open(input_path, "r", encoding="utf-8") as input_file: + data = json.load(input_file) + +with open(output_path, "w") as output_file: + output_file.write(parse_lighting_file(data)) diff --git a/tools/json2bin/map_matrix.py b/tools/jsoncnv/map_matrix.py similarity index 100% rename from tools/json2bin/map_matrix.py rename to tools/jsoncnv/map_matrix.py diff --git a/tools/json2bin/meson.build b/tools/jsoncnv/meson.build similarity index 69% rename from tools/json2bin/meson.build rename to tools/jsoncnv/meson.build index 4f296f962d..bd297afd99 100644 --- a/tools/json2bin/meson.build +++ b/tools/jsoncnv/meson.build @@ -1,15 +1,18 @@ -json2bin_env = environment() -json2bin_env.set('PYTHONPATH', meson.project_build_root()) # access to constants geneated by constgen +jsoncnv_env = environment() +jsoncnv_env.set('PYTHONPATH', meson.project_build_root()) # access to constants geneated by constgen # Old combined parser + packer scripts movedata_py = find_program('movedata.py', native: true) # New single-file-parser scripts +area_data_py = find_program('area_data.py', native: true) encounter_py = find_program('encounter.py', native: true) event_py = find_program('event.py', native: true) encdata_ex_elusive_rod_py = find_program('encdata_ex_elusive_rod.py', native: true) encdata_ex_honey_trees_py = find_program('encdata_ex_honey_trees.py', native: true) encdata_ex_trophy_garden_py = find_program('encdata_ex_trophy_garden.py', native: true) encdata_ex_great_marsh_py = find_program('encdata_ex_great_marsh.py', native: true) +lighting_py = find_program('lighting.py', native: true) map_matrix_py = find_program('map_matrix.py', native: true) npc_trades_py = find_program('npc_trades.py', native: true) +prop_model_set_py = find_program('prop_model_set.py', native: true) diff --git a/tools/json2bin/movedata.py b/tools/jsoncnv/movedata.py similarity index 96% rename from tools/json2bin/movedata.py rename to tools/jsoncnv/movedata.py index cba5ef80d8..d78781552d 100755 --- a/tools/json2bin/movedata.py +++ b/tools/jsoncnv/movedata.py @@ -10,7 +10,7 @@ from generated.moves import Move from generated.pokemon_contest_types import PokemonContestType from generated.pokemon_types import PokemonType -import json2bin as j2b +import jsoncnv as j2b SCHEMA = j2b.Parser() \ @@ -38,7 +38,7 @@ def indexer(file_path: pathlib.Path) -> int: args = j2b.ARGPARSER.parse_args() -j2b.json2bin(args.source_dir, +j2b.jsoncnv(args.source_dir, SCHEMA, args.private_dir, args.output_dir, diff --git a/tools/json2bin/npc_trades.py b/tools/jsoncnv/npc_trades.py similarity index 100% rename from tools/json2bin/npc_trades.py rename to tools/jsoncnv/npc_trades.py diff --git a/tools/jsoncnv/prop_model_set.py b/tools/jsoncnv/prop_model_set.py new file mode 100755 index 0000000000..3e3c4e2cb1 --- /dev/null +++ b/tools/jsoncnv/prop_model_set.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +import argparse +import json +import pathlib +import sys + +from convert import parse_naix, u16 + +def parse_prop_model_set(data) -> bytes: + return b"".join([ + u16(len(data["mapPropModels"])), + b"".join([u16(map_prop_models[model]) for model in data["mapPropModels"]]), + ]) + +parser = argparse.ArgumentParser() +parser.add_argument('input') +parser.add_argument('output') +parser.add_argument('--map-prop-model-naix') +args = parser.parse_args() + +input_path = pathlib.Path(args.input) +output_path = pathlib.Path(args.output) +map_prop_models = parse_naix(pathlib.Path(args.map_prop_model_naix)) + +data = {} +with open(input_path, "r", encoding="utf-8") as input_file: + data = json.load(input_file) + +with open(output_path, "wb") as output_file: + try: + output_file.write(parse_prop_model_set(data)) + except KeyError as err: + print(f'\nError parsing {args.input}: map prop model constant {err.args[0]} not found.\n', file=sys.stderr) + exit(1) diff --git a/tools/meson.build b/tools/meson.build index f446fe45ea..efa23d7ca0 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -4,7 +4,7 @@ rapidjson_dep = dependency('rapidjson') subdir('csv2bin') subdir('datagen') subdir('fixrom') -subdir('json2bin') +subdir('jsoncnv') subdir('msgenc') subdir('nitrogfx') subdir('ordergen')