diff --git a/Makefile b/Makefile
index 8782c02ad2..89eeb21d27 100644
--- a/Makefile
+++ b/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.
-CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(IINC) -nostdinc -Wab,-r4300_mul -woff 624,649,838,712,516
+# 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 649,838,712,516
 
 # Use relocations and abi fpr names in the dump
 OBJDUMP_FLAGS := --disassemble --reloc --disassemble-zeroes -Mreg-names=32
diff --git a/include/z64.h b/include/z64.h
index a83001a010..6418b43ca3 100644
--- a/include/z64.h
+++ b/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 {
-    FRAM_MODE_NOP = 0,
-    FRAM_MODE_ERASE,
-    FRAM_MODE_WRITE,
-    FRAM_MODE_READ,
-    FRAM_MODE_STATUS
-};
+typedef enum framMode {
+    /* 0 */ FRAM_MODE_NOP,
+    /* 1 */ FRAM_MODE_ERASE,
+    /* 2 */ FRAM_MODE_WRITE,
+    /* 3 */ FRAM_MODE_READ,
+    /* 4 */ FRAM_MODE_STATUS
+} framMode;
 
 typedef enum {
     /* 0 */ VI_MODE_EDIT_STATE_INACTIVE,
diff --git a/include/z64actor.h b/include/z64actor.h
index f587164010..3051f2c6ea 100644
--- a/include/z64actor.h
+++ b/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)
diff --git a/include/z64audio.h b/include/z64audio.h
index a37760566b..9b077cf1aa 100644
--- a/include/z64audio.h
+++ b/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 {
diff --git a/include/z64camera.h b/include/z64camera.h
index 54cf748ac4..ccdee88112 100644
--- a/include/z64camera.h
+++ b/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;
 
 /*================================
diff --git a/include/z64item.h b/include/z64item.h
index 345a228976..55cbb337f8 100644
--- a/include/z64item.h
+++ b/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 {
diff --git a/include/z64math.h b/include/z64math.h
index 8df81454ad..cd5c1db200 100644
--- a/include/z64math.h
+++ b/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)))
diff --git a/include/z64player.h b/include/z64player.h
index d9c80384f0..f10984216f 100644
--- a/include/z64player.h
+++ b/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);
diff --git a/include/z64save.h b/include/z64save.h
index cea6ffa46c..805b62e5a0 100644
--- a/include/z64save.h
+++ b/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);
diff --git a/include/z64schedule.h b/include/z64schedule.h
index f3a703f3c3..07a942e903 100644
--- a/include/z64schedule.h
+++ b/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 {
diff --git a/include/z64transition.h b/include/z64transition.h
index e223d9b58e..fe6027a9f8 100644
--- a/include/z64transition.h
+++ b/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
diff --git a/include/z_fireobj.h b/include/z_fireobj.h
index 7bd58d80ae..6fe0639bc0 100644
--- a/include/z_fireobj.h
+++ b/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)
diff --git a/src/audio/code_8019AF00.c b/src/audio/code_8019AF00.c
index e88135b8dd..40c457cb32 100644
--- a/src/audio/code_8019AF00.c
+++ b/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 {
diff --git a/src/audio/lib/heap.c b/src/audio/lib/heap.c
index 1ea26952b6..52533da4db 100644
--- a/src/audio/lib/heap.c
+++ b/src/audio/lib/heap.c
@@ -1386,11 +1386,11 @@ void AudioHeap_DiscardSampleCaches(void) {
 }
 
 typedef struct {
-    uintptr_t oldAddr;
-    uintptr_t newAddr;
-    size_t size;
-    u8 newMedium;
-} StorageChange;
+    /* 0x0 */ uintptr_t oldAddr;
+    /* 0x4 */ uintptr_t newAddr;
+    /* 0x8 */ size_t size;
+    /* 0xC */ u8 newMedium;
+} StorageChange; // size = 0x10
 
 void AudioHeap_ChangeStorage(StorageChange* change, Sample* sample) {
     if ((sample != NULL) && ((sample->medium == change->newMedium) || (D_801FD120 != 1)) &&
diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c
index 7df46952b8..8016e9b6ad 100644
--- a/src/audio/lib/load.c
+++ b/src/audio/lib/load.c
@@ -80,10 +80,10 @@ typedef enum {
 #define OS_MESG_PRI_HIGH 1
 
 typedef struct {
-    u16 numInstruments;
-    u16 numDrums;
-    u16 numSfx;
-} UnloadedFonts;
+    /* 0x0 */ u16 numInstruments;
+    /* 0x2 */ u16 numDrums;
+    /* 0x4 */ u16 numSfx;
+} UnloadedFonts; // size = 0x6
 
 OSMesgQueue sScriptLoadQueue;
 OSMesg sScriptLoadMesgBuf[0x10];
diff --git a/src/boot_O2_g3/yaz0.c b/src/boot_O2_g3/yaz0.c
index aa7ecdfe12..76f990659c 100644
--- a/src/boot_O2_g3/yaz0.c
+++ b/src/boot_O2_g3/yaz0.c
@@ -58,11 +58,11 @@ void* Yaz0_NextDMA(void* curSrcPos) {
 }
 
 typedef struct {
-    /* 0x00 */ u32 magic; // Yaz0
-    /* 0x04 */ u32 decSize;
-    /* 0x08 */ u32 compInfoOffset;   // only used in mio0
-    /* 0x0C */ u32 uncompDataOffset; // only used in mio0
-} Yaz0Header;                        // size = 0x10
+    /* 0x0 */ u32 magic; // Yaz0
+    /* 0x4 */ u32 decSize;
+    /* 0x8 */ u32 compInfoOffset;   // only used in mio0
+    /* 0xC */ u32 uncompDataOffset; // only used in mio0
+} Yaz0Header;                       // size = 0x10
 
 #define YAZ0_MAGIC 0x59617A30 // "Yaz0"
 
diff --git a/src/code/sys_cmpdma.c b/src/code/sys_cmpdma.c
index b2a17d5477..715892b497 100644
--- a/src/code/sys_cmpdma.c
+++ b/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;
 
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index ace56a965e..e6a814e2a6 100644
--- a/src/code/z_draw.c
+++ b/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);
-    /* 0x04 */ void* drawResources[8]; // Either display lists (Gfx*) or matrices (Mtx*)
-} DrawItemTableEntry;                  // size = 0x24
+    /* 0x0 */ void (*drawFunc)(PlayState*, s16);
+    /* 0x4 */ void* drawResources[8]; // Either display lists (Gfx*) or matrices (Mtx*)
+} DrawItemTableEntry;                 // size = 0x24
 
 static DrawItemTableEntry sDrawItemTable[] = {
     // GID_BOTTLE, OBJECT_GI_BOTTLE
diff --git a/src/code/z_eventmgr.c b/src/code/z_eventmgr.c
index e3defb4029..1219573960 100644
--- a/src/code/z_eventmgr.c
+++ b/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 {
diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c
index addfe6b67c..185373e06a 100644
--- a/src/code/z_fbdemo_circle.c
+++ b/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[] = {
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index f8f28f4b8d..e63c9d8e5a 100644
--- a/src/code/z_parameter.c
+++ b/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;
-    /* 0x01 */ u8 flags1;
-    /* 0x02 */ u8 flags2;
-    /* 0x03 */ u8 flags3;
-} RestrictionFlags;
+    /* 0x0 */ u8 scene;
+    /* 0x1 */ u8 flags1;
+    /* 0x2 */ u8 flags2;
+    /* 0x3 */ u8 flags3;
+} RestrictionFlags; // size = 0x4
 
 Input sPostmanTimerInput[MAXCONTROLLERS];
 
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 44b1fd9863..2c0a79d213 100644
--- a/src/code/z_player_lib.c
+++ b/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;
-    /* 0x01 */ u8 mouthIndex;
-} PlayerFaceIndices; // size = 0x02
+    /* 0x0 */ u8 eyeIndex;
+    /* 0x1 */ u8 mouthIndex;
+} PlayerFaceIndices; // size = 0x2
 
 PlayerFaceIndices sPlayerFaces[] = {
     { PLAYER_EYES_OPEN, PLAYER_MOUTH_CLOSED },       // PLAYER_FACE_0
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 9bc6e12ee2..78eb5f98e9 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -53,10 +53,10 @@ typedef enum {
 } RoomCullableDebugMode;
 
 typedef struct RoomShapeCullableEntryLinked {
-    /* 0x00 */ RoomShapeCullableEntry* entry;
-    /* 0x04 */ f32 boundsNearZ;
-    /* 0x08 */ struct RoomShapeCullableEntryLinked* prev;
-    /* 0x0C */ struct RoomShapeCullableEntryLinked* next;
+    /* 0x0 */ RoomShapeCullableEntry* entry;
+    /* 0x4 */ f32 boundsNearZ;
+    /* 0x8 */ struct RoomShapeCullableEntryLinked* prev;
+    /* 0xC */ struct RoomShapeCullableEntryLinked* next;
 } RoomShapeCullableEntryLinked; // size = 0x10
 
 #define ROOM_SHAPE_CULLABLE_MAX_ENTRIES 128
diff --git a/src/libultra/flash/osFlash.c b/src/libultra/flash/osFlash.c
index cd4420c4af..f8649f4fda 100644
--- a/src/libultra/flash/osFlash.c
+++ b/src/libultra/flash/osFlash.c
@@ -10,8 +10,8 @@ s32 __osFlashVersion;
 UNK_TYPE1 D_801FD0FC[0x14];
 
 typedef enum {
-    FLASH_OLD,
-    FLASH_NEW,
+    /* 0 */ FLASH_OLD,
+    /* 1 */ FLASH_NEW
 } FlashVersion;
 
 u32 osFlashGetAddr(u32 pageNum) {
diff --git a/src/libultra/os/initialize.c b/src/libultra/os/initialize.c
index 776191227f..4fabb4c4dd 100644
--- a/src/libultra/os/initialize.c
+++ b/src/libultra/os/initialize.c
@@ -3,11 +3,11 @@
 #define COLD_RESET 0
 
 typedef struct {
-    /* 0x0 */ u32 ins_00; // lui     k0, 0x8000
-    /* 0x4 */ u32 ins_04; // addiu   k0, k0, 0x39E0
-    /* 0x8 */ u32 ins_08; // jr      k0 ; __osException
-    /* 0xC */ u32 ins_0C; // nop
-} struct_exceptionPreamble;
+    /* 0x0 */ u32 ins_00;   // lui     k0, 0x8000
+    /* 0x4 */ u32 ins_04;   // addiu   k0, k0, 0x39E0
+    /* 0x8 */ u32 ins_08;   // jr      k0 ; __osException
+    /* 0xC */ u32 ins_0C;   // nop
+} struct_exceptionPreamble; // size = 0x10
 
 u64 osClockRate = OS_CLOCK_RATE;
 s32 osViClock = VI_NTSC_CLOCK;
diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
index ef35a34edc..737d480ad0 100644
--- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
+++ b/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 },
diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
index bcdda23272..c332fe82c1 100644
--- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h
index afea1bf0d6..d59bfd3ea4 100644
--- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h
+++ b/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,
-    /* 0x1 */ BGCTOWERGEAR_CENTER_COG,
-    /* 0x2 */ BGCTOWERGEAR_WATER_WHEEL,
-    /* 0x3 */ BGCTOWERGEAR_ORGAN
+    /* 0 */ BGCTOWERGEAR_CEILING_COG,
+    /* 1 */ BGCTOWERGEAR_CENTER_COG,
+    /* 2 */ BGCTOWERGEAR_WATER_WHEEL,
+    /* 3 */ BGCTOWERGEAR_ORGAN
 } BgCtowerGearType;
 
 typedef struct BgCtowerGear {
diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h
index 52a905ed56..a069346693 100644
--- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h
+++ b/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 {
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
index de7e7eb324..6d13f4ac3e 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
+++ b/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;
-    u8 unk_01;
-} BgDblueMovebgUnkStruct;
+    /* 0x0 */ u8 unk_00;
+    /* 0x1 */ u8 unk_01;
+} BgDblueMovebgUnkStruct; // size = 0x2
 
 BgDblueMovebgUnkStruct D_80A2BBF4;
 
diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h
index af5a299235..bf53007587 100644
--- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h
+++ b/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,
-    /* 1 */ BGFIREWALL_PARAMS_1,
-} BgFireWallParams;
+    /* 0 */ BGFIREWALL_PARAM_0,
+    /* 1 */ BGFIREWALL_PARAM_1
+} BgFireWallParam;
 
 typedef struct BgFireWall {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
index 942a544ffc..66666b82b3 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
+++ b/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;
-    u8 unk_04;
-} BgHakuginPostUnkStruct3;
+    /* 0x0 */ f32 unk_00;
+    /* 0x4 */ u8 unk_04;
+} BgHakuginPostUnkStruct3; // size = 0x8
 
 static BgHakuginPostUnkStruct3 D_80A9D880[] = {
     { 1200.0f, false }, { 600.0f, false }, { 900.0f, false }, { 870.0f, false },
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c
index bcc662c9f9..2d8fc2683c 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c
+++ b/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 },
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c
index 8a90a68093..ad2d9fbddd 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c
+++ b/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;
-    /* 0x01 */ s8 unk_01;
-    /* 0x04 */ Vec3f unk_04;
+    /* 0x0 */ s8 unk_00;
+    /* 0x1 */ s8 unk_01;
+    /* 0x4 */ Vec3f unk_04;
 } BgIkanaRotaryroomStruct4; // size = 0x10
 
 BgIkanaRotaryroomStruct4 D_80B82184[2][2] = {
diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h
index beeeb0b816..643be076c7 100644
--- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h
+++ b/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 {
-    BGIKNVDOUKUTU_F_0,
-    BGIKNVDOUKUTU_F_1,
-    BGIKNVDOUKUTU_F_2,
-};
+typedef enum {
+    /* 0 */ BGIKNVDOUKUTU_F_0,
+    /* 1 */ BGIKNVDOUKUTU_F_1,
+    /* 2 */ BGIKNVDOUKUTU_F_2
+} BgIknvDoukutuParam;
 
 typedef struct BgIknvDoukutu {
     /* 0x000 */ DynaPolyActor dyna;
diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h
index a5c01165d5..266ec81f21 100644
--- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h
+++ b/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
diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h
index e4cd15c153..f920c18eb9 100644
--- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h
+++ b/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
diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h
index e6d752c28f..cae36be27d 100644
--- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h
+++ b/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,
-    BGLASTBWALL_TYPE_1 = 1,
+    /* 0 */ BGLASTBWALL_TYPE_0,
+    /* 1 */ BGLASTBWALL_TYPE_1
 } BgLastBwallType;
 
 typedef struct BgLastBwall {
diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h
index 0e377f539d..d9f4a1ecef 100644
--- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c
index 119c3854a1..e235042313 100644
--- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c
+++ b/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,
-    /* 0x2 */ BGOPENSHUTTER_DOOR_CLOSED,
+    /* 1 */ BGOPENSHUTTER_DOOR_OPEN = 1,
+    /* 2 */ BGOPENSHUTTER_DOOR_CLOSED
 } BGOpenShutterDoorState;
 
 ActorInit Bg_Open_Shutter_InitVars = {
diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
index fe29e34cb5..ae35ac98c3 100644
--- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
+++ b/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,
-    BG_UMAJUMP_TYPE_2,
-    BG_UMAJUMP_TYPE_3,
-    BG_UMAJUMP_TYPE_4,
-    BG_UMAJUMP_TYPE_5,
-    BG_UMAJUMP_TYPE_6,
+    /* 1 */ BG_UMAJUMP_TYPE_1 = 1,
+    /* 2 */ BG_UMAJUMP_TYPE_2,
+    /* 3 */ BG_UMAJUMP_TYPE_3,
+    /* 4 */ BG_UMAJUMP_TYPE_4,
+    /* 5 */ BG_UMAJUMP_TYPE_5,
+    /* 6 */ BG_UMAJUMP_TYPE_6
 } BgUmaJumpType;
 
 struct BgUmajump;
diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.h b/src/overlays/actors/ovl_Boss_02/z_boss_02.h
index e7efc1199b..4fbd8b471b 100644
--- a/src/overlays/actors/ovl_Boss_02/z_boss_02.h
+++ b/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,
-} TwinmoldParams;
+    /* 200 */ TWINMOLD_STATIC = 200
+} TwinmoldParam;
 
 typedef struct Boss02 {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.h b/src/overlays/actors/ovl_Boss_03/z_boss_03.h
index a00dbacff5..2366063693 100644
--- a/src/overlays/actors/ovl_Boss_03/z_boss_03.h
+++ b/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 {
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
index 971adb3bd2..cbee0a148c 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
+++ b/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
diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c
index ba8d1b8344..ec33a8a94e 100644
--- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c
+++ b/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);
     }
 }
diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h
index fd229e0046..b56c60a9bc 100644
--- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h
index 1997a2bc53..19f99bf2f3 100644
--- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
index 56bc60a4dc..2db2823675 100644
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
+++ b/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;
-    f32 unk4;
-    f32 unk8;
-    f32 unkC;
-} DemoTreLgtInfo;
+    /* 0x0 */ f32 unk0;
+    /* 0x4 */ f32 unk4;
+    /* 0x8 */ f32 unk8;
+    /* 0xC */ f32 unkC;
+} 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
-    /* 0x01 */ DEMO_TRE_LGT_ACTION_ANIMATE
+    /* 0 */ DEMO_TRE_LGT_ACTION_WAIT, // wait until animation is needed
+    /* 1 */ DEMO_TRE_LGT_ACTION_ANIMATE
 } DemoTreLgtAction;
 
 static DemoTreLgtActionFunc sActionFuncs[] = {
diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h
index 4114b9f9c6..3c77ed6c38 100644
--- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h
+++ b/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,
-    /* 0x1 */ MADAME_AROMA_ANIMATION_1
+    /* 0 */ MADAME_AROMA_ANIMATION_0,
+    /* 1 */ MADAME_AROMA_ANIMATION_1
 } DmAlAnimations;
 
 #endif // Z_DM_AL_H
diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h
index 6f29531a04..7ce8df7d22 100644
--- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c
index f49820f030..2f933c751a 100644
--- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c
+++ b/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[] = {
diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h
index 3bff39f6a0..84f7c3e3eb 100644
--- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
index 9bd85db3ab..9f5d189674 100644
--- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c
+++ b/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,
-} EyeMode;
+    /* 5 */ TURTLE_EYEMODE_LOOK_RIGHT
+} 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 = {
diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h
index 03fd093f3c..964965cae1 100644
--- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h
+++ b/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 {
diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h
index 01b9b52af5..fbc5fcb8ba 100644
--- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h
+++ b/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 {
diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
index 01a5b8c822..1787bcf6ff 100644
--- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
+++ b/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 {
diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h
index 0f58c534d4..cc7ac89ea3 100644
--- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h
+++ b/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 {
diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c
index e875d8ab80..30d1cb3ef5 100644
--- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c
+++ b/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;
 
 /**
diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index 88129eddc9..7e202b0afe 100644
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -101,8 +101,8 @@ static InitChainEntry sInitChain[] = {
 };
 
 typedef struct {
-    /* 0x00 */ s16 sceneId;
-    /* 0x02 */ u8 index;
+    /* 0x0 */ s16 sceneId;
+    /* 0x2 */ u8 index;
 } ShutterSceneInfo; // size = 0x4
 
 ShutterSceneInfo D_808A2258[] = {
@@ -115,9 +115,9 @@ ShutterSceneInfo D_808A2258[] = {
 };
 
 typedef struct {
-    /* 0x00 */ s16 dungeonSceneId;
-    /* 0x02 */ s16 bossSceneId;
-    /* 0x04 */ u8 index;
+    /* 0x0 */ s16 dungeonSceneId;
+    /* 0x2 */ s16 bossSceneId;
+    /* 0x4 */ u8 index;
 } BossDoorInfo; // size = 0x6
 
 BossDoorInfo D_808A22A0[] = {
diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
index 1bc7e13bcc..de67845ed5 100644
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
index 38b724865f..20a1df27e3 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
+++ b/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,
-    /* 0x1 */ EFF_DUST_TYPE_1,
-    /* 0x2 */ EFF_DUST_TYPE_SPIN_ATTACK_CHARGE,
-    /* 0x3 */ EFF_DUST_TYPE_3,
-    /* 0x4 */ EFF_DUST_TYPE_4,
-    /* 0x5 */ EFF_DUST_TYPE_5
+    /* 0 */ EFF_DUST_TYPE_0,
+    /* 1 */ EFF_DUST_TYPE_1,
+    /* 2 */ EFF_DUST_TYPE_SPIN_ATTACK_CHARGE,
+    /* 3 */ EFF_DUST_TYPE_3,
+    /* 4 */ EFF_DUST_TYPE_4,
+    /* 5 */ EFF_DUST_TYPE_5
 } EffDustType;
 
 #endif // Z_EFF_DUST_H
diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c
index d45d669a72..9b52909079 100644
--- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c
+++ b/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 {
diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h
index c79537363f..de5567ff0f 100644
--- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h
+++ b/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 {
-    /* 0x0 */ EFFKAMEJIMAWAVE_PARAMS_0,
-    /* 0x1 */ EFFKAMEJIMAWAVE_PARAMS_1
-} EffKamejimaWaveParams;
+typedef enum EffKamejimaWaveParam {
+    /* 0 */ EFFKAMEJIMAWAVE_PARAM_0,
+    /* 1 */ EFFKAMEJIMAWAVE_PARAM_1
+} EffKamejimaWaveParam;
 
 #endif // Z_EFF_KAMEJIMA_WAVE_H
diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c
index a37f4ec07b..8ec3ac9593 100644
--- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c
+++ b/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,
-    /* 0x1 */ EFFLASTDAY_ACTION_1,
-    /* 0x2 */ EFFLASTDAY_ACTION_2,
-    /* 0x3 */ EFFLASTDAY_ACTION_3
+    /* 0 */ EFFLASTDAY_ACTION_NONE,
+    /* 1 */ EFFLASTDAY_ACTION_1,
+    /* 2 */ EFFLASTDAY_ACTION_2,
+    /* 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_PARAMS_2:
+        case EFFLASTDAY_PARAM_1:
+        case EFFLASTDAY_PARAM_2:
             break;
-        case EFFLASTDAY_PARAMS_3:
+        case EFFLASTDAY_PARAM_3:
             EffLastday_SetVtxAlpha(this->alpha);
             break;
         default:
diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h
index 0b50028637..9d2087ae1a 100644
--- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h
+++ b/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 {
-    /* 0x0 */ EFFLASTDAY_PARAMS_0,
-    /* 0x1 */ EFFLASTDAY_PARAMS_1,
-    /* 0x2 */ EFFLASTDAY_PARAMS_2,
-    /* 0x3 */ EFFLASTDAY_PARAMS_3
-} EffLastDayParams;
+typedef enum EffLastDayParam {
+    /* 0 */ EFFLASTDAY_PARAM_0,
+    /* 1 */ EFFLASTDAY_PARAM_1,
+    /* 2 */ EFFLASTDAY_PARAM_2,
+    /* 3 */ EFFLASTDAY_PARAM_3
+} EffLastDayParam;
 
 #endif // Z_EFF_LASTDAY_H
diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h
index 4c8a4eb775..680fdbb758 100644
--- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.h b/src/overlays/actors/ovl_En_Ani/z_en_ani.h
index fcced964bd..d0f2e6a124 100644
--- a/src/overlays/actors/ovl_En_Ani/z_en_ani.h
+++ b/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 {
-  /* else */ ANI_TYPE_STANDING,         // unfinshed and unused
-  /* 1    */ ANI_TYPE_TREE_HANGING = 1,
-};
+typedef enum EnAniType {
+  /* 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) 
 
diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
index 8d3c6b23bf..dcd3802560 100644
--- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+++ b/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[] = {
diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c
index b6c5df58d6..f4a9005f6a 100644
--- a/src/overlays/actors/ovl_En_Az/z_en_az.c
+++ b/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[] = {
diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
index df47a5f67f..4ea6bc4757 100644
--- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
+++ b/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
-    /* 0x1 */ NEJIRON_ACTION_ACTIVE,     // The Nejiron is above ground and actively chasing the player
-    /* 0x2 */ NEJIRON_ACTION_RETREATING, // The Nejiron is burrowing back underground
-    /* 0x3 */ NEJIRON_ACTION_EXPLODING   // The Nejiron has detonated
+    /* 0 */ NEJIRON_ACTION_INACTIVE,   // The Nejiron is either underground or emerging from underground
+    /* 1 */ NEJIRON_ACTION_ACTIVE,     // The Nejiron is above ground and actively chasing the player
+    /* 2 */ NEJIRON_ACTION_RETREATING, // The Nejiron is burrowing back underground
+    /* 3 */ NEJIRON_ACTION_EXPLODING   // The Nejiron has detonated
 } NejironAction;
 
 /**
  * These directions are relative to the Nejiron.
  */
 typedef enum {
-    /* 0x0 */ NEJIRON_DIRECTION_RIGHT,
-    /* 0x1 */ NEJIRON_DIRECTION_LEFT
+    /* 0 */ NEJIRON_DIRECTION_RIGHT,
+    /* 1 */ NEJIRON_DIRECTION_LEFT
 } NejironRollDirection;
 
 ActorInit En_Baguo_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
index 048fbfc95e..c1d13be5ab 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c
+++ b/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 = {
diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c
index 11dace3a5d..9fabcecc0f 100644
--- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c
+++ b/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 = {
diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.h b/src/overlays/actors/ovl_En_Bee/z_en_bee.h
index 09d9ef9317..b1773a5ca6 100644
--- a/src/overlays/actors/ovl_En_Bee/z_en_bee.h
+++ b/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,
-    /* 1 */ BEE_BEHAVIOR_ATTACK,
+    /* 0 */ BEE_BEHAVIOR_IDLE,
+    /* 1 */ BEE_BEHAVIOR_ATTACK
 } BeeBehaviorType;
 
 typedef struct EnBee {
diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h
index bb9d292809..a3561c33ba 100644
--- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h
index 9b84784f46..b532d6d089 100644
--- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h
+++ b/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
-// on spawn, 3/possible fires are turned into chosenfire
-enum EnBigpoType {
+// well version is "regular" (spawns automatically), dampe basement version is "summoned"
+// on room enter, 3 "possiblefire" are turned into "chosenfire" at random
+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) 
 
diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
index 75e6fa38e3..1a90fd29b6 100644
--- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+++ b/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 = {
diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c
index 6aa9f9e35b..ef5c9c0e24 100644
--- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c
+++ b/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
diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.h b/src/overlays/actors/ovl_En_Bom/z_en_bom.h
index 40558a9199..d115472301 100644
--- a/src/overlays/actors/ovl_En_Bom/z_en_bom.h
+++ b/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,
-} EnBomExplosiveType;
+    /* 1 */ BOMB_EXPLOSIVE_TYPE_POWDER_KEG
+} BombExplosiveType;
 
 typedef struct EnBom {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h
index 85c5ecdb31..1585613ced 100644
--- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h
+++ b/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
 
diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
index 8260386df6..7c2a648411 100644
--- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
+++ b/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,
-} EN_BOMJIMA_ACTION;
+    /* 7 */ EN_BOMJIMA_ACTION_7
+} EnBomjimaAction;
 
 static s32 D_80C009F0 = 0;
 static s32 D_80C009F4 = 0;
diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h
index f411f21a26..a784e335d1 100644
--- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
index 9165b93922..f9b5b3d41c 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c
+++ b/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 } },
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c
index b65b2c63d1..044f54334b 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/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 } };
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
index 7666f8e12a..4becc2fe6b 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+++ b/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);
diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h
index 977bf24733..c002dc5e3a 100644
--- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h
+++ b/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
diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h
index 3c73b747fb..200ec5bec1 100644
--- a/src/overlays/actors/ovl_En_Cow/z_en_cow.h
+++ b/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,
-    /*  1 */ EN_COW_TYPE_TAIL,
-    /*  2 */ EN_COW_TYPE_ABDUCTED,
+    /* 0 */ EN_COW_TYPE_DEFAULT,
+    /* 1 */ EN_COW_TYPE_TAIL,
+    /* 2 */ EN_COW_TYPE_ABDUCTED
 } EnCowType;
 
 struct EnCow;
diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c
index f524e6d5eb..ec9a11b4c0 100644
--- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c
+++ b/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 = {
diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
index 2900f4d345..2c232f096f 100644
--- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
+++ b/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);
     }
 
diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
index c75afec6e8..ff88c8c9af 100644
--- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
+++ b/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 {
-    /* 0x0 */ ENDAIKU_PARAMS_FF_0,
-    /* 0x1 */ ENDAIKU_PARAMS_FF_1,
-    /* 0x2 */ ENDAIKU_PARAMS_FF_2,
-    /* 0x3 */ ENDAIKU_PARAMS_FF_3,
-};
+typedef enum {
+    /* 0 */ ENDAIKU_PARAM_FF_0,
+    /* 1 */ ENDAIKU_PARAM_FF_1,
+    /* 2 */ ENDAIKU_PARAM_FF_2,
+    /* 3 */ ENDAIKU_PARAM_FF_3
+} EnDaikuParam;
 
 typedef struct EnDaiku {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h
index 775b2453f7..58fc26b9a5 100644
--- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
index 59b6677a0a..248f758ace 100644
--- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
+++ b/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;
diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c
index 5b5857c94a..faacd75101 100644
--- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c
+++ b/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,
-    /*  1 */ DEMOHEISHI_ANIM_CHEER_WITH_SPEAR,
-    /*  2 */ DEMOHEISHI_ANIM_WAVE,
-    /*  3 */ DEMOHEISHI_ANIM_SIT_AND_REACH,
-    /*  4 */ DEMOHEISHI_ANIM_STAND_UP
+    /* 0 */ DEMOHEISHI_ANIM_STAND_HAND_ON_HIP,
+    /* 1 */ DEMOHEISHI_ANIM_CHEER_WITH_SPEAR,
+    /* 2 */ DEMOHEISHI_ANIM_WAVE,
+    /* 3 */ DEMOHEISHI_ANIM_SIT_AND_REACH,
+    /* 4 */ DEMOHEISHI_ANIM_STAND_UP
 } EnDemoheishiAnimation;
 
 ActorInit En_Demo_heishi_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c
index 849ae33786..d80013a995 100644
--- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c
+++ b/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
-    s16 index;  // The dog's index within sDogInfo
-    s16 textId; // The ID of the text to display when the dog is picked up
-} RacetrackDogInfo;
+    /* 0x0 */ s16 color;  // The dog's color, which is used as an index into sBaseSpeeds
+    /* 0x2 */ s16 index;  // The dog's index within sDogInfo
+    /* 0x4 */ s16 textId; // The ID of the text to display when the dog is picked up
+} RacetrackDogInfo;       // size = 0x6
 
 /**
  * A table of RacetrackDogInfo for every dog at the Doggy Racetrack. Note that the textId values
diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.h b/src/overlays/actors/ovl_En_Dg/z_en_dg.h
index 9f82039877..e363427060 100644
--- a/src/overlays/actors/ovl_En_Dg/z_en_dg.h
+++ b/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,
-} DogColors;
+    /* 6 */ DOG_COLOR_GOLD
+} DogColor;
 
 struct EnDg;
 
diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h
index f0665f1b5b..57467b3f18 100644
--- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h
+++ b/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 {
-    /* 0x0 */ ENDNK_GET_3_0,
-    /* 0x1 */ ENDNK_GET_3_1,
-    /* 0x2 */ ENDNK_GET_3_2,
-    /* 0x3 */ ENDNK_GET_3_3,
-    /* 0x4 */ ENDNK_GET_3_4,
-};
+typedef enum {
+    /* 0 */ ENDNK_GET_3_0,
+    /* 1 */ ENDNK_GET_3_1,
+    /* 2 */ ENDNK_GET_3_2,
+    /* 3 */ ENDNK_GET_3_3,
+    /* 4 */ ENDNK_GET_3_4
+} EnDnkParam;
 
 typedef struct EnDnk {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c
index b7eb08743a..904a18e62d 100644
--- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c
+++ b/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[] = {
diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.h b/src/overlays/actors/ovl_En_Dno/z_en_dno.h
index f9a55cd4e5..b2e7f750fd 100644
--- a/src/overlays/actors/ovl_En_Dno/z_en_dno.h
+++ b/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,
-    /* 0x1 */ EN_DNO_GET_C000_1,
+    /* 0 */ EN_DNO_GET_C000_0,
+    /* 1 */ EN_DNO_GET_C000_1
 } EnDnoUnkC000;
 
 typedef struct EnDno {
diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
index 0b3c5ac85a..1dd5dac34d 100644
--- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
+++ b/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 = {
diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h
index 64f0baf93a..9b02f19d37 100644
--- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h
+++ b/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,
-    /* 0x1 */ EN_DNP_TYPE_RELEASED_FROM_BOTTLE,
-    /* 0x2 */ EN_DNP_TYPE_DEKU_KINGS_CHAMBER,
+    /* 0 */ EN_DNP_TYPE_WOODFALL_TEMPLE,
+    /* 1 */ EN_DNP_TYPE_RELEASED_FROM_BOTTLE,
+    /* 2 */ EN_DNP_TYPE_DEKU_KINGS_CHAMBER
 } EnDnpType;
 
 typedef struct EnDnp {
diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c
index f481f3d6b7..d662e7e552 100644
--- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c
+++ b/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[] = {
diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h
index 4b730abd35..ade8b61747 100644
--- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h
+++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h
@@ -13,12 +13,12 @@ typedef s32 (*EnDnsFunc)(struct EnDns*, PlayState*);
 #define ENDNS_GET_4000(thisx) ((thisx)->params & 0x4000)
 #define ENDNS_GET_8000(thisx) ((thisx)->params & 0x8000)
 
-enum {
-    /* 0x0 */ ENDNS_GET_7_0,
-    /* 0x1 */ ENDNS_GET_7_1,
-    /* 0x2 */ ENDNS_GET_7_2,
-    /* 0x3 */ ENDNS_GET_7_3,
-};
+typedef enum {
+    /* 0 */ ENDNS_GET_7_0,
+    /* 1 */ ENDNS_GET_7_1,
+    /* 2 */ ENDNS_GET_7_2,
+    /* 3 */ ENDNS_GET_7_3
+} EnDnsParam;
 
 typedef struct EnDns {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c
index 91d243464d..60d0ec6736 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -289,10 +289,10 @@ ActorInit En_Door_InitVars = {
 };
 
 typedef struct {
-    /* 0x00 */ s16 sceneId;
-    /* 0x02 */ u8 dListIndex;
-    /* 0x04 */ s16 objectId;
-} EnDoorInfo;
+    /* 0x0 */ s16 sceneId;
+    /* 0x2 */ u8 dListIndex;
+    /* 0x4 */ s16 objectId;
+} EnDoorInfo; // size = 0x6
 
 static EnDoorInfo sObjInfo[] = {
     { SCENE_MITURIN, 0x01, OBJECT_NUMA_OBJ },
@@ -394,7 +394,7 @@ void EnDoor_Init(Actor* thisx, PlayState* play2) {
 
     this->doorType = ENDOOR_GET_TYPE(thisx);
 
-    this->switchFlag = ENDOOR_GET_PARAMS_7F(thisx);
+    this->switchFlag = ENDOOR_GET_PARAM_7F(thisx);
     if ((this->doorType == ENDOOR_TYPE_7) && (this->switchFlag == 0)) {
         DynaPolyActor_Init(&this->knobDoor.dyna, 0);
         DynaPolyActor_LoadMesh(play, &this->knobDoor.dyna, &gDoorCol);
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h
index b6fc7c2544..03dc31ab6d 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.h
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.h
@@ -10,7 +10,7 @@ struct EnDoor;
 typedef void (*EnDoorActionFunc)(struct EnDoor*, PlayState*);
 
 #define ENDOOR_GET_TYPE(thisx) (((thisx)->params >> 7) & 7)
-#define ENDOOR_GET_PARAMS_7F(thisx) (((thisx)->params) & 0x7F)
+#define ENDOOR_GET_PARAM_7F(thisx) (((thisx)->params) & 0x7F)
 
 typedef enum EnDoorType {
     /* 0 */ ENDOOR_TYPE_0,
diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
index f03b2702e6..d2acb55be5 100644
--- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
+++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
@@ -35,17 +35,17 @@ typedef enum {
     /* 0 */ DEEP_PYTHON_EXTEND_STATE_NOT_FULLY_EXTENDED,
     /* 1 */ DEEP_PYTHON_EXTEND_STATE_FULLY_EXTENDED,
     /* 2 */ DEEP_PYTHON_EXTEND_STATE_REPEAT_LARGE_SWAY,
-    /* 3 */ DEEP_PYTHON_EXTEND_STATE_REPEAT_SMALL_SWAY,
+    /* 3 */ DEEP_PYTHON_EXTEND_STATE_REPEAT_SMALL_SWAY
 } DeepPythonExtendState;
 
 typedef enum {
     /* 0 */ DEEP_PYTHON_GRAB_STATE_START,
-    /* 1 */ DEEP_PYTHON_GRAB_STATE_GRABBED,
+    /* 1 */ DEEP_PYTHON_GRAB_STATE_GRABBED
 } DeepPythonGrabState;
 
 typedef enum {
     /* 0 */ DEEP_PYTHON_ATTACK_STATE_START,
-    /* 1 */ DEEP_PYTHON_ATTACK_STATE_RELEASED,
+    /* 1 */ DEEP_PYTHON_ATTACK_STATE_RELEASED
 } DeepPythonAttackState;
 
 static s32 sNumPythonsDead = 0;
diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h
index 2d5f31b545..a35c8fa9b7 100644
--- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h
+++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h
@@ -13,7 +13,7 @@ typedef enum {
     /* 3 */ DEEP_PYTHON_ACTION_DAMAGE,
     /* 4 */ DEEP_PYTHON_ACTION_RETREAT,
     /* 5 */ DEEP_PYTHON_ACTION_SETUP_DEAD,
-    /* 6 */ DEEP_PYTHON_ACTION_DEAD,
+    /* 6 */ DEEP_PYTHON_ACTION_DEAD
 } DeepPythonAction;
 
 struct EnDragon;
diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c
index 6f67950abb..2a9a0ac677 100644
--- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c
+++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c
@@ -13,7 +13,7 @@
 
 typedef enum {
     /* 0 */ EGBLOCK_EFFECT_DEBRIS_SOLID,
-    /* 1 */ EGBLOCK_EFFECT_DEBRIS_FLAT,
+    /* 1 */ EGBLOCK_EFFECT_DEBRIS_FLAT
 } EnEgblockEffectType;
 
 void EnEgblock_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c
index bcb7c6fa2d..c9750991ad 100644
--- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c
+++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c
@@ -37,7 +37,7 @@ typedef enum {
     /* 0 */ EYEGORE_EFFECT_IMPACT,
     /* 1 */ EYEGORE_EFFECT_PIECE_LARGE,
     /* 2 */ EYEGORE_EFFECT_PIECE_SMALL,
-    /* 3 */ EYEGORE_EFFECT_DEBRIS,
+    /* 3 */ EYEGORE_EFFECT_DEBRIS
 } EnEgolEffectType;
 
 typedef enum {
@@ -56,7 +56,7 @@ typedef enum {
     /* 12 */ EYEGORE_ANIM_SIT,
     /* 13 */ EYEGORE_ANIM_LEFT_PUNCH,
     /* 14 */ EYEGORE_ANIM_RIGHT_PUNCH,
-    /* 15 */ EYEGORE_ANIM_MAX,
+    /* 15 */ EYEGORE_ANIM_MAX
 } EnEgolAnimation;
 
 typedef enum {
@@ -64,7 +64,7 @@ typedef enum {
     /* 1 */ EYEGORE_LASER_START,
     /* 2 */ EYEGORE_LASER_CHARGING,
     /* 3 */ EYEGORE_LASER_FIRE,
-    /* 7 */ EYEGORE_LASER_ON = 7,
+    /* 7 */ EYEGORE_LASER_ON = 7
 } EnEgolLaserState;
 
 void EnEgol_Init(Actor* thisx, PlayState* play);
@@ -238,7 +238,7 @@ typedef enum {
     /* 0x0 */ EYEGORE_DMGEFF_IMMUNE_0,
     /* 0x4 */ EYEGORE_DMGEFF_LIGHT_ARROW = 4,
     /* 0xE */ EYEGORE_DMGEFF_NONE = 0xE,
-    /* 0xF */ EYEGORE_DMGEFF_IMMUNE_F,
+    /* 0xF */ EYEGORE_DMGEFF_IMMUNE_F
 } EnEgolDamageEffect;
 
 static DamageTable sDamageTable = {
@@ -1101,7 +1101,7 @@ void EnEgol_Death(EnEgol* this, PlayState* play) {
 typedef enum {
     /* 0 */ EYEGORE_HIT_NONE,
     /* 1 */ EYEGORE_HIT_DAMAGE,
-    /* 2 */ EYEGORE_HIT_IMMUNE, // Makes hitmarks, but no reaction
+    /* 2 */ EYEGORE_HIT_IMMUNE // Makes hitmarks, but no reaction
 } EyegoreHitReaction;
 
 void EnEgol_CollisionCheck(EnEgol* this, PlayState* play) {
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
index 680d59158c..18e444e97b 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
@@ -50,14 +50,14 @@ typedef struct EnElf {
 } EnElf; // size = 0x274
 
 typedef enum {
-    /* 0x00 */ ENELF_TYPE_0,
-    /* 0x01 */ ENELF_TYPE_1,
-    /* 0x02 */ ENELF_TYPE_2,
-    /* 0x03 */ ENELF_TYPE_3,
-    /* 0x04 */ ENELF_TYPE_4,
-    /* 0x05 */ ENELF_TYPE_5,
-    /* 0x06 */ ENELF_TYPE_6,
-    /* 0x07 */ ENELF_TYPE_7
+    /* 0 */ ENELF_TYPE_0,
+    /* 1 */ ENELF_TYPE_1,
+    /* 2 */ ENELF_TYPE_2,
+    /* 3 */ ENELF_TYPE_3,
+    /* 4 */ ENELF_TYPE_4,
+    /* 5 */ ENELF_TYPE_5,
+    /* 6 */ ENELF_TYPE_6,
+    /* 7 */ ENELF_TYPE_7
 } FairyType;
 
 #endif // Z_EN_ELF_H
diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
index 975b08c2c5..692a76d826 100644
--- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
+++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
@@ -10,13 +10,13 @@ typedef void (*EnElfgrpActionFunc)(struct EnElfgrp*, PlayState*);
 #define ENELFGRP_GET(thisx) ((thisx)->params & 0xF)
 #define ENELFGRP_GET_FE00(thisx) (((thisx)->params & 0xFE00) >> 9)
 
-enum {
+typedef enum {
     /* 0 */ ENELFGRP_0,
     /* 2 */ ENELFGRP_1,
     /* 2 */ ENELFGRP_2,
     /* 3 */ ENELFGRP_3,
-    /* 4 */ ENELFGRP_4,
-};
+    /* 4 */ ENELFGRP_4
+} EnElfgrpParam;
 
 typedef struct EnElfgrp {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
index 5c8e6db834..85e1b3ca48 100644
--- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
+++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
@@ -18,7 +18,7 @@ typedef enum EnEncount1Enemy {
     /* 0 */ EN_ENCOUNT1_GRASSHOPPER,
     /* 1 */ EN_ENCOUNT1_WALLMASTER,
     /* 2 */ EN_ENCOUNT1_SKULLFISH,
-    /* 3 */ EN_ENCOUNT1_SKULLFISH_2,
+    /* 3 */ EN_ENCOUNT1_SKULLFISH_2
 } EnEncount1Enemy;
 
 struct EnEncount1;
diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c
index 8d9a18cf11..972d038ae0 100644
--- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c
+++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c
@@ -103,11 +103,11 @@ void func_809C4078(EnEncount4* this, PlayState* play) {
                 return;
             }
 
-            fireWallParams = BGFIREWALL_PARAMS_0;
+            fireWallParams = BGFIREWALL_PARAM_0;
             if ((this->unk_148 == 0) || (captainKeeta->unk2DC != 0)) {
                 i = 0;
                 if (this->unk_148 != 0) {
-                    fireWallParams = BGFIREWALL_PARAMS_1;
+                    fireWallParams = BGFIREWALL_PARAM_1;
                     i = 2;
                 }
                 while (i < ARRAY_COUNT(D_809C46DC)) {
@@ -174,7 +174,7 @@ void func_809C42A8(EnEncount4* this, PlayState* play) {
     pos.x += Math_SinS(yRot) * (40.0f + randPlusMinusPoint5Scaled(40.0f));
     pos.z += Math_CosS(yRot) * (40.0f + randPlusMinusPoint5Scaled(40.0f));
     if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_SKB, pos.x, pos.y, pos.z, 0, 0, 0,
-                           ENSKB_PARAMS_0) != NULL) {
+                           ENSKB_PARAM_0) != NULL) {
         this->unk_14C++;
         if (this->unk_14C >= 2) {
             this->actionFunc = func_809C4598;
diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.h b/src/overlays/actors/ovl_En_Estone/z_en_estone.h
index ceb26c9c60..f9b44b9444 100644
--- a/src/overlays/actors/ovl_En_Estone/z_en_estone.h
+++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.h
@@ -11,7 +11,7 @@ typedef void (*EnEstoneActionFunc)(struct EnEstone*, PlayState*);
 
 typedef enum {
     /* 0 */ ENESTONE_TYPE_LARGE,
-    /* 1 */ ENESTONE_TYPE_SMALL,
+    /* 1 */ ENESTONE_TYPE_SMALL
 } EnEstoneType;
 
 typedef struct {
diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c
index 8c975dbadb..2f226e61cb 100644
--- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c
+++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c
@@ -52,11 +52,11 @@ void EnFall_FireRing_Draw(Actor* thisx, PlayState* play);
 void EnFall_MoonsTear_Draw(Actor* thisx, PlayState* play);
 
 typedef struct {
-    u8 modelIndex;
-    Vec3f pos;
-    Vec3f velocity;
-    Vec3s rot;
-} EnFallDebrisEffect;
+    /* 0x00 */ u8 modelIndex;
+    /* 0x04 */ Vec3f pos;
+    /* 0x10 */ Vec3f velocity;
+    /* 0x1C */ Vec3s rot;
+} EnFallDebrisEffect; // size = 0x24
 
 #define EN_FALL_DEBRIS_EFFECT_COUNT 50
 
diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.h b/src/overlays/actors/ovl_En_Fall/z_en_fall.h
index c9eaaf44f9..60bb7ec330 100644
--- a/src/overlays/actors/ovl_En_Fall/z_en_fall.h
+++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.h
@@ -19,7 +19,7 @@ typedef enum {
     /*  9 */ EN_FALL_TYPE_CLOCK_TOWER_MOON,
     /* 10 */ EN_FALL_TYPE_STOPPED_MOON_OPEN_MOUTH,
     /* 11 */ EN_FALL_TYPE_CRASH_FIRE_RING,
-    /* 12 */ EN_FALL_TYPE_LODMOON_INVERTED_STONE_TOWER,
+    /* 12 */ EN_FALL_TYPE_LODMOON_INVERTED_STONE_TOWER
 } EnFallType;
 
 struct EnFall;
diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.h b/src/overlays/actors/ovl_En_Fg/z_en_fg.h
index 6440812ca0..a1917b9bcb 100644
--- a/src/overlays/actors/ovl_En_Fg/z_en_fg.h
+++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.h
@@ -9,21 +9,21 @@ typedef void (*EnFgActionFunc)(struct EnFg*, PlayState*);
 
 // Based on the envColor data. Related to params but mostly unused.
 typedef enum {
-    /* 0x0 */ FG_YELLOW,
-    /* 0x1 */ FG_CYAN,
-    /* 0x2 */ FG_PINK,
-    /* 0x3 */ FG_BLUE,
-    /* 0x4 */ FG_WHITE,
-    /* 0x5 */ FG_BLACK, // All frogs are blackened when hit by an explosion
+    /* 0 */ FG_YELLOW,
+    /* 1 */ FG_CYAN,
+    /* 2 */ FG_PINK,
+    /* 3 */ FG_BLUE,
+    /* 4 */ FG_WHITE,
+    /* 5 */ FG_BLACK // All frogs are blackened when hit by an explosion
 } FrogType;
 
 typedef enum {
-    /* 0x0 */ FG_DMGEFFECT_NONE,
-    /* 0x1 */ FG_DMGEFFECT_EXPLOSION, // Bomb or bombchu, not powderkeg
-    /* 0x2 */ FG_DMGEFFECT_DEKUSTICK,
-    /* 0x3 */ FG_DMGEFFECT_HOOKSHOT,
-    /* 0x4 */ FG_DMGEFFECT_ARROW,
-    /* 0x5 */ FG_DMGEFFECT_ICEARROW,
+    /* 0 */ FG_DMGEFFECT_NONE,
+    /* 1 */ FG_DMGEFFECT_EXPLOSION, // Bomb or bombchu, not powderkeg
+    /* 2 */ FG_DMGEFFECT_DEKUSTICK,
+    /* 3 */ FG_DMGEFFECT_HOOKSHOT,
+    /* 4 */ FG_DMGEFFECT_ARROW,
+    /* 5 */ FG_DMGEFFECT_ICEARROW
 } FrogDamageEffect;
 
 typedef struct {
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
index d3941906c5..2a348051e1 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
@@ -7,12 +7,12 @@ struct EnFish;
 
 typedef void (*EnFishUnkFunc)(Actor*, PlayState*);
 
-enum {
+typedef enum {
     /* -1 */ ENFISH_MINUS1 = -1,
     /*  0 */ ENFISH_0,
     /*  1 */ ENFISH_1,
-    /*  2 */ ENFISH_2,
-};
+    /*  2 */ ENFISH_2
+} EnFishParam;
 
 typedef struct EnFish {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
index 010106fe59..2ada30cba7 100644
--- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
+++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
@@ -25,24 +25,24 @@ void EnFishing_UpdateOwner(Actor* thisx, PlayState* play2);
 void EnFishing_DrawOwner(Actor* thisx, PlayState* play);
 
 typedef struct {
-    /* 0x00 */ u8 unk_00;
-    /* 0x02 */ Vec3s pos;
-    /* 0x08 */ u8 unk_08;
-    /* 0x0C */ f32 unk_0C;
+    /* 0x0 */ u8 unk_00;
+    /* 0x2 */ Vec3s pos;
+    /* 0x8 */ u8 unk_08;
+    /* 0xC */ f32 unk_0C;
 } FishingFishInit; // size = 0x10
 
 #define EFFECT_COUNT 130
 
 typedef enum {
-    /* 0x00 */ FS_EFF_NONE,
-    /* 0x01 */ FS_EFF_RIPPLE,
-    /* 0x02 */ FS_EFF_DUST_SPLASH,
-    /* 0x03 */ FS_EFF_WATER_DUST,
-    /* 0x04 */ FS_EFF_BUBBLE,
-    /* 0x05 */ FS_EFF_RAIN_DROP,
-    /* 0x06 */ FS_EFF_OWNER_HAT,
-    /* 0x07 */ FS_EFF_RAIN_RIPPLE,
-    /* 0x08 */ FS_EFF_RAIN_SPLASH
+    /* 0 */ FS_EFF_NONE,
+    /* 1 */ FS_EFF_RIPPLE,
+    /* 2 */ FS_EFF_DUST_SPLASH,
+    /* 3 */ FS_EFF_WATER_DUST,
+    /* 4 */ FS_EFF_BUBBLE,
+    /* 5 */ FS_EFF_RAIN_DROP,
+    /* 6 */ FS_EFF_OWNER_HAT,
+    /* 7 */ FS_EFF_RAIN_RIPPLE,
+    /* 8 */ FS_EFF_RAIN_SPLASH
 } FishingEffectType;
 
 typedef struct {
@@ -73,9 +73,9 @@ typedef enum {
 } FishingPropType;
 
 typedef struct {
-    /* 0x00 */ u8 type;
-    /* 0x02 */ Vec3s pos;
-} FishingPropInit; // size = 0x08
+    /* 0x0 */ u8 type;
+    /* 0x2 */ Vec3s pos;
+} FishingPropInit; // size = 0x8
 
 typedef struct {
     /* 0x00 */ Vec3f pos;
@@ -93,8 +93,8 @@ typedef struct {
 } FishingProp; // size = 0x3C
 
 typedef enum {
-    /* 0x00 */ FS_GROUP_FISH_NONE,
-    /* 0x01 */ FS_GROUP_FISH_NORMAL
+    /* 0 */ FS_GROUP_FISH_NONE,
+    /* 1 */ FS_GROUP_FISH_NORMAL
 } FishingGroupFishType;
 
 #define GROUP_FISH_COUNT 60
diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
index 002f9e67ca..628cad4f6b 100644
--- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
+++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
@@ -11,12 +11,12 @@ typedef void (*EnFloormasActionFunc)(struct EnFloormas*, PlayState*);
 #define ENFLOORMAS_GET_7FFF(thisx) ((thisx)->params & 0x7FFF)
 #define ENFLOORMAS_GET_8000(thisx) ((thisx)->params & 0x8000)
 
-enum {
+typedef enum {
     /* 0x00 */ ENFLOORMAS_GET_7FFF_0,
     /* 0x10 */ ENFLOORMAS_GET_7FFF_10 = 0x10,
     /* 0x20 */ ENFLOORMAS_GET_7FFF_20 = 0x20,
-    /* 0x40 */ ENFLOORMAS_GET_7FFF_40 = 0x40,
-};
+    /* 0x40 */ ENFLOORMAS_GET_7FFF_40 = 0x40
+} EnFloormasParam;
 
 typedef struct EnFloormas {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
index 539560c880..ac1cb06485 100644
--- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h
+++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
@@ -13,12 +13,12 @@ typedef void (*EnFzUnkFunc)(struct EnFz*);
 #define ENFZ_GET_4000(thisx) ((thisx)->params & 0x4000)
 #define ENFZ_GET_8000(thisx) ((thisx)->params & 0x8000)
 
-enum {
+typedef enum {
     /* 0 */ ENFZ_F_0,
     /* 1 */ ENFZ_F_1,
     /* 2 */ ENFZ_F_2,
-    /* 3 */ ENFZ_F_3,
-};
+    /* 3 */ ENFZ_F_3
+} EnFzParam;
 
 typedef struct {
     /* 0x00 */ u8 unk_00;
diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h
index 04d9c71590..5602a3b4f4 100644
--- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h
+++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h
@@ -10,8 +10,8 @@ typedef void (*EnGakufuActionFunc)(struct EnGakufu*, PlayState*);
 #define GAKUFU_GET_TYPE(thisx) ((thisx)->params & 0xF)
 
 typedef enum {
-    /* 0x0 */ GAKUFU_TERMINA_FIELD,   
-    /* 0x1 */ GAKUFU_MILK_BAR
+    /* 0 */ GAKUFU_TERMINA_FIELD,   
+    /* 1 */ GAKUFU_MILK_BAR
 } GakufuType;
 
 typedef struct EnGakufu {
diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h
index 87cee9e994..a257ab3d48 100644
--- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h
+++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h
@@ -10,11 +10,11 @@ typedef void (*EnGb2ActionFunc)(struct EnGb2*, PlayState*);
 #define ENGB2_GET_7(thisx) ((thisx)->params & 7)
 #define ENGB2_GET_7F8(thisx) (((thisx)->params & 0x7F8) >> 3)
 
-enum {
+typedef enum {
     /* 0 */ ENGB2_7_0,
     /* 1 */ ENGB2_7_1,
-    /* 2 */ ENGB2_7_2,
-};
+    /* 2 */ ENGB2_7_2
+} EnGb2Param;
 
 typedef struct EnGb2 {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index 0a8aea2fd9..c78f140486 100644
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -69,8 +69,8 @@ typedef enum {
     /*  6 */ GERUDO_WHITE_ANIM_EXCITED_CLAPPING,
     /*  7 */ GERUDO_WHITE_ANIM_SALUTE,
     /*  8 */ GERUDO_WHITE_ANIM_LEADING_BOAT,
-    /*  9 */ GERUDO_WHITE_ANIM_BLOWN_AWAY,
-} GerudoWhiteAnimations;
+    /*  9 */ GERUDO_WHITE_ANIM_BLOWN_AWAY
+} GerudoWhiteAnimation;
 
 void EnGe1_ChangeAnim(EnGe1* this, s16 animIndex, u8 mode, f32 morphFrames);
 void EnGe1_ShadowDraw(Actor* thisx, Lights* lights, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.h b/src/overlays/actors/ovl_En_Gg/z_en_gg.h
index cc744cffaf..802024897d 100644
--- a/src/overlays/actors/ovl_En_Gg/z_en_gg.h
+++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.h
@@ -21,7 +21,7 @@ typedef struct EnGgStruct {
     /* 0x40 */ s32 unk_40;
     /* 0x44 */ s32 unk_44;
     /* 0x48 */ u8 unk_48;
-} EnGgStruct; // size == 0x4C
+} EnGgStruct; // size = 0x4C
 
 typedef struct EnGg {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.h b/src/overlays/actors/ovl_En_Giant/z_en_giant.h
index 45e89dd553..5842a62dad 100644
--- a/src/overlays/actors/ovl_En_Giant/z_en_giant.h
+++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.h
@@ -35,7 +35,7 @@ typedef enum {
     /* 12 */ GIANT_TYPE_MOUNTAIN_CLOCK_TOWER_FAILURE,
     /* 13 */ GIANT_TYPE_CANYON_CLOCK_TOWER_FAILURE,
     /* 14 */ GIANT_TYPE_SWAMP_CLOCK_TOWER_FAILURE,
-    /* 15 */ GIANT_TYPE_OCEAN_CLOCK_TOWER_FAILURE,
+    /* 15 */ GIANT_TYPE_OCEAN_CLOCK_TOWER_FAILURE
 } GiantType;
 
 struct EnGiant;
diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
index a76d89e7b4..b40c2287a7 100644
--- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
@@ -47,7 +47,7 @@ typedef enum {
     /* 1 */ GINKO_ANIM_SITTING,
     /* 2 */ GINKO_ANIM_REACHING,
     /* 3 */ GINKO_ANIM_AMAZED,
-    /* 4 */ GINKO_ANIM_ADVERTISING,
+    /* 4 */ GINKO_ANIM_ADVERTISING
 } GinkoAnimation;
 
 static AnimationInfo sAnimationInfo[] = {
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
index f61b50b5a2..e155ef6dfa 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
@@ -48,16 +48,16 @@ typedef struct EnGirlA {
 } EnGirlA; // size = 0x1CC
 
 typedef enum {
-    /* 0x0 */ CANBUY_RESULT_SUCCESS_1,
-    /* 0x1 */ CANBUY_RESULT_SUCCESS_2,
-    /* 0x2 */ CANBUY_RESULT_NO_ROOM,
-    /* 0x3 */ CANBUY_RESULT_NEED_EMPTY_BOTTLE,
-    /* 0x4 */ CANBUY_RESULT_NEED_RUPEES,
-    /* 0x5 */ CANBUY_RESULT_CANNOT_GET_NOW,
-    /* 0x6 */ CANBUY_RESULT_CANNOT_GET_NOW_2,
-    /* 0x7 */ CANBUY_RESULT_NO_ROOM_2,
-    /* 0x8 */ CANBUY_RESULT_ALREADY_HAVE,
-    /* 0x9 */ CANBUY_RESULT_HAVE_BETTER
+    /* 0 */ CANBUY_RESULT_SUCCESS_1,
+    /* 1 */ CANBUY_RESULT_SUCCESS_2,
+    /* 2 */ CANBUY_RESULT_NO_ROOM,
+    /* 3 */ CANBUY_RESULT_NEED_EMPTY_BOTTLE,
+    /* 4 */ CANBUY_RESULT_NEED_RUPEES,
+    /* 5 */ CANBUY_RESULT_CANNOT_GET_NOW,
+    /* 6 */ CANBUY_RESULT_CANNOT_GET_NOW_2,
+    /* 7 */ CANBUY_RESULT_NO_ROOM_2,
+    /* 8 */ CANBUY_RESULT_ALREADY_HAVE,
+    /* 9 */ CANBUY_RESULT_HAVE_BETTER
 } EnGirlACanBuyResult;
 
 typedef enum {
diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.h b/src/overlays/actors/ovl_En_Gk/z_en_gk.h
index fd724cc7c6..130b97675c 100644
--- a/src/overlays/actors/ovl_En_Gk/z_en_gk.h
+++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.h
@@ -13,14 +13,14 @@ typedef void (*EnGkActionFunc)(struct EnGk*, PlayState*);
 
 #define ENGK_PATH_INDEX_NONE 0xF
 
-enum {
+typedef enum {
     /* 0 */ ENGK_F_0,
     /* 1 */ ENGK_F_1,
     /* 2 */ ENGK_F_2,
     /* 3 */ ENGK_F_3,
     /* 4 */ ENGK_F_4,
-    /* 5 */ ENGK_F_5,
-};
+    /* 5 */ ENGK_F_5
+} EnGkParam;
 
 typedef struct EnGk {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h
index 23c02a9c4c..5162a4f774 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.h
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.h
@@ -56,7 +56,7 @@ typedef enum EnGoType {
     /* 5 */ ENGO_ASIDE_STORE,      // Shrine Goron outside store
     /* 6 */ ENGO_ASIDE_ELDERSROOM, // Shrine Goron outside Elder's room
     /* 7 */ ENGO_ASIDE_ELDERSSON,  // Shrine Goron aside the Elder's Son
-    /* 8 */ ENGO_MEDIGORON,        // Medigoron selling Powder Kegs
+    /* 8 */ ENGO_MEDIGORON         // Medigoron selling Powder Kegs
 } EnGoType;
 
 /**
@@ -70,7 +70,7 @@ typedef enum EnGoRacetrackSubtype {
     /* 4 */ ENGO_ATHLETIC_HAMSTRINGSIT,
     /* 5 */ ENGO_ATHLETIC_HAMSTRINGSTAND,
     /* 6 */ ENGO_SPECTATOR_CHEER,
-    /* 7 */ ENGO_SPECTATOR_SHOUTING,
+    /* 7 */ ENGO_SPECTATOR_SHOUTING
 } EnGoRacetrackSubtype;
 
 /**
@@ -78,7 +78,7 @@ typedef enum EnGoRacetrackSubtype {
  */
 typedef enum EnGoGraveyardSubtype {
     /* 0 */ ENGO_GRAVEYARD_GRAVEMAKER,
-    /* 1 */ ENGO_GRAVEYARD_FROZEN,
+    /* 1 */ ENGO_GRAVEYARD_FROZEN
 } EnGoGraveyardSubtype;
 
 typedef struct EnGo {
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
index e672355e52..2ace5ff851 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
@@ -14,27 +14,27 @@ typedef s32 (*EnGoroiwaUnkFunc)(struct EnGoroiwa*);
 #define ENGOROIWA_GET_300(thisx) (((thisx)->params >> 0x8) & 3)
 #define ENGOROIWA_GET_FF(thisx) ((thisx)->params & 0xFF)
 
-enum {
+typedef enum {
     /* 0 */ ENGOROIWA_300_0,
     /* 1 */ ENGOROIWA_300_1,
-    /* 3 */ ENGOROIWA_300_3 = 3,
-};
+    /* 3 */ ENGOROIWA_300_3 = 3
+} EnGoroiwaParam300;
 
-enum {
+typedef enum {
     /* 0 */ ENGOROIWA_400_0,
-    /* 1 */ ENGOROIWA_400_1,
-};
+    /* 1 */ ENGOROIWA_400_1
+} EnGoroiwaParam400;
 
-enum {
+typedef enum {
     /* 0 */ ENGOROIWA_3000_0,
     /* 1 */ ENGOROIWA_3000_1,
-    /* 2 */ ENGOROIWA_3000_2,
-};
+    /* 2 */ ENGOROIWA_3000_2
+} EnGoroiwaParam3000;
 
-enum {
+typedef enum {
     /* 1 */ ENGOROIWA_C000_1 = 1,
-    /* 2 */ ENGOROIWA_C000_2,
-};
+    /* 2 */ ENGOROIWA_C000_2
+} EnGoroiwaParamC000;
 
 typedef struct {
     /* 0x00 */ Vec3f unk_00;
diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c
index c4ff0959ca..7fbed61221 100644
--- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c
+++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c
@@ -52,18 +52,18 @@ typedef enum {
     /*  7 */ EN_GRASSHOPPER_ACTION_WAIT_AFTER_ATTACK,
     /*  8 */ EN_GRASSHOPPER_ACTION_DAMAGED,
     /*  9 */ EN_GRASSHOPPER_ACTION_DEAD,
-    /* 10 */ EN_GRASSHOPPER_ACTION_FALL,
+    /* 10 */ EN_GRASSHOPPER_ACTION_FALL
 } EnGrasshopperAction;
 
 typedef enum {
     /* 0 */ EN_GRASSHOPPER_DECISION_ATTACK,
     /* 1 */ EN_GRASSHOPPER_DECISION_FLY,
-    /* 2 */ EN_GRASSHOPPER_DECISION_ROAM_IN_CIRCLES, // Never used in the final game
+    /* 2 */ EN_GRASSHOPPER_DECISION_ROAM_IN_CIRCLES // Never used in the final game
 } EnGrasshopperNextAction;
 
 typedef enum {
     /* 0 */ EN_GRASSHOPPER_BANK_STATE_BANKING,
-    /* 1 */ EN_GRASSHOPPER_BANK_STATE_DONE,
+    /* 1 */ EN_GRASSHOPPER_BANK_STATE_DONE
 } EnGrasshopperBankState;
 
 typedef enum {
@@ -74,7 +74,7 @@ typedef enum {
     /* 4 */ EN_GRASSHOPPER_ANIM_HOVER,
     /* 5 */ EN_GRASSHOPPER_ANIM_DAMAGE,
     /* 6 */ EN_GRASSHOPPER_ANIM_DEAD,
-    /* 7 */ EN_GRASSHOPPER_ANIM_FALL,
+    /* 7 */ EN_GRASSHOPPER_ANIM_FALL
 } EnGrasshopperAnim;
 
 static s32 sOccupiedIndices[] = {
@@ -99,7 +99,7 @@ typedef enum {
     /* 0x3 */ EN_GRASSHOPPER_DMGEFF_FREEZE,     // Damages and freezes the Dragonfly in ice
     /* 0x4 */ EN_GRASSHOPPER_DMGEFF_LIGHT_ORB,  // Damages and surrounds the Dragonfly with light orbs
     /* 0xE */ EN_GRASSHOPPER_DMGEFF_HOOK = 0xE, // If hit by the Hookshot, it pulls the Dragonfly towards the player
-    /* 0xF */ EN_GRASSHOPPER_DMGEFF_NONE,       // Deals regular damage with no extra effect
+    /* 0xF */ EN_GRASSHOPPER_DMGEFF_NONE        // Deals regular damage with no extra effect
 } EnDragonflyDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h
index 11ed8a1308..049091393a 100644
--- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h
+++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h
@@ -17,7 +17,7 @@ typedef enum EnGrasshopperType {
     /*  0 */ EN_GRASSHOPPER_TYPE_NORMAL,
     /*  1 */ EN_GRASSHOPPER_TYPE_GROWS_WHEN_SPAWNED, // Spawned by EnEncount1
     /*  2 */ EN_GRASSHOPPER_TYPE_WOODFALL_TEMPLE_FINAL_ROOM,
-    /*  3 */ EN_GRASSHOPPER_TYPE_WOODFALL,
+    /*  3 */ EN_GRASSHOPPER_TYPE_WOODFALL
 } EnGrasshopperType;
 
 typedef struct EnGrasshopperEffect {
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
index 42efabb613..b7af0c5820 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.h
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
@@ -11,12 +11,12 @@ typedef void (*EnGsActionFunc)(struct EnGs*, PlayState*);
 #define ENGS_GET_FE0(thisx) (((thisx)->params >> 5) & 0x7F)
 #define ENGS_GET_F000(thisx) (((thisx)->params >> 0xC) & 0xF)
 
-enum {
+typedef enum {
     /* 0 */ ENGS_0,
     /* 1 */ ENGS_1,
     /* 2 */ ENGS_2,
-    /* 3 */ ENGS_3,
-};
+    /* 3 */ ENGS_3
+} EnGsParam;
 
 typedef struct EnGs {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c
index d27dd5a59e..ea93d617fb 100644
--- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c
+++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c
@@ -84,7 +84,7 @@ typedef enum {
     /* 0 */ WAIT_HEAD_TILT_ANIM,
     /* 1 */ WALK_ANIM,
     /* 2 */ DIG_ANIM,
-    /* 3 */ WALK_ANIM_2,
+    /* 3 */ WALK_ANIM_2
 } EnGuardNutsAnim;
 
 typedef enum {
diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c
index 0992aa9d9a..180bf8cab8 100644
--- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c
+++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c
@@ -37,14 +37,14 @@ typedef enum {
     /* 4 */ HG_ANIM_REACH_FORWARD,
     /* 5 */ HG_ANIM_CURL_UP,
     /* 6 */ HG_ANIM_CROUCHED_PANIC,
-    /* 7 */ HG_ANIM_PANIC,
+    /* 7 */ HG_ANIM_PANIC
 } HgAnimation;
 
 typedef enum {
     /* 0 */ HG_CS_FIRST_ENCOUNTER,
     /* 1 */ HG_CS_GET_MASK,
     /* 2 */ HG_CS_SUBSEQUENT_ENCOUNTER,
-    /* 3 */ HG_CS_SONG_OF_HEALING,
+    /* 3 */ HG_CS_SONG_OF_HEALING
 } HgCsIndex;
 
 ActorInit En_Hg_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c
index 37d5a61f91..f6c90f6b4e 100644
--- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c
+++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c
@@ -45,7 +45,7 @@ typedef enum {
     /* 3 */ HGO_ANIM_CONSOLE,
     /* 4 */ HGO_ANIM_CONSOLE_HEAD_UP,
     /* 5 */ HGO_ANIM_REACH_DOWN_TO_LIFT,
-    /* 6 */ HGO_ANIM_TOSS,
+    /* 6 */ HGO_ANIM_TOSS
 } HgoAnimation;
 
 ActorInit En_Hgo_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
index b6d2c8c401..787a40da7f 100644
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
@@ -92,22 +92,22 @@ void EnHorse_StickDirection(Vec2f* curStick, f32* stickMag, s16* angle);
 s32 EnHorse_GetMountSide(EnHorse* this, PlayState* play);
 
 typedef struct {
-    s32 cueId;
-    s32 csFuncIdx;
-} CsActionEntry;
+    /* 0x0 */ s32 cueId;
+    /* 0x4 */ s32 csFuncIdx;
+} CsActionEntry; // size = 0x8
 
 typedef struct {
-    s16 x;
-    s16 y;
-    s16 z;
-    s16 speed;
-    s16 angle;
-} RaceWaypoint;
+    /* 0x0 */ s16 x;
+    /* 0x2 */ s16 y;
+    /* 0x4 */ s16 z;
+    /* 0x6 */ s16 speed;
+    /* 0x8 */ s16 angle;
+} RaceWaypoint; // size = 0xA
 
 typedef struct {
-    s32 numWaypoints;
-    RaceWaypoint* waypoints;
-} RaceInfo;
+    /* 0x0 */ s32 numWaypoints;
+    /* 0x4 */ RaceWaypoint* waypoints;
+} RaceInfo; // size = 0x8
 
 static AnimationHeader* sEponaAnimations[] = {
     &object_horse_link_child_Anim_006D44, &object_horse_link_child_Anim_007468, &object_horse_link_child_Anim_005F64,
diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
index 0574b3198e..3cfc1fb544 100644
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
@@ -133,7 +133,7 @@ typedef enum EnHorseParam {
     /* 17 */ ENHORSE_17,
     /* 18 */ ENHORSE_18,
     /* 19 */ ENHORSE_19,
-    /* 20 */ ENHORSE_20,
+    /* 20 */ ENHORSE_20
 } EnHorseParam;
 
 /**
diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
index d43f1f90c3..9033878a47 100644
--- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
+++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
@@ -11,7 +11,7 @@ typedef s32 (*EnHorseGameCheckUnkFunc)(struct EnHorseGameCheck*, PlayState*);
 #define ENHORSEGAMECHECK_GET_FF(thisx) ((thisx)->params & 0xFF)
 #define ENHORSEGAMECHECK_GET_FF00(thisx) (((thisx)->params & 0xFF00) >> 8)
 
-enum {
+typedef enum {
     /*  0 */ ENHORSEGAMECHECK_FF_0,
     /*  1 */ ENHORSEGAMECHECK_FF_1,
     /*  2 */ ENHORSEGAMECHECK_FF_2,
@@ -22,8 +22,8 @@ enum {
     /*  7 */ ENHORSEGAMECHECK_FF_7,
     /*  8 */ ENHORSEGAMECHECK_FF_8,
     /*  9 */ ENHORSEGAMECHECK_FF_9,
-    /* 10 */ ENHORSEGAMECHECK_FF_MAX,
-};
+    /* 10 */ ENHORSEGAMECHECK_FF_MAX
+} EnHorseGameCheckParam;
 
 typedef struct EnHorseGameCheck {
     /* 0x000 */ DynaPolyActor dyna;
diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
index 71b338121c..d4a534ad17 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -169,8 +169,7 @@ typedef enum {
     /* 0x4 */ DMG_EFF_FIRE = 0x2,
     /* 0x0 */ DMG_EFF_ICE,
     /* 0x4 */ DMG_EFF_LIGHT_SPARKS,
-    /* 0xF */ DMG_EFF_IMMUNE = 0xF,
-
+    /* 0xF */ DMG_EFF_IMMUNE = 0xF
 } EnIkDmgEff;
 
 static DamageTable sDamageTableArmor = {
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h
index c5d7500b68..6f4dd5d95a 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.h
+++ b/src/overlays/actors/ovl_En_In/z_en_in.h
@@ -33,7 +33,7 @@ typedef enum {
     /* 14 */ ENIN_ANIM_14,
     /* 15 */ ENIN_ANIM_15,
     /* 16 */ ENIN_ANIM_16,
-    /* 17 */ ENIN_ANIM_17,
+    /* 17 */ ENIN_ANIM_17
 } EnInAnimation;
 
 #define ENIN_GET_TYPE(thisx) ((thisx)->params & 0x1FF)
diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c
index 7479a6208a..df217b86d9 100644
--- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c
+++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c
@@ -54,14 +54,14 @@ typedef enum {
     /* 16 */ EN_JG_ANIM_DEPRESSED,
     /* 17 */ EN_JG_ANIM_CUTSCENE_IDLE,
     /* 18 */ EN_JG_ANIM_CRADLE,
-    /* 19 */ EN_JG_ANIM_MAX,
+    /* 19 */ EN_JG_ANIM_MAX
 } EnJgAnimation;
 
 typedef enum {
-    /* 0x0 */ EN_JG_ACTION_FIRST_THAW,
-    /* 0x1 */ EN_JG_ACTION_SPAWNING,
-    /* 0x2 */ EN_JG_ACTION_FROZEN_OR_NON_FIRST_THAW,
-    /* 0x3 */ EN_JG_ACTION_LULLABY_INTRO_CS,
+    /* 0 */ EN_JG_ACTION_FIRST_THAW,
+    /* 1 */ EN_JG_ACTION_SPAWNING,
+    /* 2 */ EN_JG_ACTION_FROZEN_OR_NON_FIRST_THAW,
+    /* 3 */ EN_JG_ACTION_LULLABY_INTRO_CS
 } EnJgAction;
 
 ActorInit En_Jg_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
index 86d74f69aa..930a0d7a38 100644
--- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
+++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
@@ -113,15 +113,15 @@ Vec3f D_80972030 = { -3.0f, 50.0f, 90.0f };
 Vec3f D_8097203C = { 10.0f, -15.0f, 2.0f };
 
 typedef enum {
-    /* 0x0 */ ENKAKASI_ANIM_ARMS_CROSSED_ROCKING, // arms crossed and rocking back and forth
-    /* 0x1 */ ENKAKASI_ANIM_SIDEWAYS_SHAKING,
-    /* 0x2 */ ENKAKASI_ANIM_HOPPING_REGULAR,    // bounce bounce bounce (repeat)
-    /* 0x3 */ ENKAKASI_ANIM_SPIN_REACH_OFFER,   // spin and then reaching toward player
-    /* 0x4 */ ENKAKASI_ANIM_TWIRL,              // slower cinimatic twirl
-    /* 0x5 */ ENKAKASI_ANIM_ARMS_CROSSED_STILL, // arms crossed but still, also some noise sfx
-    /* 0x6 */ ENKAKASI_ANIM_WAVE,               // "wave" short sideways shake, stops early, partial? unused?
-    /* 0x7 */ ENKAKASI_ANIM_SLOWROLL,           // partial bounch, ends looking left, OFFER anim takes over
-    /* 0x8 */ ENKAKASI_ANIM_IDLE,               // slow stretching wiggle, ends in regular position
+    /* 0 */ ENKAKASI_ANIM_ARMS_CROSSED_ROCKING, // arms crossed and rocking back and forth
+    /* 1 */ ENKAKASI_ANIM_SIDEWAYS_SHAKING,
+    /* 2 */ ENKAKASI_ANIM_HOPPING_REGULAR,    // bounce bounce bounce (repeat)
+    /* 3 */ ENKAKASI_ANIM_SPIN_REACH_OFFER,   // spin and then reaching toward player
+    /* 4 */ ENKAKASI_ANIM_TWIRL,              // slower cinimatic twirl
+    /* 5 */ ENKAKASI_ANIM_ARMS_CROSSED_STILL, // arms crossed but still, also some noise sfx
+    /* 6 */ ENKAKASI_ANIM_WAVE,               // "wave" short sideways shake, stops early, partial? unused?
+    /* 7 */ ENKAKASI_ANIM_SLOWROLL,           // partial bounch, ends looking left, OFFER anim takes over
+    /* 8 */ ENKAKASI_ANIM_IDLE                // slow stretching wiggle, ends in regular position
 } EnKakasiAnimation;
 
 static AnimationHeader* sAnimations[] = {
diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
index 66aa6d5c72..34b3d64050 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
@@ -93,11 +93,11 @@ static ColliderCylinderInit sAttackCylinderInit = {
 static CollisionCheckInfoInit sColChkInfoInit = { 1, 15, 80, MASS_HEAVY };
 
 typedef enum {
-    /* 0x0 */ KAREBABA_DMGEFF_NONE,
-    /* 0x2 */ KAREBABA_DMGEFF_FIRE = 2,
-    /* 0x3 */ KAREBABA_DMGEFF_ICE,
-    /* 0x4 */ KAREBABA_DMGEFF_LIGHT,
-    /* 0x5 */ KAREBABA_DMGEFF_ELECTRIC,
+    /* 0 */ KAREBABA_DMGEFF_NONE,
+    /* 2 */ KAREBABA_DMGEFF_FIRE = 2,
+    /* 3 */ KAREBABA_DMGEFF_ICE,
+    /* 4 */ KAREBABA_DMGEFF_LIGHT,
+    /* 5 */ KAREBABA_DMGEFF_ELECTRIC
 } DekuBabaDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
index aa05aec0a1..045bef42a0 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
@@ -11,7 +11,7 @@ typedef void (*EnKarebabaActionFunc)(struct EnKarebaba*, PlayState*);
 typedef enum {
     /* 0 */ ENKAREBABA_0, // Unused, always shrinks and drops a Deku Nut
     /* 1 */ ENKAREBABA_1, // Drops sticks (Only type OoT has) 
-    /* 2 */ KAREBABA_MINI,
+    /* 2 */ KAREBABA_MINI
 } KarebabaType;
 
 typedef struct EnKarebaba {
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index 147ca24012..16ce971535 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -245,14 +245,14 @@ void EnKusa_DropCollectible(EnKusa* this, PlayState* play) {
     s32 collectableParams;
 
     if ((KUSA_GET_TYPE(&this->actor) == ENKUSA_TYPE_GRASS) || (KUSA_GET_TYPE(&this->actor) == ENKUSA_TYPE_BUSH)) {
-        if (!KUSA_GET_PARAMS_0C(&this->actor)) {
+        if (!KUSA_GET_PARAM_0C(&this->actor)) {
             Item_DropCollectibleRandom(play, NULL, &this->actor.world.pos,
                                        KUSA_GET_RAND_COLLECTIBLE_ID(&this->actor) * 0x10);
         }
     } else if (KUSA_GET_TYPE(&this->actor) == ENKUSA_TYPE_REGROWING_GRASS) {
         Item_DropCollectible(play, &this->actor.world.pos, 3);
     } else {
-        collectible = func_800A8150(KUSA_GET_PARAMS_3F(&this->actor));
+        collectible = func_800A8150(KUSA_GET_PARAM_3F(&this->actor));
         if (collectible >= 0) {
             collectableParams = KUSA_GET_COLLECTIBLE_ID(&this->actor);
             Item_DropCollectible(play, &this->actor.world.pos, (collectableParams << 8) | collectible);
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
index 56f55af3e8..b231f3e0e1 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
@@ -28,8 +28,8 @@ typedef struct EnKusa {
 #define KUSA_GET_COLLECTIBLE_ID(thisx) (((thisx)->params >> 8) & 0x7F)
 #define KUSA_GET_RAND_COLLECTIBLE_ID(thisx) (((thisx)->params >> 8) & 0xF)
 #define KUSA_SHOULD_SPAWN_BUGS(thisx) (((thisx)->params >> 0x4) & 1)
-#define KUSA_GET_PARAMS_0C(thisx) (((thisx)->params >> 0xC) & 0x1)
-#define KUSA_GET_PARAMS_3F(thisx) (((thisx)->params >> 0x2) & 0x3F)
+#define KUSA_GET_PARAM_0C(thisx) (((thisx)->params >> 0xC) & 0x1)
+#define KUSA_GET_PARAM_3F(thisx) (((thisx)->params >> 0x2) & 0x3F)
 
 
 #define KUSA_GET_TYPE(thisx)((thisx)->params & 0x3)
diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c
index 0908649dc6..f3c3f4705e 100644
--- a/src/overlays/actors/ovl_En_Light/z_en_light.c
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.c
@@ -31,9 +31,9 @@ ActorInit En_Light_InitVars = {
 };
 
 typedef struct {
-    /* 0x00 */ Color_RGBA8 unk_00;
-    /* 0x04 */ Color_RGB8 unk_04;
-    /* 0x07 */ u8 unk_07;
+    /* 0x0 */ Color_RGBA8 unk_00;
+    /* 0x4 */ Color_RGB8 unk_04;
+    /* 0x7 */ u8 unk_07;
 } EnLightStruct; // size = 0x8
 
 EnLightStruct D_808666D0[] = {
diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
index d295b1c7f6..fe26c18eb9 100644
--- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
+++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
@@ -44,14 +44,14 @@ void EnMa4_InitFaceExpression(EnMa4* this);
 typedef enum {
     /* 0 */ MA4_TYPE_DAY1,
     /* 1 */ MA4_TYPE_ALIENS_DEFEATED,
-    /* 2 */ MA4_TYPE_ALIENS_WON,
+    /* 2 */ MA4_TYPE_ALIENS_WON
 } EnMa4Type;
 
 typedef enum {
     /* 0 */ MA4_STATE_DEFAULT,
     /* 1 */ MA4_STATE_HORSEBACKGAME,
     /* 2 */ MA4_STATE_AFTERHORSEBACKGAME,
-    /* 3 */ MA4_STATE_AFTERDESCRIBETHEMCS,
+    /* 3 */ MA4_STATE_AFTERDESCRIBETHEMCS
 } EnMa4State;
 
 ActorInit En_Ma4_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h
index 9a3801d91c..3e321cc563 100644
--- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h
+++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h
@@ -19,9 +19,9 @@ typedef enum {
 } MinifrogType;
 
 typedef enum {
-    /* 0x00 */ MINIFROG_STATE_JUMP,
-    /* 0x01 */ MINIFROG_STATE_AIR,
-    /* 0x02 */ MINIFROG_STATE_GROUND
+    /* 0 */ MINIFROG_STATE_JUMP,
+    /* 1 */ MINIFROG_STATE_AIR,
+    /* 2 */ MINIFROG_STATE_GROUND
 } MinifrogJumpState;
 
 typedef struct EnMinifrog {
diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c
index 3b6cbaf869..3aac9ae11c 100644
--- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c
+++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c
@@ -80,7 +80,7 @@ typedef enum {
     /* 0x2 */ MINISLIME_DMGEFF_FIRE = 0x2,
     /* 0x3 */ MINISLIME_DMGEFF_ICE,
     /* 0xE */ MINISLIME_DMGEFF_HOOKSHOT = 0xE,
-    /* 0xF */ MINISLIME_DMGEFF_BREAK_ICE,
+    /* 0xF */ MINISLIME_DMGEFF_BREAK_ICE
 } MinislimeDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h
index 77cabe9b6b..8d29f2b8ae 100644
--- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h
+++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h
@@ -21,13 +21,13 @@ typedef enum {
     /* 0x8 */ MINISLIME_DEFEAT_MELT,
     /* 0x9 */ MINISLIME_DESPAWN,
     /* 0xA */ MINISLIME_SETUP_GEKKO_THROW,
-    /* 0xB */ MINISLIME_GEKKO_THROW,
+    /* 0xB */ MINISLIME_GEKKO_THROW
 } EnMinislimeState;
 
 typedef enum {
-    /* 0x0 */ MINISLIME_INACTIVE_STATE,
-    /* 0x1 */ MINISLIME_ACTIVE_CONTINUE_STATE,
-    /* 0x2 */ MINISLIME_ACTIVE_INIT_STATE,
+    /* 0 */ MINISLIME_INACTIVE_STATE,
+    /* 1 */ MINISLIME_ACTIVE_CONTINUE_STATE,
+    /* 2 */ MINISLIME_ACTIVE_INIT_STATE
 } EnMinislimeActiveState;
 
 typedef struct EnMinislime {
diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c
index c94a94b124..db05f0d618 100644
--- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c
+++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c
@@ -23,9 +23,9 @@ void EnMttag_PotentiallyRestartRace(EnMttag* this, PlayState* play);
 void EnMttag_HandleCantWinChoice(EnMttag* this, PlayState* play);
 
 typedef enum {
-    GORON_RACE_CHEAT_NO_CHEATING,
-    GORON_RACE_CHEAT_FALSE_START,
-    GORON_RACE_CHEAT_TRYING_TO_REACH_GOAL_FROM_BEHIND,
+    /* 0 */ GORON_RACE_CHEAT_NO_CHEATING,
+    /* 1 */ GORON_RACE_CHEAT_FALSE_START,
+    /* 2 */ GORON_RACE_CHEAT_TRYING_TO_REACH_GOAL_FROM_BEHIND
 } PlayerCheatStatus;
 
 ActorInit En_Mt_tag_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
index 4edadf412e..474c1d2df3 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@@ -43,7 +43,7 @@ typedef enum EnNbScheduleResult {
     /* 1 */ EN_NB_SCH_1,
     /* 2 */ EN_NB_SCH_2,
     /* 3 */ EN_NB_SCH_3,
-    /* 4 */ EN_NB_SCH_4,
+    /* 4 */ EN_NB_SCH_4
 } EnNbScheduleResult;
 
 static u8 sScheduleScript[] = {
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.h b/src/overlays/actors/ovl_En_Nb/z_en_nb.h
index f11464c794..2a784e096c 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.h
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h
@@ -17,7 +17,7 @@ typedef enum EnNbAnimation {
     /*  2 */ EN_NB_ANIM_TALK_ONCE,
     /*  3 */ EN_NB_ANIM_TALK_LOOP,
     /*  4 */ EN_NB_ANIM_ANGRY,
-    /*  5 */ EN_NB_ANIM_RELIEVED,
+    /*  5 */ EN_NB_ANIM_RELIEVED
 } EnNbAnimation;
 
 typedef struct EnNb {
diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c
index 66098a9d55..755385d004 100644
--- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c
+++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c
@@ -57,7 +57,7 @@ typedef enum {
     /* 0xC */ EN_NEO_REEBA_DMGEFF_HOOKSHOT = 0xC, // No damage, used only for hookshot
     /* 0xD */ EN_NEO_REEBA_DMGEFF_ELECTRIC_STUN,  // Electric effects, frozen in place
     /* 0xE */ EN_NEO_REEBA_DMGEFF_NONE,           // Normal hit
-    /* 0xF */ EN_NEO_REEBA_DMGEFF_SHATTER,        // Normal hit that can break ice if leever is frozen
+    /* 0xF */ EN_NEO_REEBA_DMGEFF_SHATTER         // Normal hit that can break ice if leever is frozen
 } EnNeoReebaDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c
index 03cdad42ce..4982f7e751 100644
--- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c
+++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c
@@ -36,7 +36,7 @@ void EnNiw_SpawnFeather(EnNiw* this, Vec3f* pos, Vec3f* vel, Vec3f* accel, f32 s
 s16 sCuccoStormActive = false;
 
 // why wouldnt they just use actionFunc?
-enum EnNiwState {
+typedef enum EnNiwState {
     /* 0 */ NIW_STATE_IDLE,
     /* 1 */ NIW_STATE_ANGRY1, // 1/2/3 are stages of summoning cucco storm
     /* 2 */ NIW_STATE_ANGRY2,
@@ -45,8 +45,8 @@ enum EnNiwState {
     /* 5 */ NIW_STATE_FALLING,
     /* 6 */ NIW_STATE_SWIMMING,
     /* 7 */ NIW_STATE_RUNNING,
-    /* 8 */ NIW_STATE_HOPPING,
-};
+    /* 8 */ NIW_STATE_HOPPING
+} EnNiwState;
 
 ActorInit En_Niw_InitVars = {
     ACTOR_EN_NIW,
diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.h b/src/overlays/actors/ovl_En_Niw/z_en_niw.h
index c603975350..06f4878003 100644
--- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h
+++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h
@@ -106,7 +106,7 @@ typedef enum {
     /* 2 */ NIW_ANIM_PECKING_AND_WAVING, // wings move along their axis, like human hand waving
     /* 3 */ NIW_ANIM_PECKING_AND_FORFLAPPING, // (unused) low (yaw based) flapping, forward and back
     /* 4 */ NIW_ANIM_FREEZE, // used during Cucco Storm
-    /* 5 */ NIW_ANIM_PECKING_SLOW_FORFLAPPING, // wing speed half that of 3
+    /* 5 */ NIW_ANIM_PECKING_SLOW_FORFLAPPING // wing speed half that of 3
 } EnNiwHeadAndWingAnimationState;
 
 
diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
index ac1e9749a4..fc6ef71dbc 100644
--- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
+++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
@@ -32,14 +32,14 @@ void EnNwc_DrawAdultBody(Actor* thisx, PlayState* play);
 s32 EnNwc_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
 EnHs* EnNwc_FindGrog(PlayState* play);
 
-enum EnNiwState {
-    /* -1 */ NWC_STATE_NIW_LOADED = -1,  // set after loading object_niw
-    /*  0 */ NWC_STATE_CHECK_BREMAN = 0, // checking for breman mask
-    /*  1 */ NWC_STATE_TURNING,          // turning to face a new direction to explore
-    /*  2 */ NWC_STATE_HOPPING_FORWARD,  // hopping to go explore
-    /*  3 */ NWC_STATE_FOLLOWING,        // following the player
-    /*  4 */ NWC_STATE_RUNNING,          // running from the player after failed breman march
-};
+typedef enum EnNwcState {
+    /* -1 */ NWC_STATE_NIW_LOADED = -1, // set after loading object_niw
+    /*  0 */ NWC_STATE_CHECK_BREMAN,    // checking for breman mask
+    /*  1 */ NWC_STATE_TURNING,         // turning to face a new direction to explore
+    /*  2 */ NWC_STATE_HOPPING_FORWARD, // hopping to go explore
+    /*  3 */ NWC_STATE_FOLLOWING,       // following the player
+    /*  4 */ NWC_STATE_RUNNING          // running from the player after failed breman march
+} EnNwcState;
 
 ActorInit En_Nwc_InitVars = {
     ACTOR_EN_NWC,
diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c
index 4ff55d7a0c..52f611c0e8 100644
--- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c
+++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c
@@ -44,8 +44,8 @@ void EnOwl_ChangeMode(EnOwl* this, EnOwlActionFunc actionFunc, EnOwlFunc unkFunc
                       AnimationHeader* animation, f32 morphFrames);
 
 typedef enum {
-    /* 0x00 */ OWL_REPEAT,
-    /* 0x01 */ OWL_OK
+    /* 0 */ OWL_REPEAT,
+    /* 1 */ OWL_OK
 } EnOwlMessageChoice;
 
 ActorInit En_Owl_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h
index 5e02aba941..095434fa0c 100644
--- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h
+++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h
@@ -17,7 +17,7 @@ typedef enum {
     /* 0x002 */ ENOWL_GET_TYPE_2,
     /* 0x003 */ ENOWL_GET_TYPE_3,
     /* 0x01E */ ENOWL_GET_TYPE_30 = 30,
-    /* 0x3E8 */ ENOWL_GET_TYPE_1000 = 1000,
+    /* 0x3E8 */ ENOWL_GET_TYPE_1000 = 1000
 } EnOwlType;
 
 typedef struct EnOwl {
diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c
index 0caeb93052..079e3027df 100644
--- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c
+++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c
@@ -80,12 +80,12 @@ ActorInit En_Pametfrog_InitVars = {
 };
 
 typedef enum {
-    /* 0x0 */ GEKKO_DMGEFF_NONE,
-    /* 0x1 */ GEKKO_DMGEFF_STUN,
-    /* 0x2 */ GEKKO_DMGEFF_FIRE,
-    /* 0x3 */ GEKKO_DMGEFF_ICE,
-    /* 0x4 */ GEKKO_DMGEFF_LIGHT,
-    /* 0x5 */ GEKKO_DMGEFF_ZORA_BARRIER,
+    /* 0 */ GEKKO_DMGEFF_NONE,
+    /* 1 */ GEKKO_DMGEFF_STUN,
+    /* 2 */ GEKKO_DMGEFF_FIRE,
+    /* 3 */ GEKKO_DMGEFF_ICE,
+    /* 4 */ GEKKO_DMGEFF_LIGHT,
+    /* 5 */ GEKKO_DMGEFF_ZORA_BARRIER
 } EnPametfrogDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h
index 90bc0cb1b7..31a3be14b3 100644
--- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h
+++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h
@@ -9,16 +9,16 @@ struct EnPametfrog;
 typedef void (*EnPametfrogActionFunc)(struct EnPametfrog*, PlayState*);
 
 typedef enum {
-    /* 0x0 */ GEKKO_PRE_SNAPPER,
-    /* 0x1 */ GEKKO_GET_SNAPPER,
-    /* 0x2 */ GEKKO_INIT_SNAPPER,
-    /* 0x3 */ GEKKO_ON_SNAPPER,
-    /* 0x4 */ GEKKO_REAR_ON_SNAPPER,
-    /* 0x5 */ GEKKO_CUTSCENE,
-    /* 0x6 */ GEKKO_FALL_OFF_SNAPPER,
-    /* 0x7 */ GEKKO_RETURN_TO_SNAPPER,
-    /* 0x8 */ GEKKO_JUMP_ON_SNAPPER,
-    /* 0x9 */ GEKKO_DEFEAT,
+    /* 0 */ GEKKO_PRE_SNAPPER,
+    /* 1 */ GEKKO_GET_SNAPPER,
+    /* 2 */ GEKKO_INIT_SNAPPER,
+    /* 3 */ GEKKO_ON_SNAPPER,
+    /* 4 */ GEKKO_REAR_ON_SNAPPER,
+    /* 5 */ GEKKO_CUTSCENE,
+    /* 6 */ GEKKO_FALL_OFF_SNAPPER,
+    /* 7 */ GEKKO_RETURN_TO_SNAPPER,
+    /* 8 */ GEKKO_JUMP_ON_SNAPPER,
+    /* 9 */ GEKKO_DEFEAT
 } EnPametfrogState;
 
 typedef struct EnPametfrog {
diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h
index 662e8574e4..5bd4de503d 100644
--- a/src/overlays/actors/ovl_En_Part/z_en_part.h
+++ b/src/overlays/actors/ovl_En_Part/z_en_part.h
@@ -8,11 +8,11 @@ struct EnPart;
 typedef void (*EnPartActionFunc)(struct EnPart*, PlayState*);
 
 typedef enum {
-    ENPART_TYPE_0 = 0,
-    ENPART_TYPE_1 = 1,
-    ENPART_TYPE_4 = 4,
-    ENPART_TYPE_15 = 15
-} EnPartParams;
+    /* 0x0 */ ENPART_TYPE_0,
+    /* 0x1 */ ENPART_TYPE_1,
+    /* 0x4 */ ENPART_TYPE_4 = 4,
+    /* 0xF */ ENPART_TYPE_15 = 15
+} EnPartParam;
 
 typedef struct EnPart {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c
index 652c19dc72..24517f8aac 100644
--- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c
+++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c
@@ -58,7 +58,7 @@ static ColliderSphereInit sSphereInit = {
 
 typedef enum {
     /* 0x0 */ POE_BALLOON_DMGEFF_NONE,
-    /* 0xF */ POE_BALLOON_DMGEFF_POP = 0xF,
+    /* 0xF */ POE_BALLOON_DMGEFF_POP = 0xF
 } PoeBalloonDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
index a1ea971999..357b08bdd6 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@@ -101,7 +101,7 @@ typedef enum {
     /* 0x1 */ POE_SISTERS_DMGEFF_UNKDMG12, // set in DamageTable, but unused
     /* 0x4 */ POE_SISTERS_DMGEFF_LIGHTARROWS = 0x4,
     /* 0xE */ POE_SISTERS_DMGEFF_SPINATTACK = 0xE,
-    /* 0xF */ POE_SISTERS_DMGEFF_DEKUNUT = 0xF,
+    /* 0xF */ POE_SISTERS_DMGEFF_DEKUNUT
 } PoeSisterDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
index cfb8a1697e..f800788c7f 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
@@ -15,17 +15,17 @@ typedef void (*EnPoSistersActionFunc)(struct EnPoSisters*, PlayState*);
 #define POE_SISTERS_PARAMS(observerFlag, megClone, type) (((observerFlag) << 0xC) | ((megClone & 3) << 0xA) | ((type & 3) << 8))
 
 typedef enum {
-    /* 0 */ POE_SISTERS_TYPE_MEG,   // purple
-    /* 1 */ POE_SISTERS_TYPE_JO,    // red
-    /* 2 */ POE_SISTERS_TYPE_BETH,  // blue
-    /* 3 */ POE_SISTERS_TYPE_AMY,   // green
+    /* 0 */ POE_SISTERS_TYPE_MEG,  // purple
+    /* 1 */ POE_SISTERS_TYPE_JO,   // red
+    /* 2 */ POE_SISTERS_TYPE_BETH, // blue
+    /* 3 */ POE_SISTERS_TYPE_AMY   // green
 } EnPoSisterType;
 
 typedef enum {
     /* 0 */ POE_SISTERS_MEG_REAL,
     /* 1 */ POE_SISTERS_MEG_CLONE1,
     /* 2 */ POE_SISTERS_MEG_CLONE2,
-    /* 3 */ POE_SISTERS_MEG_CLONE3,
+    /* 3 */ POE_SISTERS_MEG_CLONE3
 } EnPoSisterMegCloneID;
 
 typedef struct EnPoSisters {
diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c
index ef15618c9f..6d16c14188 100644
--- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c
+++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c
@@ -39,7 +39,7 @@ void EnPp_BodyPart_Move(EnPp* this, PlayState* play);
 typedef enum {
     /* 0 */ EN_PP_COLLISION_RESULT_OK,
     /* 1 */ EN_PP_COLLISION_RESULT_ABOUT_TO_RUN_INTO_WALL,
-    /* 2 */ EN_PP_COLLISION_RESULT_ABOUT_TO_RUN_OFF_LEDGE,
+    /* 2 */ EN_PP_COLLISION_RESULT_ABOUT_TO_RUN_OFF_LEDGE
 } EnPpCollisionResult;
 
 typedef enum {
@@ -56,13 +56,13 @@ typedef enum {
     /* 10 */ EN_PP_ACTION_MASK_DEAD,
     /* 11 */ EN_PP_ACTION_SPAWN_BODY_PARTS,
     /* 12 */ EN_PP_ACTION_DONE_SPAWNING_BODY_PARTS,
-    /* 13 */ EN_PP_ACTION_BODY_PART_MOVE,
+    /* 13 */ EN_PP_ACTION_BODY_PART_MOVE
 } EnPpAction;
 
 typedef enum {
     /* 0 */ EN_PP_MASK_DETACH_STATE_START,
     /* 1 */ EN_PP_MASK_DETACH_STATE_FALL,
-    /* 2 */ EN_PP_MASK_DETACH_STATE_DIE,
+    /* 2 */ EN_PP_MASK_DETACH_STATE_DIE
 } EnPpMaskDetachState;
 
 static s32 sCurrentDeadBodyPartIndex = 0;
@@ -77,7 +77,7 @@ typedef enum {
     /* 0xC */ EN_PP_DMGEFF_KNOCK_OFF_MASK = 0xC, // Knocks off the Hiploop's mask or deals regular damage
     /* 0xD */ EN_PP_DMGEFF_HOOKSHOT,             // Pulls the Hiploop's mask to the player or deals regular damage
     /* 0xE */ EN_PP_DMGEFF_GORON_POUND,          // Knocks off the Hiploop's mask or forces it to jump
-    /* 0xF */ EN_PP_DMGEFF_DAMAGE,               // Deals regular damage
+    /* 0xF */ EN_PP_DMGEFF_DAMAGE                // Deals regular damage
 } EnPpDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.h b/src/overlays/actors/ovl_En_Pp/z_en_pp.h
index aabbd9e2e6..2409487be3 100644
--- a/src/overlays/actors/ovl_En_Pp/z_en_pp.h
+++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.h
@@ -22,7 +22,7 @@ typedef enum {
     /* 13 */ EN_PP_TYPE_BODY_PART_FRONT_RIGHT_LOWER_LEG = 13,
     /* 17 */ EN_PP_TYPE_BODY_PART_LEFT_WING_MIDDLE = 17,
     /* 23 */ EN_PP_TYPE_BODY_PART_RIGHT_WING_MIDDLE = 23,
-    /* 26 */ EN_PP_TYPE_BODY_PART_CENTER_WING_MIDDLE = 26,
+    /* 26 */ EN_PP_TYPE_BODY_PART_CENTER_WING_MIDDLE = 26
 } EnPpType;
 
 typedef struct EnPp {
diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.c b/src/overlays/actors/ovl_En_Pst/z_en_pst.c
index 34ce6bafb7..9b5f1ef383 100644
--- a/src/overlays/actors/ovl_En_Pst/z_en_pst.c
+++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c
@@ -26,7 +26,7 @@ typedef enum {
 
 typedef enum {
     /* 0 */ POSTBOX_BEHAVIOUR_WAIT_FOR_ITEM,
-    /* 1 */ POSTBOX_BEHAVIOUR_TAKE_ITEM,
+    /* 1 */ POSTBOX_BEHAVIOUR_TAKE_ITEM
 } PostboxBehaviour;
 
 static u8 D_80B2C200[] = {
diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.h b/src/overlays/actors/ovl_En_Pst/z_en_pst.h
index 6051924da1..c3ebd58a8b 100644
--- a/src/overlays/actors/ovl_En_Pst/z_en_pst.h
+++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.h
@@ -9,7 +9,7 @@ typedef enum {
     /* 1 */ POSTBOX_NORTH_CLOCKTOWN,
     /* 2 */ POSTBOX_EAST_UPPER_CLOCKTOWN,
     /* 3 */ POSTBOX_EAST_LOWER_CLOCKTOWN,
-    /* 4 */ POSTBOX_SOUTH_LOWER_CLOCKTOWN,
+    /* 4 */ POSTBOX_SOUTH_LOWER_CLOCKTOWN
 } PostboxType;
 
 struct EnPst;
diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c
index d08110e433..ba76766551 100644
--- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c
+++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c
@@ -62,13 +62,13 @@ void EnRacedog_PlaySfxWalk(EnRacedog* this);
  * Stores various information for each dog in the race, mostly related to speed.
  */
 typedef struct {
-    f32 sprintSpeedMultiplier;        // Target speed is multiplied by this when the dog is in the last 1/4 of the race
-    f32 goodConditionSpeedMultiplier; // Target speed is multiplied by this if the dog is in good condition
-    s16 color;                        // The dog's color, which is used as an index into sBaseSpeeds
-    s16 index;                        // The dog's index within sDogInfo
-    s16 pointToUseSecondBaseSpeed;    // When the dog is at or after this point, the second value in sBaseSpeeds is used
-    s16 textId;                       // Used to determine the dog's condition
-} RaceDogInfo;
+    /* 0x0 */ f32 sprintSpeedMultiplier;        // Multiplies target speed when the dog is in the last 1/4 of the race
+    /* 0x4 */ f32 goodConditionSpeedMultiplier; // Multiplies target speed if the dog is in good condition
+    /* 0x8 */ s16 color;                        // The dog's color, which is used as an index into sBaseSpeeds
+    /* 0xA */ s16 index;                        // The dog's index within sDogInfo
+    /* 0xC */ s16 pointToUseSecondBaseSpeed; // When the dog is at or after this point, use the second sBaseSpeeds value
+    /* 0xE */ s16 textId;                    // Used to determine the dog's condition
+} RaceDogInfo;                               // size = 0x10
 
 ActorInit En_Racedog_InitVars = {
     ACTOR_EN_RACEDOG,
diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c
index 0c344e75fb..055b308f28 100644
--- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c
+++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c
@@ -40,7 +40,7 @@ typedef enum {
     /* 2 */ EN_RAF_ANIM_CHEW,
     /* 3 */ EN_RAF_ANIM_SPIT,
     /* 4 */ EN_RAF_ANIM_CONVULSE,
-    /* 5 */ EN_RAF_ANIM_DEATH,
+    /* 5 */ EN_RAF_ANIM_DEATH
 } EnRafAnimation;
 
 typedef enum {
@@ -51,7 +51,7 @@ typedef enum {
     /* 4 */ EN_RAF_ACTION_EXPLODE,
     /* 5 */ EN_RAF_ACTION_CONVULSE,
     /* 6 */ EN_RAF_ACTION_DISSOLVE,
-    /* 7 */ EN_RAF_ACTION_DORMANT,
+    /* 7 */ EN_RAF_ACTION_DORMANT
 } EnRafAction;
 
 typedef enum {
diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c
index 9766fe6949..9a0e1864e0 100644
--- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c
+++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c
@@ -70,18 +70,18 @@ typedef enum {
     /* 16 */ EN_RAILGIBUD_ANIM_SLUMP_LOOP,
     /* 17 */ EN_RAILGIBUD_ANIM_CONVULSION,
     /* 18 */ EN_RAILGIBUD_ANIM_ARMS_UP_START,
-    /* 19 */ EN_RAILGIBUD_ANIM_ARMS_UP_LOOP,
+    /* 19 */ EN_RAILGIBUD_ANIM_ARMS_UP_LOOP
 } EnRailgibudAnimation;
 
 typedef enum {
     /* 0 */ EN_RAILGIBUD_TYPE_GIBDO,
-    /* 1 */ EN_RAILGIBUD_TYPE_REDEAD,
+    /* 1 */ EN_RAILGIBUD_TYPE_REDEAD
 } EnRailgibudType;
 
 typedef enum {
     /* 0 */ EN_RAILGIBUD_GRAB_START,
     /* 1 */ EN_RAILGIBUD_GRAB_ATTACK,
-    /* 2 */ EN_RAILGIBUD_GRAB_RELEASE,
+    /* 2 */ EN_RAILGIBUD_GRAB_RELEASE
 } EnRailgibudGrabState;
 
 ActorInit En_Railgibud_InitVars = {
@@ -147,7 +147,7 @@ typedef enum {
     /* 0xC */ EN_RAILGIBUD_DMGEFF_ZORA_MAGIC = 0xC,  // Stuns and applies an electric effect
     /* 0xD */ EN_RAILGIBUD_DMGEFF_RECOIL,            // Deals no damage, but displays hit mark and recoil animation
     /* 0xE */ EN_RAILGIBUD_DMGEFF_LIGHT_RAY,         // Instantly kills a Redead on contact
-    /* 0xF */ EN_RAILGIBUD_DMGEFF_DAMAGE,            // Deals damage and plays the damage animation
+    /* 0xF */ EN_RAILGIBUD_DMGEFF_DAMAGE             // Deals damage and plays the damage animation
 } EnRailgibudDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c
index e145291f64..7d585c234d 100644
--- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c
+++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c
@@ -32,7 +32,7 @@ void EnRat_PostDetonation(EnRat* this, PlayState* play);
 
 typedef enum {
     /* -2 */ EN_RAT_HOOK_STARTED = -2,
-    /* -1 */ EN_RAT_HOOKED,
+    /* -1 */ EN_RAT_HOOKED
 } EnRatHookedState;
 
 ActorInit En_Rat_InitVars = {
@@ -70,7 +70,7 @@ static ColliderSphereInit sSphereInit = {
 typedef enum {
     /* 0x0 */ EN_RAT_DMGEFF_NONE,
     /* 0x1 */ EN_RAT_DMGEFF_STUN,
-    /* 0xF */ EN_RAT_DMGEFF_HOOKSHOT = 0xF, // Pulls the Real Bombchu towards the player
+    /* 0xF */ EN_RAT_DMGEFF_HOOKSHOT = 0xF // Pulls the Real Bombchu towards the player
 } EnRatDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.h b/src/overlays/actors/ovl_En_Rat/z_en_rat.h
index 9472e8c31a..28c880a925 100644
--- a/src/overlays/actors/ovl_En_Rat/z_en_rat.h
+++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.h
@@ -21,7 +21,7 @@
  */
 typedef enum {
     /* 0 */ EN_RAT_TYPE_DUNGEON,
-    /* 1 */ EN_RAT_TYPE_OVERWORLD,
+    /* 1 */ EN_RAT_TYPE_OVERWORLD
 } EnRatType;
 
 struct EnRat;
diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c
index 01b9cdd6d1..34fc411926 100644
--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c
@@ -94,7 +94,7 @@ typedef enum {
     /* 1 */ EN_RD_GRAB_INITIAL_DAMAGE,
     /* 2 */ EN_RD_GRAB_ATTACK,
     /* 3 */ EN_RD_GRAB_RELEASE,
-    /* 4 */ EN_RD_GRAB_END,
+    /* 4 */ EN_RD_GRAB_END
 } EnRdGrabState;
 
 ActorInit En_Rd_InitVars = {
@@ -139,7 +139,7 @@ typedef enum {
     /* 0xC */ EN_RD_DMGEFF_ZORA_MAGIC = 0xC,  // Stuns and applies an electric effect
     /* 0xD */ EN_RD_DMGEFF_RECOIL,            // Deals no damage, but displays hit mark and recoil animation
     /* 0xE */ EN_RD_DMGEFF_LIGHT_RAY,         // Instantly kills on contact
-    /* 0xF */ EN_RD_DMGEFF_DAMAGE,            // Deals damage and plays the damage animation
+    /* 0xF */ EN_RD_DMGEFF_DAMAGE             // Deals damage and plays the damage animation
 } EnRdDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h
index f5fbf82cba..fced38e750 100644
--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h
@@ -27,7 +27,7 @@ typedef enum {
     /*  4 */ EN_RD_TYPE_FROZEN, // Unused in the final game
     /*  5 */ EN_RD_TYPE_SQUATTING_DANCE,
     /*  6 */ EN_RD_TYPE_CLAPPING_DANCE,
-    /*  7 */ EN_RD_TYPE_PIROUETTE,
+    /*  7 */ EN_RD_TYPE_PIROUETTE
 } EnRdType;
 
 typedef struct EnRd {
diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.h b/src/overlays/actors/ovl_En_Rr/z_en_rr.h
index e996cfb129..6f4178dd9f 100644
--- a/src/overlays/actors/ovl_En_Rr/z_en_rr.h
+++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h
@@ -7,12 +7,12 @@ struct EnRr;
 
 typedef void (*EnRrActionFunc)(struct EnRr*, PlayState*);
 
-enum {
+typedef enum {
     /* 0 */ ENRR_0,
     /* 1 */ ENRR_1,
     /* 2 */ ENRR_2,
-    /* 3 */ ENRR_3,
-};
+    /* 3 */ ENRR_3
+} EnRrParam;
 
 typedef struct {
     /* 0x00 */ f32 unk_00;
diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c
index 69ad52a2d1..351b2f1462 100644
--- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c
+++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c
@@ -11,11 +11,11 @@
 
 #define THIS ((EnRuppecrow*)thisx)
 
-enum {
-    ENRUPPECROW_EFFECT_NONE = 0,
-    ENRUPPECROW_EFFECT_ICE = 10,
-    ENRUPPECROW_EFFECT_LIGHT = 20,
-};
+typedef enum {
+    /* 0x00 */ ENRUPPECROW_EFFECT_NONE = 0,
+    /* 0x0A */ ENRUPPECROW_EFFECT_ICE = 10,
+    /* 0x14 */ ENRUPPECROW_EFFECT_LIGHT = 20
+} EnRuppecrowEffect;
 
 void EnRuppecrow_Init(Actor* thisx, PlayState* play2);
 void EnRuppecrow_Destroy(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c
index c135f63daf..5a3dc440a9 100644
--- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c
+++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c
@@ -21,7 +21,7 @@ void func_80BD6B18(EnScRuppe* this, PlayState* play);
 typedef struct {
     /* 0x0 */ TexturePtr tex;
     /* 0x4 */ s16 amount;
-} RuppeInfo;
+} RuppeInfo; // size = 0x8
 
 ActorInit En_Sc_Ruppe_InitVars = {
     ACTOR_EN_SC_RUPPE,
diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h
index 8ef0f4c56b..afc9559855 100644
--- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h
+++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h
@@ -23,7 +23,7 @@ typedef enum {
     /* 2 */ RUPEE_RED,
     /* 3 */ RUPEE_ORANGE,
     /* 4 */ RUPEE_PURPLE,
-    /* 5 */ RUPEE_UNUSED,
+    /* 5 */ RUPEE_UNUSED
 } RupeeType;
 
 #endif // Z_EN_SC_RUPPE_H
diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
index 1fbf441ea0..1970ebf8c4 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
@@ -10,8 +10,8 @@ typedef void (*EnSkbActionFunc)(struct EnSkb*, PlayState*);
 #define ENSKB_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
 
 typedef enum {
-    /* 0 */ ENSKB_PARAMS_0,
-} EnSkbParams;
+    /* 0 */ ENSKB_PARAM_0
+} EnSkbParam;
 
 typedef struct EnSkb {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c
index 8d7a0e0719..5c962978e0 100644
--- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c
+++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c
@@ -28,7 +28,7 @@ typedef enum EnSlimeDamageEffect {
     /* 0x4 */ EN_SLIME_DMGEFF_LIGHT,
     /* 0x5 */ EN_SLIME_DMGEFF_ELECTRIC,
     /* 0xE */ EN_SLIME_DMGEFF_HOOKSHOT = 0xE,
-    /* 0xF */ EN_SLIME_DMGEFF_BLUNT,
+    /* 0xF */ EN_SLIME_DMGEFF_BLUNT
 } EnSlimeDamageEffect;
 
 void EnSlime_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.h b/src/overlays/actors/ovl_En_Slime/z_en_slime.h
index 0a40a117ed..130c442def 100644
--- a/src/overlays/actors/ovl_En_Slime/z_en_slime.h
+++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.h
@@ -42,7 +42,7 @@ typedef enum EnSlimeType {
     /* 0 */ EN_SLIME_TYPE_BLUE,
     /* 1 */ EN_SLIME_TYPE_GREEN,
     /* 2 */ EN_SLIME_TYPE_YELLOW,
-    /* 3 */ EN_SLIME_TYPE_RED,
+    /* 3 */ EN_SLIME_TYPE_RED
 } EnSlimeType;
 
 #endif // Z_EN_SLIME_H
diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c
index 5a65c10942..ed32353451 100644
--- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c
+++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c
@@ -58,7 +58,7 @@ typedef enum {
     // Indicates that either this Eeno is shrinking having been absorbed by another Eeno, or that
     // this Eeno is a fully-combined large Eeno and is done trying to combine with other split
     // Eenos. In both cases, this Eeno cannot be absorbed by any other Eeno.
-    /* 3 */ EN_SNOWMAN_COMBINE_STATE_BEING_ABSORBED_OR_DONE,
+    /* 3 */ EN_SNOWMAN_COMBINE_STATE_BEING_ABSORBED_OR_DONE
 } EnSnowmanCombineState;
 
 ActorInit En_Snowman_InitVars = {
@@ -119,7 +119,7 @@ typedef enum {
     /* 0x2 */ EN_SNOWMAN_DMGEFF_MELT,
     /* 0x4 */ EN_SNOWMAN_DMGEFF_LIGHT_ORB = 0x4,
     /* 0x5 */ EN_SNOWMAN_DMGEFF_ELECTRIC_STUN,
-    /* 0xF */ EN_SNOWMAN_DMGEFF_HOOKSHOT = 0xF, // Damages small Eenos, pulls the player towards large Eenos
+    /* 0xF */ EN_SNOWMAN_DMGEFF_HOOKSHOT = 0xF // Damages small Eenos, pulls the player towards large Eenos
 } EnTalkGibudDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h
index da0c0a30ad..55285fec87 100644
--- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h
+++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h
@@ -12,7 +12,7 @@ typedef enum {
     /* 1 */ EN_SNOWMAN_TYPE_LARGE,
     /* 2 */ EN_SNOWMAN_TYPE_SPLIT,
     /* 3 */ EN_SNOWMAN_TYPE_SMALL_SNOWBALL,
-    /* 4 */ EN_SNOWMAN_TYPE_LARGE_SNOWBALL,
+    /* 4 */ EN_SNOWMAN_TYPE_LARGE_SNOWBALL
 } EnSnowmanType;
 
 struct EnSnowman;
diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c
index 3908e863fe..7e3b9ead6c 100644
--- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c
+++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c
@@ -70,7 +70,7 @@ typedef enum {
     /* 5 */ STH_ANIM_LOOK_AROUND, // checking out Oceanside Spider House
     /* 6 */ STH_ANIM_PLEAD,       // wants to buy Oceanside Spider House
     /* 7 */ STH_ANIM_PANIC,       // after buying Oceanside Spider House, can be found at bottom of slide,
-    /* 8 */ STH_ANIM_START,       // set in init, not an actual index to the array
+    /* 8 */ STH_ANIM_START        // set in init, not an actual index to the array
 } EnSthAnimation;
 
 static AnimationHeader* sAnimationInfo[] = {
diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h
index 1c8c92852d..dbc459ce13 100644
--- a/src/overlays/actors/ovl_En_Sth/z_en_sth.h
+++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h
@@ -16,9 +16,9 @@ typedef enum {
     /* 2 */ STH_TYPE_SWAMP_SPIDER_HOUSE_CURED, // cursed is EnSsh
     /* 3 */ STH_TYPE_MOON_LOOKING, // South Clock Town, looking up at the moon
     /* 4 */ STH_TYPE_OCEANSIDE_SPIDER_HOUSE_GREET, // looking for shelter
-    /* 5 */ STH_TYPE_OCEANSIDE_SPIDER_HOUSE_PANIC, // shelter was not enough
+    /* 5 */ STH_TYPE_OCEANSIDE_SPIDER_HOUSE_PANIC // shelter was not enough
     // Other values: Actor will spawn and animate with arm waving, no further interaction.
-} EnSthTypes;
+} EnSthType;
 
 // Note: Vanilla types usually have 0xFEXX typing, but this upper section is unused by the code, reason unknown
 #define STH_GET_TYPE(thisx) ((thisx)->params & 0xF)
diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c
index b89976faf4..e41fc5dc75 100644
--- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c
+++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c
@@ -90,7 +90,7 @@ typedef enum {
     /* 0 */ EN_STONE_BOTTLE_NONE,
     /* 1 */ EN_STONE_BOTTLE_RED_POTION,
     /* 2 */ EN_STONE_BOTTLE_EMPTY,
-    /* 3 */ EN_STONE_BOTTLE_BLUE_POTION,
+    /* 3 */ EN_STONE_BOTTLE_BLUE_POTION
 } EnStoneHeishiBottle;
 
 typedef enum {
@@ -100,8 +100,8 @@ typedef enum {
     /* 3 */ EN_STONE_HEISHI_ANIM_WAVE,
     /* 4 */ EN_STONE_HEISHI_ANIM_SIT_AND_REACH,
     /* 5 */ EN_STONE_HEISHI_ANIM_DRINK_2,
-    /* 6 */ EN_STONE_HEISHI_ANIM_STAND_UP,
-} EnStoneHeishiAnimations;
+    /* 6 */ EN_STONE_HEISHI_ANIM_STAND_UP
+} EnStoneHeishiAnimation;
 
 void EnStoneheishi_Init(Actor* thisx, PlayState* play) {
     EnStoneheishi* this = THIS;
diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c
index d90752d9bf..43ddae02ad 100644
--- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c
+++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c
@@ -31,7 +31,7 @@ typedef enum {
     /* 5 */ SOLDIER_ANIM_5,
     /* 6 */ SOLDIER_ANIM_6,
     /* 7 */ SOLDIER_ANIM_STAND_HAND_ON_CHEST,
-    /* 8 */ SOLDIER_ANIM_MAX,
+    /* 8 */ SOLDIER_ANIM_MAX
 } SoldierAnimation;
 
 ActorInit En_Stop_heishi_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.h b/src/overlays/actors/ovl_En_Stream/z_en_stream.h
index 88856c3dd6..c5aa3c9e28 100644
--- a/src/overlays/actors/ovl_En_Stream/z_en_stream.h
+++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.h
@@ -12,13 +12,13 @@
 
 typedef enum {
     /* 0 */ EN_STREAM_SIZE_NORMAL,
-    /* 1 */ EN_STREAM_SIZE_SMALL,
+    /* 1 */ EN_STREAM_SIZE_SMALL
 } EnStreamSize;
 
 typedef enum {
     /* 0 */ EN_STREAM_PLAYER_OUTSIDE_RANGE,
     /* 1 */ EN_STREAM_PLAYER_WITHIN_RANGE_INSIDE_VORTEX,
-    /* 2 */ EN_STREAM_PLAYER_WITHIN_RANGE_BELOW_VORTEX,
+    /* 2 */ EN_STREAM_PLAYER_WITHIN_RANGE_BELOW_VORTEX
 } EnStreamPlayerLocation;
 
 struct EnStream;
diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c
index b8c5eda14c..ee9c635363 100644
--- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c
+++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c
@@ -36,7 +36,7 @@ void EnSyatekiDekunuts_Dead(EnSyatekiDekunuts* this, PlayState* play);
 
 typedef enum {
     /* 0 */ EN_SYATEKI_DEKUNUTS_HEADDRESS_TYPE_NORMAL,
-    /* 1 */ EN_SYATEKI_DEKUNUTS_HEADDRESS_TYPE_FLIPPED_UP,
+    /* 1 */ EN_SYATEKI_DEKUNUTS_HEADDRESS_TYPE_FLIPPED_UP
 } EnSyatekiDekunutsHeaddressType;
 
 ActorInit En_Syateki_Dekunuts_InitVars = {
@@ -80,7 +80,7 @@ typedef enum {
     /* 3 */ EN_SYATEKI_DEKUNUTS_ANIM_LOOK_AROUND,
     /* 4 */ EN_SYATEKI_DEKUNUTS_ANIM_DAMAGE,
     /* 5 */ EN_SYATEKI_DEKUNUTS_ANIM_DIE,
-    /* 6 */ EN_SYATEKI_DEKUNUTS_ANIM_UNBURROW, // unused
+    /* 6 */ EN_SYATEKI_DEKUNUTS_ANIM_UNBURROW // unused
 } EnSyatekiDekunutsAnimation;
 
 static AnimationInfo sAnimationInfo[] = {
diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h
index 2ceb0b32da..ce3e9ba909 100644
--- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h
+++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h
@@ -11,7 +11,7 @@
 
 typedef enum {
     /* 0 */ EN_SYATEKI_DEKUNUTS_TYPE_NORMAL, // Worth 30 points
-    /* 1 */ EN_SYATEKI_DEKUNUTS_TYPE_BONUS,  // Worth 100 points
+    /* 1 */ EN_SYATEKI_DEKUNUTS_TYPE_BONUS   // Worth 100 points
 } EnSyatekiDekunutsType;
 
 struct EnSyatekiDekunuts;
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index a584257375..f5910a06dd 100644
--- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -74,7 +74,7 @@ ActorInit En_Syateki_Man_InitVars = {
 typedef enum {
     /* 0 */ EN_SYATEKI_MAN_ANIM_HANDS_ON_TABLE,
     /* 1 */ EN_SYATEKI_MAN_ANIM_SWAMP_HEAD_SCRATCH_LOOP,
-    /* 2 */ EN_SYATEKI_MAN_ANIM_SWAMP_HEAD_SCRATCH_END,
+    /* 2 */ EN_SYATEKI_MAN_ANIM_SWAMP_HEAD_SCRATCH_END
 } EnSyatekiManAnimation;
 
 static AnimationInfo sAnimationInfo[] = {
diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c
index 7b885c5e89..52aa71cad5 100644
--- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c
+++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c
@@ -120,7 +120,7 @@ typedef enum {
     /* 3 */ EN_SYATEKI_WF_ANIM_LAND,
     /* 4 */ EN_SYATEKI_WF_ANIM_BACKFLIP, // unused
     /* 5 */ EN_SYATEKI_WF_ANIM_DAMAGED,
-    /* 6 */ EN_SYATEKI_WF_ANIM_REAR_UP_FALL_OVER,
+    /* 6 */ EN_SYATEKI_WF_ANIM_REAR_UP_FALL_OVER
 } EnSyatekiWfAnimation;
 
 static AnimationInfo sAnimationInfo[] = {
diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
index ee3b9af588..84d0b7dd11 100644
--- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
+++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
@@ -53,12 +53,12 @@ typedef struct {
     /* 0x4 */ ItemId item;
     /* 0x8 */ s32 amount;
     /* 0xC */ s16 isBottledItem;
-} EnTalkGibudRequestedItem;
+} EnTalkGibudRequestedItem; // size = 0x10
 
 typedef enum {
     /* 0 */ EN_TALK_GIBUD_REQUESTED_ITEM_MET,
     /* 1 */ EN_TALK_GIBUD_REQUESTED_ITEM_NOT_ENOUGH_AMMO,
-    /* 2 */ EN_TALK_GIBUD_REQUESTED_ITEM_NOT_MET,
+    /* 2 */ EN_TALK_GIBUD_REQUESTED_ITEM_NOT_MET
 } EnTalkGibudRequestedItemState;
 
 typedef enum {
@@ -71,7 +71,7 @@ typedef enum {
     /*  6 */ EN_TALK_GIBUD_REQUESTED_ITEM_INDEX_BOMBS,
     /*  7 */ EN_TALK_GIBUD_REQUESTED_ITEM_INDEX_HOT_SPRING_WATER,
     /*  8 */ EN_TALK_GIBUD_REQUESTED_ITEM_INDEX_BIG_POE,
-    /*  9 */ EN_TALK_GIBUD_REQUESTED_ITEM_INDEX_MILK,
+    /*  9 */ EN_TALK_GIBUD_REQUESTED_ITEM_INDEX_MILK
 } EnTalkGibudRequestedItemIndex;
 
 typedef enum {
@@ -88,18 +88,18 @@ typedef enum {
     /* 10 */ EN_TALK_GIBUD_ANIM_WALK,
     /* 11 */ EN_TALK_GIBUD_ANIM_DANCE_SQUAT,
     /* 12 */ EN_TALK_GIBUD_ANIM_DANCE_PIROUETTE,
-    /* 13 */ EN_TALK_GIBUD_ANIM_DANCE_CLAP,
+    /* 13 */ EN_TALK_GIBUD_ANIM_DANCE_CLAP
 } EnTalkGibudAnimation;
 
 typedef enum {
     /* 0 */ EN_TALK_GIBUD_TYPE_GIBDO,
-    /* 1 */ EN_TALK_GIBUD_TYPE_REDEAD,
+    /* 1 */ EN_TALK_GIBUD_TYPE_REDEAD
 } EnTalkGibudType;
 
 typedef enum {
     /* 0 */ EN_TALK_GIBUD_GRAB_START,
     /* 1 */ EN_TALK_GIBUD_GRAB_ATTACK,
-    /* 2 */ EN_TALK_GIBUD_GRAB_RELEASE,
+    /* 2 */ EN_TALK_GIBUD_GRAB_RELEASE
 } EnTalkGibudGrabState;
 
 ActorInit En_Talk_Gibud_InitVars = {
@@ -159,7 +159,7 @@ typedef enum {
     /* 0xC */ EN_TALK_GIBUD_DMGEFF_ZORA_MAGIC = 0xC,  // Stuns and applies an electric effect
     /* 0xD */ EN_TALK_GIBUD_DMGEFF_RECOIL,            // Deals no damage, but displays hit mark and recoil animation
     /* 0xE */ EN_TALK_GIBUD_DMGEFF_LIGHT_RAY,         // Instantly kills a Redead on contact
-    /* 0xF */ EN_TALK_GIBUD_DMGEFF_DAMAGE,            // Deals damage and plays the damage animation
+    /* 0xF */ EN_TALK_GIBUD_DMGEFF_DAMAGE             // Deals damage and plays the damage animation
 } EnTalkGibudDamageEffect;
 
 static DamageTable sDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c
index 1eaf1d1285..5c62c50eea 100644
--- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c
+++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c
@@ -23,13 +23,13 @@ void EnTanron4_FlyNearActor(EnTanron4* this, PlayState* play);
 
 typedef enum {
     /* 0 */ SEAGULL_FLY_FLAP,
-    /* 1 */ SEAGULL_FLY_GLIDE,
+    /* 1 */ SEAGULL_FLY_GLIDE
 } SeagullFlyState;
 
 typedef enum {
     /* 0 */ SEAGULL_TIMER_FLY_STATE,
-    /* 1 */ SEAGULL_TIMER_CHOOSE_TARGET,
-} SeagullTimers;
+    /* 1 */ SEAGULL_TIMER_CHOOSE_TARGET
+} SeagullTimer;
 
 ActorInit En_Tanron4_InitVars = {
     ACTOR_EN_TANRON4,
diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c
index 8e5a39bf81..e853570f49 100644
--- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c
+++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c
@@ -72,7 +72,7 @@ void EnTest2_Init(Actor* thisx, PlayState* play) {
     EnTest2* this = THIS;
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
-    if ((this->actor.params == EN_TEST2_PARAMS_B) || (this->actor.params == EN_TEST2_PARAMS_C)) {
+    if ((this->actor.params == EN_TEST2_PARAM_B) || (this->actor.params == EN_TEST2_PARAM_C)) {
         this->actor.flags |= ACTOR_FLAG_20;
     }
 }
diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.h b/src/overlays/actors/ovl_En_Test2/z_en_test2.h
index 3b03e0cc13..d54dbb2655 100644
--- a/src/overlays/actors/ovl_En_Test2/z_en_test2.h
+++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.h
@@ -11,8 +11,8 @@ typedef struct EnTest2 {
 } EnTest2; // size = 0x148
 
 typedef enum {
-    /* 0xB */ EN_TEST2_PARAMS_B = 0xB,
-    /* 0xC */ EN_TEST2_PARAMS_C
-} EnTest2_Params;
+    /* 0xB */ EN_TEST2_PARAM_B = 0xB,
+    /* 0xC */ EN_TEST2_PARAM_C
+} EnTest2_Param;
 
 #endif // Z_EN_TEST2_H
diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.h b/src/overlays/actors/ovl_En_Test6/z_en_test6.h
index d7e40a9831..2fe138ddb8 100644
--- a/src/overlays/actors/ovl_En_Test6/z_en_test6.h
+++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.h
@@ -9,11 +9,11 @@ typedef void (*EnTest6ActionFunc)(struct EnTest6*, PlayState*);
 
 #define ENTEST6_GET(thisx) ((thisx)->params)
 
-enum {
+typedef enum {
     /* 24 */ ENTEST6_24 = 24,
     /* 25 */ ENTEST6_25,
-    /* 26 */ ENTEST6_26,
-};
+    /* 26 */ ENTEST6_26
+} EnTest6Param;
 
 typedef struct {
     /* 0x00 */ LightNode* node;
diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
index 128e019732..c022ca1222 100644
--- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
+++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
@@ -56,7 +56,7 @@ typedef enum {
     /* 13 */ TIMETAG_KICKOUT_TEXT_TOWN_SHOOTING_GALLERY_2, // quick, it's closing time
     /* 14 */ TIMETAG_KICKOUT_TEXT_SWORDSMANS_SCHOOL, // need to cut the moon, must leave
     /* 15 */ TIMETAG_KICKOUT_TEXT_TREASURE_CHEST_SHOP, // already time to close shop
-    /* 16 */ TIMETAG_KICKOUT_TEXT_DOGGY_RACETRACK, // no more for today
+    /* 16 */ TIMETAG_KICKOUT_TEXT_DOGGY_RACETRACK // no more for today
 } TimeTagKickOutText;
 
 typedef struct EnTimeTag {
diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h
index 57d8ef3e39..af77f4a8db 100644
--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h
@@ -7,13 +7,13 @@ struct EnTite;
 
 typedef void (*EnTiteActionFunc)(struct EnTite*, PlayState*);
 
-enum {
+typedef enum {
     /* -4 */ ENTITE_MINUS_4 = -4,
     /* -3 */ ENTITE_MINUS_3,
     /* -2 */ ENTITE_MINUS_2,
     /* -1 */ ENTITE_MINUS_1,
-    /*  0 */ ENTITE_MINUS_0,
-};
+    /*  0 */ ENTITE_MINUS_0
+} EnTiteParam;
 
 typedef struct EnTite {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index 341f0a89d9..469e07e6de 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -130,9 +130,9 @@ static f32 D_80AEF8F0[] = {
 };
 
 typedef struct {
-    /* 0x00 */ Actor* unk_00;
-    /* 0x04 */ f32 unk_04;
-} EnTkStruct; // size = 0x8?
+    /* 0x0 */ Actor* unk_00;
+    /* 0x4 */ f32 unk_04;
+} EnTkStruct; // size = 0x8
 
 void func_80AEC460(EnTk* this) {
     if (DECR(this->unk_2C4) == 0) {
diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
index 9033b99236..edc488d1e4 100644
--- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
+++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
@@ -18,7 +18,7 @@ typedef enum {
     /* 1 */ TORCH2_PARAM_GORON,
     /* 2 */ TORCH2_PARAM_ZORA,
     /* 3 */ TORCH2_PARAM_DEKU,
-    /* 4 */ TORCH2_PARAM_FIERCE_DEITY,
+    /* 4 */ TORCH2_PARAM_FIERCE_DEITY
 } EnTorch2Param;
 
 typedef enum {
@@ -26,7 +26,7 @@ typedef enum {
     /* 1 */ TORCH2_STATE_FADING_IN,
     /* 2 */ TORCH2_STATE_SOLID,
     /* 3 */ TORCH2_STATE_IDLE,
-    /* 4 */ TORCH2_STATE_DYING,
+    /* 4 */ TORCH2_STATE_DYING
 } EnTorch2State;
 
 #endif // Z_EN_TORCH2_H
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
index 79bee615aa..551d7d7748 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
@@ -47,18 +47,18 @@ void EnViewer_Init(Actor* thisx, PlayState* play) {
     this->unk_154 = D_8089F3E0;
     D_8089F3E0++;
     switch (ENVIEWER_GET_3(&this->actor)) {
-        case ENVIEWER_PARAMS_0:
+        case ENVIEWER_PARAM_0:
             this->unk_148 = ENVIEWER_GET_8000(&this->actor) * 40.0f;
             this->unk_150 = (u8)ENVIEWER_GET_1FC(&this->actor) * 40.0f;
             EnViewer_SetupAction(this, func_8089F17C);
             break;
-        case ENVIEWER_PARAMS_1:
+        case ENVIEWER_PARAM_1:
             this->unk_148 = (u16)ENVIEWER_GET_FE00(&this->actor) * 40.0f;
             this->unk_150 = (u8)ENVIEWER_GET_1FC(&this->actor) * 40.0f;
             this->unk_14C = (u16)(this->actor.world.rot.y) * 40.0f;
             EnViewer_SetupAction(this, func_8089F218);
             break;
-        case ENVIEWER_PARAMS_2:
+        case ENVIEWER_PARAM_2:
             this->unk_148 = (u16)ENVIEWER_GET_FE00(&this->actor) * 40.0f;
             this->unk_14C = (u8)ENVIEWER_GET_1FC(&this->actor) * 40.0f;
             EnViewer_SetupAction(this, func_8089F2C4);
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
index 1532e7c705..c4d2114bf2 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
@@ -22,9 +22,9 @@ typedef struct EnViewer {
 } EnViewer; // size = 0x158
 
 typedef enum {
-    /* 0x0 */ ENVIEWER_PARAMS_0,
-    /* 0x1 */ ENVIEWER_PARAMS_1,
-    /* 0x2 */ ENVIEWER_PARAMS_2
-} EnViewerParams;
+    /* 0x0 */ ENVIEWER_PARAM_0,
+    /* 0x1 */ ENVIEWER_PARAM_1,
+    /* 0x2 */ ENVIEWER_PARAM_2
+} EnViewerParam;
 
 #endif // Z_EN_VIEWER_H
diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
index 93dd632450..4d1466b95c 100644
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
@@ -27,9 +27,9 @@
  * the timer to 130 frames if the player strays too far from the Wallmaster's current position.
  */
 typedef enum {
-    /* 0x0 */ WALLMASTER_TYPE_TIMER_ONLY,
-    /* 0x1 */ WALLMASTER_TYPE_PROXIMITY,
-    /* 0x2 */ WALLMASTER_TYPE_FLAG
+    /* 0 */ WALLMASTER_TYPE_TIMER_ONLY,
+    /* 1 */ WALLMASTER_TYPE_PROXIMITY,
+    /* 2 */ WALLMASTER_TYPE_FLAG
 } WallmasterType;
 
 struct EnWallmas;
diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h
index 433ebac621..f4b9d72849 100644
--- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h
+++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h
@@ -24,7 +24,7 @@ typedef enum {
     /* 0x309 */ ENWATEREFFECT_TYPE_GYORG_RIPPLES = 0x309, // Ripples on the surface when Gyrog enters/leaves the water
     /* 0x30A */ ENWATEREFFECT_TYPE_GYORG_PRIMARY_SPRAY, // Large "funnel" of water that forms when Gyorg enters/leaves the water
     /* 0x30B */ ENWATEREFFECT_TYPE_GYORG_SECONDARY_SPRAY, // Secondary "funnel" in the middle of the larger "funnel"
-    /* 0x30C */ ENWATEREFFECT_TYPE_GYORG_SHOCKWAVE, // Shockwave on the surface when Gyorg rams into the central platform
+    /* 0x30C */ ENWATEREFFECT_TYPE_GYORG_SHOCKWAVE // Shockwave on the surface when Gyorg rams into the central platform
 } EnWaterEffectType;
 
 typedef struct EnWaterEffect {
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
index b1e7f8f86f..5313aacfd5 100644
--- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
+++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
@@ -32,7 +32,7 @@ typedef enum {
     /* 4 */ WEATHERTAG_TYPE_UNK4,
     /* 5 */ WEATHERTAG_TYPE_UNK5,
     /* 6 */ WEATHERTAG_TYPE_WATERMURK,
-    /* 7 */ WEATHERTAG_TYPE_LOCALDAY2RAIN,
+    /* 7 */ WEATHERTAG_TYPE_LOCALDAY2RAIN
 } WeatherTagType;
 
 #endif // Z_EN_WEATHER_TAG_H
diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c
index b64af5a88b..7fd55f4eeb 100644
--- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c
+++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c
@@ -50,7 +50,7 @@ typedef enum {
     /* 6 */ EN_WIZ_ACTION_BURST_INTO_FLAMES,
     /* 7 */ EN_WIZ_ACTION_RUN_IN_CIRCLES,
     /* 8 */ EN_WIZ_ACTION_ATTACK,
-    /* 9 */ EN_WIZ_ACTION_DANCE,
+    /* 9 */ EN_WIZ_ACTION_DANCE
 } EnWizAction;
 
 typedef enum {
@@ -68,7 +68,7 @@ typedef enum {
     /* 0 */ EN_WIZ_FIGHT_STATE_FIRST_PHASE,
     /* 1 */ EN_WIZ_FIGHT_STATE_SECOND_PHASE_CUTSCENE,
     /* 2 */ EN_WIZ_FIGHT_STATE_SECOND_PHASE_GHOSTS_COPY_WIZROBE,
-    /* 3 */ EN_WIZ_FIGHT_STATE_SECOND_PHASE_GHOSTS_RUN_AROUND,
+    /* 3 */ EN_WIZ_FIGHT_STATE_SECOND_PHASE_GHOSTS_RUN_AROUND
 } EnWizFightState;
 
 typedef enum {
@@ -77,7 +77,7 @@ typedef enum {
     /* 2 */ EN_WIZ_ANIM_DANCE,
     /* 3 */ EN_WIZ_ANIM_WIND_UP,
     /* 4 */ EN_WIZ_ANIM_ATTACK,
-    /* 5 */ EN_WIZ_ANIM_DAMAGE,
+    /* 5 */ EN_WIZ_ANIM_DAMAGE
 } EnWizAnimation;
 
 ActorInit En_Wiz_InitVars = {
@@ -239,12 +239,12 @@ static ColliderCylinderInit sCylinderInit = {
 };
 
 typedef enum {
-    /* 0x0 */ EN_WIZ_DMGEFF_IMMUNE,     // Deals no damage
-    /* 0x1 */ EN_WIZ_DMGEFF_UNK1,       // Deals no damage. Was probably originally intended for destroying ghosts.
-    /* 0x2 */ EN_WIZ_DMGEFF_FIRE,       // Damages and sets Ice Wizrobes on fire
-    /* 0x3 */ EN_WIZ_DMGEFF_FREEZE,     // Damages and surrounds Fire Wizrobes with ice
-    /* 0x4 */ EN_WIZ_DMGEFF_LIGHT_ORB,  // Damages and surrounds the Wizrobe with light orbs
-    /* 0xF */ EN_WIZ_DMGEFF_NONE = 0xF, // Deals regular damage and has no special effect
+    /* 0x0 */ EN_WIZ_DMGEFF_IMMUNE,    // Deals no damage
+    /* 0x1 */ EN_WIZ_DMGEFF_UNK1,      // Deals no damage. Was probably originally intended for destroying ghosts.
+    /* 0x2 */ EN_WIZ_DMGEFF_FIRE,      // Damages and sets Ice Wizrobes on fire
+    /* 0x3 */ EN_WIZ_DMGEFF_FREEZE,    // Damages and surrounds Fire Wizrobes with ice
+    /* 0x4 */ EN_WIZ_DMGEFF_LIGHT_ORB, // Damages and surrounds the Wizrobe with light orbs
+    /* 0xF */ EN_WIZ_DMGEFF_NONE = 0xF // Deals regular damage and has no special effect
 } EnWizDamageEffect;
 
 static DamageTable sFireWizrobeDamageTable = {
diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h
index 4d35a0f688..70f7a6c640 100644
--- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h
+++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h
@@ -10,7 +10,7 @@
 typedef enum {
     /* 0 */ EN_WIZ_TYPE_FIRE,
     /* 1 */ EN_WIZ_TYPE_ICE,
-    /* 2 */ EN_WIZ_TYPE_FIRE_NO_BGM, // does not request the mini-boss BGM
+    /* 2 */ EN_WIZ_TYPE_FIRE_NO_BGM // does not request the mini-boss BGM
 } EnWizType;
 
 struct EnWiz;
diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h
index 3df0362edc..651aac8ea5 100644
--- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h
+++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h
@@ -7,7 +7,7 @@ typedef enum {
     /* 0 */ EN_WIZ_BROCK_PLATFORM_TYPE_INACTIVE,
     /* 1 */ EN_WIZ_BROCK_PLATFORM_TYPE_FIRE,
     /* 2 */ EN_WIZ_BROCK_PLATFORM_TYPE_ICE,
-    /* 3 */ EN_WIZ_BROCK_PLATFORM_TYPE_MAX,
+    /* 3 */ EN_WIZ_BROCK_PLATFORM_TYPE_MAX
 } EnWizBrockPlatformType;
 
 struct EnWizBrock;
diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c
index 4a7f6cd20c..8251a896b6 100644
--- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c
+++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c
@@ -32,7 +32,7 @@ typedef enum {
     /* 0 */ EN_WIZ_FIRE_ACTION_MOVE_MAGIC_PROJECTILE,
     /* 1 */ EN_WIZ_FIRE_ACTION_SMALL_FLAME,
     /* 2 */ EN_WIZ_FIRE_ACTION_POOL,
-    /* 3 */ EN_WIZ_FIRE_ACTION_KILL_MAGIC_PROJECTILE,
+    /* 3 */ EN_WIZ_FIRE_ACTION_KILL_MAGIC_PROJECTILE
 } EnWizFireAction;
 
 static s32 sPoolHitByIceArrow = false;
diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.h b/src/overlays/actors/ovl_En_Zob/z_en_zob.h
index e0bd7bf796..6e6c8e7a8b 100644
--- a/src/overlays/actors/ovl_En_Zob/z_en_zob.h
+++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.h
@@ -9,10 +9,10 @@ typedef void (*EnZobActionFunc)(struct EnZob*, PlayState*);
 
 #define ENZOB_GET_F(thisx) ((thisx)->params & 0xF)
 
-enum {
+typedef enum {
     /* 1 */ ENZOB_F_1 = 1,
-    /* 2 */ ENZOB_F_2,
-};
+    /* 2 */ ENZOB_F_2
+} EnZobParam;
 
 typedef struct EnZob {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c
index 57c85a664c..d032b65798 100644
--- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c
+++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c
@@ -30,7 +30,7 @@ typedef enum {
     /* 2 */ ENZOD_ANIM_ARMS_FOLDED,
     /* 3 */ ENZOD_ANIM_PLAYING_LENTO,
     /* 4 */ ENZOD_ANIM_PLAYING_ANDANTINO,
-    /* 5 */ ENZOD_ANIM_MAX,
+    /* 5 */ ENZOD_ANIM_MAX
 } EnZodAnimation;
 
 typedef enum {
@@ -42,7 +42,7 @@ typedef enum {
     /* 6 */ ENZOD_INSTRUMENT_DRUM_3,
     /* 7 */ ENZOD_INSTRUMENT_DRUM_4,
     /* 8 */ ENZOD_INSTRUMENT_DRUM_5,
-    /* 9 */ ENZOD_INSTRUMENT_BASS_DRUM,
+    /* 9 */ ENZOD_INSTRUMENT_BASS_DRUM
 } EnZodInstrument;
 
 const ActorInit En_Zod_InitVars = {
diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.h b/src/overlays/actors/ovl_En_Zod/z_en_zod.h
index 9e6f3f4dab..12278bb972 100644
--- a/src/overlays/actors/ovl_En_Zod/z_en_zod.h
+++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.h
@@ -33,9 +33,9 @@ typedef struct EnZod {
 } EnZod; // size = 0x2A0
 
 typedef enum {
-    /* 1 */ ENZOD_TYPE_1 = 1,
-    /* 2 */ ENZOD_TYPE_2,
-    /* 0xF */ ENZOD_TYPE_0xF = 0xF,
-} EnZodTypes;
+    /* 0x1 */ ENZOD_TYPE_1 = 1,
+    /* 0x2 */ ENZOD_TYPE_2,
+    /* 0xF */ ENZOD_TYPE_0xF = 0xF
+} EnZodType;
 
 #endif // Z_EN_ZOD_H
diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h
index 18a4212720..f8895af3ff 100644
--- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h
+++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h
@@ -10,7 +10,7 @@ typedef void (*EnZoraeggActionFunc)(struct EnZoraegg*, PlayState*);
 #define ENZORAEGG_GET_1F(thisx) ((thisx)->params & 0x1F)
 #define ENZORAEGG_GET_FE00(thisx) (((thisx)->params & 0xFE00) >> 9)
 
-enum {
+typedef enum {
     /* 0x00 */ ENZORAEGG_1F_00,
     /* 0x01 */ ENZORAEGG_1F_01,
     /* 0x02 */ ENZORAEGG_1F_02,
@@ -36,8 +36,8 @@ enum {
     /* 0x16 */ ENZORAEGG_1F_16,
     /* 0x17 */ ENZORAEGG_1F_17,
     /* 0x18 */ ENZORAEGG_1F_18,
-    /* 0x19 */ ENZORAEGG_1F_19,
-};
+    /* 0x19 */ ENZORAEGG_1F_19
+} EnZoraeggParam;
 
 typedef struct EnZoraegg {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.h b/src/overlays/actors/ovl_En_Zos/z_en_zos.h
index 669430a0c4..f761a9bc53 100644
--- a/src/overlays/actors/ovl_En_Zos/z_en_zos.h
+++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.h
@@ -10,10 +10,10 @@ typedef void (*EnZosActionFunc)(struct EnZos*, PlayState*);
 
 #define ENZOS_GET_F(thisx) ((thisx)->params & 0xF)
 
-enum {
+typedef enum {
     /* 1 */ ENZOS_F_1 = 1,
-    /* 2 */ ENZOS_F_2,
-};
+    /* 2 */ ENZOS_F_2
+} EnZosParam;
 
 typedef struct EnZos {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
index 7a071a8eca..90577dcfd8 100644
--- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
+++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
@@ -4,9 +4,9 @@
 #include "global.h"
 
 typedef enum {
-    /*  0 */ BHEART_PARAM_NORMAL,     // Spawn Parameter for Normal Scale.
-    /* 35 */ BHEART_PARAM_SMALL = 35, // Spawn Parameter for Small Scale.
-} ItemBHeartParams;
+    /*  0 */ BHEART_PARAM_NORMAL,    // Spawn Parameter for Normal Scale.
+    /* 35 */ BHEART_PARAM_SMALL = 35 // Spawn Parameter for Small Scale.
+} ItemBHeartParam;
 
 #define BHEART_SCALE_SMALL (0.1f)           // Scale value for Small Mode
 #define BHEART_SCALE_NORMAL (1.0f)          // Scale value for Normal Mode
diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
index cd48cfed19..f27254cec9 100644
--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
@@ -19,8 +19,8 @@ typedef enum {
     /* 0x7 */ MIRRAY_SPIRIT_TOPROOM_COBRA1,
     /* 0x8 */ MIRRAY_SPIRIT_TOPROOM_COBRA2,
     /* 0x9 */ MIRRAY_GANONSCASTLE_SPIRITTRIAL_DOWNLIGHT,
-    /* 0xA */ MIRRAY_MAX,
-} MirRayBeamLocations;
+    /* 0xA */ MIRRAY_MAX
+} MirRayBeamLocation;
 
 typedef struct MirRay {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h
index 177cc8e66b..4ac83cc9d8 100644
--- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h
+++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h
@@ -12,15 +12,15 @@ typedef void (*ObjArmosActionFunc)(struct ObjArmos*, PlayState*);
 #define OBJARMOS_GET_ROTZ_7(thisx) ((thisx)->home.rot.z & 7)
 #define OBJARMOS_GET_ROTX_F(thisx) ((thisx)->home.rot.x & 0xF)
 
-enum {
+typedef enum {
     /* 0 */ OBJARMOS_ROT_7_0,
     /* 1 */ OBJARMOS_ROT_7_1,
     /* 2 */ OBJARMOS_ROT_7_2,
     /* 3 */ OBJARMOS_ROT_7_3,
     /* 4 */ OBJARMOS_ROT_7_4,
     /* 5 */ OBJARMOS_ROT_7_5,
-    /* 6 */ OBJARMOS_ROT_7_6,
-};
+    /* 6 */ OBJARMOS_ROT_7_6
+} ObjArmosParam;
 
 typedef struct ObjArmos {
     /* 0x000 */ DynaPolyActor dyna;
diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
index 7699b34276..1a22de3900 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
@@ -16,11 +16,11 @@ typedef void (*ObjBeanUnkFunc)(struct ObjBean*);
 
 #define OBJBEAN_GET_3(thisx) ((thisx)->home.rot.z & 3)
 
-enum {
-    /* 0x0 */ ENOBJBEAN_GET_C000_0,
-    /* 0x1 */ ENOBJBEAN_GET_C000_1,
-    /* 0x2 */ ENOBJBEAN_GET_C000_2,
-};
+typedef enum {
+    /* 0 */ ENOBJBEAN_GET_C000_0,
+    /* 1 */ ENOBJBEAN_GET_C000_1,
+    /* 2 */ ENOBJBEAN_GET_C000_2
+} ObjBeanParam;
 
 typedef struct ObjBean {
     /* 0x000 */ DynaPolyActor dyna;
diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
index 66ef9c6915..c8eed614b2 100644
--- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
+++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
@@ -77,11 +77,11 @@ static ColliderCylinderInit sCylinderInit2 = {
 };
 
 typedef struct {
-    /* 0x00 */ ColliderCylinderInit* collider;
-    /* 0x04 */ ActorShadowFunc unk_04;
-    /* 0x08 */ ActorFunc unk_08;
-    /* 0x0C */ s32 (*unk_0C)(Actor*);
-} ObjBombiwaStruct2;
+    /* 0x0 */ ColliderCylinderInit* collider;
+    /* 0x4 */ ActorShadowFunc unk_04;
+    /* 0x8 */ ActorFunc unk_08;
+    /* 0xC */ s32 (*unk_0C)(Actor*);
+} ObjBombiwaStruct2; // size = 0x10
 
 static ObjBombiwaStruct2 D_8093A998[] = {
     { &sCylinderInit1, ActorShadow_DrawCircle, func_8093A418, func_809393B0 },
diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h
index 1805e151a8..454e3f6744 100644
--- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h
+++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h
@@ -12,7 +12,7 @@ typedef enum {
     /* 1 */ DEKU_FLOWER_TYPE_PINK_WITH_INITIAL_BOUNCE,
     /* 2 */ DEKU_FLOWER_TYPE_GOLD,
     /* 3 */ DEKU_FLOWER_TYPE_GOLD_WITH_INITIAL_BOUNCE,
-    /* 4 */ DEKU_FLOWER_TYPE_MAX,
+    /* 4 */ DEKU_FLOWER_TYPE_MAX
 } DekuFlowerType;
 
 struct ObjEtcetera;
diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c
index 4804b8b876..40c363dcaf 100644
--- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c
+++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c
@@ -55,8 +55,8 @@ static ColliderCylinderInit sCylinderInit = {
 };
 
 typedef struct {
-    /* 0x00 */ f32 unk_00;
-    /* 0x04 */ f32 unk_04;
+    /* 0x0 */ f32 unk_00;
+    /* 0x4 */ f32 unk_04;
 } ObjFireshieldStruct; // size = 0x8
 
 ObjFireshieldStruct D_80A4D84C[] = {
diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c
index 336076199f..4cc81013e9 100644
--- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c
+++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c
@@ -29,16 +29,16 @@ AnimatedMaterial* D_80B9DED0;
 AnimatedMaterial* D_80B9DED4;
 
 typedef struct {
-    /* 0x00 */ u8 unk_00;
-    /* 0x01 */ u8 unk_01;
-    /* 0x02 */ u8 unk_02;
+    /* 0x0 */ u8 unk_00;
+    /* 0x1 */ u8 unk_01;
+    /* 0x2 */ u8 unk_02;
 } ObjHansuiBssStruct; // size = 0x3
 
 ObjHansuiBssStruct D_80B9DED8;
 
 typedef struct {
-    /* 0x00 */ u8 unk_00;
-    /* 0x01 */ u8 unk_01;
+    /* 0x0 */ u8 unk_00;
+    /* 0x1 */ u8 unk_01;
 } ObjHansuiStruct; // size = 0x2
 
 ObjHansuiStruct D_80B9DC70[] = {
diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
index c06abbe7d7..1f0450b280 100644
--- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
+++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
@@ -12,15 +12,15 @@ typedef void (*ObjHunsuiActionFunc)(struct ObjHunsui*, PlayState*);
 #define OBJHUNSUI_GET_F80(thisx) (((thisx)->params >> 7) & 0x1F)
 #define OBJHUNSUI_GET_F000(thisx) (((thisx)->params >> 0xC) & 0xF)
 
-enum {
+typedef enum {
     /* 0 */ OBJHUNSUI_F000_0,
     /* 1 */ OBJHUNSUI_F000_1,
     /* 2 */ OBJHUNSUI_F000_2,
     /* 3 */ OBJHUNSUI_F000_3,
     /* 4 */ OBJHUNSUI_F000_4,
     /* 5 */ OBJHUNSUI_F000_5,
-    /* 6 */ OBJHUNSUI_F000_6,
-};
+    /* 6 */ OBJHUNSUI_F000_6
+} ObjHunsuiParam;
 
 typedef struct ObjHunsui {
     /* 0x000 */ DynaPolyActor dyna;
diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c
index 2aae58bad2..529d7ec950 100644
--- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c
+++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c
@@ -13,9 +13,9 @@
 #define THIS ((ObjJgameLight*)thisx)
 
 typedef enum {
-    /* 0x0 */ OBJJGAMELIGHT_NONE,
-    /* 0x1 */ OBJJGAMELIGHT_CORRECT,
-    /* 0x2 */ OBJJGAMELIGHT_INCORRECT,
+    /* 0 */ OBJJGAMELIGHT_NONE,
+    /* 1 */ OBJJGAMELIGHT_CORRECT,
+    /* 2 */ OBJJGAMELIGHT_INCORRECT
 } ObjJgameLightSignal;
 
 void ObjJgameLight_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c
index df518ff430..048aa9bcc2 100644
--- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c
+++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c
@@ -28,7 +28,7 @@
 typedef enum {
     /* -1 */ OBJKENDOKANBAN_DIR_DOWN = -1,
     /*  0 */ OBJKENDOKANBAN_DIR_UNDETERMINED,
-    /*  1 */ OBJKENDOKANBAN_DIR_UP,
+    /*  1 */ OBJKENDOKANBAN_DIR_UP
 } ObjKendoKanbanDirection;
 
 void ObjKendoKanban_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
index 1062d18f88..6a6937e7e4 100644
--- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
+++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
@@ -55,11 +55,11 @@ static ColliderCylinderInit sCylinderInit = {
 };
 
 typedef struct {
-    /* 0x00 */ f32 scale;
-    /* 0x04 */ s16 radius;
-    /* 0x06 */ s16 height;
-    /* 0x08 */ s16 yShift;
-    /* 0x0C */ s32 params;
+    /* 0x0 */ f32 scale;
+    /* 0x4 */ s16 radius;
+    /* 0x6 */ s16 height;
+    /* 0x8 */ s16 yShift;
+    /* 0xC */ s32 params;
 } LightblockTypeVars; // size = 0x10
 
 static LightblockTypeVars sLightblockTypeVars[] = {
diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c
index c8f657c13c..10f12c64ae 100644
--- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c
+++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c
@@ -108,7 +108,7 @@ void func_8098F220(ObjMure3* this, PlayState* play) {
 }
 
 void func_8098F364(ObjMure3* this, PlayState* play) {
-    s16 count = sRupeeCounts[OBJMURE3_PARAMS_RUPEEINDEX(&this->actor)];
+    s16 count = sRupeeCounts[OBJMURE3_PARAM_RUPEEINDEX(&this->actor)];
     s32 i;
     EnItem00** collectible;
 
@@ -126,7 +126,7 @@ void func_8098F364(ObjMure3* this, PlayState* play) {
 }
 
 void func_8098F438(ObjMure3* this, PlayState* play) {
-    s16 count = sRupeeCounts[OBJMURE3_PARAMS_RUPEEINDEX(&this->actor)];
+    s16 count = sRupeeCounts[OBJMURE3_PARAM_RUPEEINDEX(&this->actor)];
     s32 i;
 
     for (i = 0; i < count; i++) {
@@ -134,7 +134,7 @@ void func_8098F438(ObjMure3* this, PlayState* play) {
 
         if ((*collectible != NULL) && !((this->unk164 >> i) & 1)) {
             if ((*collectible)->unk1A4 != 0) {
-                Flags_SetSwitch(play, OBJMURE3_PARAMS_7F(&this->actor));
+                Flags_SetSwitch(play, OBJMURE3_PARAM_7F(&this->actor));
             }
             if ((*collectible)->actor.update == NULL) {
                 this->unk164 |= (1 << i);
@@ -147,7 +147,7 @@ void func_8098F438(ObjMure3* this, PlayState* play) {
 void ObjMure3_Init(Actor* thisx, PlayState* play) {
     ObjMure3* this = THIS;
 
-    if (Flags_GetSwitch(play, OBJMURE3_PARAMS_7F(&this->actor))) {
+    if (Flags_GetSwitch(play, OBJMURE3_PARAM_7F(&this->actor))) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -175,7 +175,7 @@ void func_8098F5E4(ObjMure3* this, PlayState* play) {
 
     if (Math3D_XZLengthSquared(this->actor.projectedPos.x, this->actor.projectedPos.z) < SQ(1150.0f)) {
         this->actor.flags |= ACTOR_FLAG_10;
-        sSpawnFuncs[OBJMURE3_PARAMS_RUPEEINDEX(&this->actor)](this, play);
+        sSpawnFuncs[OBJMURE3_PARAM_RUPEEINDEX(&this->actor)](this, play);
         func_8098F66C(this);
     }
 }
diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
index 8715e43081..336a092b4b 100644
--- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
+++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
@@ -3,8 +3,8 @@
 
 #include "global.h"
 
-#define OBJMURE3_PARAMS_7F(thisx) ((thisx)->params & 0x7F)
-#define OBJMURE3_PARAMS_RUPEEINDEX(thisx) (((thisx)->params >> 13) & 7)
+#define OBJMURE3_PARAM_7F(thisx) ((thisx)->params & 0x7F)
+#define OBJMURE3_PARAM_RUPEEINDEX(thisx) (((thisx)->params >> 13) & 7)
 
 struct ObjMure3;
 
diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c
index eab144cbdc..168168f413 100644
--- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c
+++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c
@@ -74,7 +74,7 @@ void ObjOcarinalift_Init(Actor* thisx, PlayState* play) {
         this->unk16C = 1;
         this->unk170 = Lib_SegmentedToVirtual(path->points);
         func_80AC94C0(this, this->unk168);
-        if ((OBJOCARINALIFT_GET_C(&this->dyna.actor) != OBJOCARINALIFT_PARAMSC_1) &&
+        if ((OBJOCARINALIFT_GET_C(&this->dyna.actor) != OBJOCARINALIFT_PARAM_1) &&
             (Flags_GetSwitch(play, OBJOCARINALIFT_GET_SWITCH_FLAG(&this->dyna.actor)))) {
             func_80AC96B4(this);
         } else {
@@ -137,7 +137,7 @@ void func_80AC96D0(ObjOcarinalift* this, PlayState* play) {
         this->unk168 += this->unk16C;
         thisx->speed *= 0.4f;
         if (((this->unk168 >= this->unk164) && (this->unk16C > 0)) || ((this->unk168 <= 0) && (this->unk16C < 0))) {
-            if (paramsC == OBJOCARINALIFT_PARAMSC_0) {
+            if (paramsC == OBJOCARINALIFT_PARAM_0) {
                 this->unk16C = -this->unk16C;
                 this->timer = 10;
                 func_80AC9A68(this);
@@ -155,11 +155,11 @@ void func_80AC96D0(ObjOcarinalift* this, PlayState* play) {
                     func_80AC99C0(this);
                     DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId);
                     sp34 = false;
-                } else if ((paramsC == OBJOCARINALIFT_PARAMSC_1) && (this->unk168 == OBJOCARINALIFT_GET_1F(thisx))) {
+                } else if ((paramsC == OBJOCARINALIFT_PARAM_1) && (this->unk168 == OBJOCARINALIFT_GET_1F(thisx))) {
                     func_80AC9AB8(this);
                 }
             }
-        } else if ((paramsC == OBJOCARINALIFT_PARAMSC_1) && (this->unk168 == OBJOCARINALIFT_GET_1F(thisx))) {
+        } else if ((paramsC == OBJOCARINALIFT_PARAM_1) && (this->unk168 == OBJOCARINALIFT_GET_1F(thisx))) {
             func_80AC9AB8(this);
         }
         if (sp34) {
@@ -176,7 +176,7 @@ void func_80AC99D4(ObjOcarinalift* this, PlayState* play) {
     if (!DynaPolyActor_IsPlayerOnTop(&this->dyna)) {
         func_80AC94C0(this, this->unk168);
         DynaPoly_EnableCollision(play, &play->colCtx.dyna, this->dyna.bgId);
-        if ((OBJOCARINALIFT_GET_C(&this->dyna.actor) == OBJOCARINALIFT_PARAMSC_1) &&
+        if ((OBJOCARINALIFT_GET_C(&this->dyna.actor) == OBJOCARINALIFT_PARAM_1) &&
             (this->unk168 == OBJOCARINALIFT_GET_1F(&this->dyna.actor))) {
             func_80AC9AB8(this);
         } else {
@@ -218,7 +218,7 @@ void func_80AC9B5C(ObjOcarinalift* this, PlayState* play) {
     if (func_800B886C(&this->dyna.actor, play)) {
         if (play->msgCtx.ocarinaMode == 4) {
             if (play->msgCtx.lastPlayedSong == 0) {
-                if (OBJOCARINALIFT_GET_C(&this->dyna.actor) != OBJOCARINALIFT_PARAMSC_1) {
+                if (OBJOCARINALIFT_GET_C(&this->dyna.actor) != OBJOCARINALIFT_PARAM_1) {
                     Flags_SetSwitch(play, OBJOCARINALIFT_GET_SWITCH_FLAG(&this->dyna.actor));
                 }
                 CutsceneManager_Queue(this->dyna.actor.csId);
diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h
index 3789383c2e..abb1e440b3 100644
--- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h
+++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h
@@ -24,9 +24,9 @@ typedef struct ObjOcarinalift {
     /* 0x176 */ s16 cutsceneTimer;
 } ObjOcarinalift; // size = 0x178
 
-typedef enum ObjOcarinaliftParams {
-    /* 0x0 */ OBJOCARINALIFT_PARAMSC_0,
-    /* 0x1 */ OBJOCARINALIFT_PARAMSC_1
-} ObjOcarinaliftParams;
+typedef enum ObjOcarinaliftParam {
+    /* 0 */ OBJOCARINALIFT_PARAM_0,
+    /* 1 */ OBJOCARINALIFT_PARAM_1
+} ObjOcarinaliftParam;
 
 #endif // Z_OBJ_OCARINALIFT_H
diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
index d2f61e2cf9..4740b907a2 100644
--- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
+++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
@@ -12,7 +12,7 @@ typedef void (*ObjOshihikiActionFunc)(struct ObjOshihiki*, PlayState*);
 #define OBJOSHIHIKI_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
 #define OBJOSHIHIKI_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
 
-enum {
+typedef enum {
     /* 0 */ OBJOSHIHIKI_F_0,
     /* 1 */ OBJOSHIHIKI_F_1,
     /* 2 */ OBJOSHIHIKI_F_2,
@@ -21,8 +21,8 @@ enum {
     /* 5 */ OBJOSHIHIKI_F_5,
     /* 6 */ OBJOSHIHIKI_F_6,
     /* 7 */ OBJOSHIHIKI_F_7,
-    /* 8 */ OBJOSHIHIKI_F_8,
-};
+    /* 8 */ OBJOSHIHIKI_F_8
+} ObjOshihikiParam;
 
 #define OBJOSHIHIKI_FF00_0 0
 #define OBJOSHIHIKI_FF00_80 0x80
diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c
index 29a673eae0..8a124b0ab6 100644
--- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c
+++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c
@@ -44,7 +44,7 @@ typedef struct {
     /* 0x0 */ s16 unk_00;
     /* 0x4 */ CollisionHeader* unk_04;
     /* 0x8 */ Gfx* unk_08;
-} ObjPzlblockStruct;
+} ObjPzlblockStruct; // size = 0xC
 
 ObjPzlblockStruct D_809A4060[] = {
     { GAMEPLAY_DANGEON_KEEP, &gameplay_dangeon_keep_Colheader_01D488, gameplay_dangeon_keep_DL_01C228 },
diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h
index df3fe1dee7..e059b6baa5 100644
--- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h
+++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h
@@ -10,7 +10,7 @@
 
 typedef enum {
     /* 0 */ OBJROTLIFT_TYPE_PLATFORMS,
-    /* 1 */ OBJROTLIFT_TYPE_SPIKES,
+    /* 1 */ OBJROTLIFT_TYPE_SPIKES
 } ObjRotliftType;
 
 struct ObjRotlift;
diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c
index a4378d92bd..92ac9ad858 100644
--- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c
+++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c
@@ -73,10 +73,10 @@ static ColliderJntSphInit sJntSphInit = {
 };
 
 typedef struct {
-    /* 0x00 */ s16 unk_00;
-    /* 0x02 */ s16 unk_02;
-    /* 0x04 */ ObjSnowballActionFunc unk_04;
-} ObjSnowballStruct2;
+    /* 0x0 */ s16 unk_00;
+    /* 0x2 */ s16 unk_02;
+    /* 0x4 */ ObjSnowballActionFunc unk_04;
+} ObjSnowballStruct2; // size = 0x8
 
 static ObjSnowballStruct2 D_80B04F84[] = {
     { -1, 0, func_80B02D58 },
diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c
index fb34d736ab..c366a6982f 100644
--- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c
+++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c
@@ -234,7 +234,7 @@ typedef struct {
     /* 0x1C */ f32 unk_1C;
     /* 0x20 */ f32 unk_20;
     /* 0x24 */ f32 unk_24;
-} ObjSpidertentStruct;
+} ObjSpidertentStruct; // size = 0x28
 
 ObjSpidertentStruct D_80B31350[] = {
     {
@@ -272,7 +272,7 @@ typedef struct {
     /* 0x0F */ s8 unk_0F;
     /* 0x10 */ Color_RGBA8 unk_10;
     /* 0x14 */ Color_RGBA8 unk_14;
-} ObjSpidertentStruct2;
+} ObjSpidertentStruct2; // size = 0x18
 
 ObjSpidertentStruct2 D_80B313A0[] = {
     {
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h
index 620228f535..4ebde38ad4 100644
--- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h
+++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h
@@ -7,7 +7,7 @@
 
 typedef enum {
     /* 0 */ TURRET_TIER_BASE,
-    /* 1 */ TURRET_TIER_TOP,
+    /* 1 */ TURRET_TIER_TOP
 } TurretTierType;
 
 struct ObjTokeiTurret;
diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
index e670d19e0a..43f424ceba 100644
--- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
+++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
@@ -16,7 +16,7 @@ typedef enum {
     /*  8 */ OBJ_TOKEIDAI_TYPE_TOWER_WALLS_TERMINA_FIELD = 8,
     /*  9 */ OBJ_TOKEIDAI_TYPE_WALL_CLOCK,
     /* 10 */ OBJ_TOKEIDAI_TYPE_SMALL_WALL_CLOCK,
-    /* 11 */ OBJ_TOKEIDAI_TYPE_STAIRCASE_TO_ROOFTOP,
+    /* 11 */ OBJ_TOKEIDAI_TYPE_STAIRCASE_TO_ROOFTOP
 } ObjTokeidaiType;
 
 struct ObjTokeidai;
diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
index 5f0e6c411a..9b8baa8615 100644
--- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
+++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
@@ -63,8 +63,7 @@ typedef struct {
     /* 0x14 */ ObjTsuboUnkFunc breakPot1;
     /* 0x18 */ ObjTsuboUnkFunc breakPot2;
     /* 0x1C */ ObjTsuboUnkFunc breakPot3;
-
-} ObjTsuboData;
+} ObjTsuboData; // size = 0x20
 
 ObjTsuboData sPotTypeData[4] = {
     { GAMEPLAY_DANGEON_KEEP, 0.197f, gameplay_dangeon_keep_DL_017EA0, gameplay_dangeon_keep_DL_018090, 12, 32,
diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h
index 92bd96549f..b6ed8d0dfa 100644
--- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h
+++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h
@@ -9,10 +9,10 @@ typedef void (*ObjUsiyaneActionFunc)(struct ObjUsiyane*, PlayState*);
 
 #define OBJUSIYANE_GET_F(thisx) ((thisx)->params & 0xF)
 
-enum {
+typedef enum {
     /* 0 */ OBJUSIYANE_F_0,
-    /* 1 */ OBJUSIYANE_F_1,
-};
+    /* 1 */ OBJUSIYANE_F_1
+} ObjUsiyaneParam;
 
 typedef struct {
     /* 0x00 */ Vec3f unk_00;
diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h
index bccdce6450..a1b32bbe93 100644
--- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h
+++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h
@@ -13,8 +13,8 @@ typedef struct ObjY2shutter {
 } ObjY2shutter; // size = 0x160
 
 typedef enum {
-    /* 0x0 */ SHUTTER_BARRED,
-    /* 0x1 */ SHUTTER_GRATED,
+    /* 0 */ SHUTTER_BARRED,
+    /* 1 */ SHUTTER_GRATED
 } ShutterType;
 
 #define OBJY2SHUTTER_GET_TYPE(thisx) (((thisx)->params >> 7) & 1)
diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
index 87a67191c3..8bd3ecd654 100644
--- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
+++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
@@ -19,6 +19,6 @@ typedef struct OceffStorm {
 
 typedef enum {
     /* 1 */ OCEFF_STORM_ACTION_PARAM_1 = 1
-} OceffStormActionParams;
+} OceffStormActionParam;
 
 #endif // Z_OCEFF_STORM_H
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index 41cf34318f..9bf7808595 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -80,7 +80,7 @@ typedef enum AnimSfxType {
     /*  7 */ ANIMSFX_TYPE_FLOOR_JUMP, // does not use sfxId
     /*  8 */ ANIMSFX_TYPE_8,          // FLOOR_WALK_Something2 // does not use sfxId
     /*  9 */ ANIMSFX_TYPE_9,          // Uses NA_SE_PL_WALK_LADDER // does not use sfxId, unused
-    /* 10 */ ANIMSFX_TYPE_SURFACE,
+    /* 10 */ ANIMSFX_TYPE_SURFACE
 } AnimSfxType;
 
 #define ANIMSFX_SHIFT_TYPE(type) ((type) << 11)
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
index 0e79c5df71..a786327faf 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
@@ -52,7 +52,7 @@ u32 EffectSsEnFire_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
 
     this->rScaleMax = initParams->scale;
 
-    if (initParams->params & ENFIRE_PARAMS_USE_SCALE) {
+    if (initParams->params & ENFIRE_PARAM_USE_SCALE) {
         this->rScale = initParams->scale;
     } else {
         this->rScale = 0;
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
index 0f17477b8a..491df81a59 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
@@ -4,7 +4,7 @@
 #include "global.h"
 
 #define ENFIRE_FLAGS_BODYPART_POS_VEC3S (1 << 15)
-#define ENFIRE_PARAMS_USE_SCALE (1 << 15)
+#define ENFIRE_PARAM_USE_SCALE (1 << 15)
 
 typedef struct {
     /* 0x00 */ Actor* actor;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
index c2f2312698..4f8cd94fe1 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
@@ -4,30 +4,30 @@
 #include "global.h"
 
 typedef enum {
-    /* 0x00 */ FHGFLASH_LIGHTBALL,
-    /* 0x01 */ FHGFLASH_SHOCK
+    /* 0 */ FHGFLASH_LIGHTBALL,
+    /* 1 */ FHGFLASH_SHOCK
 } FhgFlashType;
 
 typedef enum {
-    /* 0x00 */ FHGFLASH_LIGHTBALL_GREEN,
-    /* 0x01 */ FHGFLASH_LIGHTBALL_LIGHTBLUE,
-    /* 0x02 */ FHGFLASH_LIGHTBALL_RED,
-    /* 0x03 */ FHGFLASH_LIGHTBALL_YELLOW,
-    /* 0x04 */ FHGFLASH_LIGHTBALL_BLUE,
-    /* 0x05 */ FHGFLASH_LIGHTBALL_PURPLE,
-    /* 0x06 */ FHGFLASH_LIGHTBALL_ORANGE,
-    /* 0x07 */ FHGFLASH_LIGHTBALL_WHITE1,
-    /* 0x08 */ FHGFLASH_LIGHTBALL_WHITE2
+    /* 0 */ FHGFLASH_LIGHTBALL_GREEN,
+    /* 1 */ FHGFLASH_LIGHTBALL_LIGHTBLUE,
+    /* 2 */ FHGFLASH_LIGHTBALL_RED,
+    /* 3 */ FHGFLASH_LIGHTBALL_YELLOW,
+    /* 4 */ FHGFLASH_LIGHTBALL_BLUE,
+    /* 5 */ FHGFLASH_LIGHTBALL_PURPLE,
+    /* 6 */ FHGFLASH_LIGHTBALL_ORANGE,
+    /* 7 */ FHGFLASH_LIGHTBALL_WHITE1,
+    /* 8 */ FHGFLASH_LIGHTBALL_WHITE2
 } FhgFlashLightBallParam;
 
 typedef enum {
-    /* 0x00 */ FHGFLASH_SHOCK_NO_ACTOR,
-    /* 0x01 */ FHGFLASH_SHOCK_PLAYER,
-    /* 0x02 */ FHGFLASH_SHOCK_GOHT_2,
-    /* 0x03 */ FHGFLASH_SHOCK_GOHT_3,
-    /* 0x04 */ FHGFLASH_SHOCK_GOHT_4,
-    /* 0x05 */ FHGFLASH_SHOCK_GOHT_5,
-    /* 0x06 */ FHGFLASH_SHOCK_GOHT_6
+    /* 0 */ FHGFLASH_SHOCK_NO_ACTOR,
+    /* 1 */ FHGFLASH_SHOCK_PLAYER,
+    /* 2 */ FHGFLASH_SHOCK_GOHT_2,
+    /* 3 */ FHGFLASH_SHOCK_GOHT_3,
+    /* 4 */ FHGFLASH_SHOCK_GOHT_4,
+    /* 5 */ FHGFLASH_SHOCK_GOHT_5,
+    /* 6 */ FHGFLASH_SHOCK_GOHT_6
 } FhgFlashLightningParam;
 
 typedef struct {
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
index f9735d3964..1856ba6ac3 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
@@ -21,10 +21,10 @@ EffectSsInit Effect_Ss_Stone1_InitVars = {
 };
 
 typedef struct {
-    /* 0x00 */ TexturePtr texture;
-    /* 0x04 */ Color_RGBA8 primColor;
-    /* 0x08 */ Color_RGBA8 envColor;
-} EffStoneDrawInfo;
+    /* 0x0 */ TexturePtr texture;
+    /* 0x4 */ Color_RGBA8 primColor;
+    /* 0x8 */ Color_RGBA8 envColor;
+} EffStoneDrawInfo; // size = 0xC
 
 static EffStoneDrawInfo sDrawInfo[] = {
     { gEffStone8Tex, { 200, 0, 0, 255 }, { 0, 0, 0, 255 } },
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
index b50868b814..627bbd4f22 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
@@ -4,8 +4,8 @@
 #include "global.h"
 
 typedef struct {
-    /* 0x00 */ Vec3f pos;
-    /* 0x0C */ s32 reg0;
+    /* 0x0 */ Vec3f pos;
+    /* 0xC */ s32 reg0;
 } EffectSsStone1InitParams; // size = 0x10
 
 #endif
diff --git a/src/overlays/gamestates/ovl_select/z_select.h b/src/overlays/gamestates/ovl_select/z_select.h
index 69312e9869..8b5974103f 100644
--- a/src/overlays/gamestates/ovl_select/z_select.h
+++ b/src/overlays/gamestates/ovl_select/z_select.h
@@ -8,9 +8,9 @@ struct MapSelectState;
 typedef void (*SelectLoadFunc)(struct MapSelectState*, u32, s32);
 
 typedef struct {
-    /* 0x00 */ char* name;
-    /* 0x04 */ SelectLoadFunc loadFunc;
-    /* 0x08 */ s32 entrance;
+    /* 0x0 */ char* name;
+    /* 0x4 */ SelectLoadFunc loadFunc;
+    /* 0x8 */ s32 entrance;
 } SceneSelectEntry; // size = 0xC
 
 typedef struct MapSelectState {
diff --git a/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_collect.c
index 1b8511b50d..1b18adcd1d 100644
--- a/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_collect.c
+++ b/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_collect.c
@@ -563,7 +563,7 @@ typedef struct {
     /* 0x2 */ s16 down;
     /* 0x4 */ s16 left;
     /* 0x6 */ s16 right;
-} CursorPointDirection;
+} CursorPointDirection; // size = 0x8
 
 void KaleidoScope_UpdateQuestCursor(PlayState* play) {
     static s16 sQuestSongPlaybackDelayTimer = 0;
diff --git a/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_debug.c
index 8517fdf209..f643d8d401 100644
--- a/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_debug.c
+++ b/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_debug.c
@@ -37,7 +37,7 @@ typedef struct {
     /* 0x0 */ s16 screenX;
     /* 0x2 */ s16 screenY;
     /* 0x4 */ s16 width;
-} SectionPosition; // size = 0x6;
+} SectionPosition; // size = 0x6
 
 // clang-format off
 SectionPosition sSectionPositions[] = {