diff --git a/include/asset_enums.h b/include/asset_enums.h index b8934f3d..59247c01 100644 --- a/include/asset_enums.h +++ b/include/asset_enums.h @@ -5,7 +5,7 @@ /********** Asset Sections **********/ -typedef enum { +typedef enum AssetSectionsEnum { ASSET_AI_BEHAVIOUR, ASSET_AI_BEHAVIOUR_TABLE, ASSET_TEXTURES_3D, @@ -40,7 +40,7 @@ typedef enum { ASSET_OBJECT_ANIMATIONS_TABLE, ASSET_OBJECT_ANIMATIONS, ASSET_OBJECT_HEADERS_TABLE, - ASSET_OBJECT_HEADERS, + ASSET_OBJECTS, ASSET_LEVEL_OBJECT_TRANSLATION_TABLE, ASSET_EMPTY_37_TABLE, ASSET_EMPTY_37, @@ -60,7 +60,7 @@ typedef enum { /********** ASSET_AI_BEHAVIOUR **********/ -typedef enum { +typedef enum AssetAiBehaviourEnum { ASSET_AI_BEHAVIOUR_0, ASSET_AI_BEHAVIOUR_1, ASSET_AI_BEHAVIOUR_2, @@ -75,7 +75,7 @@ typedef enum { /********** ASSET_TEXTURES_3D **********/ -typedef enum { +typedef enum AssetTextures3dEnum { ASSET_TEX3D_SPACE_WHITEWALL200496, ASSET_TEX3D_SPACE_GREENWALL337, ASSET_TEX3D_SPACE_WHITEWALL, @@ -1481,7 +1481,7 @@ typedef enum { /********** ASSET_TEXTURES_2D **********/ -typedef enum { +typedef enum AssetTextures2dEnum { ASSET_TEX2D_SMALLFONT_0, ASSET_TEX2D_SMALLFONT_1, ASSET_TEX2D_SMALLFONT_2, @@ -2392,7 +2392,7 @@ typedef enum { /********** ASSET_GAME_TEXT **********/ -typedef enum { +typedef enum AssetGameTextEnum { ASSET_GAME_TEXT_0, ASSET_GAME_TEXT_1, ASSET_GAME_TEXT_2, @@ -2652,14 +2652,14 @@ typedef enum { /********** ASSET_MENU_TEXT **********/ -typedef enum { +typedef enum AssetMenuTextEnum { ASSET_MENU_TEXT_ENGLISH, ASSET_MENU_TEXT_FRENCH, ASSET_MENU_TEXT_GERMAN, ASSET_MENU_TEXT_JAPANESE } AssetMenuTextEnum; -typedef enum { +typedef enum AssetMenuTextIdsEnum { ASSET_MENU_TEXT_STEREO, ASSET_MENU_TEXT_MONO, ASSET_MENU_TEXT_HEADPHONES, @@ -2850,7 +2850,7 @@ typedef enum { /********** ASSET_SPRITES **********/ -typedef enum { +typedef enum AssetSpritesEnum { ASSET_SPRITE_MINIMAP_FOSSILCANYON, ASSET_SPRITE_MINIMAP_ANCIENTLAKE, ASSET_SPRITE_MINIMAP_PIRATELAGOON, @@ -3048,15 +3048,15 @@ typedef enum { /********** ASSET_MISC **********/ -typedef enum { +typedef enum AssetMiscEnum { ASSET_MISC_0, ASSET_MISC_1, ASSET_MISC_2, ASSET_MISC_3, ASSET_MISC_4, - ASSET_MISC_TRICKY_BOSS_DATA, - ASSET_MISC_BLUEY_BOSS_DATA, - ASSET_MISC_SMOKEY_BOSS_DATA, + ASSET_MISC_5, + ASSET_MISC_6, + ASSET_MISC_7, ASSET_MISC_8, ASSET_MISC_RACER_WEIGHT, ASSET_MISC_RACER_HANDLING, @@ -3082,19 +3082,19 @@ typedef enum { ASSET_MISC_BOSS_TRACKS_IDS, ASSET_MISC_31, ASSET_MISC_32, - ASSET_MISC_RACERSTATS_UNKNOWN0, - ASSET_MISC_RACERSTATS_DIDDY, - ASSET_MISC_RACERSTATS_TT, - ASSET_MISC_RACERSTATS_UNKNOWN1, - ASSET_MISC_RACERSTATS_KRUNCH, - ASSET_MISC_RACERSTATS_BUMPER, - ASSET_MISC_RACERSTATS_TIPTUP, - ASSET_MISC_RACERSTATS_CONKER, - ASSET_MISC_RACERSTATS_TIMBER, - ASSET_MISC_RACERSTATS_BANJO, - ASSET_MISC_RACERSTATS_DRUMSTICK, - ASSET_MISC_RACERSTATS_PIPSY, - ASSET_MISC_RACERSTATS_UNKNOWN2, + ASSET_MISC_RACERACCELERATION_UNKNOWN0, + ASSET_MISC_RACERACCELERATION_DIDDY, + ASSET_MISC_RACERACCELERATION_TT, + ASSET_MISC_RACERACCELERATION_UNKNOWN1, + ASSET_MISC_RACERACCELERATION_KRUNCH, + ASSET_MISC_RACERACCELERATION_BUMPER, + ASSET_MISC_RACERACCELERATION_TIPTUP, + ASSET_MISC_RACERACCELERATION_CONKER, + ASSET_MISC_RACERACCELERATION_TIMBER, + ASSET_MISC_RACERACCELERATION_BANJO, + ASSET_MISC_RACERACCELERATION_DRUMSTICK, + ASSET_MISC_RACERACCELERATION_PIPSY, + ASSET_MISC_RACERACCELERATION_UNKNOWN2, ASSET_MISC_46, ASSET_MISC_47, ASSET_MISC_48, @@ -3123,7 +3123,7 @@ typedef enum { /********** ASSET_LEVEL_OBJECT_MAPS **********/ -typedef enum { +typedef enum AssetLevelObjectMapsEnum { ASSET_LEVEL_OBJECT_MAPS_0, ASSET_LEVEL_OBJECT_MAPS_1, ASSET_LEVEL_OBJECT_MAPS_2, @@ -3266,7 +3266,7 @@ typedef enum { /********** ASSET_LEVEL_HEADERS **********/ -typedef enum { +typedef enum AssetLevelHeadersEnum { ASSET_LEVEL_CENTRALAREAHUB, ASSET_LEVEL_BLUEY1, ASSET_LEVEL_DRAGONFORESTHUB, @@ -3336,77 +3336,77 @@ typedef enum { /********** ASSET_LEVEL_NAMES **********/ -typedef enum { - ASSET_LEVELNAME_CENTRALAREAHUB, - ASSET_LEVELNAME_BLUEY1, - ASSET_LEVELNAME_DRAGONFORESTHUB, - ASSET_LEVELNAME_FOSSILCANYON, - ASSET_LEVELNAME_PIRATELAGOON, - ASSET_LEVELNAME_ANCIENTLAKE, - ASSET_LEVELNAME_WALRUSCOVE, - ASSET_LEVELNAME_HOTTOPVOLCANO, - ASSET_LEVELNAME_WHALEBAY, - ASSET_LEVELNAME_SNOWBALLVALLEY, - ASSET_LEVELNAME_CRESCENTISLAND, - ASSET_LEVELNAME_FIREMOUNTAIN, - ASSET_LEVELNAME_DINODOMAINHUB, - ASSET_LEVELNAME_EVERFROSTPEAK, - ASSET_LEVELNAME_SHERBETISLANDHUB, - ASSET_LEVELNAME_SPACEPORTALPHA, - ASSET_LEVELNAME_HORSESHOEGULCH, - ASSET_LEVELNAME_SPACEDUSTALLEY, - ASSET_LEVELNAME_GREENWOODVILLAGE, - ASSET_LEVELNAME_BOULDERCANYON, - ASSET_LEVELNAME_WINDMILLPLAINS, - ASSET_LEVELNAME_FRONTEND, - ASSET_LEVELNAME_CHARACTERSELECT, - ASSET_LEVELNAME_TITLESCREENSEQUENCE, - ASSET_LEVELNAME_SNOWFLAKEMOUNTAINHUB, - ASSET_LEVELNAME_SMOKEYCASTLE, - ASSET_LEVELNAME_DARKWATERBEACH, - ASSET_LEVELNAME_ICICLEPYRAMID, - ASSET_LEVELNAME_FROSTYVILLAGE, - ASSET_LEVELNAME_JUNGLEFALLS, - ASSET_LEVELNAME_TREASURECAVES, - ASSET_LEVELNAME_HAUNTEDWOODS, - ASSET_LEVELNAME_DARKMOONCAVERNS, - ASSET_LEVELNAME_STARCITY, - ASSET_LEVELNAME_TROPHYRACE, - ASSET_LEVELNAME_FUTUREFUNLANDHUB, - ASSET_LEVELNAME_OPENINGSEQUENCE, - ASSET_LEVELNAME_WIZPIG1, - ASSET_LEVELNAME_TRICKYTOPS1, - ASSET_LEVELNAME_OPTIONSBACKGROUND, - ASSET_LEVELNAME_BUBBLER1, - ASSET_LEVELNAME_SMOKEY1, - ASSET_LEVELNAME_WIZPIGMOUTHSEQUENCE, - ASSET_LEVELNAME_WIZPIGAMULETSEQUENCE, - ASSET_LEVELNAME_TTAMULETSEQUENCE, - ASSET_LEVELNAME_ROCKETSEQUENCE, - ASSET_LEVELNAME_TRICKYTOPS2, - ASSET_LEVELNAME_DINODOMAINTROPHYANIM, - ASSET_LEVELNAME_SNOWFLAKEMOUNTAINTROPHYANIM, - ASSET_LEVELNAME_SHERBETISLANDTROPHYANIM, - ASSET_LEVELNAME_DRAGONFORESTTROPHYANIM, - ASSET_LEVELNAME_FUTUREFUNLANDTROPHYANIM, - ASSET_LEVELNAME_BLUEY2, - ASSET_LEVELNAME_BUBBLER2, - ASSET_LEVELNAME_SMOKEY2, - ASSET_LEVELNAME_WIZPIG2, - ASSET_LEVELNAME_PARTYSEQUENCE, - ASSET_LEVELNAME_TRICKTOPSANIM, - ASSET_LEVELNAME_SMOKEYANIM, - ASSET_LEVELNAME_BLUEYANIM, - ASSET_LEVELNAME_WIZPIG1ANIM, - ASSET_LEVELNAME_BUBBLERANIM, - ASSET_LEVELNAME_WIZPIG2ANIM, - ASSET_LEVELNAME_LASTBIT, - ASSET_LEVELNAME_LASTBITB +typedef enum AssetLevelNamesEnum { + ASSET_LEVEL_CENTRALAREAHUB_NAME, + ASSET_LEVEL_BLUEY1_NAME, + ASSET_LEVEL_DRAGONFORESTHUB_NAME, + ASSET_LEVEL_FOSSILCANYON_NAME, + ASSET_LEVEL_PIRATELAGOON_NAME, + ASSET_LEVEL_ANCIENTLAKE_NAME, + ASSET_LEVEL_WALRUSCOVE_NAME, + ASSET_LEVEL_HOTTOPVOLCANO_NAME, + ASSET_LEVEL_WHALEBAY_NAME, + ASSET_LEVEL_SNOWBALLVALLEY_NAME, + ASSET_LEVEL_CRESCENTISLAND_NAME, + ASSET_LEVEL_FIREMOUNTAIN_NAME, + ASSET_LEVEL_DINODOMAINHUB_NAME, + ASSET_LEVEL_EVERFROSTPEAK_NAME, + ASSET_LEVEL_SHERBETISLANDHUB_NAME, + ASSET_LEVEL_SPACEPORTALPHA_NAME, + ASSET_LEVEL_HORSESHOEGULCH_NAME, + ASSET_LEVEL_SPACEDUSTALLEY_NAME, + ASSET_LEVEL_GREENWOODVILLAGE_NAME, + ASSET_LEVEL_BOULDERCANYON_NAME, + ASSET_LEVEL_WINDMILLPLAINS_NAME, + ASSET_LEVEL_FRONTEND_NAME, + ASSET_LEVEL_CHARACTERSELECT_NAME, + ASSET_LEVEL_TITLESCREENSEQUENCE_NAME, + ASSET_LEVEL_SNOWFLAKEMOUNTAINHUB_NAME, + ASSET_LEVEL_SMOKEYCASTLE_NAME, + ASSET_LEVEL_DARKWATERBEACH_NAME, + ASSET_LEVEL_ICICLEPYRAMID_NAME, + ASSET_LEVEL_FROSTYVILLAGE_NAME, + ASSET_LEVEL_JUNGLEFALLS_NAME, + ASSET_LEVEL_TREASURECAVES_NAME, + ASSET_LEVEL_HAUNTEDWOODS_NAME, + ASSET_LEVEL_DARKMOONCAVERNS_NAME, + ASSET_LEVEL_STARCITY_NAME, + ASSET_LEVEL_TROPHYRACE_NAME, + ASSET_LEVEL_FUTUREFUNLANDHUB_NAME, + ASSET_LEVEL_OPENINGSEQUENCE_NAME, + ASSET_LEVEL_WIZPIG1_NAME, + ASSET_LEVEL_TRICKYTOPS1_NAME, + ASSET_LEVEL_OPTIONSBACKGROUND_NAME, + ASSET_LEVEL_BUBBLER1_NAME, + ASSET_LEVEL_SMOKEY1_NAME, + ASSET_LEVEL_WIZPIGMOUTHSEQUENCE_NAME, + ASSET_LEVEL_WIZPIGAMULETSEQUENCE_NAME, + ASSET_LEVEL_TTAMULETSEQUENCE_NAME, + ASSET_LEVEL_ROCKETSEQUENCE_NAME, + ASSET_LEVEL_TRICKYTOPS2_NAME, + ASSET_LEVEL_DINODOMAINTROPHYANIM_NAME, + ASSET_LEVEL_SNOWFLAKEMOUNTAINTROPHYANIM_NAME, + ASSET_LEVEL_SHERBETISLANDTROPHYANIM_NAME, + ASSET_LEVEL_DRAGONFORESTTROPHYANIM_NAME, + ASSET_LEVEL_FUTUREFUNLANDTROPHYANIM_NAME, + ASSET_LEVEL_BLUEY2_NAME, + ASSET_LEVEL_BUBBLER2_NAME, + ASSET_LEVEL_SMOKEY2_NAME, + ASSET_LEVEL_WIZPIG2_NAME, + ASSET_LEVEL_PARTYSEQUENCE_NAME, + ASSET_LEVEL_TRICKTOPSANIM_NAME, + ASSET_LEVEL_SMOKEYANIM_NAME, + ASSET_LEVEL_BLUEYANIM_NAME, + ASSET_LEVEL_WIZPIG1ANIM_NAME, + ASSET_LEVEL_BUBBLERANIM_NAME, + ASSET_LEVEL_WIZPIG2ANIM_NAME, + ASSET_LEVEL_LASTBIT_NAME, + ASSET_LEVEL_LASTBITB_NAME } AssetLevelNamesEnum; /********** ASSET_LEVEL_MODELS **********/ -typedef enum { +typedef enum AssetLevelModelsEnum { ASSET_LEVELMODEL_CENTRALAREAHUB, ASSET_LEVELMODEL_BLUEY, ASSET_LEVELMODEL_DRAGONFORESTHUB, @@ -3466,7 +3466,7 @@ typedef enum { /********** ASSET_OBJECT_MODELS **********/ -typedef enum { +typedef enum AssetObjectModelsEnum { ASSET_OBJECTMODEL_DOME, ASSET_OBJECTMODEL_DOME1, ASSET_OBJECTMODEL_DOME2, @@ -3861,7 +3861,7 @@ typedef enum { /********** ASSET_OBJECT_ANIMATIONS **********/ -typedef enum { +typedef enum AssetObjectAnimationsEnum { ASSET_OBJECT_ANIMATIONS_0, ASSET_OBJECT_ANIMATIONS_1, ASSET_OBJECT_ANIMATIONS_2, @@ -4334,318 +4334,318 @@ typedef enum { ASSET_OBJECT_ANIMATIONS_469 } AssetObjectAnimationsEnum; -/********** ASSET_OBJECT_HEADERS **********/ +/********** ASSET_OBJECTS **********/ -typedef enum { - ASSET_OBJHEADER_DIDDYCAR, - ASSET_OBJHEADER_SWCAR, - ASSET_OBJHEADER_KREMCAR, - ASSET_OBJHEADER_BADGERCAR, - ASSET_OBJHEADER_TORTCAR, - ASSET_OBJHEADER_CONKACAR, - ASSET_OBJHEADER_TIGERCAR, - ASSET_OBJHEADER_BANJOCAR, - ASSET_OBJHEADER_CHICKENCAR, - ASSET_OBJHEADER_MOUSECAR, - ASSET_OBJHEADER_DIDDYHOVER, - ASSET_OBJHEADER_TICKTOCKHOVER, - ASSET_OBJHEADER_KREMLINHOVER, - ASSET_OBJHEADER_BADGERHOVER, - ASSET_OBJHEADER_TORTHOVER, - ASSET_OBJHEADER_CONKAHOVER, - ASSET_OBJHEADER_TIGERHOVER, - ASSET_OBJHEADER_BANJOHOVER, - ASSET_OBJHEADER_CHICKENHOVER, - ASSET_OBJHEADER_MOUSEHOVER, - ASSET_OBJHEADER_DIDDYPLANE, - ASSET_OBJHEADER_TICKTOCKPLANE, - ASSET_OBJHEADER_KREMPLANE, - ASSET_OBJHEADER_BADGERPLANE, - ASSET_OBJHEADER_TORTPLANE, - ASSET_OBJHEADER_CONKA, - ASSET_OBJHEADER_TIGPLANE, - ASSET_OBJHEADER_BANJOPLANE, - ASSET_OBJHEADER_CHICKENPLANE, - ASSET_OBJHEADER_MOUSEPLANE, - ASSET_OBJHEADER_FLYINGCARPET, - ASSET_OBJHEADER_TIMBERDANCER, - ASSET_OBJHEADER_CHICKENCHARACTE, - ASSET_OBJHEADER_PIPSYDANCER, - ASSET_OBJHEADER_BANJODANCER, - ASSET_OBJHEADER_TICKTOCKDANCER, - ASSET_OBJHEADER_WIZPIGSHIP, - ASSET_OBJHEADER_CONKADANCER, - ASSET_OBJHEADER_EMPTYHOVER, - ASSET_OBJHEADER_STOPWATCHMAN, - ASSET_OBJHEADER_STOPWATCHSELECT, - ASSET_OBJHEADER_PARKWARDEN, - ASSET_OBJHEADER_SMARTIETREE, - ASSET_OBJHEADER_BLUEBERRYBUSH, - ASSET_OBJHEADER_RUBBERSNOWTREE, - ASSET_OBJHEADER_SKINNYSNOWTREE, - ASSET_OBJHEADER_XMASTREE, - ASSET_OBJHEADER_ALPINESNOWTREE, - ASSET_OBJHEADER_RUBBERTREE, - ASSET_OBJHEADER_BEACHTREE, - ASSET_OBJHEADER_PALMTREETOP, - ASSET_OBJHEADER_PALMPLANT, - ASSET_OBJHEADER_PALMTREETOPCHEA, - ASSET_OBJHEADER_FIRTREE, - ASSET_OBJHEADER_SPACETREE, - ASSET_OBJHEADER_LAMPPOST, - ASSET_OBJHEADER_FLOWERS, - ASSET_OBJHEADER_REEDS, - ASSET_OBJHEADER_SMOKE, - ASSET_OBJHEADER_DINOSAUR1, - ASSET_OBJHEADER_DINOSAUR2, - ASSET_OBJHEADER_DINOSAUR3, - ASSET_OBJHEADER_WHALE, - ASSET_OBJHEADER_SNOWMEN, - ASSET_OBJHEADER_SIGNS, - ASSET_OBJHEADER_FLAMINGTORCH, - ASSET_OBJHEADER_MIST, - ASSET_OBJHEADER_SNOWBALL, - ASSET_OBJHEADER_BUOY, - ASSET_OBJHEADER_PIRATESHIP, - ASSET_OBJHEADER_LOG, - ASSET_OBJHEADER_PIGLOG, - ASSET_OBJHEADER_BOULDER, - ASSET_OBJHEADER_AIRZIPPERS, - ASSET_OBJHEADER_WATERZIPPERS, - ASSET_OBJHEADER_LEVELDOOR, - ASSET_OBJHEADER_KEITHPIGDOOR, - ASSET_OBJHEADER_CHALDOOR, - ASSET_OBJHEADER_BOSSDOOR, - ASSET_OBJHEADER_BIGBOSSDOOR, - ASSET_OBJHEADER_WORLDGATE, - ASSET_OBJHEADER_TTDOOR, - ASSET_OBJHEADER_RAMPSWITCH, - ASSET_OBJHEADER_NOENTRYDOOR, - ASSET_OBJHEADER_RAMPWHALE, - ASSET_OBJHEADER_SEAMONSTER, - ASSET_OBJHEADER_DINOISLE, - ASSET_OBJHEADER_SKYCONTROL, - ASSET_OBJHEADER_CHECKPOINT, - ASSET_OBJHEADER_CHECKARROW, - ASSET_OBJHEADER_MODECHANGE, - ASSET_OBJHEADER_TRIGGER, - ASSET_OBJHEADER_FOGCHANGER, - ASSET_OBJHEADER_AINODE, - ASSET_OBJHEADER_EXIT, - ASSET_OBJHEADER_BONUS, - ASSET_OBJHEADER_CAMERA_CONTROL, - ASSET_OBJHEADER_SETUPPOINT, - ASSET_OBJHEADER_ANIMATOR, - ASSET_OBJHEADER_TEXSCROLL, - ASSET_OBJHEADER_RGBALIGHT, - ASSET_OBJHEADER_INTROCAM, - ASSET_OBJHEADER_WEATHER, - ASSET_OBJHEADER_LENSFLARE, - ASSET_OBJHEADER_LENSFLARESWITCH, - ASSET_OBJHEADER_INFOPOINT, - ASSET_OBJHEADER_WAVEGENERATOR, - ASSET_OBJHEADER_WAVEPOWER, - ASSET_OBJHEADER_RANGETRIGGER, - ASSET_OBJHEADER_LAVASPURT, - ASSET_OBJHEADER_BOMBEXPLOSION, - ASSET_OBJHEADER_WARDENSMOKE, - ASSET_OBJHEADER_BUBBLER, - ASSET_OBJHEADER_WEAPONBALLOON, - ASSET_OBJHEADER_WBALLOONPOP, - ASSET_OBJHEADER_MISSILEGLOW, - ASSET_OBJHEADER_HOMINGGLOW, - ASSET_OBJHEADER_MISSILE, - ASSET_OBJHEADER_HOMING, - ASSET_OBJHEADER_OILSLICK, - ASSET_OBJHEADER_SMOKECLOUD, - ASSET_OBJHEADER_BOMB, - ASSET_OBJHEADER_BUBBLEWEAPON, - ASSET_OBJHEADER_WORLDKEY, - ASSET_OBJHEADER_COINCREATOR, - ASSET_OBJHEADER_TREASURESUCKER, - ASSET_OBJHEADER_COIN, - ASSET_OBJHEADER_SILVERCOIN, - ASSET_OBJHEADER_GOLDCOIN, - ASSET_OBJHEADER_BONUSGEM, - ASSET_OBJHEADER_COLLECTEGG, - ASSET_OBJHEADER_EGGCREATOR, - ASSET_OBJHEADER_CHARACTERFLAG, - ASSET_OBJHEADER_ANIMATION, - ASSET_OBJHEADER_OVERRIDEPOS, - ASSET_OBJHEADER_ANIMCAMERA, - ASSET_OBJHEADER_ANIMCAR, - ASSET_OBJHEADER_ANIMDOME, - ASSET_OBJHEADER_WIZGHOSTS, - ASSET_OBJHEADER_N64LOGO, - ASSET_OBJHEADER_ASTEROID, - ASSET_OBJHEADER_PILLAR, - ASSET_OBJHEADER_BOULDERANIM, - ASSET_OBJHEADER_PIGHEADCOLOURS, - ASSET_OBJHEADER_PIGFACEANIMATOR, - ASSET_OBJHEADER_PTERODACTYL, - ASSET_OBJHEADER_AMULETPIECE1, - ASSET_OBJHEADER_AMULETPIECE2, - ASSET_OBJHEADER_AMULETPIECE3, - ASSET_OBJHEADER_AMULETPIECE4, - ASSET_OBJHEADER_SWAMULET1, - ASSET_OBJHEADER_SWAMULET2, - ASSET_OBJHEADER_SWAMULET3, - ASSET_OBJHEADER_SWAMULET4, - ASSET_OBJHEADER_ANIMKEY, - ASSET_OBJHEADER_SPACESHIP1, - ASSET_OBJHEADER_MINISHIP, - ASSET_OBJHEADER_MONORAIL, - ASSET_OBJHEADER_SPACESHIP2, - ASSET_OBJHEADER_SPACESHIP3, - ASSET_OBJHEADER_LIGHTHOUSE, - ASSET_OBJHEADER_ROCKETSIGNPOST, - ASSET_OBJHEADER_LIGHTHOUSE1, - ASSET_OBJHEADER_LIGHTHOUSE2, - ASSET_OBJHEADER_SELECTIONHILL, - ASSET_OBJHEADER_WIDESCREEN, - ASSET_OBJHEADER_TIGERANIMPLANE, - ASSET_OBJHEADER_BADGERANIMWALK, - ASSET_OBJHEADER_TIMBERANIMCAR, - ASSET_OBJHEADER_KREMSELECT, - ASSET_OBJHEADER_CONKSELECT, - ASSET_OBJHEADER_BADGERSELECT, - ASSET_OBJHEADER_TORTSELECT, - ASSET_OBJHEADER_TIGERSELECT, - ASSET_OBJHEADER_DIDDYSELECT, - ASSET_OBJHEADER_BANJOSELECT, - ASSET_OBJHEADER_CHICKSELECT, - ASSET_OBJHEADER_MOUSESELECT, - ASSET_OBJHEADER_MAGICCARPET, - ASSET_OBJHEADER_POLYGOLDBALOON, - ASSET_OBJHEADER_ANIMGENIE, - ASSET_OBJHEADER_ANIMGENIE3, - ASSET_OBJHEADER_BUTTERFLYBAIT, - ASSET_OBJHEADER_AUDIO, - ASSET_OBJHEADER_AUDIOLINE, - ASSET_OBJHEADER_AUDIOSEQLINE, - ASSET_OBJHEADER_AUDIOSEQ, - ASSET_OBJHEADER_AUDIOREVERB, - ASSET_OBJHEADER_FRONTTYRE, - ASSET_OBJHEADER_BACKTYRE, - ASSET_OBJHEADER_PLANETYRE, - ASSET_OBJHEADER_FAN, - ASSET_OBJHEADER_JETENGINE, - ASSET_OBJHEADER_GLOVE, - ASSET_OBJHEADER_LEEFAN, - ASSET_OBJHEADER_MAGICRING, - ASSET_OBJHEADER_DOME, - ASSET_OBJHEADER_DOME1, - ASSET_OBJHEADER_DOME2, - ASSET_OBJHEADER_DOME3, - ASSET_OBJHEADER_DOME4, - ASSET_OBJHEADER_DOME5, - ASSET_OBJHEADER_DOME6, - ASSET_OBJHEADER_DOME7, - ASSET_OBJHEADER_DOME8, - ASSET_OBJHEADER_DOME9, - ASSET_OBJHEADER_DOME10, - ASSET_OBJHEADER_DOME11, - ASSET_OBJHEADER_DOME12, - ASSET_OBJHEADER_DOME13, - ASSET_OBJHEADER_DOME14, - ASSET_OBJHEADER_DOME15, - ASSET_OBJHEADER_DOME16, - ASSET_OBJHEADER_DOME17, - ASSET_OBJHEADER_SELECTIONSHADOW, - ASSET_OBJHEADER_POSTFORPARTY, - ASSET_OBJHEADER_RARELOGO, - ASSET_OBJHEADER_SPARKLYTHING, - ASSET_OBJHEADER_DOOROPENER, - ASSET_OBJHEADER_ANIMDINOSAUR2, - ASSET_OBJHEADER_TIMERANIMHOVER, - ASSET_OBJHEADER_ANIMBADGERPLANE, - ASSET_OBJHEADER_ANIMDINOSAUR1, - ASSET_OBJHEADER_ANIMMOUSECAR, - ASSET_OBJHEADER_ANIMTORT, - ASSET_OBJHEADER_CHICKENANIMPLAN, - ASSET_OBJHEADER_EMPTYHOVERANIM, - ASSET_OBJHEADER_KREMANIM, - ASSET_OBJHEADER_MOUSEHOVERANIM, - ASSET_OBJHEADER_TORTRUNNER, - ASSET_OBJHEADER_ANIMBANJOPLANE, - ASSET_OBJHEADER_CONKAANIMCAR, - ASSET_OBJHEADER_GBPARKWARDEN, - ASSET_OBJHEADER_WIZPIG, - ASSET_OBJHEADER_WIZPIGROCKET, - ASSET_OBJHEADER_PIGBOSS, - ASSET_OBJHEADER_PIGBOSS2, - ASSET_OBJHEADER_PIGROCKETEER, - ASSET_OBJHEADER_PARTICLES2, - ASSET_OBJHEADER_PIGBOULDER, - ASSET_OBJHEADER_BIGPLANET, - ASSET_OBJHEADER_ROCKETBIT1, - ASSET_OBJHEADER_ROCKETBIT2, - ASSET_OBJHEADER_GENIEHEAD, - ASSET_OBJHEADER_PIGBOULDER2, - ASSET_OBJHEADER_PIGBOULDER3, - ASSET_OBJHEADER_PIGBOULDER4, - ASSET_OBJHEADER_PIGBOULDER5, - ASSET_OBJHEADER_TRICKYTOPS, - ASSET_OBJHEADER_TRICKYANIM, - ASSET_OBJHEADER_TRICKYANIM2, - ASSET_OBJHEADER_TRICKYANIM3, - ASSET_OBJHEADER_WALRUS_ANIM, - ASSET_OBJHEADER_TERRYBOSS, - ASSET_OBJHEADER_DRAGONBOSS, - ASSET_OBJHEADER_DRAGONANIM, - ASSET_OBJHEADER_WALRUS, - ASSET_OBJHEADER_SNOWBALLBOSS, - ASSET_OBJHEADER_ANIMOCTO, - ASSET_OBJHEADER_OCTOPUS, - ASSET_OBJHEADER_GOLDBALOONSPRIT, - ASSET_OBJHEADER_SPACECOLUMN1, - ASSET_OBJHEADER_SPACECOLUMN2, - ASSET_OBJHEADER_SPACECOLUMN3, - ASSET_OBJHEADER_HAYSTACK, - ASSET_OBJHEADER_ANIMGENIE2, - ASSET_OBJHEADER_BRIGHTSTAR, - ASSET_OBJHEADER_BUTTERFLY, - ASSET_OBJHEADER_FISH, - ASSET_OBJHEADER_FROG, - ASSET_OBJHEADER_BOOST, - ASSET_OBJHEADER_MAGNETFX, - ASSET_OBJHEADER_STILLFROG, - ASSET_OBJHEADER_STOPWATCHICON, - ASSET_OBJHEADER_STOPWATCHHAND, - ASSET_OBJHEADER_BRIDGE, - ASSET_OBJHEADER_POSARROW, - ASSET_OBJHEADER_HITTESTER, - ASSET_OBJHEADER_MIDIFADE, - ASSET_OBJHEADER_WINDSAIL, - ASSET_OBJHEADER_EFFECTBOX, - ASSET_OBJHEADER_TROPHYCAB, - ASSET_OBJHEADER_FLYCOIN, - ASSET_OBJHEADER_GOLDENBALLOON, - ASSET_OBJHEADER_LASERBOLT, - ASSET_OBJHEADER_LASERGUN, - ASSET_OBJHEADER_BOLTGLOW, - ASSET_OBJHEADER_GROUNDZIPPER, - ASSET_OBJHEADER_PWSAFETELEPOINT, - ASSET_OBJHEADER_HEADFORPOINT, - ASSET_OBJHEADER_FIREBALLATTRACT, - ASSET_OBJHEADER_FIREBALL, - ASSET_OBJHEADER_OCTOBUBBLE, - ASSET_OBJHEADER_OCTOBOMB, - ASSET_OBJHEADER_GOLDTROPHY, - ASSET_OBJHEADER_PARKTROPHY, - ASSET_OBJHEADER_TICKTROPHY, - ASSET_OBJHEADER_TROPHY, - ASSET_OBJHEADER_TELEPORT, - ASSET_OBJHEADER_SHIELD, - ASSET_OBJHEADER_LIGHTNING, - ASSET_OBJHEADER_MIDIFADEPOINT, - ASSET_OBJHEADER_LEVELNAME, - ASSET_OBJHEADER_MIDICHSET -} AssetObjectHeadersEnum; +typedef enum AssetObjectsEnum { + ASSET_OBJECT_DIDDYCAR, + ASSET_OBJECT_SWCAR, + ASSET_OBJECT_KREMCAR, + ASSET_OBJECT_BADGERCAR, + ASSET_OBJECT_TORTCAR, + ASSET_OBJECT_CONKACAR, + ASSET_OBJECT_TIGERCAR, + ASSET_OBJECT_BANJOCAR, + ASSET_OBJECT_CHICKENCAR, + ASSET_OBJECT_MOUSECAR, + ASSET_OBJECT_DIDDYHOVER, + ASSET_OBJECT_TICKTOCKHOVER, + ASSET_OBJECT_KREMLINHOVER, + ASSET_OBJECT_BADGERHOVER, + ASSET_OBJECT_TORTHOVER, + ASSET_OBJECT_CONKAHOVER, + ASSET_OBJECT_TIGERHOVER, + ASSET_OBJECT_BANJOHOVER, + ASSET_OBJECT_CHICKENHOVER, + ASSET_OBJECT_MOUSEHOVER, + ASSET_OBJECT_DIDDYPLANE, + ASSET_OBJECT_TICKTOCKPLANE, + ASSET_OBJECT_KREMPLANE, + ASSET_OBJECT_BADGERPLANE, + ASSET_OBJECT_TORTPLANE, + ASSET_OBJECT_CONKA, + ASSET_OBJECT_TIGPLANE, + ASSET_OBJECT_BANJOPLANE, + ASSET_OBJECT_CHICKENPLANE, + ASSET_OBJECT_MOUSEPLANE, + ASSET_OBJECT_FLYINGCARPET, + ASSET_OBJECT_TIMBERDANCER, + ASSET_OBJECT_CHICKENCHARACTE, + ASSET_OBJECT_PIPSYDANCER, + ASSET_OBJECT_BANJODANCER, + ASSET_OBJECT_TICKTOCKDANCER, + ASSET_OBJECT_WIZPIGSHIP, + ASSET_OBJECT_CONKADANCER, + ASSET_OBJECT_EMPTYHOVER, + ASSET_OBJECT_STOPWATCHMAN, + ASSET_OBJECT_STOPWATCHSELECT, + ASSET_OBJECT_PARKWARDEN, + ASSET_OBJECT_SMARTIETREE, + ASSET_OBJECT_BLUEBERRYBUSH, + ASSET_OBJECT_RUBBERSNOWTREE, + ASSET_OBJECT_SKINNYSNOWTREE, + ASSET_OBJECT_XMASTREE, + ASSET_OBJECT_ALPINESNOWTREE, + ASSET_OBJECT_RUBBERTREE, + ASSET_OBJECT_BEACHTREE, + ASSET_OBJECT_PALMTREETOP, + ASSET_OBJECT_PALMPLANT, + ASSET_OBJECT_PALMTREETOPCHEA, + ASSET_OBJECT_FIRTREE, + ASSET_OBJECT_SPACETREE, + ASSET_OBJECT_LAMPPOST, + ASSET_OBJECT_FLOWERS, + ASSET_OBJECT_REEDS, + ASSET_OBJECT_SMOKE, + ASSET_OBJECT_DINOSAUR1, + ASSET_OBJECT_DINOSAUR2, + ASSET_OBJECT_DINOSAUR3, + ASSET_OBJECT_WHALE, + ASSET_OBJECT_SNOWMEN, + ASSET_OBJECT_SIGNS, + ASSET_OBJECT_FLAMINGTORCH, + ASSET_OBJECT_MIST, + ASSET_OBJECT_SNOWBALL, + ASSET_OBJECT_BUOY, + ASSET_OBJECT_PIRATESHIP, + ASSET_OBJECT_LOG, + ASSET_OBJECT_PIGLOG, + ASSET_OBJECT_BOULDER, + ASSET_OBJECT_AIRZIPPERS, + ASSET_OBJECT_WATERZIPPERS, + ASSET_OBJECT_LEVELDOOR, + ASSET_OBJECT_KEITHPIGDOOR, + ASSET_OBJECT_CHALDOOR, + ASSET_OBJECT_BOSSDOOR, + ASSET_OBJECT_BIGBOSSDOOR, + ASSET_OBJECT_WORLDGATE, + ASSET_OBJECT_TTDOOR, + ASSET_OBJECT_RAMPSWITCH, + ASSET_OBJECT_NOENTRYDOOR, + ASSET_OBJECT_RAMPWHALE, + ASSET_OBJECT_SEAMONSTER, + ASSET_OBJECT_DINOISLE, + ASSET_OBJECT_SKYCONTROL, + ASSET_OBJECT_CHECKPOINT, + ASSET_OBJECT_CHECKARROW, + ASSET_OBJECT_MODECHANGE, + ASSET_OBJECT_TRIGGER, + ASSET_OBJECT_FOGCHANGER, + ASSET_OBJECT_AINODE, + ASSET_OBJECT_EXIT, + ASSET_OBJECT_BONUS, + ASSET_OBJECT_CAMERA_CONTROL, + ASSET_OBJECT_SETUPPOINT, + ASSET_OBJECT_ANIMATOR, + ASSET_OBJECT_TEXSCROLL, + ASSET_OBJECT_RGBALIGHT, + ASSET_OBJECT_INTROCAM, + ASSET_OBJECT_WEATHER, + ASSET_OBJECT_LENSFLARE, + ASSET_OBJECT_LENSFLARESWITCH, + ASSET_OBJECT_INFOPOINT, + ASSET_OBJECT_WAVEGENERATOR, + ASSET_OBJECT_WAVEPOWER, + ASSET_OBJECT_RANGETRIGGER, + ASSET_OBJECT_LAVASPURT, + ASSET_OBJECT_BOMBEXPLOSION, + ASSET_OBJECT_WARDENSMOKE, + ASSET_OBJECT_BUBBLER, + ASSET_OBJECT_WEAPONBALLOON, + ASSET_OBJECT_WBALLOONPOP, + ASSET_OBJECT_MISSILEGLOW, + ASSET_OBJECT_HOMINGGLOW, + ASSET_OBJECT_MISSILE, + ASSET_OBJECT_HOMING, + ASSET_OBJECT_OILSLICK, + ASSET_OBJECT_SMOKECLOUD, + ASSET_OBJECT_BOMB, + ASSET_OBJECT_BUBBLEWEAPON, + ASSET_OBJECT_WORLDKEY, + ASSET_OBJECT_COINCREATOR, + ASSET_OBJECT_TREASURESUCKER, + ASSET_OBJECT_COIN, + ASSET_OBJECT_SILVERCOIN, + ASSET_OBJECT_GOLDCOIN, + ASSET_OBJECT_BONUSGEM, + ASSET_OBJECT_COLLECTEGG, + ASSET_OBJECT_EGGCREATOR, + ASSET_OBJECT_CHARACTERFLAG, + ASSET_OBJECT_ANIMATION, + ASSET_OBJECT_OVERRIDEPOS, + ASSET_OBJECT_ANIMCAMERA, + ASSET_OBJECT_ANIMCAR, + ASSET_OBJECT_ANIMDOME, + ASSET_OBJECT_WIZGHOSTS, + ASSET_OBJECT_N64LOGO, + ASSET_OBJECT_ASTEROID, + ASSET_OBJECT_PILLAR, + ASSET_OBJECT_BOULDERANIM, + ASSET_OBJECT_PIGHEADCOLOURS, + ASSET_OBJECT_PIGFACEANIMATOR, + ASSET_OBJECT_PTERODACTYL, + ASSET_OBJECT_AMULETPIECE1, + ASSET_OBJECT_AMULETPIECE2, + ASSET_OBJECT_AMULETPIECE3, + ASSET_OBJECT_AMULETPIECE4, + ASSET_OBJECT_SWAMULET1, + ASSET_OBJECT_SWAMULET2, + ASSET_OBJECT_SWAMULET3, + ASSET_OBJECT_SWAMULET4, + ASSET_OBJECT_ANIMKEY, + ASSET_OBJECT_SPACESHIP1, + ASSET_OBJECT_MINISHIP, + ASSET_OBJECT_MONORAIL, + ASSET_OBJECT_SPACESHIP2, + ASSET_OBJECT_SPACESHIP3, + ASSET_OBJECT_LIGHTHOUSE, + ASSET_OBJECT_ROCKETSIGNPOST, + ASSET_OBJECT_LIGHTHOUSE1, + ASSET_OBJECT_LIGHTHOUSE2, + ASSET_OBJECT_SELECTIONHILL, + ASSET_OBJECT_WIDESCREEN, + ASSET_OBJECT_TIGERANIMPLANE, + ASSET_OBJECT_BADGERANIMWALK, + ASSET_OBJECT_TIMBERANIMCAR, + ASSET_OBJECT_KREMSELECT, + ASSET_OBJECT_CONKSELECT, + ASSET_OBJECT_BADGERSELECT, + ASSET_OBJECT_TORTSELECT, + ASSET_OBJECT_TIGERSELECT, + ASSET_OBJECT_DIDDYSELECT, + ASSET_OBJECT_BANJOSELECT, + ASSET_OBJECT_CHICKSELECT, + ASSET_OBJECT_MOUSESELECT, + ASSET_OBJECT_MAGICCARPET, + ASSET_OBJECT_POLYGOLDBALOON, + ASSET_OBJECT_ANIMGENIE, + ASSET_OBJECT_ANIMGENIE3, + ASSET_OBJECT_BUTTERFLYBAIT, + ASSET_OBJECT_AUDIO, + ASSET_OBJECT_AUDIOLINE, + ASSET_OBJECT_AUDIOSEQLINE, + ASSET_OBJECT_AUDIOSEQ, + ASSET_OBJECT_AUDIOREVERB, + ASSET_OBJECT_FRONTTYRE, + ASSET_OBJECT_BACKTYRE, + ASSET_OBJECT_PLANETYRE, + ASSET_OBJECT_FAN, + ASSET_OBJECT_JETENGINE, + ASSET_OBJECT_GLOVE, + ASSET_OBJECT_LEEFAN, + ASSET_OBJECT_MAGICRING, + ASSET_OBJECT_DOME, + ASSET_OBJECT_DOME1, + ASSET_OBJECT_DOME2, + ASSET_OBJECT_DOME3, + ASSET_OBJECT_DOME4, + ASSET_OBJECT_DOME5, + ASSET_OBJECT_DOME6, + ASSET_OBJECT_DOME7, + ASSET_OBJECT_DOME8, + ASSET_OBJECT_DOME9, + ASSET_OBJECT_DOME10, + ASSET_OBJECT_DOME11, + ASSET_OBJECT_DOME12, + ASSET_OBJECT_DOME13, + ASSET_OBJECT_DOME14, + ASSET_OBJECT_DOME15, + ASSET_OBJECT_DOME16, + ASSET_OBJECT_DOME17, + ASSET_OBJECT_SELECTIONSHADOW, + ASSET_OBJECT_POSTFORPARTY, + ASSET_OBJECT_RARELOGO, + ASSET_OBJECT_SPARKLYTHING, + ASSET_OBJECT_DOOROPENER, + ASSET_OBJECT_ANIMDINOSAUR2, + ASSET_OBJECT_TIMERANIMHOVER, + ASSET_OBJECT_ANIMBADGERPLANE, + ASSET_OBJECT_ANIMDINOSAUR1, + ASSET_OBJECT_ANIMMOUSECAR, + ASSET_OBJECT_ANIMTORT, + ASSET_OBJECT_CHICKENANIMPLAN, + ASSET_OBJECT_EMPTYHOVERANIM, + ASSET_OBJECT_KREMANIM, + ASSET_OBJECT_MOUSEHOVERANIM, + ASSET_OBJECT_TORTRUNNER, + ASSET_OBJECT_ANIMBANJOPLANE, + ASSET_OBJECT_CONKAANIMCAR, + ASSET_OBJECT_GBPARKWARDEN, + ASSET_OBJECT_WIZPIG, + ASSET_OBJECT_WIZPIGROCKET, + ASSET_OBJECT_PIGBOSS, + ASSET_OBJECT_PIGBOSS2, + ASSET_OBJECT_PIGROCKETEER, + ASSET_OBJECT_PARTICLES2, + ASSET_OBJECT_PIGBOULDER, + ASSET_OBJECT_BIGPLANET, + ASSET_OBJECT_ROCKETBIT1, + ASSET_OBJECT_ROCKETBIT2, + ASSET_OBJECT_GENIEHEAD, + ASSET_OBJECT_PIGBOULDER2, + ASSET_OBJECT_PIGBOULDER3, + ASSET_OBJECT_PIGBOULDER4, + ASSET_OBJECT_PIGBOULDER5, + ASSET_OBJECT_TRICKYTOPS, + ASSET_OBJECT_TRICKYANIM, + ASSET_OBJECT_TRICKYANIM2, + ASSET_OBJECT_TRICKYANIM3, + ASSET_OBJECT_WALRUS_ANIM, + ASSET_OBJECT_TERRYBOSS, + ASSET_OBJECT_DRAGONBOSS, + ASSET_OBJECT_DRAGONANIM, + ASSET_OBJECT_WALRUS, + ASSET_OBJECT_SNOWBALLBOSS, + ASSET_OBJECT_ANIMOCTO, + ASSET_OBJECT_OCTOPUS, + ASSET_OBJECT_GOLDBALOONSPRIT, + ASSET_OBJECT_SPACECOLUMN1, + ASSET_OBJECT_SPACECOLUMN2, + ASSET_OBJECT_SPACECOLUMN3, + ASSET_OBJECT_HAYSTACK, + ASSET_OBJECT_ANIMGENIE2, + ASSET_OBJECT_BRIGHTSTAR, + ASSET_OBJECT_BUTTERFLY, + ASSET_OBJECT_FISH, + ASSET_OBJECT_FROG, + ASSET_OBJECT_BOOST, + ASSET_OBJECT_MAGNETFX, + ASSET_OBJECT_STILLFROG, + ASSET_OBJECT_STOPWATCHICON, + ASSET_OBJECT_STOPWATCHHAND, + ASSET_OBJECT_BRIDGE, + ASSET_OBJECT_POSARROW, + ASSET_OBJECT_HITTESTER, + ASSET_OBJECT_MIDIFADE, + ASSET_OBJECT_WINDSAIL, + ASSET_OBJECT_EFFECTBOX, + ASSET_OBJECT_TROPHYCAB, + ASSET_OBJECT_FLYCOIN, + ASSET_OBJECT_GOLDENBALLOON, + ASSET_OBJECT_LASERBOLT, + ASSET_OBJECT_LASERGUN, + ASSET_OBJECT_BOLTGLOW, + ASSET_OBJECT_GROUNDZIPPER, + ASSET_OBJECT_PWSAFETELEPOINT, + ASSET_OBJECT_HEADFORPOINT, + ASSET_OBJECT_FIREBALLATTRACT, + ASSET_OBJECT_FIREBALL, + ASSET_OBJECT_OCTOBUBBLE, + ASSET_OBJECT_OCTOBOMB, + ASSET_OBJECT_GOLDTROPHY, + ASSET_OBJECT_PARKTROPHY, + ASSET_OBJECT_TICKTROPHY, + ASSET_OBJECT_TROPHY, + ASSET_OBJECT_TELEPORT, + ASSET_OBJECT_SHIELD, + ASSET_OBJECT_LIGHTNING, + ASSET_OBJECT_MIDIFADEPOINT, + ASSET_OBJECT_LEVELNAME, + ASSET_OBJECT_MIDICHSET +} AssetObjectsEnum; /********** ASSET_AUDIO **********/ -typedef enum { +typedef enum AssetAudioEnum { ASSET_AUDIO_0, ASSET_AUDIO_1, ASSET_AUDIO_2, @@ -4663,7 +4663,7 @@ typedef enum { /********** ASSET_PARTICLES **********/ -typedef enum { +typedef enum AssetParticlesEnum { ASSET_PARTICLES_0, ASSET_PARTICLES_1, ASSET_PARTICLES_2, @@ -4738,7 +4738,7 @@ typedef enum { /********** ASSET_PARTICLE_BEHAVIORS **********/ -typedef enum { +typedef enum AssetParticleBehaviorsEnum { ASSET_PARTICLE_BEHAVIORS_0, ASSET_PARTICLE_BEHAVIORS_1, ASSET_PARTICLE_BEHAVIORS_2, @@ -4818,7 +4818,7 @@ typedef enum { /********** ASSET_FONTS **********/ -typedef enum { +typedef enum AssetFontsEnum { ASSET_FONTS_FUNFONT, ASSET_FONTS_SMALLFONT, ASSET_FONTS_BIGFONT, @@ -4827,7 +4827,7 @@ typedef enum { /********** ASSET_TTGHOSTS **********/ -typedef enum { +typedef enum AssetTtghostsEnum { ASSET_TTGHOSTS_FOSSILCANYON, ASSET_TTGHOSTS_PIRATELAGOON, ASSET_TTGHOSTS_ANCIENTLAKE, @@ -4850,4 +4850,4 @@ typedef enum { ASSET_TTGHOSTS_STARCITY } AssetTtghostsEnum; -#endif +#endif diff --git a/mods/assets/examples/ComicFansFont/asset_textures_2d.meta.json b/mods/assets/examples/ComicFansFont/asset_textures_2d.meta.json index 110f60c5..040e40ec 100644 --- a/mods/assets/examples/ComicFansFont/asset_textures_2d.meta.json +++ b/mods/assets/examples/ComicFansFont/asset_textures_2d.meta.json @@ -5,7 +5,7 @@ ], "sections": { "ASSET_TEX2D_COMICFANS": { - "filename": "comicfans.json" + "filename": "font/comicfans/comicfans.json" } } } diff --git a/src/objects.c b/src/objects.c index 24a255d4..4850769e 100644 --- a/src/objects.c +++ b/src/objects.c @@ -681,7 +681,7 @@ ObjectHeader *load_object_header(s32 index) { size = gAssetsObjectHeadersTable[index + 1] - assetOffset; address = allocate_from_pool_containing_slots((MemoryPoolSlot *) gObjectMemoryPool, size); if (address != NULL) { - load_asset_to_address(ASSET_OBJECT_HEADERS, (u32) address, assetOffset, size); + load_asset_to_address(ASSET_OBJECTS, (u32) address, assetOffset, size); address->unk24 = (ObjectHeader24 *) ((uintptr_t) address + (uintptr_t) address->unk24); address->objectParticles = (ObjHeaderParticleEntry *) ((uintptr_t) address + (uintptr_t) address->objectParticles); diff --git a/src/racer.c b/src/racer.c index f1f9bd13..f64fe8ea 100644 --- a/src/racer.c +++ b/src/racer.c @@ -6101,7 +6101,7 @@ void update_AI_racer(Object *obj, Object_Racer *racer, s32 updateRate, f32 updat racer->unk88 -= racer->unk88 * 0.0625 * updateRateF; } gCurrentRacerHandlingStat = 1; - gCurrentRacerMiscAssetPtr = (f32 *) get_misc_asset(ASSET_MISC_RACERSTATS_UNKNOWN0); + gCurrentRacerMiscAssetPtr = (f32 *) get_misc_asset(ASSET_MISC_RACERACCELERATION_UNKNOWN0); D_8011D568 = (f32 *) get_misc_asset(obj->segment.header->unk5D); if ((obj->segment.y_velocity < 4.0) && ((racer->groundedWheels >= 3) || (racer->buoyancy != 0.0))) { racer->unk1F1 = 0; @@ -6327,7 +6327,7 @@ void func_8005B818(Object *obj, Object_Racer *racer, s32 updateRate, f32 updateR CheckpointNode *checkpoint; s32 i; - gCurrentRacerMiscAssetPtr = get_misc_asset(ASSET_MISC_RACERSTATS_UNKNOWN0); + gCurrentRacerMiscAssetPtr = get_misc_asset(ASSET_MISC_RACERACCELERATION_UNKNOWN0); levelHeader = get_current_level_header(); sp11C = get_checkpoint_count(); if (sp11C != 0) { diff --git a/src/vehicle_tricky.c b/src/vehicle_tricky.c index eb72a489..c6824c6e 100644 --- a/src/vehicle_tricky.c +++ b/src/vehicle_tricky.c @@ -356,7 +356,7 @@ void func_8005CB68(Object_Racer *racer, s8 *arg1) { } if (worldBit != 0) { push_level_property_stack(SPECIAL_MAP_ID_NO_LEVEL, 0, VEHICLE_CAR, 0); - push_level_property_stack(ASSET_LEVELNAME_WIZPIGAMULETSEQUENCE, 0, -1, + push_level_property_stack(ASSET_LEVEL_WIZPIGAMULETSEQUENCE_NAME, 0, -1, settings->wizpigAmulet - 1); push_level_property_stack(i, 6, -1, 6); } else { diff --git a/tools/dkr_assets_tool_src/_build/dkr_assets_tool_src/builder/buildTypes/buildFonts.o b/tools/dkr_assets_tool_src/_build/dkr_assets_tool_src/builder/buildTypes/buildFonts.o index 05bf79a7..0eb95fe9 100644 Binary files a/tools/dkr_assets_tool_src/_build/dkr_assets_tool_src/builder/buildTypes/buildFonts.o and b/tools/dkr_assets_tool_src/_build/dkr_assets_tool_src/builder/buildTypes/buildFonts.o differ diff --git a/tools/dkr_assets_tool_src/_build/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.o b/tools/dkr_assets_tool_src/_build/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.o index 7f6ec48e..196d7d1a 100644 Binary files a/tools/dkr_assets_tool_src/_build/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.o and b/tools/dkr_assets_tool_src/_build/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.o differ diff --git a/tools/dkr_assets_tool_src/builder/buildTypes/buildFonts.cpp b/tools/dkr_assets_tool_src/builder/buildTypes/buildFonts.cpp index 8cdfaf2f..d3b40993 100644 --- a/tools/dkr_assets_tool_src/builder/buildTypes/buildFonts.cpp +++ b/tools/dkr_assets_tool_src/builder/buildTypes/buildFonts.cpp @@ -59,7 +59,8 @@ BuildFonts::BuildFonts(DkrAssetsSettings &settings, BuildInfo &info) : _settings outFontFile->textureIndices[texIndex] = fontTextureIndex; } - std::string encodingType = fontJson->get_string("/encoding/type"); + // Assume ASCII by default. + std::string encodingType = fontJson->get_string("/encoding/type", "ASCII"); StringHelper::make_uppercase(encodingType); // Make sure string is uppercase. @@ -71,8 +72,6 @@ BuildFonts::BuildFonts(DkrAssetsSettings &settings, BuildInfo &info) : _settings } } - DebugHelper::info(info.dstPath); - FileHelper::write_binary_file(rawData, rawDataSize, _info.dstPath, true); delete rawData; diff --git a/tools/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.cpp b/tools/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.cpp index 98d4cd74..23db4c1f 100644 --- a/tools/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.cpp +++ b/tools/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.cpp @@ -5,7 +5,7 @@ #include "helpers/c/cEnumsHelper.h" AssetEnums::AssetEnums(DkrAssetsSettings &settings) : _settings(settings) { - _outFilepath = _settings.pathToInclude / "/asset_enums.h"; + _outFilepath = _settings.pathToInclude / "asset_enums.h"; _cHeader.write_comment("This file is automatically generated. Any changes you make to this file will get overwritten."); _cHeader.write_newline(); @@ -43,6 +43,8 @@ void AssetEnums::_write_asset_section_enums() { _cHeader.write_newline(); _cHeader.write_header_comment(sectionId.c_str()); _write_asset_section_enums(sectionId, sectionJson); + } else if(sectionJson->has("/filename")) { + _write_single_asset_section_enums(sectionId, sectionJson); } continue; } @@ -68,6 +70,36 @@ void AssetEnums::_write_main_asset_enum(std::vector &mainOrder) { _cHeader.write_raw_text(mainEnum.to_string()); } +void AssetEnums::_write_single_asset_section_enums(const std::string §ionId, JsonFile *sectionJson) { + if(sectionId != "ASSET_FONTS") { + return; // This function is just for the fonts. + } + _cHeader.write_newline(); + _cHeader.write_header_comment(sectionId.c_str()); + + std::string sectionEnumName = StringHelper::upper_snake_case_to_pascal_case(sectionId) + "Enum"; + WriteableCEnum sectionEnum(sectionEnumName); + + fs::path fontSubfolder = sectionJson->get_path("/folder"); + fs::path fontJsonPath = _settings.pathToAssets; + if(!fontSubfolder.empty()) { + fontJsonPath /= fontSubfolder; + } + fontJsonPath /= sectionJson->get_string("/filename"); + JsonFile *fontsJson; + DebugHelper::assert(JsonHelper::get().get_file(fontJsonPath, &fontsJson), + "(AssetEnums::_write_single_asset_section_enums) Could not load fonts json!"); + + std::vector fontIds; + fontsJson->get_array("/fonts-order", fontIds); + for(std::string &fontId : fontIds) { + sectionEnum.add_symbol(fontId); + } + + _cHeader.write_raw_text(sectionEnum.to_string()); +} + + void AssetEnums::_write_asset_section_enums(const std::string §ionId, JsonFile *sectionJson) { std::string sectionEnumName = StringHelper::upper_snake_case_to_pascal_case(sectionId) + "Enum"; WriteableCEnum sectionEnum(sectionEnumName); @@ -80,6 +112,20 @@ void AssetEnums::_write_asset_section_enums(const std::string §ionId, JsonFi } _cHeader.write_raw_text(sectionEnum.to_string()); + + if(sectionId == "ASSET_MENU_TEXT") { + std::string menuTextIdsEnumName = StringHelper::upper_snake_case_to_pascal_case(sectionId) + "IdsEnum"; + WriteableCEnum menuTextIdsEnum(menuTextIdsEnumName); + + std::vector menuTextIds; + sectionJson->get_array("/menu-text-build-ids", menuTextIds); + for(std::string &textId : menuTextIds) { + menuTextIdsEnum.add_symbol(textId); + } + + _cHeader.write_newline(); + _cHeader.write_raw_text(menuTextIdsEnum.to_string()); + } } void AssetEnums::_write_deferred_asset_section_enums(const std::string §ionId, JsonFile *mainJson, const std::string &deferInfoPtr) { diff --git a/tools/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.h b/tools/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.h index d0165a4a..f55d5831 100644 --- a/tools/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.h +++ b/tools/dkr_assets_tool_src/prebuild/makeIncludes/assetEnums.h @@ -19,6 +19,7 @@ private: void _write_asset_section_enums(); void _write_main_asset_enum(std::vector &mainOrder); + void _write_single_asset_section_enums(const std::string §ionId, JsonFile *sectionJson); void _write_asset_section_enums(const std::string §ionId, JsonFile *sectionJson); void _write_deferred_asset_section_enums(const std::string §ionId, JsonFile *mainJson,