Add names to all typedef'd structs, unions, and enums (#2028)

* Add names to all typedef'd structs, unions, and enums

* wtf vs code

* Use a better regex

src/audio/general.c

@@ -3,7 +3,7 @@
 
 #define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
 
-typedef struct {
+typedef struct SfxPlayerState {
     /* 0x0 */ f32 vol;
     /* 0x4 */ f32 freqScale;
     /* 0x8 */ s8 reverb;
@@ -13,7 +13,7 @@ typedef struct {
     /* 0xC */ u8 combFilterGain;
 } SfxPlayerState;
 
-typedef enum {
+typedef enum SfxChannelIndex {
     /* 0x0 */ SFX_CHANNEL_PLAYER0, // SfxPlayerBank
     /* 0x1 */ SFX_CHANNEL_PLAYER1,
     /* 0x2 */ SFX_CHANNEL_PLAYER2,
@@ -32,20 +32,20 @@ typedef enum {
     /* 0xF */ SFX_CHANNEL_VOICE1
 } SfxChannelIndex; // playerIdx = 2
 
-typedef struct {
+typedef struct FreqLerp {
     /* 0x0 */ f32 value;
     /* 0x4 */ f32 target;
     /* 0x8 */ f32 step;
     /* 0xC */ s32 remainingFrames;
 } FreqLerp;
 
-typedef struct {
+typedef struct NatureAmbienceDataIO {
     /* 0x0 */ u16 playerIO;
     /* 0x2 */ u16 channelMask;
     /* 0x4 */ u8 channelIO[3 * 33 + 1];
 } NatureAmbienceDataIO; // size = 0x68
 
-typedef enum {
+typedef enum AudioDebugPage {
     /* 0x0 */ PAGE_NON,
     /* 0x1 */ PAGE_SOUND_CONTROL,
     /* 0x2 */ PAGE_SPEC_INFO, // unused
@@ -66,7 +66,7 @@ typedef enum {
 
 #define SCROLL_PRINT_BUF_SIZE 25
 
-typedef struct {
+typedef struct OcarinaStick {
     s8 x;
     s8 y;
 } OcarinaStick;

src/audio/lib/heap.c

@@ -1345,7 +1345,7 @@ void AudioHeap_DiscardSampleCaches(void) {
     }
 }
 
-typedef struct {
+typedef struct StorageChange {
     u32 oldAddr;
     u32 newAddr;
     u32 size;

src/audio/lib/load.c

@@ -7,14 +7,14 @@
 #define ASYNC_ID(v) ((u8)(v >> 8))
 #define ASYNC_LOAD_STATUS(v) ((u8)(v >> 0))
 
-typedef enum {
+typedef enum SlowLoadState {
     /* 0 */ SLOW_LOAD_STATE_WAITING,
     /* 1 */ SLOW_LOAD_STATE_START,
     /* 2 */ SLOW_LOAD_STATE_LOADING,
     /* 3 */ SLOW_LOAD_STATE_DONE
 } SlowLoadState;
 
-typedef struct {
+typedef struct SampleBankRelocInfo {
     /* 0x00 */ s32 sampleBankId1;
     /* 0x04 */ s32 sampleBankId2;
     /* 0x08 */ s32 baseAddr1;

src/audio/lib/seqplayer.c

@@ -21,7 +21,7 @@
 
 #define PROCESS_SCRIPT_END -1
 
-typedef enum {
+typedef enum PortamentoMode {
     /* 0 */ PORTAMENTO_MODE_OFF,
     /* 1 */ PORTAMENTO_MODE_1,
     /* 2 */ PORTAMENTO_MODE_2,

src/audio/lib/synthesis.c

@@ -14,7 +14,7 @@
 #define DMEM_WET_LEFT_CH 0xC80
 #define DMEM_WET_RIGHT_CH 0xE20 // = DMEM_WET_LEFT_CH + DMEM_1CH_SIZE
 
-typedef enum {
+typedef enum HaasEffectDelaySide {
     /* 0 */ HAAS_EFFECT_DELAY_NONE,
     /* 1 */ HAAS_EFFECT_DELAY_LEFT, // Delay left channel so that right channel is heard first
     /* 2 */ HAAS_EFFECT_DELAY_RIGHT // Delay right channel so that left channel is heard first

src/audio/sequence.c

@@ -26,7 +26,7 @@
     Audio_ProcessSeqCmd((SEQCMD_OP_SET_SEQPLAYER_VOLUME << 28) | ((u8)(seqPlayerIndex) << 24) | \
                         ((u8)(duration) << 16) | ((u8)((volume)*127.0f)));
 
-typedef struct {
+typedef struct SeqRequest {
     /* 0x0 */ u8 seqId;
     /* 0x1 */ u8 priority; // higher values have higher priority
 } SeqRequest;              // size = 0x2

src/audio/sfx.c

@@ -2,7 +2,7 @@
 #include "global.h"
 #include "terminal.h"
 
-typedef struct {
+typedef struct SfxRequest {
     /* 0x00 */ u16 sfxId;
     /* 0x04 */ Vec3f* pos;
     /* 0x08 */ u8 token;
@@ -11,7 +11,7 @@ typedef struct {
     /* 0x14 */ s8* reverbAdd;
 } SfxRequest; // size = 0x18
 
-typedef struct {
+typedef struct UnusedBankLerp {
     /* 0x00 */ f32 value;
     /* 0x04 */ f32 target;
     /* 0x08 */ f32 step;

src/code/fault.c

@@ -85,7 +85,7 @@ STACK(sFaultStack, 0x600);
 StackEntry sFaultThreadInfo;
 FaultMgr gFaultMgr;
 
-typedef struct {
+typedef struct FaultClientTask {
     /* 0x00 */ s32 (*callback)(void*, void*);
     /* 0x04 */ void* arg0;
     /* 0x08 */ void* arg1;

src/code/fault_drawer.c

@@ -7,7 +7,7 @@
 #include "global.h"
 #include "terminal.h"
 
-typedef struct {
+typedef struct FaultDrawer {
     /* 0x00 */ u16* fb;
     /* 0x04 */ u16 w;
     /* 0x06 */ u16 h;

src/code/flg_set.c

@@ -1,6 +1,6 @@
 #include "global.h"
 
-typedef struct {
+typedef struct FlagSetEntry {
     /* 0x00 */ u16* value;
     /* 0x04 */ const char* name;
 } FlagSetEntry; // size = 0x08

src/code/shrink_window.c

@@ -1,6 +1,6 @@
 #include "global.h"
 
-typedef enum {
+typedef enum LetterboxState {
     /* 0 */ LETTERBOX_STATE_IDLE,
     /* 1 */ LETTERBOX_STATE_GROWING,
     /* 2 */ LETTERBOX_STATE_SHRINKING

src/code/speed_meter.c

@@ -56,7 +56,7 @@ volatile OSTime D_8016A578;
 // Accumulator for `gRDPTimeTotal`
 volatile OSTime gRDPTimeAcc;
 
-typedef struct {
+typedef struct SpeedMeterTimeEntry {
     /* 0x00 */ volatile OSTime* time;
     /* 0x04 */ u8 x;
     /* 0x05 */ u8 y;
@@ -74,7 +74,7 @@ SpeedMeterTimeEntry sSpeedMeterTimeEntryArray[] = {
     { &gGraphUpdatePeriod, 0, 10, GPACK_RGBA5551(255, 0, 255, 1) },
 };
 
-typedef struct {
+typedef struct SpeedMeterAllocEntry {
     /* 0x00 */ s32 maxval;
     /* 0x04 */ s32 val;
     /* 0x08 */ u16 backColor;

src/code/ucode_disas.c

@@ -1,28 +1,28 @@
 #include "global.h"
 
-typedef struct {
+typedef struct F3dzexConst {
     /* 0x00 */ u32 value;
     /* 0x04 */ const char* name;
 } F3dzexConst; // size = 0x8
 
-typedef struct {
+typedef struct F3dzexFlag {
     /* 0x00 */ u32 value;
     /* 0x04 */ const char* setName;
     /* 0x08 */ const char* unsetName;
 } F3dzexFlag; // size = 0x0C
 
-typedef struct {
+typedef struct F3dzexRenderMode {
     /* 0x00 */ const char* name;
     /* 0x04 */ u32 value;
     /* 0x08 */ u32 mask;
 } F3dzexRenderMode; // size = 0x0C
 
-typedef struct {
+typedef struct F3dzexSetModeMacroValue {
     /* 0x00 */ const char* name;
     /* 0x04 */ u32 value;
 } F3dzexSetModeMacroValue; // size = 0x8
 
-typedef struct {
+typedef struct F3dzexSetModeMacro {
     /* 0x00 */ const char* name;
     /* 0x04 */ u32 shift;
     /* 0x08 */ u32 len;
@@ -69,7 +69,7 @@ F3dzexFlag sUCodeDisasMtxFlags[] = {
     F3DZEX_FLAG(G_MTX_PUSH, G_MTX_NOPUSH),
 };
 
-typedef enum {
+typedef enum CombinerArg {
     COMBINER_A = 1,
     COMBINER_B,
     COMBINER_C,

src/code/z_actor.c

@@ -235,7 +235,7 @@ void Actor_ProjectPos(PlayState* play, Vec3f* src, Vec3f* xyzDest, f32* cappedIn
     *cappedInvWDest = (*cappedInvWDest < 1.0f) ? 1.0f : (1.0f / *cappedInvWDest);
 }
 
-typedef struct {
+typedef struct NaviColor {
     /* 0x00 */ Color_RGBA8 inner;
     /* 0x04 */ Color_RGBA8 outer;
 } NaviColor; // size = 0x8
@@ -1540,7 +1540,7 @@ f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2) {
     return actor->xyzDistToPlayerSq;
 }
 
-typedef struct {
+typedef struct TargetRangeParams {
     /* 0x0 */ f32 rangeSq;
     /* 0x4 */ f32 leashScale;
 } TargetRangeParams; // size = 0x8
@@ -3745,7 +3745,7 @@ f32 Rand_CenteredFloat(f32 f) {
     return (Rand_ZeroOne() - 0.5f) * f;
 }
 
-typedef struct {
+typedef struct DoorLockInfo {
     /* 0x00 */ f32 chainAngle;
     /* 0x04 */ f32 chainLength;
     /* 0x08 */ f32 yShift;
@@ -3900,7 +3900,7 @@ s32 Npc_UpdateTalking(PlayState* play, Actor* actor, s16* talkState, f32 interac
     return false;
 }
 
-typedef struct {
+typedef struct NpcTrackingRotLimits {
     /* 0x00 */ s16 maxHeadYaw;
     /* 0x02 */ s16 minHeadPitch;
     /* 0x04 */ s16 maxHeadPitch;
@@ -3910,7 +3910,7 @@ typedef struct {
     /* 0x0C */ u8 rotateYaw;
 } NpcTrackingRotLimits; // size = 0x10
 
-typedef struct {
+typedef struct NpcTrackingParams {
     /* 0x00 */ NpcTrackingRotLimits rotLimits;
     // Fields specific to NPC_TRACKING_PLAYER_AUTO_TURN mode
     /* 0x10 */ f32 autoTurnDistanceRange;   // Max distance to player to enable tracking and auto-turn

src/code/z_bgcheck.c

@@ -1484,7 +1484,7 @@ s32 BgCheck_IsSpotScene(PlayState* play) {
     return false;
 }
 
-typedef struct {
+typedef struct BgCheckSceneMemEntry {
     s16 sceneId;
     u32 memSize;
 } BgCheckSceneMemEntry;
@@ -1523,7 +1523,7 @@ void BgCheck_SetSubdivisionDimension(f32 min, s32 subdivAmount, f32* max, f32* s
     *max = *subdivLength * subdivAmount + min;
 }
 
-typedef struct {
+typedef struct BgCheckSceneSubdivisionEntry {
     s16 sceneId;
     Vec3s subdivAmount;
     s32 nodeListMax; // if -1, dynamically compute max nodes

src/code/z_camera.c

@@ -7041,7 +7041,7 @@ s32 Camera_Special5(Camera* camera) {
     return true;
 }
 
-typedef enum {
+typedef enum CamElevatorPlatform {
     /* 0 */ CAM_ELEVATOR_PLATFORM_FIRE_TEMPLE_LOWER_FLOOR, // ACTOR_BG_HIDAN_ROCK
     /* 1 */ CAM_ELEVATOR_PLATFORM_FIRE_TEMPLE_EAST_TOWER,  // ACTOR_BG_HIDAN_FSLIFT
     /* 2 */ CAM_ELEVATOR_PLATFORM_FIRE_TEMPLE_WEST_TOWER,  // ACTOR_BG_HIDAN_SYOKU

src/code/z_camera_data.inc.c

@@ -1,18 +1,18 @@
 #include "ultra64.h"
 #include "global.h"
 
-typedef struct {
+typedef struct CameraModeValue {
     s16 val;
     s16 dataType;
 } CameraModeValue;
 
-typedef struct {
+typedef struct CameraMode {
     s16 funcIdx;
     s16 valueCnt;
     CameraModeValue* values;
 } CameraMode;
 
-typedef struct {
+typedef struct CameraSetting {
     union {
         u32 unk_00;
         struct {

src/code/z_collision_check.c

@@ -1602,12 +1602,12 @@ s32 CollisionCheck_SwordHitAudio(Collider* atCol, ColliderElement* acElem) {
     return true;
 }
 
-typedef struct {
+typedef struct HitInfo {
     /* 0x0 */ u8 blood;
     /* 0x1 */ u8 effect;
 } HitInfo; // size = 0x2
 
-typedef enum {
+typedef enum ColChkBloodType {
     /* 0 */ BLOOD_NONE,
     /* 1 */ BLOOD_BLUE,
     /* 2 */ BLOOD_GREEN,
@@ -1616,7 +1616,7 @@ typedef enum {
     /* 5 */ BLOOD_RED2
 } ColChkBloodType;
 
-typedef enum {
+typedef enum ColChkHitType {
     /* 0 */ HIT_WHITE,
     /* 1 */ HIT_DUST,
     /* 2 */ HIT_RED,
@@ -2687,7 +2687,7 @@ void CollisionCheck_AT(PlayState* play, CollisionCheckContext* colChkCtx) {
     CollisionCheck_SetHitEffects(play, colChkCtx);
 }
 
-typedef enum {
+typedef enum ColChkMassType {
     /* 0 */ MASSTYPE_IMMOVABLE,
     /* 1 */ MASSTYPE_HEAVY,
     /* 2 */ MASSTYPE_NORMAL

src/code/z_debug.c

@@ -1,13 +1,13 @@
 #include "global.h"
 
-typedef struct {
+typedef struct DebugCamTextBufferEntry {
     /* 0x0 */ u8 x;
     /* 0x1 */ u8 y;
     /* 0x2 */ u8 colorIndex;
     /* 0x3 */ char text[21];
 } DebugCamTextBufferEntry; // size = 0x18
 
-typedef struct {
+typedef struct InputCombo {
     /* 0x0 */ u16 hold;
     /* 0x2 */ u16 press;
 } InputCombo; // size = 0x4

src/code/z_debug_display.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
-typedef struct {
+typedef struct DebugDispObjectInfo {
     /* 0x00 */ s16 drawType;  // indicates which draw function to use when displaying the object
     /* 0x04 */ void* drawArg; // segment address (display list or texture) passed to the draw function when called
 } DebugDispObjectInfo;        // size = 0x8

src/code/z_demo.c

@@ -59,7 +59,7 @@ CutsceneHandler sScriptedCutsceneHandlers[] = {
     CutsceneHandler_RunScript,   // CS_STATE_RUN_UNSTOPPABLE
 };
 
-typedef enum {
+typedef enum TitleDemoDestination {
     /* 0 */ TITLE_DEMO_SPIRIT_TEMPLE,
     /* 1 */ TITLE_DEMO_DEATH_MOUNTAIN_CRATER,
     /* 2 */ TITLE_DEMO_GANONDORF_HORSE
@@ -67,7 +67,7 @@ typedef enum {
 
 u8 sTitleDemoDestination = TITLE_DEMO_SPIRIT_TEMPLE;
 
-typedef struct {
+typedef struct EntranceCutscene {
     /* 0x00 */ u16 entrance;      // entrance index upon which the cutscene should trigger
     /* 0x02 */ u8 ageRestriction; // 0 for adult only, 1 for child only, 2 for both ages
     /* 0x03 */ u8 flag;           // eventChkInf flag bound to the entrance cutscene

src/code/z_draw.c

@@ -106,7 +106,7 @@ void GetItem_DrawScale(PlayState* play, s16 drawId);
 void GetItem_DrawBulletBag(PlayState* play, s16 drawId);
 void GetItem_DrawWallet(PlayState* play, s16 drawId);
 
-typedef struct {
+typedef struct DrawItemTableEntry {
     /* 0x00 */ void (*drawFunc)(PlayState*, s16);
     /* 0x04 */ Gfx* dlists[8];
 } DrawItemTableEntry; // size = 0x24

src/code/z_fbdemo_circle.c

@@ -1,6 +1,6 @@
 #include "global.h"
 
-typedef enum {
+typedef enum TransitionCircleDirection {
     /* 0 */ TRANS_CIRCLE_DIR_IN,
     /* 1 */ TRANS_CIRCLE_DIR_OUT
 } TransitionCircleDirection;

src/code/z_fbdemo_fade.c

@@ -1,12 +1,12 @@
 #include "global.h"
 #include "terminal.h"
 
-typedef enum {
+typedef enum TransitionFadeDirection {
     /* 0 */ TRANS_FADE_DIR_IN,
     /* 1 */ TRANS_FADE_DIR_OUT
 } TransitionFadeDirection;
 
-typedef enum {
+typedef enum TransitionFadeType {
     /* 0 */ TRANS_FADE_TYPE_NONE,
     /* 1 */ TRANS_FADE_TYPE_ONE_WAY,
     /* 2 */ TRANS_FADE_TYPE_FLASH

src/code/z_fbdemo_wipe1.c

@@ -1,6 +1,6 @@
 #include "global.h"
 
-typedef enum {
+typedef enum TransitionWipeDirection {
     /* 0 */ TRANS_WIPE_DIR_IN,
     /* 1 */ TRANS_WIPE_DIR_OUT
 } TransitionWipeDirection;

src/code/z_fcurve_data_skelanime.c

@@ -77,7 +77,7 @@ void SkelCurve_SetAnim(SkelCurve* skelCurve, CurveAnimationHeader* animation, f3
     skelCurve->animation = animation;
 }
 
-typedef enum {
+typedef enum SkelCurveVecType {
     /* 0 */ SKELCURVE_VEC_TYPE_SCALE,
     /* 1 */ SKELCURVE_VEC_TYPE_ROTATION,
     /* 2 */ SKELCURVE_VEC_TYPE_POSIITON,

src/code/z_horse.c

@@ -34,7 +34,7 @@ void func_8006D0AC(PlayState* play) {
     }
 }
 
-typedef struct {
+typedef struct HorseSpawn {
     /* 0x00 */ s16 sceneId;
     /* 0x02 */ Vec3s pos;
     /* 0x08 */ s16 angle;
@@ -121,7 +121,7 @@ void func_8006D0EC(PlayState* play, Player* player) {
     }
 }
 
-typedef struct {
+typedef struct struct_8011F9B8 {
     /* 0x00 */ s16 sceneId;
     /* 0x04 */ s32 cutsceneIndex;
     /* 0x08 */ Vec3s pos;

src/code/z_kankyo.c

@@ -9,14 +9,14 @@
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128"
 
-typedef enum {
+typedef enum LightningBoltState {
     /* 0x00 */ LIGHTNING_BOLT_START,
     /* 0x01 */ LIGHTNING_BOLT_WAIT,
     /* 0x02 */ LIGHTNING_BOLT_DRAW,
     /* 0xFF */ LIGHTNING_BOLT_INACTIVE = 0xFF
 } LightningBoltState;
 
-typedef struct {
+typedef struct ZBufValConversionEntry {
     /* 0x00 */ s32 mantissaShift; // shift applied to the mantissa of the z buffer value
     /* 0x04 */ s32 base;          // 15.3 fixed-point base value for the exponent
 } ZBufValConversionEntry;         // size = 0x8
@@ -41,7 +41,7 @@ u16 gTimeSpeed = 0;
 
 u16 sSunScreenDepth = GPACK_ZDZ(G_MAXFBZ, 0);
 
-typedef struct {
+typedef struct TimeBasedLightEntry {
     /* 0x00 */ u16 startTime;
     /* 0x02 */ u16 endTime;
     /* 0x04 */ u8 lightSetting;
@@ -193,7 +193,7 @@ s16 gLensFlareScale;
 f32 gLensFlareColorIntensity;
 s16 gLensFlareGlareStrength;
 
-typedef struct {
+typedef struct LightningBolt {
     /* 0x00 */ u8 state;
     /* 0x04 */ Vec3f offset;
     /* 0x10 */ Vec3f pos;
@@ -1485,7 +1485,7 @@ void Environment_DrawSunLensFlare(PlayState* play, EnvironmentContext* envCtx, V
 
 f32 sLensFlareScales[] = { 23.0f, 12.0f, 7.0f, 5.0f, 3.0f, 10.0f, 6.0f, 2.0f, 3.0f, 1.0f };
 
-typedef enum {
+typedef enum LensFlareType {
     /* 0 */ LENS_FLARE_CIRCLE0,
     /* 1 */ LENS_FLARE_CIRCLE1,
     /* 2 */ LENS_FLARE_RING

src/code/z_lights.c

@@ -3,7 +3,7 @@
 
 #define LIGHTS_BUFFER_SIZE 32
 
-typedef struct {
+typedef struct LightsBuffer {
     /* 0x000 */ s32 numOccupied;
     /* 0x004 */ s32 searchIndex;
     /* 0x008 */ LightNode buf[LIGHTS_BUFFER_SIZE];

src/code/z_map_mark.c

@@ -2,7 +2,7 @@
 #include "terminal.h"
 #include "assets/textures/parameter_static/parameter_static.h"
 
-typedef struct {
+typedef struct MapMarkInfo {
     /* 0x00 */ void* texture;
     /* 0x04 */ u32 imageFormat;
     /* 0x08 */ u32 imageSize;
@@ -14,7 +14,7 @@ typedef struct {
     /* 0x20 */ u32 dtdy;
 } MapMarkInfo; // size = 0x24
 
-typedef struct {
+typedef struct MapMarkDataOverlay {
     /* 0x00 */ void* loadedRamAddr; // original name: "allocp"
     /* 0x04 */ RomFile file;
     /* 0x0C */ void* vramStart;

src/code/z_parameter.c

@@ -4,7 +4,7 @@
 #include "assets/textures/do_action_static/do_action_static.h"
 #include "assets/textures/icon_item_static/icon_item_static.h"
 
-typedef struct {
+typedef struct RestrictionFlags {
     /* 0x00 */ u8 sceneId;
     /* 0x01 */ u8 flags1;
     /* 0x02 */ u8 flags2;

src/code/z_player_lib.c

@@ -3,7 +3,7 @@
 #include "assets/objects/object_link_boy/object_link_boy.h"
 #include "assets/objects/object_link_child/object_link_child.h"
 
-typedef struct {
+typedef struct BowSlingshotStringData {
     /* 0x00 */ Gfx* dList;
     /* 0x04 */ Vec3f pos;
 } BowSlingshotStringData; // size = 0x10
@@ -90,7 +90,7 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
     PLAYER_MODELGROUP_DEFAULT,          // PLAYER_IA_LENS_OF_TRUTH
 };
 
-typedef struct {
+typedef struct EnvHazardTextTriggerEntry {
     /* 0x0 */ u8 flag;
     /* 0x2 */ u16 textId;
 } EnvHazardTextTriggerEntry; // size = 0x4

src/code/z_quake.c

@@ -2,7 +2,7 @@
 #include "quake.h"
 #include "terminal.h"
 
-typedef struct {
+typedef struct QuakeRequest {
     /* 0x00 */ s16 index;
     /* 0x02 */ s16 duration;
     /* 0x04 */ Camera* cam;

src/code/z_room.c

@@ -69,7 +69,7 @@ void Room_DrawNormal(PlayState* play, Room* room, u32 flags) {
     CLOSE_DISPS(play->state.gfxCtx, "../z_room.c", 239);
 }
 
-typedef enum {
+typedef enum RoomCullableDebugMode {
     /* 0 */ ROOM_CULL_DEBUG_MODE_OFF,
     /* 1 */ ROOM_CULL_DEBUG_MODE_UP_TO_TARGET,
     /* 2 */ ROOM_CULL_DEBUG_MODE_ONLY_TARGET

src/code/z_ss_sram.c

@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "global.h"
 
-typedef struct {
+typedef struct SsSramContext {
     /* 0x00 */ OSPiHandle piHandle;
     /* 0x74 */ OSIoMesg ioMesg;
     /* 0x8C */ OSMesgQueue msgQueue;

src/code/z_vr_box.c

@@ -2,7 +2,7 @@
 #include "terminal.h"
 #include "z64environment.h"
 
-typedef struct {
+typedef struct SkyboxFaceParams {
     /* 0x000 */ s32 xStart;
     /* 0x004 */ s32 yStart;
     /* 0x008 */ s32 zStart;

src/libultra/os/initialize.c

@@ -1,6 +1,6 @@
 #include "global.h"
 
-typedef struct {
+typedef struct __osExceptionVector {
     u32 inst1; // lui     $k0, %hi(__osException)
     u32 inst2; // addiu   $k0, $k0, %lo(__osException)
     u32 inst3; // jr      $k0

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

@@ -10,12 +10,12 @@
 
 #define FLAGS ACTOR_FLAG_4
 
-typedef enum {
+typedef enum BgBdanObjectsPropertyGetter {
     JABU_OBJECTS_GET_PROP_CAM_SETTING_NORMAL0 = 0,
     JABU_OBJECTS_GET_PROP_CAM_SETTING_DUNGEON1 = 3,
     JABU_OBJECTS_GET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE = 4
 } BgBdanObjectsPropertyGetter;
-typedef enum {
+typedef enum BgBdanObjectsPropertySetter {
     JABU_OBJECTS_SET_PROP_CAM_SETTING_NORMAL1 = 1,
     JABU_OBJECTS_SET_PROP_CAM_SETTING_DUNGEON0 = 2,
     JABU_OBJECTS_SET_PROP_WATCHED_BIGOCTO_INTRO_CUTSCENE = 4

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h

@@ -6,7 +6,7 @@
 
 struct BgBdanObjects;
 
-typedef enum {
+typedef enum BgBdanObjectsType {
     JABU_OBJECTS_TYPE_BIG_OCTO_PLATFORM,
     JABU_OBJECTS_TYPE_SMALL_AUTO_ELEVATOR,
     JABU_OBJECTS_TYPE_WATERBOX_HEIGHT_CHANGER,

src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h

@@ -5,7 +5,7 @@
 #include "global.h"
 
 // BgBdanSwitch.actor.params & 0xFF
-typedef enum {
+typedef enum BgBdanSwitchType {
     /* 0x00 */ BLUE,
     /* 0x01 */ YELLOW_HEAVY,
     /* 0x02 */ YELLOW,

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

@@ -11,7 +11,7 @@
 
 #define FLAGS ACTOR_FLAG_4
 
-typedef struct {
+typedef struct BombableWallInfo {
     /* 0x00 */ CollisionHeader* colHeader;
     /* 0x04 */ Gfx* dList;
     /* 0x08 */ s8 colType;

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h

@@ -17,7 +17,7 @@ typedef struct BgBreakwall {
     /* 0x01EC */ BgBreakwallActionFunc actionFunc;
 } BgBreakwall; // size = 0x01F0
 
-typedef enum {
+typedef enum BombableWallType {
     /* 0 */ BWALL_DC_ENTRANCE,  // When exploded it will play the Dodongo's Cavern intro cutscene
     /* 1 */ BWALL_WALL,         // Used a lot in Dodongo's Cavern and other places
     /* 2 */ BWALL_KD_FLOOR,     // Used in the King Dodongo boss room

src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c

@@ -33,7 +33,7 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
 };
 
-typedef enum {
+typedef enum BgDdanJdState {
     /* 0 */ STATE_GO_BOTTOM,
     /* 1 */ STATE_GO_MIDDLE_FROM_BOTTOM,
     /* 2 */ STATE_GO_MIDDLE_FROM_TOP,

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h

@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"
 
-typedef enum {
+typedef enum BgDodoagoEye {
     /* 0 */ BGDODOAGO_EYE_LEFT,
     /* 1 */ BGDODOAGO_EYE_RIGHT
 } BgDodoagoEye;

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

@@ -13,13 +13,13 @@
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25)
 
-typedef enum {
+typedef enum BgDyYoseizoRewardType {
     /* 0 */ FAIRY_UPGRADE_MAGIC,
     /* 1 */ FAIRY_UPGRADE_DOUBLE_MAGIC,
     /* 2 */ FAIRY_UPGRADE_DOUBLE_DEFENSE
 } BgDyYoseizoRewardType;
 
-typedef enum {
+typedef enum BgDyYoseizoSpellType {
     /* 0 */ FAIRY_SPELL_FARORES_WIND,
     /* 1 */ FAIRY_SPELL_DINS_FIRE,
     /* 2 */ FAIRY_SPELL_NAYRUS_LOVE

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h

@@ -12,7 +12,7 @@ typedef void (*BgDyYoseizoActionFunc)(struct BgDyYoseizo*, PlayState*);
 
 #define BG_DY_YOSEIZO_EFFECT_COUNT 200
 
-typedef struct {
+typedef struct BgDyYoseizoEffect {
     /* 0x00 */ u8 alive; // drawn if 1, respawn if 0
     /* 0x04 */ Vec3f pos;
     /* 0x10 */ Vec3f velocity;

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

@@ -10,7 +10,7 @@
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
-typedef enum {
+typedef enum FlashState {
     /* 0x00 */ FLASH_NONE,
     /* 0x01 */ FLASH_GROW,
     /* 0x02 */ FLASH_SHRINK

src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h

@@ -16,7 +16,7 @@ typedef struct BgGndDarkmeiro {
     /* 0x016C */ BgGndDarkmeiroUpdateFunc updateFunc;
 } BgGndDarkmeiro; // size = 0x0170
 
-typedef enum {
+typedef enum DarkmeiroType {
     /* 0 */ DARKMEIRO_INVISIBLE_PATH,   // Textures for the invisible path in shadow trial.
 
     /* 1 */ DARKMEIRO_CLEAR_BLOCK,      /* Clear blocks appear when their switch flag is set and

src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c

@@ -9,7 +9,7 @@
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
-typedef enum {
+typedef enum BgGndIceblockAction {
     /* 0 */ GNDICE_IDLE,
     /* 1 */ GNDICE_FALL,
     /* 2 */ GNDICE_HOLE

src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h

@@ -19,7 +19,7 @@ typedef struct BgHakaGate {
     /* 0x0172 */ s16 actionVar5;
 } BgHakaGate; // size = 0x0174
 
-typedef enum {
+typedef enum BgHakaGateType {
     BGHAKAGATE_STATUE,
     BGHAKAGATE_FLOOR,
     BGHAKAGATE_GATE,

src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

@@ -10,7 +10,7 @@
 
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4)
 
-typedef enum {
+typedef enum SpinningScytheTrapMode {
     /* 0 */ SCYTHE_TRAP_SHADOW_TEMPLE,
     /* 1 */ SCYTHE_TRAP_SHADOW_TEMPLE_INVISIBLE,
     /* 2 */ SCYTHE_TRAP_ICE_CAVERN

src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h

@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"
 
-typedef enum {
+typedef enum HakaTrapType {
     /* 0x00 */ HAKA_TRAP_GUILLOTINE_SLOW,
     /* 0x01 */ HAKA_TRAP_SPIKED_BOX,
     /* 0x02 */ HAKA_TRAP_SPIKED_WALL,

src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c

@@ -10,7 +10,7 @@
 
 #define FLAGS ACTOR_FLAG_4
 
-typedef enum {
+typedef enum ShadowTempleAssetsType {
     /* 0x0 */ STA_GIANT_BIRD_STATUE,
     /* 0x1 */ STA_BOMBABLE_SKULL_WALL,
     /* 0x2 */ STA_BOMBABLE_RUBBLE,

src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h

@@ -16,7 +16,7 @@ typedef struct BgHeavyBlock {
     /* 0x0174 */ BgHeavyBlockActionFunc actionFunc;
 } BgHeavyBlock; // size = 0x0178
 
-typedef enum {
+typedef enum HeavyBlockType {
     /* 0x00 */ HEAVYBLOCK_UNBREAKABLE,
     /* 0x01 */ HEAVYBLOCK_BREAKABLE,
     /* 0x02 */ HEAVYBLOCK_BIG_PIECE,

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

@@ -21,7 +21,7 @@ void BgHidanCurtain_TurnOn(BgHidanCurtain* this, PlayState* play);
 void BgHidanCurtain_TurnOff(BgHidanCurtain* this, PlayState* play);
 void BgHidanCurtain_WaitForTimer(BgHidanCurtain* this, PlayState* play);
 
-typedef struct {
+typedef struct BgHidanCurtainParams {
     /* 0x00 */ s16 radius;
     /* 0x02 */ s16 height;
     /* 0x04 */ f32 scale;

src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c

@@ -11,7 +11,7 @@
 
 #define FLAGS ACTOR_FLAG_4
 
-typedef enum {
+typedef enum HidanFwbigMoveState {
     /* 0 */ FWBIG_MOVE,
     /* 1 */ FWBIG_RESET,
     /* 2 */ FWBIG_KILL

src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

@@ -11,7 +11,7 @@
 
 #define FLAGS 0
 
-typedef enum {
+typedef enum FireTempleBombableObjectsType {
     /* 0 */ CRACKED_STONE_FLOOR,
     /* 1 */ BOMBABLE_WALL,
     /* 2 */ LARGE_BOMBABLE_WALL

src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h

@@ -8,7 +8,7 @@ struct BgIceShelter;
 
 typedef void (*BgIceShelterActionFunc)(struct BgIceShelter*, PlayState*);
 
-typedef enum {
+typedef enum RedIceType {
     /* 0 */ RED_ICE_LARGE,    // Large red ice block
     /* 1 */ RED_ICE_SMALL,    // Small red ice block
     /* 2 */ RED_ICE_PLATFORM, // Complex structure that can be climbed and walked on. Unused in vanilla OoT, used in MQ to cover the Ice Cavern Map chest

src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h

@@ -8,7 +8,7 @@ struct BgIceTurara;
 
 typedef void (*BgIceTuraraActionFunc)(struct BgIceTurara*, PlayState*);
 
-typedef enum {
+typedef enum BgIceTuraraType {
     /* 0 */ TURARA_STALAGMITE,
     /* 1 */ TURARA_STALACTITE,
     /* 2 */ TURARA_STALACTITE_REGROW

src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c

@@ -28,7 +28,7 @@ ActorProfile Bg_Jya_Bigmirror_Profile = {
     /**/ BgJyaBigmirror_Draw,
 };
 
-typedef struct {
+typedef struct BigMirrorDataEntry {
     /* 0x00 */ Vec3f pos;
     /* 0x0C */ s16 params;
     /* 0x0E */ s16 solvedRotY;

src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h

@@ -14,7 +14,7 @@
 
 struct BgJyaBigmirror;
 
-typedef struct {
+typedef struct BigmirrorCobra {
     /* 0x00 */ BgJyaCobra* cobra;
     /* 0x04 */ s16 rotY;
 } BigmirrorCobra; // size = 0x08

src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c

@@ -59,7 +59,7 @@ static ColliderJntSphInit sJntSphInit = {
     sJntSphElementsInit,
 };
 
-typedef struct {
+typedef struct BgJyaMegamiPieceInit {
     /* 0x00 */ Vec3f unk_00;
     /* 0x0C */ f32 velX;
     /* 0x10 */ s16 rotVelX;

src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h

@@ -8,7 +8,7 @@ struct BgJyaMegami;
 
 typedef void (*BgJyaMegamiActionFunc)(struct BgJyaMegami*, PlayState*);
 
-typedef struct {
+typedef struct BgJyaMegamiPiece {
     /* 0x00 */ Vec3f pos;
     /* 0x0C */ Vec3f vel;
     /* 0x18 */ s16 rotVelX;

src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h

@@ -23,7 +23,7 @@ typedef struct BgMizuBwall {
     /* 0x02B8 */ Gfx* dList;
 } BgMizuBwall; // size = 0x02BC
 
-typedef enum {
+typedef enum BgMizuBwallType {
     MIZUBWALL_FLOOR,
     MIZUBWALL_RUTO_ROOM,
     MIZUBWALL_UNUSED,

src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c

@@ -17,7 +17,7 @@ void BgMizuWater_Draw(Actor* thisx, PlayState* play);
 void BgMizuWater_WaitForAction(BgMizuWater* this, PlayState* play);
 void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, PlayState* play);
 
-typedef struct {
+typedef struct WaterLevel {
     s32 switchFlag;
     s32 yDiff;
 } WaterLevel;

src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h

@@ -18,7 +18,7 @@ typedef struct BgMoriHashigo {
     /* 0x01CC */ s8 moriTexObjectSlot;
 } BgMoriHashigo; // size = 0x01D0
 
-typedef enum {
+typedef enum HasigoType {
     /* -1 */ HASHIGO_CLASP = -1,
     /*  0 */ HASHIGO_LADDER
 } HasigoType;

src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c

@@ -10,7 +10,7 @@
 
 #define FLAGS 0
 
-typedef enum {
+typedef enum PoeFlameColor {
     POE_FLAME_PURPLE, // Meg
     POE_FLAME_RED,    // Joelle
     POE_FLAME_BLUE,   // Beth

src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

@@ -9,7 +9,7 @@
 
 #define FLAGS ACTOR_FLAG_4
 
-typedef enum {
+typedef enum WindmillSetpiecesMode {
     /* 0 */ WINDMILL_ROTATING_GEAR,
     /* 1 */ WINDMILL_DAMPE_STONE_DOOR
 } WindmillSetpiecesMode;

src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

@@ -10,7 +10,7 @@
 
 #define FLAGS ACTOR_FLAG_4
 
-typedef enum {
+typedef enum DrawbridgeType {
     /* -1 */ DT_DRAWBRIDGE = -1,
     /*  0 */ DT_CHAIN_1,
     /*  1 */ DT_CHAIN_2

src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h

@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"
 
-typedef enum {
+typedef enum BgSpot03TakiState {
     WATERFALL_CLOSED,
     WATERFALL_OPENING_IDLE,
     WATERFALL_OPENING_ANIMATED,

src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

@@ -9,14 +9,14 @@
 
 #define FLAGS ACTOR_FLAG_9
 
-typedef enum {
+typedef enum LakeHyliaObjectsType {
     /* 0x0 */ LHO_WATER_TEMPLE_ENTRACE_GATE,
     /* 0x1 */ LHO_WATER_TEMPLE_ENTRANCE_LOCK,
     /* 0x2 */ LHO_WATER_PLANE,
     /* 0x3 */ LHO_ICE_BLOCK
 } LakeHyliaObjectsType;
 
-typedef enum {
+typedef enum LakeHyliaWaterBoxIndices {
     /* 0x0 */ LHWB_GERUDO_VALLEY_RIVER_UPPER, // entrance from Gerudo Valley
     /* 0x1 */ LHWB_GERUDO_VALLEY_RIVER_LOWER, // river flowing from Gerudo Valley
     /* 0x2 */ LHWB_MAIN_1,                    // main water box

src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h

@@ -13,7 +13,7 @@ typedef struct BgSstFloor {
     /* 0x0168 */ s16 drumHeight;
 } BgSstFloor; // size = 0x016C
 
-typedef enum {
+typedef enum BgSstFloorParams {
     /* 0 */ BONGOFLOOR_REST,
     /* 1 */ BONGOFLOOR_HIT
 } BgSstFloorParams;

src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h

@@ -6,7 +6,7 @@
 
 struct BgVbSima;
 
-typedef enum {
+typedef enum BgVbSimaSignal {
     /* 0 */ VBSIMA_STAND,
     /* 1 */ VBSIMA_COLLAPSE,
     /* 2 */ VBSIMA_KILL

src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h

@@ -15,7 +15,7 @@ typedef struct BgYdanHasi {
     /* 0x016A */ s16 timer; //Also used as an offset for the water blocks Y position for a "bobbing" effect
 } BgYdanHasi; // size = 0x016C
 
-typedef enum {
+typedef enum HasiType {
     /* 0 */ HASI_WATER_BLOCK,
     /* 1 */ HASI_WATER,
     /* 2 */ HASI_THREE_BLOCKS

src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c

@@ -19,7 +19,7 @@ void BgYdanSp_FloorWebIdle(BgYdanSp* this, PlayState* play);
 void BgYdanSp_BurnWallWeb(BgYdanSp* this, PlayState* play);
 void BgYdanSp_WallWebIdle(BgYdanSp* this, PlayState* play);
 
-typedef enum {
+typedef enum BgYdanSpType {
     /* 0 */ WEB_FLOOR,
     /* 1 */ WEB_WALL
 } BgYdanSpType;

src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h

@@ -10,7 +10,7 @@ typedef void (*BossDodongoActionFunc)(struct BossDodongo*, PlayState*);
 
 #define BOSS_DODONGO_EFFECT_COUNT 80
 
-typedef struct {
+typedef struct BossDodongoEffect {
     /* 0x00 */ Vec3f unk_00;
     /* 0x0C */ Vec3f unk_0C;
     /* 0x18 */ Vec3f unk_18;

src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c

@@ -14,20 +14,20 @@
 
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
-typedef enum {
+typedef enum BossFdIntroFlyState {
     /* 0 */ INTRO_FLY_EMERGE,
     /* 1 */ INTRO_FLY_HOLE,
     /* 2 */ INTRO_FLY_CAMERA,
     /* 3 */ INTRO_FLY_RETRAT
 } BossFdIntroFlyState;
 
-typedef enum {
+typedef enum BossFdManeIndex {
     /* 0 */ MANE_CENTER,
     /* 1 */ MANE_RIGHT,
     /* 2 */ MANE_LEFT
 } BossFdManeIndex;
 
-typedef enum {
+typedef enum BossFdEyeState {
     /* 0 */ EYE_OPEN,
     /* 1 */ EYE_HALF,
     /* 2 */ EYE_CLOSED

src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h

@@ -8,7 +8,7 @@ struct BossFd;
 
 typedef void (*BossFdActionFunc)(struct BossFd*, PlayState*);
 
-typedef enum {
+typedef enum BossFdActionState {
     /*  -1 */ BOSSFD_WAIT_INTRO = -1,
     /*   0 */ BOSSFD_FLY_MAIN,
     /*   1 */ BOSSFD_FLY_HOLE,
@@ -26,7 +26,7 @@ typedef enum {
     /* 205 */ BOSSFD_SKULL_BURN
 } BossFdActionState;
 
-typedef enum {
+typedef enum BossFdCutsceneState {
     /* 0 */ BFD_CS_NONE,
     /* 1 */ BFD_CS_WAIT,
     /* 2 */ BFD_CS_START,
@@ -38,7 +38,7 @@ typedef enum {
 
 #define BOSSFD_EFFECT_COUNT 180
 
-typedef struct {
+typedef struct BossFdEffect {
     /* 0x00 */ Vec3f pos;
     /* 0x0C */ Vec3f velocity;
     /* 0x18 */ Vec3f accel;
@@ -58,7 +58,7 @@ typedef struct {
 #define vFdFxRotY bFdFxFloat2
 #define vFdFxYStop bFdFxFloat2
 
-typedef enum {
+typedef enum BossFdEffectType {
     /* 0 */ BFD_FX_NONE,
     /* 1 */ BFD_FX_EMBER,
     /* 2 */ BFD_FX_DEBRIS,
@@ -67,13 +67,13 @@ typedef enum {
     /* 5 */ BFD_FX_SKULL_PIECE
 } BossFdEffectType;
 
-typedef struct {
+typedef struct BossFdMane {
     /* 0x000 */ Vec3f pos[30];
     /* 0x168 */ f32 scale[30];
     /* 0x1E0 */ Vec3f head;
 } BossFdMane; // size = 0x1EC
 
-typedef enum {
+typedef enum BossFdS16Var {
     /*  0 */ BFD_ACTION_STATE,
     /*  1 */ BFD_MOVE_TIMER,
     /*  2 */ BFD_VAR_TIMER,
@@ -96,7 +96,7 @@ typedef enum {
     /* 19 */ BFD_SHORT_COUNT
 } BossFdS16Var;
 
-typedef enum {
+typedef enum BossFdF32Var {
     /*  0 */ BFD_TEX1_SCROLL_X,
     /*  1 */ BFD_TEX1_SCROLL_Y,
     /*  2 */ BFD_TEX2_SCROLL_X,

src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c

@@ -12,7 +12,7 @@
 
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
-typedef enum {
+typedef enum BossFd2CutsceneState {
     /* 0 */ DEATH_START,
     /* 1 */ DEATH_RETREAT,
     /* 2 */ DEATH_HANDOFF,
@@ -21,7 +21,7 @@ typedef enum {
     /* 5 */ DEATH_FINISH
 } BossFd2CutsceneState;
 
-typedef enum {
+typedef enum BossFd2EyeState {
     /* 0 */ EYE_OPEN,
     /* 1 */ EYE_HALF,
     /* 2 */ EYE_CLOSED

src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h

@@ -8,14 +8,14 @@ struct BossFd2;
 
 typedef void (*BossFd2ActionFunc)(struct BossFd2*, PlayState*);
 
-typedef enum {
+typedef enum BossFd2Signal {
     /* 0 */ FD2_SIGNAL_NONE,
     /* 1 */ FD2_SIGNAL_FLY,
     /* 2 */ FD2_SIGNAL_DEATH,
     /* 100 */ FD2_SIGNAL_GROUND = 100
 } BossFd2Signal;
 
-typedef struct {
+typedef struct BossFd2Mane {
     /* 0x000 */ Vec3f rot[10];
     /* 0x078 */ Vec3f pos[10];
     /* 0x0F0 */ Vec3f pull[10];
@@ -23,7 +23,7 @@ typedef struct {
     /* 0x190 */ Vec3f head;
 } BossFd2Mane; // size = 0x19C
 
-typedef enum {
+typedef enum BossFd2S16Var {
     /* 0 */ FD2_TURN_TO_LINK,
     /* 1 */ FD2_ACTION_STATE,
     /* 2 */ FD2_UNK_TIMER,
@@ -39,7 +39,7 @@ typedef enum {
     /* 19 */ FD2_SHORT_COUNT = 19
 } BossFd2S16Var;
 
-typedef enum {
+typedef enum BossFd2F32Var {
     /*  0 */ FD2_TEX1_SCROLL_X,
     /*  1 */ FD2_TEX1_SCROLL_Y,
     /*  2 */ FD2_TEX2_SCROLL_X,

src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c

@@ -120,7 +120,7 @@ static EnZl3* sZelda;
 
 #define BOSSGANON_EFFECT_COUNT 200
 
-typedef struct {
+typedef struct GanondorfEffect {
     /* 0x00 */ u8 type;
     /* 0x01 */ u8 timer;
     /* 0x04 */ Vec3f pos;
@@ -502,7 +502,7 @@ void BossGanon_SetupIntroCutscene(BossGanon* this, PlayState* play) {
     }
 }
 
-typedef struct {
+typedef struct CutsceneCameraPosition {
     /* 0x00 */ Vec3s eye;
     /* 0x06 */ Vec3s at;
 } CutsceneCameraPosition; // size = 0x12

src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h

@@ -8,7 +8,7 @@ struct BossGanon;
 
 typedef void (*BossGanonActionFunc)(struct BossGanon*, PlayState*);
 
-typedef enum {
+typedef enum GanondorfLimb {
     /*  0 */ GANONDORF_LIMB_NONE,
     /*  1 */ GANONDORF_LIMB_ROOT,
     /*  2 */ GANONDORF_LIMB_TORSO,
@@ -38,7 +38,7 @@ typedef enum {
     /* 26 */ GANONDORF_LIMB_MAX
 } GanondorfLimb;
 
-typedef enum {
+typedef enum GanondorfFwork {
     /*  0 */ GDF_FWORK_0,
     /*  1 */ GDF_FWORK_1,
     /*  2 */ GDF_CENTER_POS,
@@ -52,19 +52,19 @@ typedef enum {
     /* 10 */ GDF_FWORK_MAX
 } GanondorfFwork;
 
-typedef enum {
+typedef enum WindowShatterState {
     /* 0 */ GDF_WINDOW_SHATTER_OFF,
     /* 1 */ GDF_WINDOW_SHATTER_PARTIAL,
     /* 2 */ GDF_WINDOW_SHATTER_FULL
 } WindowShatterState;
 
-typedef enum {
+typedef enum GanondorfShockType {
     /* 0 */ GDF_SHOCK_DORF_YELLOW,
     /* 1 */ GDF_SHOCK_PLAYER_YELLOW,
     /* 2 */ GDF_SHOCK_PLAYER_PURPLE
 } GanondorfShockType;
 
-typedef enum {
+typedef enum GanondorfEffectType {
     /* 0 */ GDF_EFF_NONE,
     /* 1 */ GDF_EFF_SPARKLE,
     /* 2 */ GDF_EFF_LIGHT_RAY,
@@ -77,7 +77,7 @@ typedef enum {
     /* 9 */ GDF_EFF_WINDOW_SHARD
 } GanondorfEffectType;
 
-typedef enum {
+typedef enum GanondorfTriforceType {
     /* 0 */ GDF_TRIFORCE_PLAYER,
     /* 1 */ GDF_TRIFORCE_ZELDA,
     /* 2 */ GDF_TRIFORCE_DORF

src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h

@@ -8,7 +8,7 @@ struct BossGanon2;
 
 typedef void (*BossGanon2ActionFunc)(struct BossGanon2*, PlayState*);
 
-typedef enum {
+typedef enum GanonLimb {
     /*  0 */ GANON_LIMB_NONE,
     /*  1 */ GANON_LIMB_ROOT,
     /*  2 */ GANON_LIMB_TORSO,

src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c

@@ -4,7 +4,7 @@
 
 #define BOSS_GANON2_EFFECT_COUNT 100
 
-typedef struct {
+typedef struct BossGanon2Effect {
     /* 0x00 */ u8 type;
     /* 0x01 */ u8 unk_01;
     /* 0x04 */ Vec3f position;

src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c

@@ -14,7 +14,7 @@
 
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
-typedef enum {
+typedef enum BossGanondrofDeathState {
     /* 0 */ NOT_DEAD,
     /* 1 */ DEATH_START,
     /* 2 */ DEATH_THROES,
@@ -24,24 +24,24 @@ typedef enum {
     /* 6 */ DEATH_FINISH
 } BossGanondrofDeathState;
 
-typedef enum {
+typedef enum BossGanondrofThrowAction {
     /* 0 */ THROW_NORMAL,
     /* 1 */ THROW_SLOW
 } BossGanondrofThrowAction;
 
-typedef enum {
+typedef enum BossGanondrofStunnedAction {
     /* 0 */ STUNNED_FALL,
     /* 1 */ STUNNED_GROUND
 } BossGanondrofStunnedAction;
 
-typedef enum {
+typedef enum BossGanondrofChargeAction {
     /* 0 */ CHARGE_WINDUP,
     /* 1 */ CHARGE_START,
     /* 2 */ CHARGE_ATTACK,
     /* 3 */ CHARGE_FINISH
 } BossGanondrofChargeAction;
 
-typedef enum {
+typedef enum BossGanondrofDeathAction {
     /* 0 */ DEATH_SPASM,
     /* 1 */ DEATH_LIMP,
     /* 2 */ DEATH_HUNCHED

src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h

@@ -15,7 +15,7 @@ typedef void (*BossGanondrofActionFunc)(struct BossGanondrof*, PlayState*);
 #define GND_BOSSROOM_CENTER_Y -33.0f
 #define GND_BOSSROOM_CENTER_Z -3315.0f
 
-typedef enum {
+typedef enum BossGanondrofFlyMode {
     /* 0 */ GND_FLY_PAINTING,
     /* 1 */ GND_FLY_NEUTRAL,
     /* 2 */ GND_FLY_VOLLEY,
@@ -23,13 +23,13 @@ typedef enum {
     /* 4 */ GND_FLY_CHARGE
 } BossGanondrofFlyMode;
 
-typedef enum {
+typedef enum BossGanondrofEyeState {
     /* 0 */ GND_EYESTATE_NONE,
     /* 1 */ GND_EYESTATE_FADE,
     /* 2 */ GND_EYESTATE_BRIGHTEN
 } BossGanondrofEyeState;
 
-typedef enum {
+typedef enum BossGanondrofS16Var {
     /*  0 */ GND_VARIANCE_TIMER,
     /*  1 */ GND_US_1,
     /*  2 */ GND_US_2,
@@ -51,7 +51,7 @@ typedef enum {
     /* 20 */ GND_SHORT_COUNT = 20
 } BossGanondrofS16Var;
 
-typedef enum {
+typedef enum BossGanondrofF32Var {
     /*  0 */ GND_FLOAT_SPEED,
     /*  1 */ GND_END_FRAME,
     /*  2 */ GND_EYE_BRIGHTNESS,

src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c

@@ -9,13 +9,13 @@
 // IRIS_FOLLOW: gohma looks towards the player (iris rotation)
 // BONUS_IFRAMES: gain invincibility frames when the player does something (throwing things?), or
 // randomly (see BossGoma_UpdateEye)
-typedef enum {
+typedef enum GohmaEyeState {
     EYESTATE_IRIS_FOLLOW_BONUS_IFRAMES, // default, allows not drawing lens and iris when eye is closed
     EYESTATE_IRIS_NO_FOLLOW_NO_IFRAMES,
     EYESTATE_IRIS_FOLLOW_NO_IFRAMES
 } GohmaEyeState;
 
-typedef enum {
+typedef enum GohmaVisualState {
     VISUALSTATE_RED,         // main/eye: red
     VISUALSTATE_DEFAULT,     // main: greenish cyan, blinks with dark gray every 16 frames; eye: white
     VISUALSTATE_DEFEATED,    // main/eye: dark gray

src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h

@@ -8,7 +8,7 @@ struct BossGoma;
 
 typedef void (*BossGomaActionFunc)(struct BossGoma*, PlayState*);
 
-typedef enum {
+typedef enum BossGomaLimb {
     /*  0 */ BOSSGOMA_LIMB_NONE,
     /*  1 */ BOSSGOMA_LIMB_ROOT1,
     /*  2 */ BOSSGOMA_LIMB_ROOT2,

src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c

@@ -20,7 +20,7 @@
 
 #define BOSS_MO_EFFECT_COUNT 300
 
-typedef struct {
+typedef struct BossMoEffect {
     /* 0x00 */ Vec3f pos;
     /* 0x0C */ Vec3f vel;
     /* 0x18 */ Vec3f accel;
@@ -59,7 +59,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play);
 
 void BossMo_Unknown(void);
 
-typedef enum {
+typedef enum BossMoEffectType {
     /* 0 */ MO_FX_NONE,
     /* 1 */ MO_FX_SMALL_RIPPLE,
     /* 2 */ MO_FX_BIG_RIPPLE,
@@ -70,7 +70,7 @@ typedef enum {
     /* 7 */ MO_FX_BUBBLE
 } BossMoEffectType;
 
-typedef enum {
+typedef enum BossMoTentState {
     /*   0 */ MO_TENT_READY,
     /*   1 */ MO_TENT_SWING,
     /*   2 */ MO_TENT_ATTACK,
@@ -90,7 +90,7 @@ typedef enum {
     /* 206 */ MO_TENT_DEATH_6
 } BossMoTentState;
 
-typedef enum {
+typedef enum BossMoCoreState {
     /* -11 */ MO_CORE_UNUSED = -11,
     /*   0 */ MO_CORE_MOVE = 0,
     /*   1 */ MO_CORE_MAKE_TENT,
@@ -102,7 +102,7 @@ typedef enum {
     /*  21 */ MO_CORE_INTRO_REVEAL
 } BossMoCoreState;
 
-typedef enum {
+typedef enum BossMoCsState {
     /*   0 */ MO_BATTLE,
     /*   1 */ MO_INTRO_WAIT,
     /*   2 */ MO_INTRO_START,

src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h

@@ -8,7 +8,7 @@ struct BossMo;
 
 typedef void (*BossMoActionFunc)(struct BossMo*, PlayState*);
 
-typedef enum {
+typedef enum BossMoTentS16Var {
     /* 0 */ MO_TENT_ACTION_STATE,
     /* 1 */ MO_TENT_MOVE_TIMER,
     /* 2 */ MO_TENT_VAR_TIMER,
@@ -21,7 +21,7 @@ typedef enum {
     /* 9 */ MO_TENT_SHORT_MAX
 } BossMoTentS16Var;
 
-typedef enum {
+typedef enum BossMoCoreS16Var {
     /* 0 */ MO_CORE_ACTION_STATE,
     /* 1 */ MO_CORE_MOVE_TIMER,
     /* 2 */ MO_CORE_VAR_TIMER,
@@ -34,7 +34,7 @@ typedef enum {
     /* 9 */ MO_CORE_SHORT_MAX
 } BossMoCoreS16Var;
 
-typedef enum {
+typedef enum BossMoTentF32Var {
     /* 0 */ MO_TENT_SWING_LAG_X,
     /* 1 */ MO_TENT_SWING_SIZE_X,
     /* 2 */ MO_TENT_SWING_RATE_X,
@@ -45,7 +45,7 @@ typedef enum {
     /* 7 */ MO_TENT_FLOAT_MAX
 } BossMoTentF32Var;
 
-typedef enum {
+typedef enum BossMoCoreF32Var {
     /* 0 */ MO_CORE_INTRO_WATER_ALPHA,
     /* 1 */ MO_CORE_FLOAT_MAX
 } BossMoCoreF32Var;

src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c

@@ -24,7 +24,7 @@
 #define ROOM_CENTER_Y 0.0f
 #define ROOM_CENTER_Z 0.0f
 
-typedef enum {
+typedef enum BossSstHandState {
     /*  0 */ HAND_WAIT,
     /*  1 */ HAND_BEAT,
     /*  2 */ HAND_RETREAT,
@@ -39,7 +39,7 @@ typedef enum {
     /* 11 */ HAND_DEATH
 } BossSstHandState;
 
-typedef enum {
+typedef enum BossSstEffectMode {
     /* 0 */ BONGO_NULL,
     /* 1 */ BONGO_ICE,
     /* 2 */ BONGO_SHOCKWAVE,

src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h

@@ -10,7 +10,7 @@ typedef void (*BossSstActionFunc)(struct BossSst*, PlayState*);
 
 #define BOSS_SST_EFFECT_COUNT 18
 
-typedef struct {
+typedef struct BossSstEffect {
     /* 0x0000 */ Vec3f pos;
     /* 0x0010 */ Vec3f vel;
     /* 0x0018 */ Vec3s rot;
@@ -20,7 +20,7 @@ typedef struct {
     /* 0x0024 */ u8 alpha;
 } BossSstEffect; // size = 0x28
 
-typedef struct {
+typedef struct BossSstHandTrail {
     /* 0x0000 */ PosRot world;
     /* 0x0014 */ f32 zPosMod;
     /* 0x0018 */ s16 yRotMod;
@@ -54,7 +54,7 @@ typedef struct BossSst {
     /* 0x09D4 */ BossSstHandTrail handTrails[7];
 } BossSst; // size = 0x0A98
 
-typedef enum {
+typedef enum BossSstType {
     /* -1 */ BONGO_HEAD = -1,
     /*  0 */ BONGO_LEFT_HAND,
     /*  1 */ BONGO_RIGHT_HAND

src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c

@@ -5,7 +5,7 @@
 
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
-typedef enum {
+typedef enum TwEffType {
     /*  0 */ TWEFF_NONE,
     /*  1 */ TWEFF_DOT,
     /*  2 */ TWEFF_2,
@@ -19,13 +19,13 @@ typedef enum {
     /* 10 */ TWEFF_SHLD_HIT
 } TwEffType;
 
-typedef enum {
+typedef enum EffectWork {
     /* 0 */ EFF_ARGS,
     /* 1 */ EFF_UNKS1,
     /* 2 */ EFF_WORK_MAX
 } EffectWork;
 
-typedef enum {
+typedef enum EffectFWork {
     /* 0 */ EFF_SCALE,
     /* 1 */ EFF_DIST,
     /* 2 */ EFF_ROLL,
@@ -33,7 +33,7 @@ typedef enum {
     /* 4 */ EFF_FWORK_MAX
 } EffectFWork;
 
-typedef enum {
+typedef enum TwinrovaType {
     /* 0x00 */ TW_KOTAKE,
     /* 0x01 */ TW_KOUME,
     /* 0x02 */ TW_TWINROVA,
@@ -47,7 +47,7 @@ typedef enum {
 
 #define BOSS_TW_EFFECT_COUNT 150
 
-typedef struct {
+typedef struct BossTwEffect {
     /* 0x0000 */ u8 type;
     /* 0x0001 */ u8 frame;
     /* 0x0004 */ Vec3f pos;

src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h

@@ -8,7 +8,7 @@ struct BossTw;
 
 typedef void (*BossTwActionFunc)(struct BossTw* this, PlayState* play);
 
-typedef enum {
+typedef enum TwWork {
     /*  0 */ CS_TIMER_1,
     /*  1 */ CS_TIMER_2,
     /*  2 */ TW_PLLR_IDX,
@@ -25,7 +25,7 @@ typedef enum {
     /* 13 */ WORK_MAX
 } TwWork;
 
-typedef enum {
+typedef enum TwFwork {
     /*  0 */ OUTR_CRWN_TX_X1,
     /*  1 */ OUTR_CRWN_TX_X2,
     /*  2 */ INNR_CRWN_TX_X1,
@@ -55,7 +55,7 @@ typedef enum {
     /* 26 */ FWORK_MAX
 } TwFwork;
 
-typedef enum {
+typedef enum TwinrovaKotakeKoumeLimb {
     /*  0 */ TWINROVA_KOTAKE_KOUME_LIMB_NONE,
     /*  1 */ TWINROVA_KOTAKE_KOUME_LIMB_PELVIS,
     /*  2 */ TWINROVA_KOTAKE_KOUME_LIMB_LEFT_THIGH,
@@ -86,7 +86,7 @@ typedef enum {
     /* 27 */ TWINROVA_KOTAKE_KOUME_LIMB_MAX
 } TwinrovaKotakeKoumeLimb;
 
-typedef enum {
+typedef enum TwinrovaLimb {
     /*  0 */ TWINROVA_LIMB_NONE,
     /*  1 */ TWINROVA_LIMB_PELVIS,
     /*  2 */ TWINROVA_LIMB_SASH_1,

src/overlays/actors/ovl_Boss_Va/z_boss_va.c

@@ -41,7 +41,7 @@ typedef struct BossVaEffect {
     /* 0x54 */ struct BossVa* parent;
 } BossVaEffect; // size = 0x58
 
-typedef enum {
+typedef enum BossVaEffectType {
     /* 0 */ VA_NONE,
     /* 1 */ VA_LARGE_SPARK,
     /* 2 */ VA_BLAST_SPARK,
@@ -53,7 +53,7 @@ typedef enum {
     /* 8 */ VA_GORE
 } BossVaEffectType;
 
-typedef enum {
+typedef enum BossVaSparkMode {
     /* 1 */ SPARK_TETHER = 1,
     /* 2 */ SPARK_BARI,
     /* 3 */ SPARK_BLAST,
@@ -62,25 +62,25 @@ typedef enum {
     /* 6 */ SPARK_LINK
 } BossVaSparkMode;
 
-typedef enum {
+typedef enum BossVaBloodMode {
     /* 0 */ BLOOD_DROPLET,
     /* 1 */ BLOOD_SPLATTER,
     /* 2 */ BLOOD_SPOT
 } BossVaBloodMode;
 
-typedef enum {
+typedef enum BossVaTumorMode {
     /* 0 */ TUMOR_UNUSED,
     /* 1 */ TUMOR_BODY,
     /* 2 */ TUMOR_ARM
 } BossVaTumorMode;
 
-typedef enum {
+typedef enum BossVaGoreMode {
     /* 0 */ GORE_PERMANENT,
     /* 1 */ GORE_FLOOR,
     /* 2 */ GORE_FADING
 } BossVaGoreMode;
 
-typedef enum {
+typedef enum BossVaCutscene {
     /* -5 */ INTRO_UNUSED_START = -5,
     /* -4 */ INTRO_START,
     /* -3 */ INTRO_LOOK_DOOR,

src/overlays/actors/ovl_Boss_Va/z_boss_va.h

@@ -47,7 +47,7 @@ typedef struct BossVa {
     /* 0x0338 */ ColliderQuad colliderLightning;
 } BossVa; // size = 0x03B8
 
-typedef enum {
+typedef enum BossVaParam {
     /* -1 */ BOSSVA_BODY = -1,
     /*  0 */ BOSSVA_SUPPORT_1,
     /*  1 */ BOSSVA_SUPPORT_2,

src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c

@@ -44,7 +44,7 @@ void DemoEc_Destroy(Actor* thisx, PlayState* play);
 void DemoEc_Update(Actor* thisx, PlayState* play);
 void DemoEc_Draw(Actor* thisx, PlayState* play);
 
-typedef enum {
+typedef enum DemoEcUpdateMode {
     /* 00 */ EC_UPDATE_COMMON,
     /* 01 */ EC_UPDATE_INGO,
     /* 02 */ EC_UPDATE_TALON,
@@ -76,7 +76,7 @@ typedef enum {
     /* 28 */ EC_UPDATE_MALON
 } DemoEcUpdateMode;
 
-typedef enum {
+typedef enum DemoEcDrawconfig {
     /* 00 */ EC_DRAW_COMMON,
     /* 01 */ EC_DRAW_INGO,
     /* 02 */ EC_DRAW_TALON,

src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h

@@ -8,71 +8,71 @@ struct DemoEffect;
 
 typedef void (*DemoEffectFunc)(struct DemoEffect*, PlayState*);
 
-typedef struct {
+typedef struct DemoEffectFireBall {
     /* 0x00 */ u8 timer;
 } DemoEffectFireBall;
 
-typedef struct {
+typedef struct DemoEffectBlueOrb {
     /* 0x00 */ u8 alpha;
     /* 0x01 */ u8 scale;
     /* 0x02 */ u8 pad;
     /* 0x04 */ s16 rotation;
 } DemoEffectBlueOrb;
 
-typedef struct {
+typedef struct DemoEffectLight {
     /* 0x00 */ u8 alpha;
     /* 0x01 */ u8 scaleFlag;
     /* 0x02 */ u8 flicker;
     /* 0x04 */ s16 rotation;
 } DemoEffectLight;
 
-typedef struct {
+typedef struct DemoEffectLgtShower {
     /* 0x00 */ u8 alpha;
 } DemoEffectLgtShower;
 
-typedef struct {
+typedef struct DemoEffectGodLgt {
     /* 0x00 */ u8 type;
     /* 0x01 */ u8 lightRingSpawnDelay;
     /* 0x02 */ u8 rotation;
     /* 0x04 */ s16 lightRingSpawnTimer;
 } DemoEffectGodLgt;
 
-typedef struct {
+typedef struct DemoEffectLightRing {
     /* 0x00 */ u8 timerIncrement;
     /* 0x01 */ u8 alpha;
     /* 0x02 */ u8 pad;
     /* 0x04 */ s16 timer;
 } DemoEffectLightRing;
 
-typedef struct {
+typedef struct DemoEffectTriforceSpot {
     /* 0x00 */ u8 triforceSpotOpacity;
     /* 0x01 */ u8 lightColumnOpacity;
     /* 0x02 */ u8 crystalLightOpacity;
     /* 0x04 */ s16 rotation;
 } DemoEffectTriforceSpot;
 
-typedef struct {
+typedef struct DemoEffectGetItem {
     /* 0x00 */ u8 isPositionInit;
     /* 0x01 */ u8 isLoaded;
     /* 0x02 */ u8 drawId;
     /* 0x04 */ s16 rotation;
 } DemoEffectGetItem;
 
-typedef struct {
+typedef struct DemoEffectTimeWarp {
     /* 0x00 */ u8 pad;
     /* 0x01 */ u8 pad2;
     /* 0x02 */ u8 pad3;
     /* 0x04 */ s16 shrinkTimer;
 } DemoEffectTimeWarp;
 
-typedef struct {
+typedef struct DemoEffectJewel {
     /* 0x00 */ u8 type;
     /* 0x01 */ u8 isPositionInit;
     /* 0x02 */ u8 alpha;
     /* 0x04 */ s16 timer;
 } DemoEffectJewel;
 
-typedef struct {
+typedef struct DemoEffectDust {
     /* 0x00 */ u8 timer;
 } DemoEffectDust;
 
@@ -108,7 +108,7 @@ typedef struct DemoEffect {
 } DemoEffect; // size = 0x01A0
 
 // These names come from the objects that correspond to this actor type.
-typedef enum {
+typedef enum DemoEffectType {
     /* 0x00 */ DEMO_EFFECT_CRYSTAL_LIGHT,
     /* 0x01 */ DEMO_EFFECT_FIRE_BALL,
     /* 0x02 */ DEMO_EFFECT_BLUE_ORB, // Object is in GAMEPLAY_KEEP. Not a name from object. It's a blue orb.
@@ -138,7 +138,7 @@ typedef enum {
     /* 0x1A */ DEMO_EFFECT_MAX_TYPE
 } DemoEffectType;
 
-typedef enum {
+typedef enum DemoEffectLightColor {
     /* 0x00 */ DEMO_EFFECT_LIGHT_RED,
     /* 0x01 */ DEMO_EFFECT_LIGHT_BLUE,
     /* 0x02 */ DEMO_EFFECT_LIGHT_GREEN,
@@ -148,7 +148,7 @@ typedef enum {
     /* 0x06 */ DEMO_EFFECT_LIGHT_GREEN2
 } DemoEffectLightColor;
 
-typedef enum {
+typedef enum DemoEffectGodLgtType {
     /* 0x00 */ GOD_LGT_DIN,
     /* 0x01 */ GOD_LGT_NAYRU,
     /* 0x02 */ GOD_LGT_FARORE

src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c

@@ -10,13 +10,13 @@
 
 #define FLAGS ACTOR_FLAG_4
 
-typedef enum {
+typedef enum DemoExtAction {
     /* 0x00 */ EXT_WAIT,
     /* 0x01 */ EXT_MAINTAIN,
     /* 0x02 */ EXT_DISPELL
 } DemoExtAction;
 
-typedef enum {
+typedef enum DemoExtDrawMode {
     /* 0x00 */ EXT_DRAW_NOTHING,
     /* 0x01 */ EXT_DRAW_VORTEX
 } DemoExtDrawMode;

src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h

@@ -28,7 +28,7 @@ typedef struct DemoGj {
  * bits  8-10: The amount of collectible that will be dropped when killed.
  * bits  0- 7: A value of the enum DemoGjType.
  */
-typedef enum {
+typedef enum DemoGjType {
     /* 04 */ DEMOGJ_TYPE_AROUNDARENA = 4, // This is the indestructible rubble around the arena. This actor keeps alive the whole fight.
     /* 08 */ DEMOGJ_TYPE_RUBBLE_PILE_1 = 8, // DEMOGJ_TYPE_RUBBLE_PILE_X are the rubbles from where Ganondorf rises. When he transforms into Ganon these are removed from the scene (Actor_Kill).
     /* 09 */ DEMOGJ_TYPE_RUBBLE_PILE_2,