diff --git a/include/constants/gx_colors.h b/include/constants/gx_colors.h new file mode 100644 index 0000000000..bfcbc2a5d1 --- /dev/null +++ b/include/constants/gx_colors.h @@ -0,0 +1,8 @@ +#ifndef POKEPLATINUM_CONSTANTS_GX_COLORS_H +#define POKEPLATINUM_CONSTANTS_GX_COLORS_H + +#define COLOR_BLACK GX_RGB(0, 0, 0) +#define COLOR_DARK_GRAY GX_RGB(4, 4, 4) +#define COLOR_TRANSPARENT GX_RGB(31, 31, 16) + +#endif // POKEPLATINUM_CONSTANTS_GX_COLORS_H diff --git a/include/constants/map_prop.h b/include/constants/map_prop.h index e786eb1104..82324bfe9b 100644 --- a/include/constants/map_prop.h +++ b/include/constants/map_prop.h @@ -1,11 +1,14 @@ #ifndef POKEPLATINUM_CONSTANTS_MAP_PROP_H #define POKEPLATINUM_CONSTANTS_MAP_PROP_H -enum MapPropId { - MAP_PROP_ID_HONEY_TREE = 26, - MAP_PROP_ID_UNK_242 = 242, - MAP_PROP_ID_UNK_258 = 258, - MAP_PROP_ID_UNK_475 = 475, +enum MapPropModelId { + MAP_PROP_MODEL_ID_HONEY_TREE = 26, + MAP_PROP_MODEL_ID_UNK_124 = 124, + MAP_PROP_MODEL_ID_UNK_242 = 242, + MAP_PROP_MODEL_ID_UNK_258 = 258, + MAP_PROP_MODEL_ID_UNK_475 = 475, + MAP_PROP_MODEL_ID_UNK_498 = 498, + MAP_PROP_MODEL_ID_UNK_517 = 517, }; #endif // POKEPLATINUM_CONSTANTS_MAP_PROP_H diff --git a/include/data/map_headers.h b/include/data/map_headers.h index 9911475958..09d3354088 100644 --- a/include/data/map_headers.h +++ b/include/data/map_headers.h @@ -8,7 +8,7 @@ static const MapHeader sMapHeaders[] = { [MAP_HEADER_EVERYWHERE] = { - .unk_00 = 0x0, + .areaDataArchiveID = 0x0, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -30,7 +30,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_NOTHING] = { - .unk_00 = 0x0, + .areaDataArchiveID = 0x0, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -52,7 +52,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNDERGROUND] = { - .unk_00 = 0x2, + .areaDataArchiveID = 0x2, .unk_01 = 0x2, .mapMatrixID = 0x2, .scriptsArchiveID = scripts_underground, @@ -74,7 +74,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_jubilife_city, @@ -96,7 +96,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_JUBILIFE_CITY_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_jubilife_city_mart, @@ -118,7 +118,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_1] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0x14, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_jubilife_city_unknown_house_1, @@ -140,7 +140,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_jubilife_city_pokecenter_1f, @@ -162,7 +162,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_jubilife_city_pokecenter_2f, @@ -184,7 +184,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKETCH_CO_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 0x8D, .scriptsArchiveID = scripts_poketch_co_1f, @@ -206,7 +206,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKETCH_CO_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 0x8E, .scriptsArchiveID = scripts_poketch_co_2f, @@ -228,7 +228,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKETCH_CO_3F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 143, .scriptsArchiveID = scripts_poketch_co_3f, @@ -250,7 +250,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_TV_1F] = { - .unk_00 = 34, + .areaDataArchiveID = 34, .unk_01 = 0xF, .mapMatrixID = 148, .scriptsArchiveID = scripts_jubilife_tv_1f, @@ -272,7 +272,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_TV_2F] = { - .unk_00 = 34, + .areaDataArchiveID = 34, .unk_01 = 0xF, .mapMatrixID = 149, .scriptsArchiveID = scripts_jubilife_tv_2f, @@ -294,7 +294,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_TV_3F] = { - .unk_00 = 34, + .areaDataArchiveID = 34, .unk_01 = 0xF, .mapMatrixID = 150, .scriptsArchiveID = scripts_jubilife_tv_3f, @@ -316,7 +316,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_TV_4F] = { - .unk_00 = 34, + .areaDataArchiveID = 34, .unk_01 = 0xF, .mapMatrixID = 151, .scriptsArchiveID = scripts_jubilife_tv_4f, @@ -338,7 +338,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_TV_2F_GALLERY] = { - .unk_00 = 34, + .areaDataArchiveID = 34, .unk_01 = 0xF, .mapMatrixID = 152, .scriptsArchiveID = scripts_jubilife_tv_2f_gallery, @@ -360,7 +360,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_TV_3F_GLOBAL_RANKING_ROOM] = { - .unk_00 = 34, + .areaDataArchiveID = 34, .unk_01 = 0xF, .mapMatrixID = 153, .scriptsArchiveID = scripts_jubilife_tv_3f_global_ranking_room, @@ -382,7 +382,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_TV_3F_GROUP_RANKING_ROOM] = { - .unk_00 = 34, + .areaDataArchiveID = 34, .unk_01 = 0xF, .mapMatrixID = 154, .scriptsArchiveID = scripts_jubilife_tv_3f_group_ranking_room, @@ -404,7 +404,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_TV_ELEVATOR] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, .scriptsArchiveID = scripts_jubilife_tv_elevator, @@ -426,7 +426,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, .scriptsArchiveID = scripts_jubilife_city_south_house_1f, @@ -448,7 +448,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_jubilife_city_south_house_2f, @@ -470,7 +470,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_3F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_jubilife_city_south_house_3f, @@ -492,7 +492,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_4F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_empty, @@ -514,7 +514,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_2] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0x14, .mapMatrixID = 125, .scriptsArchiveID = scripts_jubilife_city_unknown_house_2, @@ -536,7 +536,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, .scriptsArchiveID = scripts_jubilife_city_condominiums_1f, @@ -558,7 +558,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_jubilife_city_condominiums_2f, @@ -580,7 +580,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_3F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_jubilife_city_condominiums_3f, @@ -602,7 +602,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_4F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_jubilife_city_condominiums_4f, @@ -624,7 +624,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GLOBAL_TERMINAL_1F] = { - .unk_00 = 40, + .areaDataArchiveID = 40, .unk_01 = 0xF, .mapMatrixID = 205, .scriptsArchiveID = scripts_global_terminal_1f, @@ -646,7 +646,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TRAINERS_SCHOOL] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 140, .scriptsArchiveID = scripts_trainers_school, @@ -668,7 +668,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_SOUTHWEST_HOUSE_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, .scriptsArchiveID = scripts_jubilife_city_southwest_house_1f, @@ -690,7 +690,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_3] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0x14, .mapMatrixID = 125, .scriptsArchiveID = scripts_jubilife_city_unknown_house_3, @@ -712,7 +712,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_4] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0x14, .mapMatrixID = 125, .scriptsArchiveID = scripts_jubilife_city_unknown_house_4, @@ -734,7 +734,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY] = { - .unk_00 = 15, + .areaDataArchiveID = 15, .unk_01 = 9, .mapMatrixID = 0, .scriptsArchiveID = scripts_canalave_city, @@ -756,7 +756,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_CANALAVE_CITY_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_canalave_city_mart, @@ -778,7 +778,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY_GYM] = { - .unk_00 = 0x18, + .areaDataArchiveID = 0x18, .unk_01 = 0xF, .mapMatrixID = 112, .scriptsArchiveID = scripts_canalave_city_gym, @@ -800,7 +800,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_canalave_city_pokecenter_1f, @@ -822,7 +822,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_canalave_city_pokecenter_2f, @@ -844,7 +844,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_LIBRARY_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 217, .scriptsArchiveID = scripts_canalave_library_1f, @@ -866,7 +866,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_LIBRARY_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 218, .scriptsArchiveID = scripts_canalave_library_2f, @@ -888,7 +888,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_LIBRARY_3F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 219, .scriptsArchiveID = scripts_canalave_library_3f, @@ -910,7 +910,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY_SOUTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_canalave_city_southeast_house, @@ -932,7 +932,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY_EAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_canalave_city_east_house, @@ -954,7 +954,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY_HARBOR_INN] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_canalave_city_harbor_inn, @@ -976,7 +976,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY_SAILOR_ELDRITCH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_canalave_city_sailor_eldritch_house, @@ -998,7 +998,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY] = { - .unk_00 = 0x7, + .areaDataArchiveID = 0x7, .unk_01 = 0x1, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_oreburgh_city, @@ -1020,7 +1020,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_OREBURGH_CITY_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_oreburgh_city_mart, @@ -1042,7 +1042,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_GYM] = { - .unk_00 = 0x19, + .areaDataArchiveID = 0x19, .unk_01 = 0xF, .mapMatrixID = 113, .scriptsArchiveID = scripts_oreburgh_city_gym, @@ -1064,7 +1064,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_oreburgh_city_pokecenter_1f, @@ -1086,7 +1086,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_oreburgh_city_pokecenter_2f, @@ -1108,7 +1108,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, .scriptsArchiveID = scripts_oreburgh_city_northwest_house_1f, @@ -1130,7 +1130,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_oreburgh_city_northwest_house_2f, @@ -1152,7 +1152,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_3F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 136, .scriptsArchiveID = scripts_oreburgh_city_northwest_house_3f, @@ -1174,7 +1174,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_NORTHWEST_HOUSE_4F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_oreburgh_city_northwest_house_4f, @@ -1196,7 +1196,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, .scriptsArchiveID = scripts_oreburgh_city_north_house_1f, @@ -1218,7 +1218,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_oreburgh_city_north_house_2f, @@ -1240,7 +1240,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_3F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 136, .scriptsArchiveID = scripts_oreburgh_city_north_house_3f, @@ -1262,7 +1262,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_NORTH_HOUSE_4F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_oreburgh_city_north_house_4f, @@ -1284,7 +1284,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_MIDDLE_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_oreburgh_city_middle_house, @@ -1306,7 +1306,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MINING_MUSEUM] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 155, .scriptsArchiveID = scripts_mining_museum, @@ -1328,7 +1328,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_WEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_oreburgh_city_west_house, @@ -1350,7 +1350,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, .scriptsArchiveID = scripts_oreburgh_city_east_house_1f, @@ -1372,7 +1372,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_oreburgh_city_east_house_2f, @@ -1394,7 +1394,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_EAST_HOUSE_3F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_oreburgh_city_east_house_3f, @@ -1416,7 +1416,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_SOUTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_oreburgh_city_south_house, @@ -1438,7 +1438,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 0, .scriptsArchiveID = scripts_eterna_city, @@ -1460,7 +1460,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ETERNA_CITY_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_eterna_city_mart, @@ -1482,7 +1482,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_GYM] = { - .unk_00 = 0x1A, + .areaDataArchiveID = 0x1A, .unk_01 = 0xF, .mapMatrixID = 220, .scriptsArchiveID = scripts_eterna_city_gym, @@ -1504,7 +1504,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_DP_GYM] = { - .unk_00 = 0x1A, + .areaDataArchiveID = 0x1A, .unk_01 = 0xF, .mapMatrixID = 221, .scriptsArchiveID = scripts_eterna_city_dp_gym, @@ -1526,7 +1526,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_eterna_city_pokecenter_1f, @@ -1548,7 +1548,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_eterna_city_pokecenter_2f, @@ -1570,7 +1570,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CYCLE_SHOP] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 138, .scriptsArchiveID = scripts_cycle_shop, @@ -1592,7 +1592,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_1F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 266, .scriptsArchiveID = scripts_team_galactic_eterna_building_1f, @@ -1614,7 +1614,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_2F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 162, .scriptsArchiveID = scripts_team_galactic_eterna_building_2f, @@ -1636,7 +1636,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_3F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 163, .scriptsArchiveID = scripts_team_galactic_eterna_building_3f, @@ -1658,7 +1658,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TEAM_GALACTIC_ETERNA_BUILDING_4F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 164, .scriptsArchiveID = scripts_team_galactic_eterna_building_4f, @@ -1680,7 +1680,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 132, .scriptsArchiveID = scripts_eterna_city_condominiums_1f, @@ -1702,7 +1702,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 135, .scriptsArchiveID = scripts_eterna_city_condominiums_2f, @@ -1724,7 +1724,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_3F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_eterna_city_condominiums_3f, @@ -1746,7 +1746,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_4F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_eterna_city_condominiums_4f, @@ -1768,7 +1768,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_206_CYCLING_ROAD_NORTH_GATE] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 259, .scriptsArchiveID = scripts_route_206_cycling_road_north_gate, @@ -1790,7 +1790,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_NORTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 170, .scriptsArchiveID = scripts_eterna_city_north_house, @@ -1812,7 +1812,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_SOUTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, .scriptsArchiveID = scripts_eterna_city_south_house, @@ -1834,7 +1834,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_EAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, .scriptsArchiveID = scripts_eterna_city_east_house, @@ -1856,7 +1856,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_UNDERGROUND_MAN_HOUSE] = { - .unk_00 = 43, + .areaDataArchiveID = 43, .unk_01 = 0xF, .mapMatrixID = 248, .scriptsArchiveID = scripts_eterna_city_underground_man_house, @@ -1878,7 +1878,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_UNKNOWN_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0x14, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_empty, @@ -1900,7 +1900,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY] = { - .unk_00 = 0x9, + .areaDataArchiveID = 0x9, .unk_01 = 0x3, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_hearthome_city, @@ -1922,7 +1922,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_HEARTHOME_CITY_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_hearthome_city_mart, @@ -1944,7 +1944,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_GYM_ENTRANCE_ROOM] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 222, .scriptsArchiveID = scripts_hearthome_city_gym_entrance_room, @@ -1966,7 +1966,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_GYM_TRAINER_ROOM_1] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, .scriptsArchiveID = scripts_hearthome_city_gym_trainer_room_1, @@ -1988,7 +1988,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_GYM_TRAINER_ROOM_2] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 224, .scriptsArchiveID = scripts_hearthome_city_gym_trainer_room_2, @@ -2010,7 +2010,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_GYM_LEADER_ROOM] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 225, .scriptsArchiveID = scripts_hearthome_city_gym_leader_room, @@ -2032,7 +2032,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_1] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, .scriptsArchiveID = scripts_empty, @@ -2054,7 +2054,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_1] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 224, .scriptsArchiveID = scripts_hearthome_city_dp_gym_elevator_room_1, @@ -2076,7 +2076,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_2] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, .scriptsArchiveID = scripts_empty, @@ -2098,7 +2098,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_ELEVATOR_ROOM_2] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 224, .scriptsArchiveID = scripts_hearthome_city_dp_gym_elevator_room_2, @@ -2120,7 +2120,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_3] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, .scriptsArchiveID = scripts_empty, @@ -2142,7 +2142,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_4] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, .scriptsArchiveID = scripts_empty, @@ -2164,7 +2164,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_5] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, .scriptsArchiveID = scripts_empty, @@ -2186,7 +2186,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_TRAINER_ROOM_6] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 223, .scriptsArchiveID = scripts_empty, @@ -2208,7 +2208,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_DP_GYM_LEADER_ROOM] = { - .unk_00 = 0x1B, + .areaDataArchiveID = 0x1B, .unk_01 = 0xF, .mapMatrixID = 225, .scriptsArchiveID = scripts_hearthome_city_dp_gym_leader_room, @@ -2230,7 +2230,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_hearthome_city_pokecenter_1f, @@ -2252,7 +2252,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_hearthome_city_pokecenter_2f, @@ -2274,7 +2274,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 209, .scriptsArchiveID = scripts_hearthome_city_southeast_house_1f, @@ -2296,7 +2296,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 210, .scriptsArchiveID = scripts_hearthome_city_southeast_house_2f, @@ -2318,7 +2318,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_SOUTHEAST_HOUSE_ELEVATOR] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, .scriptsArchiveID = scripts_hearthome_city_southeast_house_elevator, @@ -2340,7 +2340,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_POKEMON_FAN_CLUB] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 156, .scriptsArchiveID = scripts_hearthome_city_pokemon_fan_club, @@ -2362,7 +2362,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_WEST_GATE_TO_AMITY_SQUARE] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 157, .scriptsArchiveID = scripts_hearthome_city_west_gate_to_amity_square, @@ -2384,7 +2384,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_EAST_GATE_TO_AMITY_SQUARE] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 157, .scriptsArchiveID = scripts_hearthome_city_east_gate_to_amity_square, @@ -2406,7 +2406,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_208_GATE_TO_HEARTHOME_CITY] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 258, .scriptsArchiveID = scripts_route_208_gate_to_hearthome_city, @@ -2428,7 +2428,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_209_GATE_TO_HEARTHOME_CITY] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 258, .scriptsArchiveID = scripts_route_209_gate_to_hearthome_city, @@ -2450,7 +2450,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_212_GATE_TO_HEARTHOME_CITY] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 257, .scriptsArchiveID = scripts_route_212_gate_to_hearthome_city, @@ -2472,7 +2472,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_1F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 209, .scriptsArchiveID = scripts_hearthome_city_northeast_house_1f, @@ -2494,7 +2494,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 210, .scriptsArchiveID = scripts_hearthome_city_northeast_house_2f, @@ -2516,7 +2516,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_NORTHEAST_HOUSE_ELEVATOR] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, .scriptsArchiveID = scripts_hearthome_city_northeast_house_elevator, @@ -2538,7 +2538,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_NORTHWEST_HOUSE] = { - .unk_00 = 43, + .areaDataArchiveID = 43, .unk_01 = 0xF, .mapMatrixID = 245, .scriptsArchiveID = scripts_hearthome_city_northwest_house, @@ -2560,7 +2560,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POFFIN_HOUSE] = { - .unk_00 = 37, + .areaDataArchiveID = 37, .unk_01 = 0xF, .mapMatrixID = 0xED, .scriptsArchiveID = scripts_poffin_house, @@ -2582,7 +2582,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CONTEST_HALL_LOBBY] = { - .unk_00 = 32, + .areaDataArchiveID = 32, .unk_01 = 0xF, .mapMatrixID = 165, .scriptsArchiveID = scripts_contest_hall_lobby, @@ -2604,7 +2604,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CONTEST_HALL_STAGE_ONGOING_CONTEST] = { - .unk_00 = 32, + .areaDataArchiveID = 32, .unk_01 = 0xF, .mapMatrixID = 166, .scriptsArchiveID = scripts_contest_hall_stage_ongoing_contest, @@ -2626,7 +2626,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FOREIGN_BUILDING] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 167, .scriptsArchiveID = scripts_foreign_building, @@ -2648,7 +2648,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY] = { - .unk_00 = 0xC, + .areaDataArchiveID = 0xC, .unk_01 = 0x6, .mapMatrixID = 0, .scriptsArchiveID = scripts_pastoria_city, @@ -2670,7 +2670,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_PASTORIA_CITY_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 206, .scriptsArchiveID = scripts_pastoria_city_mart, @@ -2692,7 +2692,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_GYM] = { - .unk_00 = 0x17, + .areaDataArchiveID = 0x17, .unk_01 = 0xF, .mapMatrixID = 111, .scriptsArchiveID = scripts_pastoria_city_gym, @@ -2714,7 +2714,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_pastoria_city_pokecenter_1f, @@ -2736,7 +2736,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_pastoria_city_pokecenter_2f, @@ -2758,7 +2758,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_1F] = { - .unk_00 = 39, + .areaDataArchiveID = 39, .unk_01 = 0xF, .mapMatrixID = 181, .scriptsArchiveID = scripts_pastoria_city_observatory_gate_1f, @@ -2780,7 +2780,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_OBSERVATORY_GATE_2F] = { - .unk_00 = 39, + .areaDataArchiveID = 39, .unk_01 = 0xF, .mapMatrixID = 182, .scriptsArchiveID = scripts_pastoria_city_observatory_gate_2f, @@ -2802,7 +2802,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_SOUTHWEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_pastoria_city_southwest_house, @@ -2824,7 +2824,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_MIDDLE_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_pastoria_city_middle_house, @@ -2846,7 +2846,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_EAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, .scriptsArchiveID = scripts_pastoria_city_east_house, @@ -2868,7 +2868,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_NORTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_pastoria_city_north_house, @@ -2890,7 +2890,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_NORTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_pastoria_city_northeast_house, @@ -2912,7 +2912,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY] = { - .unk_00 = 11, + .areaDataArchiveID = 11, .unk_01 = 0x5, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_veilstone_city, @@ -2934,7 +2934,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_VEILSTONE_CITY_GYM] = { - .unk_00 = 29, + .areaDataArchiveID = 29, .unk_01 = 0xF, .mapMatrixID = 115, .scriptsArchiveID = scripts_veilstone_city_gym, @@ -2956,7 +2956,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_veilstone_city_pokecenter_1f, @@ -2978,7 +2978,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_veilstone_city_pokecenter_2f, @@ -3000,7 +3000,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GAME_CORNER] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 139, .scriptsArchiveID = scripts_game_corner, @@ -3022,7 +3022,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_STORE_1F] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 172, .scriptsArchiveID = scripts_veilstone_store_1f, @@ -3044,7 +3044,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_STORE_2F] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 173, .scriptsArchiveID = scripts_veilstone_store_2f, @@ -3066,7 +3066,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_STORE_3F] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 174, .scriptsArchiveID = scripts_veilstone_store_3f, @@ -3088,7 +3088,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_STORE_4F] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 175, .scriptsArchiveID = scripts_veilstone_store_4f, @@ -3110,7 +3110,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_STORE_5F] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 176, .scriptsArchiveID = scripts_veilstone_store_5f, @@ -3132,7 +3132,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_STORE_ELEVATOR] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, .scriptsArchiveID = scripts_veilstone_store_elevator, @@ -3154,7 +3154,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY_GALACTIC_WAREHOUSE] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 177, .scriptsArchiveID = scripts_veilstone_city_galactic_warehouse, @@ -3176,7 +3176,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY_PRIZE_EXCHANGE] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 204, .scriptsArchiveID = scripts_veilstone_city_prize_exchange, @@ -3198,7 +3198,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY_SOUTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, .scriptsArchiveID = scripts_veilstone_city_southeast_house, @@ -3220,7 +3220,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY_NORTHWEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, .scriptsArchiveID = scripts_veilstone_city_northwest_house, @@ -3242,7 +3242,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY_NORTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_veilstone_city_northeast_house, @@ -3264,7 +3264,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY_SOUTHWEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_veilstone_city_southwest_house, @@ -3286,7 +3286,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_215_GATE_TO_VEILSTONE_CITY] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 258, .scriptsArchiveID = scripts_route_215_gate_to_veilstone_city, @@ -3308,7 +3308,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY] = { - .unk_00 = 0xD, + .areaDataArchiveID = 0xD, .unk_01 = 0x7, .mapMatrixID = 0, .scriptsArchiveID = scripts_sunyshore_city, @@ -3330,7 +3330,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_SUNYSHORE_CITY_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_sunyshore_city_pokecenter_1f, @@ -3352,7 +3352,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_sunyshore_city_pokecenter_2f, @@ -3374,7 +3374,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_sunyshore_city_mart, @@ -3396,7 +3396,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_1] = { - .unk_00 = 30, + .areaDataArchiveID = 30, .unk_01 = 0xF, .mapMatrixID = 226, .scriptsArchiveID = scripts_sunyshore_city_gym_room_1, @@ -3418,7 +3418,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_2] = { - .unk_00 = 30, + .areaDataArchiveID = 30, .unk_01 = 0xF, .mapMatrixID = 227, .scriptsArchiveID = scripts_sunyshore_city_gym_room_2, @@ -3440,7 +3440,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_GYM_ROOM_3] = { - .unk_00 = 30, + .areaDataArchiveID = 30, .unk_01 = 0xF, .mapMatrixID = 228, .scriptsArchiveID = scripts_sunyshore_city_gym_room_3, @@ -3462,7 +3462,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_MARKET] = { - .unk_00 = 38, + .areaDataArchiveID = 38, .unk_01 = 0xF, .mapMatrixID = 203, .scriptsArchiveID = scripts_sunyshore_market, @@ -3484,7 +3484,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_NORTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_sunyshore_city_northeast_house, @@ -3506,7 +3506,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_WEST_HOUSE] = { - .unk_00 = 43, + .areaDataArchiveID = 43, .unk_01 = 0xF, .mapMatrixID = 248, .scriptsArchiveID = scripts_sunyshore_city_west_house, @@ -3528,7 +3528,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_NORTHWEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_sunyshore_city_northwest_house, @@ -3550,7 +3550,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_1] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_sunyshore_city_unknown_house_1, @@ -3572,7 +3572,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_2] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_sunyshore_city_unknown_house_2, @@ -3594,7 +3594,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_EAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, .scriptsArchiveID = scripts_sunyshore_city_east_house, @@ -3616,7 +3616,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VISTA_LIGHTHOUSE] = { - .unk_00 = 39, + .areaDataArchiveID = 39, .unk_01 = 0xF, .mapMatrixID = 230, .scriptsArchiveID = scripts_vista_lighthouse, @@ -3638,7 +3638,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_CITY] = { - .unk_00 = 0xE, + .areaDataArchiveID = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_snowpoint_city, @@ -3660,7 +3660,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_SNOWPOINT_CITY_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_snowpoint_city_mart, @@ -3682,7 +3682,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_CITY_GYM] = { - .unk_00 = 0x1C, + .areaDataArchiveID = 0x1C, .unk_01 = 0xF, .mapMatrixID = 114, .scriptsArchiveID = scripts_snowpoint_city_gym, @@ -3704,7 +3704,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_CITY_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_snowpoint_city_pokecenter_1f, @@ -3726,7 +3726,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_CITY_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_snowpoint_city_pokecenter_2f, @@ -3748,7 +3748,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_CITY_WEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_snowpoint_city_west_house, @@ -3770,7 +3770,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_CITY_EAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, .scriptsArchiveID = scripts_snowpoint_city_east_house, @@ -3792,7 +3792,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE] = { - .unk_00 = 0xD, + .areaDataArchiveID = 0xD, .unk_01 = 0xA, .mapMatrixID = 0, .scriptsArchiveID = scripts_pokemon_league, @@ -3814,7 +3814,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_pokemon_league_south_pokecenter_1f, @@ -3836,7 +3836,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_pokemon_league_south_pokecenter_2f, @@ -3858,7 +3858,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 144, .scriptsArchiveID = scripts_pokemon_league_north_pokecenter_1f, @@ -3880,7 +3880,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_AARON_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 187, .scriptsArchiveID = scripts_pokemon_league_elevator_to_aaron_room, @@ -3902,7 +3902,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_AARON_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 183, .scriptsArchiveID = scripts_pokemon_league_aaron_room, @@ -3924,7 +3924,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_BERTHA_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 188, .scriptsArchiveID = scripts_pokemon_league_elevator_to_bertha_room, @@ -3946,7 +3946,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_BERTHA_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 184, .scriptsArchiveID = scripts_pokemon_league_bertha_room, @@ -3968,7 +3968,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_FLINT_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 188, .scriptsArchiveID = scripts_pokemon_league_elevator_to_flint_room, @@ -3990,7 +3990,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_FLINT_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 185, .scriptsArchiveID = scripts_pokemon_league_flint_room, @@ -4012,7 +4012,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_LUCIAN_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 188, .scriptsArchiveID = scripts_pokemon_league_elevator_to_lucian_room, @@ -4034,7 +4034,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_LUCIAN_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 186, .scriptsArchiveID = scripts_pokemon_league_lucian_room, @@ -4056,7 +4056,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_CHAMPION_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 189, .scriptsArchiveID = scripts_pokemon_league_elevator_to_champion_room, @@ -4078,7 +4078,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_CHAMPION_ROOM] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 190, .scriptsArchiveID = scripts_pokemon_league_champion_room, @@ -4100,7 +4100,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_ELEVATOR_TO_HALL_OF_FAME] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 192, .scriptsArchiveID = scripts_pokemon_league_elevator_to_hall_of_fame, @@ -4122,7 +4122,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_HALL_OF_FAME] = { - .unk_00 = 36, + .areaDataArchiveID = 36, .unk_01 = 0xF, .mapMatrixID = 191, .scriptsArchiveID = scripts_pokemon_league_hall_of_fame, @@ -4144,7 +4144,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FIGHT_AREA] = { - .unk_00 = 0x13, + .areaDataArchiveID = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_fight_area, @@ -4166,7 +4166,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_FIGHT_AREA_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_fight_area_pokecenter_1f, @@ -4188,7 +4188,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FIGHT_AREA_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_fight_area_pokecenter_2f, @@ -4210,7 +4210,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FIGHT_AREA_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_fight_area_mart, @@ -4232,7 +4232,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_PARK_GATE_TO_FIGHT_AREA] = { - .unk_00 = 44, + .areaDataArchiveID = 44, .unk_01 = 0xF, .mapMatrixID = 250, .scriptsArchiveID = scripts_battle_park_gate_to_fight_area, @@ -4254,7 +4254,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_225_GATE_TO_FIGHT_AREA] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 257, .scriptsArchiveID = scripts_route_225_gate_to_fight_area, @@ -4276,7 +4276,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FIGHT_AREA_MIDDLE_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_fight_area_middle_house, @@ -4298,7 +4298,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FIGHT_AREA_SOUTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_fight_area_south_house, @@ -4320,7 +4320,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FIGHT_AREA_UNKNOWN_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_empty, @@ -4342,7 +4342,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_197] = { - .unk_00 = 55, + .areaDataArchiveID = 55, .unk_01 = 55, .mapMatrixID = 0x5, .scriptsArchiveID = scripts_empty, @@ -4364,7 +4364,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_MINE_B1F] = { - .unk_00 = 55, + .areaDataArchiveID = 55, .unk_01 = 0xF, .mapMatrixID = 5, .scriptsArchiveID = scripts_oreburgh_mine_b1f, @@ -4386,7 +4386,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_MINE_B2F] = { - .unk_00 = 55, + .areaDataArchiveID = 55, .unk_01 = 0xF, .mapMatrixID = 6, .scriptsArchiveID = scripts_oreburgh_mine_b2f, @@ -4408,7 +4408,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VALLEY_WINDWORKS_OUTSIDE] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 0, .scriptsArchiveID = scripts_valley_windworks_outside, @@ -4430,7 +4430,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_VALLEY_WINDWORKS_BUILDING] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 234, .scriptsArchiveID = scripts_valley_windworks_building, @@ -4452,7 +4452,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_FOREST_OUTSIDE] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_eterna_forest_outside, @@ -4474,7 +4474,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ETERNA_FOREST] = { - .unk_00 = 54, + .areaDataArchiveID = 54, .unk_01 = 0xF, .mapMatrixID = 7, .scriptsArchiveID = scripts_eterna_forest, @@ -4496,7 +4496,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_FUEGO_IRONWORKS_OUTSIDE] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 0, .scriptsArchiveID = scripts_fuego_ironworks_outside, @@ -4518,7 +4518,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_FUEGO_IRONWORKS_BUILDING] = { - .unk_00 = 67, + .areaDataArchiveID = 67, .unk_01 = 0xF, .mapMatrixID = 0x8, .scriptsArchiveID = scripts_fuego_ironworks_building, @@ -4540,7 +4540,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_206] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -4562,7 +4562,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_1F_SOUTH] = { - .unk_00 = 0x45, + .areaDataArchiveID = 0x45, .unk_01 = 0xF, .mapMatrixID = 9, .scriptsArchiveID = scripts_mt_coronet_1f_south, @@ -4584,7 +4584,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_2F] = { - .unk_00 = 0x45, + .areaDataArchiveID = 0x45, .unk_01 = 0xF, .mapMatrixID = 10, .scriptsArchiveID = scripts_mt_coronet_2f, @@ -4606,7 +4606,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_3F] = { - .unk_00 = 0x45, + .areaDataArchiveID = 0x45, .unk_01 = 0xF, .mapMatrixID = 11, .scriptsArchiveID = scripts_empty, @@ -4628,7 +4628,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_OUTSIDE_NORTH] = { - .unk_00 = 0xE, + .areaDataArchiveID = 0xE, .unk_01 = 0x8, .mapMatrixID = 12, .scriptsArchiveID = scripts_empty, @@ -4650,7 +4650,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_MT_CORONET_OUTSIDE_SOUTH] = { - .unk_00 = 0xE, + .areaDataArchiveID = 0xE, .unk_01 = 0x8, .mapMatrixID = 13, .scriptsArchiveID = scripts_empty, @@ -4672,7 +4672,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_MT_CORONET_4F_ROOMS_1_AND_2] = { - .unk_00 = 70, + .areaDataArchiveID = 70, .unk_01 = 0xF, .mapMatrixID = 14, .scriptsArchiveID = scripts_empty, @@ -4694,7 +4694,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_4F_ROOM_3] = { - .unk_00 = 70, + .areaDataArchiveID = 70, .unk_01 = 0xF, .mapMatrixID = 15, .scriptsArchiveID = scripts_empty, @@ -4716,7 +4716,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_5F] = { - .unk_00 = 70, + .areaDataArchiveID = 70, .unk_01 = 15, .mapMatrixID = 16, .scriptsArchiveID = scripts_empty, @@ -4738,7 +4738,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_6F] = { - .unk_00 = 70, + .areaDataArchiveID = 70, .unk_01 = 0xF, .mapMatrixID = 17, .scriptsArchiveID = scripts_mt_coronet_6f, @@ -4760,7 +4760,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_1F_TUNNEL_ROOM] = { - .unk_00 = 0x45, + .areaDataArchiveID = 0x45, .unk_01 = 0xF, .mapMatrixID = 18, .scriptsArchiveID = scripts_mt_coronet_1f_tunnel_room, @@ -4782,7 +4782,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_2] = { - .unk_00 = 0x45, + .areaDataArchiveID = 0x45, .unk_01 = 0xF, .mapMatrixID = 19, .scriptsArchiveID = scripts_mt_coronet_1f_north_room_2, @@ -4804,7 +4804,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_1F_NORTH_ROOM_1] = { - .unk_00 = 0x45, + .areaDataArchiveID = 0x45, .unk_01 = 0xF, .mapMatrixID = 20, .scriptsArchiveID = scripts_mt_coronet_1f_north_room_1, @@ -4826,7 +4826,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_B1F] = { - .unk_00 = 0x45, + .areaDataArchiveID = 0x45, .unk_01 = 0xF, .mapMatrixID = 21, .scriptsArchiveID = scripts_empty, @@ -4848,7 +4848,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SPEAR_PILLAR] = { - .unk_00 = 0x3C, + .areaDataArchiveID = 0x3C, .unk_01 = 0xF, .mapMatrixID = 22, .scriptsArchiveID = scripts_spear_pillar, @@ -4870,7 +4870,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SPEAR_PILLAR_DISTORTED] = { - .unk_00 = 0x3C, + .areaDataArchiveID = 0x3C, .unk_01 = 0xF, .mapMatrixID = 0x17, .scriptsArchiveID = scripts_spear_pillar_distorted, @@ -4892,7 +4892,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_222] = { - .unk_00 = 0xC, + .areaDataArchiveID = 0xC, .unk_01 = 0x6, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -4914,7 +4914,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_DP_GREAT_MARSH] = { - .unk_00 = 63, + .areaDataArchiveID = 63, .unk_01 = 0xF, .mapMatrixID = 0x18, .scriptsArchiveID = scripts_empty, @@ -4936,7 +4936,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_224] = { - .unk_00 = 0xA, + .areaDataArchiveID = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -4958,7 +4958,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_MANIAC_TUNNEL_ROOM] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 0x19, .scriptsArchiveID = scripts_solaceon_ruins_maniac_tunnel_room, @@ -4980,7 +4980,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_1] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 0x1A, .scriptsArchiveID = scripts_solaceon_ruins_room_1, @@ -5002,7 +5002,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_2_NORTHEAST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 40, .scriptsArchiveID = scripts_empty, @@ -5024,7 +5024,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_1_NORTHWEST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 35, .scriptsArchiveID = scripts_empty, @@ -5046,7 +5046,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_2] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 39, .scriptsArchiveID = scripts_solaceon_ruins_room_2, @@ -5068,7 +5068,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_1_SOUTHEAST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 0x1F, .scriptsArchiveID = scripts_empty, @@ -5090,7 +5090,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_3] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 34, .scriptsArchiveID = scripts_empty, @@ -5112,7 +5112,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_2_SOUTHEAST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 0x1F, .scriptsArchiveID = scripts_empty, @@ -5134,7 +5134,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_6_SOUTHEAST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 40, .scriptsArchiveID = scripts_empty, @@ -5156,7 +5156,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_5_SOUTHWEST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 42, .scriptsArchiveID = scripts_empty, @@ -5178,7 +5178,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_3_NORTHWEST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 35, .scriptsArchiveID = scripts_empty, @@ -5200,7 +5200,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_3_SOUTHWEST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 35, .scriptsArchiveID = scripts_empty, @@ -5222,7 +5222,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_4] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 36, .scriptsArchiveID = scripts_empty, @@ -5244,7 +5244,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_6] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 34, .scriptsArchiveID = scripts_empty, @@ -5266,7 +5266,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_5] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 30, .scriptsArchiveID = scripts_empty, @@ -5288,7 +5288,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_7] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 41, .scriptsArchiveID = scripts_solaceon_ruins_room_7, @@ -5310,7 +5310,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_4_SOUTHEAST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 0x1F, .scriptsArchiveID = scripts_empty, @@ -5332,7 +5332,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_6_NORTHWEST_DEAD_END] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 35, .scriptsArchiveID = scripts_empty, @@ -5354,7 +5354,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_243] = { - .unk_00 = 0xE, + .areaDataArchiveID = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -5376,7 +5376,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VICTORY_ROAD_1F] = { - .unk_00 = 71, + .areaDataArchiveID = 71, .unk_01 = 0xF, .mapMatrixID = 43, .scriptsArchiveID = scripts_victory_road_1f, @@ -5398,7 +5398,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VICTORY_ROAD_2F] = { - .unk_00 = 71, + .areaDataArchiveID = 71, .unk_01 = 0xF, .mapMatrixID = 44, .scriptsArchiveID = scripts_empty, @@ -5420,7 +5420,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VICTORY_ROAD_B1F] = { - .unk_00 = 71, + .areaDataArchiveID = 71, .unk_01 = 0xF, .mapMatrixID = 45, .scriptsArchiveID = scripts_empty, @@ -5442,7 +5442,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VICTORY_ROAD_1F_ROOM_2] = { - .unk_00 = 71, + .areaDataArchiveID = 71, .unk_01 = 0xF, .mapMatrixID = 46, .scriptsArchiveID = scripts_victory_road_1f_room_2, @@ -5464,7 +5464,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VICTORY_ROAD_1F_ROOM_1] = { - .unk_00 = 71, + .areaDataArchiveID = 71, .unk_01 = 0xF, .mapMatrixID = 47, .scriptsArchiveID = scripts_empty, @@ -5486,7 +5486,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VICTORY_ROAD_1F_ROOM_3] = { - .unk_00 = 71, + .areaDataArchiveID = 71, .unk_01 = 0xF, .mapMatrixID = 48, .scriptsArchiveID = scripts_empty, @@ -5508,7 +5508,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_250] = { - .unk_00 = 0x4, + .areaDataArchiveID = 0x4, .unk_01 = 0x4, .mapMatrixID = 49, .scriptsArchiveID = scripts_empty, @@ -5530,7 +5530,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PAL_PARK] = { - .unk_00 = 61, + .areaDataArchiveID = 61, .unk_01 = 0xF, .mapMatrixID = 49, .scriptsArchiveID = scripts_pal_park, @@ -5552,7 +5552,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_252] = { - .unk_00 = 0x9, + .areaDataArchiveID = 0x9, .unk_01 = 0x3, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -5574,7 +5574,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_AMITY_SQUARE] = { - .unk_00 = 59, + .areaDataArchiveID = 59, .unk_01 = 0xF, .mapMatrixID = 50, .scriptsArchiveID = scripts_amity_square, @@ -5596,7 +5596,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RAVAGED_PATH] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 51, .scriptsArchiveID = scripts_ravaged_path, @@ -5618,7 +5618,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_255] = { - .unk_00 = 54, + .areaDataArchiveID = 54, .unk_01 = 54, .mapMatrixID = 52, .scriptsArchiveID = scripts_empty, @@ -5640,7 +5640,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FLOAROMA_MEADOW] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 52, .scriptsArchiveID = scripts_floaroma_meadow, @@ -5662,7 +5662,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_FLOAROMA_MEADOW_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_floaroma_meadow_house, @@ -5684,7 +5684,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_GATE_1F] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 0x3, .scriptsArchiveID = scripts_oreburgh_gate_1f, @@ -5706,7 +5706,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_GATE_B1F] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 0x4, .scriptsArchiveID = scripts_oreburgh_gate_b1f, @@ -5728,7 +5728,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FULLMOON_ISLAND] = { - .unk_00 = 0xF, + .areaDataArchiveID = 0xF, .unk_01 = 0xF, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_fullmoon_island, @@ -5750,7 +5750,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FULLMOON_ISLAND_FOREST] = { - .unk_00 = 54, + .areaDataArchiveID = 54, .unk_01 = 0xF, .mapMatrixID = 53, .scriptsArchiveID = scripts_fullmoon_island_forest, @@ -5772,7 +5772,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_STARK_MOUNTAIN_OUTSIDE] = { - .unk_00 = 0x11, + .areaDataArchiveID = 0x11, .unk_01 = 0xF, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_stark_mountain_outside, @@ -5794,7 +5794,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_STARK_MOUNTAIN_ROOM_1] = { - .unk_00 = 0x39, + .areaDataArchiveID = 0x39, .unk_01 = 0xF, .mapMatrixID = 0x39, .scriptsArchiveID = scripts_stark_mountain_room_1, @@ -5816,7 +5816,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_STARK_MOUNTAIN_ROOM_2] = { - .unk_00 = 0x39, + .areaDataArchiveID = 0x39, .unk_01 = 0xF, .mapMatrixID = 58, .scriptsArchiveID = scripts_stark_mountain_room_2, @@ -5838,7 +5838,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_STARK_MOUNTAIN_ROOM_3] = { - .unk_00 = 0x39, + .areaDataArchiveID = 0x39, .unk_01 = 0xF, .mapMatrixID = 59, .scriptsArchiveID = scripts_stark_mountain_room_3, @@ -5860,7 +5860,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_266] = { - .unk_00 = 0x12, + .areaDataArchiveID = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -5882,7 +5882,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SENDOFF_SPRING] = { - .unk_00 = 62, + .areaDataArchiveID = 62, .unk_01 = 0xF, .mapMatrixID = 0x3C, .scriptsArchiveID = scripts_sendoff_spring, @@ -5904,7 +5904,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_TURNBACK_CAVE_ENTRANCE] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 61, .scriptsArchiveID = scripts_turnback_cave_entrance, @@ -5926,7 +5926,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_ROOM] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 62, .scriptsArchiveID = scripts_turnback_cave_pillar_room, @@ -5948,7 +5948,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_GIRATINA_ROOM] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 63, .scriptsArchiveID = scripts_turnback_cave_giratina_room, @@ -5970,7 +5970,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_1] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_1, @@ -5992,7 +5992,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_2] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_2, @@ -6014,7 +6014,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_3] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_3, @@ -6036,7 +6036,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FLOWER_PARADISE] = { - .unk_00 = 0xD, + .areaDataArchiveID = 0xD, .unk_01 = 0xA, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_flower_paradise, @@ -6058,7 +6058,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_UNKNOWN_275] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_empty, @@ -6080,7 +6080,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_276] = { - .unk_00 = 11, + .areaDataArchiveID = 11, .unk_01 = 0x5, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -6102,7 +6102,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_277] = { - .unk_00 = 11, + .areaDataArchiveID = 11, .unk_01 = 0x5, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -6124,7 +6124,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_TEMPLE_1F] = { - .unk_00 = 65, + .areaDataArchiveID = 65, .unk_01 = 0xF, .mapMatrixID = 68, .scriptsArchiveID = scripts_snowpoint_temple_1f, @@ -6146,7 +6146,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B1F] = { - .unk_00 = 65, + .areaDataArchiveID = 65, .unk_01 = 0xF, .mapMatrixID = 0x45, .scriptsArchiveID = scripts_empty, @@ -6168,7 +6168,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B2F] = { - .unk_00 = 65, + .areaDataArchiveID = 65, .unk_01 = 0xF, .mapMatrixID = 70, .scriptsArchiveID = scripts_empty, @@ -6190,7 +6190,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B3F] = { - .unk_00 = 65, + .areaDataArchiveID = 65, .unk_01 = 0xF, .mapMatrixID = 71, .scriptsArchiveID = scripts_empty, @@ -6212,7 +6212,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B4F] = { - .unk_00 = 65, + .areaDataArchiveID = 65, .unk_01 = 0xF, .mapMatrixID = 0x48, .scriptsArchiveID = scripts_empty, @@ -6234,7 +6234,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_TEMPLE_B5F] = { - .unk_00 = 65, + .areaDataArchiveID = 65, .unk_01 = 0xF, .mapMatrixID = 73, .scriptsArchiveID = scripts_snowpoint_temple_b5f, @@ -6256,7 +6256,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_WAYWARD_CAVE_1F] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 0x4A, .scriptsArchiveID = scripts_wayward_cave_1f, @@ -6278,7 +6278,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_WAYWARD_CAVE_B1F] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 75, .scriptsArchiveID = scripts_empty, @@ -6300,7 +6300,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RUIN_MANIAC_CAVE_SHORT] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 76, .scriptsArchiveID = scripts_ruin_maniac_cave_short, @@ -6322,7 +6322,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TROPHY_GARDEN] = { - .unk_00 = 0xC, + .areaDataArchiveID = 0xC, .unk_01 = 0xF, .mapMatrixID = 79, .scriptsArchiveID = scripts_empty, @@ -6344,7 +6344,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_IRON_ISLAND] = { - .unk_00 = 0xF, + .areaDataArchiveID = 0xF, .unk_01 = 0xF, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_iron_island, @@ -6366,7 +6366,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_IRON_ISLAND_1F] = { - .unk_00 = 0x48, + .areaDataArchiveID = 0x48, .unk_01 = 0xF, .mapMatrixID = 80, .scriptsArchiveID = scripts_iron_island_1f, @@ -6388,7 +6388,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_IRON_ISLAND_B1F_LEFT_ROOM] = { - .unk_00 = 0x48, + .areaDataArchiveID = 0x48, .unk_01 = 0xF, .mapMatrixID = 81, .scriptsArchiveID = scripts_empty, @@ -6410,7 +6410,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_IRON_ISLAND_B1F_RIGHT_ROOM] = { - .unk_00 = 0x48, + .areaDataArchiveID = 0x48, .unk_01 = 0xF, .mapMatrixID = 82, .scriptsArchiveID = scripts_iron_island_b1f_right_room, @@ -6432,7 +6432,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_IRON_ISLAND_B2F_RIGHT_ROOM] = { - .unk_00 = 0x48, + .areaDataArchiveID = 0x48, .unk_01 = 0xF, .mapMatrixID = 83, .scriptsArchiveID = scripts_empty, @@ -6454,7 +6454,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_IRON_ISLAND_B2F_LEFT_ROOM] = { - .unk_00 = 0x48, + .areaDataArchiveID = 0x48, .unk_01 = 0xF, .mapMatrixID = 84, .scriptsArchiveID = scripts_iron_island_b2f_left_room, @@ -6476,7 +6476,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_IRON_ISLAND_B3F] = { - .unk_00 = 0x48, + .areaDataArchiveID = 0x48, .unk_01 = 0xF, .mapMatrixID = 85, .scriptsArchiveID = scripts_iron_island_b3f, @@ -6498,7 +6498,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OLD_CHATEAU] = { - .unk_00 = 66, + .areaDataArchiveID = 66, .unk_01 = 0xF, .mapMatrixID = 86, .scriptsArchiveID = scripts_old_chateau, @@ -6520,7 +6520,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OLD_CHATEAU_DINING_AREA] = { - .unk_00 = 66, + .areaDataArchiveID = 66, .unk_01 = 0xF, .mapMatrixID = 87, .scriptsArchiveID = scripts_old_chateau_dining_area, @@ -6542,7 +6542,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OLD_CHATEAU_SIDE_ROOMS] = { - .unk_00 = 66, + .areaDataArchiveID = 66, .unk_01 = 0xF, .mapMatrixID = 88, .scriptsArchiveID = scripts_old_chateau_side_rooms, @@ -6564,7 +6564,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OLD_CHATEAU_CORRIDOR] = { - .unk_00 = 66, + .areaDataArchiveID = 66, .unk_01 = 0xF, .mapMatrixID = 89, .scriptsArchiveID = scripts_empty, @@ -6586,7 +6586,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OLD_CHATEAU_BACK_WEST_ROOM] = { - .unk_00 = 66, + .areaDataArchiveID = 66, .unk_01 = 0xF, .mapMatrixID = 90, .scriptsArchiveID = scripts_empty, @@ -6608,7 +6608,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_WEST_ROOM] = { - .unk_00 = 66, + .areaDataArchiveID = 66, .unk_01 = 0xF, .mapMatrixID = 91, .scriptsArchiveID = scripts_old_chateau_back_middle_west_room, @@ -6630,7 +6630,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_ROOM] = { - .unk_00 = 66, + .areaDataArchiveID = 66, .unk_01 = 0xF, .mapMatrixID = 92, .scriptsArchiveID = scripts_empty, @@ -6652,7 +6652,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OLD_CHATEAU_BACK_MIDDLE_EAST_ROOM] = { - .unk_00 = 66, + .areaDataArchiveID = 66, .unk_01 = 0xF, .mapMatrixID = 93, .scriptsArchiveID = scripts_old_chateau_back_middle_east_room, @@ -6674,7 +6674,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OLD_CHATEAU_BACK_EAST_ROOM] = { - .unk_00 = 66, + .areaDataArchiveID = 66, .unk_01 = 0xF, .mapMatrixID = 94, .scriptsArchiveID = scripts_empty, @@ -6696,7 +6696,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_304] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0x1F, .mapMatrixID = 157, .scriptsArchiveID = scripts_empty, @@ -6718,7 +6718,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GALACTIC_HQ_1F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 95, .scriptsArchiveID = scripts_galactic_hq_1f, @@ -6740,7 +6740,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GALACTIC_HQ_2F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 96, .scriptsArchiveID = scripts_galactic_hq_2f, @@ -6762,7 +6762,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GALACTIC_HQ_3F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 97, .scriptsArchiveID = scripts_galactic_hq_3f, @@ -6784,7 +6784,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GALACTIC_HQ_4F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 98, .scriptsArchiveID = scripts_galactic_hq_4f, @@ -6806,7 +6806,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GALACTIC_HQ_B1F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 100, .scriptsArchiveID = scripts_galactic_hq_b1f, @@ -6828,7 +6828,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GALACTIC_HQ_B2F] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 99, .scriptsArchiveID = scripts_galactic_hq_b2f, @@ -6850,7 +6850,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_LAKE_VERITY_LOW_WATER] = { - .unk_00 = 62, + .areaDataArchiveID = 62, .unk_01 = 0xF, .mapMatrixID = 101, .scriptsArchiveID = scripts_lake_verity_low_water, @@ -6872,7 +6872,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_LAKE_VERITY] = { - .unk_00 = 62, + .areaDataArchiveID = 62, .unk_01 = 0xF, .mapMatrixID = 102, .scriptsArchiveID = scripts_lake_verity, @@ -6894,7 +6894,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_VERITY_CAVERN] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 103, .scriptsArchiveID = scripts_verity_cavern, @@ -6916,7 +6916,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_LAKE_VALOR_DRAINED] = { - .unk_00 = 62, + .areaDataArchiveID = 62, .unk_01 = 0xF, .mapMatrixID = 104, .scriptsArchiveID = scripts_lake_valor_drained, @@ -6938,7 +6938,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_LAKE_VALOR] = { - .unk_00 = 62, + .areaDataArchiveID = 62, .unk_01 = 0xF, .mapMatrixID = 105, .scriptsArchiveID = scripts_lake_valor, @@ -6960,7 +6960,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_VALOR_CAVERN] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 106, .scriptsArchiveID = scripts_valor_cavern, @@ -6982,7 +6982,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_LAKE_ACUITY_LOW_WATER] = { - .unk_00 = 0xE, + .areaDataArchiveID = 0xE, .unk_01 = 0xF, .mapMatrixID = 107, .scriptsArchiveID = scripts_lake_acuity_low_water, @@ -7004,7 +7004,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_LAKE_ACUITY] = { - .unk_00 = 0xE, + .areaDataArchiveID = 0xE, .unk_01 = 0xF, .mapMatrixID = 108, .scriptsArchiveID = scripts_lake_acuity, @@ -7026,7 +7026,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ACUITY_CAVERN] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 109, .scriptsArchiveID = scripts_acuity_cavern, @@ -7048,7 +7048,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_NEWMOON_ISLAND] = { - .unk_00 = 0xF, + .areaDataArchiveID = 0xF, .unk_01 = 0x9, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_newmoon_island, @@ -7070,7 +7070,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_NEWMOON_ISLAND_FOREST] = { - .unk_00 = 54, + .areaDataArchiveID = 54, .unk_01 = 0xF, .mapMatrixID = 110, .scriptsArchiveID = scripts_newmoon_island_forest, @@ -7092,7 +7092,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_PARK] = { - .unk_00 = 64, + .areaDataArchiveID = 64, .unk_01 = 0xF, .mapMatrixID = 229, .scriptsArchiveID = scripts_battle_park, @@ -7114,7 +7114,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_BATTLE_PARK_EXCHANGE_SERVICE_CORNER] = { - .unk_00 = 41, + .areaDataArchiveID = 41, .unk_01 = 0xF, .mapMatrixID = 231, .scriptsArchiveID = scripts_battle_park_exchange_service_corner, @@ -7136,7 +7136,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_324] = { - .unk_00 = 33, + .areaDataArchiveID = 33, .unk_01 = 0xF, .mapMatrixID = 232, .scriptsArchiveID = scripts_empty, @@ -7158,7 +7158,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_325] = { - .unk_00 = 33, + .areaDataArchiveID = 33, .unk_01 = 0xF, .mapMatrixID = 233, .scriptsArchiveID = scripts_empty, @@ -7180,7 +7180,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_TOWER] = { - .unk_00 = 33, + .areaDataArchiveID = 33, .unk_01 = 0xF, .mapMatrixID = 193, .scriptsArchiveID = scripts_battle_tower, @@ -7202,7 +7202,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_TOWER_ELEVATOR] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, .scriptsArchiveID = scripts_battle_tower_elevator, @@ -7224,7 +7224,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_TOWER_CORRIDOR] = { - .unk_00 = 33, + .areaDataArchiveID = 33, .unk_01 = 0xF, .mapMatrixID = 194, .scriptsArchiveID = scripts_battle_tower_corridor, @@ -7246,7 +7246,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_TOWER_CORRIDOR_MULTI] = { - .unk_00 = 33, + .areaDataArchiveID = 33, .unk_01 = 0xF, .mapMatrixID = 195, .scriptsArchiveID = scripts_battle_tower_corridor_multi, @@ -7268,7 +7268,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_TOWER_BATTLE_ROOM] = { - .unk_00 = 33, + .areaDataArchiveID = 33, .unk_01 = 0xF, .mapMatrixID = 197, .scriptsArchiveID = scripts_battle_tower_battle_room, @@ -7290,7 +7290,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_TOWER_MULTI_BATTLE_ROOM] = { - .unk_00 = 33, + .areaDataArchiveID = 33, .unk_01 = 0xF, .mapMatrixID = 198, .scriptsArchiveID = scripts_battle_tower_multi_battle_room, @@ -7312,7 +7312,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_2P] = { - .unk_00 = 0x5, + .areaDataArchiveID = 0x5, .unk_01 = 0xE, .mapMatrixID = 118, .scriptsArchiveID = scripts_communication_club_colosseum_2p, @@ -7334,7 +7334,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_4P] = { - .unk_00 = 0x5, + .areaDataArchiveID = 0x5, .unk_01 = 0xE, .mapMatrixID = 121, .scriptsArchiveID = scripts_communication_club_colosseum_4p, @@ -7356,7 +7356,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VERITY_LAKEFRONT] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_verity_lakefront, @@ -7378,7 +7378,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_VERITY_LAKEFRONT_UNKNOWN_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0x14, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_verity_lakefront_unknown_house, @@ -7400,7 +7400,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VALOR_LAKEFRONT] = { - .unk_00 = 0x12, + .areaDataArchiveID = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_valor_lakefront, @@ -7422,7 +7422,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_RESTAURANT] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 147, .scriptsArchiveID = scripts_restaurant, @@ -7444,7 +7444,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 146, .scriptsArchiveID = scripts_grand_lake_valor_lakefront_east_house, @@ -7466,7 +7466,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GRAND_LAKE_VALOR_LAKEFRONT_WEST_HOUSE] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 146, .scriptsArchiveID = scripts_grand_lake_valor_lakefront_west_house, @@ -7488,7 +7488,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ACUITY_LAKEFRONT] = { - .unk_00 = 0xE, + .areaDataArchiveID = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_acuity_lakefront, @@ -7510,7 +7510,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_SPRING_PATH] = { - .unk_00 = 0x12, + .areaDataArchiveID = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -7532,7 +7532,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_201] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_201, @@ -7554,7 +7554,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_202] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_202, @@ -7576,7 +7576,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_203] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_203, @@ -7598,7 +7598,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_204_SOUTH] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_204_south, @@ -7620,7 +7620,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_204_NORTH] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_204_north, @@ -7642,7 +7642,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_205_SOUTH] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_205_south, @@ -7664,7 +7664,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_205_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_route_205_house, @@ -7686,7 +7686,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_205_NORTH] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_205_north, @@ -7708,7 +7708,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_206] = { - .unk_00 = 0x7, + .areaDataArchiveID = 0x7, .unk_01 = 0x1, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_206, @@ -7730,7 +7730,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_206_CYCLING_ROAD_SOUTH_GATE] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 260, .scriptsArchiveID = scripts_route_206_cycling_road_south_gate, @@ -7752,7 +7752,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GATE_BETWEEN_ETERNA_CITY_ROUTE_206] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0x1F, .mapMatrixID = 157, .scriptsArchiveID = scripts_gate_between_eterna_city_route_206, @@ -7774,7 +7774,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_207] = { - .unk_00 = 0x7, + .areaDataArchiveID = 0x7, .unk_01 = 0x1, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_207, @@ -7796,7 +7796,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_208] = { - .unk_00 = 0x9, + .areaDataArchiveID = 0x9, .unk_01 = 0x3, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_208, @@ -7818,7 +7818,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_208_HOUSE] = { - .unk_00 = 43, + .areaDataArchiveID = 43, .unk_01 = 0xF, .mapMatrixID = 249, .scriptsArchiveID = scripts_route_208_house, @@ -7840,7 +7840,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_209] = { - .unk_00 = 0xA, + .areaDataArchiveID = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_209, @@ -7862,7 +7862,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_1F] = { - .unk_00 = 42, + .areaDataArchiveID = 42, .unk_01 = 0xF, .mapMatrixID = 212, .scriptsArchiveID = scripts_route_209_lost_tower_1f, @@ -7884,7 +7884,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_2F] = { - .unk_00 = 42, + .areaDataArchiveID = 42, .unk_01 = 0xF, .mapMatrixID = 213, .scriptsArchiveID = scripts_empty, @@ -7906,7 +7906,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_3F] = { - .unk_00 = 42, + .areaDataArchiveID = 42, .unk_01 = 0xF, .mapMatrixID = 214, .scriptsArchiveID = scripts_empty, @@ -7928,7 +7928,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_4F] = { - .unk_00 = 42, + .areaDataArchiveID = 42, .unk_01 = 0xF, .mapMatrixID = 215, .scriptsArchiveID = scripts_empty, @@ -7950,7 +7950,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_209_LOST_TOWER_5F] = { - .unk_00 = 42, + .areaDataArchiveID = 42, .unk_01 = 0xF, .mapMatrixID = 216, .scriptsArchiveID = scripts_route_209_lost_tower_5f, @@ -7972,7 +7972,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_210_SOUTH] = { - .unk_00 = 0xA, + .areaDataArchiveID = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_210_south, @@ -7994,7 +7994,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_210_NORTH] = { - .unk_00 = 0xA, + .areaDataArchiveID = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_210_north, @@ -8016,7 +8016,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_210_GRANDMA_WILMA_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_route_210_grandma_wilma_house, @@ -8038,7 +8038,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_211_WEST] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_211_west, @@ -8060,7 +8060,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_211_EAST] = { - .unk_00 = 0xA, + .areaDataArchiveID = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_211_east, @@ -8082,7 +8082,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_212_NORTH] = { - .unk_00 = 0xC, + .areaDataArchiveID = 0xC, .unk_01 = 0x6, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_212_north, @@ -8104,7 +8104,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_POKEMON_MANSION] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 178, .scriptsArchiveID = scripts_pokemon_mansion, @@ -8126,7 +8126,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_MANSION_MAIDS_ROOM] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 179, .scriptsArchiveID = scripts_pokemon_mansion_maids_room, @@ -8148,7 +8148,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_MANSION_OFFICE] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 180, .scriptsArchiveID = scripts_pokemon_mansion_office, @@ -8170,7 +8170,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_212_SOUTH] = { - .unk_00 = 0xC, + .areaDataArchiveID = 0xC, .unk_01 = 0x6, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_212_south, @@ -8192,7 +8192,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_212_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, .scriptsArchiveID = scripts_route_212_house, @@ -8214,7 +8214,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_213] = { - .unk_00 = 0x12, + .areaDataArchiveID = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_213, @@ -8236,7 +8236,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_213_GATE_TO_PASTORIA_CITY] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 258, .scriptsArchiveID = scripts_route_213_gate_to_pastoria_city, @@ -8258,7 +8258,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FOOTSTEP_HOUSE] = { - .unk_00 = 43, + .areaDataArchiveID = 43, .unk_01 = 0xF, .mapMatrixID = 247, .scriptsArchiveID = scripts_footstep_house, @@ -8280,7 +8280,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GRAND_LAKE_ROUTE_213_LOBBY] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 145, .scriptsArchiveID = scripts_grand_lake_route_213_lobby, @@ -8302,7 +8302,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GRAND_LAKE_ROUTE_213_EAST_HOUSE] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 146, .scriptsArchiveID = scripts_grand_lake_route_213_east_house, @@ -8324,7 +8324,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GRAND_LAKE_ROUTE_213_NORTHWEST_HOUSE] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 146, .scriptsArchiveID = scripts_grand_lake_route_213_northwest_house, @@ -8346,7 +8346,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GRAND_LAKE_ROUTE_213_NORTHEAST_HOUSE] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 146, .scriptsArchiveID = scripts_grand_lake_route_213_northeast_house, @@ -8368,7 +8368,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_214] = { - .unk_00 = 0x12, + .areaDataArchiveID = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_214, @@ -8390,7 +8390,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_214_GATE_TO_VEILSTONE_CITY] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 257, .scriptsArchiveID = scripts_route_214_gate_to_veilstone_city, @@ -8412,7 +8412,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_215] = { - .unk_00 = 0xA, + .areaDataArchiveID = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_215, @@ -8434,7 +8434,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_216] = { - .unk_00 = 0xE, + .areaDataArchiveID = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_216, @@ -8456,7 +8456,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_216_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_route_216_house, @@ -8478,7 +8478,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_217] = { - .unk_00 = 0xE, + .areaDataArchiveID = 0xE, .unk_01 = 0x8, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_217, @@ -8500,7 +8500,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_217_WEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, .scriptsArchiveID = scripts_route_217_west_house, @@ -8522,7 +8522,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_217_NORTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, .scriptsArchiveID = scripts_route_217_northeast_house, @@ -8544,7 +8544,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_218] = { - .unk_00 = 0xF, + .areaDataArchiveID = 0xF, .unk_01 = 0x9, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_218, @@ -8566,7 +8566,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_218_GATE_TO_JUBILIFE_CITY] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 258, .scriptsArchiveID = scripts_route_218_gate_to_jubilife_city, @@ -8588,7 +8588,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_218_GATE_TO_CANALAVE_CITY] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 258, .scriptsArchiveID = scripts_route_218_gate_to_canalave_city, @@ -8610,7 +8610,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_219] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_219, @@ -8632,7 +8632,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_221] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_221, @@ -8654,7 +8654,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_PAL_PARK_LOBBY] = { - .unk_00 = 39, + .areaDataArchiveID = 39, .unk_01 = 0xF, .mapMatrixID = 201, .scriptsArchiveID = scripts_pal_park_lobby, @@ -8676,7 +8676,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_221_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, .scriptsArchiveID = scripts_route_221_house, @@ -8698,7 +8698,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_222] = { - .unk_00 = 0x12, + .areaDataArchiveID = 0x12, .unk_01 = 0xC, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_222, @@ -8720,7 +8720,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_222_WEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_route_222_west_house, @@ -8742,7 +8742,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_222_EAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_route_222_east_house, @@ -8764,7 +8764,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_222_GATE_TO_SUNYSHORE_CITY] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 258, .scriptsArchiveID = scripts_route_222_gate_to_sunyshore_city, @@ -8786,7 +8786,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_224] = { - .unk_00 = 0xD, + .areaDataArchiveID = 0xD, .unk_01 = 0xA, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_224, @@ -8808,7 +8808,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_225] = { - .unk_00 = 0x11, + .areaDataArchiveID = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_225, @@ -8830,7 +8830,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_UNKNOWN_401] = { - .unk_00 = 0x11, + .areaDataArchiveID = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -8852,7 +8852,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_402] = { - .unk_00 = 0x11, + .areaDataArchiveID = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -8874,7 +8874,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_227] = { - .unk_00 = 0x11, + .areaDataArchiveID = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_227, @@ -8896,7 +8896,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_UNKNOWN_404] = { - .unk_00 = 0x11, + .areaDataArchiveID = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -8918,7 +8918,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_405] = { - .unk_00 = 0x11, + .areaDataArchiveID = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -8940,7 +8940,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_228] = { - .unk_00 = 0x13, + .areaDataArchiveID = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_228, @@ -8962,7 +8962,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_229] = { - .unk_00 = 0x13, + .areaDataArchiveID = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_229, @@ -8984,7 +8984,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_UNKNOWN_408] = { - .unk_00 = 0x13, + .areaDataArchiveID = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -9006,7 +9006,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_409] = { - .unk_00 = 0x13, + .areaDataArchiveID = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -9028,7 +9028,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RECORD_MIXING_ROOM] = { - .unk_00 = 0x5, + .areaDataArchiveID = 0x5, .unk_01 = 0xE, .mapMatrixID = 119, .scriptsArchiveID = scripts_empty, @@ -9050,7 +9050,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TWINLEAF_TOWN] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_twinleaf_town, @@ -9072,7 +9072,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_TWINLEAF_TOWN_RIVAL_HOUSE_1F] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 126, .scriptsArchiveID = scripts_twinleaf_town_rival_house_1f, @@ -9094,7 +9094,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TWINLEAF_TOWN_RIVAL_HOUSE_2F] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 127, .scriptsArchiveID = scripts_twinleaf_town_rival_house_2f, @@ -9116,7 +9116,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_1F] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 128, .scriptsArchiveID = scripts_twinleaf_town_player_house_1f, @@ -9138,7 +9138,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TWINLEAF_TOWN_PLAYER_HOUSE_2F] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 129, .scriptsArchiveID = scripts_twinleaf_town_player_house_2f, @@ -9160,7 +9160,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TWINLEAF_TOWN_NORTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_twinleaf_town_northeast_house, @@ -9182,7 +9182,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TWINLEAF_TOWN_SOUTHWEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_twinleaf_town_southwest_house, @@ -9204,7 +9204,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SANDGEM_TOWN] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_sandgem_town, @@ -9226,7 +9226,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_SANDGEM_TOWN_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_sandgem_town_mart, @@ -9248,7 +9248,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SANDGEM_TOWN_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_sandgem_town_pokecenter_1f, @@ -9270,7 +9270,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SANDGEM_TOWN_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_sandgem_town_pokecenter_2f, @@ -9292,7 +9292,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SANDGEM_TOWN_POKEMON_RESEARCH_LAB] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 160, .scriptsArchiveID = scripts_sandgem_town_pokemon_research_lab, @@ -9314,7 +9314,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SANDGEM_TOWN_COUNTERPART_HOUSE_1F] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 130, .scriptsArchiveID = scripts_sandgem_town_counterpart_house_1f, @@ -9336,7 +9336,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SANDGEM_TOWN_COUNTERPART_HOUSE_2F] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 131, .scriptsArchiveID = scripts_sandgem_town_counterpart_house_2f, @@ -9358,7 +9358,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SANDGEM_TOWN_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_sandgem_town_house, @@ -9380,7 +9380,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FLOAROMA_TOWN] = { - .unk_00 = 0x8, + .areaDataArchiveID = 0x8, .unk_01 = 0x2, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_floaroma_town, @@ -9402,7 +9402,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_FLOAROMA_TOWN_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_floaroma_town_mart, @@ -9424,7 +9424,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FLOAROMA_TOWN_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_floaroma_town_pokecenter_1f, @@ -9446,7 +9446,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FLOAROMA_TOWN_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_floaroma_town_pokecenter_2f, @@ -9468,7 +9468,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FLOWER_SHOP] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 236, .scriptsArchiveID = scripts_flower_shop, @@ -9490,7 +9490,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FLOAROMA_TOWN_SOUTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_floaroma_town_southeast_house, @@ -9512,7 +9512,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FLOAROMA_TOWN_MIDDLE_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_floaroma_town_middle_house, @@ -9534,7 +9534,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_TOWN] = { - .unk_00 = 0xA, + .areaDataArchiveID = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_solaceon_town, @@ -9556,7 +9556,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_SOLACEON_TOWN_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_solaceon_town_mart, @@ -9578,7 +9578,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_TOWN_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_solaceon_town_pokecenter_1f, @@ -9600,7 +9600,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_TOWN_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_solaceon_town_pokecenter_2f, @@ -9622,7 +9622,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_DAY_CARE] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 137, .scriptsArchiveID = scripts_pokemon_day_care, @@ -9644,7 +9644,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_TOWN_NORTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_solaceon_town_northeast_house, @@ -9666,7 +9666,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_TOWN_POKEMON_NEWS_PRESS] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, .scriptsArchiveID = scripts_solaceon_town_pokemon_news_press, @@ -9688,7 +9688,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_TOWN_NORTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_solaceon_town_north_house, @@ -9710,7 +9710,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_TOWN_EAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_solaceon_town_east_house, @@ -9732,7 +9732,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CELESTIC_TOWN] = { - .unk_00 = 0xA, + .areaDataArchiveID = 0xA, .unk_01 = 0x4, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_celestic_town, @@ -9754,7 +9754,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_CELESTIC_TOWN_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_celestic_town_pokecenter_1f, @@ -9776,7 +9776,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CELESTIC_TOWN_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_celestic_town_pokecenter_2f, @@ -9798,7 +9798,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CELESTIC_TOWN_NORTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 168, .scriptsArchiveID = scripts_celestic_town_north_house, @@ -9820,7 +9820,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CELESTIC_TOWN_NORTHWEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 170, .scriptsArchiveID = scripts_celestic_town_northwest_house, @@ -9842,7 +9842,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CELESTIC_TOWN_NORTHEAST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, .scriptsArchiveID = scripts_celestic_town_northeast_house, @@ -9864,7 +9864,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CELESTIC_TOWN_SOUTHWEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, .scriptsArchiveID = scripts_celestic_town_southwest_house, @@ -9886,7 +9886,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CELESTIC_TOWN_CAVE] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 169, .scriptsArchiveID = scripts_celestic_town_cave, @@ -9908,7 +9908,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SURVIVAL_AREA] = { - .unk_00 = 0x11, + .areaDataArchiveID = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_survival_area, @@ -9930,7 +9930,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_SURVIVAL_AREA_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_survival_area_mart, @@ -9952,7 +9952,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SURVIVAL_AREA_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_survival_area_pokecenter_1f, @@ -9974,7 +9974,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SURVIVAL_AREA_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_survival_area_pokecenter_2f, @@ -9996,7 +9996,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLEGROUND] = { - .unk_00 = 52, + .areaDataArchiveID = 52, .unk_01 = 0xF, .mapMatrixID = 265, .scriptsArchiveID = scripts_battleground, @@ -10018,7 +10018,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SURVIVAL_AREA_SOUTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, .scriptsArchiveID = scripts_survival_area_south_house, @@ -10040,7 +10040,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SURVIVAL_AREA_NORTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, .scriptsArchiveID = scripts_survival_area_north_house, @@ -10062,7 +10062,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RESORT_AREA] = { - .unk_00 = 0x13, + .areaDataArchiveID = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_resort_area, @@ -10084,7 +10084,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_RESORT_AREA_MART] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 122, .scriptsArchiveID = scripts_resort_area_mart, @@ -10106,7 +10106,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RESORT_AREA_POKECENTER_1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x74, .scriptsArchiveID = scripts_resort_area_pokecenter_1f, @@ -10128,7 +10128,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RESORT_AREA_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_resort_area_pokecenter_2f, @@ -10150,7 +10150,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_1F] = { - .unk_00 = 38, + .areaDataArchiveID = 38, .unk_01 = 0xF, .mapMatrixID = 199, .scriptsArchiveID = scripts_resort_area_ribbon_syndicate_1f, @@ -10172,7 +10172,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_2F] = { - .unk_00 = 38, + .areaDataArchiveID = 38, .unk_01 = 0xF, .mapMatrixID = 200, .scriptsArchiveID = scripts_resort_area_ribbon_syndicate_2f, @@ -10194,7 +10194,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RESORT_AREA_RIBBON_SYNDICATE_ELEVATOR] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, .scriptsArchiveID = scripts_resort_area_ribbon_syndicate_elevator, @@ -10216,7 +10216,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VILLA] = { - .unk_00 = 51, + .areaDataArchiveID = 51, .unk_01 = 0xF, .mapMatrixID = 264, .scriptsArchiveID = scripts_villa, @@ -10238,7 +10238,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RESORT_AREA_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_resort_area_house, @@ -10260,7 +10260,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNION_ROOM] = { - .unk_00 = 0x5, + .areaDataArchiveID = 0x5, .unk_01 = 0xE, .mapMatrixID = 120, .scriptsArchiveID = scripts_union_room, @@ -10282,7 +10282,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_220] = { - .unk_00 = 0x6, + .areaDataArchiveID = 0x6, .unk_01 = 0x0, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -10304,7 +10304,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_223] = { - .unk_00 = 0xD, + .areaDataArchiveID = 0xD, .unk_01 = 0x7, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -10326,7 +10326,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_ROUTE_226] = { - .unk_00 = 0x11, + .areaDataArchiveID = 0x11, .unk_01 = 11, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_226, @@ -10348,7 +10348,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_UNKNOWN_470] = { - .unk_00 = 0x13, + .areaDataArchiveID = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -10370,7 +10370,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_230] = { - .unk_00 = 0x13, + .areaDataArchiveID = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_route_230, @@ -10392,7 +10392,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_SEABREAK_PATH] = { - .unk_00 = 0xD, + .areaDataArchiveID = 0xD, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -10414,7 +10414,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_UNKNOWN_473] = { - .unk_00 = 0x13, + .areaDataArchiveID = 0x13, .unk_01 = 0xD, .mapMatrixID = 0x0, .scriptsArchiveID = scripts_empty, @@ -10436,7 +10436,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_jubilife_city_pokecenter_b1f, @@ -10458,7 +10458,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_canalave_city_pokecenter_b1f, @@ -10480,7 +10480,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_OREBURGH_CITY_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_oreburgh_city_pokecenter_b1f, @@ -10502,7 +10502,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ETERNA_CITY_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_eterna_city_pokecenter_b1f, @@ -10524,7 +10524,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HEARTHOME_CITY_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_hearthome_city_pokecenter_b1f, @@ -10546,7 +10546,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_PASTORIA_CITY_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_pastoria_city_pokecenter_b1f, @@ -10568,7 +10568,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_CITY_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_veilstone_city_pokecenter_b1f, @@ -10590,7 +10590,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SUNYSHORE_CITY_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_sunyshore_city_pokecenter_b1f, @@ -10612,7 +10612,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SNOWPOINT_CITY_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_snowpoint_city_pokecenter_b1f, @@ -10634,7 +10634,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_SOUTH_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_pokemon_league_south_pokecenter_b1f, @@ -10656,7 +10656,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FIGHT_AREA_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_fight_area_pokecenter_b1f, @@ -10678,7 +10678,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SANDGEM_TOWN_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_sandgem_town_pokecenter_b1f, @@ -10700,7 +10700,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_FLOAROMA_TOWN_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_floaroma_town_pokecenter_b1f, @@ -10722,7 +10722,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_TOWN_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_solaceon_town_pokecenter_b1f, @@ -10744,7 +10744,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CELESTIC_TOWN_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_celestic_town_pokecenter_b1f, @@ -10766,7 +10766,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SURVIVAL_AREA_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_survival_area_pokecenter_b1f, @@ -10788,7 +10788,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RESORT_AREA_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_resort_area_pokecenter_b1f, @@ -10810,7 +10810,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CANALAVE_CITY_WEST_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 124, .scriptsArchiveID = scripts_canalave_city_west_house, @@ -10832,7 +10832,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CAFE] = { - .unk_00 = 35, + .areaDataArchiveID = 35, .unk_01 = 0xF, .mapMatrixID = 171, .scriptsArchiveID = scripts_cafe, @@ -10854,7 +10854,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_TOWER_BATTLE_SALON] = { - .unk_00 = 33, + .areaDataArchiveID = 33, .unk_01 = 0xF, .mapMatrixID = 196, .scriptsArchiveID = scripts_battle_tower_battle_salon, @@ -10876,7 +10876,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GALACTIC_HQ_CONTROL_ROOM] = { - .unk_00 = 68, + .areaDataArchiveID = 68, .unk_01 = 0xF, .mapMatrixID = 0xEE, .scriptsArchiveID = scripts_galactic_hq_control_room, @@ -10898,7 +10898,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_2F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x75, .scriptsArchiveID = scripts_pokemon_league_north_pokecenter_2f, @@ -10920,7 +10920,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_POKEMON_LEAGUE_NORTH_POKECENTER_B1F] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 235, .scriptsArchiveID = scripts_pokemon_league_north_pokecenter_b1f, @@ -10942,7 +10942,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GALACTIC_HQ_LABORATORY] = { - .unk_00 = 68, + .areaDataArchiveID = 68, .unk_01 = 0xF, .mapMatrixID = 0xEF, .scriptsArchiveID = scripts_galactic_hq_laboratory, @@ -10964,7 +10964,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_225_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 0x7B, .scriptsArchiveID = scripts_route_225_house, @@ -10986,7 +10986,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_226_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, .scriptsArchiveID = scripts_route_226_house, @@ -11008,7 +11008,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_227_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_route_227_house, @@ -11030,7 +11030,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_228_GATE_TO_ROUTE_226] = { - .unk_00 = 50, + .areaDataArchiveID = 50, .unk_01 = 0xF, .mapMatrixID = 258, .scriptsArchiveID = scripts_route_228_gate_to_route_226, @@ -11052,7 +11052,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_228_NORTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 244, .scriptsArchiveID = scripts_route_228_north_house, @@ -11074,7 +11074,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_228_SOUTH_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 125, .scriptsArchiveID = scripts_route_228_south_house, @@ -11096,7 +11096,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GREAT_MARSH_1] = { - .unk_00 = 63, + .areaDataArchiveID = 63, .unk_01 = 0xF, .mapMatrixID = 240, .scriptsArchiveID = scripts_great_marsh_1, @@ -11118,7 +11118,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GREAT_MARSH_2] = { - .unk_00 = 63, + .areaDataArchiveID = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, .scriptsArchiveID = scripts_great_marsh_2, @@ -11140,7 +11140,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GREAT_MARSH_3] = { - .unk_00 = 63, + .areaDataArchiveID = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, .scriptsArchiveID = scripts_great_marsh_3, @@ -11162,7 +11162,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GREAT_MARSH_4] = { - .unk_00 = 63, + .areaDataArchiveID = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, .scriptsArchiveID = scripts_great_marsh_4, @@ -11184,7 +11184,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GREAT_MARSH_5] = { - .unk_00 = 63, + .areaDataArchiveID = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, .scriptsArchiveID = scripts_great_marsh_5, @@ -11206,7 +11206,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GREAT_MARSH_6] = { - .unk_00 = 63, + .areaDataArchiveID = 63, .unk_01 = 0xF, .mapMatrixID = 0xF0, .scriptsArchiveID = scripts_great_marsh_6, @@ -11228,7 +11228,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_HALL_OF_ORIGIN] = { - .unk_00 = 0x3C, + .areaDataArchiveID = 0x3C, .unk_01 = 0xF, .mapMatrixID = 241, .scriptsArchiveID = scripts_hall_of_origin, @@ -11250,7 +11250,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_511] = { - .unk_00 = 0x3C, + .areaDataArchiveID = 0x3C, .unk_01 = 0xF, .mapMatrixID = 242, .scriptsArchiveID = scripts_empty, @@ -11272,7 +11272,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_RUIN_MANIAC_CAVE_LONG] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 77, .scriptsArchiveID = scripts_ruin_maniac_cave_long, @@ -11294,7 +11294,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MANIAC_TUNNEL] = { - .unk_00 = 53, + .areaDataArchiveID = 53, .unk_01 = 0xF, .mapMatrixID = 78, .scriptsArchiveID = scripts_maniac_tunnel, @@ -11316,7 +11316,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_IRON_ISLAND_HOUSE] = { - .unk_00 = 0x14, + .areaDataArchiveID = 0x14, .unk_01 = 0xF, .mapMatrixID = 243, .scriptsArchiveID = scripts_iron_island_house, @@ -11338,7 +11338,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SOLACEON_RUINS_ROOM_5_SOUTHEAST_DEADEND] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 0x1F, .scriptsArchiveID = scripts_empty, @@ -11360,7 +11360,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VISTA_LIGHTHOUSE_ELEVATOR] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 207, .scriptsArchiveID = scripts_vista_lighthouse_elevator, @@ -11382,7 +11382,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_JUBILIFE_CITY_SOUTHWEST_HOUSE_2F] = { - .unk_00 = 0x1F, + .areaDataArchiveID = 0x1F, .unk_01 = 0xF, .mapMatrixID = 208, .scriptsArchiveID = scripts_jubilife_city_southwest_house_2f, @@ -11404,7 +11404,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_4] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_4, @@ -11426,7 +11426,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_5] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_5, @@ -11448,7 +11448,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_1_ROOM_6] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_turnback_cave_pillar_1_room_6, @@ -11470,7 +11470,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_1] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_1, @@ -11492,7 +11492,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_2] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_2, @@ -11514,7 +11514,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_3] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_3, @@ -11536,7 +11536,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_4] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_4, @@ -11558,7 +11558,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_5] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_5, @@ -11580,7 +11580,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_2_ROOM_6] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_turnback_cave_pillar_2_room_6, @@ -11602,7 +11602,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_1] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_1, @@ -11624,7 +11624,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_2] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_2, @@ -11646,7 +11646,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_3] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_3, @@ -11668,7 +11668,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_4] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_4, @@ -11690,7 +11690,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_5] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_5, @@ -11712,7 +11712,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_TURNBACK_CAVE_PILLAR_3_ROOM_6] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_turnback_cave_pillar_3_room_6, @@ -11734,7 +11734,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_533] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_empty, @@ -11756,7 +11756,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_534] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_empty, @@ -11778,7 +11778,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_535] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_empty, @@ -11800,7 +11800,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_536] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_empty, @@ -11822,7 +11822,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_537] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_empty, @@ -11844,7 +11844,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_538] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_empty, @@ -11866,7 +11866,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_539] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_empty, @@ -11888,7 +11888,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_540] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_empty, @@ -11910,7 +11910,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_541] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_empty, @@ -11932,7 +11932,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_542] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_empty, @@ -11954,7 +11954,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_543] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_empty, @@ -11976,7 +11976,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_544] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_empty, @@ -11998,7 +11998,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_545] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_empty, @@ -12020,7 +12020,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_546] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_empty, @@ -12042,7 +12042,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_547] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_empty, @@ -12064,7 +12064,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_548] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_empty, @@ -12086,7 +12086,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_549] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_empty, @@ -12108,7 +12108,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_550] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_empty, @@ -12130,7 +12130,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_551] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_empty, @@ -12152,7 +12152,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_552] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 64, .scriptsArchiveID = scripts_empty, @@ -12174,7 +12174,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_553] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_empty, @@ -12196,7 +12196,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_554] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 65, .scriptsArchiveID = scripts_empty, @@ -12218,7 +12218,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_555] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_empty, @@ -12240,7 +12240,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_556] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_empty, @@ -12262,7 +12262,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_557] = { - .unk_00 = 56, + .areaDataArchiveID = 56, .unk_01 = 0xF, .mapMatrixID = 66, .scriptsArchiveID = scripts_empty, @@ -12284,7 +12284,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_CONTEST_HALL_STAGE_NO_CONTEST] = { - .unk_00 = 32, + .areaDataArchiveID = 32, .unk_01 = 0xF, .mapMatrixID = 166, .scriptsArchiveID = scripts_contest_hall_stage_no_contest, @@ -12306,7 +12306,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_FRONTIER] = { - .unk_00 = 73, + .areaDataArchiveID = 73, .unk_01 = 0xF, .mapMatrixID = 256, .scriptsArchiveID = scripts_battle_frontier, @@ -12328,7 +12328,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x1, }, [MAP_HEADER_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA] = { - .unk_00 = 44, + .areaDataArchiveID = 44, .unk_01 = 0xF, .mapMatrixID = 250, .scriptsArchiveID = scripts_battle_frontier_gate_to_fight_area, @@ -12350,7 +12350,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_561] = { - .unk_00 = 45, + .areaDataArchiveID = 45, .unk_01 = 0xF, .mapMatrixID = 251, .scriptsArchiveID = scripts_empty, @@ -12372,7 +12372,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_FACTORY] = { - .unk_00 = 46, + .areaDataArchiveID = 46, .unk_01 = 0xF, .mapMatrixID = 252, .scriptsArchiveID = scripts_battle_factory, @@ -12394,7 +12394,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_HALL] = { - .unk_00 = 47, + .areaDataArchiveID = 47, .unk_01 = 0xF, .mapMatrixID = 253, .scriptsArchiveID = scripts_battle_hall, @@ -12416,7 +12416,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_CASTLE] = { - .unk_00 = 48, + .areaDataArchiveID = 48, .unk_01 = 0xF, .mapMatrixID = 254, .scriptsArchiveID = scripts_battle_castle, @@ -12438,7 +12438,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_BATTLE_ARCADE] = { - .unk_00 = 49, + .areaDataArchiveID = 49, .unk_01 = 0xF, .mapMatrixID = 255, .scriptsArchiveID = scripts_battle_arcade, @@ -12460,7 +12460,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_VEILSTONE_STORE_B1F] = { - .unk_00 = 0x16, + .areaDataArchiveID = 0x16, .unk_01 = 0xF, .mapMatrixID = 246, .scriptsArchiveID = scripts_veilstone_store_b1f, @@ -12482,7 +12482,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GLOBAL_TERMINAL_2F] = { - .unk_00 = 40, + .areaDataArchiveID = 40, .unk_01 = 0xF, .mapMatrixID = 262, .scriptsArchiveID = scripts_global_terminal_2f, @@ -12504,7 +12504,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GLOBAL_TERMINAL_3F] = { - .unk_00 = 40, + .areaDataArchiveID = 40, .unk_01 = 0xF, .mapMatrixID = 263, .scriptsArchiveID = scripts_global_terminal_3f, @@ -12526,7 +12526,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_GALACTIC_HQ_HALL] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 261, .scriptsArchiveID = scripts_galactic_hq_hall, @@ -12548,7 +12548,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_570] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 268, .scriptsArchiveID = scripts_empty, @@ -12570,7 +12570,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROTOMS_ROOM] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 267, .scriptsArchiveID = scripts_rotoms_room, @@ -12592,7 +12592,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_572] = { - .unk_00 = 58, + .areaDataArchiveID = 58, .unk_01 = 0xF, .mapMatrixID = 266, .scriptsArchiveID = scripts_empty, @@ -12614,7 +12614,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_1F] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 269, .scriptsArchiveID = scripts_distortion_world_1f, @@ -12636,7 +12636,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_B1F] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 270, .scriptsArchiveID = scripts_distortion_world_b1f, @@ -12658,7 +12658,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_B2F] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 271, .scriptsArchiveID = scripts_distortion_world_b2f, @@ -12680,7 +12680,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_B3F] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 272, .scriptsArchiveID = scripts_distortion_world_b3f, @@ -12702,7 +12702,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_B4F] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 273, .scriptsArchiveID = scripts_distortion_world_b4f, @@ -12724,7 +12724,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_UNKNOWN_578] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 274, .scriptsArchiveID = scripts_map_header_unknown_578, @@ -12746,7 +12746,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_B5F] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 275, .scriptsArchiveID = scripts_distortion_world_b5f, @@ -12768,7 +12768,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_B6F] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 0x114, .scriptsArchiveID = scripts_distortion_world_b6f, @@ -12790,7 +12790,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_B7F] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 0x115, .scriptsArchiveID = scripts_distortion_world_b7f, @@ -12812,7 +12812,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_GIRATINA_ROOM] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 0x116, .scriptsArchiveID = scripts_distortion_world_giratina_room, @@ -12834,7 +12834,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_DISTORTION_WORLD_TURNBACK_CAVE_ROOM] = { - .unk_00 = 0x4A, + .areaDataArchiveID = 0x4A, .unk_01 = 0xF, .mapMatrixID = 0x117, .scriptsArchiveID = scripts_distortion_world_turnback_cave_room, @@ -12856,7 +12856,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SPEAR_PILLAR_DIALGA] = { - .unk_00 = 0x3C, + .areaDataArchiveID = 0x3C, .unk_01 = 0xF, .mapMatrixID = 0x118, .scriptsArchiveID = scripts_spear_pillar_dialga, @@ -12878,7 +12878,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_SPEAR_PILLAR_PALKIA] = { - .unk_00 = 0x3C, + .areaDataArchiveID = 0x3C, .unk_01 = 0xF, .mapMatrixID = 0x119, .scriptsArchiveID = scripts_spear_pillar_palkia, @@ -12900,7 +12900,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_WIFI_PLAZA_ENTRANCE] = { - .unk_00 = 0x15, + .areaDataArchiveID = 0x15, .unk_01 = 0xF, .mapMatrixID = 0x11A, .scriptsArchiveID = scripts_wifi_plaza_entrance, @@ -12922,7 +12922,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_IRON_ISLAND_IRON_RUINS] = { - .unk_00 = 0x48, + .areaDataArchiveID = 0x48, .unk_01 = 0xF, .mapMatrixID = 0x11B, .scriptsArchiveID = scripts_empty, @@ -12944,7 +12944,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_IRON_RUINS] = { - .unk_00 = 0x48, + .areaDataArchiveID = 0x48, .unk_01 = 0xF, .mapMatrixID = 0x11C, .scriptsArchiveID = scripts_iron_ruins, @@ -12966,7 +12966,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_MT_CORONET_ICEBERG_RUINS] = { - .unk_00 = 0x45, + .areaDataArchiveID = 0x45, .unk_01 = 0xF, .mapMatrixID = 0x11D, .scriptsArchiveID = scripts_empty, @@ -12988,7 +12988,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ICEBERG_RUINS] = { - .unk_00 = 0x45, + .areaDataArchiveID = 0x45, .unk_01 = 0xF, .mapMatrixID = 0x11E, .scriptsArchiveID = scripts_iceberg_ruins, @@ -13010,7 +13010,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROUTE_228_ROCK_PEAK_RUINS] = { - .unk_00 = 0x39, + .areaDataArchiveID = 0x39, .unk_01 = 0xF, .mapMatrixID = 0x11F, .scriptsArchiveID = scripts_empty, @@ -13032,7 +13032,7 @@ static const MapHeader sMapHeaders[] = { .isFlyAllowed = 0x0, }, [MAP_HEADER_ROCK_PEAK_RUINS] = { - .unk_00 = 0x39, + .areaDataArchiveID = 0x39, .unk_01 = 0xF, .mapMatrixID = 288, .scriptsArchiveID = scripts_rock_peak_ruins, diff --git a/include/field/field_system.h b/include/field/field_system.h index 4a0d8f8162..76ab1d2c87 100644 --- a/include/field/field_system.h +++ b/include/field/field_system.h @@ -14,6 +14,7 @@ #include "struct_defs/struct_0204AFC4.h" #include "field/field_system_sub2_decl.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop.h" #include "overlay005/struct_ov5_021D1A68_decl.h" #include "overlay005/struct_ov5_021D3CAC_decl.h" @@ -26,7 +27,6 @@ #include "overlay005/struct_ov5_021E8F60_decl.h" #include "overlay005/struct_ov5_021EB0E0_decl.h" #include "overlay005/struct_ov5_021EF300_decl.h" -#include "overlay005/struct_ov5_021EF76C_decl.h" #include "overlay023/struct_ov23_0224942C_decl.h" #include "overlay056/struct_ov56_02256468_decl.h" #include "overlay066/struct_ov66_0222DCE0_sub1.h" @@ -80,7 +80,7 @@ typedef struct FieldSystem_t { Camera *camera; UnkStruct_ov5_021E8F60 *unk_28; MapMatrix *mapMatrix; - UnkStruct_ov5_021EF76C *unk_30; + AreaDataManager *areaDataManager; UnkStruct_ov5_021D1A68 *unk_34; MapObjectManager *mapObjMan; PlayerAvatar *playerAvatar; diff --git a/include/map_header.h b/include/map_header.h index e4b2213657..b531f88fe2 100644 --- a/include/map_header.h +++ b/include/map_header.h @@ -4,7 +4,7 @@ #include "generated/evolution_methods.h" typedef struct { - u8 unk_00; + u8 areaDataArchiveID; u8 unk_01; u16 mapMatrixID; u16 scriptsArchiveID; @@ -27,7 +27,7 @@ typedef struct { } MapHeader; u32 MapHeader_IDBoundsCheck(u32 headerID); -const u16 sub_0203A038(u32 headerID); +const u16 MapHeader_GetAreaDataArchiveID(u32 headerID); const u16 sub_0203A04C(u32 headerID); const u16 MapHeader_GetMapMatrixID(u32 headerID); u32 MapHeader_GetMsgArchiveID(u32 headerID); diff --git a/include/overlay005/area_data.h b/include/overlay005/area_data.h new file mode 100644 index 0000000000..88a7653571 --- /dev/null +++ b/include/overlay005/area_data.h @@ -0,0 +1,52 @@ +#ifndef POKEPLATINUM_OV5_AREA_DATA_H +#define POKEPLATINUM_OV5_AREA_DATA_H + +#include + +#include "overlay005/map_prop_material_shape.h" +#include "overlay005/struct_ov5_021D3CAC_decl.h" + +#define MAX_MAP_PROP_MODEL_FILES 768 + +typedef struct AreaDataManagerLoadData { + int areaDataArchiveID; + UnkStruct_ov5_021D3CAC *unk_04; + u16 mapPropModelIDsCount; + int dummy0C; +} AreaDataManagerLoadData; + +typedef struct AreaDataFile { + u16 mapPropArchivesID; + u16 mapTextureArchiveID; + // The value of this changes in the NARC, but is unused in the code + u16 dummy04; + u16 areaLightArchiveID; +} AreaDataFile; + +typedef struct AreaDataManager { + int dummy00; + NNSG3dResFileHeader *mapPropModelFiles[MAX_MAP_PROP_MODEL_FILES]; + void *mapTextureFile; + void *mapPropTextureFile; + NNSG3dResTex *mapTexture; + NNSG3dResTex *mapPropTexture; + MapPropMaterialShape *mapPropMatShp; + AreaDataFile areaData; + AreaDataManagerLoadData *loadData; + // Note: the first element is the size of this array + u16 *mapPropModelIDs; +} AreaDataManager; + +AreaDataManager *AreaDataManager_Alloc(int areaDataArchiveID, UnkStruct_ov5_021D3CAC *param1); +void AreaDataManager_Load(AreaDataManager *areaDataManager); +NNSG3dResFileHeader **AreaDataManager_GetMapPropModelFile(const int mapPropModelID, AreaDataManager *const areaDataManager); +void AreaDataManager_Free(AreaDataManager **areaDataManager); +NNSG3dResTex *AreaDataManager_GetMapTexture(const AreaDataManager *areaDataManager); +NNSG3dResTex *AreaDataManager_GetMapPropTexture(const AreaDataManager *areaDataManager); +const MapPropMaterialShape *AreaDataManager_GetMapPropMaterialShape(const AreaDataManager *areaDataManager); +BOOL AreaDataManager_IsOutdoorsLighting(const AreaDataManager *areaDataManager); +u8 AreaDataManager_GetAreaLightArchiveID(const AreaDataManager *areaDataManager); +int AreaDataManager_GetMapPropModelID(const AreaDataManager *areaDataManager, const int index); +BOOL AreaDataManager_HasMapPropModelFile(const AreaDataManager *areaDataManager, const int mapPropModelID); + +#endif // POKEPLATINUM_OV5_AREA_DATA_H diff --git a/include/overlay005/map_prop.h b/include/overlay005/map_prop.h index ae5471f870..6a46c27d8e 100644 --- a/include/overlay005/map_prop.h +++ b/include/overlay005/map_prop.h @@ -4,16 +4,16 @@ #include #include +#include "overlay005/area_data.h" #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D5894.h" -#include "overlay005/struct_ov5_021EF76C_decl.h" #include "narc.h" #define MAX_LOADED_MAP_PROPS 32 typedef struct MapProp { - int id; + int modelID; BOOL loaded; BOOL hidden; BOOL applyRotation; @@ -32,8 +32,8 @@ MapPropManager *MapPropManager_New(const u8 heapId); void MapPropManager_Free(MapPropManager *mapPropManager); void MapPropManager_Init(MapPropManager *mapPropManager); void MapPropManager_InitOne(const int index, MapPropManager *mapPropManager); -void MapPropManager_Load(NARC *landDataNARC, const int mapPropFilesSize, UnkStruct_ov5_021EF76C *const param2, MapPropManager *mapPropManager, UnkStruct_ov5_021D3CAC *param4); -void MapPropManager_Render(const VecFx32 *positionOffset, const UnkStruct_ov5_021EF76C *param1, const BOOL param2, UnkStruct_ov5_021D5894 *const param3, MapPropManager *mapPropManager); +void MapPropManager_Load(NARC *landDataNARC, const int mapPropFilesSize, AreaDataManager *const areaDataManager, MapPropManager *mapPropManager, UnkStruct_ov5_021D3CAC *param4); +void MapPropManager_Render(const VecFx32 *positionOffset, const AreaDataManager *areaDataManager, const BOOL param2, UnkStruct_ov5_021D5894 *const param3, MapPropManager *mapPropManager); VecFx32 *MapProp_GetRotation(MapProp *mapProp); VecFx32 MapProp_GetPosition(const MapProp *mapProp); void MapProp_SetPosition(MapProp *mapProp, const VecFx32 *position); @@ -42,9 +42,9 @@ int MapProp_GetId(const MapProp *mapProp); NNSG3dRenderObj *MapProp_GetRenderObj(const MapProp *mapProp); NNSG3dResMdl *MapProp_GetModel(const MapProp *mapProp); MapProp *MapPropManager_GetLoadedProp(MapPropManager *mapPropManager, const u8 index); -MapProp *MapPropManager_FindLoadedPropById(MapPropManager *mapPropManager, const int id); +MapProp *MapPropManager_FindLoadedPropByModelID(MapPropManager *mapPropManager, const int modelID); MapProp *MapPropManager_GetLoadedPropSafely(MapPropManager *mapPropManager, const int index); -u8 MapPropManager_LoadOne(MapPropManager *mapPropManager, UnkStruct_ov5_021EF76C *const param1, const int id, const VecFx32 *position, const VecFx32 *rotation, UnkStruct_ov5_021D3CAC *param5); -void MapPropManager_Render2(MapPropManager *mapPropManager, UnkStruct_ov5_021EF76C *const param1); +u8 MapPropManager_LoadOne(MapPropManager *mapPropManager, AreaDataManager *const areaDataManager, const int modelID, const VecFx32 *position, const VecFx32 *rotation, UnkStruct_ov5_021D3CAC *param5); +void MapPropManager_Render2(MapPropManager *mapPropManager, AreaDataManager *const areaDataManager); #endif // POKEPLATINUM_OV5_MAP_PROP_H diff --git a/include/overlay005/map_prop_material_shape.h b/include/overlay005/map_prop_material_shape.h index a4af6d52b7..48d0c402f4 100644 --- a/include/overlay005/map_prop_material_shape.h +++ b/include/overlay005/map_prop_material_shape.h @@ -21,8 +21,8 @@ typedef struct MapPropMaterialShape { MapPropMaterialShape *MapPropMaterialShape_Alloc(void); void MapPropMaterialShape_Load(const char *path, MapPropMaterialShape *propMatShp); void MapPropMaterialShape_Free(MapPropMaterialShape *propMatShp); -void MapProp_GetMaterialShapeIDsCount(const int mapPropID, const MapPropMaterialShape *propMatShp, u16 *idsCount); -void MapProp_GetMaterialShapeIDsLocator(const int mapPropID, const MapPropMaterialShape *propMatShp, u16 *idsCount, u16 *idsIndex); +void MapProp_GetMaterialShapeIDsCount(const int mapPropModelID, const MapPropMaterialShape *propMatShp, u16 *idsCount); +void MapProp_GetMaterialShapeIDsLocator(const int mapPropModelID, const MapPropMaterialShape *propMatShp, u16 *idsCount, u16 *idsIndex); MapPropMaterialShapeIDs const *MapPropMaterialShape_GetMaterialShapeIDsAt(const u16 index, const MapPropMaterialShape *propMatShp); #endif // POKEPLATINUM_OV5_MAP_PROP_MATERIAL_SHAPE_H diff --git a/include/overlay005/ov5_021E779C.h b/include/overlay005/ov5_021E779C.h index e31362e823..eb433636ad 100644 --- a/include/overlay005/ov5_021E779C.h +++ b/include/overlay005/ov5_021E779C.h @@ -4,20 +4,20 @@ #include #include "field/field_system_decl.h" +#include "overlay005/area_data.h" #include "overlay005/bdhc.h" #include "overlay005/funcptr_ov5_021E9630.h" #include "overlay005/map_prop.h" #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D5894.h" #include "overlay005/struct_ov5_021E8F60_decl.h" -#include "overlay005/struct_ov5_021EF76C_decl.h" #include "map_matrix.h" #include "narc.h" void ov5_021E7A54(UnkStruct_ov5_021E8F60 *param0); void ov5_021E8188(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1); -UnkStruct_ov5_021E8F60 *ov5_021E9084(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021D3CAC *param2, const int param3); +UnkStruct_ov5_021E8F60 *ov5_021E9084(MapMatrix *param0, AreaDataManager *param1, UnkStruct_ov5_021D3CAC *param2, const int param3); void ov5_021E9150(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2); void ov5_021E9190(const u8 param0, UnkStruct_ov5_021E8F60 *param1); void ov5_021E91FC(const UnkStruct_ov5_021E8F60 *param0, UnkStruct_ov5_021D5894 *const param1); @@ -37,8 +37,8 @@ const BDHC *ov5_021E9610(const UnkStruct_ov5_021E8F60 *param0, const u8 param1); u16 const *ov5_021E9624(const UnkStruct_ov5_021E8F60 *param0, const u8 param1); void ov5_021E9630(UnkStruct_ov5_021E8F60 *param0, UnkFuncPtr_ov5_021E9630 param1, void *param2); NARC *ov5_021E9828(UnkStruct_ov5_021E8F60 *param0); -UnkStruct_ov5_021E8F60 *ov5_021E9830(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, NARC *param2); -void ov5_021E98C8(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, UnkStruct_ov5_021EF76C *param2, NARC *param3); +UnkStruct_ov5_021E8F60 *ov5_021E9830(MapMatrix *param0, AreaDataManager *param1, NARC *param2); +void ov5_021E98C8(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, AreaDataManager *param2, NARC *param3); void ov5_021E9938(UnkStruct_ov5_021E8F60 *param0); void ov5_021E9998(UnkStruct_ov5_021E8F60 *param0); void ov5_021E99C4(UnkStruct_ov5_021E8F60 *param0); @@ -47,10 +47,10 @@ void ov5_021E9AAC(UnkStruct_ov5_021E8F60 *param0, const int param1, const int pa void ov5_021E9B10(UnkStruct_ov5_021E8F60 *param0, int param1, int param2); void ov5_021E9C0C(const UnkStruct_ov5_021E8F60 *param0, const UnkStruct_ov5_021D5894 *param1); void ov5_021E9CD8(UnkStruct_ov5_021E8F60 *param0); -void ov5_021E9D3C(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021E8F60 *param2, UnkStruct_ov5_021E8F60 *param3, const int param4, const int param5); +void ov5_021E9D3C(MapMatrix *param0, AreaDataManager *param1, UnkStruct_ov5_021E8F60 *param2, UnkStruct_ov5_021E8F60 *param3, const int param4, const int param5); void ov5_021E9F98(UnkStruct_ov5_021E8F60 *param0, UnkStruct_ov5_021E8F60 *param1); void ov5_021EA174(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1); -void ov5_021EA540(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, UnkStruct_ov5_021EF76C *param2); +void ov5_021EA540(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, AreaDataManager *param2); void ov5_021EA58C(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, int *param3); void ov5_021EA5E0(UnkStruct_ov5_021E8F60 *param0, int param1, int param2); void ov5_021EA678(UnkStruct_ov5_021E8F60 *param0, int param1, int param2, int param3); diff --git a/include/overlay005/ov5_021EF75C.h b/include/overlay005/ov5_021EF75C.h deleted file mode 100644 index 954696f410..0000000000 --- a/include/overlay005/ov5_021EF75C.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef POKEPLATINUM_OV5_021EF75C_H -#define POKEPLATINUM_OV5_021EF75C_H - -#include - -#include "overlay005/map_prop_material_shape.h" -#include "overlay005/struct_ov5_021D3CAC_decl.h" -#include "overlay005/struct_ov5_021EF76C_decl.h" - -UnkStruct_ov5_021EF76C *ov5_021EF76C(int param0, UnkStruct_ov5_021D3CAC *param1); -void ov5_021EF7A0(UnkStruct_ov5_021EF76C *param0); -NNSG3dResFileHeader **ov5_021EF9E8(const int param0, UnkStruct_ov5_021EF76C *const param1); -void ov5_021EFA10(UnkStruct_ov5_021EF76C **param0); -NNSG3dResTex *ov5_021EFA8C(const UnkStruct_ov5_021EF76C *param0); -NNSG3dResTex *ov5_021EFAA0(const UnkStruct_ov5_021EF76C *param0); -const MapPropMaterialShape *ov5_021EFAB4(const UnkStruct_ov5_021EF76C *param0); -BOOL ov5_021EFAC0(const UnkStruct_ov5_021EF76C *param0); -u8 ov5_021EFAD8(const UnkStruct_ov5_021EF76C *param0); -int ov5_021EFAE8(const UnkStruct_ov5_021EF76C *param0, const int param1); -BOOL ov5_021EFAF8(const UnkStruct_ov5_021EF76C *param0, const int param1); - -#endif // POKEPLATINUM_OV5_021EF75C_H diff --git a/include/overlay005/struct_ov5_021EF76C_decl.h b/include/overlay005/struct_ov5_021EF76C_decl.h deleted file mode 100644 index efe71520f3..0000000000 --- a/include/overlay005/struct_ov5_021EF76C_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV5_021EF76C_DECL_H -#define POKEPLATINUM_STRUCT_OV5_021EF76C_DECL_H - -typedef struct UnkStruct_ov5_021EF76C_t UnkStruct_ov5_021EF76C; - -#endif // POKEPLATINUM_STRUCT_OV5_021EF76C_DECL_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 6531a18134..fc0e08937a 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -512,7 +512,7 @@ Overlay overlay5 Object main.nef.p/src_overlay005_ov5_021EF250.c.o Object main.nef.p/src_overlay005_hblank_system.c.o Object main.nef.p/src_overlay005_ov5_021EF4BC.c.o - Object main.nef.p/src_overlay005_ov5_021EF75C.c.o + Object main.nef.p/src_overlay005_area_data.c.o Object main.nef.p/src_overlay005_honey_tree.c.o Object main.nef.p/src_overlay005_ov5_021F007C.c.o Object main.nef.p/src_overlay005_ov5_021FF6B8.c.o diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index d0aa197680..95f8e86c9d 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -4,6 +4,7 @@ #include #include +#include "constants/gx_colors.h" #include "constants/heap.h" #include "constants/narc.h" #include "constants/species.h" @@ -78,9 +79,6 @@ #define OAM_VRAM_TRANSFER_MAIN_SIZE (0x14000) #define OAM_VRAM_TRANSFER_SUB_SIZE (0x4000) -#define COLOR_BLACK GX_RGB(4, 4, 4) -#define COLOR_TRANSPARENT GX_RGB(31, 31, 16) - #define TRANSPARENT_DEPTH 0x7FFF #define TRANSPARENT_POLYGON_ID 63 @@ -561,7 +559,7 @@ static void Setup3D(ChooseStarterApp *app) G3X_EdgeMarking(TRUE); for (int i = 0; i < 8; i++) { - app->edgeMarkings[i] = COLOR_BLACK; + app->edgeMarkings[i] = COLOR_DARK_GRAY; } G3X_SetEdgeColorTable(app->edgeMarkings); diff --git a/src/map_header.c b/src/map_header.c index e29182efbd..c585105230 100644 --- a/src/map_header.c +++ b/src/map_header.c @@ -14,10 +14,10 @@ u32 MapHeader_IDBoundsCheck(u32 headerID) return headerID; } -const u16 sub_0203A038(u32 headerID) +const u16 MapHeader_GetAreaDataArchiveID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); - return sMapHeaders[headerID].unk_00; + return sMapHeaders[headerID].areaDataArchiveID; } const u16 sub_0203A04C(u32 headerID) diff --git a/src/meson.build b/src/meson.build index 9060c05795..69c210d394 100644 --- a/src/meson.build +++ b/src/meson.build @@ -405,7 +405,7 @@ pokeplatinum_c = files( 'overlay005/ov5_021EF250.c', 'overlay005/hblank_system.c', 'overlay005/ov5_021EF4BC.c', - 'overlay005/ov5_021EF75C.c', + 'overlay005/area_data.c', 'overlay005/honey_tree.c', 'overlay005/ov5_021F007C.c', 'overlay005/ov5_021F067C.c', diff --git a/src/overlay005/area_data.c b/src/overlay005/area_data.c new file mode 100644 index 0000000000..df67d94283 --- /dev/null +++ b/src/overlay005/area_data.c @@ -0,0 +1,233 @@ +#include "overlay005/area_data.h" + +#include +#include + +#include "constants/gx_colors.h" +#include "constants/heap.h" + +#include "overlay005/map_prop_material_shape.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/struct_ov5_021D3CAC_decl.h" + +#include "easy3d.h" +#include "heap.h" +#include "narc.h" + +static const GXRgb sIndoorsEdgeMarkings[8] = { + COLOR_BLACK, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY +}; + +static const GXRgb sOutdoorsEdgeMarkings[8] = { + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY, + COLOR_DARK_GRAY +}; + +static void AreaData_StripTextureData(void *resourceFile, NNSG3dResTex *texture) +{ + u8 *textureData = (u8 *)texture + texture->texInfo.ofsTex; + u32 strippedTextureDataSize = (u32)(textureData - (u8 *)resourceFile); + + Heap_ReallocFromHeap(resourceFile, strippedTextureDataSize); +} + +AreaDataManager *AreaDataManager_Alloc(const int areaDataArchiveID, UnkStruct_ov5_021D3CAC *param1) +{ + AreaDataManager *areaDataManager = Heap_AllocFromHeap(HEAP_ID_FIELD, sizeof(AreaDataManager)); + + areaDataManager->loadData = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELD, sizeof(AreaDataManagerLoadData)); + areaDataManager->loadData->areaDataArchiveID = areaDataArchiveID; + areaDataManager->loadData->unk_04 = param1; + areaDataManager->loadData->dummy0C = 0; + + return areaDataManager; +} + +void AreaDataManager_Load(AreaDataManager *areaDataManager) +{ + NARC *narc; + AreaDataManagerLoadData *loadData = areaDataManager->loadData; + + NARC_ReadWholeMemberByIndexPair(&areaDataManager->areaData, NARC_INDEX_FIELDDATA__AREADATA__AREA_DATA, loadData->areaDataArchiveID); + + areaDataManager->mapPropModelIDs = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREA_BUILD, areaDataManager->areaData.mapPropArchivesID, HEAP_ID_FIELD); + loadData->mapPropModelIDsCount = areaDataManager->mapPropModelIDs[0]; + + GF_ASSERT(loadData->mapPropModelIDsCount < MAX_MAP_PROP_MODEL_FILES); + + areaDataManager->mapTexture = NULL; + areaDataManager->mapTextureFile = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_MAP_TEX__MAP_TEX_SET, areaDataManager->areaData.mapTextureArchiveID, HEAP_ID_FIELD); + areaDataManager->mapPropTextureFile = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREABM_TEXSET, areaDataManager->areaData.mapPropArchivesID, HEAP_ID_FIELD); + areaDataManager->mapTexture = NNS_G3dGetTex((NNSG3dResFileHeader *)areaDataManager->mapTextureFile); + + if (loadData->mapPropModelIDsCount != 0) { + areaDataManager->mapPropTexture = NNS_G3dGetTex((NNSG3dResFileHeader *)areaDataManager->mapPropTextureFile); + } else { + areaDataManager->mapPropTexture = NULL; + } + + BOOL textureUploaded = Easy3D_UploadTextureToVRAM(areaDataManager->mapTexture); + GF_ASSERT(textureUploaded); + + AreaData_StripTextureData(areaDataManager->mapTextureFile, areaDataManager->mapTexture); + + if (areaDataManager->mapPropTexture != NULL) { + BOOL textureUploaded = Easy3D_UploadTextureToVRAM(areaDataManager->mapPropTexture); + GF_ASSERT(textureUploaded); + + AreaData_StripTextureData(areaDataManager->mapPropTextureFile, areaDataManager->mapPropTexture); + } + + for (int i = 0; i < MAX_MAP_PROP_MODEL_FILES; i++) { + areaDataManager->mapPropModelFiles[i] = NULL; + } + + areaDataManager->mapPropMatShp = NULL; + + narc = NARC_ctor(NARC_INDEX_FIELDDATA__BUILD_MODEL__BUILD_MODEL, HEAP_ID_FIELD); + + int i; + u16 mapPropModelID; + int mapPropModelAnimeListNARCFileCount = ov5_021D3F84(loadData->unk_04); + + for (i = 0; i < loadData->mapPropModelIDsCount; i++) { + mapPropModelID = areaDataManager->mapPropModelIDs[i + 1]; + + GF_ASSERT(areaDataManager->mapPropModelFiles[mapPropModelID] == NULL); + areaDataManager->mapPropModelFiles[mapPropModelID] = NARC_AllocAndReadWholeMember(narc, mapPropModelID, HEAP_ID_FIELD); + + if (mapPropModelID < mapPropModelAnimeListNARCFileCount) { + NNSG3dResMdl *mapPropModel = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(areaDataManager->mapPropModelFiles[mapPropModelID]), 0); + ov5_021D3A50(mapPropModelID, mapPropModel, areaDataManager->mapPropTexture, loadData->unk_04); + } + + BOOL textureBound = Easy3D_BindTextureToResource(areaDataManager->mapPropModelFiles[mapPropModelID], areaDataManager->mapPropTexture); + GF_ASSERT(textureBound); + } + + // Make sure the dummy box ("dmybox00") model is always loaded + if (areaDataManager->mapPropModelFiles[0] == NULL) { + BOOL res; + NNSG3dResTex *texture; + + areaDataManager->mapPropModelFiles[0] = NARC_AllocAndReadWholeMember(narc, 0, HEAP_ID_FIELD); + texture = NNS_G3dGetTex(areaDataManager->mapPropModelFiles[0]); + + if (texture != NULL) { + res = Easy3D_UploadTextureToVRAM(texture); + GF_ASSERT(res); + + res = Easy3D_BindTextureToResource(areaDataManager->mapPropModelFiles[0], texture); + GF_ASSERT(res); + } + } + + NARC_dtor(narc); + G3X_EdgeMarking(TRUE); + + if (!AreaDataManager_IsOutdoorsLighting(areaDataManager)) { + G3X_SetEdgeColorTable(sIndoorsEdgeMarkings); + } else { + G3X_SetEdgeColorTable(sOutdoorsEdgeMarkings); + } + + char mapPropMaterialShapeFilePath[256]; + + areaDataManager->mapPropMatShp = MapPropMaterialShape_Alloc(); + sprintf(mapPropMaterialShapeFilePath, "fielddata/build_model/build_model_matshp.dat"); + MapPropMaterialShape_Load(mapPropMaterialShapeFilePath, areaDataManager->mapPropMatShp); + + Heap_FreeToHeap(areaDataManager->loadData); + areaDataManager->loadData = NULL; +} + +NNSG3dResFileHeader **AreaDataManager_GetMapPropModelFile(const int mapPropModelID, AreaDataManager *const areaDataManager) +{ + GF_ASSERT(areaDataManager != NULL); + + if (areaDataManager->mapPropModelFiles[mapPropModelID] == NULL) { + // Return the dummy box model if the requested one is not loaded + GF_ASSERT(areaDataManager->mapPropModelFiles[0] != NULL); + return &areaDataManager->mapPropModelFiles[0]; + } + + return &areaDataManager->mapPropModelFiles[mapPropModelID]; +} + +void AreaDataManager_Free(AreaDataManager **areaDataManager) +{ + if ((*areaDataManager)->mapPropMatShp != NULL) { + MapPropMaterialShape_Free((*areaDataManager)->mapPropMatShp); + } + + for (int i = 0; i < MAX_MAP_PROP_MODEL_FILES; i++) { + if ((*areaDataManager)->mapPropModelFiles[i] != NULL) { + Heap_FreeToHeap((*areaDataManager)->mapPropModelFiles[i]); + } + } + + Heap_FreeToHeap((*areaDataManager)->mapPropModelIDs); + Heap_FreeToHeap((*areaDataManager)->mapTextureFile); + + (*areaDataManager)->mapTextureFile = NULL; + Heap_FreeToHeap((*areaDataManager)->mapPropTextureFile); + + (*areaDataManager)->mapPropTextureFile = NULL; + Heap_FreeToHeap(*areaDataManager); + + (*areaDataManager) = NULL; +} + +NNSG3dResTex *AreaDataManager_GetMapTexture(const AreaDataManager *areaDataManager) +{ + GF_ASSERT(areaDataManager != NULL); + return areaDataManager->mapTexture; +} + +NNSG3dResTex *AreaDataManager_GetMapPropTexture(const AreaDataManager *areaDataManager) +{ + GF_ASSERT(areaDataManager != NULL); + return areaDataManager->mapPropTexture; +} + +const MapPropMaterialShape *AreaDataManager_GetMapPropMaterialShape(const AreaDataManager *areaDataManager) +{ + return areaDataManager->mapPropMatShp; +} + +BOOL AreaDataManager_IsOutdoorsLighting(const AreaDataManager *areaDataManager) +{ + if ((areaDataManager->areaData.areaLightArchiveID == 0) || (areaDataManager->areaData.areaLightArchiveID == 3)) { + return TRUE; + } else { + return FALSE; + } +} + +u8 AreaDataManager_GetAreaLightArchiveID(const AreaDataManager *areaDataManager) +{ + return areaDataManager->areaData.areaLightArchiveID; +} + +int AreaDataManager_GetMapPropModelID(const AreaDataManager *areaDataManager, const int index) +{ + return areaDataManager->mapPropModelIDs[index]; +} + +BOOL AreaDataManager_HasMapPropModelFile(const AreaDataManager *areaDataManager, const int mapPropModelID) +{ + return areaDataManager->mapPropModelFiles[mapPropModelID] != NULL; +} diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index 6c55fd8f5b..14ea68fed5 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -15,6 +15,7 @@ #include "field/field_system.h" #include "field/field_system_sub2_decl.h" #include "field/field_system_sub2_t.h" +#include "overlay005/area_data.h" #include "overlay005/const_ov5_021FF6B8.h" #include "overlay005/const_ov5_021FF744.h" #include "overlay005/const_ov5_021FF7D0.h" @@ -40,7 +41,6 @@ #include "overlay005/ov5_021EE75C.h" #include "overlay005/ov5_021EF250.h" #include "overlay005/ov5_021EF4BC.h" -#include "overlay005/ov5_021EF75C.h" #include "overlay005/ov5_021F0824.h" #include "overlay005/ov5_021F10E8.h" #include "overlay005/struct_ov5_021D1A68_decl.h" @@ -204,7 +204,7 @@ static BOOL FieldMap_Init(OverlayManager *overlayMan, int *param1) break; case 1: ov5_021D1790(fieldSystem); - ov5_021EF7A0(fieldSystem->unk_30); + AreaDataManager_Load(fieldSystem->areaDataManager); fieldSystem->mapPropManager = MapPropManager_New(HEAP_ID_FIELD); @@ -304,7 +304,7 @@ static BOOL FieldMap_Exit(OverlayManager *overlayMan, int *param1) break; case 1: if (ov5_021E9300(fieldSystem->unk_28) == 1) { - ov5_021EFA10(&fieldSystem->unk_30); + AreaDataManager_Free(&fieldSystem->areaDataManager); ov5_021E92E4(fieldSystem->unk_28); HoneyTree_FreeShakeData(&fieldSystem->unk_A8); ov5_021D5BA8(fieldSystem); @@ -714,7 +714,7 @@ static void ov5_021D15F4(FieldSystem *fieldSystem) ov9_0224CA50(fieldSystem); } - MapPropManager_Render2(fieldSystem->mapPropManager, fieldSystem->unk_30); + MapPropManager_Render2(fieldSystem->mapPropManager, fieldSystem->areaDataManager); { const MtxFx44 *v2; @@ -789,10 +789,10 @@ static void ov5_021D1790(FieldSystem *fieldSystem) fieldSystem->unk_54 = ov5_021D4194(); { - u16 v0, v1; + u16 areaDataArchiveID, v1; - v0 = sub_0203A038(fieldSystem->location->mapId); - fieldSystem->unk_30 = ov5_021EF76C(v0, fieldSystem->unk_50); + areaDataArchiveID = MapHeader_GetAreaDataArchiveID(fieldSystem->location->mapId); + fieldSystem->areaDataManager = AreaDataManager_Alloc(areaDataArchiveID, fieldSystem->unk_50); v1 = sub_0203A04C(fieldSystem->location->mapId); GF_ASSERT(fieldSystem->unk_34 == NULL); @@ -803,7 +803,7 @@ static void ov5_021D1790(FieldSystem *fieldSystem) static void ov5_021D17EC(FieldSystem *fieldSystem) { - fieldSystem->unk_28 = ov5_021E9084(fieldSystem->mapMatrix, fieldSystem->unk_30, fieldSystem->unk_50, fieldSystem->unk_60); + fieldSystem->unk_28 = ov5_021E9084(fieldSystem->mapMatrix, fieldSystem->areaDataManager, fieldSystem->unk_50, fieldSystem->unk_60); if (FieldMap_InDistortionWorld(fieldSystem) == TRUE) { int v0 = 0, v1 = 0, v2 = 0; @@ -900,7 +900,7 @@ static void ov5_021D1968(FieldSystem *fieldSystem) ov5_021D5B40(PlayerAvatar_PosVector(fieldSystem->playerAvatar), fieldSystem, v0, 1); } - fieldSystem->unk_4C = ov5_021D521C(fieldSystem->unk_44, ov5_021EFAD8(fieldSystem->unk_30)); + fieldSystem->unk_4C = ov5_021D521C(fieldSystem->unk_44, AreaDataManager_GetAreaLightArchiveID(fieldSystem->areaDataManager)); if (FieldMap_InDistortionWorld(fieldSystem) == TRUE) { fieldSystem->unk_04->unk_0C = NULL; @@ -912,7 +912,7 @@ static void ov5_021D1968(FieldSystem *fieldSystem) fieldSystem->unk_64 = ov5_021E1B08(4); fieldSystem->unk_04->unk_10 = ov5_021D5CB0(); - ov5_021D5CE4(fieldSystem->unk_04->unk_10, ov5_021EFA8C(fieldSystem->unk_30)); + ov5_021D5CE4(fieldSystem->unk_04->unk_10, AreaDataManager_GetMapTexture(fieldSystem->areaDataManager)); sub_02068344(fieldSystem); ov5_021EE7C0(fieldSystem); SetVBlankCallback(fieldmap, fieldSystem); diff --git a/src/overlay005/honey_tree.c b/src/overlay005/honey_tree.c index 3af6f84fd3..573aa45c27 100644 --- a/src/overlay005/honey_tree.c +++ b/src/overlay005/honey_tree.c @@ -196,7 +196,7 @@ void HoneyTree_StopShaking(FieldSystem *fieldSystem) ov5_021E9340(v1, fieldSystem->unk_28, &v3); - v2 = MapPropManager_FindLoadedPropById(v3, MAP_PROP_ID_HONEY_TREE); + v2 = MapPropManager_FindLoadedPropByModelID(v3, MAP_PROP_MODEL_ID_HONEY_TREE); v4 = MapProp_GetRenderObj(v2); if (v2 != NULL) { @@ -366,7 +366,7 @@ static void DoTreeShakingAnimation(FieldSystem *fieldSystem, MapPropManager *par return; } - v4 = MapPropManager_FindLoadedPropById(param1, MAP_PROP_ID_HONEY_TREE); + v4 = MapPropManager_FindLoadedPropByModelID(param1, MAP_PROP_MODEL_ID_HONEY_TREE); if (v4 != NULL) { NNSG3dRenderObj *v7; diff --git a/src/overlay005/map_prop.c b/src/overlay005/map_prop.c index ed9c42185e..92bfebfbf3 100644 --- a/src/overlay005/map_prop.c +++ b/src/overlay005/map_prop.c @@ -5,13 +5,12 @@ #include "constants/heap.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop_material_shape.h" #include "overlay005/ov5_021D37AC.h" #include "overlay005/ov5_021D5878.h" -#include "overlay005/ov5_021EF75C.h" #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D5894.h" -#include "overlay005/struct_ov5_021EF76C_decl.h" #include "easy3d.h" #include "fx_util.h" @@ -19,11 +18,11 @@ #include "narc.h" #include "unk_0201CED8.h" -static void MapPropManager_InitRenderObj(const int loadedPropId, UnkStruct_ov5_021EF76C *const param1, NNSG3dRenderObj *renderObj, NNSG3dResMdl **resMdl); -static void MapPropManager_RenderUsing1Mat1Shp(const NNSG3dResMdl *resMdl, VecFx32 *position, MtxFx33 *rotation, VecFx32 *scale, const MapPropMaterialShape *propMatShp, const int mapPropID); +static void MapPropManager_InitRenderObj(const int modelID, AreaDataManager *const areaDataManager, NNSG3dRenderObj *renderObj, NNSG3dResMdl **model); +static void MapPropManager_RenderUsing1Mat1Shp(const NNSG3dResMdl *model, VecFx32 *position, MtxFx33 *rotation, VecFx32 *scale, const MapPropMaterialShape *propMatShp, const int modelID); typedef struct { - int id; + int modelID; VecFx32 position; VecFx32 rotation; VecFx32 scale; @@ -49,7 +48,7 @@ void MapPropManager_Init(MapPropManager *mapPropManager) for (u8 i = 0; i < MAX_LOADED_MAP_PROPS; i++) { VecFx32 nullVector = { 0, 0, 0 }; - mapPropManager->loadedProps[i].id = 0; + mapPropManager->loadedProps[i].modelID = 0; mapPropManager->loadedProps[i].loaded = FALSE; mapPropManager->loadedProps[i].hidden = FALSE; mapPropManager->loadedProps[i].applyRotation = FALSE; @@ -65,7 +64,7 @@ void MapPropManager_InitOne(const int index, MapPropManager *mapPropManager) GF_ASSERT(index < MAX_LOADED_MAP_PROPS); VecFx32 nullVector = { 0, 0, 0 }; - mapPropManager->loadedProps[index].id = 0; + mapPropManager->loadedProps[index].modelID = 0; mapPropManager->loadedProps[index].loaded = FALSE; mapPropManager->loadedProps[index].hidden = FALSE; mapPropManager->loadedProps[index].applyRotation = FALSE; @@ -75,7 +74,7 @@ void MapPropManager_InitOne(const int index, MapPropManager *mapPropManager) mapPropManager->loadedProps[index].model = NULL; } -void MapPropManager_Load(NARC *landDataNARC, const int mapPropFilesSize, UnkStruct_ov5_021EF76C *const param2, MapPropManager *mapPropManager, UnkStruct_ov5_021D3CAC *param4) +void MapPropManager_Load(NARC *landDataNARC, const int mapPropFilesSize, AreaDataManager *const areaDataManager, MapPropManager *mapPropManager, UnkStruct_ov5_021D3CAC *param4) { MapPropFile *mapPropFiles = NULL; u32 mapPropFilesCount; @@ -93,24 +92,24 @@ void MapPropManager_Load(NARC *landDataNARC, const int mapPropFilesSize, UnkStru MapProp *loadedProp = &mapPropManager->loadedProps[i]; if (i < mapPropFilesCount) { - loadedProp->id = mapPropFiles[i].id; + loadedProp->modelID = mapPropFiles[i].modelID; loadedProp->loaded = TRUE; loadedProp->applyRotation = FALSE; loadedProp->position = mapPropFiles[i].position; loadedProp->rotation = mapPropFiles[i].rotation; loadedProp->scale = mapPropFiles[i].scale; - MapPropManager_InitRenderObj(loadedProp->id, param2, &loadedProp->renderObj, &loadedProp->model); + MapPropManager_InitRenderObj(loadedProp->modelID, areaDataManager, &loadedProp->renderObj, &loadedProp->model); - if (ov5_021EFAF8(param2, loadedProp->id) == FALSE) { - loadedProp->id = 0; + if (AreaDataManager_HasMapPropModelFile(areaDataManager, loadedProp->modelID) == FALSE) { + loadedProp->modelID = 0; } - ov5_021D3BE4(loadedProp->id, &loadedProp->renderObj, param4); + ov5_021D3BE4(loadedProp->modelID, &loadedProp->renderObj, param4); } else { VecFx32 nullVector = { 0, 0, 0 }; - loadedProp->id = 0; + loadedProp->modelID = 0; loadedProp->loaded = FALSE; loadedProp->applyRotation = FALSE; loadedProp->position = nullVector; @@ -124,7 +123,7 @@ void MapPropManager_Load(NARC *landDataNARC, const int mapPropFilesSize, UnkStru } } -void MapPropManager_Render(const VecFx32 *positionOffset, const UnkStruct_ov5_021EF76C *param1, const BOOL param2, UnkStruct_ov5_021D5894 *const param3, MapPropManager *mapPropManager) +void MapPropManager_Render(const VecFx32 *positionOffset, const AreaDataManager *areaDataManager, const BOOL param2, UnkStruct_ov5_021D5894 *const param3, MapPropManager *mapPropManager) { int i; VecFx32 position; @@ -153,19 +152,19 @@ void MapPropManager_Render(const VecFx32 *positionOffset, const UnkStruct_ov5_02 position.z += positionOffset->z; if (sub_0201CED8(loadedProp->model, &position, &rotationMatrix, &loadedProp->scale)) { - const MapPropMaterialShape *propMatShp = ov5_021EFAB4(param1); + const MapPropMaterialShape *propMatShp = AreaDataManager_GetMapPropMaterialShape(areaDataManager); u16 propMatShpIDsCount; if (param2 == TRUE) { ov5_021D5948(param3, loadedProp->model, (1 | 1 << 1 | 1 << 4 | 1 << 5 | 1 << 8 | 1 << 9 | 1 << 10 | 1 << 11)); } - MapProp_GetMaterialShapeIDsCount(loadedProp->id, propMatShp, &propMatShpIDsCount); + MapProp_GetMaterialShapeIDsCount(loadedProp->modelID, propMatShp, &propMatShpIDsCount); if (propMatShpIDsCount == 0) { Easy3D_DrawRenderObj(&loadedProp->renderObj, &position, &rotationMatrix, &loadedProp->scale); } else { - MapPropManager_RenderUsing1Mat1Shp(loadedProp->model, &position, &rotationMatrix, &loadedProp->scale, propMatShp, loadedProp->id); + MapPropManager_RenderUsing1Mat1Shp(loadedProp->model, &position, &rotationMatrix, &loadedProp->scale, propMatShp, loadedProp->modelID); } } } @@ -194,7 +193,7 @@ void MapProp_SetHidden(MapProp *mapProp, const BOOL hidden) int MapProp_GetId(const MapProp *mapProp) { - return mapProp->id; + return mapProp->modelID; } NNSG3dRenderObj *MapProp_GetRenderObj(const MapProp *mapProp) @@ -212,12 +211,12 @@ MapProp *MapPropManager_GetLoadedProp(MapPropManager *mapPropManager, const u8 i return &mapPropManager->loadedProps[index]; } -MapProp *MapPropManager_FindLoadedPropById(MapPropManager *mapPropManager, const int id) +MapProp *MapPropManager_FindLoadedPropByModelID(MapPropManager *mapPropManager, const int modelID) { for (int i = 0; i < MAX_LOADED_MAP_PROPS; i++) { MapProp *loadedProp = &mapPropManager->loadedProps[i]; - if (loadedProp->id == id) { + if (loadedProp->modelID == modelID) { return loadedProp; } } @@ -234,15 +233,15 @@ MapProp *MapPropManager_GetLoadedPropSafely(MapPropManager *mapPropManager, cons return loadedProp; } -static void MapPropManager_InitRenderObj(const int loadedPropId, UnkStruct_ov5_021EF76C *const param1, NNSG3dRenderObj *renderObj, NNSG3dResMdl **resMdl) +static void MapPropManager_InitRenderObj(const int modelID, AreaDataManager *const areaDataManager, NNSG3dRenderObj *renderObj, NNSG3dResMdl **model) { - NNSG3dResFileHeader **nsbmdFile = ov5_021EF9E8(loadedPropId, param1); + NNSG3dResFileHeader **modelFile = AreaDataManager_GetMapPropModelFile(modelID, areaDataManager); - *resMdl = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*nsbmdFile), 0); - NNS_G3dRenderObjInit(renderObj, *resMdl); + *model = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*modelFile), 0); + NNS_G3dRenderObjInit(renderObj, *model); } -static void MapPropManager_RenderUsing1Mat1Shp(const NNSG3dResMdl *resMdl, VecFx32 *position, MtxFx33 *rotation, VecFx32 *scale, const MapPropMaterialShape *propMatShp, const int mapPropID) +static void MapPropManager_RenderUsing1Mat1Shp(const NNSG3dResMdl *model, VecFx32 *position, MtxFx33 *rotation, VecFx32 *scale, const MapPropMaterialShape *propMatShp, const int modelID) { u8 i; u16 propMatShpIDsCount; @@ -256,7 +255,7 @@ static void MapPropManager_RenderUsing1Mat1Shp(const NNSG3dResMdl *resMdl, VecFx NNS_G3dGlbSetBaseScale(scale); NNS_G3dGlbFlush(); - MapProp_GetMaterialShapeIDsLocator(mapPropID, propMatShp, &propMatShpIDsCount, &propMatShpIDsIndex); + MapProp_GetMaterialShapeIDsLocator(modelID, propMatShp, &propMatShpIDsCount, &propMatShpIDsIndex); propMatShpIDs = MapPropMaterialShape_GetMaterialShapeIDsAt(propMatShpIDsIndex, propMatShp); materialID = 0xFF; @@ -270,11 +269,11 @@ static void MapPropManager_RenderUsing1Mat1Shp(const NNSG3dResMdl *resMdl, VecFx sendMaterial = FALSE; } - NNS_G3dDraw1Mat1Shp(resMdl, materialID, propMatShpIDs[i].shapeID, sendMaterial); + NNS_G3dDraw1Mat1Shp(model, materialID, propMatShpIDs[i].shapeID, sendMaterial); } } -u8 MapPropManager_LoadOne(MapPropManager *mapPropManager, UnkStruct_ov5_021EF76C *const param1, const int id, const VecFx32 *position, const VecFx32 *rotation, UnkStruct_ov5_021D3CAC *param5) +u8 MapPropManager_LoadOne(MapPropManager *mapPropManager, AreaDataManager *const areaDataManager, const int modelID, const VecFx32 *position, const VecFx32 *rotation, UnkStruct_ov5_021D3CAC *param5) { u8 i; VecFx32 scale = { FX32_ONE, FX32_ONE, FX32_ONE }; @@ -294,10 +293,10 @@ u8 MapPropManager_LoadOne(MapPropManager *mapPropManager, UnkStruct_ov5_021EF76C } loadedProp->scale = scale; - loadedProp->id = id; + loadedProp->modelID = modelID; - MapPropManager_InitRenderObj(loadedProp->id, param1, &loadedProp->renderObj, &loadedProp->model); - ov5_021D3B24(loadedProp->id, 0, FALSE, &loadedProp->renderObj, param5); + MapPropManager_InitRenderObj(loadedProp->modelID, areaDataManager, &loadedProp->renderObj, &loadedProp->model); + ov5_021D3B24(loadedProp->modelID, 0, FALSE, &loadedProp->renderObj, param5); return i; } @@ -307,7 +306,7 @@ u8 MapPropManager_LoadOne(MapPropManager *mapPropManager, UnkStruct_ov5_021EF76C return MAX_LOADED_MAP_PROPS; } -void MapPropManager_Render2(MapPropManager *mapPropManager, UnkStruct_ov5_021EF76C *const param1) +void MapPropManager_Render2(MapPropManager *mapPropManager, AreaDataManager *const areaDataManager) { u8 i; MtxFx33 rotationMatrix = { @@ -330,10 +329,10 @@ void MapPropManager_Render2(MapPropManager *mapPropManager, UnkStruct_ov5_021EF7 continue; } - const MapPropMaterialShape *propMatShp = ov5_021EFAB4(param1); + const MapPropMaterialShape *propMatShp = AreaDataManager_GetMapPropMaterialShape(areaDataManager); u16 propMatShpIDsCount; - MapProp_GetMaterialShapeIDsCount(loadedProp->id, propMatShp, &propMatShpIDsCount); + MapProp_GetMaterialShapeIDsCount(loadedProp->modelID, propMatShp, &propMatShpIDsCount); if (loadedProp->applyRotation) { MTX_Rot33Vec(&rotationMatrix, &loadedProp->rotation); @@ -342,7 +341,7 @@ void MapPropManager_Render2(MapPropManager *mapPropManager, UnkStruct_ov5_021EF7 if (propMatShpIDsCount == 0) { Easy3D_DrawRenderObj(&loadedProp->renderObj, &loadedProp->position, &rotationMatrix, &loadedProp->scale); } else { - MapPropManager_RenderUsing1Mat1Shp(loadedProp->model, &loadedProp->position, &rotationMatrix, &loadedProp->scale, propMatShp, loadedProp->id); + MapPropManager_RenderUsing1Mat1Shp(loadedProp->model, &loadedProp->position, &rotationMatrix, &loadedProp->scale, propMatShp, loadedProp->modelID); } } } diff --git a/src/overlay005/map_prop_material_shape.c b/src/overlay005/map_prop_material_shape.c index bc2f1301f8..ec9165925d 100644 --- a/src/overlay005/map_prop_material_shape.c +++ b/src/overlay005/map_prop_material_shape.c @@ -62,15 +62,15 @@ void MapPropMaterialShape_Free(MapPropMaterialShape *propMatShp) Heap_FreeToHeap(propMatShp); } -void MapProp_GetMaterialShapeIDsCount(const int mapPropID, const MapPropMaterialShape *propMatShp, u16 *idsCount) +void MapProp_GetMaterialShapeIDsCount(const int modelID, const MapPropMaterialShape *propMatShp, u16 *idsCount) { - *idsCount = propMatShp->idsLocators[mapPropID].idsCount; + *idsCount = propMatShp->idsLocators[modelID].idsCount; } -void MapProp_GetMaterialShapeIDsLocator(const int mapPropID, const MapPropMaterialShape *propMatShp, u16 *idsCount, u16 *idsIndex) +void MapProp_GetMaterialShapeIDsLocator(const int modelID, const MapPropMaterialShape *propMatShp, u16 *idsCount, u16 *idsIndex) { - *idsCount = propMatShp->idsLocators[mapPropID].idsCount; - *idsIndex = propMatShp->idsLocators[mapPropID].idsIndex; + *idsCount = propMatShp->idsLocators[modelID].idsCount; + *idsIndex = propMatShp->idsLocators[modelID].idsIndex; } MapPropMaterialShapeIDs const *MapPropMaterialShape_GetMaterialShapeIDsAt(const u16 index, const MapPropMaterialShape *propMatShp) diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c index 0933240980..6fd6feb17d 100644 --- a/src/overlay005/ov5_021D431C.c +++ b/src/overlay005/ov5_021D431C.c @@ -7,10 +7,10 @@ #include "struct_defs/struct_02055130.h" #include "field/field_system.h" +#include "overlay005/area_data.h" #include "overlay005/fieldmap.h" #include "overlay005/map_prop.h" #include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021EF75C.h" #include "overlay005/struct_ov5_021D3CE4_decl.h" #include "camera.h" @@ -117,7 +117,7 @@ BOOL ov5_021D433C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1) v7 = ov5_021D3F94(fieldSystem->unk_50, v4); param1->unk_1E = v7; - v8 = ov5_021EFAA0(fieldSystem->unk_30); + v8 = AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager); ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 1, v4, MapProp_GetRenderObj(v2), MapProp_GetModel(v2), v8, v7, 1, 0); } else { @@ -274,7 +274,7 @@ BOOL ov5_021D453C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1) v7 = ov5_021D3F94(fieldSystem->unk_50, v4); param1->unk_1E = v7; - v8 = ov5_021EFAA0(fieldSystem->unk_30); + v8 = AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager); ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 1, v4, MapProp_GetRenderObj(v2), MapProp_GetModel(v2), v8, v7, 1, 0); } else { @@ -501,7 +501,7 @@ BOOL ov5_021D4858(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, cons u8 v6; NNSG3dResTex *v7; - v7 = ov5_021EFAA0(fieldSystem->unk_30); + v7 = AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager); ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 2, v4, MapProp_GetRenderObj(v2), MapProp_GetModel(v2), v7, 1, 1, 1); } else { GF_ASSERT(FALSE); @@ -613,7 +613,7 @@ BOOL ov5_021D4A24(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, cons u8 v6; NNSG3dResTex *v7; - v7 = ov5_021EFAA0(fieldSystem->unk_30); + v7 = AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager); ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 2, v4, MapProp_GetRenderObj(v2), MapProp_GetModel(v2), v7, 1, 1, 0); } else { GF_ASSERT(FALSE); @@ -739,7 +739,7 @@ void ov5_021D4BF4(FieldSystem *fieldSystem, const int param1, const int param2, NNSG3dResTex *v7; v6 = ov5_021D3F94(fieldSystem->unk_50, v3); - v7 = ov5_021EFAA0(fieldSystem->unk_30); + v7 = AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager); ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, param3, v3, MapProp_GetRenderObj(v1), MapProp_GetModel(v1), v7, v6, 1, 0); } else { diff --git a/src/overlay005/ov5_021D521C.c b/src/overlay005/ov5_021D521C.c index d69e90a79b..a521164b21 100644 --- a/src/overlay005/ov5_021D521C.c +++ b/src/overlay005/ov5_021D521C.c @@ -3,6 +3,8 @@ #include #include +#include "constants/narc.h" + #include "overlay005/ov5_021D5878.h" #include "overlay005/struct_ov5_021D52F4.h" #include "overlay005/struct_ov5_021D5894.h" @@ -147,7 +149,7 @@ static u32 ov5_021D53D4(u32 param0, UnkStruct_ov5_021D52F4 **param1) char v7[256]; UnkStruct_ov5_021D52F4 *v8; - v4 = LoadMemberFromNARC(176, param0, 0, 4, 0); + v4 = LoadMemberFromNARC(NARC_INDEX_DATA__AREALIGHT, param0, 0, 4, 0); v3 = v4; v2 = 0; diff --git a/src/overlay005/ov5_021E779C.c b/src/overlay005/ov5_021E779C.c index 4984a0b445..212d070eae 100644 --- a/src/overlay005/ov5_021E779C.c +++ b/src/overlay005/ov5_021E779C.c @@ -6,16 +6,15 @@ #include "constants/heap.h" #include "field/field_system.h" +#include "overlay005/area_data.h" #include "overlay005/bdhc.h" #include "overlay005/funcptr_ov5_021E9630.h" #include "overlay005/map_prop.h" #include "overlay005/ov5_021D521C.h" #include "overlay005/ov5_021EEAC8.h" -#include "overlay005/ov5_021EF75C.h" #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D5894.h" #include "overlay005/struct_ov5_021EEB48_decl.h" -#include "overlay005/struct_ov5_021EF76C_decl.h" #include "easy3d.h" #include "heap.h" @@ -54,7 +53,7 @@ typedef struct { } UnkStruct_ov5_021E7814; typedef void (*UnkFuncPtr_ov5_021FAE98)(UnkStruct_ov5_021E8F60 *, const int, const int, const int, const int, const int); -typedef void (*UnkFuncPtr_ov5_021FAE98_1)(const u8, UnkStruct_ov5_021EF76C *const, const MapMatrix *, const int, const int, UnkStruct_ov5_021E8F60 *, UnkStruct_ov5_021E7814 *); +typedef void (*UnkFuncPtr_ov5_021FAE98_1)(const u8, AreaDataManager *const, const MapMatrix *, const int, const int, UnkStruct_ov5_021E8F60 *, UnkStruct_ov5_021E7814 *); typedef struct UnkStruct_ov5_021FAE98_t { UnkFuncPtr_ov5_021FAE98 unk_00; @@ -100,7 +99,7 @@ typedef struct UnkStruct_ov5_021E8F60_t { u8 unk_A1; BOOL unk_A4; int unk_A8; - UnkStruct_ov5_021EF76C *unk_AC; + AreaDataManager *unk_AC; MapMatrix *unk_B0; int unk_B4; int unk_B8; @@ -150,11 +149,11 @@ static void ov5_021E7AC4(UnkStruct_ov5_021E8F60 *param0); static void ov5_021E77E4(UnkStruct_ov5_021E8F60 *param0, const u8 param1); static BOOL ov5_021E80D0(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const u8 param3, const u8 param4, const u8 param5, const u8 param6); static void ov5_021E7BAC(NARC *param0, const int param1, UnkStruct_ov5_021E7BAC *param2); -static void ov5_021E7C00(const u8 param0, UnkStruct_ov5_021EF76C *const param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6); -static void ov5_021E7CD4(const u8 param0, UnkStruct_ov5_021EF76C *const param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6); -static void ov5_021E7E28(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, const UnkStruct_ov5_021E8F60 *param7); -static void ov5_021E7F1C(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7); -static void ov5_021E7FF0(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7); +static void ov5_021E7C00(const u8 param0, AreaDataManager *const param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6); +static void ov5_021E7CD4(const u8 param0, AreaDataManager *const param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6); +static void ov5_021E7E28(const int param0, const u8 param1, AreaDataManager *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, const UnkStruct_ov5_021E8F60 *param7); +static void ov5_021E7F1C(const int param0, const u8 param1, AreaDataManager *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7); +static void ov5_021E7FF0(const int param0, const u8 param1, AreaDataManager *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7); static void ov5_021E86A0(const int param0, const u8 param1, UnkStruct_ov5_021E8F60 *param2); static void ov5_021E8668(const u8 param0, const u8 param1, const u8 param2, const u8 param3, UnkStruct_ov5_021E8F60 *param4); static void ov5_021E8614(const u8 param0, UnkStruct_ov5_021E8F60 *param1); @@ -174,7 +173,7 @@ static void ov5_021E8D50(UnkStruct_ov5_021E8F60 *param0); static void ov5_021E8F90(const int param0, const int param1, const int param2, const int param3, UnkStruct_ov5_021E8F60 *param4); static void ov5_021E901C(const int param0, const int param1, const MapMatrix *param2, VecFx32 *param3); static void ov5_021E9A14(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const int param3, const int param4, const int param5); -static void ov5_021E9B70(const int param0, const u8 param1, const UnkStruct_ov5_021EF76C *param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7); +static void ov5_021E9B70(const int param0, const u8 param1, const AreaDataManager *param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7); static void ov5_021E9C40(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, const UnkStruct_ov5_021D5894 *param2); static const UnkStruct_ov5_021FAE98 Unk_ov5_021FAE98 = { @@ -461,7 +460,7 @@ static void ov5_021E7BAC(NARC *param0, const int param1, UnkStruct_ov5_021E7BAC Heap_FreeToHeap(v0); } -static void ov5_021E7C00(const u8 param0, UnkStruct_ov5_021EF76C *const param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6) +static void ov5_021E7C00(const u8 param0, AreaDataManager *const param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6) { int v0; u8 v1; @@ -495,7 +494,7 @@ static void ov5_021E7C00(const u8 param0, UnkStruct_ov5_021EF76C *const param1, { param6->unk_10.unk_00++; - param6->unk_08 = ov5_021E976C(param5->unk_EC, v3.unk_04, ¶m6->unk_00[param0]->unk_800, &(param6->unk_00[param0]->unk_854), ov5_021EFA8C(param1), &(param6->unk_00[param0]->unk_864), ¶m6->unk_10.unk_00); + param6->unk_08 = ov5_021E976C(param5->unk_EC, v3.unk_04, ¶m6->unk_00[param0]->unk_800, &(param6->unk_00[param0]->unk_854), AreaDataManager_GetMapTexture(param1), &(param6->unk_00[param0]->unk_864), ¶m6->unk_10.unk_00); } { @@ -504,7 +503,7 @@ static void ov5_021E7C00(const u8 param0, UnkStruct_ov5_021EF76C *const param1, } } -static void ov5_021E7CD4(const u8 param0, UnkStruct_ov5_021EF76C *const param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6) +static void ov5_021E7CD4(const u8 param0, AreaDataManager *const param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6) { int v0; u8 v1; @@ -536,11 +535,11 @@ static void ov5_021E7CD4(const u8 param0, UnkStruct_ov5_021EF76C *const param1, { param6->unk_10.unk_00++; - param6->unk_08 = ov5_021E976C(param5->unk_EC, v3.unk_04, ¶m6->unk_00[param0]->unk_800, &(param6->unk_00[param0]->unk_854), ov5_021EFA8C(param1), &(param6->unk_00[param0]->unk_864), ¶m6->unk_10.unk_00); + param6->unk_08 = ov5_021E976C(param5->unk_EC, v3.unk_04, ¶m6->unk_00[param0]->unk_800, &(param6->unk_00[param0]->unk_854), AreaDataManager_GetMapTexture(param1), &(param6->unk_00[param0]->unk_864), ¶m6->unk_10.unk_00); } } -static void ov5_021E7D98(const u8 param0, const UnkStruct_ov5_021EF76C *param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6) +static void ov5_021E7D98(const u8 param0, const AreaDataManager *param1, const MapMatrix *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6) { int v0; u8 v1; @@ -566,11 +565,11 @@ static void ov5_021E7D98(const u8 param0, const UnkStruct_ov5_021EF76C *param1, { param6->unk_10.unk_00++; - param6->unk_08 = ov5_021E976C(param5->unk_EC, v3.unk_04, ¶m6->unk_00[param0]->unk_800, &(param6->unk_00[param0]->unk_854), ov5_021EFA8C(param1), &(param6->unk_00[param0]->unk_864), ¶m6->unk_10.unk_00); + param6->unk_08 = ov5_021E976C(param5->unk_EC, v3.unk_04, ¶m6->unk_00[param0]->unk_800, &(param6->unk_00[param0]->unk_854), AreaDataManager_GetMapTexture(param1), &(param6->unk_00[param0]->unk_864), ¶m6->unk_10.unk_00); } } -static void ov5_021E7E28(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, const UnkStruct_ov5_021E8F60 *param7) +static void ov5_021E7E28(const int param0, const u8 param1, AreaDataManager *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, const UnkStruct_ov5_021E8F60 *param7) { int v0; NNSG3dResMdl *v1; @@ -600,7 +599,7 @@ static void ov5_021E7E28(const int param0, const u8 param1, UnkStruct_ov5_021EF7 } { - v1 = ov5_021E97AC(param7->unk_EC, v2.unk_04, ¶m7->unk_84[param1]->unk_800, &(param7->unk_84[param1]->unk_854), ov5_021EFA8C(param2)); + v1 = ov5_021E97AC(param7->unk_EC, v2.unk_04, ¶m7->unk_84[param1]->unk_800, &(param7->unk_84[param1]->unk_854), AreaDataManager_GetMapTexture(param2)); if (param6 == 1) { ov5_021D53A4(v1); @@ -620,7 +619,7 @@ static void ov5_021E7E28(const int param0, const u8 param1, UnkStruct_ov5_021EF7 } } -static void ov5_021E7F1C(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7) +static void ov5_021E7F1C(const int param0, const u8 param1, AreaDataManager *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7) { int v0; UnkStruct_ov5_021E7BAC v1; @@ -648,7 +647,7 @@ static void ov5_021E7F1C(const int param0, const u8 param1, UnkStruct_ov5_021EF7 } { - v2 = ov5_021E97AC(param7->unk_EC, v1.unk_04, ¶m7->unk_84[param1]->unk_800, &(param7->unk_84[param1]->unk_854), ov5_021EFA8C(param2)); + v2 = ov5_021E97AC(param7->unk_EC, v1.unk_04, ¶m7->unk_84[param1]->unk_800, &(param7->unk_84[param1]->unk_854), AreaDataManager_GetMapTexture(param2)); if (param6 == 1) { ov5_021D53A4(v2); @@ -660,7 +659,7 @@ static void ov5_021E7F1C(const int param0, const u8 param1, UnkStruct_ov5_021EF7 param7->unk_84[param1]->unk_860 = param0; } -static void ov5_021E7FF0(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7) +static void ov5_021E7FF0(const int param0, const u8 param1, AreaDataManager *const param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7) { int v0; UnkStruct_ov5_021E7BAC v1; @@ -849,7 +848,7 @@ void ov5_021E8188(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1) NNSG3dResMdlSet *v5 = NNS_G3dGetMdlSet(v1->unk_00[v1->unk_22 - 1]->unk_854); NNSG3dResMdl *v6 = NNS_G3dGetMdlByIdx(v5, 0); - if (ov5_021EFAC0(param1->unk_AC) == 1) { + if (AreaDataManager_IsOutdoorsLighting(param1->unk_AC) == 1) { ov5_021D53A4(v6); } } @@ -1153,7 +1152,7 @@ static void ov5_021E89D0(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, if (param1->unk_84[param0]->unk_864 == 1) { if (param1->unk_84[param0]->unk_868 != NULL) { - MapPropManager_Render(&v0, param1->unk_AC, ov5_021EFAC0(param1->unk_AC), param2, param1->unk_84[param0]->unk_868); + MapPropManager_Render(&v0, param1->unk_AC, AreaDataManager_IsOutdoorsLighting(param1->unk_AC), param2, param1->unk_84[param0]->unk_868); } } } @@ -1444,7 +1443,7 @@ static void ov5_021E8E28(UnkStruct_ov5_021E8F60 *param0, const int param1, const param0->unk_84[v0]->bdhc = BDHC_New(); BDHC_MarkNotLoaded(param0->unk_84[v0]->bdhc); - ov5_021E7E28(v1[v0], v0, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, ov5_021EFAC0(param0->unk_AC), param0); + ov5_021E7E28(v1[v0], v0, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, AreaDataManager_IsOutdoorsLighting(param0->unk_AC), param0); } } @@ -1458,7 +1457,7 @@ static void ov5_021E8ECC(UnkStruct_ov5_021E8F60 *param0, const int param1, const for (v0 = 0; v0 < 4; v0++) { param0->unk_84[v0]->bdhc = NULL; - ov5_021E7F1C(v1[v0], v0, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, ov5_021EFAC0(param0->unk_AC), param0); + ov5_021E7F1C(v1[v0], v0, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, AreaDataManager_IsOutdoorsLighting(param0->unk_AC), param0); } } @@ -1532,7 +1531,7 @@ static void ov5_021E901C(const int param0, const int param1, const MapMatrix *pa param3->z += v1 * 32 * 16 * FX32_ONE; } -UnkStruct_ov5_021E8F60 *ov5_021E9084(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021D3CAC *param2, const int param3) +UnkStruct_ov5_021E8F60 *ov5_021E9084(MapMatrix *param0, AreaDataManager *param1, UnkStruct_ov5_021D3CAC *param2, const int param3) { UnkStruct_ov5_021E8F60 *v0; BOOL v1; @@ -1979,7 +1978,7 @@ NARC *ov5_021E9828(UnkStruct_ov5_021E8F60 *param0) return param0->unk_EC; } -UnkStruct_ov5_021E8F60 *ov5_021E9830(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, NARC *param2) +UnkStruct_ov5_021E8F60 *ov5_021E9830(MapMatrix *param0, AreaDataManager *param1, NARC *param2) { UnkStruct_ov5_021E8F60 *v0; BOOL v1; @@ -2010,7 +2009,7 @@ UnkStruct_ov5_021E8F60 *ov5_021E9830(MapMatrix *param0, UnkStruct_ov5_021EF76C * return v0; } -void ov5_021E98C8(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, UnkStruct_ov5_021EF76C *param2, NARC *param3) +void ov5_021E98C8(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, AreaDataManager *param2, NARC *param3) { BOOL v0; @@ -2086,7 +2085,7 @@ static void ov5_021E9A14(UnkStruct_ov5_021E8F60 *param0, const int param1, const for (v0 = 0; v0 < 4; v0++) { param0->unk_84[v0]->bdhc = NULL; - ov5_021E9B70(v1[v0], v0, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, ov5_021EFAC0(param0->unk_AC), param0); + ov5_021E9B70(v1[v0], v0, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, AreaDataManager_IsOutdoorsLighting(param0->unk_AC), param0); } } @@ -2105,11 +2104,11 @@ void ov5_021E9AAC(UnkStruct_ov5_021E8F60 *param0, const int param1, const int pa void ov5_021E9B10(UnkStruct_ov5_021E8F60 *param0, int param1, int param2) { param0->unk_84[param1]->bdhc = NULL; - ov5_021E9B70(param2, param1, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, ov5_021EFAC0(param0->unk_AC), param0); + ov5_021E9B70(param2, param1, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, AreaDataManager_IsOutdoorsLighting(param0->unk_AC), param0); param0->unk_84[param1]->unk_864 = 0; } -static void ov5_021E9B70(const int param0, const u8 param1, const UnkStruct_ov5_021EF76C *param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7) +static void ov5_021E9B70(const int param0, const u8 param1, const AreaDataManager *param2, const MapMatrix *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7) { int v0, v1; UnkStruct_ov5_021E7BAC v2; @@ -2126,7 +2125,7 @@ static void ov5_021E9B70(const int param0, const u8 param1, const UnkStruct_ov5_ NARC_Seek(param7->unk_EC, v1); DC_FlushRange((void *)param7->unk_84[param1]->unk_854, v2.unk_04); - v3 = ov5_021E97AC(param7->unk_EC, v2.unk_04, ¶m7->unk_84[param1]->unk_800, &(param7->unk_84[param1]->unk_854), ov5_021EFA8C(param2)); + v3 = ov5_021E97AC(param7->unk_EC, v2.unk_04, ¶m7->unk_84[param1]->unk_800, &(param7->unk_84[param1]->unk_854), AreaDataManager_GetMapTexture(param2)); if (param6 == 1) { ov5_021D53A4(v3); @@ -2185,7 +2184,7 @@ void ov5_021E9CD8(UnkStruct_ov5_021E8F60 *param0) } } -void ov5_021E9D3C(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021E8F60 *param2, UnkStruct_ov5_021E8F60 *param3, const int param4, const int param5) +void ov5_021E9D3C(MapMatrix *param0, AreaDataManager *param1, UnkStruct_ov5_021E8F60 *param2, UnkStruct_ov5_021E8F60 *param3, const int param4, const int param5) { int v0; int v1[4]; @@ -2238,7 +2237,7 @@ void ov5_021E9D3C(MapMatrix *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_o } for (v0 = 0; v0 < 4; v0++) { - ov5_021E7FF0(v1[v0], v0, param3->unk_AC, param3->unk_B0, param3->unk_B4, param3->unk_B8, ov5_021EFAC0(param3->unk_AC), param3); + ov5_021E7FF0(v1[v0], v0, param3->unk_AC, param3->unk_B0, param3->unk_B4, param3->unk_B8, AreaDataManager_IsOutdoorsLighting(param3->unk_AC), param3); } } @@ -2399,7 +2398,7 @@ void ov5_021EA174(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1) NNSG3dResMdlSet *v5 = NNS_G3dGetMdlSet(v1->unk_00[v1->unk_22 - 1]->unk_854); NNSG3dResMdl *v6 = NNS_G3dGetMdlByIdx(v5, 0); - if (ov5_021EFAC0(param1->unk_AC) == 1) { + if (AreaDataManager_IsOutdoorsLighting(param1->unk_AC) == 1) { ov5_021D53A4(v6); } } @@ -2452,7 +2451,7 @@ void ov5_021EA174(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1) } } -void ov5_021EA540(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, UnkStruct_ov5_021EF76C *param2) +void ov5_021EA540(UnkStruct_ov5_021E8F60 *param0, MapMatrix *param1, AreaDataManager *param2) { param0->unk_AC = param2; param0->unk_B0 = param1; @@ -2487,7 +2486,7 @@ void ov5_021EA5E0(UnkStruct_ov5_021E8F60 *param0, int param1, int param2) MI_CpuFillFast(param0->unk_84[param1]->unk_00, 0xffffffff, 2 * 32 * 32); BDHC_MarkNotLoaded(param0->unk_84[param1]->bdhc); - ov5_021E7E28(param2, param1, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, ov5_021EFAC0(param0->unk_AC), param0); + ov5_021E7E28(param2, param1, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, AreaDataManager_IsOutdoorsLighting(param0->unk_AC), param0); } void ov5_021EA678(UnkStruct_ov5_021E8F60 *param0, int param1, int param2, int param3) diff --git a/src/overlay005/ov5_021EF75C.c b/src/overlay005/ov5_021EF75C.c deleted file mode 100644 index b8a3ed2aed..0000000000 --- a/src/overlay005/ov5_021EF75C.c +++ /dev/null @@ -1,299 +0,0 @@ -#include "overlay005/ov5_021EF75C.h" - -#include -#include - -#include "overlay005/map_prop_material_shape.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/struct_ov5_021D3CAC_decl.h" - -#include "easy3d.h" -#include "heap.h" -#include "narc.h" - -typedef struct { - int unk_00; - UnkStruct_ov5_021D3CAC *unk_04; - u16 unk_08; - int unk_0C; -} UnkStruct_ov5_021EF7A0; - -typedef struct { - u16 unk_00; - u16 unk_02; - u16 unk_04; - u16 unk_06; -} UnkStruct_ov5_021EF76C_sub1; - -typedef struct UnkStruct_ov5_021EF76C_t { - int unk_00; - NNSG3dResFileHeader *unk_04[768]; - void *unk_C04; - void *unk_C08; - NNSG3dResTex *unk_C0C; - NNSG3dResTex *unk_C10; - MapPropMaterialShape *unk_C14; - UnkStruct_ov5_021EF76C_sub1 unk_C18; - UnkStruct_ov5_021EF7A0 *unk_C20; - u16 *unk_C24; -} UnkStruct_ov5_021EF76C; - -static const GXRgb Unk_ov5_021FF588[8] = { - GX_RGB(0, 0, 0), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4) -}; - -static const GXRgb Unk_ov5_021FF598[8] = { - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4), - GX_RGB(4, 4, 4) -}; - -static void ov5_021EF75C(void *param0, NNSG3dResTex *param1) -{ - u8 *v0; - u32 v1; - - v0 = (u8 *)param1 + param1->texInfo.ofsTex; - v1 = (u32)(v0 - (u8 *)param0); - - Heap_ReallocFromHeap(param0, v1); -} - -UnkStruct_ov5_021EF76C *ov5_021EF76C(const int param0, UnkStruct_ov5_021D3CAC *param1) -{ - UnkStruct_ov5_021EF76C *v0; - - v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EF76C)); - - v0->unk_C20 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EF7A0)); - v0->unk_C20->unk_00 = param0; - v0->unk_C20->unk_04 = param1; - v0->unk_C20->unk_0C = 0; - - return v0; -} - -void ov5_021EF7A0(UnkStruct_ov5_021EF76C *param0) -{ - NARC *v0; - UnkStruct_ov5_021EF7A0 *v1 = param0->unk_C20; - - NARC_ReadWholeMemberByIndexPair(¶m0->unk_C18, NARC_INDEX_FIELDDATA__AREADATA__AREA_DATA, v1->unk_00); - - param0->unk_C24 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREA_BUILD, param0->unk_C18.unk_00, 4); - v1->unk_08 = param0->unk_C24[0]; - - GF_ASSERT(v1->unk_08 < 768); - - param0->unk_C0C = NULL; - param0->unk_C04 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_MAP_TEX__MAP_TEX_SET, param0->unk_C18.unk_02, 4); - param0->unk_C08 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREABM_TEXSET, param0->unk_C18.unk_00, 4); - param0->unk_C0C = NNS_G3dGetTex((NNSG3dResFileHeader *)param0->unk_C04); - - if (v1->unk_08 != 0) { - param0->unk_C10 = NNS_G3dGetTex((NNSG3dResFileHeader *)param0->unk_C08); - } else { - param0->unk_C10 = NULL; - } - - { - BOOL v2; - - v2 = Easy3D_UploadTextureToVRAM(param0->unk_C0C); - GF_ASSERT(v2); - } - - ov5_021EF75C(param0->unk_C04, param0->unk_C0C); - - if (param0->unk_C10 != NULL) { - BOOL v3; - - v3 = Easy3D_UploadTextureToVRAM(param0->unk_C10); - GF_ASSERT(v3); - - ov5_021EF75C(param0->unk_C08, param0->unk_C10); - } - - { - int v4; - - for (v4 = 0; v4 < 768; v4++) { - param0->unk_04[v4] = NULL; - } - - param0->unk_C14 = NULL; - } - - v0 = NARC_ctor(NARC_INDEX_FIELDDATA__BUILD_MODEL__BUILD_MODEL, 4); - - { - int v5; - u16 v6; - int v7; - - v7 = ov5_021D3F84(v1->unk_04); - - for (v5 = 0; v5 < v1->unk_08; v5++) { - v6 = param0->unk_C24[v5 + 1]; - - GF_ASSERT(param0->unk_04[v6] == NULL); - param0->unk_04[v6] = NARC_AllocAndReadWholeMember(v0, v6, 4); - - { - NNSG3dResMdl *v8; - - if (v6 < v7) { - v8 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(param0->unk_04[v6]), 0); - ov5_021D3A50(v6, v8, param0->unk_C10, v1->unk_04); - } - } - - { - BOOL v9; - - v9 = Easy3D_BindTextureToResource(param0->unk_04[v6], param0->unk_C10); - GF_ASSERT(v9); - } - } - } - - if (param0->unk_04[0] == NULL) { - BOOL v10; - NNSG3dResTex *v11; - - param0->unk_04[0] = NARC_AllocAndReadWholeMember(v0, 0, 4); - - v11 = NNS_G3dGetTex( - (NNSG3dResFileHeader *)param0->unk_04[0]); - - if (v11 != NULL) { - v10 = Easy3D_UploadTextureToVRAM(v11); - GF_ASSERT(v10); - - v10 = Easy3D_BindTextureToResource(param0->unk_04[0], v11); - GF_ASSERT(v10); - } - } - - NARC_dtor(v0); - G3X_EdgeMarking(1); - - if (ov5_021EFAC0(param0) == 0) { - G3X_SetEdgeColorTable(Unk_ov5_021FF588); - } else { - G3X_SetEdgeColorTable(Unk_ov5_021FF598); - } - - { - char v12[256]; - - param0->unk_C14 = MapPropMaterialShape_Alloc(); - sprintf(v12, "fielddata/build_model/build_model_matshp.dat"); - MapPropMaterialShape_Load(v12, param0->unk_C14); - } - - Heap_FreeToHeap(param0->unk_C20); - param0->unk_C20 = NULL; -} - -NNSG3dResFileHeader **ov5_021EF9E8(const int param0, UnkStruct_ov5_021EF76C *const param1) -{ - GF_ASSERT(param1 != NULL); - - if (param1->unk_04[param0] == NULL) { - GF_ASSERT(param1->unk_04[0] != NULL); - - return &(param1->unk_04[0]); - } - - return &(param1->unk_04[param0]); -} - -void ov5_021EFA10(UnkStruct_ov5_021EF76C **param0) -{ - int v0; - - if ((*param0)->unk_C14 != NULL) { - MapPropMaterialShape_Free((*param0)->unk_C14); - } - - for (v0 = 0; v0 < 768; v0++) { - if ((*param0)->unk_04[v0] != NULL) { - Heap_FreeToHeap((*param0)->unk_04[v0]); - } - } - - Heap_FreeToHeap((*param0)->unk_C24); - Heap_FreeToHeap((*param0)->unk_C04); - - (*param0)->unk_C04 = NULL; - Heap_FreeToHeap((*param0)->unk_C08); - - (*param0)->unk_C08 = NULL; - Heap_FreeToHeap(*param0); - - (*param0) = NULL; -} - -NNSG3dResTex *ov5_021EFA8C(const UnkStruct_ov5_021EF76C *param0) -{ - GF_ASSERT(param0 != NULL); - return param0->unk_C0C; -} - -NNSG3dResTex *ov5_021EFAA0(const UnkStruct_ov5_021EF76C *param0) -{ - GF_ASSERT(param0 != NULL); - return param0->unk_C10; -} - -const MapPropMaterialShape *ov5_021EFAB4(const UnkStruct_ov5_021EF76C *param0) -{ - return param0->unk_C14; -} - -BOOL ov5_021EFAC0(const UnkStruct_ov5_021EF76C *param0) -{ - if ((param0->unk_C18.unk_06 == 0) || (param0->unk_C18.unk_06 == 3)) { - return 1; - } else { - return 0; - } -} - -u8 ov5_021EFAD8(const UnkStruct_ov5_021EF76C *param0) -{ - u8 v0; - - v0 = param0->unk_C18.unk_06; - return v0; -} - -int ov5_021EFAE8(const UnkStruct_ov5_021EF76C *param0, const int param1) -{ - int v0; - - v0 = param0->unk_C24[param1]; - return v0; -} - -BOOL ov5_021EFAF8(const UnkStruct_ov5_021EF76C *param0, const int param1) -{ - if (param0->unk_04[param1] == NULL) { - return 0; - } else { - return 1; - } -} diff --git a/src/overlay005/ov5_021F0824.c b/src/overlay005/ov5_021F0824.c index 2fb6ab04ad..82d2d32d99 100644 --- a/src/overlay005/ov5_021F0824.c +++ b/src/overlay005/ov5_021F0824.c @@ -6,8 +6,8 @@ #include "struct_decls/struct_02029894_decl.h" #include "field/field_system.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop.h" -#include "overlay005/ov5_021EF75C.h" #include "overlay023/ov23_02241F74.h" #include "field_comm_manager.h" @@ -52,9 +52,9 @@ void ov5_021F0824(FieldSystem *fieldSystem) v9.x += (v7 * FX32_ONE * 8); v9.z += (v8 * FX32_ONE * 8); - v10 = ov5_021EFAE8(fieldSystem->unk_30, v1); + v10 = AreaDataManager_GetMapPropModelID(fieldSystem->areaDataManager, v1); - MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, v10, &v9, NULL, fieldSystem->unk_50); + MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, v10, &v9, NULL, fieldSystem->unk_50); } } } diff --git a/src/overlay005/ov5_021F8370.c b/src/overlay005/ov5_021F8370.c index 6c608eb13c..0ce102d64c 100644 --- a/src/overlay005/ov5_021F8370.c +++ b/src/overlay005/ov5_021F8370.c @@ -159,8 +159,8 @@ static void ov5_021F8480(UnkStruct_ov5_021F8480 *param0, const u32 param1) if (v2->unk_00 == 0) { v2->unk_00 = 1; v2->unk_04 = v4; - v2->unk_02 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, v4, &v5->unk_04, &v3, fieldSystem->unk_50); - v2->unk_08 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, v4); + v2->unk_02 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, v4, &v5->unk_04, &v3, fieldSystem->unk_50); + v2->unk_08 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, v4); break; } diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c index 675c3f4e70..bdf1ac2fcd 100644 --- a/src/overlay006/ov6_02242AF0.c +++ b/src/overlay006/ov6_02242AF0.c @@ -9,9 +9,9 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "field/field_system.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop.h" #include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021EF75C.h" #include "overlay006/struct_ov6_02242AF0.h" #include "field_system.h" @@ -106,7 +106,7 @@ void ov6_02242AF0(FieldSystem *fieldSystem) break; } - MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, 475, &v2, NULL, fieldSystem->unk_50); + MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, 475, &v2, NULL, fieldSystem->unk_50); } void ov6_02242B58(FieldSystem *fieldSystem, const u16 param1, const u16 param2) @@ -208,12 +208,12 @@ static BOOL ov6_02242C5C(FieldTask *taskMan) MapProp *v4; NNSG3dRenderObj *v5; - v4 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_475); + v4 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_475); v5 = MapProp_GetRenderObj(v4); - v3 = ov5_021EF9E8(475, fieldSystem->unk_30); + v3 = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_ID_UNK_475, fieldSystem->areaDataManager); v2 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v3), 0); - ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 16, 475, v5, v2, ov5_021EFAA0(fieldSystem->unk_30), 1, -1, 0); + ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 16, 475, v5, v2, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, -1, 0); ov5_021D4250(fieldSystem->unk_54, 16, 0); } (v1->unk_05)++; @@ -235,7 +235,7 @@ static BOOL ov6_02242C5C(FieldTask *taskMan) MapProp *v6; VecFx32 v7; - v6 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_475); + v6 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_475); v7 = MapProp_GetPosition(v6); if (v1->unk_00(fieldSystem, v1, &v1->unk_0C, &v7)) { diff --git a/src/overlay006/ov6_02246C24.c b/src/overlay006/ov6_02246C24.c index fdd7fe94c9..63eb61deef 100644 --- a/src/overlay006/ov6_02246C24.c +++ b/src/overlay006/ov6_02246C24.c @@ -3,10 +3,12 @@ #include #include +#include "constants/map_prop.h" + #include "field/field_system.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop.h" #include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021EF75C.h" #include "field_task.h" #include "heap.h" @@ -82,18 +84,18 @@ static BOOL ov6_02246C9C(FieldTask *param0) NNSG3dRenderObj *v7; BOOL v8; - v3 = ov5_021EF9E8(517, fieldSystem->unk_30); - v5 = ov5_021EF9E8(124, fieldSystem->unk_30); + v3 = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_ID_UNK_517, fieldSystem->areaDataManager); + v5 = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_ID_UNK_124, fieldSystem->areaDataManager); v2 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v3), 0); v4 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v5), 0); - ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 0x10, 517, NULL, v2, ov5_021EFAA0(fieldSystem->unk_30), 1, 1, 0); + ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 0x10, 517, NULL, v2, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); v8 = sub_020552B4(fieldSystem, 124, &v6, NULL); GF_ASSERT(v8); v7 = MapProp_GetRenderObj(v6); - ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 0x20, 124, v7, v4, ov5_021EFAA0(fieldSystem->unk_30), 1, 1, 0); + ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 0x20, 124, v7, v4, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); } (v1->unk_0F)++; break; @@ -109,7 +111,7 @@ static BOOL ov6_02246C9C(FieldTask *param0) Sound_PlayEffect(1534); - v1->unk_10[v1->unk_0D] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, 517, &v11, &v12, fieldSystem->unk_50); + v1->unk_10[v1->unk_0D] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, 517, &v11, &v12, fieldSystem->unk_50); v9 = MapPropManager_GetLoadedPropSafely(fieldSystem->mapPropManager, v1->unk_10[v1->unk_0D]); v10 = MapProp_GetRenderObj(v9); diff --git a/src/overlay006/ov6_02246F00.c b/src/overlay006/ov6_02246F00.c index 0f3579c473..bcdcd00d29 100644 --- a/src/overlay006/ov6_02246F00.c +++ b/src/overlay006/ov6_02246F00.c @@ -3,10 +3,12 @@ #include #include +#include "constants/map_prop.h" + #include "field/field_system.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop.h" #include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021EF75C.h" #include "field_task.h" #include "heap.h" @@ -54,14 +56,14 @@ static BOOL ov6_02246F40(FieldTask *param0) NNSG3dRenderObj *v5; BOOL v6; - v3 = ov5_021EF9E8(498, fieldSystem->unk_30); + v3 = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_ID_UNK_498, fieldSystem->areaDataManager); v2 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v3), 0); v6 = sub_020552B4(fieldSystem, 498, &v4, NULL); GF_ASSERT(v6); v5 = MapProp_GetRenderObj(v4); - ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 0x1, 498, v5, v2, ov5_021EFAA0(fieldSystem->unk_30), 2, v1->unk_00, 0); + ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 0x1, 498, v5, v2, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 2, v1->unk_00, 0); } (v1->unk_02)++; break; diff --git a/src/overlay006/ov6_02247078.c b/src/overlay006/ov6_02247078.c index 7fbd623d8c..78a1ebca95 100644 --- a/src/overlay006/ov6_02247078.c +++ b/src/overlay006/ov6_02247078.c @@ -6,9 +6,9 @@ #include "struct_defs/struct_02055130.h" #include "field/field_system.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop.h" #include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021EF75C.h" #include "unk_02054D00.h" @@ -25,7 +25,7 @@ void ov6_02247078(FieldSystem *fieldSystem, const u8 param1) if (v0) { NNSG3dResTex *v5; - v5 = ov5_021EFAA0(fieldSystem->unk_30); + v5 = AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager); ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, param1, v3, MapProp_GetRenderObj(v1), MapProp_GetModel(v1), v5, 2, 1, 0); } else { GF_ASSERT(0); diff --git a/src/overlay006/ov6_02247D30.c b/src/overlay006/ov6_02247D30.c index 8028e74e5e..914811fead 100644 --- a/src/overlay006/ov6_02247D30.c +++ b/src/overlay006/ov6_02247D30.c @@ -3,10 +3,12 @@ #include #include +#include "constants/map_prop.h" + #include "field/field_system.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop.h" #include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021EF75C.h" #include "field_task.h" #include "heap.h" @@ -76,10 +78,10 @@ static BOOL ov6_02247DAC(FieldTask *param0) NNSG3dResFileHeader **v3; NNSG3dRenderObj *v4; - v3 = ov5_021EF9E8(517, fieldSystem->unk_30); + v3 = AreaDataManager_GetMapPropModelFile(MAP_PROP_MODEL_ID_UNK_517, fieldSystem->areaDataManager); v2 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v3), 0); - ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 0x10, 517, NULL, v2, ov5_021EFAA0(fieldSystem->unk_30), 1, 1, 0); + ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 0x10, 517, NULL, v2, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); } (v1->unk_0F)++; break; @@ -93,7 +95,7 @@ static BOOL ov6_02247DAC(FieldTask *param0) v7.y = v1->unk_00.y + Unk_ov6_022498E4[v1->unk_0D].y; v7.z = v1->unk_00.z + Unk_ov6_022498E4[v1->unk_0D].z; - v1->unk_10[v1->unk_0D] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, 517, &v7, &v8, fieldSystem->unk_50); + v1->unk_10[v1->unk_0D] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, 517, &v7, &v8, fieldSystem->unk_50); v5 = MapPropManager_GetLoadedPropSafely(fieldSystem->mapPropManager, v1->unk_10[v1->unk_0D]); v6 = MapProp_GetRenderObj(v5); ov5_021D4220(fieldSystem->unk_54, 0x10, v1->unk_0D, v6); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index fc7453f393..ed5fe44055 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -430,7 +430,7 @@ static BOOL ov8_02249A94(FieldTask *taskMan) v5 = ov5_021D3DA0(3, fieldSystem->unk_50); if (ov5_021D3F70(v3) && ov5_021D3F70(v4) && ov5_021D3F70(v5)) { - v0 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_242); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_242); { VecFx32 v6; @@ -481,7 +481,7 @@ static BOOL ov8_02249B74(FieldTask *taskMan) v5 = ov5_021D3DA0(3, fieldSystem->unk_50); if (ov5_021D3F70(v3) && ov5_021D3F70(v4) && ov5_021D3F70(v5)) { - v0 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_242); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_242); { VecFx32 v6; @@ -501,7 +501,7 @@ static BOOL ov8_02249B74(FieldTask *taskMan) } } break; case 2: - v0 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_242); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_242); { VecFx32 v7; @@ -518,7 +518,7 @@ static BOOL ov8_02249B74(FieldTask *taskMan) } break; case 3: - v0 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_242); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_242); { VecFx32 v8; @@ -568,7 +568,7 @@ static BOOL ov8_02249CD8(FieldTask *taskMan) v5 = ov5_021D3DA0(3, fieldSystem->unk_50); if (ov5_021D3F70(v3) && ov5_021D3F70(v4) && ov5_021D3F70(v5)) { - v0 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_242); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_242); { VecFx32 v6; @@ -613,7 +613,7 @@ void ov8_02249DBC(FieldSystem *fieldSystem) { VecFx32 v9 = { FX32_ONE * 16 * 16, 0, FX32_ONE * 16 * 16 }; - MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, 242, &v9, NULL, fieldSystem->unk_50); + MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, 242, &v9, NULL, fieldSystem->unk_50); } ov5_021EF2CC(0, 1, 2, 25, 38, (FX32_ONE * 16 * 0), fieldSystem->unk_A0); @@ -651,7 +651,7 @@ void ov8_02249DBC(FieldSystem *fieldSystem) v6 = 0; } - v1 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_242); + v1 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_242); { VecFx32 v10; @@ -784,7 +784,7 @@ static BOOL ov8_0224A018(FieldTask *taskMan) (v2->unk_00)++; break; case 1: { - v0 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_258); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_258); { VecFx32 v3; @@ -830,7 +830,7 @@ static BOOL ov8_0224A0E8(FieldTask *taskMan) (v2->unk_00)++; break; case 1: { - v0 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_258); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_258); { VecFx32 v3; @@ -1584,13 +1584,13 @@ void ov8_0224A8C8(FieldSystem *fieldSystem) VecFx32 v3 = { FX32_ONE * (16 * 16), 0, FX32_ONE * (16 * 16) }; v3.y = (FX32_ONE * 16) * 10; - v0->unk_04 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, 300, &v3, NULL, fieldSystem->unk_50); + v0->unk_04 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, 300, &v3, NULL, fieldSystem->unk_50); v3.y = (FX32_ONE * 16) * 10 * 2; - v0->unk_08 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, 301, &v3, NULL, fieldSystem->unk_50); + v0->unk_08 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, 301, &v3, NULL, fieldSystem->unk_50); v3.y = (FX32_ONE * 16) * 10 * 3; - v0->unk_0C = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, 302, &v3, NULL, fieldSystem->unk_50); + v0->unk_0C = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, 302, &v3, NULL, fieldSystem->unk_50); } { @@ -1617,7 +1617,7 @@ void ov8_0224A8C8(FieldSystem *fieldSystem) v4.x += (FX32_ONE * 8); v4.z += (FX32_ONE * 8); - v0->unk_28[v5] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, Unk_ov8_0224CB68[v5].unk_00, &v4, NULL, fieldSystem->unk_50); + v0->unk_28[v5] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, Unk_ov8_0224CB68[v5].unk_00, &v4, NULL, fieldSystem->unk_50); v0->unk_88[v5] = Unk_ov8_0224CB68[v5].unk_00; } } @@ -2123,7 +2123,7 @@ void ov8_0224ABD4(FieldSystem *fieldSystem) ov8_0224AB64(&(v7[v5]), v2->unk_00, &v4); } - v0->unk_04[v5] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, v7[v5].unk_00, &v3, &v4, fieldSystem->unk_50); + v0->unk_04[v5] = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, v7[v5].unk_00, &v3, &v4, fieldSystem->unk_50); } } } @@ -2452,9 +2452,9 @@ void ov8_0224B020(FieldSystem *fieldSystem) v4->unk_0C = *v5; v4->unk_10 = MapPropManager_LoadOne( - fieldSystem->mapPropManager, fieldSystem->unk_30, *v5, v6, &v7, fieldSystem->unk_50); + fieldSystem->mapPropManager, fieldSystem->areaDataManager, *v5, v6, &v7, fieldSystem->unk_50); - v4->unk_14 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, *v5); + v4->unk_14 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, *v5); } } diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index 1c8dc72153..829db838aa 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -15,6 +15,7 @@ #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/area_data.h" #include "overlay005/fieldmap.h" #include "overlay005/map_object_anim_cmd.h" #include "overlay005/ov5_021D57BC.h" @@ -28,7 +29,6 @@ #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay005/struct_ov5_021E8F60_decl.h" #include "overlay005/struct_ov5_021ED0A4.h" -#include "overlay005/struct_ov5_021EF76C_decl.h" #include "overlay005/struct_ov5_02201C58.h" #include "overlay009/struct_ov9_02249FF4.h" #include "overlay009/struct_ov9_0224F6EC_decl.h" @@ -371,7 +371,7 @@ typedef struct { u32 unk_08; NARC *unk_0C; MapMatrix *unk_10; - UnkStruct_ov5_021EF76C *unk_14; + AreaDataManager *unk_14; UnkStruct_ov5_021E8F60 *unk_18; } UnkStruct_ov9_0224C8E8; @@ -576,7 +576,7 @@ typedef struct { int unk_0C; int unk_10[4]; int unk_20; - UnkStruct_ov5_021EF76C *unk_24; + AreaDataManager *unk_24; UnkStruct_ov9_0224E0DC *unk_28; SysTask *unk_2C; } UnkStruct_ov9_0224CBD8; @@ -4370,7 +4370,7 @@ static void ov9_0224C8E8(UnkStruct_ov9_02249B04 *param0) } { - v2->unk_14 = fieldSystem->unk_30; + v2->unk_14 = fieldSystem->areaDataManager; } { @@ -4797,7 +4797,7 @@ static int ov9_0224CEBC(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 * } if (v1->unk_14 == NULL) { - v1->unk_14 = fieldSystem->unk_30; + v1->unk_14 = fieldSystem->areaDataManager; } if (v1->unk_04 == 0) { @@ -4825,7 +4825,7 @@ static int ov9_0224CEBC(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 * { int v4 = 0, v5 = 0, v6 = 0; - ov5_021EA540(fieldSystem->unk_28, fieldSystem->mapMatrix, fieldSystem->unk_30); + ov5_021EA540(fieldSystem->unk_28, fieldSystem->mapMatrix, fieldSystem->areaDataManager); ov9_02251094(v2->unk_00, &v4, &v5, &v6); ov5_021EA678(fieldSystem->unk_28, v4, v5, v6); ov5_021EA6A4(fieldSystem->unk_28, 1); diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index 0cef2579ba..250ddb369e 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -1491,7 +1491,7 @@ static void ov23_0224C5B4(SysTask *param0, void *param1) v6.y = 0; v6.z = (v2) * (FX32_ONE * 16) + (FX32_ONE * 8); - Unk_ov23_022577AC->unk_12D5[v0] = MapPropManager_LoadOne(Unk_ov23_022577AC->fieldSystem->mapPropManager, Unk_ov23_022577AC->fieldSystem->unk_30, 429 + v3, &v6, NULL, Unk_ov23_022577AC->fieldSystem->unk_50); + Unk_ov23_022577AC->unk_12D5[v0] = MapPropManager_LoadOne(Unk_ov23_022577AC->fieldSystem->mapPropManager, Unk_ov23_022577AC->fieldSystem->areaDataManager, 429 + v3, &v6, NULL, Unk_ov23_022577AC->fieldSystem->unk_50); } } } @@ -2341,7 +2341,7 @@ static void ov23_0224D54C(UnkStruct_ov23_0224D54C *param0) v0 = MapProp_GetPosition(v1); MapPropManager_InitOne(0, Unk_ov23_022577AC->fieldSystem->mapPropManager); - MapPropManager_LoadOne(Unk_ov23_022577AC->fieldSystem->mapPropManager, Unk_ov23_022577AC->fieldSystem->unk_30, 317 + param0->unk_05, &v0, NULL, Unk_ov23_022577AC->fieldSystem->unk_50); + MapPropManager_LoadOne(Unk_ov23_022577AC->fieldSystem->mapPropManager, Unk_ov23_022577AC->fieldSystem->areaDataManager, 317 + param0->unk_05, &v0, NULL, Unk_ov23_022577AC->fieldSystem->unk_50); } static void ov23_0224D5A8(SysTask *param0, void *param1) diff --git a/src/overlay023/ov23_02254A14.c b/src/overlay023/ov23_02254A14.c index 899c9181dd..c0c3f2f1db 100644 --- a/src/overlay023/ov23_02254A14.c +++ b/src/overlay023/ov23_02254A14.c @@ -8,10 +8,10 @@ #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop.h" #include "overlay005/ov5_021D1A94.h" #include "overlay005/ov5_021EAFA4.h" -#include "overlay005/ov5_021EF75C.h" #include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay005/struct_ov5_021EB0E0_decl.h" #include "overlay006/struct_ov6_0223E6EC.h" @@ -179,7 +179,7 @@ static void ov23_02254A14(FieldSystem *fieldSystem, const int param1, UnkStruct_ v1.y = FX32_ONE; v1.z = (FX32_ONE * 16) * ((0 * 32) + 13) + ((FX32_ONE * 8) * v0->unk_1C); - v0->unk_10 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, ov23_02255E14(fieldSystem, param1), &v1, NULL, fieldSystem->unk_50); + v0->unk_10 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, ov23_02255E14(fieldSystem, param1), &v1, NULL, fieldSystem->unk_50); v0->unk_00.unk_00 = 16; v0->unk_00.unk_04 = 13; v0->unk_00.unk_08 = 16 + (v0->unk_18 - 1); @@ -1228,7 +1228,7 @@ static void ov23_02255D78(FieldSystem *fieldSystem, UnkStruct_ov23_02255BF4 *par v4.z = (FX32_ONE * 16) * (v5->unk_00.unk_04) + (FX32_ONE * 8) * v2; v4.y = FX32_ONE; - v5->unk_10 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, v0, &v4, NULL, fieldSystem->unk_50); + v5->unk_10 = MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, v0, &v4, NULL, fieldSystem->unk_50); } } @@ -1261,7 +1261,7 @@ static const int ov23_02255E14(FieldSystem *fieldSystem, const int param1) int v0; GF_ASSERT(param1 != 0); - v0 = ov5_021EFAE8(fieldSystem->unk_30, param1); + v0 = AreaDataManager_GetMapPropModelID(fieldSystem->areaDataManager, param1); return v0; } diff --git a/src/unk_0206C784.c b/src/unk_0206C784.c index 2a3deca5b2..3fd7d1969c 100644 --- a/src/unk_0206C784.c +++ b/src/unk_0206C784.c @@ -8,9 +8,9 @@ #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/area_data.h" #include "overlay005/map_prop.h" #include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021EF75C.h" #include "overlay005/struct_ov5_021D5894.h" #include "camera.h" @@ -311,14 +311,14 @@ static void sub_0206CBA0(FieldSystem *fieldSystem) MapProp *v6; NNSG3dRenderObj *v7; - v5 = ov5_021EF9E8(v2[v0], fieldSystem->unk_30); + v5 = AreaDataManager_GetMapPropModelFile(v2[v0], fieldSystem->areaDataManager); v4 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v5), 0); v1 = sub_020552B4(fieldSystem, v2[v0], &v6, NULL); GF_ASSERT(v1); v7 = MapProp_GetRenderObj(v6); - ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, v3[v0], v2[v0], v7, v4, ov5_021EFAA0(fieldSystem->unk_30), 1, 1, 0); + ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, v3[v0], v2[v0], v7, v4, AreaDataManager_GetMapPropTexture(fieldSystem->areaDataManager), 1, 1, 0); } else { GF_ASSERT(FALSE); } diff --git a/src/unk_0207160C.c b/src/unk_0207160C.c index 0ab75553d0..bdca2f9c7d 100644 --- a/src/unk_0207160C.c +++ b/src/unk_0207160C.c @@ -136,8 +136,8 @@ void sub_0207160C(FieldSystem *fieldSystem) }; v6.y = v5; - MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->unk_30, MAP_PROP_ID_UNK_258, &v6, NULL, fieldSystem->unk_50); - v1 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_258); + MapPropManager_LoadOne(fieldSystem->mapPropManager, fieldSystem->areaDataManager, MAP_PROP_MODEL_ID_UNK_258, &v6, NULL, fieldSystem->unk_50); + v1 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_258); } else { const int v7[2] = { 258, 502 }; @@ -330,7 +330,7 @@ static BOOL sub_020718D8(FieldTask *taskMan) break; case 1: { if (v2->unk_08) { - v0 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_258); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_258); } else { const int v3[2] = { 258, 502 }; BOOL v4 = sub_02055324(fieldSystem, v3, 2, &v0, NULL); @@ -391,7 +391,7 @@ static BOOL sub_020719D8(FieldTask *taskMan) break; case 1: { if (v2->unk_08) { - v0 = MapPropManager_FindLoadedPropById(fieldSystem->mapPropManager, MAP_PROP_ID_UNK_258); + v0 = MapPropManager_FindLoadedPropByModelID(fieldSystem->mapPropManager, MAP_PROP_MODEL_ID_UNK_258); } else { const int v3[2] = { 258, 502 }; BOOL v4 = sub_02055324(fieldSystem, v3, 2, &v0, NULL);