Make MapId alias AssetLevelHeadersEnum

This commit is contained in:
Antonio Castelli
2022-11-07 23:31:13 -08:00
parent eac875afa0
commit d57b96d4c6
4 changed files with 31 additions and 95 deletions
+4 -68
View File
@@ -3,78 +3,14 @@
#include "sound_ids.h"
#include "sequence_ids.h"
#include "asset_enums.h"
/* All the enums defined here can be used in asset files */
typedef enum MapId {
/* 0x00 */ MAP_ID_OVERWORLD,
/* 0x01 */ MAP_ID_BLUEY1,
/* 0x02 */ MAP_ID_DRAGON_FOREST,
/* 0x03 */ MAP_ID_FOSSIL_CANYON,
/* 0x04 */ MAP_ID_PIRATE_LAGOON,
/* 0x05 */ MAP_ID_ANCIENT_LAKE,
/* 0x06 */ MAP_ID_WALRUS_COVE,
/* 0x07 */ MAP_ID_HOT_TOP_VOLCANO,
/* 0x08 */ MAP_ID_WHALE_BAY,
/* 0x09 */ MAP_ID_SNOWBALL_VALLEY,
/* 0x0A */ MAP_ID_CRESCENT_ISLAND,
/* 0x0B */ MAP_ID_FIRE_MOUNTAIN,
/* 0x0C */ MAP_ID_DINO_DOMAIN,
/* 0x0D */ MAP_ID_EVERFROST_PEAK,
/* 0x0E */ MAP_ID_SHERBET_ISLAND,
/* 0x0F */ MAP_ID_SPACEPORT_ALPHA,
/* 0x10 */ MAP_ID_HORSESHOE_GULTCH,
/* 0x11 */ MAP_ID_SPACEDUST_ALLEY,
/* 0x12 */ MAP_ID_GREENWOOD_VILLAGE,
/* 0x13 */ MAP_ID_BOULDER_CANYON,
/* 0x14 */ MAP_ID_WINDMILL_PLAINS,
/* 0x15 */ MAP_ID_INTRO_CUTSCENE1,
/* 0x16 */ MAP_ID_CHARACTER_SELECT,
/* 0x17 */ MAP_ID_INTRO_CUTSCENE2,
/* 0x18 */ MAP_ID_SNOWFLAKE_MOUNTAIN,
/* 0x19 */ MAP_ID_SMOKEY_CASTLE,
/* 0x1A */ MAP_ID_DARKWATER_BEACH,
/* 0x1B */ MAP_ID_ICICLE_PYRAMID,
/* 0x1C */ MAP_ID_FROSTY_VILLAGE,
/* 0x1D */ MAP_ID_JUNGLE_FALLS,
/* 0x1E */ MAP_ID_TREASURE_CAVES,
/* 0x1F */ MAP_ID_HAUNTED_WOODS,
/* 0x20 */ MAP_ID_DARKMOON_CAVERNS,
/* 0x21 */ MAP_ID_STAR_CITY,
/* 0x22 */ MAP_ID_TROPHY_RACE_DISPLAY,
/* 0x23 */ MAP_ID_FUTURE_FUN_LAND,
/* 0x24 */ MAP_ID_OVERWORLD_CUTSCENE_AREA,
/* 0x25 */ MAP_ID_WIZPIG1,
/* 0x26 */ MAP_ID_TRICKY1,
/* 0x27 */ MAP_ID_MAIN_MENU,
/* 0x28 */ MAP_ID_BUBBLER1,
/* 0x29 */ MAP_ID_SMOKEY1,
/* 0x2A */ MAP_ID_WIZPIG_MOUTH_CUTSCENE,
/* 0x2B */ MAP_ID_WIZPIG_AMULET_CUTSCENE,
/* 0x2C */ MAP_ID_TT_AMULET_CUTSCENE,
/* 0x2D */ MAP_ID_LIGHTHOUSE_CUTSCENE,
/* 0x2E */ MAP_ID_TRICKY2,
/* 0x2F */ MAP_ID_DINO_TROPHY_CUTSCENE,
/* 0x30 */ MAP_ID_SNOWFLAKE_TROPHY_CUTSCENE,
/* 0x31 */ MAP_ID_SHERBET_TROPY_CUTSCENE,
/* 0x32 */ MAP_ID_DRAGON_TROPHY_CUTSCENE,
/* 0x33 */ MAP_ID_FFL_TROPHY_CUTSCENE,
/* 0x34 */ MAP_ID_BLUEY2,
/* 0x35 */ MAP_ID_BUBBLER2,
/* 0x36 */ MAP_ID_SMOKEY2,
/* 0x37 */ MAP_ID_WIZPIG2,
/* 0x38 */ MAP_ID_PARTY_CUTSCENE,
/* 0x39 */ MAP_ID_TRICKY_CUTSCENE,
/* 0x3A */ MAP_ID_SMOKEY_CUTSCENE,
/* 0x3B */ MAP_ID_BLUEY_CUTSCENE,
/* 0x3C */ MAP_ID_WIZPIG1_CUTSCENE,
/* 0x3D */ MAP_ID_BUBBLER_CUTSCENE,
/* 0x3E */ MAP_ID_WIZPIG2_CUTSCENE,
/* 0x3F */ MAP_ID_FINAL_CUTSCENE1,
/* 0x40 */ MAP_ID_FINAL_CUTSCENE2,
} MapId;
// Alias for brevity.
typedef AssetLevelHeadersEnum MapId;
// There are a few instances of comparing AssetLevelHeadersEnums with special, negative values.
// There are a few instances of comparing MapId with special, negative values.
typedef enum SpecialMapId {
SPECIAL_MAP_ID_UNK_NEG10 = -10,
SPECIAL_MAP_ID_UNK_NEG2 = -2,