Label unused layouts

This commit is contained in:
GriffinR 2021-02-08 05:01:24 -05:00
parent 6899acfb6f
commit 2237d0748f
63 changed files with 241 additions and 241 deletions

View File

@ -742,14 +742,14 @@
"blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_08428450",
"name": "Unknown_08428450_Layout",
"id": "LAYOUT_UNUSED_CONTEST_ROOM1",
"name": "UnusedContestRoom1_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/Unknown_08428450/border.bin",
"blockdata_filepath": "data/layouts/Unknown_08428450/map.bin"
"border_filepath": "data/layouts/UnusedContestRoom1/border.bin",
"blockdata_filepath": "data/layouts/UnusedContestRoom1/map.bin"
},
{
"id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE",
@ -822,24 +822,24 @@
"blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_084294C4",
"name": "Unknown_084294C4_Layout",
"id": "LAYOUT_UNUSED_CONTEST_ROOM2",
"name": "UnusedContestRoom2_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/Unknown_084294C4/border.bin",
"blockdata_filepath": "data/layouts/Unknown_084294C4/map.bin"
"border_filepath": "data/layouts/UnusedContestRoom2/border.bin",
"blockdata_filepath": "data/layouts/UnusedContestRoom2/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_084294E8",
"name": "Unknown_084294E8_Layout",
"id": "LAYOUT_UNUSED_CONTEST_ROOM3",
"name": "UnusedContestRoom3_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/Unknown_084294E8/border.bin",
"blockdata_filepath": "data/layouts/Unknown_084294E8/map.bin"
"border_filepath": "data/layouts/UnusedContestRoom3/border.bin",
"blockdata_filepath": "data/layouts/UnusedContestRoom3/map.bin"
},
{
"id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB",
@ -1692,144 +1692,144 @@
"blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E6C0",
"name": "Unknown_0843E6C0_Layout",
"id": "LAYOUT_UNUSED_CAVE1",
"name": "UnusedCave1_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E6C0/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E6C0/map.bin"
"border_filepath": "data/layouts/UnusedCave1/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave1/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E6E4",
"name": "Unknown_0843E6E4_Layout",
"id": "LAYOUT_UNUSED_CAVE2",
"name": "UnusedCave2_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E6E4/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E6E4/map.bin"
"border_filepath": "data/layouts/UnusedCave2/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave2/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E708",
"name": "Unknown_0843E708_Layout",
"id": "LAYOUT_UNUSED_CAVE3",
"name": "UnusedCave3_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E708/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E708/map.bin"
"border_filepath": "data/layouts/UnusedCave3/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave3/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E72C",
"name": "Unknown_0843E72C_Layout",
"id": "LAYOUT_UNUSED_CAVE4",
"name": "UnusedCave4_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E72C/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E72C/map.bin"
"border_filepath": "data/layouts/UnusedCave4/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave4/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E750",
"name": "Unknown_0843E750_Layout",
"id": "LAYOUT_UNUSED_CAVE5",
"name": "UnusedCave5_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E750/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E750/map.bin"
"border_filepath": "data/layouts/UnusedCave5/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave5/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E774",
"name": "Unknown_0843E774_Layout",
"id": "LAYOUT_UNUSED_CAVE6",
"name": "UnusedCave6_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E774/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E774/map.bin"
"border_filepath": "data/layouts/UnusedCave6/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave6/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E798",
"name": "Unknown_0843E798_Layout",
"id": "LAYOUT_UNUSED_CAVE7",
"name": "UnusedCave7_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E798/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E798/map.bin"
"border_filepath": "data/layouts/UnusedCave7/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave7/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E7BC",
"name": "Unknown_0843E7BC_Layout",
"id": "LAYOUT_UNUSED_CAVE8",
"name": "UnusedCave8_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E7BC/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E7BC/map.bin"
"border_filepath": "data/layouts/UnusedCave8/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave8/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E7E0",
"name": "Unknown_0843E7E0_Layout",
"id": "LAYOUT_UNUSED_CAVE9",
"name": "UnusedCave9_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E7E0/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E7E0/map.bin"
"border_filepath": "data/layouts/UnusedCave9/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave9/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E804",
"name": "Unknown_0843E804_Layout",
"id": "LAYOUT_UNUSED_CAVE10",
"name": "UnusedCave10_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E804/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E804/map.bin"
"border_filepath": "data/layouts/UnusedCave10/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave10/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E828",
"name": "Unknown_0843E828_Layout",
"id": "LAYOUT_UNUSED_CAVE11",
"name": "UnusedCave11_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E828/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E828/map.bin"
"border_filepath": "data/layouts/UnusedCave11/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave11/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E84C",
"name": "Unknown_0843E84C_Layout",
"id": "LAYOUT_UNUSED_CAVE12",
"name": "UnusedCave12_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E84C/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E84C/map.bin"
"border_filepath": "data/layouts/UnusedCave12/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave12/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E870",
"name": "Unknown_0843E870_Layout",
"id": "LAYOUT_UNUSED_CAVE13",
"name": "UnusedCave13_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E870/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E870/map.bin"
"border_filepath": "data/layouts/UnusedCave13/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave13/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_0843E894",
"name": "Unknown_0843E894_Layout",
"id": "LAYOUT_UNUSED_CAVE14",
"name": "UnusedCave14_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Cave",
"border_filepath": "data/layouts/Unknown_0843E894/border.bin",
"blockdata_filepath": "data/layouts/Unknown_0843E894/map.bin"
"border_filepath": "data/layouts/UnusedCave14/border.bin",
"blockdata_filepath": "data/layouts/UnusedCave14/map.bin"
},
{
"id": "LAYOUT_NEW_MAUVILLE_ENTRANCE",
@ -2252,64 +2252,64 @@
"blockdata_filepath": "data/layouts/ContestHall/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
"name": "UnknownLinkContestRoom_25_29_Layout",
"id": "LAYOUT_UNUSED_CONTEST_HALL1",
"name": "UnusedContestHall1_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/UnknownLinkContestRoom_25_29/border.bin",
"blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_29/map.bin"
"border_filepath": "data/layouts/UnusedContestHall1/border.bin",
"blockdata_filepath": "data/layouts/UnusedContestHall1/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
"name": "UnknownLinkContestRoom_25_30_Layout",
"id": "LAYOUT_UNUSED_CONTEST_HALL2",
"name": "UnusedContestHall2_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/UnknownLinkContestRoom_25_30/border.bin",
"blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_30/map.bin"
"border_filepath": "data/layouts/UnusedContestHall2/border.bin",
"blockdata_filepath": "data/layouts/UnusedContestHall2/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
"name": "UnknownLinkContestRoom_25_31_Layout",
"id": "LAYOUT_UNUSED_CONTEST_HALL3",
"name": "UnusedContestHall3_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/UnknownLinkContestRoom_25_31/border.bin",
"blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_31/map.bin"
"border_filepath": "data/layouts/UnusedContestHall3/border.bin",
"blockdata_filepath": "data/layouts/UnusedContestHall3/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
"name": "UnknownLinkContestRoom_25_32_Layout",
"id": "LAYOUT_UNUSED_CONTEST_HALL4",
"name": "UnusedContestHall4_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/UnknownLinkContestRoom_25_32/border.bin",
"blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_32/map.bin"
"border_filepath": "data/layouts/UnusedContestHall4/border.bin",
"blockdata_filepath": "data/layouts/UnusedContestHall4/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
"name": "UnknownLinkContestRoom_25_33_Layout",
"id": "LAYOUT_UNUSED_CONTEST_HALL5",
"name": "UnusedContestHall5_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/UnknownLinkContestRoom_25_33/border.bin",
"blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_33/map.bin"
"border_filepath": "data/layouts/UnusedContestHall5/border.bin",
"blockdata_filepath": "data/layouts/UnusedContestHall5/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
"name": "UnknownLinkContestRoom_25_34_Layout",
"id": "LAYOUT_UNUSED_CONTEST_HALL6",
"name": "UnusedContestHall6_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_Contest",
"border_filepath": "data/layouts/UnknownLinkContestRoom_25_34/border.bin",
"blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
"border_filepath": "data/layouts/UnusedContestHall6/border.bin",
"blockdata_filepath": "data/layouts/UnusedContestHall6/map.bin"
},
{
"id": "LAYOUT_CONTEST_HALL_BEAUTY",
@ -2412,14 +2412,14 @@
"blockdata_filepath": "data/layouts/SafariZone_South/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_08447028",
"name": "Unknown_08447028_Layout",
"id": "LAYOUT_UNUSED_OUTDOOR_AREA",
"name": "UnusedOutdoorArea_Layout",
"width": 58,
"height": 26,
"primary_tileset": "gTileset_General",
"secondary_tileset": "0",
"border_filepath": "data/layouts/Unknown_08447028/border.bin",
"blockdata_filepath": "data/layouts/Unknown_08447028/map.bin"
"border_filepath": "data/layouts/UnusedOutdoorArea/border.bin",
"blockdata_filepath": "data/layouts/UnusedOutdoorArea/map.bin"
},
{
"id": "LAYOUT_ROUTE109_SEASHORE_HOUSE",
@ -3582,14 +3582,14 @@
"blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_084693AC",
"name": "Unknown_084693AC_Layout",
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_UNUSED",
"name": "BattleFrontier_BattlePikeRoomUnused_Layout",
"width": 1,
"height": 1,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattlePike",
"border_filepath": "data/layouts/Unknown_084693AC/border.bin",
"blockdata_filepath": "data/layouts/Unknown_084693AC/map.bin"
"border_filepath": "data/layouts/BattleFrontier_BattlePikeRoomUnused/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomUnused/map.bin"
},
{
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",

View File

@ -1,18 +0,0 @@
{
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33",
"name": "UnknownLinkContestRoom_25_33",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
"music": "MUS_GSC_PEWTER",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_cycling": false,
"allow_escaping": false,
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}

View File

@ -1,18 +0,0 @@
{
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34",
"name": "UnknownLinkContestRoom_25_34",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
"music": "MUS_GSC_PEWTER",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_cycling": false,
"allow_escaping": false,
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}

View File

@ -1,7 +1,7 @@
{
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29",
"name": "UnknownLinkContestRoom_25_29",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
"id": "MAP_UNUSED_CONTEST_HALL1",
"name": "UnusedContestHall1",
"layout": "LAYOUT_UNUSED_CONTEST_HALL1",
"music": "MUS_GSC_PEWTER",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,

View File

@ -1,7 +1,7 @@
{
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30",
"name": "UnknownLinkContestRoom_25_30",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
"id": "MAP_UNUSED_CONTEST_HALL2",
"name": "UnusedContestHall2",
"layout": "LAYOUT_UNUSED_CONTEST_HALL2",
"music": "MUS_GSC_PEWTER",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,

View File

@ -1,7 +1,7 @@
{
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31",
"name": "UnknownLinkContestRoom_25_31",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
"id": "MAP_UNUSED_CONTEST_HALL3",
"name": "UnusedContestHall3",
"layout": "LAYOUT_UNUSED_CONTEST_HALL3",
"music": "MUS_GSC_PEWTER",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,

View File

@ -1,7 +1,7 @@
{
"id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32",
"name": "UnknownLinkContestRoom_25_32",
"layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
"id": "MAP_UNUSED_CONTEST_HALL4",
"name": "UnusedContestHall4",
"layout": "LAYOUT_UNUSED_CONTEST_HALL4",
"music": "MUS_GSC_PEWTER",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,

View File

@ -0,0 +1,18 @@
{
"id": "MAP_UNUSED_CONTEST_HALL5",
"name": "UnusedContestHall5",
"layout": "LAYOUT_UNUSED_CONTEST_HALL5",
"music": "MUS_GSC_PEWTER",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_cycling": false,
"allow_escaping": false,
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}

View File

@ -0,0 +1,18 @@
{
"id": "MAP_UNUSED_CONTEST_HALL6",
"name": "UnusedContestHall6",
"layout": "LAYOUT_UNUSED_CONTEST_HALL6",
"music": "MUS_GSC_PEWTER",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_cycling": false,
"allow_escaping": false,
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"shared_events_map": "ContestHall",
"shared_scripts_map": "ContestHall"
}

View File

@ -461,12 +461,12 @@
"RecordCorner",
"BattleColosseum_4P",
"ContestHall",
"UnknownLinkContestRoom_25_29",
"UnknownLinkContestRoom_25_30",
"UnknownLinkContestRoom_25_31",
"UnknownLinkContestRoom_25_32",
"UnknownLinkContestRoom_25_33",
"UnknownLinkContestRoom_25_34",
"UnusedContestHall1",
"UnusedContestHall2",
"UnusedContestHall3",
"UnusedContestHall4",
"UnusedContestHall5",
"UnusedContestHall6",
"ContestHallBeauty",
"ContestHallTough",
"ContestHallCool",

View File

@ -79,7 +79,7 @@
#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72
#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73
#define LAYOUT_LILYCOVE_CITY_HOUSE2 74
#define LAYOUT_UNKNOWN_08428450 75
#define LAYOUT_UNUSED_CONTEST_ROOM1 75
#define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76
#define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77
#define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78
@ -87,8 +87,8 @@
#define LAYOUT_HOUSE_WITH_BED 80
#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81
#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82
#define LAYOUT_UNKNOWN_084294C4 83
#define LAYOUT_UNKNOWN_084294E8 84
#define LAYOUT_UNUSED_CONTEST_ROOM2 83
#define LAYOUT_UNUSED_CONTEST_ROOM3 84
#define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85
#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86
#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87
@ -174,20 +174,20 @@
#define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167
#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168
#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169
#define LAYOUT_UNKNOWN_0843E6C0 170
#define LAYOUT_UNKNOWN_0843E6E4 171
#define LAYOUT_UNKNOWN_0843E708 172
#define LAYOUT_UNKNOWN_0843E72C 173
#define LAYOUT_UNKNOWN_0843E750 174
#define LAYOUT_UNKNOWN_0843E774 175
#define LAYOUT_UNKNOWN_0843E798 176
#define LAYOUT_UNKNOWN_0843E7BC 177
#define LAYOUT_UNKNOWN_0843E7E0 178
#define LAYOUT_UNKNOWN_0843E804 179
#define LAYOUT_UNKNOWN_0843E828 180
#define LAYOUT_UNKNOWN_0843E84C 181
#define LAYOUT_UNKNOWN_0843E870 182
#define LAYOUT_UNKNOWN_0843E894 183
#define LAYOUT_UNUSED_CAVE1 170
#define LAYOUT_UNUSED_CAVE2 171
#define LAYOUT_UNUSED_CAVE3 172
#define LAYOUT_UNUSED_CAVE4 173
#define LAYOUT_UNUSED_CAVE5 174
#define LAYOUT_UNUSED_CAVE6 175
#define LAYOUT_UNUSED_CAVE7 176
#define LAYOUT_UNUSED_CAVE8 177
#define LAYOUT_UNUSED_CAVE9 178
#define LAYOUT_UNUSED_CAVE10 179
#define LAYOUT_UNUSED_CAVE11 180
#define LAYOUT_UNUSED_CAVE12 181
#define LAYOUT_UNUSED_CAVE13 182
#define LAYOUT_UNUSED_CAVE14 183
#define LAYOUT_NEW_MAUVILLE_ENTRANCE 184
#define LAYOUT_NEW_MAUVILLE_INSIDE 185
#define LAYOUT_ABANDONED_SHIP_DECK 186
@ -230,12 +230,12 @@
#define LAYOUT_RECORD_CORNER 223
#define LAYOUT_BATTLE_COLOSSEUM_4P 224
#define LAYOUT_CONTEST_HALL 225
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230
#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231
#define LAYOUT_UNUSED_CONTEST_HALL1 226
#define LAYOUT_UNUSED_CONTEST_HALL2 227
#define LAYOUT_UNUSED_CONTEST_HALL3 228
#define LAYOUT_UNUSED_CONTEST_HALL4 229
#define LAYOUT_UNUSED_CONTEST_HALL5 230
#define LAYOUT_UNUSED_CONTEST_HALL6 231
#define LAYOUT_CONTEST_HALL_BEAUTY 232
#define LAYOUT_CONTEST_HALL_TOUGH 233
#define LAYOUT_CONTEST_HALL_COOL 234
@ -246,7 +246,7 @@
#define LAYOUT_SAFARI_ZONE_NORTH 239
#define LAYOUT_SAFARI_ZONE_SOUTHWEST 240
#define LAYOUT_SAFARI_ZONE_SOUTH 241
#define LAYOUT_UNKNOWN_08447028 242
#define LAYOUT_UNUSED_OUTDOOR_AREA 242
#define LAYOUT_ROUTE109_SEASHORE_HOUSE 243
#define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244
#define LAYOUT_ROUTE110_TRICK_HOUSE_END 245
@ -363,7 +363,7 @@
#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356
#define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357
#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS 358
#define LAYOUT_UNKNOWN_084693AC 359
#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_UNUSED 359
#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360
#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR 361
#define LAYOUT_BATTLE_PYRAMID_SQUARE01 362

View File

@ -402,67 +402,67 @@
#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8))
// Map Group 25
#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8))
#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8))
#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8))
#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8))
#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8))
#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8))
#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8))
#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8))
#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8))
#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8))
#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8))
#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8))
#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8))
#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8))
#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8))
#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8))
#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8))
#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8))
#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8))
#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8))
#define MAP_BATTLE_COLOSSEUM_2P (24 | (25 << 8))
#define MAP_TRADE_CENTER (25 | (25 << 8))
#define MAP_RECORD_CORNER (26 | (25 << 8))
#define MAP_BATTLE_COLOSSEUM_4P (27 | (25 << 8))
#define MAP_CONTEST_HALL (28 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31 (31 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32 (32 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33 (33 | (25 << 8))
#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34 (34 | (25 << 8))
#define MAP_CONTEST_HALL_BEAUTY (35 | (25 << 8))
#define MAP_CONTEST_HALL_TOUGH (36 | (25 << 8))
#define MAP_CONTEST_HALL_COOL (37 | (25 << 8))
#define MAP_CONTEST_HALL_SMART (38 | (25 << 8))
#define MAP_CONTEST_HALL_CUTE (39 | (25 << 8))
#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8))
#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8))
#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8))
#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8))
#define MAP_UNION_ROOM (60 | (25 << 8))
#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8))
#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8))
#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8))
#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8))
#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8))
#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8))
#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8))
#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8))
#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8))
#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8))
#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8))
#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8))
#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8))
#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8))
#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8))
#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8))
#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8))
#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8))
#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8))
#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8))
#define MAP_BATTLE_COLOSSEUM_2P (24 | (25 << 8))
#define MAP_TRADE_CENTER (25 | (25 << 8))
#define MAP_RECORD_CORNER (26 | (25 << 8))
#define MAP_BATTLE_COLOSSEUM_4P (27 | (25 << 8))
#define MAP_CONTEST_HALL (28 | (25 << 8))
#define MAP_UNUSED_CONTEST_HALL1 (29 | (25 << 8))
#define MAP_UNUSED_CONTEST_HALL2 (30 | (25 << 8))
#define MAP_UNUSED_CONTEST_HALL3 (31 | (25 << 8))
#define MAP_UNUSED_CONTEST_HALL4 (32 | (25 << 8))
#define MAP_UNUSED_CONTEST_HALL5 (33 | (25 << 8))
#define MAP_UNUSED_CONTEST_HALL6 (34 | (25 << 8))
#define MAP_CONTEST_HALL_BEAUTY (35 | (25 << 8))
#define MAP_CONTEST_HALL_TOUGH (36 | (25 << 8))
#define MAP_CONTEST_HALL_COOL (37 | (25 << 8))
#define MAP_CONTEST_HALL_SMART (38 | (25 << 8))
#define MAP_CONTEST_HALL_CUTE (39 | (25 << 8))
#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8))
#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8))
#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8))
#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8))
#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8))
#define MAP_UNION_ROOM (60 | (25 << 8))
// Map Group 26
#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8))

View File

@ -1326,7 +1326,7 @@ bool8 InBattlePike(void)
return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM
|| gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
|| gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS
|| gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_084693AC;
|| gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_UNUSED;
}
static void SetHintedRoom(void)