Misc Cleanup 3 (#1268)

* begin more cleanup

* more enums

* typo

* ==

* fix go.h

* fix RaceDogInfo struct

* PR Review

* PR Suggestions

* missed one

* missed even more

* fix params

* fix number

Makefile

@@ -122,8 +122,8 @@ OPTFLAGS := -O2 -g3
 ASFLAGS := -march=vr4300 -32 -Iinclude
 MIPS_VERSION := -mips2
 
-# we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff.
+# we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Suppress the warnings with -woff.
-CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(IINC) -nostdinc -Wab,-r4300_mul -woff 624,649,838,712,516
+CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(IINC) -nostdinc -Wab,-r4300_mul -woff 649,838,712,516
 
 # Use relocations and abi fpr names in the dump
 OBJDUMP_FLAGS := --disassemble --reloc --disassemble-zeroes -Mreg-names=32

include/z64.h

@@ -657,7 +657,7 @@ typedef struct {
 #define FLASHROM_REQUEST_WRITE 1
 #define FLASHROM_REQUEST_READ 2
 
-enum fram_command {
+typedef enum framCommand {
     /* Does nothing for FRAM_COMMAND_SET_MODE_READ_AND_STATUS, FRAM_MODE_NOP, FRAM_COMMAND_SET_MODE_STATUS_AND_STATUS
        Initializes fram to 0xFF in FRAM_MODE_ERASE
        Writes Contents in FLASHRAM_MODE_WRITE
@@ -681,15 +681,15 @@ enum fram_command {
     FRAM_COMMAND_SET_MODE_READ_AND_STATUS = 0xF0000000,
     /* unk */
     FRAM_COMMAND_UNK_ERASE_OPERATION = 0x3C000000
-};
+} framCommand;
 
-enum fram_mode {
+typedef enum framMode {
-    FRAM_MODE_NOP = 0,
+    /* 0 */ FRAM_MODE_NOP,
-    FRAM_MODE_ERASE,
+    /* 1 */ FRAM_MODE_ERASE,
-    FRAM_MODE_WRITE,
+    /* 2 */ FRAM_MODE_WRITE,
-    FRAM_MODE_READ,
+    /* 3 */ FRAM_MODE_READ,
-    FRAM_MODE_STATUS
+    /* 4 */ FRAM_MODE_STATUS
-};
+} framMode;
 
 typedef enum {
     /* 0 */ VI_MODE_EDIT_STATE_INACTIVE,

include/z64actor.h

@@ -317,7 +317,7 @@ typedef struct EnAObj {
 
 typedef enum {
     /* 0 */ AOBJ_SIGNPOST_OBLONG,
-    /* 1 */ AOBJ_SIGNPOST_ARROW,
+    /* 1 */ AOBJ_SIGNPOST_ARROW
 } AObjType;
 
 #define AOBJ_GET_TEXTID(thisx) ((((thisx)->params >> 8) & 0xFF) | 0x300)

include/z64audio.h

@@ -105,7 +105,7 @@ typedef enum {
     /* 1 */ SOUNDMODE_HEADSET,
     /* 2 */ SOUNDMODE_SURROUND_EXTERNAL,
     /* 3 */ SOUNDMODE_MONO,
-    /* 4 */ SOUNDMODE_SURROUND,
+    /* 4 */ SOUNDMODE_SURROUND
 } SoundMode;
 
 typedef enum {

include/z64camera.h

@@ -361,7 +361,7 @@ typedef enum {
     /* 0x12 */ CAM_DATA_18,
     /* 0x13 */ CAM_DATA_19,
     /* 0x14 */ CAM_DATA_20,
-    /* 0x15 */ CAM_DATA_21,
+    /* 0x15 */ CAM_DATA_21
 } CameraDataType;
 
 /*================================

include/z64item.h

@@ -19,7 +19,7 @@ typedef enum {
     /* 2 */ EQUIP_VALUE_SWORD_RAZOR,
     /* 3 */ EQUIP_VALUE_SWORD_GILDED,
     /* 4 */ EQUIP_VALUE_SWORD_DIETY,
-    /* 5 */ EQUIP_VALUE_SWORD_MAX,
+    /* 5 */ EQUIP_VALUE_SWORD_MAX
 } EquipValueSword;
 
 typedef enum {

include/z64math.h

@@ -105,13 +105,13 @@ typedef VecSphGeo VecGeo;
 typedef enum {
     /* 0 */ OLIB_ADD_COPY, // Copy `b` to dest
     /* 1 */ OLIB_ADD_OFFSET, // Add `a` and `b` to dest, and also add the yaw of `a` to the dest
-    /* 2 */ OLIB_ADD, // Add `a` and `b` to dest
+    /* 2 */ OLIB_ADD // Add `a` and `b` to dest
 } OlibVec3fAdd;
 
 typedef enum {
     /* 0 */ OLIB_DIFF_COPY, // Copy `b` to dest
     /* 1 */ OLIB_DIFF_OFFSET, // Sub `a` and `b` to dest, and also subs the yaw of `a` to the dest
-    /* 2 */ OLIB_DIFF, // Sub `a` and `b` to dest
+    /* 2 */ OLIB_DIFF // Sub `a` and `b` to dest
 } OlibVec3fDiff;
 
 #define LERPIMP(v0, v1, t) ((v0) + (((v1) - (v0)) * (t)))

include/z64player.h

@@ -962,7 +962,7 @@ typedef enum PlayerUnkAA5 {
     /* 2 */ PLAYER_UNKAA5_2,
     /* 3 */ PLAYER_UNKAA5_3,
     /* 4 */ PLAYER_UNKAA5_4,
-    /* 5 */ PLAYER_UNKAA5_5,
+    /* 5 */ PLAYER_UNKAA5_5
 } PlayerUnkAA5;
 
 typedef void (*PlayerActionFunc)(struct Player* this, struct PlayState* play);

include/z64save.h

@@ -87,7 +87,7 @@ typedef enum {
     /*  5 */ TIMER_ID_ENV_HAZARD, // environmental hazard timer (underwater or hot room)
     /*  6 */ TIMER_ID_GORON_RACE_UNUSED,
     /*  7 */ TIMER_ID_MAX,
-    /* 99 */ TIMER_ID_NONE = 99,
+    /* 99 */ TIMER_ID_NONE = 99
 } TimerId;
 
 typedef enum {
@@ -1569,7 +1569,7 @@ typedef enum {
     /* 0 */ DUNGEON_INDEX_WOODFALL_TEMPLE,
     /* 1 */ DUNGEON_INDEX_SNOWHEAD_TEMPLE,
     /* 2 */ DUNGEON_INDEX_GREAT_BAY_TEMPLE,
-    /* 3 */ DUNGEON_INDEX_STONE_TOWER_TEMPLE, // Also applies to Inverted Stone Tower Temple
+    /* 3 */ DUNGEON_INDEX_STONE_TOWER_TEMPLE // Also applies to Inverted Stone Tower Temple
 } DungeonIndex;
 
 void Sram_ActivateOwl(u8 owlId);

include/z64schedule.h

@@ -50,13 +50,13 @@ typedef enum {
     /* 0x0F */ SCHEDULE_CMD_ID_CHECK_BEFORE_TIME_S,  // Branches if the current time is less than the command time, short range branch
     /* 0x10 */ SCHEDULE_CMD_ID_CHECK_BEFORE_TIME_L,  // Branches if the current time is less than the command time, long range branch
     /* 0x11 */ SCHEDULE_CMD_ID_BRANCH_S,             // Always branch, short range branch
-    /* 0x12 */ SCHEDULE_CMD_ID_BRANCH_L,             // Always branch, long range branch
+    /* 0x12 */ SCHEDULE_CMD_ID_BRANCH_L              // Always branch, long range branch
 } ScheduleCommandId;
 
 typedef enum {
     /* 0 */ SCHEDULE_CHECK_MISC_ROOM_KEY,
     /* 1 */ SCHEDULE_CHECK_MISC_LETTER_TO_KAFEI,
-    /* 2 */ SCHEDULE_CHECK_MISC_MASK_ROMANI,
+    /* 2 */ SCHEDULE_CHECK_MISC_MASK_ROMANI
 } ScheduleCheckMisc;
 
 typedef struct {

include/z64transition.h

@@ -68,7 +68,7 @@ typedef struct {
 
 typedef enum {
     /* 1 */ TRANS_INSTANCE_TYPE_FILL_OUT = 1,
-    /* 2 */ TRANS_INSTANCE_TYPE_FILL_IN,
+    /* 2 */ TRANS_INSTANCE_TYPE_FILL_IN
 } TransitionInstanceType;
 
 #define TRANS_INSTANCE_TYPE_FADE_FLASH 3

include/z_fireobj.h

@@ -61,7 +61,7 @@ typedef enum FireState {
     /* 0 */ FIRE_STATE_GROWING,
     /* 1 */ FIRE_STATE_SHRINKING,
     /* 2 */ FIRE_STATE_FULLY_LIT,
-    /* 3 */ FIRE_STATE_NOT_LIT,
+    /* 3 */ FIRE_STATE_NOT_LIT
 } FireState;
 
 #define FIRE_FLAG_WATER_EXTINGUISHABLE (1 << 0)

src/audio/code_8019AF00.c

@@ -9,7 +9,7 @@ typedef struct {
     /* 0x0 */ Vec3f* pos;
     /* 0x4 */ f32 freqScale;
     /* 0x8 */ s8 reverbAdd;
-} SfxSettings; // size = 0x9
+} SfxSettings; // size = 0xC
 
 typedef struct {
     /* 0x0 */ f32 volume;
@@ -20,7 +20,7 @@ typedef struct {
     /* 0xB */ u8 filter;
     /* 0xC */ u8 combFilterGain;
     /* 0xD */ u8 zVolume;
-} SfxChannelState; // size = 0xE
+} SfxChannelState; // size = 0x10
 
 typedef enum {
     /* 0x0 */ SFX_CHANNEL_PLAYER0, // SfxPlayerBank
@@ -50,7 +50,7 @@ typedef enum {
     /* 0x4 */ SEQ_PLAYER_IO_PORT_4,
     /* 0x5 */ SEQ_PLAYER_IO_PORT_5,
     /* 0x6 */ SEQ_PLAYER_IO_PORT_6,
-    /* 0x7 */ SEQ_PLAYER_IO_PORT_7,
+    /* 0x7 */ SEQ_PLAYER_IO_PORT_7
 } SeqPlayerIOPort;
 
 typedef struct {

src/audio/lib/heap.c

@@ -1386,11 +1386,11 @@ void AudioHeap_DiscardSampleCaches(void) {
 }
 
 typedef struct {
-    uintptr_t oldAddr;
+    /* 0x0 */ uintptr_t oldAddr;
-    uintptr_t newAddr;
+    /* 0x4 */ uintptr_t newAddr;
-    size_t size;
+    /* 0x8 */ size_t size;
-    u8 newMedium;
+    /* 0xC */ u8 newMedium;
-} StorageChange;
+} StorageChange; // size = 0x10
 
 void AudioHeap_ChangeStorage(StorageChange* change, Sample* sample) {
     if ((sample != NULL) && ((sample->medium == change->newMedium) || (D_801FD120 != 1)) &&

src/audio/lib/load.c

@@ -80,10 +80,10 @@ typedef enum {
 #define OS_MESG_PRI_HIGH 1
 
 typedef struct {
-    u16 numInstruments;
+    /* 0x0 */ u16 numInstruments;
-    u16 numDrums;
+    /* 0x2 */ u16 numDrums;
-    u16 numSfx;
+    /* 0x4 */ u16 numSfx;
-} UnloadedFonts;
+} UnloadedFonts; // size = 0x6
 
 OSMesgQueue sScriptLoadQueue;
 OSMesg sScriptLoadMesgBuf[0x10];

src/boot_O2_g3/yaz0.c

@@ -58,11 +58,11 @@ void* Yaz0_NextDMA(void* curSrcPos) {
 }
 
 typedef struct {
-    /* 0x00 */ u32 magic; // Yaz0
+    /* 0x0 */ u32 magic; // Yaz0
-    /* 0x04 */ u32 decSize;
+    /* 0x4 */ u32 decSize;
-    /* 0x08 */ u32 compInfoOffset;   // only used in mio0
+    /* 0x8 */ u32 compInfoOffset;   // only used in mio0
-    /* 0x0C */ u32 uncompDataOffset; // only used in mio0
+    /* 0xC */ u32 uncompDataOffset; // only used in mio0
-} Yaz0Header;                        // size = 0x10
+} Yaz0Header;                       // size = 0x10
 
 #define YAZ0_MAGIC 0x59617A30 // "Yaz0"
 

src/code/sys_cmpdma.c

@@ -2,7 +2,7 @@
 #include "system_malloc.h"
 
 typedef struct {
-    union {
+    /* 0x0 */ union {
         u32 dmaWord[2];
         u32 dataStart;
         u32 dataSize;
@@ -11,7 +11,7 @@ typedef struct {
             u32 end;
         } offset;
     };
-} CmpDmaBuffer;
+} CmpDmaBuffer; // size = 0x8
 
 CmpDmaBuffer sDmaBuffer;
 

src/code/z_draw.c

@@ -115,9 +115,9 @@ void GetItem_DrawWallet(PlayState* play, s16 drawId);
 void GetItem_DrawRemains(PlayState* play, s16 drawId);
 
 typedef struct {
-    /* 0x00 */ void (*drawFunc)(PlayState*, s16);
+    /* 0x0 */ void (*drawFunc)(PlayState*, s16);
-    /* 0x04 */ void* drawResources[8]; // Either display lists (Gfx*) or matrices (Mtx*)
+    /* 0x4 */ void* drawResources[8]; // Either display lists (Gfx*) or matrices (Mtx*)
-} DrawItemTableEntry;                  // size = 0x24
+} DrawItemTableEntry;                 // size = 0x24
 
 static DrawItemTableEntry sDrawItemTable[] = {
     // GID_BOTTLE, OBJECT_GI_BOTTLE

src/code/z_eventmgr.c

@@ -36,7 +36,7 @@ ActorCutscene sGlobalCutsceneList[] = {
 typedef enum {
     /* 0 */ CS_START_0,
     /* 1 */ CS_START_1,
-    /* 2 */ CS_START_2,
+    /* 2 */ CS_START_2
 } ActorCutsceneStartMethod;
 
 typedef struct {

src/code/z_fbdemo_circle.c

@@ -2,7 +2,7 @@
 
 typedef enum {
     /* 0 */ TRANS_CIRCLE_DIR_IN,
-    /* 1 */ TRANS_CIRCLE_DIR_OUT,
+    /* 1 */ TRANS_CIRCLE_DIR_OUT
 } TransitionCircleDirection;
 
 Gfx sTransCircleSetupDL[] = {

src/code/z_parameter.c

@@ -23,11 +23,11 @@ typedef enum {
 #define DO_ACTION_TEX_SIZE ((DO_ACTION_TEX_WIDTH * DO_ACTION_TEX_HEIGHT) / 2) // (sizeof(gCheckDoActionENGTex))
 
 typedef struct {
-    /* 0x00 */ u8 scene;
+    /* 0x0 */ u8 scene;
-    /* 0x01 */ u8 flags1;
+    /* 0x1 */ u8 flags1;
-    /* 0x02 */ u8 flags2;
+    /* 0x2 */ u8 flags2;
-    /* 0x03 */ u8 flags3;
+    /* 0x3 */ u8 flags3;
-} RestrictionFlags;
+} RestrictionFlags; // size = 0x4
 
 Input sPostmanTimerInput[MAXCONTROLLERS];
 

src/code/z_player_lib.c

@@ -270,7 +270,7 @@ void func_80122C20(PlayState* play, struct_80122D44_arg1* arg1) {
 typedef struct {
     /* 0x0 */ Color_RGB8 color;
     /* 0x4 */ Gfx* dList;
-} struct_801BFDD0; // size = 0x08
+} struct_801BFDD0; // size = 0x8
 
 struct_801BFDD0 D_801BFDD0[] = {
     { { 180, 200, 255 }, gLinkGoronCurledDL },
@@ -1643,9 +1643,9 @@ TexturePtr sPlayerMouthTextures[PLAYER_MOUTH_MAX] = {
 };
 
 typedef struct PlayerFaceIndices {
-    /* 0x00 */ u8 eyeIndex;
+    /* 0x0 */ u8 eyeIndex;
-    /* 0x01 */ u8 mouthIndex;
+    /* 0x1 */ u8 mouthIndex;
-} PlayerFaceIndices; // size = 0x02
+} PlayerFaceIndices; // size = 0x2
 
 PlayerFaceIndices sPlayerFaces[] = {
     { PLAYER_EYES_OPEN, PLAYER_MOUTH_CLOSED },       // PLAYER_FACE_0

src/code/z_room.c

@@ -53,10 +53,10 @@ typedef enum {
 } RoomCullableDebugMode;
 
 typedef struct RoomShapeCullableEntryLinked {
-    /* 0x00 */ RoomShapeCullableEntry* entry;
+    /* 0x0 */ RoomShapeCullableEntry* entry;
-    /* 0x04 */ f32 boundsNearZ;
+    /* 0x4 */ f32 boundsNearZ;
-    /* 0x08 */ struct RoomShapeCullableEntryLinked* prev;
+    /* 0x8 */ struct RoomShapeCullableEntryLinked* prev;
-    /* 0x0C */ struct RoomShapeCullableEntryLinked* next;
+    /* 0xC */ struct RoomShapeCullableEntryLinked* next;
 } RoomShapeCullableEntryLinked; // size = 0x10
 
 #define ROOM_SHAPE_CULLABLE_MAX_ENTRIES 128

src/libultra/flash/osFlash.c

@@ -10,8 +10,8 @@ s32 __osFlashVersion;
 UNK_TYPE1 D_801FD0FC[0x14];
 
 typedef enum {
-    FLASH_OLD,
+    /* 0 */ FLASH_OLD,
-    FLASH_NEW,
+    /* 1 */ FLASH_NEW
 } FlashVersion;
 
 u32 osFlashGetAddr(u32 pageNum) {

src/libultra/os/initialize.c

@@ -3,11 +3,11 @@
 #define COLD_RESET 0
 
 typedef struct {
-    /* 0x0 */ u32 ins_00; // lui     k0, 0x8000
+    /* 0x0 */ u32 ins_00;   // lui     k0, 0x8000
-    /* 0x4 */ u32 ins_04; // addiu   k0, k0, 0x39E0
+    /* 0x4 */ u32 ins_04;   // addiu   k0, k0, 0x39E0
-    /* 0x8 */ u32 ins_08; // jr      k0 ; __osException
+    /* 0x8 */ u32 ins_08;   // jr      k0 ; __osException
-    /* 0xC */ u32 ins_0C; // nop
+    /* 0xC */ u32 ins_0C;   // nop
-} struct_exceptionPreamble;
+} struct_exceptionPreamble; // size = 0x10
 
 u64 osClockRate = OS_CLOCK_RATE;
 s32 osViClock = VI_NTSC_CLOCK;

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

@@ -60,7 +60,7 @@ typedef struct {
     /* 0x14 */ BgBreakwallUnkFunc unk_14;
     /* 0x18 */ BgBreakwallUnkFunc2 unk_18;
     /* 0x1C */ ActorFunc unk_1C;
-} BgBreakwallStruct;
+} BgBreakwallStruct; // size = 0x20
 
 BgBreakwallStruct D_808B8140[] = {
     { OBJECT_OMOYA_OBJ, object_omoya_obj_DL_0001A0, NULL, NULL, NULL, func_808B7380, func_808B77D0, NULL },

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h

@@ -12,11 +12,11 @@ typedef void (*BgBreakwallUnkFunc2)(struct BgBreakwall*, PlayState*);
 #define BGBREAKWALL_GET_F(thisx) ((thisx)-> params & 0xF)
 #define BGBREAKWALL_SWITCHFLAG(thisx) (((thisx)-> params & 0xFE00) >> 9)
 
-enum {
+typedef enum {
     /*  7 */ BGBREAKWALL_F_7 = 7,
     /*  9 */ BGBREAKWALL_F_9 = 9,
-    /* 11 */ BGBREAKWALL_F_11 = 11,
+    /* 11 */ BGBREAKWALL_F_11 = 11
-};
+} BgBreakwallParam;
 
 typedef struct BgBreakwall {
     /* 0x000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h

@@ -9,10 +9,10 @@ struct BgCtowerGear;
 #define BGCTOWERGEAR_GET_TYPE(thisx) ((thisx)->params & 3)
 
 typedef enum {
-    /* 0x0 */ BGCTOWERGEAR_CEILING_COG,
+    /* 0 */ BGCTOWERGEAR_CEILING_COG,
-    /* 0x1 */ BGCTOWERGEAR_CENTER_COG,
+    /* 1 */ BGCTOWERGEAR_CENTER_COG,
-    /* 0x2 */ BGCTOWERGEAR_WATER_WHEEL,
+    /* 2 */ BGCTOWERGEAR_WATER_WHEEL,
-    /* 0x3 */ BGCTOWERGEAR_ORGAN
+    /* 3 */ BGCTOWERGEAR_ORGAN
 } BgCtowerGearType;
 
 typedef struct BgCtowerGear {

src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h

@@ -11,7 +11,7 @@ typedef enum {
     /* 0 */ BGCTOWERROT_CORRIDOR,
     /* 1 */ BGCTOWERROT_STONE_DOOR_MAIN, // Main door controls cutscene flow (updating Link fields and playing sounds). 
                                          // It is the one on the left when entering from the Lost Woods
-    /* 2 */ BGCTOWERROT_STONE_DOOR,
+    /* 2 */ BGCTOWERROT_STONE_DOOR
 } BgCtowerRotType;
 
 typedef struct BgCtowerRot {

src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c

@@ -34,9 +34,9 @@ void func_80A2B308(Actor* thisx, PlayState* play);
 BgDblueMovebg* D_80A2BBF0;
 
 typedef struct {
-    u8 unk_00;
+    /* 0x0 */ u8 unk_00;
-    u8 unk_01;
+    /* 0x1 */ u8 unk_01;
-} BgDblueMovebgUnkStruct;
+} BgDblueMovebgUnkStruct; // size = 0x2
 
 BgDblueMovebgUnkStruct D_80A2BBF4;
 

src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h

@@ -8,9 +8,9 @@ struct BgFireWall;
 typedef void (*BgFireWallActionFunc)(struct BgFireWall*, PlayState*);
 
 typedef enum {
-    /* 0 */ BGFIREWALL_PARAMS_0,
+    /* 0 */ BGFIREWALL_PARAM_0,
-    /* 1 */ BGFIREWALL_PARAMS_1,
+    /* 1 */ BGFIREWALL_PARAM_1
-} BgFireWallParams;
+} BgFireWallParam;
 
 typedef struct BgFireWall {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c

@@ -52,9 +52,9 @@ ActorInit Bg_Hakugin_Post_InitVars = {
 };
 
 typedef struct {
-    f32 unk_00;
+    /* 0x0 */ f32 unk_00;
-    u8 unk_04;
+    /* 0x4 */ u8 unk_04;
-} BgHakuginPostUnkStruct3;
+} BgHakuginPostUnkStruct3; // size = 0x8
 
 static BgHakuginPostUnkStruct3 D_80A9D880[] = {
     { 1200.0f, false }, { 600.0f, false }, { 900.0f, false }, { 870.0f, false },

src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c

@@ -78,7 +78,7 @@ typedef struct {
     /* 0x0C */ f32 unk_C;
     /* 0x10 */ Gfx* unk_10;
     /* 0x14 */ u8 unk_14;
-} BgHakuginSwitchStruct;
+} BgHakuginSwitchStruct; // size = 0x18
 
 BgHakuginSwitchStruct D_80B1688C[] = {
     { -156.0f, -178.0f, 6.0f, 10.0f, object_goronswitch_DL_000268, 0xB4 },

src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c

@@ -116,9 +116,9 @@ Vec3f D_80B8216C = { 225.0f, -280.0f, -210.0f };
 Vec3f D_80B82178 = { -255.0f, -280.0f, 210.0f };
 
 typedef struct {
-    /* 0x00 */ s8 unk_00;
+    /* 0x0 */ s8 unk_00;
-    /* 0x01 */ s8 unk_01;
+    /* 0x1 */ s8 unk_01;
-    /* 0x04 */ Vec3f unk_04;
+    /* 0x4 */ Vec3f unk_04;
 } BgIkanaRotaryroomStruct4; // size = 0x10
 
 BgIkanaRotaryroomStruct4 D_80B82184[2][2] = {

src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h

@@ -9,11 +9,11 @@ typedef void (*BgIknvDoukutuActionFunc)(struct BgIknvDoukutu*, PlayState*);
 
 #define BGIKNVDOUKUTU_GET_F(thisx) ((thisx)->params & 0xF)
 
-enum {
+typedef enum {
-    BGIKNVDOUKUTU_F_0,
+    /* 0 */ BGIKNVDOUKUTU_F_0,
-    BGIKNVDOUKUTU_F_1,
+    /* 1 */ BGIKNVDOUKUTU_F_1,
-    BGIKNVDOUKUTU_F_2,
+    /* 2 */ BGIKNVDOUKUTU_F_2
-};
+} BgIknvDoukutuParam;
 
 typedef struct BgIknvDoukutu {
     /* 0x000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h

@@ -19,7 +19,7 @@ typedef struct BgIknvObj {
 typedef enum {
     /* 0 */ IKNV_OBJ_WATERWHEEL,
     /* 1 */ IKNV_OBJ_RAISED_DOOR, // defunct door covering entrance to Stone Tower
-    /* 2 */ IKNV_OBJ_SAKON_DOOR,  // door to Sakon's Hideout
+    /* 2 */ IKNV_OBJ_SAKON_DOOR   // door to Sakon's Hideout
 } BgIknvObjType;
 
 #endif // Z_BG_IKNV_OBJ_H

src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h

@@ -21,7 +21,7 @@ typedef enum {
     /* 0 */ LADDER_SIZE_12RUNG,
     /* 1 */ LADDER_SIZE_16RUNG,
     /* 2 */ LADDER_SIZE_20RUNG,
-    /* 3 */ LADDER_SIZE_24RUNG,
+    /* 3 */ LADDER_SIZE_24RUNG
 } BgLadderSize;
 
 #endif // Z_BG_LADDER_H

src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h

@@ -12,8 +12,8 @@ typedef void (*BgLastBwallActionFunc)(struct BgLastBwall*, PlayState*);
 #define BGLASTBWALL_GET_TYPE(thisx) (((thisx)->params >> 0xC) & 0xF)
 
 typedef enum {
-    BGLASTBWALL_TYPE_0 = 0,
+    /* 0 */ BGLASTBWALL_TYPE_0,
-    BGLASTBWALL_TYPE_1 = 1,
+    /* 1 */ BGLASTBWALL_TYPE_1
 } BgLastBwallType;
 
 typedef struct BgLastBwall {

src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h

@@ -9,7 +9,7 @@
 
 typedef enum {
     /* 0 */ BG_NUMA_HANA_TYPE_NORMAL,
-    /* 1 */ BG_NUMA_HANA_TYPE_OPEN_FLOWER_COLLISION,
+    /* 1 */ BG_NUMA_HANA_TYPE_OPEN_FLOWER_COLLISION
 } BgNumaHanaType;
 
 struct BgNumaHana;

src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c

@@ -23,8 +23,8 @@ void func_80ACAE5C(BgOpenShutter* this, PlayState* play);
 void func_80ACAEF0(BgOpenShutter* this, PlayState* play);
 
 typedef enum {
-    /* 0x1 */ BGOPENSHUTTER_DOOR_OPEN = 1,
+    /* 1 */ BGOPENSHUTTER_DOOR_OPEN = 1,
-    /* 0x2 */ BGOPENSHUTTER_DOOR_CLOSED,
+    /* 2 */ BGOPENSHUTTER_DOOR_CLOSED
 } BGOpenShutterDoorState;
 
 ActorInit Bg_Open_Shutter_InitVars = {

src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h

@@ -7,12 +7,12 @@
 #define BG_UMAJUMP_GET_TYPE(thisx) ((thisx)->params & 0xFF)
 
 typedef enum {
-    BG_UMAJUMP_TYPE_1 = 1,
+    /* 1 */ BG_UMAJUMP_TYPE_1 = 1,
-    BG_UMAJUMP_TYPE_2,
+    /* 2 */ BG_UMAJUMP_TYPE_2,
-    BG_UMAJUMP_TYPE_3,
+    /* 3 */ BG_UMAJUMP_TYPE_3,
-    BG_UMAJUMP_TYPE_4,
+    /* 4 */ BG_UMAJUMP_TYPE_4,
-    BG_UMAJUMP_TYPE_5,
+    /* 5 */ BG_UMAJUMP_TYPE_5,
-    BG_UMAJUMP_TYPE_6,
+    /* 6 */ BG_UMAJUMP_TYPE_6
 } BgUmaJumpType;
 
 struct BgUmajump;

src/overlays/actors/ovl_Boss_02/z_boss_02.h

@@ -27,15 +27,15 @@ typedef enum {
     /* 1 */ TWINMOLD_EFFECT_SAND,       // The sand kicked up when Twinmold touches the ground
     /* 2 */ TWINMOLD_EFFECT_BLACK_DUST, // Unused
     /* 3 */ TWINMOLD_EFFECT_FRAGMENT,   // The fragments that fly off when the parts of Twinmold explode
-    /* 4 */ TWINMOLD_EFFECT_FLASH,      // The flashes of light that appear when the parts of Twinmold explode
+    /* 4 */ TWINMOLD_EFFECT_FLASH       // The flashes of light that appear when the parts of Twinmold explode
 } TwinmoldEffectType;
 
 typedef enum {
     /*   0 */ TWINMOLD_RED,
     /*  35 */ TWINMOLD_BLUE = 35,
     /* 100 */ TWINMOLD_TAIL = 100,
-    /* 200 */ TWINMOLD_STATIC = 200,
+    /* 200 */ TWINMOLD_STATIC = 200
-} TwinmoldParams;
+} TwinmoldParam;
 
 typedef struct Boss02 {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_Boss_03/z_boss_03.h

@@ -31,7 +31,7 @@ typedef enum {
     /* 1 */ GYORG_EFFECT_BUBBLE,
     /* 2 */ GYORG_EFFECT_DROPLET,
     /* 3 */ GYORG_EFFECT_SPLASH,
-    /* 4 */ GYORG_EFFECT_WET_SPOT,
+    /* 4 */ GYORG_EFFECT_WET_SPOT
 } GyorgEffectType;
 
 typedef struct Boss03 {

src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h

@@ -38,14 +38,14 @@ typedef struct DemoKankyo {
 typedef enum {
     /* 0 */ DEMO_KANKYO_TYPE_LOSTWOODS,
     /* 1 */ DEMO_KANKYO_TYPE_GIANTS,
-    /* 2 */ DEMO_KANKYO_TYPE_MOON,
+    /* 2 */ DEMO_KANKYO_TYPE_MOON
 } DemoKankyoType;
 
 typedef enum {
     /* 0 */ DEMO_KANKYO_STATE_INIT,
     /* 1 */ DEMO_KANKYO_STATE_SINGLE,
     /* 2 */ DEMO_KANKYO_STATE_SKYFISH,
-    /* 3 */ DEMO_KANKYO_STATE_DISABLED,
+    /* 3 */ DEMO_KANKYO_STATE_DISABLED
 } DemoKankyoStateType;
 
 #endif // Z_DEMO_KANKYO_H

src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c

@@ -38,7 +38,7 @@ void DemoMoonend_Init(Actor* thisx, PlayState* play) {
     Actor_SetScale(&this->actor, 0.1f);
     this->actionFunc = DemoMoonend_DoNothing;
 
-    if (DEMOMOONEND_GET_PARAMS_F(thisx) == 1) {
+    if (DEMOMOONEND_GET_PARAM_F(thisx) == 1) {
         Actor_SetScale(&this->actor, 0.05f);
         Actor_SetScale(&this->actor, 6.0f);
         this->actor.draw = NULL;
@@ -60,7 +60,7 @@ void DemoMoonend_Init(Actor* thisx, PlayState* play) {
 void DemoMoonend_Destroy(Actor* thisx, PlayState* play) {
     DemoMoonend* this = THIS;
 
-    if (DEMOMOONEND_GET_PARAMS_F(thisx) != 1) {
+    if (DEMOMOONEND_GET_PARAM_F(thisx) != 1) {
         func_8018349C(&this->skeletonInfo);
     }
 }

src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h

@@ -8,7 +8,7 @@ struct DemoMoonend;
 
 typedef void (*DemoMoonendActionFunc)(struct DemoMoonend*, PlayState*);
 
-#define DEMOMOONEND_GET_PARAMS_F(thisx) (((thisx)->params) & 0xF)
+#define DEMOMOONEND_GET_PARAM_F(thisx) (((thisx)->params) & 0xF)
 
 typedef struct DemoMoonend {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h

@@ -12,13 +12,13 @@ typedef void (*DemoSyotenActionFunc)(struct DemoSyoten*, PlayState*);
 
 #define DEMOSYOTEN_7E00_3F 0x3F
 
-enum {
+typedef enum {
     /* 0 */ DEMOSYOTEN_F_0,
     /* 1 */ DEMOSYOTEN_F_1,
     /* 2 */ DEMOSYOTEN_F_2,
     /* 3 */ DEMOSYOTEN_F_3,
     /* 4 */ DEMOSYOTEN_F_4
-};
+} DemoSyotenParam;
 
 typedef struct DemoSyoten {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c

@@ -24,11 +24,11 @@ void DemoTreLgt_SetupAnimate(DemoTreLgt* this, PlayState* play, f32 frame);
 void DemoTreLgt_Animate(DemoTreLgt* this, PlayState* play);
 
 typedef struct {
-    f32 unk0;
+    /* 0x0 */ f32 unk0;
-    f32 unk4;
+    /* 0x4 */ f32 unk4;
-    f32 unk8;
+    /* 0x8 */ f32 unk8;
-    f32 unkC;
+    /* 0xC */ f32 unkC;
-} DemoTreLgtInfo;
+} DemoTreLgtInfo; // size = 0x10
 
 static DemoTreLgtInfo D_808E1490[2] = {
     { 1.0f, 136.0f, 190.0f, 40.0f },
@@ -53,8 +53,8 @@ static TransformUpdateIndex* sBoxLightAnimations[] = {
 };
 
 typedef enum {
-    /* 0x00 */ DEMO_TRE_LGT_ACTION_WAIT, // wait until animation is needed
+    /* 0 */ DEMO_TRE_LGT_ACTION_WAIT, // wait until animation is needed
-    /* 0x01 */ DEMO_TRE_LGT_ACTION_ANIMATE
+    /* 1 */ DEMO_TRE_LGT_ACTION_ANIMATE
 } DemoTreLgtAction;
 
 static DemoTreLgtActionFunc sActionFuncs[] = {

src/overlays/actors/ovl_Dm_Al/z_dm_al.h

@@ -22,8 +22,8 @@ typedef struct DmAl {
 } DmAl; // size = 0x460
 
 typedef enum {
-    /* 0x0 */ MADAME_AROMA_ANIMATION_0,
+    /* 0 */ MADAME_AROMA_ANIMATION_0,
-    /* 0x1 */ MADAME_AROMA_ANIMATION_1
+    /* 1 */ MADAME_AROMA_ANIMATION_1
 } DmAlAnimations;
 
 #endif // Z_DM_AL_H

src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h

@@ -9,12 +9,12 @@ typedef void (*DmChar01ActionFunc)(struct DmChar01*, PlayState*);
 
 #define DMCHAR01_GET(thisx) ((thisx)->params)
 
-enum {
+typedef enum {
     /* 0 */ DMCHAR01_0,
     /* 1 */ DMCHAR01_1,
     /* 2 */ DMCHAR01_2,
-    /* 3 */ DMCHAR01_3,
+    /* 3 */ DMCHAR01_3
-};
+} DmChar01Param;
 
 typedef struct DmChar01 {
     /* 0x000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c

@@ -35,7 +35,7 @@ typedef enum {
     /* 0 */ DMCHAR02_ANIM_HIT_GROUND,
     /* 1 */ DMCHAR02_ANIM_TURN_AROUND,
     /* 2 */ DMCHAR02_ANIM_JUGGLE,
-    /* 3 */ DMCHAR02_ANIM_FALL,
+    /* 3 */ DMCHAR02_ANIM_FALL
 } DmChar02Animation;
 
 static AnimationInfo sAnimationInfo[] = {

src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h

@@ -9,7 +9,7 @@ typedef void (*DmChar05ActionFunc)(struct DmChar05*, PlayState*);
 
 #define DMCHAR05_GET(thisx) ((thisx)->params)
 
-enum {
+typedef enum {
     /* 0 */ DMCHAR05_0,
     /* 1 */ DMCHAR05_1,
     /* 2 */ DMCHAR05_2,
@@ -22,8 +22,8 @@ enum {
     /* 9 */ DMCHAR05_9,
     /* 10 */ DMCHAR05_10,
     /* 11 */ DMCHAR05_11,
-    /* 12 */ DMCHAR05_12,
+    /* 12 */ DMCHAR05_12
-};
+} DmChar05Param;
 
 typedef struct DmChar05 {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c

@@ -38,8 +38,8 @@ typedef enum {
     /* 2 */ TURTLE_EYEMODE_CLOSED,
     /* 3 */ TURTLE_EYEMODE_LOOK_STRAIGHT,
     /* 4 */ TURTLE_EYEMODE_UNUSED,
-    /* 5 */ TURTLE_EYEMODE_LOOK_RIGHT,
+    /* 5 */ TURTLE_EYEMODE_LOOK_RIGHT
-} EyeMode;
+} TurtleEyeMode;
 
 typedef enum {
     /* 0 */ TURTLE_ANIM_IDLE,
@@ -48,7 +48,7 @@ typedef enum {
     /* 3 */ TURTLE_ANIM_SPEAK1,
     /* 4 */ TURTLE_ANIM_COUGH,
     /* 5 */ TURTLE_ANIM_SPEAK2,
-    /* 6 */ TURTLE_ANIM_YAWN,
+    /* 6 */ TURTLE_ANIM_YAWN
 } TurtleAnimation;
 
 ActorInit Dm_Char08_InitVars = {

src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h

@@ -14,7 +14,7 @@ typedef enum {
     /* 0 */ DMOPSTAGE_TYPE_GROUND,
     /* 1 */ DMOPSTAGE_TYPE_ROOT_TREE,
     /* 2 */ DMOPSTAGE_TYPE_CUT_TREE,
-    /* 3 */ DMOPSTAGE_TYPE_STRAIGHT_TREE,
+    /* 3 */ DMOPSTAGE_TYPE_STRAIGHT_TREE
 } DmOpStageTypes;
 
 typedef struct DmOpstage {

src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h

@@ -10,7 +10,7 @@ typedef void (*DmRavineActionFunc)(struct DmRavine*, PlayState*);
 typedef enum {
     /* 0 */ DM_RAVINE_STATE_INITIALIZED,
     /* 1 */ DM_RAVINE_STATE_ACTIVE,
-    /* 2 */ DM_RAVINE_STATE_PENDING_DEATH,
+    /* 2 */ DM_RAVINE_STATE_PENDING_DEATH
 } DmRavineState;
 
 typedef struct DmRavine {

src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c

@@ -108,7 +108,7 @@ typedef enum {
     /* 68 */ SK_ANIM_LOOK_LEFT_START,
     /* 69 */ SK_ANIM_LOOK_LEFT_LOOP,
     /* 70 */ SK_ANIM_SNIFF,
-    /* 71 */ SK_ANIM_LAUGH_AFTER_SNIFF,
+    /* 71 */ SK_ANIM_LAUGH_AFTER_SNIFF
 } SkullKidAnimation;
 
 typedef enum {
@@ -116,7 +116,7 @@ typedef enum {
     /* 1 */ SK_MASK_TYPE_NORMAL,
     /* 2 */ SK_MASK_TYPE_GLOWING_EYES,
     /* 3 */ SK_MASK_TYPE_FADING_OUT,
-    /* 9 */ SK_MASK_TYPE_RAISED = 9,
+    /* 9 */ SK_MASK_TYPE_RAISED = 9
 } SkullKidMaskType;
 
 typedef enum {
@@ -127,19 +127,19 @@ typedef enum {
     /* 4 */ SK_HAND_TYPE_JUGGLING_OR_DROPPING_OCARINA,
     /* 5 */ SK_HAND_TYPE_HOLDING_MAJORAS_MASK_AND_FLUTE,
     /* 6 */ SK_HAND_TYPE_HOLDING_FLUTE,
-    /* 9 */ SK_HAND_TYPE_DEFAULT = 9,
+    /* 9 */ SK_HAND_TYPE_DEFAULT = 9
 } SkullKidHandType;
 
 typedef enum {
     /* 0 */ SK_FADE_IN_STATE_NONE,
     /* 1 */ SK_FADE_IN_STATE_START,
     /* 2 */ SK_FADE_IN_STATE_INCREASE_FOG,
-    /* 3 */ SK_FADE_IN_STATE_INCREASE_ALPHA,
+    /* 3 */ SK_FADE_IN_STATE_INCREASE_ALPHA
 } SkullKidFadeInState;
 
 typedef enum {
     /* 0 */ SK_FADE_OUT_STATE_NONE,
-    /* 1 */ SK_FADE_OUT_STATE_FADING_OUT,
+    /* 1 */ SK_FADE_OUT_STATE_FADING_OUT
 } SkullKidFadeOutState;
 
 typedef enum {

src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h

@@ -12,7 +12,7 @@ typedef void (*DmStkActionFunc)(struct DmStk*, PlayState*);
 
 typedef enum {
     /* 0 */ DM_STK_TYPE_SKULL_KID,
-    /* 1 */ DM_STK_TYPE_MAJORAS_MASK,
+    /* 1 */ DM_STK_TYPE_MAJORAS_MASK
 } DmStkType;
 
 typedef struct DmStk {

src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c

@@ -47,7 +47,7 @@ typedef enum {
     /* 4 */ ZELDA_ANIM_GIVING_OCARINA,
     /* 5 */ ZELDA_ANIM_PLAYING_OCARINA_START,
     /* 6 */ ZELDA_ANIM_PLAYING_OCARINA,
-    /* 7 */ ZELDA_ANIM_MAX,
+    /* 7 */ ZELDA_ANIM_MAX
 } DmZlAnimation;
 
 static TexturePtr sMouthTextures[] = {
@@ -61,7 +61,7 @@ typedef enum {
     /* 0 */ ZELDA_MOUTH_NEUTRAL,
     /* 1 */ ZELDA_MOUTH_SMILING,
     /* 2 */ ZELDA_MOUTH_FROWNING,
-    /* 3 */ ZELDA_MOUTH_OPEN,
+    /* 3 */ ZELDA_MOUTH_OPEN
 } DmZlMouthTextures;
 
 static TexturePtr sEyeTextures[] = {
@@ -81,7 +81,7 @@ typedef enum {
     /* 3 */ ZELDA_EYE_WIDE,
     /* 4 */ ZELDA_EYE_HAPPY,
     /* 5 */ ZELDA_EYE_OPEN_LOOKING_LEFT,
-    /* 6 */ ZELDA_EYE_OPEN_LOOKING_RIGHT,
+    /* 6 */ ZELDA_EYE_OPEN_LOOKING_RIGHT
 } DmZlEyeTextures;
 
 // Unused in MM
@@ -92,7 +92,7 @@ typedef enum {
     /* 3 */ ZELDA_EYE_STATE_LOOKING_RIGHT,
     /* 4 */ ZELDA_EYE_STATE_WIDE,
     /* 5 */ ZELDA_EYE_STATE_HAPPY,
-    /* 6 */ ZELDA_EYE_STATE_CLOSED2,
+    /* 6 */ ZELDA_EYE_STATE_CLOSED2
 } DmZlEyeStates;
 
 /**

src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c

@@ -101,8 +101,8 @@ static InitChainEntry sInitChain[] = {
 };
 
 typedef struct {
-    /* 0x00 */ s16 sceneId;
+    /* 0x0 */ s16 sceneId;
-    /* 0x02 */ u8 index;
+    /* 0x2 */ u8 index;
 } ShutterSceneInfo; // size = 0x4
 
 ShutterSceneInfo D_808A2258[] = {
@@ -115,9 +115,9 @@ ShutterSceneInfo D_808A2258[] = {
 };
 
 typedef struct {
-    /* 0x00 */ s16 dungeonSceneId;
+    /* 0x0 */ s16 dungeonSceneId;
-    /* 0x02 */ s16 bossSceneId;
+    /* 0x2 */ s16 bossSceneId;
-    /* 0x04 */ u8 index;
+    /* 0x4 */ u8 index;
 } BossDoorInfo; // size = 0x6
 
 BossDoorInfo D_808A22A0[] = {

src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h

@@ -13,15 +13,15 @@ typedef void (*DoorWarp1ActionFunc)(struct DoorWarp1*, PlayState*);
 #define DOORWARP1_GET_FF00_2(thisx) ((thisx)->params & 0xFF00)
 #define DOORWARP1_GET_FF00_3(thisx) ((thisx)->params >> 8)
 
-enum {
+typedef enum {
     /* 0 */ ENDOORWARP1_FF_0,
     /* 1 */ ENDOORWARP1_FF_1,
     /* 2 */ ENDOORWARP1_FF_2,
     /* 3 */ ENDOORWARP1_FF_3,
     /* 4 */ ENDOORWARP1_FF_4,
     /* 5 */ ENDOORWARP1_FF_5,
-    /* 6 */ ENDOORWARP1_FF_6,
+    /* 6 */ ENDOORWARP1_FF_6
-};
+} DoorWarp1Param;
 
 typedef struct DoorWarp1 {
     /* 0x000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h

@@ -22,12 +22,12 @@ typedef struct EffDust {
 } EffDust; // size = 0x560
 
 typedef enum {
-    /* 0x0 */ EFF_DUST_TYPE_0,
+    /* 0 */ EFF_DUST_TYPE_0,
-    /* 0x1 */ EFF_DUST_TYPE_1,
+    /* 1 */ EFF_DUST_TYPE_1,
-    /* 0x2 */ EFF_DUST_TYPE_SPIN_ATTACK_CHARGE,
+    /* 2 */ EFF_DUST_TYPE_SPIN_ATTACK_CHARGE,
-    /* 0x3 */ EFF_DUST_TYPE_3,
+    /* 3 */ EFF_DUST_TYPE_3,
-    /* 0x4 */ EFF_DUST_TYPE_4,
+    /* 4 */ EFF_DUST_TYPE_4,
-    /* 0x5 */ EFF_DUST_TYPE_5
+    /* 5 */ EFF_DUST_TYPE_5
 } EffDustType;
 
 #endif // Z_EFF_DUST_H

src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c

@@ -49,7 +49,7 @@ void EffKamejimaWave_Init(Actor* thisx, PlayState* play) {
 
     Actor_SetScale(&this->actor, 0.2f);
     this->actor.scale.y = 0.0f;
-    if (EFFKAMEJIMAWAVE_GET_F(thisx) == EFFKAMEJIMAWAVE_PARAMS_1) {
+    if (EFFKAMEJIMAWAVE_GET_F(thisx) == EFFKAMEJIMAWAVE_PARAM_1) {
         this->actionFunc = func_80BCEDE0;
         sVtxAlpha = 255;
     } else {

src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h

@@ -16,9 +16,9 @@ typedef struct EffKamejimaWave {
     /* 0x14C */ EffKamejimaWaveActionFunc actionFunc;
 } EffKamejimaWave; // size = 0x150
 
-typedef enum params {
+typedef enum EffKamejimaWaveParam {
-    /* 0x0 */ EFFKAMEJIMAWAVE_PARAMS_0,
+    /* 0 */ EFFKAMEJIMAWAVE_PARAM_0,
-    /* 0x1 */ EFFKAMEJIMAWAVE_PARAMS_1
+    /* 1 */ EFFKAMEJIMAWAVE_PARAM_1
-} EffKamejimaWaveParams;
+} EffKamejimaWaveParam;
 
 #endif // Z_EFF_KAMEJIMA_WAVE_H

src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c

@@ -22,10 +22,10 @@ void func_80BEBEB8(EffLastday* this, PlayState* play);
 void func_80BEBF78(EffLastday* this, PlayState* play);
 
 typedef enum EffLastDayAction {
-    /* 0x0 */ EFFLASTDAY_ACTION_NONE,
+    /* 0 */ EFFLASTDAY_ACTION_NONE,
-    /* 0x1 */ EFFLASTDAY_ACTION_1,
+    /* 1 */ EFFLASTDAY_ACTION_1,
-    /* 0x2 */ EFFLASTDAY_ACTION_2,
+    /* 2 */ EFFLASTDAY_ACTION_2,
-    /* 0x3 */ EFFLASTDAY_ACTION_3
+    /* 3 */ EFFLASTDAY_ACTION_3
 } EffLastDayAction;
 
 ActorInit Eff_Lastday_InitVars = {
@@ -46,7 +46,7 @@ void EffLastday_Init(Actor* thisx, PlayState* play2) {
 
     Actor_SetScale(&this->actor, 0.1f);
     switch (EFFLASTDAY_GET_F(&this->actor)) {
-        case EFFLASTDAY_PARAMS_1:
+        case EFFLASTDAY_PARAM_1:
             this->dList = object_lastday_DL_000510;
             this->matAnim = Lib_SegmentedToVirtual(object_lastday_Matanimheader_000608);
             this->cueType = CS_CMD_ACTOR_CUE_508;
@@ -54,7 +54,7 @@ void EffLastday_Init(Actor* thisx, PlayState* play2) {
             Actor_SetScale(&this->actor, 1.0f);
             break;
 
-        case EFFLASTDAY_PARAMS_2:
+        case EFFLASTDAY_PARAM_2:
             this->dList = object_lastday_DL_000210;
             this->matAnim = Lib_SegmentedToVirtual(object_lastday_Matanimheader_000308);
             this->cueType = CS_CMD_ACTOR_CUE_509;
@@ -62,7 +62,7 @@ void EffLastday_Init(Actor* thisx, PlayState* play2) {
             Actor_SetScale(&this->actor, 0.5f);
             break;
 
-        case EFFLASTDAY_PARAMS_3:
+        case EFFLASTDAY_PARAM_3:
             this->dList = object_lastday_DL_000060;
             this->matAnim = Lib_SegmentedToVirtual(object_lastday_Matanimheader_000148);
             this->cueType = CS_CMD_ACTOR_CUE_510;
@@ -79,13 +79,13 @@ void EffLastday_Init(Actor* thisx, PlayState* play2) {
             Actor_SetScale(&this->actor, 1.0f);
             Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EFF_LASTDAY, this->actor.world.pos.x,
                                this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.world.rot.y, 0,
-                               EFFLASTDAY_PARAMS_1);
+                               EFFLASTDAY_PARAM_1);
             Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EFF_LASTDAY, this->actor.world.pos.x,
                                this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.world.rot.y, 0,
-                               EFFLASTDAY_PARAMS_2);
+                               EFFLASTDAY_PARAM_2);
             Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EFF_LASTDAY, this->actor.world.pos.x,
                                this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.world.rot.y, 0,
-                               EFFLASTDAY_PARAMS_3);
+                               EFFLASTDAY_PARAM_3);
             break;
     }
 }
@@ -238,10 +238,10 @@ void EffLastday_Draw(Actor* thisx, PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx);
 
     switch (EFFLASTDAY_GET_F(thisx)) {
-        case EFFLASTDAY_PARAMS_1:
+        case EFFLASTDAY_PARAM_1:
-        case EFFLASTDAY_PARAMS_2:
+        case EFFLASTDAY_PARAM_2:
             break;
-        case EFFLASTDAY_PARAMS_3:
+        case EFFLASTDAY_PARAM_3:
             EffLastday_SetVtxAlpha(this->alpha);
             break;
         default:

src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h

@@ -19,11 +19,11 @@ typedef struct EffLastday {
     /* 0x154 */ EffLastdayActionFunc actionFunc;
 } EffLastday; // size = 0x158
 
-typedef enum EffLastDayParams {
+typedef enum EffLastDayParam {
-    /* 0x0 */ EFFLASTDAY_PARAMS_0,
+    /* 0 */ EFFLASTDAY_PARAM_0,
-    /* 0x1 */ EFFLASTDAY_PARAMS_1,
+    /* 1 */ EFFLASTDAY_PARAM_1,
-    /* 0x2 */ EFFLASTDAY_PARAMS_2,
+    /* 2 */ EFFLASTDAY_PARAM_2,
-    /* 0x3 */ EFFLASTDAY_PARAMS_3
+    /* 3 */ EFFLASTDAY_PARAM_3
-} EffLastDayParams;
+} EffLastDayParam;
 
 #endif // Z_EFF_LASTDAY_H

src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h

@@ -14,10 +14,10 @@ typedef void (*EnAkindonutsUnkFunc)(struct EnAkindonuts*, PlayState*);
 
 #define ENAKINDONUTS_PATH_INDEX_NONE 0x3F
 
-enum {
+typedef enum {
     /* 1 */ ENAKINDONUTS_3_1 = 1,
-    /* 2 */ ENAKINDONUTS_3_2,
+    /* 2 */ ENAKINDONUTS_3_2
-};
+} EnAkindonutsParam;
 
 typedef struct EnAkindonuts {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_En_Ani/z_en_ani.h

@@ -28,10 +28,10 @@ typedef struct EnAni {
     /* 0x2FC */ EnAniActionFunc actionFunc;
 } EnAni; // size = 0x300
 
-enum EnAniType {
+typedef enum EnAniType {
-  /* else */ ANI_TYPE_STANDING,         // unfinshed and unused
+  /* 1 */ ANI_TYPE_TREE_HANGING = 1,
-  /* 1    */ ANI_TYPE_TREE_HANGING = 1,
+  /* 2 */ ANI_TYPE_STANDING // unfinshed and unused. Never read as 2, only taken as the "else" case from `ANI_TYPE_TREE_HANGING`
-};
+} EnAniType;
 
 #define ANI_GET_TYPE(thisx) ((thisx)->params & 0xFF) 
 

src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c

@@ -50,14 +50,14 @@ typedef enum {
     /* 2 */ EN_AOB01_ANIM_LAUGH_LOOP,
     /* 3 */ EN_AOB01_ANIM_SURPRISE_START,
     /* 4 */ EN_AOB01_ANIM_SURPRISE_LOOP,
-    /* 5 */ EN_AOB01_ANIM_IDLE_2,
+    /* 5 */ EN_AOB01_ANIM_IDLE_2
 } EnAob01Animation;
 
 typedef enum {
     /* 0 */ EN_AOB01_EYE_OPEN,
     /* 1 */ EN_AOB01_EYE_HALF,
     /* 2 */ EN_AOB01_EYE_CLOSED,
-    /* 3 */ EN_AOB01_EYE_MAX,
+    /* 3 */ EN_AOB01_EYE_MAX
 } EnAob01EyeTexture;
 
 static AnimationInfo sAnimationInfo[] = {

src/overlays/actors/ovl_En_Az/z_en_az.c

@@ -72,7 +72,7 @@ typedef enum {
     /* 10 */ BEAVER_ANIM_TALK_TO_RIGHT,
     /* 11 */ BEAVER_ANIM_BOW,
     /* 12 */ BEAVER_ANIM_IDLE_FACE_LEFT,
-    /* 13 */ BEAVER_ANIM_IDLE_FACE_RIGHT,
+    /* 13 */ BEAVER_ANIM_IDLE_FACE_RIGHT
 } BeaverAnimation;
 
 static AnimationSpeedInfo sAnimationInfo[] = {

src/overlays/actors/ovl_En_Baguo/z_en_baguo.c

@@ -27,18 +27,18 @@ void EnBaguo_UpdateEffects(EnBaguo* this, PlayState* play);
 void EnBaguo_DrawEffects(EnBaguo* this, PlayState* play);
 
 typedef enum {
-    /* 0x0 */ NEJIRON_ACTION_INACTIVE,   // The Nejiron is either underground or emerging from underground
+    /* 0 */ NEJIRON_ACTION_INACTIVE,   // The Nejiron is either underground or emerging from underground
-    /* 0x1 */ NEJIRON_ACTION_ACTIVE,     // The Nejiron is above ground and actively chasing the player
+    /* 1 */ NEJIRON_ACTION_ACTIVE,     // The Nejiron is above ground and actively chasing the player
-    /* 0x2 */ NEJIRON_ACTION_RETREATING, // The Nejiron is burrowing back underground
+    /* 2 */ NEJIRON_ACTION_RETREATING, // The Nejiron is burrowing back underground
-    /* 0x3 */ NEJIRON_ACTION_EXPLODING   // The Nejiron has detonated
+    /* 3 */ NEJIRON_ACTION_EXPLODING   // The Nejiron has detonated
 } NejironAction;
 
 /**
  * These directions are relative to the Nejiron.
  */
 typedef enum {
-    /* 0x0 */ NEJIRON_DIRECTION_RIGHT,
+    /* 0 */ NEJIRON_DIRECTION_RIGHT,
-    /* 0x1 */ NEJIRON_DIRECTION_LEFT
+    /* 1 */ NEJIRON_DIRECTION_LEFT
 } NejironRollDirection;
 
 ActorInit En_Baguo_InitVars = {

src/overlays/actors/ovl_En_Bb/z_en_bb.c

@@ -32,7 +32,7 @@ void EnBb_Revive(EnBb* this, PlayState* play);
 typedef enum {
     /* -1 */ BB_BODY_PART_DRAW_STATUS_BROKEN = -1,
     /*  0 */ BB_BODY_PART_DRAW_STATUS_ALIVE,
-    /*  1 */ BB_BODY_PART_DRAW_STATUS_DEAD,
+    /*  1 */ BB_BODY_PART_DRAW_STATUS_DEAD
 } EnBbBodyPartDrawStatus;
 
 ActorInit En_Bb_InitVars = {
@@ -73,7 +73,7 @@ typedef enum {
     /* 0x3 */ EN_BB_DMGEFF_ICE_ARROW = 0x3,
     /* 0x4 */ EN_BB_DMGEFF_LIGHT_ARROW,
     /* 0x5 */ EN_BB_DMGEFF_ZORA_MAGIC,
-    /* 0xE */ EN_BB_DMGEFF_HOOKSHOT = 0xE,
+    /* 0xE */ EN_BB_DMGEFF_HOOKSHOT = 0xE
 } EnBbDamageEffect;
 
 static DamageTable sDamageTable = {

src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c

@@ -32,7 +32,7 @@ void EnBbfall_Frozen(EnBbfall* this, PlayState* play);
 typedef enum {
     /* -1 */ BBFALL_BODY_PART_DRAW_STATUS_BROKEN = -1,
     /*  0 */ BBFALL_BODY_PART_DRAW_STATUS_ALIVE,
-    /*  1 */ BBFALL_BODY_PART_DRAW_STATUS_DEAD,
+    /*  1 */ BBFALL_BODY_PART_DRAW_STATUS_DEAD
 } EnBbfallBodyPartDrawStatus;
 
 ActorInit En_Bbfall_InitVars = {
@@ -102,7 +102,7 @@ typedef enum {
     /* 0x3 */ EN_BBFALL_DMGEFF_ICE_ARROW = 0x3,
     /* 0x4 */ EN_BBFALL_DMGEFF_LIGHT_ARROW,
     /* 0x5 */ EN_BBFALL_DMGEFF_ZORA_MAGIC,
-    /* 0xE */ EN_BBFALL_DMGEFF_HOOKSHOT = 0xE,
+    /* 0xE */ EN_BBFALL_DMGEFF_HOOKSHOT = 0xE
 } EnBbfallDamageEffect;
 
 static DamageTable sDamageTable = {

src/overlays/actors/ovl_En_Bee/z_en_bee.h

@@ -9,8 +9,8 @@ struct EnBee;
 typedef void (*EnBeeActionFunc)(struct EnBee*, PlayState*);
 
 typedef enum {
-    /* 0 */ BEE_BEHAVIOR_IDLE = 0,
+    /* 0 */ BEE_BEHAVIOR_IDLE,
-    /* 1 */ BEE_BEHAVIOR_ATTACK,
+    /* 1 */ BEE_BEHAVIOR_ATTACK
 } BeeBehaviorType;
 
 typedef struct EnBee {

src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h

@@ -8,10 +8,10 @@ struct EnBigpamet;
 
 typedef void (*EnBigpametActionFunc)(struct EnBigpamet*, PlayState*);
 
-enum {
+typedef enum {
     /* 0 */ ENBIGPAMET_0,    
-    /* 1 */ ENBIGPAMET_1,    
+    /* 1 */ ENBIGPAMET_1
-};
+} EnBigpametParam;
 
 typedef struct {
     /* 0x00 */ Vec3f unk_00;

src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h

@@ -53,16 +53,16 @@ typedef struct EnBigpo {
     /* 0x338 */ EnBigpoFireEffect fires[3];
 } EnBigpo; // size = 0x398
 
-// well ver is regular, dampe basement ver is summoned
+// well version is "regular" (spawns automatically), dampe basement version is "summoned"
-// on spawn, 3/possible fires are turned into chosenfire
+// on room enter, 3 "possiblefire" are turned into "chosenfire" at random
-enum EnBigpoType {
+typedef enum EnBigpoType {
   /* 0 */ ENBIGPO_REGULAR,
   /* 1 */ ENBIGPO_SUMMONED,
   /* 2 */ ENBIGPO_POSSIBLEFIRE,
   /* 3 */ ENBIGPO_CHOSENFIRE,
   /* 4 */ ENBIGPO_REVEALEDFIRE,
-  /* 5 */ ENBIGPO_UNK5,
+  /* 5 */ ENBIGPO_UNK5
-};
+} EnBigpoType;
 
 #define BIGPO_GET_SWITCHFLAGS(thisx) (u8)((thisx)->params >> 0x8) 
 

src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c

@@ -254,7 +254,7 @@ typedef enum {
     /* 0x5 */ BIGSLIME_DMGEFF_ELECTRIC_STUN,
     /* 0xD */ BIGSLIME_DMGEFF_DEKU_STUN = 0xD,
     /* 0xE */ BIGSLIME_DMGEFF_HOOKSHOT,
-    /* 0xF */ BIGSLIME_DMGEFF_BREAK_ICE,
+    /* 0xF */ BIGSLIME_DMGEFF_BREAK_ICE
 } BigslimeDamageEffect;
 
 static DamageTable sDamageTable = {

src/overlays/actors/ovl_En_Bjt/z_en_bjt.c

@@ -229,7 +229,7 @@ typedef enum {
     /* 1 */ TOILET_HAND_BEHAVIOUR_TAKE_ITEM,     // take paper and disappear to use it
     /* 2 */ TOILET_HAND_BEHAVIOUR_USE_ITEM,      // using paper, flushing
     /* 3 */ TOILET_HAND_BEHAVIOUR_REAPPEAR,      // reappear with reward
-    /* 4 */ TOILET_HAND_BEHAVIOUR_REWARD_GIVEN,
+    /* 4 */ TOILET_HAND_BEHAVIOUR_REWARD_GIVEN
 } ToiletHandBehaviour;
 
 // msgevent callback/communication. Follow and choose parts of script to run

src/overlays/actors/ovl_En_Bom/z_en_bom.h

@@ -13,14 +13,14 @@ typedef void (*EnBomActionFunc)(struct EnBom*, PlayState*);
 
 typedef enum BombType {
     /* 0 */ BOMB_TYPE_BODY,
-    /* 1 */ BOMB_TYPE_EXPLOSION,
+    /* 1 */ BOMB_TYPE_EXPLOSION
 } BombType;
 
 // Passed via x rotation
-typedef enum EnBomExplosiveType {
+typedef enum BombExplosiveType {
     /* 0 */ BOMB_EXPLOSIVE_TYPE_BOMB,
-    /* 1 */ BOMB_EXPLOSIVE_TYPE_POWDER_KEG,
+    /* 1 */ BOMB_EXPLOSIVE_TYPE_POWDER_KEG
-} EnBomExplosiveType;
+} BombExplosiveType;
 
 typedef struct EnBom {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_En_Bombers/z_en_bombers.h

@@ -10,13 +10,13 @@ typedef void (*EnBombersActionFunc)(struct EnBombers*, PlayState*);
 #define ENBOMBERS_GET_F(thisx) ((thisx)->params & 0xF)
 #define ENBOMBERS_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
 
-enum {
+typedef enum {
     /* 0 */ ENBOMBERS_F_0,
     /* 1 */ ENBOMBERS_F_1,
     /* 2 */ ENBOMBERS_F_2,
     /* 3 */ ENBOMBERS_F_3,
-    /* 4 */ ENBOMBERS_F_4,
+    /* 4 */ ENBOMBERS_F_4
-};
+} EnBombersParam;
 
 #define ENBOMBERS_F0_0 0
 

src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c

@@ -39,7 +39,7 @@ void func_80C00168(EnBomjima* this, PlayState* play);
 void func_80C00234(EnBomjima* this);
 void func_80C00284(EnBomjima* this, PlayState* play);
 
-typedef enum EN_BOMJIMA_ACTION {
+typedef enum EnBomjimaAction {
     /* 0 */ EN_BOMJIMA_ACTION_0,
     /* 1 */ EN_BOMJIMA_ACTION_1,
     /* 2 */ EN_BOMJIMA_ACTION_2,
@@ -47,8 +47,8 @@ typedef enum EN_BOMJIMA_ACTION {
     /* 4 */ EN_BOMJIMA_ACTION_4,
     /* 5 */ EN_BOMJIMA_ACTION_5,
     /* 6 */ EN_BOMJIMA_ACTION_6,
-    /* 7 */ EN_BOMJIMA_ACTION_7,
+    /* 7 */ EN_BOMJIMA_ACTION_7
-} EN_BOMJIMA_ACTION;
+} EnBomjimaAction;
 
 static s32 D_80C009F0 = 0;
 static s32 D_80C009F4 = 0;

src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h

@@ -11,19 +11,19 @@ typedef void (*EnBomjimbActionFunc)(struct EnBomjimb*, PlayState*);
 #define ENBOMJIMB_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
 #define ENBOMJIMB_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
 
-enum {
+typedef enum {
     /* 0 */ ENBOMJIMB_F_0,
     /* 1 */ ENBOMJIMB_F_1,
     /* 2 */ ENBOMJIMB_F_2,
     /* 3 */ ENBOMJIMB_F_3,
-    /* 4 */ ENBOMJIMB_F_4,
+    /* 4 */ ENBOMJIMB_F_4
-};
+} EnBomjimbParamF;
 
-enum {
+typedef enum {
     /* 0 */ ENBOMJIMB_F0_0,
     /* 1 */ ENBOMJIMB_F0_1,
-    /* 2 */ ENBOMJIMB_F0_2,
+    /* 2 */ ENBOMJIMB_F0_2
-};
+} EnBomjimbParamF0;
 
 typedef struct EnBomjimb {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_En_Boom/z_en_boom.c

@@ -311,7 +311,7 @@ typedef struct {
     /* 0x00 */ Gfx* unk_00;
     /* 0x04 */ Vec3f unk_04;
     /* 0x10 */ Vec3f unk_10;
-} EnBoomStruct;
+} EnBoomStruct; // size = 0x1C
 
 EnBoomStruct D_808A3078[] = {
     { gameplay_keep_DL_06FE20, { -960.0f, 0.0f, 0.0f }, { 960.0f, 0.0f, 0.0f } },

src/overlays/actors/ovl_En_Box/z_en_box.c

@@ -73,7 +73,7 @@ static InitChainEntry sInitChain[] = {
 };
 
 typedef struct {
-    f32 data[5];
+    /* 0x0 */ f32 data[5];
 } EnBox_PlaybackSpeed; // 0x14
 
 static EnBox_PlaybackSpeed sPlaybackSpeed = { { 1.5f, 1.0f, 1.5f, 1.0f, 1.5f } };

src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c

@@ -20,7 +20,7 @@ typedef enum {
     /* 0x05 */ CLEAR_TAG_EFFECT_LIGHT_RAYS,
     /* 0x06 */ CLEAR_TAG_EFFECT_SHOCKWAVE,
     /* 0x07 */ CLEAR_TAG_EFFECT_SPLASH,
-    /* 0x08 */ CLEAR_TAG_EFFECT_ISOLATED_SMOKE,
+    /* 0x08 */ CLEAR_TAG_EFFECT_ISOLATED_SMOKE
 } ClearTagEffectType;
 
 void EnClearTag_Init(Actor* thisx, PlayState* play);

src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h

@@ -21,7 +21,7 @@ typedef enum {
     /* 1 */ EN_COL_MAN_RECOVERY_HEART,
     /* 2 */ EN_COL_MAN_FALLING_ROCK,
     /* 3 */ EN_COL_MAN_CUTSCENE_BOMB,
-    /* 4 */ EN_COL_MAN_GAMEPLAY_BOMB,
+    /* 4 */ EN_COL_MAN_GAMEPLAY_BOMB
 } EnColManType;
 
 #endif // Z_EN_COL_MAN_H

src/overlays/actors/ovl_En_Cow/z_en_cow.h

@@ -10,9 +10,9 @@
 #define EN_COW_FLAG_WONT_GIVE_MILK (1 << 2)
 
 typedef enum {
-    /*  0 */ EN_COW_TYPE_DEFAULT,
+    /* 0 */ EN_COW_TYPE_DEFAULT,
-    /*  1 */ EN_COW_TYPE_TAIL,
+    /* 1 */ EN_COW_TYPE_TAIL,
-    /*  2 */ EN_COW_TYPE_ABDUCTED,
+    /* 2 */ EN_COW_TYPE_ABDUCTED
 } EnCowType;
 
 struct EnCow;

src/overlays/actors/ovl_En_Crow/z_en_crow.c

@@ -74,7 +74,7 @@ typedef enum {
     /* 2 */ GUAY_DMGEFF_FIRE,
     /* 3 */ GUAY_DMGEFF_ICE,
     /* 4 */ GUAY_DMGEFF_LIGHT,
-    /* 5 */ GUAY_DMGEFF_ELECTRIC,
+    /* 5 */ GUAY_DMGEFF_ELECTRIC
 } GuayDamageEffect;
 
 static DamageTable sDamageTable = {

src/overlays/actors/ovl_En_Daiku/z_en_daiku.c

@@ -76,14 +76,14 @@ void EnDaiku_Init(Actor* thisx, PlayState* play) {
     this->actor.targetMode = 0;
     Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
     this->unk_278 = ENDAIKU_GET_FF(&this->actor);
-    if (this->unk_278 == ENDAIKU_PARAMS_FF_3) {
+    if (this->unk_278 == ENDAIKU_PARAM_FF_3) {
         this->pathIndex = ENDAIKU_GET_PATH_INDEX(&this->actor);
         this->path = SubS_GetPathByIndex(play, this->pathIndex, ENDAIKU_PATH_INDEX_NONE);
-    } else if (this->unk_278 == ENDAIKU_PARAMS_FF_2) {
+    } else if (this->unk_278 == ENDAIKU_PARAM_FF_2) {
         this->unk_264 = -2000;
     }
 
-    if (this->unk_278 == ENDAIKU_PARAMS_FF_0) {
+    if (this->unk_278 == ENDAIKU_PARAM_FF_0) {
         this->collider.dim.radius = 30;
         this->collider.dim.height = 60;
         this->collider.dim.yShift = 0;
@@ -100,20 +100,20 @@ void EnDaiku_Init(Actor* thisx, PlayState* play) {
     this->actor.gravity = -3.0f;
 
     switch (this->unk_278) {
-        case ENDAIKU_PARAMS_FF_0:
+        case ENDAIKU_PARAM_FF_0:
             this->unk_27E = this->unk_278 * 4 + 4;
 
-        case ENDAIKU_PARAMS_FF_1:
+        case ENDAIKU_PARAM_FF_1:
             SkelAnime_InitFlex(play, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_002FA0,
                                this->jointTable, this->morphTable, 17);
             break;
 
-        case ENDAIKU_PARAMS_FF_2:
+        case ENDAIKU_PARAM_FF_2:
             SkelAnime_InitFlex(play, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_00B690,
                                this->jointTable, this->morphTable, 17);
             break;
 
-        case ENDAIKU_PARAMS_FF_3:
+        case ENDAIKU_PARAM_FF_3:
             SkelAnime_InitFlex(play, &this->skelAnime, &object_daiku_Skel_00A850, &object_daiku_Anim_001114,
                                this->jointTable, this->morphTable, 17);
             break;
@@ -173,7 +173,7 @@ void func_809438F8(EnDaiku* this, PlayState* play) {
     s32 pad2;
 
     if (Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) {
-        if (this->unk_278 == ENDAIKU_PARAMS_FF_1) {
+        if (this->unk_278 == ENDAIKU_PARAM_FF_1) {
             this->actor.textId = 0x2365;
         } else {
             this->actor.textId = 0x2366;
@@ -188,7 +188,7 @@ void func_809438F8(EnDaiku* this, PlayState* play) {
         return;
     }
 
-    if ((this->unk_278 == ENDAIKU_PARAMS_FF_2) && (this->unk_284 <= currentFrame)) {
+    if ((this->unk_278 == ENDAIKU_PARAM_FF_2) && (this->unk_284 <= currentFrame)) {
         if (Rand_ZeroOne() < 0.5f) {
             func_8094373C(this, 7);
         } else {
@@ -196,7 +196,7 @@ void func_809438F8(EnDaiku* this, PlayState* play) {
         }
     }
 
-    if (this->unk_278 == ENDAIKU_PARAMS_FF_3) {
+    if (this->unk_278 == ENDAIKU_PARAM_FF_3) {
         f32 xzDist;
         f32 yawDiff;
 
@@ -219,11 +219,11 @@ void func_809438F8(EnDaiku* this, PlayState* play) {
         }
     }
 
-    if (this->unk_278 != ENDAIKU_PARAMS_FF_0) {
+    if (this->unk_278 != ENDAIKU_PARAM_FF_0) {
         s16 angle = ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, this->actor.world.rot.y));
 
         this->unk_280 = this->actor.yawTowardsPlayer;
-        if ((this->unk_278 == ENDAIKU_PARAMS_FF_1) || (this->unk_278 == ENDAIKU_PARAMS_FF_2) || (angle <= 0x2890)) {
+        if ((this->unk_278 == ENDAIKU_PARAM_FF_1) || (this->unk_278 == ENDAIKU_PARAM_FF_2) || (angle <= 0x2890)) {
             func_800B8614(&this->actor, play, 100.0f);
         }
     }
@@ -237,7 +237,7 @@ void func_80943BC0(EnDaiku* this) {
 void func_80943BDC(EnDaiku* this, PlayState* play) {
     f32 currentFrame = this->skelAnime.curFrame;
 
-    if ((this->unk_278 == ENDAIKU_PARAMS_FF_2) && (this->unk_284 <= currentFrame)) {
+    if ((this->unk_278 == ENDAIKU_PARAM_FF_2) && (this->unk_284 <= currentFrame)) {
         if (Rand_ZeroOne() < 0.5f) {
             func_8094373C(this, 7);
         } else {
@@ -259,7 +259,7 @@ void EnDaiku_Update(Actor* thisx, PlayState* play) {
         SkelAnime_Update(&this->skelAnime);
     }
 
-    if ((this->unk_278 == ENDAIKU_PARAMS_FF_0) && (gSaveContext.save.day == 3) && (gSaveContext.save.isNight)) {
+    if ((this->unk_278 == ENDAIKU_PARAM_FF_0) && (gSaveContext.save.day == 3) && (gSaveContext.save.isNight)) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -314,7 +314,7 @@ void EnDaiku_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* ro
         gSPDisplayList(POLY_OPA_DISP++, D_809440D4[this->unk_278]);
     }
 
-    if ((this->unk_278 == ENDAIKU_PARAMS_FF_3) && (limbIndex == 8)) {
+    if ((this->unk_278 == ENDAIKU_PARAM_FF_3) && (limbIndex == 8)) {
         gSPDisplayList(POLY_OPA_DISP++, object_daiku_DL_008EC8);
     }
 

src/overlays/actors/ovl_En_Daiku/z_en_daiku.h

@@ -12,12 +12,12 @@ typedef void (*EnDaikuActionFunc)(struct EnDaiku*, PlayState*);
 
 #define ENDAIKU_PATH_INDEX_NONE 0x3F
 
-enum {
+typedef enum {
-    /* 0x0 */ ENDAIKU_PARAMS_FF_0,
+    /* 0 */ ENDAIKU_PARAM_FF_0,
-    /* 0x1 */ ENDAIKU_PARAMS_FF_1,
+    /* 1 */ ENDAIKU_PARAM_FF_1,
-    /* 0x2 */ ENDAIKU_PARAMS_FF_2,
+    /* 2 */ ENDAIKU_PARAM_FF_2,
-    /* 0x3 */ ENDAIKU_PARAMS_FF_3,
+    /* 3 */ ENDAIKU_PARAM_FF_3
-};
+} EnDaikuParam;
 
 typedef struct EnDaiku {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h

@@ -13,11 +13,11 @@ typedef void (*EnDaiku2ActionFunc)(struct EnDaiku2*, PlayState*);
 
 #define ENDAIKU2_PATH_INDEX_NONE 0x3F
 
-enum {
+typedef enum {
     /*  -1 */ ENDAIKU2_GET_7F_MINUS1 = -1,
     /*   0 */ ENDAIKU2_GET_7F_0,
-    /* 127 */ ENDAIKU2_GET_7F_127 = 127,
+    /* 127 */ ENDAIKU2_GET_7F_127 = 127
-};
+} EnDaiku2Param;
 
 typedef struct EnDaiku2Effect {
     /* 0x00 */ u8 isEnabled;

src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h

@@ -10,12 +10,12 @@ typedef void (*EnDekunutsActionFunc)(struct EnDekunuts*, PlayState*);
 
 #define ENDEKUNUTS_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
 
-enum {
+typedef enum {
     /* 0x00 */ ENDEKUNUTS_GET_FF00_0,
     /* 0x01 */ ENDEKUNUTS_GET_FF00_1,
     /* 0x02 */ ENDEKUNUTS_GET_FF00_2,
     /* 0xFF */ ENDEKUNUTS_GET_FF00_FF = 0xFF
-};
+} EnDekunutsParam;
 
 typedef struct EnDekunuts {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c

@@ -23,11 +23,11 @@ void EnDemoheishi_Talk(EnDemoheishi* this, PlayState* play);
 s32 EnDemoheishi_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
 
 typedef enum {
-    /*  0 */ DEMOHEISHI_ANIM_STAND_HAND_ON_HIP,
+    /* 0 */ DEMOHEISHI_ANIM_STAND_HAND_ON_HIP,
-    /*  1 */ DEMOHEISHI_ANIM_CHEER_WITH_SPEAR,
+    /* 1 */ DEMOHEISHI_ANIM_CHEER_WITH_SPEAR,
-    /*  2 */ DEMOHEISHI_ANIM_WAVE,
+    /* 2 */ DEMOHEISHI_ANIM_WAVE,
-    /*  3 */ DEMOHEISHI_ANIM_SIT_AND_REACH,
+    /* 3 */ DEMOHEISHI_ANIM_SIT_AND_REACH,
-    /*  4 */ DEMOHEISHI_ANIM_STAND_UP
+    /* 4 */ DEMOHEISHI_ANIM_STAND_UP
 } EnDemoheishiAnimation;
 
 ActorInit En_Demo_heishi_InitVars = {

src/overlays/actors/ovl_En_Dg/z_en_dg.c

@@ -62,7 +62,7 @@ ActorInit En_Dg_InitVars = {
 typedef enum {
     /* 0 */ DOG_GRAB_STATE_NONE,
     /* 1 */ DOG_GRAB_STATE_HELD,
-    /* 2 */ DOG_GRAB_STATE_THROWN_OR_SITTING_AFTER_THROW,
+    /* 2 */ DOG_GRAB_STATE_THROWN_OR_SITTING_AFTER_THROW
 } DogGrabState;
 
 typedef enum {
@@ -74,7 +74,7 @@ typedef enum {
     /* 5 */ DOG_BEHAVIOR_ZORA_WAIT,
     /* 6 */ DOG_BEHAVIOR_DEKU,
     /* 7 */ DOG_BEHAVIOR_DEKU_WAIT,
-    /* 8 */ DOG_BEHAVIOR_DEFAULT,
+    /* 8 */ DOG_BEHAVIOR_DEFAULT
 } DogBehavior;
 
 static u8 sIsAnyDogHeld = false;
@@ -85,10 +85,10 @@ static s16 sBremenMaskFollowerIndex = ENDG_INDEX_NO_BREMEN_MASK_FOLLOWER;
  * Stores the state for the dogs milling about at the Doggy Racetrack.
  */
 typedef struct {
-    s16 color;  // The dog's color, which is used as an index into sBaseSpeeds
+    /* 0x0 */ s16 color;  // The dog's color, which is used as an index into sBaseSpeeds
-    s16 index;  // The dog's index within sDogInfo
+    /* 0x2 */ s16 index;  // The dog's index within sDogInfo
-    s16 textId; // The ID of the text to display when the dog is picked up
+    /* 0x4 */ s16 textId; // The ID of the text to display when the dog is picked up
-} RacetrackDogInfo;
+} RacetrackDogInfo;       // size = 0x6
 
 /**
  * A table of RacetrackDogInfo for every dog at the Doggy Racetrack. Note that the textId values

src/overlays/actors/ovl_En_Dg/z_en_dg.h

@@ -11,8 +11,8 @@ typedef enum {
     /* 3 */ DOG_COLOR_BEIGE,
     /* 4 */ DOG_COLOR_BROWN,
     /* 5 */ DOG_COLOR_BLUE,
-    /* 6 */ DOG_COLOR_GOLD,
+    /* 6 */ DOG_COLOR_GOLD
-} DogColors;
+} DogColor;
 
 struct EnDg;
 

src/overlays/actors/ovl_En_Dnk/z_en_dnk.h

@@ -10,13 +10,13 @@ typedef void (*EnDnkActionFunc)(struct EnDnk*, PlayState*);
 #define ENDNK_GET_3(thisx) ((thisx)->params & 0x3)
 #define ENDNK_GET_3C(thisx) ((thisx)->params & 0x3C)
 
-enum {
+typedef enum {
-    /* 0x0 */ ENDNK_GET_3_0,
+    /* 0 */ ENDNK_GET_3_0,
-    /* 0x1 */ ENDNK_GET_3_1,
+    /* 1 */ ENDNK_GET_3_1,
-    /* 0x2 */ ENDNK_GET_3_2,
+    /* 2 */ ENDNK_GET_3_2,
-    /* 0x3 */ ENDNK_GET_3_3,
+    /* 3 */ ENDNK_GET_3_3,
-    /* 0x4 */ ENDNK_GET_3_4,
+    /* 4 */ ENDNK_GET_3_4
-};
+} EnDnkParam;
 
 typedef struct EnDnk {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_En_Dno/z_en_dno.c

@@ -63,7 +63,7 @@ typedef enum {
     /* 16 */ EN_DNO_ANIM_IMPLORE_START,
     /* 17 */ EN_DNO_ANIM_SHOCK_START,
     /* 18 */ EN_DNO_ANIM_SHOCK_LOOP,
-    /* 19 */ EN_DNO_ANIM_GRIEVE,
+    /* 19 */ EN_DNO_ANIM_GRIEVE
 } EnDnoAnimation;
 
 static AnimationSpeedInfo sAnimations[] = {

src/overlays/actors/ovl_En_Dno/z_en_dno.h

@@ -13,8 +13,8 @@ typedef void (*EnDnoActionFunc)(struct EnDno*, PlayState*);
 #define EN_DNO_GET_C000(thisx) (((thisx)->params >> 0xE) & 0x3)
 
 typedef enum {
-    /* 0x0 */ EN_DNO_GET_C000_0,
+    /* 0 */ EN_DNO_GET_C000_0,
-    /* 0x1 */ EN_DNO_GET_C000_1,
+    /* 1 */ EN_DNO_GET_C000_1
 } EnDnoUnkC000;
 
 typedef struct EnDno {

src/overlays/actors/ovl_En_Dnp/z_en_dnp.c

@@ -29,7 +29,7 @@ typedef enum {
     /* 1 */ EN_DNP_EYE_HALF,
     /* 2 */ EN_DNP_EYE_CLOSED,
     /* 3 */ EN_DNP_EYE_ANGRY,
-    /* 4 */ EN_DNP_EYE_MAX,
+    /* 4 */ EN_DNP_EYE_MAX
 } EnDnpEyeIndex;
 
 ActorInit En_Dnp_InitVars = {

src/overlays/actors/ovl_En_Dnp/z_en_dnp.h

@@ -11,9 +11,9 @@ typedef void (*EnDnpActionFunc)(struct EnDnp*, PlayState*);
 #define EN_DNP_GET_TYPE(thisx) ((thisx)->params & 7)
 
 typedef enum {
-    /* 0x0 */ EN_DNP_TYPE_WOODFALL_TEMPLE,
+    /* 0 */ EN_DNP_TYPE_WOODFALL_TEMPLE,
-    /* 0x1 */ EN_DNP_TYPE_RELEASED_FROM_BOTTLE,
+    /* 1 */ EN_DNP_TYPE_RELEASED_FROM_BOTTLE,
-    /* 0x2 */ EN_DNP_TYPE_DEKU_KINGS_CHAMBER,
+    /* 2 */ EN_DNP_TYPE_DEKU_KINGS_CHAMBER
 } EnDnpType;
 
 typedef struct EnDnp {

src/overlays/actors/ovl_En_Dns/z_en_dns.c

@@ -30,7 +30,7 @@ typedef enum {
     /*  7 */ EN_DNS_ANIM_RUN_LOOP,
     /*  8 */ EN_DNS_ANIM_DANCE,
     /*  9 */ EN_DNS_ANIM_FLIP,
-    /* 10 */ EN_DNS_ANIM_MAX,
+    /* 10 */ EN_DNS_ANIM_MAX
 } EnDnsAnimation;
 
 static s32 D_8092DCB0[] = {