diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
index 338d65a03a..a90cfe0aeb 100644
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
@@ -8,14 +8,14 @@ struct ArrowIce;
 typedef void (*ArrowIceActionFunc)(struct ArrowIce*, PlayState*);
 
 typedef struct ArrowIce {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ s16 radius;
-    /* 0x0146 */ u16 timer;
-    /* 0x0148 */ u8 alpha;
-    /* 0x014C */ Vec3f firedPos;
-    /* 0x0158 */ f32 height;
-    /* 0x015C */ f32 blueingEffectMagnitude;
-    /* 0x0160 */ ArrowIceActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ s16 radius;
+    /* 0x146 */ u16 timer;
+    /* 0x148 */ u8 alpha;
+    /* 0x14C */ Vec3f firedPos;
+    /* 0x158 */ f32 height;
+    /* 0x15C */ f32 blueingEffectMagnitude;
+    /* 0x160 */ ArrowIceActionFunc actionFunc;
 } ArrowIce; // size = 0x164
 
 extern const ActorInit Arrow_Ice_InitVars;
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 a30f63f1a5..77c1b88089 100644
--- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
+++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
@@ -19,11 +19,11 @@ enum {
 };
 
 typedef struct BgBreakwall {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ s8 unk_15C;
-    /* 0x015D */ u8 switchFlag;
-    /* 0x015E */ u8 unk_15E;
-    /* 0x0160 */ BgBreakwallActionFunc actionFunc;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ s8 unk_15C;
+    /* 0x15D */ u8 switchFlag;
+    /* 0x15E */ u8 unk_15E;
+    /* 0x160 */ BgBreakwallActionFunc actionFunc;
 } BgBreakwall; // size = 0x164
 
 extern const ActorInit Bg_Breakwall_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h
index 8e44e7597e..c1e4940d62 100644
--- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h
+++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h
@@ -8,12 +8,12 @@ struct BgCraceMovebg;
 typedef void (*BgCraceMovebgActionFunc)(struct BgCraceMovebg*, PlayState*);
 
 typedef struct BgCraceMovebg {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ BgCraceMovebgActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x10];
-    /* 0x0170 */ s32 unk_170;
-    /* 0x0174 */ char unk_174[0x20];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ BgCraceMovebgActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x10];
+    /* 0x170 */ s32 unk_170;
+    /* 0x174 */ char unk_174[0x20];
 } BgCraceMovebg; // size = 0x194
 
 extern const ActorInit Bg_Crace_Movebg_InitVars;
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 5da321679a..952a13c4a9 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 {
-    /* 0x00 */ BGCTOWERGEAR_CEILING_COG,
-    /* 0x01 */ BGCTOWERGEAR_CENTER_COG,
-    /* 0x02 */ BGCTOWERGEAR_WATER_WHEEL,
-    /* 0x03 */ BGCTOWERGEAR_ORGAN
+    /* 0x0 */ BGCTOWERGEAR_CEILING_COG,
+    /* 0x1 */ BGCTOWERGEAR_CENTER_COG,
+    /* 0x2 */ BGCTOWERGEAR_WATER_WHEEL,
+    /* 0x3 */ BGCTOWERGEAR_ORGAN
 } BgCtowerGearType;
 
 typedef struct BgCtowerGear {
diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
index 8d8f3d2983..1bdf179338 100644
--- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
+++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
@@ -8,11 +8,11 @@ struct BgDanpeiMovebg;
 typedef void (*BgDanpeiMovebgActionFunc)(struct BgDanpeiMovebg*, PlayState*);
 
 typedef struct BgDanpeiMovebg {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ BgDanpeiMovebgActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x6C];
-    /* 0x01CC */ u16 unk_1CC;
-    /* 0x01CE */ char unk_1CE[0xA];
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ BgDanpeiMovebgActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x6C];
+    /* 0x1CC */ u16 unk_1CC;
+    /* 0x1CE */ char unk_1CE[0xA];
 } BgDanpeiMovebg; // size = 0x1D8
 
 extern const ActorInit Bg_Danpei_Movebg_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h
index adef3420eb..098f967703 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h
+++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h
@@ -18,30 +18,30 @@ typedef struct {
 } BgDblueBalanceStruct; // size = 0x14
 
 typedef struct BgDblueBalance {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ struct BgDblueBalance* unk_15C;
-    /* 0x0160 */ struct BgDblueBalance* unk_160;
-    /* 0x0164 */ struct BgDblueBalance* unk_164;
-    /* 0x0168 */ BgDblueBalanceActionFunc actionFunc;
-    /* 0x016C */ s32 unk_16C;
-    /* 0x0170 */ s32 unk_170;
-    /* 0x0174 */ s16 unk_174;
-    /* 0x0176 */ s16 unk_176;
-    /* 0x0178 */ s16 unk_178;
-    /* 0x017A */ s16 unk_17A;
-    /* 0x017C */ s8 unk_17C;
-    /* 0x017D */ s8 unk_17D;
-    /* 0x017E */ s8 unk_17E;
-    /* 0x017F */ s8 unk_17F;
-    /* 0x0180 */ s8 unk_180;
-    /* 0x0181 */ s8 unk_181;
-    /* 0x0182 */ s8 unk_182;
-    /* 0x0183 */ u8 unk_183;
-    /* 0x0184 */ s16 unk_184;
-    /* 0x0186 */ s8 unk_186;
-    /* 0x0187 */ s8 unk_187;
-    /* 0x0188 */ BgDblueBalanceStruct unk_188[8];
-    /* 0x0228 */ f32 unk_228;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ struct BgDblueBalance* unk_15C;
+    /* 0x160 */ struct BgDblueBalance* unk_160;
+    /* 0x164 */ struct BgDblueBalance* unk_164;
+    /* 0x168 */ BgDblueBalanceActionFunc actionFunc;
+    /* 0x16C */ s32 unk_16C;
+    /* 0x170 */ s32 unk_170;
+    /* 0x174 */ s16 unk_174;
+    /* 0x176 */ s16 unk_176;
+    /* 0x178 */ s16 unk_178;
+    /* 0x17A */ s16 unk_17A;
+    /* 0x17C */ s8 unk_17C;
+    /* 0x17D */ s8 unk_17D;
+    /* 0x17E */ s8 unk_17E;
+    /* 0x17F */ s8 unk_17F;
+    /* 0x180 */ s8 unk_180;
+    /* 0x181 */ s8 unk_181;
+    /* 0x182 */ s8 unk_182;
+    /* 0x183 */ u8 unk_183;
+    /* 0x184 */ s16 unk_184;
+    /* 0x186 */ s8 unk_186;
+    /* 0x187 */ s8 unk_187;
+    /* 0x188 */ BgDblueBalanceStruct unk_188[8];
+    /* 0x228 */ f32 unk_228;
 } BgDblueBalance; // size = 0x22C
 
 extern const ActorInit Bg_Dblue_Balance_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h
index 4e16a28c73..db6cba5b46 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h
+++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h
@@ -8,10 +8,10 @@ struct BgDblueElevator;
 typedef void (*BgDblueElevatorActionFunc)(struct BgDblueElevator*, PlayState*);
 
 typedef struct BgDblueElevator {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ BgDblueElevatorActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x10];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ BgDblueElevatorActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x10];
 } BgDblueElevator; // size = 0x170
 
 extern const ActorInit Bg_Dblue_Elevator_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h
index 24bd8e91ad..c02b826195 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h
+++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h
@@ -11,21 +11,21 @@ typedef void (*BgDblueWaterfallActionFunc)(struct BgDblueWaterfall*, PlayState*)
 #define BGDBLUEWATERFALL_GET_100(thisx) (((thisx)->params >> 8) & 1)
 
 typedef struct BgDblueWaterfall {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ AnimatedMaterial* unk_190;
-    /* 0x0194 */ BgDblueWaterfallActionFunc actionFunc;
-    /* 0x0198 */ f32 unk_198;
-    /* 0x019C */ s16 unk_19C;
-    /* 0x019E */ u8 unk_19E;
-    /* 0x019F */ u8 unk_19F;
-    /* 0x01A0 */ u8 unk_1A0;
-    /* 0x01A1 */ UNK_TYPE1 unk1A1[2];
-    /* 0x01A3 */ s8 unk_1A3;
-    /* 0x01A4 */ s16 unk_1A4;
-    /* 0x01A6 */ UNK_TYPE1 unk1A6[1];
-    /* 0x01A7 */ s8 unk_1A7;
-    /* 0x01A8 */ f32 unk_1A8;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ AnimatedMaterial* unk_190;
+    /* 0x194 */ BgDblueWaterfallActionFunc actionFunc;
+    /* 0x198 */ f32 unk_198;
+    /* 0x19C */ s16 unk_19C;
+    /* 0x19E */ u8 unk_19E;
+    /* 0x19F */ u8 unk_19F;
+    /* 0x1A0 */ u8 unk_1A0;
+    /* 0x1A1 */ UNK_TYPE1 unk1A1[2];
+    /* 0x1A3 */ s8 unk_1A3;
+    /* 0x1A4 */ s16 unk_1A4;
+    /* 0x1A6 */ UNK_TYPE1 unk1A6[1];
+    /* 0x1A7 */ s8 unk_1A7;
+    /* 0x1A8 */ f32 unk_1A8;
 } BgDblueWaterfall; // size = 0x1AC
 
 extern const ActorInit Bg_Dblue_Waterfall_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h
index e1bf883475..c4d824dc09 100644
--- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h
+++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h
@@ -8,10 +8,10 @@ struct BgDkjailIvy;
 typedef void (*BgDkjailIvyActionFunc)(struct BgDkjailIvy*, PlayState*);
 
 typedef struct BgDkjailIvy {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x64];
-    /* 0x01A8 */ BgDkjailIvyActionFunc actionFunc;
-    /* 0x01AC */ char unk_1AC[0x4];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x64];
+    /* 0x1A8 */ BgDkjailIvyActionFunc actionFunc;
+    /* 0x1AC */ char unk_1AC[0x4];
 } BgDkjailIvy; // size = 0x1B0
 
 extern const ActorInit Bg_Dkjail_Ivy_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h
index 66c6e00c09..df21bf9336 100644
--- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h
+++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h
@@ -11,12 +11,12 @@ typedef void (*BgF40BlockActionFunc)(struct BgF40Block*, PlayState*);
 #define BGF40BLOCK_GET_SWITCHFLAG(thisx) (((thisx)->params & 0xFE00) >> 9)
 
 typedef struct BgF40Block {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ Path* path;
-    /* 0x0160 */ s32 unk_160;
-    /* 0x0164 */ s32 unk_164;
-    /* 0x0168 */ s32 unk_168;
-    /* 0x016C */ BgF40BlockActionFunc actionFunc;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ Path* path;
+    /* 0x160 */ s32 unk_160;
+    /* 0x164 */ s32 unk_164;
+    /* 0x168 */ s32 unk_168;
+    /* 0x16C */ BgF40BlockActionFunc actionFunc;
 } BgF40Block; // size = 0x170
 
 extern const ActorInit Bg_F40_Block_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h
index 672a3132ed..b0fe89341a 100644
--- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h
+++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h
@@ -10,14 +10,14 @@ struct BgF40Switch;
 typedef void (*BgF40SwitchActionFunc)(struct BgF40Switch*, PlayState*);
 
 typedef struct BgF40Switch {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ s16 switchReleaseDelay; // frames until a pressed switch becomes released if nothing is still pressing it
-    /* 0x015E */ s8 isPressed; // Logical state of the switch (pressed or unpressed). Animation state may lag behind this slightly.
-    /* 0x015F */ s8 wasPressed; // used as temporary during update function
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ s16 switchReleaseDelay; // frames until a pressed switch becomes released if nothing is still pressing it
+    /* 0x15E */ s8 isPressed; // Logical state of the switch (pressed or unpressed). Animation state may lag behind this slightly.
+    /* 0x15F */ s8 wasPressed; // used as temporary during update function
     // true if this switch is the one that initiated a state change; false if this switch is changing as a result of another switch tied to the same flag.
     // this is a temporary flag related to something currently happening, not a permanent property of the switch.
-    /* 0x0160 */ s8 isInitiator;
-    /* 0x0164 */ BgF40SwitchActionFunc actionFunc;
+    /* 0x160 */ s8 isInitiator;
+    /* 0x164 */ BgF40SwitchActionFunc actionFunc;
 } BgF40Switch; // size = 0x168
 
 extern const ActorInit Bg_F40_Switch_InitVars;
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 d1d21f303d..f65fe6e595 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 struct BgFireWall {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ BgFireWallActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x68];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ BgFireWallActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x68];
 } BgFireWall; // size = 0x1B0
 
 extern const ActorInit Bg_Fire_Wall_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h
index aef2e5aafc..5e42b689da 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h
@@ -8,10 +8,10 @@ struct BgHakaBombwall;
 typedef void (*BgHakaBombwallActionFunc)(struct BgHakaBombwall*, PlayState*);
 
 typedef struct BgHakaBombwall {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x64];
-    /* 0x01A8 */ BgHakaBombwallActionFunc actionFunc;
-    /* 0x01AC */ char unk_1AC[0x4];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x64];
+    /* 0x1A8 */ BgHakaBombwallActionFunc actionFunc;
+    /* 0x1AC */ char unk_1AC[0x4];
 } BgHakaBombwall; // size = 0x1B0
 
 extern const ActorInit Bg_Haka_Bombwall_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h
index 7662ab6383..777c498640 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h
@@ -8,9 +8,9 @@ struct BgHakuginElvpole;
 typedef void (*BgHakuginElvpoleActionFunc)(struct BgHakuginElvpole*, PlayState*);
 
 typedef struct BgHakuginElvpole {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x20];
-    /* 0x0164 */ BgHakuginElvpoleActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x20];
+    /* 0x164 */ BgHakuginElvpoleActionFunc actionFunc;
 } BgHakuginElvpole; // size = 0x168
 
 extern const ActorInit Bg_Hakugin_Elvpole_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h
index 7ecae1ea8e..8e702a0063 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h
@@ -48,26 +48,26 @@ typedef struct {
 } BgHakuginPostUnkStruct; // size = 0x1928
 
 typedef struct {
-    /* 0x0000 */ ColliderCylinder colliders[8];
-    /* 0x0260 */ s32 count;
+    /* 0x000 */ ColliderCylinder colliders[8];
+    /* 0x260 */ s32 count;
 } BgHakuginPostColliders; // size = 0x264
 
 typedef struct BgHakuginPost {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ BgHakuginPostActionFunc actionFunc;
-    /* 0x0160 */ f32 unk_160;
-    /* 0x0164 */ f32 unk_164;
-    /* 0x0168 */ f32 unk_168;
-    /* 0x016C */ f32 unk_16C;
-    /* 0x0170 */ s32 unk_170;
-    /* 0x0174 */ s32 unk_174;
-    /* 0x0178 */ s8 unk_178;
-    /* 0x0179 */ s8 unk_179;
-    /* 0x017C */ BgHakuginPostFunc unkFunc;
-    /* 0x0180 */ s16 unk_180;
-    /* 0x0182 */ s16 unk_182;
-    /* 0x0184 */ s16 unk_184;
-    /* 0x0186 */ s16 unk_186;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ BgHakuginPostActionFunc actionFunc;
+    /* 0x160 */ f32 unk_160;
+    /* 0x164 */ f32 unk_164;
+    /* 0x168 */ f32 unk_168;
+    /* 0x16C */ f32 unk_16C;
+    /* 0x170 */ s32 unk_170;
+    /* 0x174 */ s32 unk_174;
+    /* 0x178 */ s8 unk_178;
+    /* 0x179 */ s8 unk_179;
+    /* 0x17C */ BgHakuginPostFunc unkFunc;
+    /* 0x180 */ s16 unk_180;
+    /* 0x182 */ s16 unk_182;
+    /* 0x184 */ s16 unk_184;
+    /* 0x186 */ s16 unk_186;
 } BgHakuginPost; // size = 0x188
 
 extern const ActorInit Bg_Hakugin_Post_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h
index e4a5928f6d..74757f8369 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h
@@ -15,21 +15,21 @@ typedef void (*BgHakuginSwitchUnkFunc)(struct BgHakuginSwitch*, PlayState*);
 #define BGHAKUGINSWITCH_GET_7_1 1
 
 typedef struct BgHakuginSwitch {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ColliderCylinder collider;
-    /* 0x01A8 */ Gfx* unk_1A8;
-    /* 0x01AC */ BgHakuginSwitchActionFunc actionFunc;
-    /* 0x01B0 */ s16 unk_1B0;
-    /* 0x01B2 */ s8 unk_1B2;
-    /* 0x01B4 */ BgHakuginSwitchUnkFunc unk_1B4;
-    /* 0x01B8 */ s16 unk_1B8;
-    /* 0x01BA */ s16 unk_1BA;
-    /* 0x01BC */ s16 unk_1BC;
-    /* 0x01BE */ s8 unk_1BE;
-    /* 0x01BF */ s8 unk_1BF;
-    /* 0x01C0 */ s8 unk_1C0;
-    /* 0x01C4 */ f32 unk_1C4;
-    /* 0x01C8 */ f32 unk_1C8;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ColliderCylinder collider;
+    /* 0x1A8 */ Gfx* unk_1A8;
+    /* 0x1AC */ BgHakuginSwitchActionFunc actionFunc;
+    /* 0x1B0 */ s16 unk_1B0;
+    /* 0x1B2 */ s8 unk_1B2;
+    /* 0x1B4 */ BgHakuginSwitchUnkFunc unk_1B4;
+    /* 0x1B8 */ s16 unk_1B8;
+    /* 0x1BA */ s16 unk_1BA;
+    /* 0x1BC */ s16 unk_1BC;
+    /* 0x1BE */ s8 unk_1BE;
+    /* 0x1BF */ s8 unk_1BF;
+    /* 0x1C0 */ s8 unk_1C0;
+    /* 0x1C4 */ f32 unk_1C4;
+    /* 0x1C8 */ f32 unk_1C8;
 } BgHakuginSwitch; // size = 0x1CC
 
 extern const ActorInit Bg_Hakugin_Switch_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h
index 1eba0e6b67..5c5281911d 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h
@@ -8,20 +8,20 @@ struct BgIkanaBlock;
 typedef void (*BgIkanaBlockActionFunc)(struct BgIkanaBlock*, PlayState*);
 
 typedef struct BgIkanaBlock {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ AnimatedMaterial* unk_15C;
-    /* 0x0160 */ BgIkanaBlockActionFunc actionFunc;
-    /* 0x0164 */ f32* unk_164;
-    /* 0x0168 */ f32 unk_168;
-    /* 0x016C */ f32 unk_16C;
-    /* 0x0170 */ f32 unk_170;
-    /* 0x0174 */ Vec3s unk_174;
-    /* 0x017A */ u8 unk_17A;
-    /* 0x017B */ s8 unk_17B;
-    /* 0x017C */ u8 unk_17C;
-    /* 0x017D */ s8 unk_17D;
-    /* 0x017E */ s8 unk_17E;
-    /* 0x017F */ s8 unk_17F;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ AnimatedMaterial* unk_15C;
+    /* 0x160 */ BgIkanaBlockActionFunc actionFunc;
+    /* 0x164 */ f32* unk_164;
+    /* 0x168 */ f32 unk_168;
+    /* 0x16C */ f32 unk_16C;
+    /* 0x170 */ f32 unk_170;
+    /* 0x174 */ Vec3s unk_174;
+    /* 0x17A */ u8 unk_17A;
+    /* 0x17B */ s8 unk_17B;
+    /* 0x17C */ u8 unk_17C;
+    /* 0x17D */ s8 unk_17D;
+    /* 0x17E */ s8 unk_17E;
+    /* 0x17F */ s8 unk_17F;
 } BgIkanaBlock; // size = 0x180
 
 extern const ActorInit Bg_Ikana_Block_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h
index 1a5850232b..da11bcfea4 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h
@@ -11,10 +11,10 @@ typedef void (*BgIkanaBombwallActionFunc)(struct BgIkanaBombwall*, PlayState*);
 #define BGIKANABOMBWALL_GET_100(thisx) (((thisx)->params >> 8) & 1)
 
 typedef struct BgIkanaBombwall {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ColliderCylinder collider;
-    /* 0x01A8 */ BgIkanaBombwallActionFunc actionFunc;
-    /* 0x01AC */ s8 unk_1AC;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ColliderCylinder collider;
+    /* 0x1A8 */ BgIkanaBombwallActionFunc actionFunc;
+    /* 0x1AC */ s8 unk_1AC;
 } BgIkanaBombwall; // size = 0x1B0
 
 extern const ActorInit Bg_Ikana_Bombwall_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
index 11a962b4ec..4642a43694 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
@@ -13,10 +13,10 @@ struct BgIkanaDharma;
 typedef void (*BgIkanaDharmaActionFunc)(struct BgIkanaDharma*, PlayState*);
 
 typedef struct BgIkanaDharma {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ColliderCylinder collider;
-    /* 0x01A8 */ BgIkanaDharmaActionFunc actionFunc;
-    /* 0x01AC */ s8 cutsceneFramesRemaining;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ColliderCylinder collider;
+    /* 0x1A8 */ BgIkanaDharmaActionFunc actionFunc;
+    /* 0x1AC */ s8 cutsceneFramesRemaining;
 } BgIkanaDharma; // size = 0x1B0
 
 extern const ActorInit Bg_Ikana_Dharma_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h
index e818eb77db..89021fa541 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h
@@ -33,20 +33,20 @@ typedef struct {
 } BgIkanaRotaryroomStruct3; // size = 0x58
 
 typedef struct BgIkanaRotaryroom {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ColliderJntSph collider;
-    /* 0x017C */ ColliderJntSphElement colliderElements[2];
-    /* 0x01FC */ AnimatedMaterial* unk_1FC;
-    /* 0x0200 */ BgIkanaRotaryroomUnkFunc unk_200;
-    /* 0x0204 */ BgIkanaRotaryroomStruct1 unk_204;
-    /* 0x0248 */ BgIkanaRotaryroomStruct1 unk_248[2];
-    /* 0x02D0 */ BgIkanaRotaryroomStruct1 unk_2D0[4];
-    /* 0x03E0 */ BgIkanaRotaryroomStruct2 unk_3E0[4];
-    /* 0x0520 */ BgIkanaRotaryroomStruct3 unk_520;
-    /* 0x0578 */ BgIkanaRotaryroomUnkFunc2 unk_578;
-    /* 0x057C */ BgIkanaRotaryroomUnkFunc2 unk_57C;
-    /* 0x0580 */ BgIkanaRotaryroomActionFunc actionFunc;
-    /* 0x0584 */ s16 unk_584;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ColliderJntSph collider;
+    /* 0x17C */ ColliderJntSphElement colliderElements[2];
+    /* 0x1FC */ AnimatedMaterial* unk_1FC;
+    /* 0x200 */ BgIkanaRotaryroomUnkFunc unk_200;
+    /* 0x204 */ BgIkanaRotaryroomStruct1 unk_204;
+    /* 0x248 */ BgIkanaRotaryroomStruct1 unk_248[2];
+    /* 0x2D0 */ BgIkanaRotaryroomStruct1 unk_2D0[4];
+    /* 0x3E0 */ BgIkanaRotaryroomStruct2 unk_3E0[4];
+    /* 0x520 */ BgIkanaRotaryroomStruct3 unk_520;
+    /* 0x578 */ BgIkanaRotaryroomUnkFunc2 unk_578;
+    /* 0x57C */ BgIkanaRotaryroomUnkFunc2 unk_57C;
+    /* 0x580 */ BgIkanaRotaryroomActionFunc actionFunc;
+    /* 0x584 */ s16 unk_584;
 } BgIkanaRotaryroom; // size = 0x588
 
 extern const ActorInit Bg_Ikana_Rotaryroom_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h
index 1d2569d848..19651ef575 100644
--- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h
+++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h
@@ -8,10 +8,10 @@ struct BgKin2Picture;
 typedef void (*BgKin2PictureActionFunc)(struct BgKin2Picture*, PlayState*);
 
 typedef struct BgKin2Picture {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0xF0];
-    /* 0x0234 */ BgKin2PictureActionFunc actionFunc;
-    /* 0x0238 */ char unk_238[0xC];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0xF0];
+    /* 0x234 */ BgKin2PictureActionFunc actionFunc;
+    /* 0x238 */ char unk_238[0xC];
 } BgKin2Picture; // size = 0x244
 
 extern const ActorInit Bg_Kin2_Picture_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h
index 0ae259c047..ce88b25e0b 100644
--- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h
+++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h
@@ -10,13 +10,13 @@ typedef void (*BgKin2ShelfActionFunc)(struct BgKin2Shelf*, PlayState*);
 #define BGKIN2SHELF_GET_1(thisx) ((thisx)->params & 1)
 
 typedef struct BgKin2Shelf {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ BgKin2ShelfActionFunc actionFunc;
-    /* 0x0160 */ f32 unk_160;
-    /* 0x0164 */ u8 unk_164;
-    /* 0x0165 */ s8 unk_165;
-    /* 0x0166 */ s8 unk_166;
-    /* 0x0167 */ s8 unk_167;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ BgKin2ShelfActionFunc actionFunc;
+    /* 0x160 */ f32 unk_160;
+    /* 0x164 */ u8 unk_164;
+    /* 0x165 */ s8 unk_165;
+    /* 0x166 */ s8 unk_166;
+    /* 0x167 */ s8 unk_167;
 } BgKin2Shelf; // size = 0x168
 
 extern const ActorInit Bg_Kin2_Shelf_InitVars;
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 0ace6c5882..c393b55af7 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
@@ -8,10 +8,10 @@ struct BgLastBwall;
 typedef void (*BgLastBwallActionFunc)(struct BgLastBwall*, PlayState*);
 
 typedef struct BgLastBwall {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ BgLastBwallActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0xDC];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ BgLastBwallActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0xDC];
 } BgLastBwall; // size = 0x23C
 
 extern const ActorInit Bg_Last_Bwall_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h
index 2ae0aca412..64a6fd34b0 100644
--- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h
+++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h
@@ -13,15 +13,15 @@ typedef void (*BgSpdwebActionFunc)(struct BgSpdweb*, PlayState*);
 #define BGSPDWEB_FF_1 1
 
 typedef struct BgSpdweb {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ BgSpdwebActionFunc actionFunc;
-    /* 0x0160 */ u8 switchFlag;
-    /* 0x0161 */ u8 unk_161;
-    /* 0x0162 */ s16 unk_162;
-    /* 0x0164 */ f32 unk_164;
-    /* 0x0168 */ ColliderTris collider;
-    /* 0x0188 */ ColliderTrisElement colliderElements[4];
-    /* 0x02F8 */ Vec3s* unk_2F8;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ BgSpdwebActionFunc actionFunc;
+    /* 0x160 */ u8 switchFlag;
+    /* 0x161 */ u8 unk_161;
+    /* 0x162 */ s16 unk_162;
+    /* 0x164 */ f32 unk_164;
+    /* 0x168 */ ColliderTris collider;
+    /* 0x188 */ ColliderTrisElement colliderElements[4];
+    /* 0x2F8 */ Vec3s* unk_2F8;
 } BgSpdweb; // size = 0x2FC
 
 extern const ActorInit Bg_Spdweb_InitVars;
diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.h b/src/overlays/actors/ovl_Boss_01/z_boss_01.h
index ff9b772dc3..3d874a01fd 100644
--- a/src/overlays/actors/ovl_Boss_01/z_boss_01.h
+++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.h
@@ -8,10 +8,10 @@ struct Boss01;
 typedef void (*Boss01ActionFunc)(struct Boss01*, PlayState*);
 
 typedef struct Boss01 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x320];
-    /* 0x0464 */ Boss01ActionFunc actionFunc;
-    /* 0x0468 */ char unk_468[0x674];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x320];
+    /* 0x464 */ Boss01ActionFunc actionFunc;
+    /* 0x468 */ char unk_468[0x674];
 } Boss01; // size = 0xADC
 
 extern const ActorInit Boss_01_InitVars;
diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c
index 91a4c88774..045ff53b5b 100644
--- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c
+++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c
@@ -724,7 +724,7 @@ void Boss03_ChasePlayer(Boss03* this, PlayState* play) {
 
             if (sp43 != 0) {
                 Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WATER_EFFECT, player->actor.world.pos.x, this->waterHeight,
-                            player->actor.world.pos.z, 0, 0, 0x78, ENWATEREFFECT_777);
+                            player->actor.world.pos.z, 0, 0, 0x78, ENWATEREFFECT_309);
                 Boss03_PlayUnderwaterSfx(&this->actor.projectedPos, NA_SE_EN_KONB_SINK_OLD);
             }
 
@@ -1055,7 +1055,7 @@ void Boss03_Charge(Boss03* this, PlayState* play) {
             play_sound(NA_SE_IT_BIG_BOMB_EXPLOSION);
             func_800BC848(&this->actor, play, 20, 15);
             Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WATER_EFFECT, 0.0f, this->waterHeight, 0.0f, 0, 0, 0x96,
-                        ENWATEREFFECT_780);
+                        ENWATEREFFECT_30C);
 
             // Player is above water && Player is standing on ground
             if ((this->waterHeight < player->actor.world.pos.y) && (player->actor.bgCheckFlags & 1)) {
@@ -1528,7 +1528,7 @@ void Boss03_DeathCutscene(Boss03* this, PlayState* play) {
             if ((this->workTimer[WORK_TIMER_UNK0_C] == 0) && ((this->waterHeight - 100.0f) < this->actor.world.pos.y)) {
                 this->workTimer[WORK_TIMER_UNK0_C] = Rand_ZeroFloat(15.0f) + 15.0f;
                 Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WATER_EFFECT, this->actor.world.pos.x, this->waterHeight,
-                            this->actor.world.pos.z, 0, 0, 0x78, ENWATEREFFECT_777);
+                            this->actor.world.pos.z, 0, 0, 0x78, ENWATEREFFECT_309);
 
                 if (this->actionFunc == Boss03_DeathCutscene) {
                     if ((D_809E9840 % 2) != 0) {
@@ -2013,7 +2013,7 @@ void Boss03_Update(Actor* thisx, PlayState* play2) {
             }
 
             Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WATER_EFFECT, this->actor.world.pos.x, this->waterHeight,
-                        this->actor.world.pos.z, 0, 0, 0x78, ENWATEREFFECT_777);
+                        this->actor.world.pos.z, 0, 0, 0x78, ENWATEREFFECT_309);
 
             this->unk_280 = 27;
             this->unk_284 = this->actor.world.pos.x;
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 96dd4fc3f1..b10446704a 100644
--- a/src/overlays/actors/ovl_Boss_03/z_boss_03.h
+++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.h
@@ -35,73 +35,73 @@ typedef enum {
 } GyorgEffectType;
 
 typedef struct Boss03 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ UNK_TYPE1 unk_144[0x04];
-    /* 0x0148 */ SkelAnime skelAnime;
-    /* 0x018C */ Vec3s jointTable[GYORG_LIMB_MAX];
-    /* 0x01E6 */ Vec3s morphTable[GYORG_LIMB_MAX];
-    /* 0x0240 */ s16 unk_240; // generic timer? used by Gyorg and seaweed
-    /* 0x0242 */ u8 unk_242;
-    /* 0x0243 */ UNK_TYPE1 unk_243[0x09];
-    /* 0x024C */ s16 workTimer[GYORG_WORK_TIMER_MAX];
-    /* 0x0252 */ s8 numSpawnedSmallFish; // number of Tanron3 fish that are currently alive, -1 indexed
-    /* 0x0253 */ u8 hasSpwanedSmallFishes; // Tanron
-    /* 0x0254 */ s16 bubbleEffectSpawnCount; // Amount of bubble effect which will be spawned by Update
-    /* 0x0258 */ f32 waterHeight; // always 430.0f
-    /* 0x025C */ s16 unk_25C; // Timer related to collision?
-    /* 0x025E */ s16 unk_25E;
-    /* 0x0260 */ f32 unk_260; // rotY
-    /* 0x0264 */ UNK_TYPE1 unk_264[0x04];
-    /* 0x0268 */ Vec3f unk_268; // set to player.world.pos or random values
-    /* 0x0274 */ s16 unk_274;
-    /* 0x0276 */ s16 unk_276;
-    /* 0x0278 */ f32 unk_278;
-    /* 0x027C */ f32 unk_27C;
-    /* 0x0280 */ s16 unk_280;
-    /* 0x0284 */ f32 unk_284; // Maybe a Vec3f
-    /* 0x0288 */ f32 unk_288; // Set but not used
-    /* 0x028C */ f32 unk_28C;
-    /* 0x0290 */ u8 unk_290;
-    /* 0x0294 */ f32 unk_294;
-    /* 0x0298 */ f32 unk_298;
-    /* 0x029C */ s16 leftFinYRot;
-    /* 0x029E */ s16 rightFinYRot;
-    /* 0x02A0 */ s16 bodyYRot;
-    /* 0x02A2 */ Vec3s unk_2A2;
-    /* 0x02A8 */ s16 jawZRot;
-    /* 0x02AC */ Vec3f insideJawPos; // used to grab player
-    /* 0x02B8 */ f32 unk_2B8;
-    /* 0x02BC */ u8 unk_2BC; // set but not used
-    /* 0x02BD */ u8 unk_2BD; // playerUnderwater?
-    /* 0x02BE */ s16 unk_2BE;
-    /* 0x02C0 */ UNK_TYPE1 unk_2C0[0x04];
-    /* 0x02C0 */ f32 unk_2C4;
-    /* 0x02C8 */ Vec3f prevPlayerPos;
-    /* 0x02D4 */ u8 wetSpotEffectSpawnCount;
-    /* 0x02D5 */ u8 unk_2D5; // flag
-    /* 0x02D6 */ s16 shapeRotTargetX;
-    /* 0x02D8 */ s16 shapeRotTargetY;
-    /* 0x02DA */ s16 shapeRotTargetZ;
-    /* 0x02DC */ Vec3f seaweedSegmentPositions[6];
-    /* 0x0324 */ s16 unk_324; // timer? set by Tanron3
-    /* 0x0328 */ Boss03ActionFunc actionFunc;
-    /* 0x032C */ ColliderJntSph headCollider;
-    /* 0x034C */ ColliderJntSphElement headColliderElements[2];
-    /* 0x03CC */ ColliderJntSph bodyCollider;
-    /* 0x03EC */ ColliderJntSphElement bodyColliderElements[5];
-    /* 0x052C */ f32 floppingAnimLastFrame;
-    /* 0x0530 */ u32 csTimer;
-    /* 0x0534 */ s16 csState;
-    /* 0x0536 */ s16 csCamId;
-    /* 0x0538 */ Vec3f csCamEye;
-    /* 0x0544 */ Vec3f csCamAt;
-    /* 0x0550 */ Vec3f csCamTargetEye;
-    /* 0x055C */ Vec3f csCamTargetAt;
-    /* 0x0568 */ f32 unk_568;
-    /* 0x056C */ f32 unk_56C;
-    /* 0x0570 */ f32 unk_570; // set but not used
-    /* 0x0574 */ UNK_TYPE1 unk_574[0x04];
-    /* 0x0578 */ f32 cameraFov;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ UNK_TYPE1 unk_144[0x04];
+    /* 0x148 */ SkelAnime skelAnime;
+    /* 0x18C */ Vec3s jointTable[GYORG_LIMB_MAX];
+    /* 0x1E6 */ Vec3s morphTable[GYORG_LIMB_MAX];
+    /* 0x240 */ s16 unk_240; // generic timer? used by Gyorg and seaweed
+    /* 0x242 */ u8 unk_242;
+    /* 0x243 */ UNK_TYPE1 unk_243[0x09];
+    /* 0x24C */ s16 workTimer[GYORG_WORK_TIMER_MAX];
+    /* 0x252 */ s8 numSpawnedSmallFish; // number of Tanron3 fish that are currently alive, -1 indexed
+    /* 0x253 */ u8 hasSpwanedSmallFishes; // Tanron
+    /* 0x254 */ s16 bubbleEffectSpawnCount; // Amount of bubble effect which will be spawned by Update
+    /* 0x258 */ f32 waterHeight; // always 430.0f
+    /* 0x25C */ s16 unk_25C; // Timer related to collision?
+    /* 0x25E */ s16 unk_25E;
+    /* 0x260 */ f32 unk_260; // rotY
+    /* 0x264 */ UNK_TYPE1 unk_264[0x04];
+    /* 0x268 */ Vec3f unk_268; // set to player.world.pos or random values
+    /* 0x274 */ s16 unk_274;
+    /* 0x276 */ s16 unk_276;
+    /* 0x278 */ f32 unk_278;
+    /* 0x27C */ f32 unk_27C;
+    /* 0x280 */ s16 unk_280;
+    /* 0x284 */ f32 unk_284; // Maybe a Vec3f
+    /* 0x288 */ f32 unk_288; // Set but not used
+    /* 0x28C */ f32 unk_28C;
+    /* 0x290 */ u8 unk_290;
+    /* 0x294 */ f32 unk_294;
+    /* 0x298 */ f32 unk_298;
+    /* 0x29C */ s16 leftFinYRot;
+    /* 0x29E */ s16 rightFinYRot;
+    /* 0x2A0 */ s16 bodyYRot;
+    /* 0x2A2 */ Vec3s unk_2A2;
+    /* 0x2A8 */ s16 jawZRot;
+    /* 0x2AC */ Vec3f insideJawPos; // used to grab player
+    /* 0x2B8 */ f32 unk_2B8;
+    /* 0x2BC */ u8 unk_2BC; // set but not used
+    /* 0x2BD */ u8 unk_2BD; // playerUnderwater?
+    /* 0x2BE */ s16 unk_2BE;
+    /* 0x2C0 */ UNK_TYPE1 unk_2C0[0x04];
+    /* 0x2C0 */ f32 unk_2C4;
+    /* 0x2C8 */ Vec3f prevPlayerPos;
+    /* 0x2D4 */ u8 wetSpotEffectSpawnCount;
+    /* 0x2D5 */ u8 unk_2D5; // flag
+    /* 0x2D6 */ s16 shapeRotTargetX;
+    /* 0x2D8 */ s16 shapeRotTargetY;
+    /* 0x2DA */ s16 shapeRotTargetZ;
+    /* 0x2DC */ Vec3f seaweedSegmentPositions[6];
+    /* 0x324 */ s16 unk_324; // timer? set by Tanron3
+    /* 0x328 */ Boss03ActionFunc actionFunc;
+    /* 0x32C */ ColliderJntSph headCollider;
+    /* 0x34C */ ColliderJntSphElement headColliderElements[2];
+    /* 0x3CC */ ColliderJntSph bodyCollider;
+    /* 0x3EC */ ColliderJntSphElement bodyColliderElements[5];
+    /* 0x52C */ f32 floppingAnimLastFrame;
+    /* 0x530 */ u32 csTimer;
+    /* 0x534 */ s16 csState;
+    /* 0x536 */ s16 csCamId;
+    /* 0x538 */ Vec3f csCamEye;
+    /* 0x544 */ Vec3f csCamAt;
+    /* 0x550 */ Vec3f csCamTargetEye;
+    /* 0x55C */ Vec3f csCamTargetAt;
+    /* 0x568 */ f32 unk_568;
+    /* 0x56C */ f32 unk_56C;
+    /* 0x570 */ f32 unk_570; // set but not used
+    /* 0x574 */ UNK_TYPE1 unk_574[0x04];
+    /* 0x578 */ f32 cameraFov;
 } Boss03; // size = 0x57C
  
 #define GYORG_PARAM_DEFAULT (0)
diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.h b/src/overlays/actors/ovl_Boss_04/z_boss_04.h
index 622326b166..d4835e42d3 100644
--- a/src/overlays/actors/ovl_Boss_04/z_boss_04.h
+++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.h
@@ -38,14 +38,14 @@ typedef struct Boss04 {
     /* 0x2E0 */ s16 unk_2E0;
     /* 0x2E2 */ s16 unk_2E2;
     /* 0x2E4 */ Vec3f unk_2E4[16];
-    /* 0x2E4 */ Vec3f unk_3A4[15];
-    /* 0x2E4 */ Vec3f unk_458[15];
-    /* 0x2E4 */ Vec3f unk_50C[11];
-    /* 0x2E4 */ Vec3f unk_590[11];
-    /* 0x2E4 */ Vec3f unk_614[6];
-    /* 0x2E4 */ Vec3f unk_65C[6];
-    /* 0x2E4 */ Vec3f unk_6A4;
-    /* 0x2E4 */ Vec3f unk_6B0;
+    /* 0x3A4 */ Vec3f unk_3A4[15];
+    /* 0x458 */ Vec3f unk_458[15];
+    /* 0x50C */ Vec3f unk_50C[11];
+    /* 0x590 */ Vec3f unk_590[11];
+    /* 0x614 */ Vec3f unk_614[6];
+    /* 0x65C */ Vec3f unk_65C[6];
+    /* 0x6A4 */ Vec3f unk_6A4;
+    /* 0x6B0 */ Vec3f unk_6B0;
     /* 0x6BC */ Vec3f unk_6BC;
     /* 0x6C8 */ Vec3f unk_6C8;
     /* 0x6D4 */ f32 unk_6D4;
diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.h b/src/overlays/actors/ovl_Boss_05/z_boss_05.h
index 039eeb7502..7a3f295070 100644
--- a/src/overlays/actors/ovl_Boss_05/z_boss_05.h
+++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.h
@@ -8,10 +8,10 @@ struct Boss05;
 typedef void (*Boss05ActionFunc)(struct Boss05*, PlayState*);
 
 typedef struct Boss05 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x2C];
-    /* 0x0170 */ Boss05ActionFunc actionFunc;
-    /* 0x0174 */ char unk_174[0x394];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x2C];
+    /* 0x170 */ Boss05ActionFunc actionFunc;
+    /* 0x174 */ char unk_174[0x394];
 } Boss05; // size = 0x508
 
 extern const ActorInit Boss_05_InitVars;
diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.h b/src/overlays/actors/ovl_Boss_06/z_boss_06.h
index a720d2b24a..7ab5fd8574 100644
--- a/src/overlays/actors/ovl_Boss_06/z_boss_06.h
+++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.h
@@ -10,44 +10,44 @@ typedef void (*Boss06ActionFunc)(struct Boss06*, PlayState*);
 #define ENBOSS06_GET_PARAMS(thisx) ((thisx)->params)
 
 typedef struct Boss06 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ u8 unk_144;
-    /* 0x0146 */ s16 unk_146;
-    /* 0x0148 */ s16 unk_148;
-    /* 0x014C */ ColliderCylinder collider;
-    /* 0x0198 */ Boss06ActionFunc actionFunc;
-    /* 0x019C */ f32 unk_19C;
-    /* 0x01A0 */ f32 unk_1A0;
-    /* 0x01A4 */ f32 unk_1A4;
-    /* 0x01A8 */ f32 unk_1A8;
-    /* 0x01AC */ f32 unk_1AC;
-    /* 0x01B0 */ f32 unk_1B0;
-    /* 0x01B4 */ f32 unk_1B4;
-    /* 0x01B8 */ UNK_TYPE1 unk1B8[4];
-    /* 0x01BC */ f32 unk_1BC;
-    /* 0x01C0 */ f32 unk_1C0;
-    /* 0x01C4 */ UNK_TYPE1 unk1C4[4];
-    /* 0x01C8 */ u8 unk_1C8;
-    /* 0x01C9 */ u8 unk_1C9;
-    /* 0x01CA */ s16 unk_1CA;
-    /* 0x01CC */ f32 unk_1CC;
-    /* 0x01D0 */ f32 unk_1D0;
-    /* 0x01D4 */ f32 unk_1D4;
-    /* 0x01D8 */ f32 unk_1D8;
-    /* 0x01DC */ f32 unk_1DC;
-    /* 0x01E0 */ f32 unk_1E0;
-    /* 0x01E4 */ f32 unk_1E4;
-    /* 0x01E8 */ UNK_TYPE1 unk1E8[0x15];
-    /* 0x01FD */ u8 unk_1FD;
-    /* 0x01FE */ u8 unk_1FE;
-    /* 0x01FF */ u8 unk_1FF;
-    /* 0x0200 */ u8 unk_200[0x800];
-    /* 0x0A00 */ s16 unk_A00;
-    /* 0x0A04 */ Vec3f unk_A04;
-    /* 0x0A10 */ Vec3f unk_A10;
-    /* 0x0A1C */ Vec3f unk_A1C;
-    /* 0x0A28 */ f32 unk_A28;
-    /* 0x0A2C */ f32 unk_A2C;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ u8 unk_144;
+    /* 0x146 */ s16 unk_146;
+    /* 0x148 */ s16 unk_148;
+    /* 0x14C */ ColliderCylinder collider;
+    /* 0x198 */ Boss06ActionFunc actionFunc;
+    /* 0x19C */ f32 unk_19C;
+    /* 0x1A0 */ f32 unk_1A0;
+    /* 0x1A4 */ f32 unk_1A4;
+    /* 0x1A8 */ f32 unk_1A8;
+    /* 0x1AC */ f32 unk_1AC;
+    /* 0x1B0 */ f32 unk_1B0;
+    /* 0x1B4 */ f32 unk_1B4;
+    /* 0x1B8 */ UNK_TYPE1 unk1B8[4];
+    /* 0x1BC */ f32 unk_1BC;
+    /* 0x1C0 */ f32 unk_1C0;
+    /* 0x1C4 */ UNK_TYPE1 unk1C4[4];
+    /* 0x1C8 */ u8 unk_1C8;
+    /* 0x1C9 */ u8 unk_1C9;
+    /* 0x1CA */ s16 unk_1CA;
+    /* 0x1CC */ f32 unk_1CC;
+    /* 0x1D0 */ f32 unk_1D0;
+    /* 0x1D4 */ f32 unk_1D4;
+    /* 0x1D8 */ f32 unk_1D8;
+    /* 0x1DC */ f32 unk_1DC;
+    /* 0x1E0 */ f32 unk_1E0;
+    /* 0x1E4 */ f32 unk_1E4;
+    /* 0x1E8 */ UNK_TYPE1 unk1E8[0x15];
+    /* 0x1FD */ u8 unk_1FD;
+    /* 0x1FE */ u8 unk_1FE;
+    /* 0x1FF */ u8 unk_1FF;
+    /* 0x200 */ u8 unk_200[0x800];
+    /* 0xA00 */ s16 unk_A00;
+    /* 0xA04 */ Vec3f unk_A04;
+    /* 0xA10 */ Vec3f unk_A10;
+    /* 0xA1C */ Vec3f unk_A1C;
+    /* 0xA28 */ f32 unk_A28;
+    /* 0xA2C */ f32 unk_A2C;
 } Boss06; // size = 0xA30
 
 extern const ActorInit Boss_06_InitVars;
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
index 749ead9467..985e2c30c5 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
@@ -23,15 +23,15 @@ typedef enum {
 } DemoEffectType;
 
 typedef struct DemoEffect {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelCurve skelCurve;
-    /* 0x0164 */ u8 initObjectIndex;
-    /* 0x0165 */ u8 primXluColor[3];
-    /* 0x0168 */ u8 envXluColor[3];
-    /* 0x016C */ s16 timer;
-    /* 0x0170 */ DemoEffectActionFunc initActionFunc;
-    /* 0x0174 */ ActorFunc initDrawFunc;
-    /* 0x0178 */ DemoEffectActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelCurve skelCurve;
+    /* 0x164 */ u8 initObjectIndex;
+    /* 0x165 */ u8 primXluColor[3];
+    /* 0x168 */ u8 envXluColor[3];
+    /* 0x16C */ s16 timer;
+    /* 0x170 */ DemoEffectActionFunc initActionFunc;
+    /* 0x174 */ ActorFunc initDrawFunc;
+    /* 0x178 */ DemoEffectActionFunc actionFunc;
 } DemoEffect; // size = 0x17C
 
 extern const ActorInit Demo_Effect_InitVars;
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 7c7885b147..f6f05d0a6d 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
@@ -8,21 +8,21 @@ struct DemoKankyo;
 typedef void (*DemoKankyoActionFunc)(struct DemoKankyo*, PlayState*);
 
 typedef struct {
-  /* 0x000 */ u8 state;
-  /* 0x004 */ Vec3f posOffset;
-  /* 0x010 */ Vec3f posOffsetPrev;
-  /* 0x01C */ Vec3f posBase;
-  /* 0x028 */ Vec3f speedClock; // cycles in radians
-  /* 0x034 */ f32 speed;
-  /* 0x038 */ f32 speedTarget;
-  /* 0x03C */ u16 alphaClock;
-  /* 0x03E */ u16 LostWoodsSkyFishSpeedXZClock;
-  /* 0x040 */ u8 alpha;
-  /* 0x044 */ f32 scale; // size of the effect
-  /* 0x048 */ u16 LostWoodsSkyFishSpeedXZ; // the x-z speed (angular velocity) the lost woods skyfish oscillates around player. pos or neg 200-400 
-  /* 0x04A */ u16 LostWoodsSkyFishPosOffsetMax; // The x-z range the lost woods skyfish oscillates around player. random value between 15-65
-  /* 0x04C */ f32 LostWoodsSkyFishSpeedY; // the y speed (angular velocity) the lost woods skyfish oscillates around player.
-  /* 0x050 */ u16 pad50; // unused, always assigned to 0, nothing else in this actor uses it
+  /* 0x00 */ u8 state;
+  /* 0x04 */ Vec3f posOffset;
+  /* 0x10 */ Vec3f posOffsetPrev;
+  /* 0x1C */ Vec3f posBase;
+  /* 0x28 */ Vec3f speedClock; // cycles in radians
+  /* 0x34 */ f32 speed;
+  /* 0x38 */ f32 speedTarget;
+  /* 0x3C */ u16 alphaClock;
+  /* 0x3E */ u16 LostWoodsSkyFishSpeedXZClock;
+  /* 0x40 */ u8 alpha;
+  /* 0x44 */ f32 scale; // size of the effect
+  /* 0x48 */ u16 LostWoodsSkyFishSpeedXZ; // the x-z speed (angular velocity) the lost woods skyfish oscillates around player. pos or neg 200-400 
+  /* 0x4A */ u16 LostWoodsSkyFishPosOffsetMax; // The x-z range the lost woods skyfish oscillates around player. random value between 15-65
+  /* 0x4C */ f32 LostWoodsSkyFishSpeedY; // the y speed (angular velocity) the lost woods skyfish oscillates around player.
+  /* 0x50 */ u16 pad50; // unused, always assigned to 0, nothing else in this actor uses it
 } DemoKankyoEffect; // size = 0x54
 
 #define DEMOKANKYO_EFFECT_COUNT 64
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 c7cd1fb100..212e93d841 100644
--- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h
+++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h
@@ -8,9 +8,9 @@ struct DemoMoonend;
 typedef void (*DemoMoonendActionFunc)(struct DemoMoonend*, PlayState*);
 
 typedef struct DemoMoonend {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x19C];
-    /* 0x02E0 */ DemoMoonendActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x19C];
+    /* 0x2E0 */ DemoMoonendActionFunc actionFunc;
 } DemoMoonend; // size = 0x2E4
 
 extern const ActorInit Demo_Moonend_InitVars;
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 b5c90371cd..b0a00f2a68 100644
--- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h
+++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h
@@ -21,20 +21,20 @@ enum {
 };
 
 typedef struct DemoSyoten {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkeletonInfo unk_144;
-    /* 0x0174 */ Vec3s unk_174[51];
-    /* 0x02A6 */ Vec3s unk_2A6[51];
-    /* 0x03D8 */ f32 unk_3D8;
-    /* 0x03DC */ Gfx* unk_3DC;
-    /* 0x03E0 */ AnimatedMaterial* unk_3E0;
-    /* 0x03E4 */ u16 unk_3E4;
-    /* 0x03E6 */ s16 unk_3E6;
-    /* 0x03E8 */ Path* unk_3E8;
-    /* 0x03EC */ s32 unk_3EC;
-    /* 0x03F0 */ u16 unk_3F0;
-    /* 0x03F2 */ u16 unk_3F2;
-    /* 0x03F4 */ DemoSyotenActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkeletonInfo unk_144;
+    /* 0x174 */ Vec3s unk_174[51];
+    /* 0x2A6 */ Vec3s unk_2A6[51];
+    /* 0x3D8 */ f32 unk_3D8;
+    /* 0x3DC */ Gfx* unk_3DC;
+    /* 0x3E0 */ AnimatedMaterial* unk_3E0;
+    /* 0x3E4 */ u16 unk_3E4;
+    /* 0x3E6 */ s16 unk_3E6;
+    /* 0x3E8 */ Path* unk_3E8;
+    /* 0x3EC */ s32 unk_3EC;
+    /* 0x3F0 */ u16 unk_3F0;
+    /* 0x3F2 */ u16 unk_3F2;
+    /* 0x3F4 */ DemoSyotenActionFunc actionFunc;
 } DemoSyoten; // size = 0x3F8
 
 extern const ActorInit Demo_Syoten_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h
index c49f049d11..f52f92d691 100644
--- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h
+++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h
@@ -8,10 +8,10 @@ struct DmAh;
 typedef void (*DmAhActionFunc)(struct DmAh*, PlayState*);
 
 typedef struct DmAh {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ DmAhActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x114];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ DmAhActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x114];
 } DmAh; // size = 0x2A0
 
 extern const ActorInit Dm_Ah_InitVars;
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 5e9a3d91dd..6387511df7 100644
--- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h
+++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h
@@ -8,10 +8,10 @@ struct DmAl;
 typedef void (*DmAlActionFunc)(struct DmAl*, PlayState*);
 
 typedef struct DmAl {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ DmAlActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x2D4];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ DmAlActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x2D4];
 } DmAl; // size = 0x460
 
 extern const ActorInit Dm_Al_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.h b/src/overlays/actors/ovl_Dm_An/z_dm_an.h
index 676d215a49..2282fee9c0 100644
--- a/src/overlays/actors/ovl_Dm_An/z_dm_an.h
+++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.h
@@ -9,31 +9,31 @@ struct DmAn;
 typedef void (*DmAnActionFunc)(struct DmAn*, PlayState*);
 
 typedef struct DmAn {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ DmAnActionFunc actionFunc;
-    /* 0x018C */ Vec3f unk_18C;
-    /* 0x018C */ Vec3f unk_194;
-    /* 0x01A4 */ Vec3s unk_1A4;
-    /* 0x01A4 */ Vec3s unk_1AA;
-    /* 0x01B0 */ Vec3s jointTable[OBJECT_AN1_LIMB_MAX];
-    /* 0x022E */ Vec3s morphTable[OBJECT_AN1_LIMB_MAX];
-    /* 0x02AC */ s8 unk_2AC;
-    /* 0x02AD */ s8 unk_2AD;
-    /* 0x02AE */ u16 unk_2AE;
-    /* 0x02B0 */ u8 unk_2B0;
-    /* 0x02B4 */ Actor* unk_2B4;
-    /* 0x02B8 */ s16 unk_2B8;
-    /* 0x02BA */ s16 unk_2BA;
-    /* 0x02BC */ s16 unk_2BC;
-    /* 0x02BE */ s16 unk_2BE;
-    /* 0x02C0 */ s16 unk_2C0;
-    /* 0x02C2 */ s16 unk_2C2;
-    /* 0x02C4 */ s16 unk_2C4;
-    /* 0x02C8 */ s32 unk_2C8;
-    /* 0x02CC */ s32 unk_2CC;
-    /* 0x02D0 */ s32 unk_2D0;
-    /* 0x02D4 */ s32 unk_2D4;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ DmAnActionFunc actionFunc;
+    /* 0x18C */ Vec3f unk_18C;
+    /* 0x18C */ Vec3f unk_194;
+    /* 0x1A4 */ Vec3s unk_1A4;
+    /* 0x1A4 */ Vec3s unk_1AA;
+    /* 0x1B0 */ Vec3s jointTable[OBJECT_AN1_LIMB_MAX];
+    /* 0x22E */ Vec3s morphTable[OBJECT_AN1_LIMB_MAX];
+    /* 0x2AC */ s8 unk_2AC;
+    /* 0x2AD */ s8 unk_2AD;
+    /* 0x2AE */ u16 unk_2AE;
+    /* 0x2B0 */ u8 unk_2B0;
+    /* 0x2B4 */ Actor* unk_2B4;
+    /* 0x2B8 */ s16 unk_2B8;
+    /* 0x2BA */ s16 unk_2BA;
+    /* 0x2BC */ s16 unk_2BC;
+    /* 0x2BE */ s16 unk_2BE;
+    /* 0x2C0 */ s16 unk_2C0;
+    /* 0x2C2 */ s16 unk_2C2;
+    /* 0x2C4 */ s16 unk_2C4;
+    /* 0x2C8 */ s32 unk_2C8;
+    /* 0x2CC */ s32 unk_2CC;
+    /* 0x2D0 */ s32 unk_2D0;
+    /* 0x2D4 */ s32 unk_2D4;
 } DmAn; // size = 0x2D8
 
 extern const ActorInit Dm_An_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h
index d28232eb36..0a7f2410c6 100644
--- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h
+++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h
@@ -21,18 +21,18 @@ typedef struct {
 } DmChar00Struct; // size = 0x10
 
 typedef struct DmChar00 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[7];
-    /* 0x01B2 */ UNK_TYPE1 unk_1B2[0x30];
-    /* 0x01E2 */ Vec3s morphTable[7];
-    /* 0x020C */ UNK_TYPE1 unk_20C[0x30];
-    /* 0x023C */ DmChar00ActionFunc actionFunc;
-    /* 0x0240 */ DmChar00Struct unk_240;
-    /* 0x0250 */ DmChar00Struct unk_250;
-    /* 0x0260 */ u8 unk_260;
-    /* 0x0261 */ u8 unk_261;
-    /* 0x0262 */ u16 unk_262;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[7];
+    /* 0x1B2 */ UNK_TYPE1 unk_1B2[0x30];
+    /* 0x1E2 */ Vec3s morphTable[7];
+    /* 0x20C */ UNK_TYPE1 unk_20C[0x30];
+    /* 0x23C */ DmChar00ActionFunc actionFunc;
+    /* 0x240 */ DmChar00Struct unk_240;
+    /* 0x250 */ DmChar00Struct unk_250;
+    /* 0x260 */ u8 unk_260;
+    /* 0x261 */ u8 unk_261;
+    /* 0x262 */ u16 unk_262;
 } DmChar00; // size = 0x264
 
 extern const ActorInit Dm_Char00_InitVars;
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 e972f89ab0..677a2b59b7 100644
--- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h
+++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h
@@ -17,15 +17,15 @@ enum {
 };
 
 typedef struct DmChar01 {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ UNK_TYPE1 unk15C[0x44];
-    /* 0x01A0 */ DmChar01ActionFunc actionFunc;
-    /* 0x01A4 */ UNK_TYPE1 unk1A4[0x8];
-    /* 0x01AC */ s16 unk_1AC[205];
-    /* 0x0346 */ s16 unk_346;
-    /* 0x0348 */ f32 unk_348;
-    /* 0x034C */ u8 unk_34C;
-    /* 0x034D */ u8 unk_34D;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ UNK_TYPE1 unk15C[0x44];
+    /* 0x1A0 */ DmChar01ActionFunc actionFunc;
+    /* 0x1A4 */ UNK_TYPE1 unk1A4[0x8];
+    /* 0x1AC */ s16 unk_1AC[205];
+    /* 0x346 */ s16 unk_346;
+    /* 0x348 */ f32 unk_348;
+    /* 0x34C */ u8 unk_34C;
+    /* 0x34D */ u8 unk_34D;
 } DmChar01; // size = 0x350
 
 extern const ActorInit Dm_Char01_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h
index f06e8085e6..8d2905ad8d 100644
--- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h
+++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h
@@ -8,10 +8,10 @@ struct DmChar03;
 typedef void (*DmChar03ActionFunc)(struct DmChar03*, PlayState*);
 
 typedef struct DmChar03 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ DmChar03ActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x10];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ DmChar03ActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x10];
 } DmChar03; // size = 0x19C
 
 extern const ActorInit Dm_Char03_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h
index 7bb8efc041..b44bad9cd2 100644
--- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h
+++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h
@@ -8,10 +8,10 @@ struct DmChar04;
 typedef void (*DmChar04ActionFunc)(struct DmChar04*, PlayState*);
 
 typedef struct DmChar04 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0xF8];
-    /* 0x023C */ DmChar04ActionFunc actionFunc;
-    /* 0x0240 */ char unk_240[0x24];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0xF8];
+    /* 0x23C */ DmChar04ActionFunc actionFunc;
+    /* 0x240 */ char unk_240[0x24];
 } DmChar04; // size = 0x264
 
 extern const ActorInit Dm_Char04_InitVars;
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 85a422e96c..212cdb03e1 100644
--- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h
+++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h
@@ -26,20 +26,20 @@ enum {
 };
 
 typedef struct DmChar05 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ DmChar05ActionFunc actionFunc;
-    /* 0x018C */ s16 unk_18C;
-    /* 0x018E */ u8 unk_18E;
-    /* 0x018F */ u8 unk_18F;
-    /* 0x0190 */ Vec3f unk_190;
-    /* 0x019C */ u32 unk_19C;
-    /* 0x01A0 */ u32 unk_1A0;
-    /* 0x01A4 */ u32 unk_1A4;
-    /* 0x01A8 */ s32 unk_1A8;
-    /* 0x01AC */ s32 unk_1AC;
-    /* 0x01B0 */ s32 unk_1B0;
-    /* 0x01B4 */ u8 unk_1B4;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ DmChar05ActionFunc actionFunc;
+    /* 0x18C */ s16 unk_18C;
+    /* 0x18E */ u8 unk_18E;
+    /* 0x18F */ u8 unk_18F;
+    /* 0x190 */ Vec3f unk_190;
+    /* 0x19C */ u32 unk_19C;
+    /* 0x1A0 */ u32 unk_1A0;
+    /* 0x1A4 */ u32 unk_1A4;
+    /* 0x1A8 */ s32 unk_1A8;
+    /* 0x1AC */ s32 unk_1AC;
+    /* 0x1B0 */ s32 unk_1B0;
+    /* 0x1B4 */ u8 unk_1B4;
 } DmChar05; // size = 0x1B8
 
 extern const ActorInit Dm_Char05_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h
index 5e51fc516c..49a026063f 100644
--- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h
+++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h
@@ -8,10 +8,10 @@ struct DmChar06;
 typedef void (*DmChar06ActionFunc)(struct DmChar06*, PlayState*);
 
 typedef struct DmChar06 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x14C];
-    /* 0x0290 */ DmChar06ActionFunc actionFunc;
-    /* 0x0294 */ char unk_294[0x10];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x14C];
+    /* 0x290 */ DmChar06ActionFunc actionFunc;
+    /* 0x294 */ char unk_294[0x10];
 } DmChar06; // size = 0x2A4
 
 extern const ActorInit Dm_Char06_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h
index 7633e89184..1718a9fb02 100644
--- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h
+++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h
@@ -8,10 +8,10 @@ struct DmChar08;
 typedef void (*DmChar08ActionFunc)(struct DmChar08*, PlayState*);
 
 typedef struct DmChar08 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x5C];
-    /* 0x01A0 */ DmChar08ActionFunc actionFunc;
-    /* 0x01A4 */ char unk_1A4[0x68];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x5C];
+    /* 0x1A0 */ DmChar08ActionFunc actionFunc;
+    /* 0x1A4 */ char unk_1A4[0x68];
 } DmChar08; // size = 0x20C
 
 extern const ActorInit Dm_Char08_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h
index 22e57726e3..770c9358c2 100644
--- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h
+++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h
@@ -8,10 +8,10 @@ struct DmChar09;
 typedef void (*DmChar09ActionFunc)(struct DmChar09*, PlayState*);
 
 typedef struct DmChar09 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0xBC];
-    /* 0x0200 */ DmChar09ActionFunc actionFunc;
-    /* 0x0204 */ char unk_204[0x2C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0xBC];
+    /* 0x200 */ DmChar09ActionFunc actionFunc;
+    /* 0x204 */ char unk_204[0x2C];
 } DmChar09; // size = 0x230
 
 extern const ActorInit Dm_Char09_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h
index 74efd4c1e0..b7e45a3a1f 100644
--- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h
+++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h
@@ -9,31 +9,31 @@ struct DmGm;
 typedef void (*DmGmActionFunc)(struct DmGm*, PlayState*);
 
 typedef struct DmGm {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ DmGmActionFunc actionFunc;
-    /* 0x018C */ Vec3f unk_18C;
-    /* 0x018C */ Vec3f unk_194;
-    /* 0x01A4 */ Vec3s unk_1A4;
-    /* 0x01A4 */ Vec3s unk_1AA;
-    /* 0x01B0 */ Vec3s jointTable[OBJECT_AN1_LIMB_MAX];
-    /* 0x022E */ Vec3s morphTable[OBJECT_AN1_LIMB_MAX];
-    /* 0x02AC */ s8 unk_2AC;
-    /* 0x02AD */ s8 unk_2AD;
-    /* 0x02AE */ u16 unk_2AE;
-    /* 0x02B0 */ u8 unk_2B0;
-    /* 0x02B4 */ Actor* unk_2B4;
-    /* 0x02B8 */ s16 unk_2B8;
-    /* 0x02BA */ s16 unk_2BA;
-    /* 0x02BC */ s16 unk_2BC;
-    /* 0x02BE */ s16 unk_2BE;
-    /* 0x02C0 */ s16 unk_2C0;
-    /* 0x02C2 */ s16 unk_2C2;
-    /* 0x02C4 */ s16 unk_2C4;
-    /* 0x02C8 */ s32 unk_2C8;
-    /* 0x02CC */ s32 unk_2CC;
-    /* 0x02D0 */ s32 unk_2D0;
-    /* 0x02D4 */ s32 unk_2D4;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ DmGmActionFunc actionFunc;
+    /* 0x18C */ Vec3f unk_18C;
+    /* 0x18C */ Vec3f unk_194;
+    /* 0x1A4 */ Vec3s unk_1A4;
+    /* 0x1A4 */ Vec3s unk_1AA;
+    /* 0x1B0 */ Vec3s jointTable[OBJECT_AN1_LIMB_MAX];
+    /* 0x22E */ Vec3s morphTable[OBJECT_AN1_LIMB_MAX];
+    /* 0x2AC */ s8 unk_2AC;
+    /* 0x2AD */ s8 unk_2AD;
+    /* 0x2AE */ u16 unk_2AE;
+    /* 0x2B0 */ u8 unk_2B0;
+    /* 0x2B4 */ Actor* unk_2B4;
+    /* 0x2B8 */ s16 unk_2B8;
+    /* 0x2BA */ s16 unk_2BA;
+    /* 0x2BC */ s16 unk_2BC;
+    /* 0x2BE */ s16 unk_2BE;
+    /* 0x2C0 */ s16 unk_2C0;
+    /* 0x2C2 */ s16 unk_2C2;
+    /* 0x2C4 */ s16 unk_2C4;
+    /* 0x2C8 */ s32 unk_2C8;
+    /* 0x2CC */ s32 unk_2CC;
+    /* 0x2D0 */ s32 unk_2D0;
+    /* 0x2D4 */ s32 unk_2D4;
 } DmGm; // size = 0x2D8
 
 extern const ActorInit Dm_Gm_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h
index 32bd6aa39b..02d12ee7d4 100644
--- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h
+++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h
@@ -8,12 +8,12 @@ struct DmHina;
 typedef void (*DmHinaActionFunc)(struct DmHina*, PlayState*);
 
 typedef struct DmHina {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ DmHinaActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x10];
-    /* 0x0158 */ f32 unk_158;
-    /* 0x015C */ f32 unk_15C;
-    /* 0x0160 */ char unk_160[0x24];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ DmHinaActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x10];
+    /* 0x158 */ f32 unk_158;
+    /* 0x15C */ f32 unk_15C;
+    /* 0x160 */ char unk_160[0x24];
 } DmHina; // size = 0x184
 
 extern const ActorInit Dm_Hina_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h
index 6d568cd50b..fda9397c7b 100644
--- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h
+++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h
@@ -8,10 +8,10 @@ struct DmTag;
 typedef void (*DmTagActionFunc)(struct DmTag*, PlayState*);
 
 typedef struct DmTag {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ DmTagActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x20];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ DmTagActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x20];
 } DmTag; // size = 0x1AC
 
 extern const ActorInit Dm_Tag_InitVars;
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 bc66c2480c..c57f610a08 100644
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
@@ -24,36 +24,36 @@ enum {
 };
 
 typedef struct DoorWarp1 {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ SkelAnime skelAnime;
-    /* 0x01A0 */ DmHina* unk_1A0;
-    /* 0x01A4 */ f32 unk_1A4;
-    /* 0x01A8 */ f32 unk_1A8;
-    /* 0x01AC */ f32 unk_1AC;
-    /* 0x01B0 */ f32 unk_1B0;
-    /* 0x01B4 */ f32 unk_1B4;
-    /* 0x01B8 */ f32 unk_1B8;
-    /* 0x01BC */ f32 unk_1BC;
-    /* 0x01C0 */ f32 unk_1C0;
-    /* 0x01C4 */ s16 unk_1C4;
-    /* 0x01C6 */ s16 unk_1C6;
-    /* 0x01C8 */ s16 unk_1C8;
-    /* 0x01CA */ s16 unk_1CA;
-    /* 0x01CC */ s16 unk_1CC;
-    /* 0x01CE */ s16 unk_1CE;
-    /* 0x01D0 */ u16 unk_1D0;
-    /* 0x01D2 */ s8 unk_1D2;
-    /* 0x01D3 */ u8 unk_1D3;
-    /* 0x01D4 */ u8 unk_1D4;
-    /* 0x01D8 */ DoorWarp1ActionFunc actionFunc;
-    /* 0x01DC */ LightNode* unk_1DC;
-    /* 0x01E0 */ LightInfo unk_1E0;
-    /* 0x01F0 */ LightNode* unk_1F0;
-    /* 0x01F4 */ LightInfo unk_1F4;
-    /* 0x0202 */ u8 unk_202;
-    /* 0x0203 */ u8 unk_203;
-    /* 0x0204 */ f32 unk_204;
-    /* 0x0208 */ u8 unk_208;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ SkelAnime skelAnime;
+    /* 0x1A0 */ DmHina* unk_1A0;
+    /* 0x1A4 */ f32 unk_1A4;
+    /* 0x1A8 */ f32 unk_1A8;
+    /* 0x1AC */ f32 unk_1AC;
+    /* 0x1B0 */ f32 unk_1B0;
+    /* 0x1B4 */ f32 unk_1B4;
+    /* 0x1B8 */ f32 unk_1B8;
+    /* 0x1BC */ f32 unk_1BC;
+    /* 0x1C0 */ f32 unk_1C0;
+    /* 0x1C4 */ s16 unk_1C4;
+    /* 0x1C6 */ s16 unk_1C6;
+    /* 0x1C8 */ s16 unk_1C8;
+    /* 0x1CA */ s16 unk_1CA;
+    /* 0x1CC */ s16 unk_1CC;
+    /* 0x1CE */ s16 unk_1CE;
+    /* 0x1D0 */ u16 unk_1D0;
+    /* 0x1D2 */ s8 unk_1D2;
+    /* 0x1D3 */ u8 unk_1D3;
+    /* 0x1D4 */ u8 unk_1D4;
+    /* 0x1D8 */ DoorWarp1ActionFunc actionFunc;
+    /* 0x1DC */ LightNode* unk_1DC;
+    /* 0x1E0 */ LightInfo unk_1E0;
+    /* 0x1F0 */ LightNode* unk_1F0;
+    /* 0x1F4 */ LightInfo unk_1F4;
+    /* 0x202 */ u8 unk_202;
+    /* 0x203 */ u8 unk_203;
+    /* 0x204 */ f32 unk_204;
+    /* 0x208 */ u8 unk_208;
 } DoorWarp1; // size = 0x20C
 
 extern const ActorInit Door_Warp1_InitVars;
diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.h b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h
index 9f45088a2c..9860d13ebe 100644
--- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.h
+++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h
@@ -8,9 +8,9 @@ struct EffChange;
 typedef void (*EffChangeActionFunc)(struct EffChange*, PlayState*);
 
 typedef struct EffChange {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x84];
-    /* 0x01C8 */ EffChangeActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x84];
+    /* 0x1C8 */ EffChangeActionFunc actionFunc;
 } EffChange; // size = 0x1CC
 
 extern const ActorInit Eff_Change_InitVars;
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 d214453b2e..ec864ea4d7 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
@@ -8,26 +8,26 @@ struct EffDust;
 typedef void (*EffDustActionFunc)(struct EffDust*, PlayState*);
 
 typedef struct EffDust {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ f32 distanceTraveled[64]; // For each particle. Normalized. From 0.0f to 1.0f
-    /* 0x0244 */ Vec3f initialPositions[64]; // Array of position for each dust particle.
-    /* 0x0544 */ u8 index;
-    /* 0x0545 */ u8 life; // Only considered if actor.params is 2, 3 or 4.
-    /* 0x0548 */ f32 dx; // Normalized. 0.0f to 1.0f
-    /* 0x054C */ f32 dy; // Normalized. 0.0f to 1.0f
-    /* 0x0550 */ f32 dz; // Normalized. 0.0f to 1.0f
-    /* 0x0554 */ f32 scalingFactor;
-    /* 0x0558 */ EffDustActionFunc actionFunc;
-    /* 0x055C */ ActorFunc drawFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ f32 distanceTraveled[64]; // For each particle. Normalized. From 0.0f to 1.0f
+    /* 0x244 */ Vec3f initialPositions[64]; // Array of position for each dust particle.
+    /* 0x544 */ u8 index;
+    /* 0x545 */ u8 life; // Only considered if actor.params is 2, 3 or 4.
+    /* 0x548 */ f32 dx; // Normalized. 0.0f to 1.0f
+    /* 0x54C */ f32 dy; // Normalized. 0.0f to 1.0f
+    /* 0x550 */ f32 dz; // Normalized. 0.0f to 1.0f
+    /* 0x554 */ f32 scalingFactor;
+    /* 0x558 */ EffDustActionFunc actionFunc;
+    /* 0x55C */ ActorFunc drawFunc;
 } EffDust; // size = 0x560
 
 typedef enum {
-    /* 0x00 */ EFF_DUST_TYPE_0,
-    /* 0x01 */ EFF_DUST_TYPE_1,
-    /* 0x02 */ EFF_DUST_TYPE_2,
-    /* 0x03 */ EFF_DUST_TYPE_3,
-    /* 0x04 */ EFF_DUST_TYPE_4,
-    /* 0x05 */ EFF_DUST_TYPE_5
+    /* 0x0 */ EFF_DUST_TYPE_0,
+    /* 0x1 */ EFF_DUST_TYPE_1,
+    /* 0x2 */ EFF_DUST_TYPE_2,
+    /* 0x3 */ EFF_DUST_TYPE_3,
+    /* 0x4 */ EFF_DUST_TYPE_4,
+    /* 0x5 */ EFF_DUST_TYPE_5
 } EffDustType;
 
 extern const ActorInit Eff_Dust_InitVars;
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 93fb666b36..89f8ccc687 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
@@ -8,9 +8,9 @@ struct EffKamejimaWave;
 typedef void (*EffKamejimaWaveActionFunc)(struct EffKamejimaWave*, PlayState*);
 
 typedef struct EffKamejimaWave {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x8];
-    /* 0x014C */ EffKamejimaWaveActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x8];
+    /* 0x14C */ EffKamejimaWaveActionFunc actionFunc;
 } EffKamejimaWave; // size = 0x150
 
 extern const ActorInit Eff_Kamejima_Wave_InitVars;
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 175ac5a20d..0647b0a50c 100644
--- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h
+++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h
@@ -8,9 +8,9 @@ struct EffLastday;
 typedef void (*EffLastdayActionFunc)(struct EffLastday*, PlayState*);
 
 typedef struct EffLastday {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x10];
-    /* 0x0154 */ EffLastdayActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x10];
+    /* 0x154 */ EffLastdayActionFunc actionFunc;
 } EffLastday; // size = 0x158
 
 extern const ActorInit Eff_Lastday_InitVars;
diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h
index 3df7fe2247..9c8d5946ee 100644
--- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h
+++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h
@@ -8,9 +8,9 @@ struct EffStk;
 typedef void (*EffStkActionFunc)(struct EffStk*, PlayState*);
 
 typedef struct EffStk {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x8];
-    /* 0x014C */ EffStkActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x8];
+    /* 0x14C */ EffStkActionFunc actionFunc;
 } EffStk; // size = 0x150
 
 extern const ActorInit Eff_Stk_InitVars;
diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h
index c8875a7d53..cd33b350b4 100644
--- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h
+++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h
@@ -12,8 +12,8 @@ typedef void (*ElfMsg6ActionFunc)(struct ElfMsg6*, PlayState*);
 #define ELFMSG6_SWITCHFLAG(thisx) (((thisx)->params & 0xFE00) >> 9)
 
 typedef struct ElfMsg6 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ElfMsg6ActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ElfMsg6ActionFunc actionFunc;
 } ElfMsg6; // size = 0x148
 
 extern const ActorInit Elf_Msg6_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.h b/src/overlays/actors/ovl_En_Ah/z_en_ah.h
index b1c18287f6..78872a270d 100644
--- a/src/overlays/actors/ovl_En_Ah/z_en_ah.h
+++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.h
@@ -9,33 +9,33 @@ typedef void (*EnAhActionFunc)(struct EnAh*, PlayState*);
 typedef void (*EnAhUnkFunc)(struct EnAh*, PlayState*);
 
 typedef struct EnAh {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnAhActionFunc actionFunc;
-    /* 0x018C */ EnAhUnkFunc unk_18C;
-    /* 0x0190 */ ColliderCylinder collider;
-    /* 0x01DC */ u8 unk_1DC;
-    /* 0x01E0 */ s32 unk_1E0;
-    /* 0x01E4 */ Actor* unk_1E4;
-    /* 0x01E8 */ Vec3f unk_1E8[2];
-    /* 0x0200 */ Vec3s unk_200[2];
-    /* 0x020C */ Vec3s jointTable[17];
-    /* 0x0272 */ Vec3s morphTable[17];
-    /* 0x02D8 */ u16 unk_2D8;
-    /* 0x02DA */ u16 unk_2DA;
-    /* 0x02DC */ f32 unk_2DC;
-    /* 0x02E0 */ UNK_TYPE1 unk2E0[0xC];
-    /* 0x02EC */ s16 unk_2EC;
-    /* 0x02EE */ s16 unk_2EE;
-    /* 0x02F0 */ s16 unk_2F0;
-    /* 0x02F2 */ s16 unk_2F2;
-    /* 0x02F4 */ s16 unk_2F4;
-    /* 0x02F6 */ s16 unk_2F6;
-    /* 0x02F8 */ s16 unk_2F8;
-    /* 0x02FA */ s16 unk_2FA;
-    /* 0x02FC */ s16 unk_2FC;
-    /* 0x02FE */ s16 unk_2FE;
-    /* 0x0300 */ s32 unk_300;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnAhActionFunc actionFunc;
+    /* 0x18C */ EnAhUnkFunc unk_18C;
+    /* 0x190 */ ColliderCylinder collider;
+    /* 0x1DC */ u8 unk_1DC;
+    /* 0x1E0 */ s32 unk_1E0;
+    /* 0x1E4 */ Actor* unk_1E4;
+    /* 0x1E8 */ Vec3f unk_1E8[2];
+    /* 0x200 */ Vec3s unk_200[2];
+    /* 0x20C */ Vec3s jointTable[17];
+    /* 0x272 */ Vec3s morphTable[17];
+    /* 0x2D8 */ u16 unk_2D8;
+    /* 0x2DA */ u16 unk_2DA;
+    /* 0x2DC */ f32 unk_2DC;
+    /* 0x2E0 */ UNK_TYPE1 unk2E0[0xC];
+    /* 0x2EC */ s16 unk_2EC;
+    /* 0x2EE */ s16 unk_2EE;
+    /* 0x2F0 */ s16 unk_2F0;
+    /* 0x2F2 */ s16 unk_2F2;
+    /* 0x2F4 */ s16 unk_2F4;
+    /* 0x2F6 */ s16 unk_2F6;
+    /* 0x2F8 */ s16 unk_2F8;
+    /* 0x2FA */ s16 unk_2FA;
+    /* 0x2FC */ s16 unk_2FC;
+    /* 0x2FE */ s16 unk_2FE;
+    /* 0x300 */ s32 unk_300;
 } EnAh; // size = 0x304
 
 extern const ActorInit En_Ah_InitVars;
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 a148987362..ec0446f95a 100644
--- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h
+++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h
@@ -18,36 +18,36 @@ enum {
 };
 
 typedef struct EnAkindonuts {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[28];
-    /* 0x0230 */ Vec3s morphTable[28];
-    /* 0x02D8 */ EnAkindonutsActionFunc actionFunc;
-    /* 0x02DC */ EnAkindonutsUnkFunc unk_2DC;
-    /* 0x02E0 */ ColliderCylinder collider;
-    /* 0x032C */ u16 unk_32C;
-    /* 0x0330 */ Path* path;
-    /* 0x0334 */ s32 unk_334;
-    /* 0x0338 */ s16 unk_338;
-    /* 0x033A */ s16 unk_33A;
-    /* 0x033C */ u16 unk_33C;
-    /* 0x033E */ s16 unk_33E;
-    /* 0x0340 */ f32 unk_340;
-    /* 0x0344 */ f32 unk_344;
-    /* 0x0348 */ f32 unk_348;
-    /* 0x034C */ f32 unk_34C;
-    /* 0x0350 */ s16 unk_350;
-    /* 0x0352 */ s16 unk_352;
-    /* 0x0354 */ UNK_TYPE1 unk354[0x2];
-    /* 0x0356 */ s16 unk_356;
-    /* 0x0358 */ f32 unk_358;
-    /* 0x035C */ s16 unk_35C;
-    /* 0x035E */ s16 unk_35E;
-    /* 0x0360 */ s16 cutscene;
-    /* 0x0362 */ s16 unk_362;
-    /* 0x0364 */ s16 unk_364;
-    /* 0x0366 */ s8 unk_366;
-    /* 0x0368 */ s16 unk_368;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[28];
+    /* 0x230 */ Vec3s morphTable[28];
+    /* 0x2D8 */ EnAkindonutsActionFunc actionFunc;
+    /* 0x2DC */ EnAkindonutsUnkFunc unk_2DC;
+    /* 0x2E0 */ ColliderCylinder collider;
+    /* 0x32C */ u16 unk_32C;
+    /* 0x330 */ Path* path;
+    /* 0x334 */ s32 unk_334;
+    /* 0x338 */ s16 unk_338;
+    /* 0x33A */ s16 unk_33A;
+    /* 0x33C */ u16 unk_33C;
+    /* 0x33E */ s16 unk_33E;
+    /* 0x340 */ f32 unk_340;
+    /* 0x344 */ f32 unk_344;
+    /* 0x348 */ f32 unk_348;
+    /* 0x34C */ f32 unk_34C;
+    /* 0x350 */ s16 unk_350;
+    /* 0x352 */ s16 unk_352;
+    /* 0x354 */ UNK_TYPE1 unk354[0x2];
+    /* 0x356 */ s16 unk_356;
+    /* 0x358 */ f32 unk_358;
+    /* 0x35C */ s16 unk_35C;
+    /* 0x35E */ s16 unk_35E;
+    /* 0x360 */ s16 cutscene;
+    /* 0x362 */ s16 unk_362;
+    /* 0x364 */ s16 unk_364;
+    /* 0x366 */ s8 unk_366;
+    /* 0x368 */ s16 unk_368;
 } EnAkindonuts; // size = 0x36C
 
 extern const ActorInit En_Akindonuts_InitVars;
diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.h b/src/overlays/actors/ovl_En_Al/z_en_al.h
index 42fe81ef2f..4a92743df9 100644
--- a/src/overlays/actors/ovl_En_Al/z_en_al.h
+++ b/src/overlays/actors/ovl_En_Al/z_en_al.h
@@ -10,39 +10,39 @@ typedef s32 (*EnAlUnkFunc)(struct EnAl*, PlayState*);
 typedef void (*EnAlUnkFunc2)(struct EnAl*, PlayState*);
 
 typedef struct EnAl {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnAlActionFunc actionFunc;
-    /* 0x018C */ EnAlUnkFunc2 unk_18C;
-    /* 0x0190 */ MtxF unk_190[6];
-    /* 0x0310 */ ColliderCylinder unk_310;
-    /* 0x035C */ u8 unk_35C;
-    /* 0x0360 */ s32* unk_360;
-    /* 0x0364 */ s32 unk_364;
-    /* 0x0368 */ Actor* unk_368;
-    /* 0x036C */ Vec3f unk_36C;
-    /* 0x0378 */ Vec3s unk_378;
-    /* 0x037E */ Vec3s jointTable[27];
-    /* 0x0420 */ Vec3s morphTable[27];
-    /* 0x04C2 */ u16 unk_4C2;
-    /* 0x04C4 */ u16 unk_4C4;
-    /* 0x04C8 */ f32 unk_4C8;
-    /* 0x04CC */ UNK_TYPE1 unk4CC[8];
-    /* 0x04D4 */ f32 unk_4D4;
-    /* 0x04D8 */ UNK_TYPE1 unk4D8[4];
-    /* 0x04DC */ s16 unk_4DC;
-    /* 0x04DE */ s16 unk_4DE;
-    /* 0x04E0 */ s16 unk_4E0;
-    /* 0x04E2 */ s16 unk_4E2;
-    /* 0x04E4 */ s16 unk_4E4;
-    /* 0x04E6 */ s16 unk_4E6;
-    /* 0x04E8 */ s16 unk_4E8;
-    /* 0x04EA */ s16 unk_4EA;
-    /* 0x04EC */ EnAlUnkFunc unk_4EC;
-    /* 0x04F0 */ s32 unk_4F0;
-    /* 0x04F4 */ s32 unk_4F4;
-    /* 0x04F8 */ s32 unk_4F8;
-    /* 0x04FC */ UNK_TYPE1 unk4FC[4];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnAlActionFunc actionFunc;
+    /* 0x18C */ EnAlUnkFunc2 unk_18C;
+    /* 0x190 */ MtxF unk_190[6];
+    /* 0x310 */ ColliderCylinder unk_310;
+    /* 0x35C */ u8 unk_35C;
+    /* 0x360 */ s32* unk_360;
+    /* 0x364 */ s32 unk_364;
+    /* 0x368 */ Actor* unk_368;
+    /* 0x36C */ Vec3f unk_36C;
+    /* 0x378 */ Vec3s unk_378;
+    /* 0x37E */ Vec3s jointTable[27];
+    /* 0x420 */ Vec3s morphTable[27];
+    /* 0x4C2 */ u16 unk_4C2;
+    /* 0x4C4 */ u16 unk_4C4;
+    /* 0x4C8 */ f32 unk_4C8;
+    /* 0x4CC */ UNK_TYPE1 unk4CC[8];
+    /* 0x4D4 */ f32 unk_4D4;
+    /* 0x4D8 */ UNK_TYPE1 unk4D8[4];
+    /* 0x4DC */ s16 unk_4DC;
+    /* 0x4DE */ s16 unk_4DE;
+    /* 0x4E0 */ s16 unk_4E0;
+    /* 0x4E2 */ s16 unk_4E2;
+    /* 0x4E4 */ s16 unk_4E4;
+    /* 0x4E6 */ s16 unk_4E6;
+    /* 0x4E8 */ s16 unk_4E8;
+    /* 0x4EA */ s16 unk_4EA;
+    /* 0x4EC */ EnAlUnkFunc unk_4EC;
+    /* 0x4F0 */ s32 unk_4F0;
+    /* 0x4F4 */ s32 unk_4F4;
+    /* 0x4F8 */ s32 unk_4F8;
+    /* 0x4FC */ UNK_TYPE1 unk4FC[4];
 } EnAl; // size = 0x500
 
 extern const ActorInit En_Al_InitVars;
diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h
index 50770ccfcc..79d3a81bdd 100644
--- a/src/overlays/actors/ovl_En_Am/z_en_am.h
+++ b/src/overlays/actors/ovl_En_Am/z_en_am.h
@@ -9,22 +9,22 @@ struct EnAm;
 typedef void (*EnAmActionFunc)(struct EnAm*, PlayState*);
 
 typedef struct EnAm {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[OBJECT_AM_LIMB_MAX];
-    /* 0x01DC */ Vec3s morphTable[OBJECT_AM_LIMB_MAX];
-    /* 0x0230 */ EnAmActionFunc actionFunc;
-    /* 0x0234 */ u8 textureBlend; // 0 = statue textures; 255 = enemy textures
-    /* 0x0236 */ s16 explodeTimer; // timer counting down till armos explodes
-    /* 0x0238 */ s16 returnHomeTimer; // Timer that counts down till an armos will return to its spawn position
-    /* 0x023A */ s16 unkFlag;
-    /* 0x023C */ s16 armosYaw; // Yaw of Armos
-    /* 0x0240 */ f32 speed; // Hopping speed of Armos
-    /* 0x0244 */ f32 drawDmgEffAlpha;
-    /* 0x0248 */ f32 drawDmgEffScale;
-    /* 0x024C */ Vec3f limbPos[13];
-    /* 0x02E8 */ ColliderCylinder enemyCollider; // Collider for when Armos is Hostile
-    /* 0x0334 */ ColliderCylinder interactCollider; // Collider for when an interactable Armos is docile
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[OBJECT_AM_LIMB_MAX];
+    /* 0x1DC */ Vec3s morphTable[OBJECT_AM_LIMB_MAX];
+    /* 0x230 */ EnAmActionFunc actionFunc;
+    /* 0x234 */ u8 textureBlend; // 0 = statue textures; 255 = enemy textures
+    /* 0x236 */ s16 explodeTimer; // timer counting down till armos explodes
+    /* 0x238 */ s16 returnHomeTimer; // Timer that counts down till an armos will return to its spawn position
+    /* 0x23A */ s16 unkFlag;
+    /* 0x23C */ s16 armosYaw; // Yaw of Armos
+    /* 0x240 */ f32 speed; // Hopping speed of Armos
+    /* 0x244 */ f32 drawDmgEffAlpha;
+    /* 0x248 */ f32 drawDmgEffScale;
+    /* 0x24C */ Vec3f limbPos[13];
+    /* 0x2E8 */ ColliderCylinder enemyCollider; // Collider for when Armos is Hostile
+    /* 0x334 */ ColliderCylinder interactCollider; // Collider for when an interactable Armos is docile
 } EnAm; // size = 0x380
 
 extern const ActorInit En_Am_InitVars;
diff --git a/src/overlays/actors/ovl_En_An/z_en_an.h b/src/overlays/actors/ovl_En_An/z_en_an.h
index 71eff9d4e0..c4d2dd5aef 100644
--- a/src/overlays/actors/ovl_En_An/z_en_an.h
+++ b/src/overlays/actors/ovl_En_An/z_en_an.h
@@ -8,10 +8,10 @@ struct EnAn;
 typedef void (*EnAnActionFunc)(struct EnAn*, PlayState*);
 
 typedef struct EnAn {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnAnActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x23C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ EnAnActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x23C];
 } EnAn; // size = 0x3C8
 
 extern const ActorInit En_An_InitVars;
diff --git a/src/overlays/actors/ovl_En_And/z_en_and.h b/src/overlays/actors/ovl_En_And/z_en_and.h
index 680a179dae..0ebd1a743c 100644
--- a/src/overlays/actors/ovl_En_And/z_en_and.h
+++ b/src/overlays/actors/ovl_En_And/z_en_and.h
@@ -8,10 +8,10 @@ struct EnAnd;
 typedef void (*EnAndActionFunc)(struct EnAnd*, PlayState*);
 
 typedef struct EnAnd {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnAndActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x188];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ EnAndActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x188];
 } EnAnd; // size = 0x314
 
 extern const ActorInit En_And_InitVars;
diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.h b/src/overlays/actors/ovl_En_Az/z_en_az.h
index ee141bfb3a..5c302c6f3f 100644
--- a/src/overlays/actors/ovl_En_Az/z_en_az.h
+++ b/src/overlays/actors/ovl_En_Az/z_en_az.h
@@ -8,9 +8,9 @@ struct EnAz;
 typedef void (*EnAzActionFunc)(struct EnAz*, PlayState*);
 
 typedef struct EnAz {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnAzActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x290];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnAzActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x290];
 } EnAz; // size = 0x3D8
 
 extern const ActorInit En_Az_InitVars;
diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.h b/src/overlays/actors/ovl_En_Baba/z_en_baba.h
index 8c00f10e5e..0b39fc50b3 100644
--- a/src/overlays/actors/ovl_En_Baba/z_en_baba.h
+++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.h
@@ -19,41 +19,41 @@ enum {
 };
 
 typedef struct EnBaba {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ struct EnOssan* unk_144;
-    /* 0x0148 */ EnBabaActionFunc actionFunc;
-    /* 0x014C */ UNK_TYPE1 unk14C[4];
-    /* 0x0150 */ SkelAnime skelAnime;
-    /* 0x0194 */ ColliderCylinder collider;
-    /* 0x01E0 */ u16 unk_1E0;
-    /* 0x01E2 */ u8 unk_1E2;
-    /* 0x01E4 */ Path* path;
-    /* 0x01E8 */ s16 unk_1E8;
-    /* 0x01EA */ UNK_TYPE1 unk1EA[0x1C];
-    /* 0x0206 */ Vec3s jointTable[18];
-    /* 0x0272 */ Vec3s morphTable[18];
-    /* 0x02DE */ Vec3s trackTarget;
-    /* 0x02E4 */ Vec3s headRot;
-    /* 0x02EA */ Vec3s torsoRot;
-    /* 0x02F0 */ UNK_TYPE1 unk2F0[0x12];
-    /* 0x0302 */ s16 unk_302[18];
-    /* 0x0326 */ s16 unk_326[18];
-    /* 0x034A */ UNK_TYPE1 unk34A[0xBA];
-    /* 0x0404 */ s16 unk_404;
-    /* 0x0406 */ UNK_TYPE1 unk406[4];
-    /* 0x040A */ u16 unk_40A;
-    /* 0x040C */ s32 unk_40C;
-    /* 0x0410 */ Path* timePath;
-    /* 0x0414 */ Vec3f timePathTargetPos;
-    /* 0x0420 */ f32 timePathProgress;
-    /* 0x0424 */ s32 timePathTotalTime;
-    /* 0x0428 */ s32 timePathWaypointTime;
-    /* 0x042C */ s32 timePathWaypoint;
-    /* 0x0430 */ s32 timePathElapsedTime;
-    /* 0x0434 */ u8 unk_434;
-    /* 0x0436 */ s16 timePathTimeSpeed;
-    /* 0x0438 */ s32 unk_438;
-    /* 0x043C */ s32 unk_43C;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ struct EnOssan* unk_144;
+    /* 0x148 */ EnBabaActionFunc actionFunc;
+    /* 0x14C */ UNK_TYPE1 unk14C[4];
+    /* 0x150 */ SkelAnime skelAnime;
+    /* 0x194 */ ColliderCylinder collider;
+    /* 0x1E0 */ u16 unk_1E0;
+    /* 0x1E2 */ u8 unk_1E2;
+    /* 0x1E4 */ Path* path;
+    /* 0x1E8 */ s16 unk_1E8;
+    /* 0x1EA */ UNK_TYPE1 unk1EA[0x1C];
+    /* 0x206 */ Vec3s jointTable[18];
+    /* 0x272 */ Vec3s morphTable[18];
+    /* 0x2DE */ Vec3s trackTarget;
+    /* 0x2E4 */ Vec3s headRot;
+    /* 0x2EA */ Vec3s torsoRot;
+    /* 0x2F0 */ UNK_TYPE1 unk2F0[0x12];
+    /* 0x302 */ s16 unk_302[18];
+    /* 0x326 */ s16 unk_326[18];
+    /* 0x34A */ UNK_TYPE1 unk34A[0xBA];
+    /* 0x404 */ s16 unk_404;
+    /* 0x406 */ UNK_TYPE1 unk406[4];
+    /* 0x40A */ u16 unk_40A;
+    /* 0x40C */ s32 unk_40C;
+    /* 0x410 */ Path* timePath;
+    /* 0x414 */ Vec3f timePathTargetPos;
+    /* 0x420 */ f32 timePathProgress;
+    /* 0x424 */ s32 timePathTotalTime;
+    /* 0x428 */ s32 timePathWaypointTime;
+    /* 0x42C */ s32 timePathWaypoint;
+    /* 0x430 */ s32 timePathElapsedTime;
+    /* 0x434 */ u8 unk_434;
+    /* 0x436 */ s16 timePathTimeSpeed;
+    /* 0x438 */ s32 unk_438;
+    /* 0x43C */ s32 unk_43C;
 } EnBaba; // size = 0x440
 
 extern const ActorInit En_Baba_InitVars;
diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.h b/src/overlays/actors/ovl_En_Bal/z_en_bal.h
index 3bb22cb34a..9184cfa688 100644
--- a/src/overlays/actors/ovl_En_Bal/z_en_bal.h
+++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.h
@@ -8,10 +8,10 @@ struct EnBal;
 typedef void (*EnBalActionFunc)(struct EnBal*, PlayState*);
 
 typedef struct EnBal {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x48];
-    /* 0x018C */ EnBalActionFunc actionFunc;
-    /* 0x0190 */ char unk_190[0x224];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x48];
+    /* 0x18C */ EnBalActionFunc actionFunc;
+    /* 0x190 */ char unk_190[0x224];
 } EnBal; // size = 0x3B4
 
 extern const ActorInit En_Bal_InitVars;
diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.h b/src/overlays/actors/ovl_En_Bat/z_en_bat.h
index 3a8a2e0a1d..76356e83c6 100644
--- a/src/overlays/actors/ovl_En_Bat/z_en_bat.h
+++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.h
@@ -8,9 +8,9 @@ struct EnBat;
 typedef void (*EnBatActionFunc)(struct EnBat*, PlayState*);
 
 typedef struct EnBat {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnBatActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x94];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnBatActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x94];
 } EnBat; // size = 0x1DC
 
 extern const ActorInit En_Bat_InitVars;
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 3cf0dbd511..1676a55079 100644
--- a/src/overlays/actors/ovl_En_Bee/z_en_bee.h
+++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.h
@@ -8,10 +8,10 @@ struct EnBee;
 typedef void (*EnBeeActionFunc)(struct EnBee*, PlayState*);
 
 typedef struct EnBee {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0xBC];
-    /* 0x0200 */ EnBeeActionFunc actionFunc;
-    /* 0x0204 */ char unk_204[0x84];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0xBC];
+    /* 0x200 */ EnBeeActionFunc actionFunc;
+    /* 0x204 */ char unk_204[0x84];
 } EnBee; // size = 0x288
 
 extern const ActorInit En_Bee_InitVars;
diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
index 2838727631..027c8fa31d 100644
--- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
+++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
@@ -33,26 +33,26 @@ typedef enum {
 } ObjectBigokutaLimbs;
 
 typedef struct EnBigokuta {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnBigokutaUnkFunc unkFunc; // possibly something to do with photographing
-    /* 0x0148 */ SkelAnime skelAnime;
-    /* 0x018C */ EnBigokutaActionFunc actionFunc;
-    /* 0x0190 */ u8 drawDmgEffType;
-    /* 0x0192 */ s16 timer;
-    /* 0x0194 */ s16 camId;
-    /* 0x0196 */ s16 cutscene;
-    /* 0x0198 */ Vec3s jointTable[BIGOKUTA_LIMB_MAX];
-    /* 0x0210 */ Vec3s morphTable[BIGOKUTA_LIMB_MAX];
-    /* 0x0288 */ f32 drawDmgEffAlpha;
-    /* 0x028C */ f32 drawDmgEffScale;
-    /* 0x0290 */ f32 drawDmgEffFrozenSteamScale; // only affects DRAWEFFECT_ICE
-    /* 0x0294 */ Vec3f playerPos;
-    /* 0x02A0 */ Vec3f playerHoldPos;
-    /* 0x02AC */ Vec3f camAt;
-    /* 0x02B8 */ Vec3f camEye;
-    /* 0x02C4 */ Vec3f limbPos[13];
-    /* 0x0360 */ ColliderCylinder shellCollider;
-    /* 0x03AC */ ColliderCylinder bodyCollider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnBigokutaUnkFunc unkFunc; // possibly something to do with photographing
+    /* 0x148 */ SkelAnime skelAnime;
+    /* 0x18C */ EnBigokutaActionFunc actionFunc;
+    /* 0x190 */ u8 drawDmgEffType;
+    /* 0x192 */ s16 timer;
+    /* 0x194 */ s16 camId;
+    /* 0x196 */ s16 cutscene;
+    /* 0x198 */ Vec3s jointTable[BIGOKUTA_LIMB_MAX];
+    /* 0x210 */ Vec3s morphTable[BIGOKUTA_LIMB_MAX];
+    /* 0x288 */ f32 drawDmgEffAlpha;
+    /* 0x28C */ f32 drawDmgEffScale;
+    /* 0x290 */ f32 drawDmgEffFrozenSteamScale; // only affects DRAWEFFECT_ICE
+    /* 0x294 */ Vec3f playerPos;
+    /* 0x2A0 */ Vec3f playerHoldPos;
+    /* 0x2AC */ Vec3f camAt;
+    /* 0x2B8 */ Vec3f camEye;
+    /* 0x2C4 */ Vec3f limbPos[13];
+    /* 0x360 */ ColliderCylinder shellCollider;
+    /* 0x3AC */ ColliderCylinder bodyCollider;
 } EnBigokuta; // size = 0x3F8
 
 extern const ActorInit En_Bigokuta_InitVars;
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 e845aad908..b2d01d4686 100644
--- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h
+++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h
@@ -8,12 +8,12 @@ struct EnBigpamet;
 typedef void (*EnBigpametActionFunc)(struct EnBigpamet*, PlayState*);
 
 typedef struct EnBigpamet {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x154];
-    /* 0x0298 */ EnBigpametActionFunc actionFunc;
-    /* 0x029C */ char unk_29C[0x10];
-    /* 0x02AC */ f32 unk_2AC;
-    /* 0x02B0 */ char unk_2B0[0x31C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x154];
+    /* 0x298 */ EnBigpametActionFunc actionFunc;
+    /* 0x29C */ char unk_29C[0x10];
+    /* 0x2AC */ f32 unk_2AC;
+    /* 0x2B0 */ char unk_2B0[0x31C];
 } EnBigpamet; // size = 0x5CC
 
 extern const ActorInit En_Bigpamet_InitVars;
diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h
index 54ed04c40c..33bc33badd 100644
--- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h
+++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h
@@ -8,10 +8,10 @@ struct EnBjt;
 typedef void (*EnBjtActionFunc)(struct EnBjt*, PlayState*);
 
 typedef struct EnBjt {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnBjtActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0xD0];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ EnBjtActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0xD0];
 } EnBjt; // size = 0x25C
 
 extern const ActorInit En_Bjt_InitVars;
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 4365c1f66d..538b0d8b56 100644
--- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h
+++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h
@@ -21,33 +21,33 @@ enum {
 #define ENBOMBERS_F0_0 0
 
 typedef struct EnBombers {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[21];
-    /* 0x0206 */ Vec3s morphtable[21];
-    /* 0x0284 */ EnBombersActionFunc actionFunc;
-    /* 0x0288 */ s16 unk_288;
-    /* 0x028A */ s16 unk_28A;
-    /* 0x028C */ UNK_TYPE1 unk28C[2];
-    /* 0x028E */ s16 unk_28E;
-    /* 0x0290 */ s16 unk_290;
-    /* 0x0294 */ Vec3f unk_294;
-    /* 0x02A0 */ s16 unk_2A0;
-    /* 0x02A2 */ UNK_TYPE1 unk2A2[2];
-    /* 0x02A4 */ s16 unk_2A4;
-    /* 0x02A6 */ s16 unk_2A6;
-    /* 0x02A8 */ s16 unk_2A8;
-    /* 0x02AA */ s16 unk_2AA;
-    /* 0x02AC */ s16 unk_2AC;
-    /* 0x02B0 */ f32 unk_2B0;
-    /* 0x02B4 */ f32 unk_2B4;
-    /* 0x02B8 */ s16 unk_2B8;
-    /* 0x02BA */ s16 unk_2BA;
-    /* 0x02BC */ s16 unk_2BC;
-    /* 0x02BE */ s16 unk_2BE;
-    /* 0x02C0 */ s16 unk_2C0;
-    /* 0x02C4 */ s32 unk_2C4;
-    /* 0x02C8 */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[21];
+    /* 0x206 */ Vec3s morphtable[21];
+    /* 0x284 */ EnBombersActionFunc actionFunc;
+    /* 0x288 */ s16 unk_288;
+    /* 0x28A */ s16 unk_28A;
+    /* 0x28C */ UNK_TYPE1 unk28C[2];
+    /* 0x28E */ s16 unk_28E;
+    /* 0x290 */ s16 unk_290;
+    /* 0x294 */ Vec3f unk_294;
+    /* 0x2A0 */ s16 unk_2A0;
+    /* 0x2A2 */ UNK_TYPE1 unk2A2[2];
+    /* 0x2A4 */ s16 unk_2A4;
+    /* 0x2A6 */ s16 unk_2A6;
+    /* 0x2A8 */ s16 unk_2A8;
+    /* 0x2AA */ s16 unk_2AA;
+    /* 0x2AC */ s16 unk_2AC;
+    /* 0x2B0 */ f32 unk_2B0;
+    /* 0x2B4 */ f32 unk_2B4;
+    /* 0x2B8 */ s16 unk_2B8;
+    /* 0x2BA */ s16 unk_2BA;
+    /* 0x2BC */ s16 unk_2BC;
+    /* 0x2BE */ s16 unk_2BE;
+    /* 0x2C0 */ s16 unk_2C0;
+    /* 0x2C4 */ s32 unk_2C4;
+    /* 0x2C8 */ ColliderCylinder collider;
 } EnBombers; // size = 0x314
 
 extern const ActorInit En_Bombers_InitVars;
diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h
index a5120ffcf0..a645fe2afe 100644
--- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h
+++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h
@@ -10,35 +10,35 @@ struct EnBombers2;
 typedef void (*EnBombers2ActionFunc)(struct EnBombers2*, PlayState*);
 
 typedef struct EnBombers2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x014C */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s morphTable[OBJECT_CS_LIMB_MAX];
-    /* 0x0206 */ Vec3s jointTable[OBJECT_CS_LIMB_MAX];
-    /* 0x0284 */ EnBombers2ActionFunc actionFunc;
-    /* 0x0288 */ s16 unk_288;
-    /* 0x028A */ s16 unk_28A;
-    /* 0x028C */ UNK_TYPE1 pad_28C[2];
-    /* 0x028E */ s16 unk_28E;
-    /* 0x0290 */ s16 unk_290;
-    /* 0x0292 */ UNK_TYPE1 pad_292[4];
-    /* 0x0296 */ s16 unk_296;
-    /* 0x0298 */ UNK_TYPE1 pad_298[4];
-    /* 0x029C */ Vec3f unk_29C;
-    /* 0x02A8 */ s32 unk_2A8;
-    /* 0x02AC */ u8 unk_2AC;
-    /* 0x02AE */ s16 animIndex;
-    /* 0x02B0 */ s16 cutscene;
-    /* 0x02B2 */ s16 unk_2B2;
-    /* 0x02B4 */ s16 unk_2B4;
-    /* 0x02B6 */ s16 unk_2B6;
-    /* 0x02B8 */ f32 lastAnimFrame;
-    /* 0x02BC */ s16 eyeIndex;
-    /* 0x02BE */ s16 unk_2BE;
-    /* 0x02C0 */ s16 unk_2C0;
-    /* 0x02C2 */ s16 textIdIndex;
-    /* 0x02C4 */ s16 correctDigitSlots[5];
-    /* 0x02CE */ s16 unk_2CE;  
-    /* 0x02D0 */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x14C */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s morphTable[OBJECT_CS_LIMB_MAX];
+    /* 0x206 */ Vec3s jointTable[OBJECT_CS_LIMB_MAX];
+    /* 0x284 */ EnBombers2ActionFunc actionFunc;
+    /* 0x288 */ s16 unk_288;
+    /* 0x28A */ s16 unk_28A;
+    /* 0x28C */ UNK_TYPE1 pad_28C[2];
+    /* 0x28E */ s16 unk_28E;
+    /* 0x290 */ s16 unk_290;
+    /* 0x292 */ UNK_TYPE1 pad_292[4];
+    /* 0x296 */ s16 unk_296;
+    /* 0x298 */ UNK_TYPE1 pad_298[4];
+    /* 0x29C */ Vec3f unk_29C;
+    /* 0x2A8 */ s32 unk_2A8;
+    /* 0x2AC */ u8 unk_2AC;
+    /* 0x2AE */ s16 animIndex;
+    /* 0x2B0 */ s16 cutscene;
+    /* 0x2B2 */ s16 unk_2B2;
+    /* 0x2B4 */ s16 unk_2B4;
+    /* 0x2B6 */ s16 unk_2B6;
+    /* 0x2B8 */ f32 lastAnimFrame;
+    /* 0x2BC */ s16 eyeIndex;
+    /* 0x2BE */ s16 unk_2BE;
+    /* 0x2C0 */ s16 unk_2C0;
+    /* 0x2C2 */ s16 textIdIndex;
+    /* 0x2C4 */ s16 correctDigitSlots[5];
+    /* 0x2CE */ s16 unk_2CE;  
+    /* 0x2D0 */ ColliderCylinder collider;
 } EnBombers2; // size = 0x31C
 
 extern const ActorInit En_Bombers2_InitVars;
diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
index 209f5c91a6..18a2a32ede 100644
--- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
+++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
@@ -13,17 +13,17 @@ typedef void (*EnBombfActionFunc)(struct EnBombf*, PlayState*);
 #define ENBOMBF_1 1
 
 typedef struct EnBombf {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder colliderCylinder;
-    /* 0x0190 */ ColliderJntSph colliderJntSph;
-    /* 0x01B0 */ ColliderJntSphElement colliderJntSphElements[1];
-    /* 0x01F0 */ s16 timer;
-    /* 0x01F4 */ EnBombfActionFunc actionFunc;
-    /* 0x01F8 */ s32 unk_1F8;
-    /* 0x01FC */ u8 unk_1FC;
-    /* 0x01FE */ s16 unk_1FE;
-    /* 0x0200 */ f32 unk_200;
-    /* 0x0204 */ f32 unk_204;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder colliderCylinder;
+    /* 0x190 */ ColliderJntSph colliderJntSph;
+    /* 0x1B0 */ ColliderJntSphElement colliderJntSphElements[1];
+    /* 0x1F0 */ s16 timer;
+    /* 0x1F4 */ EnBombfActionFunc actionFunc;
+    /* 0x1F8 */ s32 unk_1F8;
+    /* 0x1FC */ u8 unk_1FC;
+    /* 0x1FE */ s16 unk_1FE;
+    /* 0x200 */ f32 unk_200;
+    /* 0x204 */ f32 unk_204;
 } EnBombf; // size = 0x208
 
 extern const ActorInit En_Bombf_InitVars;
diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h
index 6e4682eb30..b247e03ea0 100644
--- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h
+++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h
@@ -11,7 +11,7 @@ typedef void (*EnBomjimaActionFunc)(struct EnBomjima*, PlayState*);
 #define ENBOMJIMA_GET_F(thisx) ((thisx)->params & 0xF)
 
 typedef struct EnBomjima {
-    /* 0x0000 */ Actor actor;
+    /* 0x000 */ Actor actor;
     /* 0x144 */ SkelAnime skelAnime;
     /* 0x188 */ Vec3s jointTable[21];
     /* 0x206 */ Vec3s morphTable[21];
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
index bbc8e68e1e..45e3618ed1 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
@@ -8,17 +8,17 @@ struct EnBoom;
 typedef void (*EnBoomActionFunc)(struct EnBoom*, PlayState*);
 
 typedef struct EnBoom {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderQuad collider;
-    /* 0x01C4 */ Actor* player;
-    /* 0x01C8 */ Actor* unk_1C8;
-    /* 0x01CC */ u8 unk_1CC;
-    /* 0x01CD */ u8 unk_1CD;
-    /* 0x01CE */ u8 unk_1CE;
-    /* 0x01CF */ s8 unk_1CF;
-    /* 0x01D0 */ s32 effectIndex;
-    /* 0x01D4 */ WeaponInfo weaponInfo;
-    /* 0x01F0 */ EnBoomActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderQuad collider;
+    /* 0x1C4 */ Actor* player;
+    /* 0x1C8 */ Actor* unk_1C8;
+    /* 0x1CC */ u8 unk_1CC;
+    /* 0x1CD */ u8 unk_1CD;
+    /* 0x1CE */ u8 unk_1CE;
+    /* 0x1CF */ s8 unk_1CF;
+    /* 0x1D0 */ s32 effectIndex;
+    /* 0x1D4 */ WeaponInfo weaponInfo;
+    /* 0x1F0 */ EnBoomActionFunc actionFunc;
 } EnBoom; // size = 0x1F4
 
 extern const ActorInit En_Boom_InitVars;
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h
index a7017a7163..0ea7fe8de4 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.h
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.h
@@ -44,26 +44,26 @@ typedef enum {
 #define ENBOX_PARAMS(type, item, chestFlag) ((((type) & 0xF) << 12) | ((item) << 5) | ((chestFlag) & 0x1F))
 
 typedef struct EnBox {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ SkelAnime skelAnime;
-    /* 0x01A0 */ s32 unk_1A0;
-    /* 0x01A4 */ UNK_TYPE1 unk_1A4[0x04];
-    /* 0x01A8 */ f32 unk_1A8;
-    /* 0x01AC */ EnBoxActionFunc actionFunc;
-    /* 0x01B0 */ Vec3s jointTable[OBJECT_BOX_CHEST_LIMB_MAX];
-    /* 0x01CE */ Vec3s morphTable[OBJECT_BOX_CHEST_LIMB_MAX];
-    /* 0x01EC */ s16 unk_1EC;
-    /* 0x01EE */ u8 movementFlags;
-    /* 0x01EF */ u8 alpha;
-    /* 0x01F0 */ u8 switchFlag;
-    /* 0x01F1 */ u8 type;
-    /* 0x01F2 */ u8 iceSmokeTimer;
-    /* 0x01F3 */ s8 unk_1F3;
-    /* 0x01F4 */ func_80867BDC_a0 unk_1F4;
-    /* 0x0218 */ s16 cutsceneIdxA;
-    /* 0x021A */ s16 cutsceneIdxB;
-    /* 0x021C */ s32 getItem;
-    /* 0x0220 */ s32 collectableFlag;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ SkelAnime skelAnime;
+    /* 0x1A0 */ s32 unk_1A0;
+    /* 0x1A4 */ UNK_TYPE1 unk_1A4[0x04];
+    /* 0x1A8 */ f32 unk_1A8;
+    /* 0x1AC */ EnBoxActionFunc actionFunc;
+    /* 0x1B0 */ Vec3s jointTable[OBJECT_BOX_CHEST_LIMB_MAX];
+    /* 0x1CE */ Vec3s morphTable[OBJECT_BOX_CHEST_LIMB_MAX];
+    /* 0x1EC */ s16 unk_1EC;
+    /* 0x1EE */ u8 movementFlags;
+    /* 0x1EF */ u8 alpha;
+    /* 0x1F0 */ u8 switchFlag;
+    /* 0x1F1 */ u8 type;
+    /* 0x1F2 */ u8 iceSmokeTimer;
+    /* 0x1F3 */ s8 unk_1F3;
+    /* 0x1F4 */ func_80867BDC_a0 unk_1F4;
+    /* 0x218 */ s16 cutsceneIdxA;
+    /* 0x21A */ s16 cutsceneIdxB;
+    /* 0x21C */ s32 getItem;
+    /* 0x220 */ s32 collectableFlag;
 } EnBox; // size = 0x224
 
 extern const ActorInit En_Box_InitVars;
diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
index 4a67a94c64..2217b86b15 100644
--- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
+++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
@@ -8,9 +8,9 @@ struct EnBubble;
 typedef void (*EnBubbleActionFunc)(struct EnBubble*, PlayState*);
 
 typedef struct EnBubble {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnBubbleActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x110];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnBubbleActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x110];
 } EnBubble; // size = 0x258
 
 extern const ActorInit En_Bubble_InitVars;
diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
index a93c0eea8e..2d7a6a0bc6 100644
--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
@@ -15,22 +15,22 @@ typedef void (*EnButteActionFunc)(struct EnButte*, PlayState*);
 #define ENBUTTE_1 1
 
 typedef struct EnButte {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderJntSph collider;
-    /* 0x0164 */ ColliderJntSphElement colldierElements[1];
-    /* 0x01A4 */ SkelAnime skelAnime;
-    /* 0x01E8 */ Vec3s jointTable[8];
-    /* 0x0218 */ Vec3s morphTable[8];
-    /* 0x0248 */ EnButteActionFunc actionFunc;
-    /* 0x024C */ s16 unk_24C;
-    /* 0x024E */ u8 unk_24E;
-    /* 0x024F */ u8 unk_24F;
-    /* 0x0250 */ u8 unk_250;
-    /* 0x0252 */ s16 unk_252;
-    /* 0x0254 */ s16 unk_254;
-    /* 0x0256 */ s16 unk_256;
-    /* 0x0258 */ s16 unk_258;
-    /* 0x025C */ f32 unk_25C;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderJntSph collider;
+    /* 0x164 */ ColliderJntSphElement colldierElements[1];
+    /* 0x1A4 */ SkelAnime skelAnime;
+    /* 0x1E8 */ Vec3s jointTable[8];
+    /* 0x218 */ Vec3s morphTable[8];
+    /* 0x248 */ EnButteActionFunc actionFunc;
+    /* 0x24C */ s16 unk_24C;
+    /* 0x24E */ u8 unk_24E;
+    /* 0x24F */ u8 unk_24F;
+    /* 0x250 */ u8 unk_250;
+    /* 0x252 */ s16 unk_252;
+    /* 0x254 */ s16 unk_254;
+    /* 0x256 */ s16 unk_256;
+    /* 0x258 */ s16 unk_258;
+    /* 0x25C */ f32 unk_25C;
 } EnButte; // size = 0x260
 
 extern const ActorInit En_Butte_InitVars;
diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h
index 79bfdeb6c1..306f410554 100644
--- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h
+++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h
@@ -9,9 +9,9 @@ struct EnCrow;
 typedef void (*EnCrowActionFunc)(struct EnCrow*, PlayState*);
 
 typedef struct EnCrow {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnCrowActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnCrowActionFunc actionFunc;
     /* 0x18C */ u8 deathMode;
     /* 0x18E */ s16 timer;
     /* 0x190 */ s16 aimRotX;
diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.h b/src/overlays/actors/ovl_En_Death/z_en_death.h
index 2441e00b5b..bc4e326bb2 100644
--- a/src/overlays/actors/ovl_En_Death/z_en_death.h
+++ b/src/overlays/actors/ovl_En_Death/z_en_death.h
@@ -8,10 +8,10 @@ struct EnDeath;
 typedef void (*EnDeathActionFunc)(struct EnDeath*, PlayState*);
 
 typedef struct EnDeath {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnDeathActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x7AC];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ EnDeathActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x7AC];
 } EnDeath; // size = 0x938
 
 extern const ActorInit En_Death_InitVars;
diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
index 19b977e092..923f336aa4 100644
--- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
+++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
@@ -8,10 +8,10 @@ struct EnDekubaba;
 typedef void (*EnDekubabaActionFunc)(struct EnDekubaba*, PlayState*);
 
 typedef struct EnDekubaba {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnDekubabaActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x290];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ EnDekubabaActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x290];
 } EnDekubaba; // size = 0x41C
 
 extern const ActorInit En_Dekubaba_InitVars;
diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h
index f0fb5ed765..e26b9a7c02 100644
--- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h
+++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h
@@ -8,9 +8,9 @@ struct EnDnh;
 typedef void (*EnDnhActionFunc)(struct EnDnh*, PlayState*);
 
 typedef struct EnDnh {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnDnhActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x74];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnDnhActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x74];
 } EnDnh; // size = 0x1BC
 
 extern const ActorInit En_Dnh_InitVars;
diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h
index cfbbbbd58d..18d525f44a 100644
--- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h
+++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h
@@ -8,9 +8,9 @@ struct EnDoorEtc;
 typedef void (*EnDoorEtcActionFunc)(struct EnDoorEtc*, PlayState*);
 
 typedef struct EnDoorEtc {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0xB4];
-    /* 0x01F8 */ EnDoorEtcActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0xB4];
+    /* 0x1F8 */ EnDoorEtcActionFunc actionFunc;
 } EnDoorEtc; // size = 0x1FC
 
 extern const ActorInit En_Door_Etc_InitVars;
diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.h b/src/overlays/actors/ovl_En_Dt/z_en_dt.h
index 2fbd228e61..78b0987891 100644
--- a/src/overlays/actors/ovl_En_Dt/z_en_dt.h
+++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.h
@@ -8,10 +8,10 @@ struct EnDt;
 typedef void (*EnDtActionFunc)(struct EnDt*, PlayState*);
 
 typedef struct EnDt {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0xF8];
-    /* 0x023C */ EnDtActionFunc actionFunc;
-    /* 0x0240 */ char unk_240[0xA0];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0xF8];
+    /* 0x23C */ EnDtActionFunc actionFunc;
+    /* 0x240 */ char unk_240[0xA0];
 } EnDt; // size = 0x2E0
 
 extern const ActorInit En_Dt_InitVars;
diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h
index 8127749381..d1222a5ebf 100644
--- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h
+++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h
@@ -8,10 +8,10 @@ struct EnEgblock;
 typedef void (*EnEgblockActionFunc)(struct EnEgblock*, PlayState*);
 
 typedef struct EnEgblock {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x5C];
-    /* 0x01A0 */ EnEgblockActionFunc actionFunc;
-    /* 0x01A4 */ char unk_1A4[0xC10];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x5C];
+    /* 0x1A0 */ EnEgblockActionFunc actionFunc;
+    /* 0x1A4 */ char unk_1A4[0xC10];
 } EnEgblock; // size = 0xDB4
 
 extern const ActorInit En_Egblock_InitVars;
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 0f8646dc63..2ee080fa3e 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
@@ -12,41 +12,41 @@ typedef void (*EnElfUnkFunc)(struct EnElf*, PlayState*);
 #define ENELF_GET_FE00(thisx) (((thisx)->params & 0xFE00) >> 9)
 
 typedef struct EnElf {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[7];
-    /* 0x01B2 */ Vec3s morphTable[7];
-    /* 0x01DC */ Color_RGBAf innerColor;
-    /* 0x01EC */ Color_RGBAf outerColor;
-    /* 0x01FC */ LightInfo lightInfoGlow;
-    /* 0x020C */ LightNode* lightNodeGlow;
-    /* 0x0210 */ LightInfo lightInfoNoGlow;
-    /* 0x0220 */ LightNode* lightNodeNoGlow;
-    /* 0x0224 */ Vec3f unk_224;
-    /* 0x0230 */ Actor* elfMsg;
-    /* 0x0234 */ Actor* unk_234;
-    /* 0x0238 */ f32 unk_238;
-    /* 0x023C */ f32 unk_23C;
-    /* 0x0240 */ f32 unk_240;
-    /* 0x0244 */ s16 unk_244;
-    /* 0x0246 */ s16 unk_246;
-    /* 0x0248 */ s16 unk_248;
-    /* 0x024A */ s16 unk_24A;
-    /* 0x024C */ s16 unk_24C;
-    /* 0x0250 */ f32 unk_250;
-    /* 0x0254 */ f32 unk_254;
-    /* 0x0258 */ s16 unk_258;
-    /* 0x025A */ u16 timer;
-    /* 0x025C */ s16 unk_25C;
-    /* 0x025E */ s16 disappearTimer;
-    /* 0x0260 */ s16 unk_260;
-    /* 0x0262 */ u16 fairyFlags;
-    /* 0x0264 */ u16 unk_264;
-    /* 0x0266 */ u16 unk_266;
-    /* 0x0268 */ u8 unk_268;
-    /* 0x0269 */ u8 unk_269;
-    /* 0x026C */ EnElfUnkFunc unk_26C;
-    /* 0x0270 */ EnElfActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[7];
+    /* 0x1B2 */ Vec3s morphTable[7];
+    /* 0x1DC */ Color_RGBAf innerColor;
+    /* 0x1EC */ Color_RGBAf outerColor;
+    /* 0x1FC */ LightInfo lightInfoGlow;
+    /* 0x20C */ LightNode* lightNodeGlow;
+    /* 0x210 */ LightInfo lightInfoNoGlow;
+    /* 0x220 */ LightNode* lightNodeNoGlow;
+    /* 0x224 */ Vec3f unk_224;
+    /* 0x230 */ Actor* elfMsg;
+    /* 0x234 */ Actor* unk_234;
+    /* 0x238 */ f32 unk_238;
+    /* 0x23C */ f32 unk_23C;
+    /* 0x240 */ f32 unk_240;
+    /* 0x244 */ s16 unk_244;
+    /* 0x246 */ s16 unk_246;
+    /* 0x248 */ s16 unk_248;
+    /* 0x24A */ s16 unk_24A;
+    /* 0x24C */ s16 unk_24C;
+    /* 0x250 */ f32 unk_250;
+    /* 0x254 */ f32 unk_254;
+    /* 0x258 */ s16 unk_258;
+    /* 0x25A */ u16 timer;
+    /* 0x25C */ s16 unk_25C;
+    /* 0x25E */ s16 disappearTimer;
+    /* 0x260 */ s16 unk_260;
+    /* 0x262 */ u16 fairyFlags;
+    /* 0x264 */ u16 unk_264;
+    /* 0x266 */ u16 unk_266;
+    /* 0x268 */ u8 unk_268;
+    /* 0x269 */ u8 unk_269;
+    /* 0x26C */ EnElfUnkFunc unk_26C;
+    /* 0x270 */ EnElfActionFunc actionFunc;
 } EnElf; // size = 0x274
 
 extern const ActorInit En_Elf_InitVars;
diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h
index 46862f2c6c..cab77c8a41 100644
--- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h
+++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h
@@ -10,15 +10,15 @@ struct EnElfbub;
 typedef void (*EnElfbubActionFunc)(struct EnElfbub*, PlayState*);
 
 typedef struct EnElfbub {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ s16 zRot;
-    /* 0x0192 */ s16 zRotDelta;
-    /* 0x0194 */ s16 oscillationAngle;
-    /* 0x0196 */ s16 popTimer;
-    /* 0x0198 */ f32 xScale;
-    /* 0x019C */ f32 xyScale;
-    /* 0x01A0 */ EnElfbubActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ s16 zRot;
+    /* 0x192 */ s16 zRotDelta;
+    /* 0x194 */ s16 oscillationAngle;
+    /* 0x196 */ s16 popTimer;
+    /* 0x198 */ f32 xScale;
+    /* 0x19C */ f32 xyScale;
+    /* 0x1A0 */ EnElfbubActionFunc actionFunc;
 } EnElfbub; // size = 0x1A4
 
 extern const ActorInit En_Elfbub_InitVars;
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 bb3a86a403..8536b806e7 100644
--- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
+++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
@@ -19,13 +19,13 @@ enum {
 };
 
 typedef struct EnElfgrp {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ s16 unk_144;
-    /* 0x0146 */ u8 unk_146;
-    /* 0x0147 */ u8 unk_147;
-    /* 0x0148 */ s8 unk_148;
-    /* 0x014A */ u16 unk_14A;
-    /* 0x014C */ EnElfgrpActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ s16 unk_144;
+    /* 0x146 */ u8 unk_146;
+    /* 0x147 */ u8 unk_147;
+    /* 0x148 */ s8 unk_148;
+    /* 0x14A */ u16 unk_14A;
+    /* 0x14C */ EnElfgrpActionFunc actionFunc;
 } EnElfgrp; // size = 0x150
 
 extern const ActorInit En_Elfgrp_InitVars;
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 f9e1e9647e..d625f21519 100644
--- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
+++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
@@ -8,13 +8,13 @@ struct EnEncount1;
 typedef void (*EnEncount1ActionFunc)(struct EnEncount1*, PlayState*);
 
 typedef struct EnEncount1 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnEncount1ActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x6];
-    /* 0x014E */ s16 unk_14E;
-    /* 0x0150 */ char unk_150[0xA];
-    /* 0x015A */ s16 unk_15A;
-    /* 0x015C */ char unk_15C[0x8];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnEncount1ActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x6];
+    /* 0x14E */ s16 unk_14E;
+    /* 0x150 */ char unk_150[0xA];
+    /* 0x15A */ s16 unk_15A;
+    /* 0x15C */ char unk_15C[0x8];
 } EnEncount1; // size = 0x164
 
 extern const ActorInit En_Encount1_InitVars;
diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h
index 81391df304..2b0bb59d8e 100644
--- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h
+++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h
@@ -8,9 +8,9 @@ struct EnEncount3;
 typedef void (*EnEncount3ActionFunc)(struct EnEncount3*, PlayState*);
 
 typedef struct EnEncount3 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnEncount3ActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x84];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnEncount3ActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x84];
 } EnEncount3; // size = 0x1CC
 
 extern const ActorInit En_Encount3_InitVars;
diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h
index a2b50e085c..013c907a5a 100644
--- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h
+++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h
@@ -8,12 +8,12 @@ struct EnEncount4;
 typedef void (*EnEncount4ActionFunc)(struct EnEncount4*, PlayState*);
 
 typedef struct EnEncount4 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnEncount4ActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x4];
-    /* 0x014C */ s16 unk_14C;
-    /* 0x014E */ s16 unk_14E;
-    /* 0x0150 */ char unk_150[0x8];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnEncount4ActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x4];
+    /* 0x14C */ s16 unk_14C;
+    /* 0x14E */ s16 unk_14E;
+    /* 0x150 */ char unk_150[0x8];
 } EnEncount4; // size = 0x158
 
 extern const ActorInit En_Encount4_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h
index 6f00783d5d..f30d09a7a2 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h
+++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h
@@ -8,19 +8,19 @@ struct EnEndingHero6;
 typedef void (*EnEndingHero6ActionFunc)(struct EnEndingHero6*, PlayState*);
 
 typedef struct EnEndingHero6 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[20];
-    /* 0x0200 */ Vec3s morphTable[20];
-    /* 0x0278 */ EnEndingHero6ActionFunc actionFunc;
-    /* 0x027C */ s32 animIndex;
-    /* 0x0280 */ s32 npcIndex;
-    /* 0x0284 */ s8 objectIndex;
-    /* 0x0286 */ s16 timer;
-    /* 0x0288 */ s16 blinkTimer;
-    /* 0x028A */ s16 eyeState;
-    /* 0x028C */ f32 frameCount;
-    /* 0x0290 */ s16 isIdle;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[20];
+    /* 0x200 */ Vec3s morphTable[20];
+    /* 0x278 */ EnEndingHero6ActionFunc actionFunc;
+    /* 0x27C */ s32 animIndex;
+    /* 0x280 */ s32 npcIndex;
+    /* 0x284 */ s8 objectIndex;
+    /* 0x286 */ s16 timer;
+    /* 0x288 */ s16 blinkTimer;
+    /* 0x28A */ s16 eyeState;
+    /* 0x28C */ f32 frameCount;
+    /* 0x290 */ s16 isIdle;
 } EnEndingHero6; // size = 0x294
 
 extern const ActorInit En_Ending_Hero6_InitVars;
diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.h b/src/overlays/actors/ovl_En_Famos/z_en_famos.h
index 0478f70df6..c446c21131 100644
--- a/src/overlays/actors/ovl_En_Famos/z_en_famos.h
+++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.h
@@ -9,10 +9,10 @@ struct EnFamos;
 typedef void (*EnFamosActionFunc)(struct EnFamos*, PlayState*);
 
 typedef struct EnFamosRock {
-    /* 00 */ Vec3f pos;
-    /* 0C */ Vec3f velocity;
-    /* 18 */ Vec3s rotation;
-    /* 20 */ f32   scale;
+    /* 0x00 */ Vec3f pos;
+    /* 0x0C */ Vec3f velocity;
+    /* 0x18 */ Vec3s rotation;
+    /* 0x20 */ f32   scale;
 } EnFamosRock; // size = 0x24
 
 #define GET_FAMOS_PATH(thisx) (thisx->params)
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 1dfb30f04f..6440812ca0 100644
--- a/src/overlays/actors/ovl_En_Fg/z_en_fg.h
+++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.h
@@ -9,32 +9,32 @@ typedef void (*EnFgActionFunc)(struct EnFg*, PlayState*);
 
 // Based on the envColor data. Related to params but mostly unused.
 typedef enum {
-    /* 0x00 */ FG_YELLOW,
-    /* 0x01 */ FG_CYAN,
-    /* 0x02 */ FG_PINK,
-    /* 0x03 */ FG_BLUE,
-    /* 0x04 */ FG_WHITE,
-    /* 0x05 */ FG_BLACK, // All frogs are blackened when hit by an explosion
+    /* 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
 } FrogType;
 
 typedef enum {
-    /* 0x00 */ FG_DMGEFFECT_NONE,
-    /* 0x01 */ FG_DMGEFFECT_EXPLOSION, // Bomb or bombchu, not powderkeg
-    /* 0x02 */ FG_DMGEFFECT_DEKUSTICK,
-    /* 0x03 */ FG_DMGEFFECT_HOOKSHOT,
-    /* 0x04 */ FG_DMGEFFECT_ARROW,
-    /* 0x05 */ FG_DMGEFFECT_ICEARROW,
+    /* 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,
 } FrogDamageEffect;
 
 typedef struct {
-    /* 0x0000 */ u8 type;
-    /* 0x0001 */ u8 timer;
-    /* 0x0004 */ f32 xyScale;
-    /* 0x0008 */ UNK_TYPE1 unk_08[0xC];
-    /* 0x0014 */ Vec3f pos;
-    /* 0x0020 */ Vec3f unk_20; // Likely acceleration, set to 0 but unused
-    /* 0x002C */ Vec3f velocity;
-    /* 0x0038 */ UNK_TYPE1 unk_38[0x4];
+    /* 0x00 */ u8 type;
+    /* 0x01 */ u8 timer;
+    /* 0x04 */ f32 xyScale;
+    /* 0x08 */ UNK_TYPE1 unk_08[0xC];
+    /* 0x14 */ Vec3f pos;
+    /* 0x20 */ Vec3f unk_20; // Likely acceleration, set to 0 but unused
+    /* 0x2C */ Vec3f velocity;
+    /* 0x38 */ UNK_TYPE1 unk_38[0x4];
 } EnFgEffectDust; // size = 0x3C
 
 typedef struct EnFg {
diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h
index beb3438b9e..5af536dbb0 100644
--- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h
+++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h
@@ -9,56 +9,56 @@ typedef void (*EnFishingActionFunc)(struct EnFishing*, PlayState*);
 
 typedef struct EnFishing {
     /* 0x000 */ Actor actor;
-    /* 0x0144 */ UNK_TYPE1 unk_144[0x004];
-    /* 0x0148 */ u8 unk_148;
-    /* 0x0149 */ u8 unk_149;
-    /* 0x014A */ u8 unk_14A;
-    /* 0x014C */ s16 unk_14C;
-    /* 0x014E */ u8 unk_14E;
-    /* 0x014F */ u8 unk_14F;
-    /* 0x0150 */ s16 unk_150;
-    /* 0x0152 */ s16 unk_152;
-    /* 0x0154 */ s16 unk_154;
-    /* 0x0156 */ s16 unk_156;
-    /* 0x0158 */ s16 unk_158;
-    /* 0x015A */ s16 unk_15A;
-    /* 0x015C */ s16 unk_15C;
-    /* 0x015E */ s16 unk_15E;
-    /* 0x0160 */ s16 unk_160;
-    /* 0x0162 */ s16 unk_162;
-    /* 0x0164 */ s16 unk_164;
-    /* 0x0166 */ s16 unk_166;
-    /* 0x0168 */ s16 unk_168;
-    /* 0x016A */ s16 unk_16A;
-    /* 0x016C */ s16 unk_16C;
-    /* 0x016E */ s16 unk_16E;
-    /* 0x0170 */ s16 unk_170;
-    /* 0x0172 */ s16 unk_172[4];
-    /* 0x017C */ f32 unk_17C;
-    /* 0x0180 */ f32 unk_180;
-    /* 0x0184 */ f32 unk_184;
-    /* 0x0188 */ f32 unk_188;
-    /* 0x018C */ f32 unk_18C;
-    /* 0x0190 */ f32 unk_190;
-    /* 0x0194 */ f32 unk_194;
-    /* 0x0198 */ s16 unk_198;
-    /* 0x019A */ s16 unk_19A;
-    /* 0x019C */ s16 unk_19C;
-    /* 0x01A0 */ f32 unk_1A0;
-    /* 0x01A4 */ f32 unk_1A4;
-    /* 0x01A8 */ f32 unk_1A8;
-    /* 0x01AC */ Vec3f unk_1AC;
-    /* 0x01B8 */ Vec3f fishMouthPos;
-    /* 0x01C4 */ s16 unk_1C4[3];
-    /* 0x01CA */ u8 unk_1CA;
-    /* 0x01CB */ u8 unk_1CB;
-    /* 0x01CC */ u8 unk_1CC;
-    /* 0x01CD */ u8 unk_1CD;
-    /* 0x01D0 */ SkelAnime skelAnime;
-    /* 0x0214 */ LightNode* lightNode;
-    /* 0x0218 */ LightInfo lightInfo;
-    /* 0x0228 */ ColliderJntSph collider;
-    /* 0x0248 */ ColliderJntSphElement colliderElements[12];
+    /* 0x144 */ UNK_TYPE1 unk_144[0x004];
+    /* 0x148 */ u8 unk_148;
+    /* 0x149 */ u8 unk_149;
+    /* 0x14A */ u8 unk_14A;
+    /* 0x14C */ s16 unk_14C;
+    /* 0x14E */ u8 unk_14E;
+    /* 0x14F */ u8 unk_14F;
+    /* 0x150 */ s16 unk_150;
+    /* 0x152 */ s16 unk_152;
+    /* 0x154 */ s16 unk_154;
+    /* 0x156 */ s16 unk_156;
+    /* 0x158 */ s16 unk_158;
+    /* 0x15A */ s16 unk_15A;
+    /* 0x15C */ s16 unk_15C;
+    /* 0x15E */ s16 unk_15E;
+    /* 0x160 */ s16 unk_160;
+    /* 0x162 */ s16 unk_162;
+    /* 0x164 */ s16 unk_164;
+    /* 0x166 */ s16 unk_166;
+    /* 0x168 */ s16 unk_168;
+    /* 0x16A */ s16 unk_16A;
+    /* 0x16C */ s16 unk_16C;
+    /* 0x16E */ s16 unk_16E;
+    /* 0x170 */ s16 unk_170;
+    /* 0x172 */ s16 unk_172[4];
+    /* 0x17C */ f32 unk_17C;
+    /* 0x180 */ f32 unk_180;
+    /* 0x184 */ f32 unk_184;
+    /* 0x188 */ f32 unk_188;
+    /* 0x18C */ f32 unk_18C;
+    /* 0x190 */ f32 unk_190;
+    /* 0x194 */ f32 unk_194;
+    /* 0x198 */ s16 unk_198;
+    /* 0x19A */ s16 unk_19A;
+    /* 0x19C */ s16 unk_19C;
+    /* 0x1A0 */ f32 unk_1A0;
+    /* 0x1A4 */ f32 unk_1A4;
+    /* 0x1A8 */ f32 unk_1A8;
+    /* 0x1AC */ Vec3f unk_1AC;
+    /* 0x1B8 */ Vec3f fishMouthPos;
+    /* 0x1C4 */ s16 unk_1C4[3];
+    /* 0x1CA */ u8 unk_1CA;
+    /* 0x1CB */ u8 unk_1CB;
+    /* 0x1CC */ u8 unk_1CC;
+    /* 0x1CD */ u8 unk_1CD;
+    /* 0x1D0 */ SkelAnime skelAnime;
+    /* 0x214 */ LightNode* lightNode;
+    /* 0x218 */ LightInfo lightInfo;
+    /* 0x228 */ ColliderJntSph collider;
+    /* 0x248 */ ColliderJntSphElement colliderElements[12];
 } EnFishing; // size = 0x548
 
 extern const ActorInit En_Fishing_InitVars;
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 47b3af3d27..c4500973ff 100644
--- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
+++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
@@ -19,21 +19,21 @@ enum {
 };
 
 typedef struct EnFloormas {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnFloormasActionFunc actionFunc;
-    /* 0x018C */ u8 drawDmgEffType;
-    /* 0x018E */ s16 unk_18E;
-    /* 0x0190 */ s16 unk_190;
-    /* 0x0192 */ s16 unk_192;
-    /* 0x0194 */ s16 unk_194;
-    /* 0x0196 */ Vec3s jointTable[WALLMASTER_LIMB_MAX];
-    /* 0x022C */ Vec3s morphTable[WALLMASTER_LIMB_MAX];
-    /* 0x02C4 */ f32 drawDmgEffAlpha;
-    /* 0x02C8 */ f32 drawDmgEffScale;
-    /* 0x02CC */ f32 drawDmgEffFrozenSteamScale;
-    /* 0x02D0 */ Vec3f limbPos[11];
-    /* 0x0354 */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnFloormasActionFunc actionFunc;
+    /* 0x18C */ u8 drawDmgEffType;
+    /* 0x18E */ s16 unk_18E;
+    /* 0x190 */ s16 unk_190;
+    /* 0x192 */ s16 unk_192;
+    /* 0x194 */ s16 unk_194;
+    /* 0x196 */ Vec3s jointTable[WALLMASTER_LIMB_MAX];
+    /* 0x22C */ Vec3s morphTable[WALLMASTER_LIMB_MAX];
+    /* 0x2C4 */ f32 drawDmgEffAlpha;
+    /* 0x2C8 */ f32 drawDmgEffScale;
+    /* 0x2CC */ f32 drawDmgEffFrozenSteamScale;
+    /* 0x2D0 */ Vec3f limbPos[11];
+    /* 0x354 */ ColliderCylinder collider;
 } EnFloormas; // size = 0x3A0
 
 extern const ActorInit En_Floormas_InitVars;
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
index 76c46181db..9ed3b69c5a 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
@@ -23,33 +23,33 @@ typedef struct {
 } EnFuUnkStruct; // size = 0x38
 
 typedef struct EnFu {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ EnFuActionFunc actionFunc;
-    /* 0x01D8 */ Vec3s jointTable[21];
-    /* 0x0256 */ Vec3s morphTable[21];
-    /* 0x02D4 */ BgFuMizu* unk_2D4;
-    /* 0x02D8 */ EnFuUnkStruct unk_2D8[10];
-    /* 0x0508 */ Vec3f unk_508;
-    /* 0x0514 */ Vec3f unk_514;
-    /* 0x0520 */ s32 unk_520;
-    /* 0x0524 */ s16 unk_524[3];
-    /* 0x052A */ s16 unk_52A[3];
-    /* 0x0530 */ char unk530[0x8];
-    /* 0x0538 */ Vec3s* unk_538;
-    /* 0x053C */ s16 unk_53C;
-    /* 0x053E */ s16 unk_53E;
-    /* 0x0540 */ s16 unk_540;
-    /* 0x0542 */ s16 unk_542;
-    /* 0x0544 */ s16 unk_544;
-    /* 0x0546 */ s16 unk_546;
-    /* 0x0548 */ s16 unk_548;
-    /* 0x054A */ s16 unk_54A;
-    /* 0x054C */ s16 unk_54C;
-    /* 0x054E */ s16 unk_54E;
-    /* 0x0550 */ s16 unk_550;
-    /* 0x0552 */ u16 unk_552;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ EnFuActionFunc actionFunc;
+    /* 0x1D8 */ Vec3s jointTable[21];
+    /* 0x256 */ Vec3s morphTable[21];
+    /* 0x2D4 */ BgFuMizu* unk_2D4;
+    /* 0x2D8 */ EnFuUnkStruct unk_2D8[10];
+    /* 0x508 */ Vec3f unk_508;
+    /* 0x514 */ Vec3f unk_514;
+    /* 0x520 */ s32 unk_520;
+    /* 0x524 */ s16 unk_524[3];
+    /* 0x52A */ s16 unk_52A[3];
+    /* 0x530 */ char unk530[0x8];
+    /* 0x538 */ Vec3s* unk_538;
+    /* 0x53C */ s16 unk_53C;
+    /* 0x53E */ s16 unk_53E;
+    /* 0x540 */ s16 unk_540;
+    /* 0x542 */ s16 unk_542;
+    /* 0x544 */ s16 unk_544;
+    /* 0x546 */ s16 unk_546;
+    /* 0x548 */ s16 unk_548;
+    /* 0x54A */ s16 unk_54A;
+    /* 0x54C */ s16 unk_54C;
+    /* 0x54E */ s16 unk_54E;
+    /* 0x550 */ s16 unk_550;
+    /* 0x552 */ u16 unk_552;
 } EnFu; // size = 0x554
 
 extern const ActorInit En_Fu_InitVars;
diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h
index fa38ef3d71..909e7b24d8 100644
--- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h
+++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h
@@ -18,13 +18,13 @@ typedef struct {
 } EnFuKagoStruct; // size = 0x40
 
 typedef struct EnFuKago {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ EnFuKagoActionFunc actionFunc;
-    /* 0x0160 */ ColliderSphere collider;
-    /* 0x01B8 */ EnFuKagoStruct unk_1B8[6];
-    /* 0x0338 */ s16 unk_338;
-    /* 0x033A */ s16 unk_33A;
-    /* 0x033C */ s16 unk_33C;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ EnFuKagoActionFunc actionFunc;
+    /* 0x160 */ ColliderSphere collider;
+    /* 0x1B8 */ EnFuKagoStruct unk_1B8[6];
+    /* 0x338 */ s16 unk_338;
+    /* 0x33A */ s16 unk_33A;
+    /* 0x33C */ s16 unk_33C;
 } EnFuKago; // size = 0x340
 
 extern const ActorInit En_Fu_Kago_InitVars;
diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h
index cb3acd4c0f..d24ac91d56 100644
--- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h
+++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h
@@ -19,19 +19,19 @@ typedef struct {
 } EnFuMatoStruct; // size = 0x34
 
 typedef struct EnFuMato {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ EnFuMatoActionFunc actionFunc;
-    /* 0x0160 */ ColliderSphere collider;
-    /* 0x01B8 */ EnFuMatoStruct unk_1B8[6];
-    /* 0x02F0 */ s32 unk_2F0;
-    /* 0x02F4 */ s32 unk_2F4;
-    /* 0x02F8 */ Vec3s* unk_2F8;
-    /* 0x02FC */ Vec3s unk_2FC;
-    /* 0x0302 */ s16 unk_302;
-    /* 0x0304 */ s16 unk_304;
-    /* 0x0306 */ UNK_TYPE1 unk306[2];
-    /* 0x0308 */ s16 unk_308;
-    /* 0x030A */ s16 unk_30A;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ EnFuMatoActionFunc actionFunc;
+    /* 0x160 */ ColliderSphere collider;
+    /* 0x1B8 */ EnFuMatoStruct unk_1B8[6];
+    /* 0x2F0 */ s32 unk_2F0;
+    /* 0x2F4 */ s32 unk_2F4;
+    /* 0x2F8 */ Vec3s* unk_2F8;
+    /* 0x2FC */ Vec3s unk_2FC;
+    /* 0x302 */ s16 unk_302;
+    /* 0x304 */ s16 unk_304;
+    /* 0x306 */ UNK_TYPE1 unk306[2];
+    /* 0x308 */ s16 unk_308;
+    /* 0x30A */ s16 unk_30A;
 } EnFuMato; // size = 0x30C
 
 extern const ActorInit En_Fu_Mato_InitVars;
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 1b8f943687..c9db31b75f 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 {
-    /* 0x00 */ GAKUFU_TERMINA_FIELD,   
-    /* 0x01 */ GAKUFU_MILK_BAR
+    /* 0x0 */ GAKUFU_TERMINA_FIELD,   
+    /* 0x1 */ GAKUFU_MILK_BAR
 } GakufuType;
 
 typedef struct EnGakufu {
diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
index 23cf30641b..a3c04a93a9 100644
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
@@ -8,9 +8,9 @@ struct EnGe1;
 typedef void (*EnGe1ActionFunc)(struct EnGe1*, PlayState*);
 
 typedef struct EnGe1 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x184];
-    /* 0x02C8 */ EnGe1ActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x184];
+    /* 0x2C8 */ EnGe1ActionFunc actionFunc;
 } EnGe1; // size = 0x2CC
 
 extern const ActorInit En_Ge1_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
index 5596f0b1e5..f0d97869df 100644
--- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
+++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
@@ -8,9 +8,9 @@ struct EnGe2;
 typedef void (*EnGe2ActionFunc)(struct EnGe2*, PlayState*);
 
 typedef struct EnGe2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x1C4];
-    /* 0x0308 */ EnGe2ActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x1C4];
+    /* 0x308 */ EnGe2ActionFunc actionFunc;
 } EnGe2; // size = 0x30C
 
 extern const ActorInit En_Ge2_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
index 018d99a674..10912aae08 100644
--- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
+++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
@@ -8,9 +8,9 @@ struct EnGe3;
 typedef void (*EnGe3ActionFunc)(struct EnGe3*, PlayState*);
 
 typedef struct EnGe3 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x1D8];
-    /* 0x031C */ EnGe3ActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x1D8];
+    /* 0x31C */ EnGe3ActionFunc actionFunc;
 } EnGe3; // size = 0x320
 
 extern const ActorInit En_Ge3_InitVars;
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 4a0d361c36..421168e995 100644
--- a/src/overlays/actors/ovl_En_Gg/z_en_gg.h
+++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.h
@@ -24,37 +24,37 @@ typedef struct EnGgStruct {
 } EnGgStruct; // size == 0x4C
 
 typedef struct EnGg {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ EnGgActionFunc actionFunc;
-    /* 0x01D8 */ Vec3s unk_1D8;
-    /* 0x01DE */ Vec3s unk_1DE;
-    /* 0x01E4 */ Vec3s jointTable[20];
-    /* 0x025C */ Vec3s morphTable[20];
-    /* 0x02D4 */ UNK_TYPE1 unk_2D4[0x6];
-    /* 0x02DA */ u8 unk_2DA;
-    /* 0x02DB */ u8 unk_2DB;
-    /* 0x02DC */ s16 unk_2DC;
-    /* 0x02DE */ UNK_TYPE1 unk2DE[4];
-    /* 0x02E2 */ s16 unk_2E2;
-    /* 0x02E4 */ s16 unk_2E4;
-    /* 0x02E6 */ s16 unk_2E6;
-    /* 0x02E8 */ s16 unk_2E8;
-    /* 0x02EA */ UNK_TYPE1 unk2EA[0x1A];
-    /* 0x0304 */ s16 unk_304;
-    /* 0x0306 */ u8 unk_306;
-    /* 0x0307 */ u8 unk_307;
-    /* 0x0308 */ u8 unk_308;
-    /* 0x0309 */ u8 unk_309;
-    /* 0x030A */ s16 unk_30A;
-    /* 0x030C */ UNK_TYPE1 unk30C[4];
-    /* 0x0310 */ f32 unk_310;
-    /* 0x0314 */ UNK_TYPE1 unk314[0xC];
-    /* 0x0320 */ Vec3f unk_320;
-    /* 0x032C */ Vec3f unk_32C;
-    /* 0x0338 */ Vec3f unk_338;
-    /* 0x0344 */ EnGgStruct unk_344;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ EnGgActionFunc actionFunc;
+    /* 0x1D8 */ Vec3s unk_1D8;
+    /* 0x1DE */ Vec3s unk_1DE;
+    /* 0x1E4 */ Vec3s jointTable[20];
+    /* 0x25C */ Vec3s morphTable[20];
+    /* 0x2D4 */ UNK_TYPE1 unk_2D4[0x6];
+    /* 0x2DA */ u8 unk_2DA;
+    /* 0x2DB */ u8 unk_2DB;
+    /* 0x2DC */ s16 unk_2DC;
+    /* 0x2DE */ UNK_TYPE1 unk2DE[4];
+    /* 0x2E2 */ s16 unk_2E2;
+    /* 0x2E4 */ s16 unk_2E4;
+    /* 0x2E6 */ s16 unk_2E6;
+    /* 0x2E8 */ s16 unk_2E8;
+    /* 0x2EA */ UNK_TYPE1 unk2EA[0x1A];
+    /* 0x304 */ s16 unk_304;
+    /* 0x306 */ u8 unk_306;
+    /* 0x307 */ u8 unk_307;
+    /* 0x308 */ u8 unk_308;
+    /* 0x309 */ u8 unk_309;
+    /* 0x30A */ s16 unk_30A;
+    /* 0x30C */ UNK_TYPE1 unk30C[4];
+    /* 0x310 */ f32 unk_310;
+    /* 0x314 */ UNK_TYPE1 unk314[0xC];
+    /* 0x320 */ Vec3f unk_320;
+    /* 0x32C */ Vec3f unk_32C;
+    /* 0x338 */ Vec3f unk_338;
+    /* 0x344 */ EnGgStruct unk_344;
 } EnGg; // size = 0x390
 
 extern const ActorInit En_Gg_InitVars;
diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h
index 9cf825b784..21c1f84417 100644
--- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h
+++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h
@@ -10,29 +10,29 @@ typedef void (*EnGg2ActionFunc)(struct EnGg2*, PlayState*);
 #define ENGG2_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
 
 typedef struct EnGg2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ UNK_TYPE1 unk144[0x4C];
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ EnGg2ActionFunc actionFunc;
-    /* 0x01D8 */ Path* unk_1D8;
-    /* 0x01DC */ s32 unk_1DC;
-    /* 0x01E0 */ Vec3s unk_1E0;
-    /* 0x01E6 */ Vec3s unk_1E6;
-    /* 0x01EC */ Vec3s jointTable[20];
-    /* 0x0264 */ Vec3s morphTable[20];
-    /* 0x02DC */ UNK_TYPE1 unk2DC[0x8];
-    /* 0x02E4 */ s16 unk_2E4;
-    /* 0x02E6 */ UNK_TYPE1 unk2E6[4];
-    /* 0x02EA */ s16 unk_2EA;
-    /* 0x02EC */ s16 unk_2EC;
-    /* 0x02EE */ s16 unk_2EE;
-    /* 0x02F0 */ u8 unk_2F0;
-    /* 0x02F1 */ u8 unk_2F1;
-    /* 0x02F2 */ s16 unk_2F2;
-    /* 0x02F4 */ s16 unk_2F4;
-    /* 0x02F6 */ s16 unk_2F6;
-    /* 0x02F8 */ UNK_TYPE1 unk2F8[0xC];
-    /* 0x0304 */ Vec3f unk_304;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ UNK_TYPE1 unk144[0x4C];
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ EnGg2ActionFunc actionFunc;
+    /* 0x1D8 */ Path* unk_1D8;
+    /* 0x1DC */ s32 unk_1DC;
+    /* 0x1E0 */ Vec3s unk_1E0;
+    /* 0x1E6 */ Vec3s unk_1E6;
+    /* 0x1EC */ Vec3s jointTable[20];
+    /* 0x264 */ Vec3s morphTable[20];
+    /* 0x2DC */ UNK_TYPE1 unk2DC[0x8];
+    /* 0x2E4 */ s16 unk_2E4;
+    /* 0x2E6 */ UNK_TYPE1 unk2E6[4];
+    /* 0x2EA */ s16 unk_2EA;
+    /* 0x2EC */ s16 unk_2EC;
+    /* 0x2EE */ s16 unk_2EE;
+    /* 0x2F0 */ u8 unk_2F0;
+    /* 0x2F1 */ u8 unk_2F1;
+    /* 0x2F2 */ s16 unk_2F2;
+    /* 0x2F4 */ s16 unk_2F4;
+    /* 0x2F6 */ s16 unk_2F6;
+    /* 0x2F8 */ UNK_TYPE1 unk2F8[0xC];
+    /* 0x304 */ Vec3f unk_304;
 } EnGg2; // size = 0x310
 
 extern const ActorInit En_Gg2_InitVars;
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 90cc26ffdb..cb48f591d4 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
@@ -48,63 +48,63 @@ typedef struct EnGirlA {
 } EnGirlA; // size = 0x1CC
 
 typedef enum {
-    /* 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
+    /* 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
 } EnGirlACanBuyResult;
 
 typedef enum {
-	/* 00 */ SI_POTION_RED_1,
-	/* 01 */ SI_POTION_GREEN_1,
-	/* 02 */ SI_POTION_BLUE,
-	/* 03 */ SI_FAIRY_1,
-	/* 04 */ SI_ARROWS_LARGE_1,
-	/* 05 */ SI_POTION_GREEN_2,
-	/* 06 */ SI_SHIELD_HERO_1,
-	/* 07 */ SI_STICK_1,
-	/* 08 */ SI_ARROWS_MEDIUM_1,
-	/* 09 */ SI_NUTS_1,
-	/* 10 */ SI_POTION_RED_2,
-	/* 11 */ SI_FAIRY_2,
-	/* 12 */ SI_ARROWS_MEDIUM_2,
-	/* 13 */ SI_ARROWS_LARGE_2,
-	/* 14 */ SI_POTION_GREEN_3,
-	/* 15 */ SI_NUTS_2,
-	/* 16 */ SI_STICK_2,
-	/* 17 */ SI_SHIELD_HERO_2,
-	/* 18 */ SI_POTION_RED_3,
-	/* 19 */ SI_MASK_ALL_NIGHT,
-	/* 20 */ SI_BOMB_BAG_20_1,
-	/* 21 */ SI_BOMB_BAG_30_1,
-	/* 22 */ SI_BOMB_BAG_40,
-	/* 23 */ SI_BOMB_BAG_20_2,
-	/* 24 */ SI_BOMB_BAG_30_2,
-	/* 25 */ SI_BOMBCHU,
-	/* 26 */ SI_BOMB_1,
-	/* 27 */ SI_SHIELD_HERO_3,
-	/* 28 */ SI_ARROWS_SMALL_1,
-	/* 29 */ SI_POTION_RED_4,
-	/* 30 */ SI_BOMB_2,
-	/* 31 */ SI_ARROWS_SMALL_2,
-	/* 32 */ SI_POTION_RED_5,
-	/* 33 */ SI_BOMB_3,
-	/* 34 */ SI_ARROWS_SMALL_3,
-	/* 35 */ SI_POTION_RED_6,
-	/* 36 */ SI_BOTTLE,
-	/* 37 */ SI_SWORD_GREAT_FAIRY,
-	/* 38 */ SI_SWORD_KOKIRI,
-	/* 39 */ SI_SWORD_RAZOR,
-	/* 40 */ SI_SWORD_GILDED,
-	/* 41 */ SI_SHIELD_HERO_4,
-	/* 42 */ SI_SHIELD_MIRROR,
-    /* 43 */ SI_MAX
+    /* 0x00 */ SI_POTION_RED_1,
+    /* 0x01 */ SI_POTION_GREEN_1,
+    /* 0x02 */ SI_POTION_BLUE,
+    /* 0x03 */ SI_FAIRY_1,
+    /* 0x04 */ SI_ARROWS_LARGE_1,
+    /* 0x05 */ SI_POTION_GREEN_2,
+    /* 0x06 */ SI_SHIELD_HERO_1,
+    /* 0x07 */ SI_STICK_1,
+    /* 0x08 */ SI_ARROWS_MEDIUM_1,
+    /* 0x09 */ SI_NUTS_1,
+    /* 0x0A */ SI_POTION_RED_2,
+    /* 0x0B */ SI_FAIRY_2,
+    /* 0x0C */ SI_ARROWS_MEDIUM_2,
+    /* 0x0D */ SI_ARROWS_LARGE_2,
+    /* 0x0E */ SI_POTION_GREEN_3,
+    /* 0x0F */ SI_NUTS_2,
+    /* 0x10 */ SI_STICK_2,
+    /* 0x11 */ SI_SHIELD_HERO_2,
+    /* 0x12 */ SI_POTION_RED_3,
+    /* 0x13 */ SI_MASK_ALL_NIGHT,
+    /* 0x14 */ SI_BOMB_BAG_20_1,
+    /* 0x15 */ SI_BOMB_BAG_30_1,
+    /* 0x16 */ SI_BOMB_BAG_40,
+    /* 0x17 */ SI_BOMB_BAG_20_2,
+    /* 0x18 */ SI_BOMB_BAG_30_2,
+    /* 0x19 */ SI_BOMBCHU,
+    /* 0x1A */ SI_BOMB_1,
+    /* 0x1B */ SI_SHIELD_HERO_3,
+    /* 0x1C */ SI_ARROWS_SMALL_1,
+    /* 0x1D */ SI_POTION_RED_4,
+    /* 0x1E */ SI_BOMB_2,
+    /* 0x1F */ SI_ARROWS_SMALL_2,
+    /* 0x20 */ SI_POTION_RED_5,
+    /* 0x21 */ SI_BOMB_3,
+    /* 0x22 */ SI_ARROWS_SMALL_3,
+    /* 0x23 */ SI_POTION_RED_6,
+    /* 0x24 */ SI_BOTTLE,
+    /* 0x25 */ SI_SWORD_GREAT_FAIRY,
+    /* 0x26 */ SI_SWORD_KOKIRI,
+    /* 0x27 */ SI_SWORD_RAZOR,
+    /* 0x28 */ SI_SWORD_GILDED,
+    /* 0x29 */ SI_SHIELD_HERO_4,
+    /* 0x2A */ SI_SHIELD_MIRROR,
+    /* 0x2B */ SI_MAX
 } EnGirlAShopItemId;
 
 extern const ActorInit En_GirlA_InitVars;
@@ -127,8 +127,8 @@ typedef struct {
 } StickDirectionPrompt; // size = 0x38
 
 typedef struct ShopItem {
-    /* 0x00 */ s16 shopItemId;
-    /* 0x02 */ Vec3s spawnPos;
-} ShopItem; // size = 0x8;
+    /* 0x0 */ s16 shopItemId;
+    /* 0x2 */ Vec3s spawnPos;
+} ShopItem; // size = 0x8
 
 #endif // Z_EN_GIRLA_H
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 d61157cca3..61610d684d 100644
--- a/src/overlays/actors/ovl_En_Gk/z_en_gk.h
+++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.h
@@ -21,39 +21,39 @@ enum {
 };
 
 typedef struct EnGk {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ EnGkActionFunc actionFunc;
-    /* 0x01D8 */ Vec3s unk_1D8;
-    /* 0x01DE */ Vec3s unk_1DE;
-    /* 0x01E4 */ u16 unk_1E4;
-    /* 0x01E8 */ Path* path;
-    /* 0x01EC */ s32 unk_1EC;
-    /* 0x01F0 */ Vec3s jointTable[20];
-    /* 0x01F0 */ Vec3s morphTable[20];
-    /* 0x02E0 */ s16 unk_2E0;
-    /* 0x02E2 */ s16 unk_2E2;
-    /* 0x02E4 */ s16 unk_2E4;
-    /* 0x02E8 */ Vec3f unk_2E8;
-    /* 0x02F4 */ Vec3f unk_2F4;
-    /* 0x0300 */ Vec3f unk_300;
-    /* 0x030C */ Vec3f unk_30C;
-    /* 0x0318 */ s16 unk_318;
-    /* 0x031A */ u8 unk_31A;
-    /* 0x031B */ u8 unk_31B;
-    /* 0x031C */ u16 unk_31C;
-    /* 0x031E */ s16 unk_31E;
-    /* 0x0320 */ s16 unk_320;
-    /* 0x0322 */ s16 unk_322;
-    /* 0x0324 */ s16 unk_324;
-    /* 0x0328 */ Vec3f unk_328;
-    /* 0x0334 */ Vec3s unk_334;
-    /* 0x033C */ Vec3f unk_33C;
-    /* 0x0348 */ Vec3s unk_348;
-    /* 0x034E */ s16 unk_34E;
-    /* 0x0350 */ s16 unk_350;
-    /* 0x0354 */ f32 unk_354;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ EnGkActionFunc actionFunc;
+    /* 0x1D8 */ Vec3s unk_1D8;
+    /* 0x1DE */ Vec3s unk_1DE;
+    /* 0x1E4 */ u16 unk_1E4;
+    /* 0x1E8 */ Path* path;
+    /* 0x1EC */ s32 unk_1EC;
+    /* 0x1F0 */ Vec3s jointTable[20];
+    /* 0x1F0 */ Vec3s morphTable[20];
+    /* 0x2E0 */ s16 unk_2E0;
+    /* 0x2E2 */ s16 unk_2E2;
+    /* 0x2E4 */ s16 unk_2E4;
+    /* 0x2E8 */ Vec3f unk_2E8;
+    /* 0x2F4 */ Vec3f unk_2F4;
+    /* 0x300 */ Vec3f unk_300;
+    /* 0x30C */ Vec3f unk_30C;
+    /* 0x318 */ s16 unk_318;
+    /* 0x31A */ u8 unk_31A;
+    /* 0x31B */ u8 unk_31B;
+    /* 0x31C */ u16 unk_31C;
+    /* 0x31E */ s16 unk_31E;
+    /* 0x320 */ s16 unk_320;
+    /* 0x322 */ s16 unk_322;
+    /* 0x324 */ s16 unk_324;
+    /* 0x328 */ Vec3f unk_328;
+    /* 0x334 */ Vec3s unk_334;
+    /* 0x33C */ Vec3f unk_33C;
+    /* 0x348 */ Vec3s unk_348;
+    /* 0x34E */ s16 unk_34E;
+    /* 0x350 */ s16 unk_350;
+    /* 0x354 */ f32 unk_354;
 } EnGk; // size = 0x358
 
 extern const ActorInit En_Gk_InitVars;
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
index ef70131adc..528352a658 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
@@ -12,68 +12,68 @@ typedef void (*EnGmUnkFunc2)(struct EnGm*, PlayState*);
 #define ENGM_GET_FF(thisx) ((thisx)->params & 0xFF)
 
 typedef struct EnGm {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnGmActionFunc actionFunc;
-    /* 0x018C */ EnGmUnkFunc2 unk_18C;
-    /* 0x0190 */ ColliderCylinder colliderCylinder;
-    /* 0x01DC */ ColliderSphere colliderSphere;
-    /* 0x0234 */ Path* timePath;
-    /* 0x0238 */ Vec3f timePathTargetPos;
-    /* 0x0244 */ f32 timePathProgress;
-    /* 0x0248 */ s32 timePathTotalTime;
-    /* 0x024C */ s32 timePathWaypointTime;
-    /* 0x0250 */ s32 timePathWaypoint;
-    /* 0x0254 */ s32 timePathElapsedTime;
-    /* 0x0258 */ u8 unk_258;
-    /* 0x0259 */ u8 unk_259;
-    /* 0x025C */ s32 unk_25C;
-    /* 0x0260 */ s8 unk_260;
-    /* 0x0261 */ s8 unk_261;
-    /* 0x0262 */ s8 unk_262;
-    /* 0x0264 */ s32* unk_264;
-    /* 0x0268 */ Actor* unk_268;
-    /* 0x026C */ UNK_TYPE1 unk26C[0xC];
-    /* 0x0278 */ Vec3f unk_278;
-    /* 0x0284 */ Vec3f unk_284;
-    /* 0x0290 */ Vec3f unk_290;
-    /* 0x029C */ Vec3f unk_29C;
-    /* 0x02A8 */ Vec3s unk_2A8;
-    /* 0x02AE */ Vec3s unk_2AE;
-    /* 0x02B4 */ Vec3s jointTable[20];
-    /* 0x032C */ Vec3s morphTable[20];
-    /* 0x03A4 */ u16 unk_3A4;
-    /* 0x03A6 */ u16 unk_3A6;
-    /* 0x03A8 */ f32 unk_3A8;
-    /* 0x03AC */ f32 unk_3AC;
-    /* 0x03B0 */ f32 unk_3B0;
-    /* 0x03B4 */ f32 unk_3B4;
-    /* 0x03B8 */ s16 unk_3B8;
-    /* 0x03BA */ s16 unk_3BA;
-    /* 0x03BC */ s16 unk_3BC;
-    /* 0x03BE */ s16 unk_3BE;
-    /* 0x03C0 */ s16 unk_3C0;
-    /* 0x03C2 */ s16 unk_3C2;
-    /* 0x03C4 */ s16 timePathTimeSpeed;
-    /* 0x03C6 */ s16 unk_3C6;
-    /* 0x03C8 */ s16 unk_3C8;
-    /* 0x03CA */ s16 unk_3CA;
-    /* 0x03CC */ s16 unk_3CC;
-    /* 0x03CE */ s16 unk_3CE;
-    /* 0x03D0 */ s16 unk_3D0;
-    /* 0x03D2 */ s16 unk_3D2[3];
-    /* 0x03D8 */ s16 unk_3D8[3];
-    /* 0x03DE */ s16 unk_3DE;
-    /* 0x03E0 */ s16 unk_3E0;
-    /* 0x03E2 */ s16 unk_3E2;
-    /* 0x03E4 */ EnGmUnkFunc unk_3E4;
-    /* 0x03E8 */ s32 unk_3E8;
-    /* 0x03EC */ UNK_TYPE1 unk3EC[0x4];
-    /* 0x03F0 */ s32 unk_3F0;
-    /* 0x03F4 */ s32 unk_3F4;
-    /* 0x03F8 */ s32 unk_3F8;
-    /* 0x03FC */ s32 unk_3FC;
-    /* 0x0400 */ s32 unk_400;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnGmActionFunc actionFunc;
+    /* 0x18C */ EnGmUnkFunc2 unk_18C;
+    /* 0x190 */ ColliderCylinder colliderCylinder;
+    /* 0x1DC */ ColliderSphere colliderSphere;
+    /* 0x234 */ Path* timePath;
+    /* 0x238 */ Vec3f timePathTargetPos;
+    /* 0x244 */ f32 timePathProgress;
+    /* 0x248 */ s32 timePathTotalTime;
+    /* 0x24C */ s32 timePathWaypointTime;
+    /* 0x250 */ s32 timePathWaypoint;
+    /* 0x254 */ s32 timePathElapsedTime;
+    /* 0x258 */ u8 unk_258;
+    /* 0x259 */ u8 unk_259;
+    /* 0x25C */ s32 unk_25C;
+    /* 0x260 */ s8 unk_260;
+    /* 0x261 */ s8 unk_261;
+    /* 0x262 */ s8 unk_262;
+    /* 0x264 */ s32* unk_264;
+    /* 0x268 */ Actor* unk_268;
+    /* 0x26C */ UNK_TYPE1 unk26C[0xC];
+    /* 0x278 */ Vec3f unk_278;
+    /* 0x284 */ Vec3f unk_284;
+    /* 0x290 */ Vec3f unk_290;
+    /* 0x29C */ Vec3f unk_29C;
+    /* 0x2A8 */ Vec3s unk_2A8;
+    /* 0x2AE */ Vec3s unk_2AE;
+    /* 0x2B4 */ Vec3s jointTable[20];
+    /* 0x32C */ Vec3s morphTable[20];
+    /* 0x3A4 */ u16 unk_3A4;
+    /* 0x3A6 */ u16 unk_3A6;
+    /* 0x3A8 */ f32 unk_3A8;
+    /* 0x3AC */ f32 unk_3AC;
+    /* 0x3B0 */ f32 unk_3B0;
+    /* 0x3B4 */ f32 unk_3B4;
+    /* 0x3B8 */ s16 unk_3B8;
+    /* 0x3BA */ s16 unk_3BA;
+    /* 0x3BC */ s16 unk_3BC;
+    /* 0x3BE */ s16 unk_3BE;
+    /* 0x3C0 */ s16 unk_3C0;
+    /* 0x3C2 */ s16 unk_3C2;
+    /* 0x3C4 */ s16 timePathTimeSpeed;
+    /* 0x3C6 */ s16 unk_3C6;
+    /* 0x3C8 */ s16 unk_3C8;
+    /* 0x3CA */ s16 unk_3CA;
+    /* 0x3CC */ s16 unk_3CC;
+    /* 0x3CE */ s16 unk_3CE;
+    /* 0x3D0 */ s16 unk_3D0;
+    /* 0x3D2 */ s16 unk_3D2[3];
+    /* 0x3D8 */ s16 unk_3D8[3];
+    /* 0x3DE */ s16 unk_3DE;
+    /* 0x3E0 */ s16 unk_3E0;
+    /* 0x3E2 */ s16 unk_3E2;
+    /* 0x3E4 */ EnGmUnkFunc unk_3E4;
+    /* 0x3E8 */ s32 unk_3E8;
+    /* 0x3EC */ UNK_TYPE1 unk3EC[0x4];
+    /* 0x3F0 */ s32 unk_3F0;
+    /* 0x3F4 */ s32 unk_3F4;
+    /* 0x3F8 */ s32 unk_3F8;
+    /* 0x3FC */ s32 unk_3FC;
+    /* 0x400 */ s32 unk_400;
 } EnGm; // size = 0x404
 
 extern const ActorInit En_Gm_InitVars;
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 0588141077..0278a70df3 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.h
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.h
@@ -46,59 +46,59 @@ typedef struct {
 } EnGoStruct; // size = 0x3C;
 
 typedef struct EnGo {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnGoActionFunc actionFunc;
-    /* 0x018C */ EnGoActionFunc unk_18C;
-    /* 0x0190 */ EnGoActionFunc unk_190;
-    /* 0x0194 */ ColliderCylinder colliderCylinder;
-    /* 0x01E0 */ UNK_TYPE1 unk1E0[0x4C];
-    /* 0x022C */ ColliderSphere colliderSphere;
-    /* 0x0284 */ Path* unk_284;
-    /* 0x0288 */ s8 unk_288;
-    /* 0x0289 */ s8 unk_289;
-    /* 0x028C */ s32 unk_28C;
-    /* 0x0290 */ Vec3f unk_290;
-    /* 0x029C */ Vec3f unk_29C;
-    /* 0x02A8 */ Vec3s unk_2A8;
-    /* 0x02AE */ Vec3s unk_2AE;
-    /* 0x02B4 */ Vec3s jointTable[18];
-    /* 0x0320 */ Vec3s morphTable[18];
-    /* 0x038C */ Actor* unk_38C;
-    /* 0x0390 */ u16 unk_390;
-    /* 0x0392 */ u16 unk_392;
-    /* 0x0394 */ u8 unk_394;
-    /* 0x0398 */ f32 unk_398;
-    /* 0x039C */ f32 unk_39C;
-    /* 0x03A0 */ f32 unk_3A0;
-    /* 0x03A4 */ f32 unk_3A4;
-    /* 0x03A8 */ f32 unk_3A8;
-    /* 0x03AC */ UNK_TYPE1 unk3AC[0x2];
-    /* 0x03AE */ s16 unk_3AE;
-    /* 0x03B0 */ s16 unk_3B0;
-    /* 0x03B2 */ s16 unk_3B2;
-    /* 0x03B4 */ s16 unk_3B4;
-    /* 0x03B6 */ s16 unk_3B6;
-    /* 0x03B8 */ s16 unk_3B8;
-    /* 0x03BA */ s16 unk_3BA;
-    /* 0x03BC */ s16 unk_3BC;
-    /* 0x03BE */ s16 unk_3BE;
-    /* 0x03C0 */ s16 unk_3C0;
-    /* 0x03C2 */ s16 unk_3C2;
-    /* 0x03C4 */ s16 unk_3C4;
-    /* 0x03C6 */ s16 unk_3C6;
-    /* 0x03C8 */ s16 unk_3C8[3];
-    /* 0x03CE */ s16 unk_3CE[3];
-    /* 0x03D4 */ s16 unk_3D4;
-    /* 0x03D8 */ void* unk_3D8;
-    /* 0x03DC */ s32 unk_3DC;
-    /* 0x03E0 */ UNK_TYPE1 unk3E0[0x4];
-    /* 0x03E4 */ s32 unk_3E4;
-    /* 0x03E8 */ s32 unk_3E8;
-    /* 0x03EC */ s32 unk_3EC;
-    /* 0x03F0 */ s32 unk_3F0;
-    /* 0x03F4 */ s32 unk_3F4;
-    /* 0x03F8 */ EnGoStruct unk_3F8[32];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnGoActionFunc actionFunc;
+    /* 0x18C */ EnGoActionFunc unk_18C;
+    /* 0x190 */ EnGoActionFunc unk_190;
+    /* 0x194 */ ColliderCylinder colliderCylinder;
+    /* 0x1E0 */ UNK_TYPE1 unk1E0[0x4C];
+    /* 0x22C */ ColliderSphere colliderSphere;
+    /* 0x284 */ Path* unk_284;
+    /* 0x288 */ s8 unk_288;
+    /* 0x289 */ s8 unk_289;
+    /* 0x28C */ s32 unk_28C;
+    /* 0x290 */ Vec3f unk_290;
+    /* 0x29C */ Vec3f unk_29C;
+    /* 0x2A8 */ Vec3s unk_2A8;
+    /* 0x2AE */ Vec3s unk_2AE;
+    /* 0x2B4 */ Vec3s jointTable[18];
+    /* 0x320 */ Vec3s morphTable[18];
+    /* 0x38C */ Actor* unk_38C;
+    /* 0x390 */ u16 unk_390;
+    /* 0x392 */ u16 unk_392;
+    /* 0x394 */ u8 unk_394;
+    /* 0x398 */ f32 unk_398;
+    /* 0x39C */ f32 unk_39C;
+    /* 0x3A0 */ f32 unk_3A0;
+    /* 0x3A4 */ f32 unk_3A4;
+    /* 0x3A8 */ f32 unk_3A8;
+    /* 0x3AC */ UNK_TYPE1 unk3AC[0x2];
+    /* 0x3AE */ s16 unk_3AE;
+    /* 0x3B0 */ s16 unk_3B0;
+    /* 0x3B2 */ s16 unk_3B2;
+    /* 0x3B4 */ s16 unk_3B4;
+    /* 0x3B6 */ s16 unk_3B6;
+    /* 0x3B8 */ s16 unk_3B8;
+    /* 0x3BA */ s16 unk_3BA;
+    /* 0x3BC */ s16 unk_3BC;
+    /* 0x3BE */ s16 unk_3BE;
+    /* 0x3C0 */ s16 unk_3C0;
+    /* 0x3C2 */ s16 unk_3C2;
+    /* 0x3C4 */ s16 unk_3C4;
+    /* 0x3C6 */ s16 unk_3C6;
+    /* 0x3C8 */ s16 unk_3C8[3];
+    /* 0x3CE */ s16 unk_3CE[3];
+    /* 0x3D4 */ s16 unk_3D4;
+    /* 0x3D8 */ void* unk_3D8;
+    /* 0x3DC */ s32 unk_3DC;
+    /* 0x3E0 */ UNK_TYPE1 unk3E0[0x4];
+    /* 0x3E4 */ s32 unk_3E4;
+    /* 0x3E8 */ s32 unk_3E8;
+    /* 0x3EC */ s32 unk_3EC;
+    /* 0x3F0 */ s32 unk_3F0;
+    /* 0x3F4 */ s32 unk_3F4;
+    /* 0x3F8 */ EnGoStruct unk_3F8[32];
 } EnGo; // size = 0xB78
 
 extern const ActorInit En_Go_InitVars;
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 db841977c6..fc4f66f51f 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
@@ -54,31 +54,31 @@ typedef struct {
 } EnGoroiwaStruct; // size = 0x30
 
 typedef struct EnGoroiwa {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderJntSph collider;
-    /* 0x0164 */ ColliderJntSphElement colliderElements[1];
-    /* 0x01A4 */ EnGoroiwaActionFunc actionFunc;
-    /* 0x01A8 */ Vec3f unk_1A8;
-    /* 0x01B4 */ Vec3f unk_1B4;
-    /* 0x01C0 */ f32 unk_1C0;
-    /* 0x01C4 */ f32 unk_1C4;
-    /* 0x01C8 */ s16 unk_1C8;
-    /* 0x01CA */ s16 unk_1CA;
-    /* 0x01CC */ s16 unk_1CC;
-    /* 0x01CE */ s16 unk_1CE;
-    /* 0x01D0 */ Vec3s* unk_1D0;
-    /* 0x01D4 */ s16 unk_1D4;
-    /* 0x01D6 */ s16 unk_1D6;
-    /* 0x01D8 */ s16 unk_1D8;
-    /* 0x01DA */ s16 unk_1DA;
-    /* 0x01DC */ f32 unk_1DC;
-    /* 0x01E0 */ f32 unk_1E0;
-    /* 0x01E4 */ s8 unk_1E4;
-    /* 0x01E5 */ u8 unk_1E5;
-    /* 0x01E6 */ s8 unk_1E6;
-    /* 0x01E7 */ s8 unk_1E7;
-    /* 0x01E8 */ EnGoroiwaStruct unk_1E8[2];
-    /* 0x0248 */ s32 unk_248;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderJntSph collider;
+    /* 0x164 */ ColliderJntSphElement colliderElements[1];
+    /* 0x1A4 */ EnGoroiwaActionFunc actionFunc;
+    /* 0x1A8 */ Vec3f unk_1A8;
+    /* 0x1B4 */ Vec3f unk_1B4;
+    /* 0x1C0 */ f32 unk_1C0;
+    /* 0x1C4 */ f32 unk_1C4;
+    /* 0x1C8 */ s16 unk_1C8;
+    /* 0x1CA */ s16 unk_1CA;
+    /* 0x1CC */ s16 unk_1CC;
+    /* 0x1CE */ s16 unk_1CE;
+    /* 0x1D0 */ Vec3s* unk_1D0;
+    /* 0x1D4 */ s16 unk_1D4;
+    /* 0x1D6 */ s16 unk_1D6;
+    /* 0x1D8 */ s16 unk_1D8;
+    /* 0x1DA */ s16 unk_1DA;
+    /* 0x1DC */ f32 unk_1DC;
+    /* 0x1E0 */ f32 unk_1E0;
+    /* 0x1E4 */ s8 unk_1E4;
+    /* 0x1E5 */ u8 unk_1E5;
+    /* 0x1E6 */ s8 unk_1E6;
+    /* 0x1E7 */ s8 unk_1E7;
+    /* 0x1E8 */ EnGoroiwaStruct unk_1E8[2];
+    /* 0x248 */ s32 unk_248;
 } EnGoroiwa; // size = 0x24C
 
 extern const ActorInit En_Goroiwa_InitVars;
diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h
index 22071de5df..6e5d65e8f8 100644
--- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h
+++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h
@@ -29,26 +29,26 @@ typedef enum {
 } EnHeishiLimbs;
 
 typedef struct EnHeishi {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[HEISHI_LIMB_MAX];
-    /* 0x01EE */ Vec3s morphTable[HEISHI_LIMB_MAX];
-    /* 0x0254 */ EnHeishiActionFunc actionFunc;
-    /* 0x0258 */ s16 headRotY;
-    /* 0x025A */ s16 headRotX;
-    /* 0x025C */ s16 headRotZ;
-    /* 0x025E */ s16 headRotYTarget;
-    /* 0x0260 */ s16 headRotXTarget;
-    /* 0x0262 */ s16 headRotZTarget;
-    /* 0x0264 */ s32 animIndex;
-    /* 0x0268 */ s32 paramsCopy;
-    /* 0x026C */ s32 shouldSetHeadRotation;
-    /* 0x0270 */ s16 timer;
-    /* 0x0272 */ s16 yawTowardsPlayer;
-    /* 0x0274 */ f32 frameCount;
-    /* 0x0278 */ s16 unk278;    // set and not used
-    /* 0x027C */ UNK_TYPE1 unk_27C[0x8];
-    /* 0x0284 */ ColliderCylinder colliderCylinder;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[HEISHI_LIMB_MAX];
+    /* 0x1EE */ Vec3s morphTable[HEISHI_LIMB_MAX];
+    /* 0x254 */ EnHeishiActionFunc actionFunc;
+    /* 0x258 */ s16 headRotY;
+    /* 0x25A */ s16 headRotX;
+    /* 0x25C */ s16 headRotZ;
+    /* 0x25E */ s16 headRotYTarget;
+    /* 0x260 */ s16 headRotXTarget;
+    /* 0x262 */ s16 headRotZTarget;
+    /* 0x264 */ s32 animIndex;
+    /* 0x268 */ s32 paramsCopy;
+    /* 0x26C */ s32 shouldSetHeadRotation;
+    /* 0x270 */ s16 timer;
+    /* 0x272 */ s16 yawTowardsPlayer;
+    /* 0x274 */ f32 frameCount;
+    /* 0x278 */ s16 unk278;    // set and not used
+    /* 0x27C */ UNK_TYPE1 unk_27C[0x8];
+    /* 0x284 */ ColliderCylinder colliderCylinder;
 } EnHeishi; // size = 0x2D0
 
 #endif // Z_EN_HEISHI_H
diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h
index 5ed3668f7d..a8edd1d75d 100644
--- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h
+++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h
@@ -11,26 +11,26 @@ typedef void (*EnHiddenNutsActionFunc)(struct EnHiddenNuts*, PlayState*);
 #define ENHIDDENNUTS_GET_F80(thisx) (((thisx)->params >> 7) & 0x1F)
 
 typedef struct EnHiddenNuts {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[10];
-    /* 0x01C4 */ Vec3s morphTable[10];
-    /* 0x0200 */ EnHiddenNutsActionFunc actionFunc;
-    /* 0x0204 */ Path* path;
-    /* 0x0208 */ s16 unk_208;
-    /* 0x020A */ u8 unk_20A;
-    /* 0x020C */ Vec3f unk_20C;
-    /* 0x0218 */ s16 unk_218;
-    /* 0x021A */ s16 unk_21A;
-    /* 0x021C */ s16 switchFlag;
-    /* 0x021E */ s16 unk_21E;
-    /* 0x0220 */ s32 unk_220;
-    /* 0x0224 */ s16 unk_224;
-    /* 0x0226 */ s16 unk_226;
-    /* 0x0228 */ f32 unk_228;
-    /* 0x022C */ f32 unk_22C;
-    /* 0x0230 */ UNK_TYPE1 unk230[4];
-    /* 0x0234 */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[10];
+    /* 0x1C4 */ Vec3s morphTable[10];
+    /* 0x200 */ EnHiddenNutsActionFunc actionFunc;
+    /* 0x204 */ Path* path;
+    /* 0x208 */ s16 unk_208;
+    /* 0x20A */ u8 unk_20A;
+    /* 0x20C */ Vec3f unk_20C;
+    /* 0x218 */ s16 unk_218;
+    /* 0x21A */ s16 unk_21A;
+    /* 0x21C */ s16 switchFlag;
+    /* 0x21E */ s16 unk_21E;
+    /* 0x220 */ s32 unk_220;
+    /* 0x224 */ s16 unk_224;
+    /* 0x226 */ s16 unk_226;
+    /* 0x228 */ f32 unk_228;
+    /* 0x22C */ f32 unk_22C;
+    /* 0x230 */ UNK_TYPE1 unk230[4];
+    /* 0x234 */ ColliderCylinder collider;
 } EnHiddenNuts; // size = 0x280
 
 extern const ActorInit En_Hidden_Nuts_InitVars;
diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h
index e8ede22261..44fd8c4ef8 100644
--- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h
+++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h
@@ -10,26 +10,26 @@ typedef void (*EnHintSkbActionFunc)(struct EnHintSkb*, PlayState*);
 #define ENHINTSKB_GET_FF(thisx) ((thisx)->params & 0xFF)
 
 typedef struct EnHintSkb {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderJntSph collider;
-    /* 0x0164 */ ColliderJntSphElement colliderElement[2];
-    /* 0x01E4 */ SkelAnime skelAnime;
-    /* 0x0228 */ EnHintSkbActionFunc actionFunc;
-    /* 0x022C */ Vec3f limbPos[14];
-    /* 0x02D4 */ f32 drawDmgEffAlpha;
-    /* 0x02D8 */ f32 drawDmgEffScale;
-    /* 0x02DC */ s32 limbCount;
-    /* 0x02E0 */ Vec3s jointTable[20];
-    /* 0x0358 */ Vec3s morphtable[20];
-    /* 0x03D0 */ UNK_TYPE1 unk3D0[0xC];
-    /* 0x03DC */ s16 unk_3DC;
-    /* 0x03DE */ s16 unk_3DE;
-    /* 0x03E0 */ s16 unk_3E0;
-    /* 0x03E2 */ s16 drawDmgEffTimer;
-    /* 0x03E4 */ s16 unk_3E4;
-    /* 0x03E6 */ u16 unk_3E6;
-    /* 0x03E8 */ u8 unk_3E8;
-    /* 0x03E9 */ u8 drawDmgEffType;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderJntSph collider;
+    /* 0x164 */ ColliderJntSphElement colliderElement[2];
+    /* 0x1E4 */ SkelAnime skelAnime;
+    /* 0x228 */ EnHintSkbActionFunc actionFunc;
+    /* 0x22C */ Vec3f limbPos[14];
+    /* 0x2D4 */ f32 drawDmgEffAlpha;
+    /* 0x2D8 */ f32 drawDmgEffScale;
+    /* 0x2DC */ s32 limbCount;
+    /* 0x2E0 */ Vec3s jointTable[20];
+    /* 0x358 */ Vec3s morphtable[20];
+    /* 0x3D0 */ UNK_TYPE1 unk3D0[0xC];
+    /* 0x3DC */ s16 unk_3DC;
+    /* 0x3DE */ s16 unk_3DE;
+    /* 0x3E0 */ s16 unk_3E0;
+    /* 0x3E2 */ s16 drawDmgEffTimer;
+    /* 0x3E4 */ s16 unk_3E4;
+    /* 0x3E6 */ u16 unk_3E6;
+    /* 0x3E8 */ u8 unk_3E8;
+    /* 0x3E9 */ u8 drawDmgEffType;
 } EnHintSkb; // size = 0x3EC
 
 extern const ActorInit En_Hint_Skb_InitVars;
diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h
index 9985d5180f..f48ffbe9d9 100644
--- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h
+++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h
@@ -10,9 +10,9 @@ typedef void (*EnHitTagActionFunc)(struct EnHitTag*, PlayState*);
 #define ENHITTAG_GET_SWITCHFLAG(thisx) (s32)(((thisx)->params & 0xFE00) >> 9)
 
 typedef struct EnHitTag {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ EnHitTagActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ EnHitTagActionFunc actionFunc;
 } EnHitTag; // size = 0x194
 
 extern const ActorInit En_Hit_Tag_InitVars;
diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
index 4f3fb5b584..bf4b08fd74 100644
--- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
+++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
@@ -8,9 +8,9 @@ struct EnHonotrap;
 typedef void (*EnHonotrapActionFunc)(struct EnHonotrap*, PlayState*);
 
 typedef struct EnHonotrap {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnHonotrapActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x17C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnHonotrapActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x17C];
 } EnHonotrap; // size = 0x2C4
 
 extern const ActorInit En_Honotrap_InitVars;
diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
index d6979dc32f..d72c72d158 100644
--- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h
+++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
@@ -21,17 +21,17 @@ typedef void (*EnHsActionFunc)(struct EnHs*, PlayState*);
 // The count of [chicks transformed into adult] is stored in [this->actor.home.rot.x] (incremented by 2)
 
 typedef struct EnHs {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ Vec3s jointTable[OBJECT_HS_LIMB_MAX];
-    /* 0x0234 */ Vec3s morphTable[OBJECT_HS_LIMB_MAX];
-    /* 0x0294 */ Vec3s headRot;
-    /* 0x029A */ Vec3s unusedRot; // probably not chest, as chest is same limb as lower body
-    /* 0x02A0 */ u16 stateFlags;
-    /* 0x02A2 */ s16 stateTimer; // reused for different actionFunc
-    /* 0x02A4 */ Vec3f nwcPos[20]; // actual chick position are even values, odd values seem to be extra values for smoother chain
-    /* 0x0394 */ EnHsActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ Vec3s jointTable[OBJECT_HS_LIMB_MAX];
+    /* 0x234 */ Vec3s morphTable[OBJECT_HS_LIMB_MAX];
+    /* 0x294 */ Vec3s headRot;
+    /* 0x29A */ Vec3s unusedRot; // probably not chest, as chest is same limb as lower body
+    /* 0x2A0 */ u16 stateFlags;
+    /* 0x2A2 */ s16 stateTimer; // reused for different actionFunc
+    /* 0x2A4 */ Vec3f nwcPos[20]; // actual chick position are even values, odd values seem to be extra values for smoother chain
+    /* 0x394 */ EnHsActionFunc actionFunc;
 } EnHs; // size = 0x398
 
 extern const ActorInit En_Hs_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.h b/src/overlays/actors/ovl_En_Ig/z_en_ig.h
index 51004b4702..5ff18dfef2 100644
--- a/src/overlays/actors/ovl_En_Ig/z_en_ig.h
+++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.h
@@ -12,54 +12,54 @@ typedef void (*EnIgUnkFunc2)(struct EnIg*, PlayState*);
 #define ENIG_GET_FF(thisx) ((thisx)->params & 0xFF)
 
 typedef struct EnIg {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnIgActionFunc actionFunc;
-    /* 0x018C */ EnIgUnkFunc2 unk_18C;
-    /* 0x0190 */ MtxF unk_190;
-    /* 0x01D0 */ ColliderCylinder collider1;
-    /* 0x021C */ ColliderSphere collider2;
-    /* 0x0274 */ Path* timePath;
-    /* 0x0278 */ Vec3f timePathTargetPos;
-    /* 0x0284 */ f32 timePathProgress;
-    /* 0x0288 */ s32 timePathTotalTime;
-    /* 0x028C */ s32 timePathWaypointTime;
-    /* 0x0290 */ s32 timePathWaypoint;
-    /* 0x0294 */ s32 timePathElapsedTime;
-    /* 0x0298 */ u8 scheduleResult;
-    /* 0x029C */ s32* unk_29C;
-    /* 0x02A0 */ s32 unk_2A0;
-    /* 0x02A4 */ s8 unk_2A4;
-    /* 0x02A8 */ Actor* unk_2A8;
-    /* 0x02AC */ UNK_TYPE1 unk2AC[0x4];
-    /* 0x02B0 */ Vec3f unk_2B0;
-    /* 0x02BC */ Vec3f unk_2BC;
-    /* 0x02C8 */ UNK_TYPE1 unk2C8[0xC];
-    /* 0x02D4 */ Vec3f unk_2D4;
-    /* 0x02E0 */ UNK_TYPE1 unk2E0[0x6];
-    /* 0x02E6 */ Vec3s unk_2E6;
-    /* 0x02EC */ Vec3s jointTable[19];
-    /* 0x035E */ Vec3s morphTable[19];
-    /* 0x03D0 */ u16 unk_3D0;
-    /* 0x03D2 */ u16 unk_3D2;
-    /* 0x03D4 */ f32 unk_3D4;
-    /* 0x03D8 */ UNK_TYPE1 unk3D8[0x8];
-    /* 0x03E0 */ s16 unk_3E0;
-    /* 0x03E2 */ s16 unk_3E2;
-    /* 0x03E4 */ s16 unk_3E4;
-    /* 0x03E6 */ s16 unk_3E6;
-    /* 0x03E8 */ s16 unk_3E8;
-    /* 0x03EA */ s16 unk_3EA;
-    /* 0x03EC */ s16 timePathTimeSpeed;
-    /* 0x03EE */ s16 unk_3EE;
-    /* 0x03F0 */ s16 unk_3F0;
-    /* 0x03F2 */ s16 unk_3F2;
-    /* 0x03F4 */ s16 unk_3F4;
-    /* 0x03F6 */ s16 unk_3F6;
-    /* 0x03F8 */ EnIgUnkFunc unk_3F8;
-    /* 0x03FC */ s32 unk_3FC;
-    /* 0x0400 */ UNK_TYPE1 unk400[0x8];
-    /* 0x0408 */ s32 unk_408;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnIgActionFunc actionFunc;
+    /* 0x18C */ EnIgUnkFunc2 unk_18C;
+    /* 0x190 */ MtxF unk_190;
+    /* 0x1D0 */ ColliderCylinder collider1;
+    /* 0x21C */ ColliderSphere collider2;
+    /* 0x274 */ Path* timePath;
+    /* 0x278 */ Vec3f timePathTargetPos;
+    /* 0x284 */ f32 timePathProgress;
+    /* 0x288 */ s32 timePathTotalTime;
+    /* 0x28C */ s32 timePathWaypointTime;
+    /* 0x290 */ s32 timePathWaypoint;
+    /* 0x294 */ s32 timePathElapsedTime;
+    /* 0x298 */ u8 scheduleResult;
+    /* 0x29C */ s32* unk_29C;
+    /* 0x2A0 */ s32 unk_2A0;
+    /* 0x2A4 */ s8 unk_2A4;
+    /* 0x2A8 */ Actor* unk_2A8;
+    /* 0x2AC */ UNK_TYPE1 unk2AC[0x4];
+    /* 0x2B0 */ Vec3f unk_2B0;
+    /* 0x2BC */ Vec3f unk_2BC;
+    /* 0x2C8 */ UNK_TYPE1 unk2C8[0xC];
+    /* 0x2D4 */ Vec3f unk_2D4;
+    /* 0x2E0 */ UNK_TYPE1 unk2E0[0x6];
+    /* 0x2E6 */ Vec3s unk_2E6;
+    /* 0x2EC */ Vec3s jointTable[19];
+    /* 0x35E */ Vec3s morphTable[19];
+    /* 0x3D0 */ u16 unk_3D0;
+    /* 0x3D2 */ u16 unk_3D2;
+    /* 0x3D4 */ f32 unk_3D4;
+    /* 0x3D8 */ UNK_TYPE1 unk3D8[0x8];
+    /* 0x3E0 */ s16 unk_3E0;
+    /* 0x3E2 */ s16 unk_3E2;
+    /* 0x3E4 */ s16 unk_3E4;
+    /* 0x3E6 */ s16 unk_3E6;
+    /* 0x3E8 */ s16 unk_3E8;
+    /* 0x3EA */ s16 unk_3EA;
+    /* 0x3EC */ s16 timePathTimeSpeed;
+    /* 0x3EE */ s16 unk_3EE;
+    /* 0x3F0 */ s16 unk_3F0;
+    /* 0x3F2 */ s16 unk_3F2;
+    /* 0x3F4 */ s16 unk_3F4;
+    /* 0x3F6 */ s16 unk_3F6;
+    /* 0x3F8 */ EnIgUnkFunc unk_3F8;
+    /* 0x3FC */ s32 unk_3FC;
+    /* 0x400 */ UNK_TYPE1 unk400[0x8];
+    /* 0x408 */ s32 unk_408;
 } EnIg; // size = 0x40C
 
 extern const ActorInit En_Ig_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
index ae63547907..39dfff7b9b 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
@@ -8,10 +8,10 @@ struct EnIk;
 typedef void (*EnIkActionFunc)(struct EnIk*, PlayState*);
 
 typedef struct EnIk {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x1AC];
-    /* 0x02F0 */ EnIkActionFunc actionFunc;
-    /* 0x02F4 */ char unk_2F4[0x374];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x1AC];
+    /* 0x2F0 */ EnIkActionFunc actionFunc;
+    /* 0x2F4 */ char unk_2F4[0x374];
 } EnIk; // size = 0x668
 
 extern const ActorInit En_Ik_InitVars;
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
index 6e30eca32f..ae8304caee 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
@@ -10,19 +10,19 @@ typedef void (*EnInsectActionFunc)(struct EnInsect*, PlayState*);
 #define ENINSECT_GET_1(thisx) ((thisx)->params & 1)
 
 typedef struct EnInsect {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderJntSph collider;
-    /* 0x0164 */ ColliderJntSphElement colliderElements[1];
-    /* 0x01A4 */ SkelAnime skelAnime;
-    /* 0x01E8 */ Vec3s jointTable[24];
-    /* 0x0278 */ Vec3s morphTable[24];
-    /* 0x0308 */ EnInsectActionFunc actionFunc;
-    /* 0x030C */ u16 unk_30C;
-    /* 0x030E */ s16 unk_30E;
-    /* 0x0310 */ s16 unk_310;
-    /* 0x0312 */ s16 unk_312;
-    /* 0x0314 */ s16 unk_314;
-    /* 0x0316 */ s16 unk_316;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderJntSph collider;
+    /* 0x164 */ ColliderJntSphElement colliderElements[1];
+    /* 0x1A4 */ SkelAnime skelAnime;
+    /* 0x1E8 */ Vec3s jointTable[24];
+    /* 0x278 */ Vec3s morphTable[24];
+    /* 0x308 */ EnInsectActionFunc actionFunc;
+    /* 0x30C */ u16 unk_30C;
+    /* 0x30E */ s16 unk_30E;
+    /* 0x310 */ s16 unk_310;
+    /* 0x312 */ s16 unk_312;
+    /* 0x314 */ s16 unk_314;
+    /* 0x316 */ s16 unk_316;
 } EnInsect; // size = 0x318
 
 extern const ActorInit En_Insect_InitVars;
diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h
index 2841e39db7..35cbb4da9c 100644
--- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h
+++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h
@@ -8,9 +8,9 @@ struct EnInvadepohDemo;
 typedef void (*EnInvadepohDemoActionFunc)(struct EnInvadepohDemo*, PlayState*);
 
 typedef struct EnInvadepohDemo {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnInvadepohDemoActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x180];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnInvadepohDemoActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x180];
 } EnInvadepohDemo; // size = 0x2C8
 
 extern const ActorInit En_Invadepoh_Demo_InitVars;
diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h
index c5b9d77339..49d9bd6ef6 100644
--- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h
+++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h
@@ -11,11 +11,11 @@ typedef void (*EnInvisibleRuppeActionFunc)(struct EnInvisibleRuppe*, PlayState*)
 #define INVISIBLERUPPE_GET_1FC(thisx) (((thisx)->actor.params & 0x1FC) >> 2)
 
 typedef struct EnInvisibleRuppe {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ s16 unk_190;
-    /* 0x0192 */ s16 unk_192;
-    /* 0x0194 */ EnInvisibleRuppeActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ s16 unk_190;
+    /* 0x192 */ s16 unk_192;
+    /* 0x194 */ EnInvisibleRuppeActionFunc actionFunc;
 } EnInvisibleRuppe; // size = 0x198
 
 extern const ActorInit En_Invisible_Ruppe_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
index 0652b84bf1..080abbf4af 100644
--- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
+++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
@@ -19,13 +19,13 @@ typedef void (*EnIshiUnkFunc2)(Actor*, PlayState*);
 #define ENISHI_GET_FE00(thisx) (((thisx)->params >> 9) & 0x7F)
 
 typedef struct EnIshi {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ EnIshiActionFunc actionFunc;
-    /* 0x0194 */ s8 unk_194;
-    /* 0x0195 */ s8 unk_195;
-    /* 0x0196 */ s8 unk_196;
-    /* 0x0197 */ u8 unk_197;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ EnIshiActionFunc actionFunc;
+    /* 0x194 */ s8 unk_194;
+    /* 0x195 */ s8 unk_195;
+    /* 0x196 */ s8 unk_196;
+    /* 0x197 */ u8 unk_197;
 } EnIshi; // size = 0x198
 
 extern const ActorInit En_Ishi_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.h b/src/overlays/actors/ovl_En_Ja/z_en_ja.h
index 078863b48b..6eeca985ae 100644
--- a/src/overlays/actors/ovl_En_Ja/z_en_ja.h
+++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.h
@@ -22,42 +22,42 @@ typedef struct {
 } EnJaStruct2; // size = 0x10
 
 typedef struct EnJa {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnJaActionFunc actionFunc;
-    /* 0x018C */ ColliderCylinder collider;
-    /* 0x01D8 */ EnJaStruct2 unk_1D8;
-    /* 0x01E4 */ Vec3s unk_1E4;
-    /* 0x01EC */ Vec3f unk_1EC;
-    /* 0x01F8 */ Vec3f unk_1F8;
-    /* 0x0204 */ Vec3f unk_204;
-    /* 0x0210 */ Vec3f unk_210;
-    /* 0x021C */ Vec3f unk_21C;
-    /* 0x0228 */ Vec3f unk_228;
-    /* 0x0234 */ EnJaStruct unk_234[4];
-    /* 0x0274 */ Vec3s unk_274;
-    /* 0x027A */ Vec3s unk_27A;
-    /* 0x0280 */ Vec3s jointTable[16];
-    /* 0x02E0 */ Vec3s morphTable[16];
-    /* 0x0340 */ u16 unk_340;
-    /* 0x0344 */ f32 unk_344;
-    /* 0x0348 */ f32 unk_348;
-    /* 0x034C */ f32 unk_34C;
-    /* 0x0350 */ UNK_TYPE1 unk350[0x4];
-    /* 0x0354 */ s16 unk_354;
-    /* 0x0356 */ s16 unk_356;
-    /* 0x0358 */ s16 unk_358;
-    /* 0x035A */ s16 unk_35A;
-    /* 0x035C */ s16 unk_35C;
-    /* 0x035E */ s16 unk_35E;
-    /* 0x0360 */ s16 unk_360;
-    /* 0x0362 */ s16 unk_362;
-    /* 0x0364 */ s16 unk_364;
-    /* 0x0366 */ s16 unk_366;
-    /* 0x0368 */ void* unk_368;
-    /* 0x036C */ s32 unk_36C;
-    /* 0x0370 */ UNK_TYPE1 unk370[4];
-    /* 0x0374 */ s32 unk_374;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnJaActionFunc actionFunc;
+    /* 0x18C */ ColliderCylinder collider;
+    /* 0x1D8 */ EnJaStruct2 unk_1D8;
+    /* 0x1E4 */ Vec3s unk_1E4;
+    /* 0x1EC */ Vec3f unk_1EC;
+    /* 0x1F8 */ Vec3f unk_1F8;
+    /* 0x204 */ Vec3f unk_204;
+    /* 0x210 */ Vec3f unk_210;
+    /* 0x21C */ Vec3f unk_21C;
+    /* 0x228 */ Vec3f unk_228;
+    /* 0x234 */ EnJaStruct unk_234[4];
+    /* 0x274 */ Vec3s unk_274;
+    /* 0x27A */ Vec3s unk_27A;
+    /* 0x280 */ Vec3s jointTable[16];
+    /* 0x2E0 */ Vec3s morphTable[16];
+    /* 0x340 */ u16 unk_340;
+    /* 0x344 */ f32 unk_344;
+    /* 0x348 */ f32 unk_348;
+    /* 0x34C */ f32 unk_34C;
+    /* 0x350 */ UNK_TYPE1 unk350[0x4];
+    /* 0x354 */ s16 unk_354;
+    /* 0x356 */ s16 unk_356;
+    /* 0x358 */ s16 unk_358;
+    /* 0x35A */ s16 unk_35A;
+    /* 0x35C */ s16 unk_35C;
+    /* 0x35E */ s16 unk_35E;
+    /* 0x360 */ s16 unk_360;
+    /* 0x362 */ s16 unk_362;
+    /* 0x364 */ s16 unk_364;
+    /* 0x366 */ s16 unk_366;
+    /* 0x368 */ void* unk_368;
+    /* 0x36C */ s32 unk_36C;
+    /* 0x370 */ UNK_TYPE1 unk370[4];
+    /* 0x374 */ s32 unk_374;
 } EnJa; // size = 0x378
 
 extern const ActorInit En_Ja_InitVars;
diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h
index 8a6c3ec1ea..5fdf911ccf 100644
--- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h
+++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h
@@ -16,25 +16,25 @@ typedef struct {
 } EnJgameTsnStruct; // size = 0x8
 
 typedef struct EnJgameTsn {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ EnJgameTsnActionFunc actionFunc;
-    /* 0x01D8 */ EnJgameTsnStruct unk_1D8[4];
-    /* 0x01F8 */ EnJgameTsnStruct unk_1F8;
-    /* 0x0200 */ EnJgameTsnStruct unk_200;
-    /* 0x0208 */ u8* unk_208[4];
-    /* 0x0218 */ s32 unk_218;
-    /* 0x021C */ s32 unk_21C;
-    /* 0x0220 */ Vec3s jointTable[OBJECT_TSN_LIMB_MAX];
-    /* 0x0286 */ Vec3s morphTable[OBJECT_TSN_LIMB_MAX];
-    /* 0x02EC */ Vec3s unk_2EC;
-    /* 0x02F2 */ Vec3s unk_2F2;
-    /* 0x02F8 */ s16 unk_2F8;
-    /* 0x02FA */ s16 unk_2FA;
-    /* 0x02FC */ s16 unk_2FC;
-    /* 0x02FE */ s16 unk_2FE;
-    /* 0x0300 */ u16 unk_300;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ EnJgameTsnActionFunc actionFunc;
+    /* 0x1D8 */ EnJgameTsnStruct unk_1D8[4];
+    /* 0x1F8 */ EnJgameTsnStruct unk_1F8;
+    /* 0x200 */ EnJgameTsnStruct unk_200;
+    /* 0x208 */ u8* unk_208[4];
+    /* 0x218 */ s32 unk_218;
+    /* 0x21C */ s32 unk_21C;
+    /* 0x220 */ Vec3s jointTable[OBJECT_TSN_LIMB_MAX];
+    /* 0x286 */ Vec3s morphTable[OBJECT_TSN_LIMB_MAX];
+    /* 0x2EC */ Vec3s unk_2EC;
+    /* 0x2F2 */ Vec3s unk_2F2;
+    /* 0x2F8 */ s16 unk_2F8;
+    /* 0x2FA */ s16 unk_2FA;
+    /* 0x2FC */ s16 unk_2FC;
+    /* 0x2FE */ s16 unk_2FE;
+    /* 0x300 */ u16 unk_300;
 } EnJgameTsn; // size = 0x304
 
 extern const ActorInit En_Jgame_Tsn_InitVars;
diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h
index 441ec5f177..96c1bbf49e 100644
--- a/src/overlays/actors/ovl_En_Js/z_en_js.h
+++ b/src/overlays/actors/ovl_En_Js/z_en_js.h
@@ -8,9 +8,9 @@ struct EnJs;
 typedef void (*EnJsActionFunc)(struct EnJs*, PlayState*);
 
 typedef struct EnJs {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x180];
-    /* 0x02C4 */ EnJsActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x180];
+    /* 0x2C4 */ EnJsActionFunc actionFunc;
 } EnJs; // size = 0x2C8
 
 extern const ActorInit En_Js_InitVars;
diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.h b/src/overlays/actors/ovl_En_Jso/z_en_jso.h
index 7fd25473e9..e2961c3aec 100644
--- a/src/overlays/actors/ovl_En_Jso/z_en_jso.h
+++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.h
@@ -8,10 +8,10 @@ struct EnJso;
 typedef void (*EnJsoActionFunc)(struct EnJso*, PlayState*);
 
 typedef struct EnJso {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x134];
-    /* 0x0278 */ EnJsoActionFunc actionFunc;
-    /* 0x027C */ char unk_27C[0xD70];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x134];
+    /* 0x278 */ EnJsoActionFunc actionFunc;
+    /* 0x27C */ char unk_27C[0xD70];
 } EnJso; // size = 0xFEC
 
 extern const ActorInit En_Jso_InitVars;
diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h
index 265b55ea32..8ef208926a 100644
--- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h
+++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h
@@ -8,13 +8,13 @@ struct EnKaizoku;
 typedef void (*EnKaizokuActionFunc)(struct EnKaizoku*, PlayState*);
 
 typedef struct EnKaizoku {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x168];
-    /* 0x02AC */ EnKaizokuActionFunc actionFunc;
-    /* 0x02B0 */ char unk_2B0[0x40];
-    /* 0x02F0 */ f32 unk_2F0;
-    /* 0x02F4 */ s16 unk_2F4;
-    /* 0x02F6 */ char unk_2F6[0x2FA];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x168];
+    /* 0x2AC */ EnKaizokuActionFunc actionFunc;
+    /* 0x2B0 */ char unk_2B0[0x40];
+    /* 0x2F0 */ f32 unk_2F0;
+    /* 0x2F4 */ s16 unk_2F4;
+    /* 0x2F6 */ char unk_2F6[0x2FA];
 } EnKaizoku; // size = 0x5F0
 
 extern const ActorInit En_Kaizoku_InitVars;
diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.h b/src/overlays/actors/ovl_En_Kame/z_en_kame.h
index 1bcdb43f71..6e0aa371b5 100644
--- a/src/overlays/actors/ovl_En_Kame/z_en_kame.h
+++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.h
@@ -8,29 +8,29 @@ struct EnKame;
 typedef void (*EnKameActionFunc)(struct EnKame*, PlayState*);
 
 typedef struct EnKame {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime1;
-    /* 0x0188 */ Vec3s jointTable1[13];
-    /* 0x01D6 */ Vec3s morphTable1[13];
-    /* 0x0224 */ SkelAnime skelAnime2;
-    /* 0x0268 */ Vec3s jointTable2[4];
-    /* 0x0280 */ Vec3s morphTable2[4];
-    /* 0x0298 */ EnKameActionFunc actionFunc;
-    /* 0x029C */ u8 unk_29C;
-    /* 0x029D */ u8 drawDmgEffType;
-    /* 0x029E */ s16 unk_29E;
-    /* 0x02A0 */ s16 unk_2A0;
-    /* 0x02A2 */ s16 unk_2A2;
-    /* 0x02A4 */ s16 unk_2A4;
-    /* 0x02A6 */ s16 unk_2A6;
-    /* 0x02A8 */ f32 unk_2A8;
-    /* 0x02AC */ f32 unk_2AC;
-    /* 0x02B0 */ f32 drawDmgEffAlpha;
-    /* 0x02B4 */ f32 drawDmgEffScale;
-    /* 0x02B8 */ f32 drawDmgEffFrozenSteamScale;
-    /* 0x02BC */ Vec3f unk_2BC;
-    /* 0x02C8 */ Vec3f limbPos[10];
-    /* 0x0340 */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime1;
+    /* 0x188 */ Vec3s jointTable1[13];
+    /* 0x1D6 */ Vec3s morphTable1[13];
+    /* 0x224 */ SkelAnime skelAnime2;
+    /* 0x268 */ Vec3s jointTable2[4];
+    /* 0x280 */ Vec3s morphTable2[4];
+    /* 0x298 */ EnKameActionFunc actionFunc;
+    /* 0x29C */ u8 unk_29C;
+    /* 0x29D */ u8 drawDmgEffType;
+    /* 0x29E */ s16 unk_29E;
+    /* 0x2A0 */ s16 unk_2A0;
+    /* 0x2A2 */ s16 unk_2A2;
+    /* 0x2A4 */ s16 unk_2A4;
+    /* 0x2A6 */ s16 unk_2A6;
+    /* 0x2A8 */ f32 unk_2A8;
+    /* 0x2AC */ f32 unk_2AC;
+    /* 0x2B0 */ f32 drawDmgEffAlpha;
+    /* 0x2B4 */ f32 drawDmgEffScale;
+    /* 0x2B8 */ f32 drawDmgEffFrozenSteamScale;
+    /* 0x2BC */ Vec3f unk_2BC;
+    /* 0x2C8 */ Vec3f limbPos[10];
+    /* 0x340 */ ColliderCylinder collider;
 } EnKame; // size = 0x38C
 
 extern const ActorInit En_Kame_InitVars;
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 a1b3e5a837..9d41245e69 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
@@ -14,20 +14,20 @@ enum {
 };
 
 typedef struct EnKarebaba {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnKarebabaActionFunc actionFunc;
-    /* 0x018C */ Vec3s jointTable[8];
-    /* 0x01BC */ Vec3s morphTable[8];
-    /* 0x01EC */ u8 drawDmgEffType;
-    /* 0x01EE */ s16 unk_1EE;
-    /* 0x01F0 */ f32 drawDmgEffAlpha;
-    /* 0x01F4 */ f32 drawDmgEffScale;
-    /* 0x01F8 */ f32 drawDmgEffFrozenSteamScale;
-    /* 0x01FC */ Vec3f limbPos[4];
-    /* 0x022C */ CollisionPoly* unk_22C;
-    /* 0x0230 */ ColliderCylinder collider1;
-    /* 0x027C */ ColliderCylinder collider2;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnKarebabaActionFunc actionFunc;
+    /* 0x18C */ Vec3s jointTable[8];
+    /* 0x1BC */ Vec3s morphTable[8];
+    /* 0x1EC */ u8 drawDmgEffType;
+    /* 0x1EE */ s16 unk_1EE;
+    /* 0x1F0 */ f32 drawDmgEffAlpha;
+    /* 0x1F4 */ f32 drawDmgEffScale;
+    /* 0x1F8 */ f32 drawDmgEffFrozenSteamScale;
+    /* 0x1FC */ Vec3f limbPos[4];
+    /* 0x22C */ CollisionPoly* unk_22C;
+    /* 0x230 */ ColliderCylinder collider1;
+    /* 0x27C */ ColliderCylinder collider2;
 } EnKarebaba; // size = 0x2C8
 
 extern const ActorInit En_Karebaba_InitVars;
diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h
index b3c6679296..dbbb96e768 100644
--- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h
+++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h
@@ -9,18 +9,18 @@ struct EnKbt;
 typedef void (*EnKbtActionFunc)(struct EnKbt*, PlayState*);
 
 typedef struct EnKbt {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[OBJECT_KBT_LIMB_MAX];
-    /* 0x0200 */ Vec3s morphTable[OBJECT_KBT_LIMB_MAX];
-    /* 0x0278 */ Actor* unk_278;
-    /* 0x027C */ u16 unk_27C;
-    /* 0x027E */ u8 unk_27E;
-    /* 0x027F */ u8 unk_27F;
-    /* 0x0280 */ s16 unk_280;
-    /* 0x0282 */ s16 unk_282;
-    /* 0x0284 */ s16 unk_284;
-    /* 0x0288 */ EnKbtActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[OBJECT_KBT_LIMB_MAX];
+    /* 0x200 */ Vec3s morphTable[OBJECT_KBT_LIMB_MAX];
+    /* 0x278 */ Actor* unk_278;
+    /* 0x27C */ u16 unk_27C;
+    /* 0x27E */ u8 unk_27E;
+    /* 0x27F */ u8 unk_27F;
+    /* 0x280 */ s16 unk_280;
+    /* 0x282 */ s16 unk_282;
+    /* 0x284 */ s16 unk_284;
+    /* 0x288 */ EnKbtActionFunc actionFunc;
 } EnKbt; // size = 0x28C
 
 extern const ActorInit En_Kbt_InitVars;
diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h
index b811563a9d..2d49058e8f 100644
--- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h
+++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h
@@ -13,23 +13,23 @@ typedef void (*EnKendoJsActionFunc)(struct EnKendoJs*, PlayState*);
 #define ENKENDOJS_FF_1 1
 
 typedef struct EnKendoJs {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ EnKendoJsActionFunc actionFunc;
-    /* 0x01D8 */ Vec3s jointTable[13];
-    /* 0x0226 */ Vec3s morphTable[13];
-    /* 0x0274 */ Vec3s* unk_274;
-    /* 0x0278 */ Vec3s unk_278;
-    /* 0x027E */ Vec3s unk_27E;
-    /* 0x0284 */ s16 unk_284;
-    /* 0x0286 */ s16 unk_286;
-    /* 0x0288 */ s16 unk_288;
-    /* 0x028A */ s16 unk_28A;
-    /* 0x028C */ s16 unk_28C;
-    /* 0x028E */ s16 unk_28E;
-    /* 0x0290 */ s16 unk_290;
-    /* 0x0292 */ u8 unk_292;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ EnKendoJsActionFunc actionFunc;
+    /* 0x1D8 */ Vec3s jointTable[13];
+    /* 0x226 */ Vec3s morphTable[13];
+    /* 0x274 */ Vec3s* unk_274;
+    /* 0x278 */ Vec3s unk_278;
+    /* 0x27E */ Vec3s unk_27E;
+    /* 0x284 */ s16 unk_284;
+    /* 0x286 */ s16 unk_286;
+    /* 0x288 */ s16 unk_288;
+    /* 0x28A */ s16 unk_28A;
+    /* 0x28C */ s16 unk_28C;
+    /* 0x28E */ s16 unk_28E;
+    /* 0x290 */ s16 unk_290;
+    /* 0x292 */ u8 unk_292;
 } EnKendoJs; // size = 0x294
 
 extern const ActorInit En_Kendo_Js_InitVars;
diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h
index 4973a7eda2..2ef14c942f 100644
--- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h
+++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h
@@ -8,9 +8,9 @@ struct EnKitan;
 typedef void (*EnKitanActionFunc)(struct EnKitan*, PlayState*);
 
 typedef struct EnKitan {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x194];
-    /* 0x02D8 */ EnKitanActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x194];
+    /* 0x2D8 */ EnKitanActionFunc actionFunc;
 } EnKitan; // size = 0x2DC
 
 extern const ActorInit En_Kitan_InitVars;
diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.h b/src/overlays/actors/ovl_En_Knight/z_en_knight.h
index b7faee749c..a4fca8554e 100644
--- a/src/overlays/actors/ovl_En_Knight/z_en_knight.h
+++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.h
@@ -8,22 +8,22 @@ struct EnKnight;
 typedef void (*EnKnightActionFunc)(struct EnKnight*, PlayState*);
 
 typedef struct EnKnight {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ s16 unk_144;
-    /* 0x0146 */ char unk_146[0x2];
-    /* 0x0148 */ s8 unk_148;
-    /* 0x0149 */ char pad149[8];
-    /* 0x0151 */ s8 unk_151;
-    /* 0x0152 */ char pad152[1];
-    /* 0x0153 */ u8 unk_153;
-    /* 0x0154 */ u8 unk_154;
-    /* 0x0155 */ char pad155[0x2CB];
-    /* 0x0420 */ EnKnightActionFunc actionFunc;
-    /* 0x0424 */ char unk_424[0x25C];
-    /* 0x0680 */ u8 unk_680;
-    /* 0x0681 */ char pad681[9];
-    /* 0x068A */ s16 unk_68A;
-    /* 0x068C */ char pad68C[0x48];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ s16 unk_144;
+    /* 0x146 */ char unk_146[0x2];
+    /* 0x148 */ s8 unk_148;
+    /* 0x149 */ char pad149[8];
+    /* 0x151 */ s8 unk_151;
+    /* 0x152 */ char pad152[1];
+    /* 0x153 */ u8 unk_153;
+    /* 0x154 */ u8 unk_154;
+    /* 0x155 */ char pad155[0x2CB];
+    /* 0x420 */ EnKnightActionFunc actionFunc;
+    /* 0x424 */ char unk_424[0x25C];
+    /* 0x680 */ u8 unk_680;
+    /* 0x681 */ char pad681[9];
+    /* 0x68A */ s16 unk_68A;
+    /* 0x68C */ char pad68C[0x48];
 } EnKnight; // size = 0x6D4
 
 extern const ActorInit En_Knight_InitVars;
diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h
index 6d62df60ad..67e172ee8d 100644
--- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h
+++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h
@@ -62,23 +62,23 @@ typedef struct {
 } EnKusa2UnkBssStruct; // size = 0x1740
 
 typedef struct EnKusa2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ EnKusa2ActionFunc actionFunc;
-    /* 0x0194 */ struct EnKusa2* unk_194[9];
-    /* 0x01B8 */ EnKusa2UnkBssSubStruct* unk_1B8;
-    /* 0x01BC */ s16 unk_1BC;
-    /* 0x01BE */ s8 unk_1BE;
-    /* 0x01C0 */ struct EnKusa2* unk_1C0;
-    /* 0x01C4 */ s16 unk_1C4;
-    /* 0x01C6 */ UNK_TYPE1 unk1C6[0x2];
-    /* 0x01C8 */ s16 unk_1C8;
-    /* 0x01CA */ s16 unk_1CA;
-    /* 0x01CC */ s16 unk_1CC;
-    /* 0x01CE */ s8 unk_1CE;
-    /* 0x01CF */ u8 unk_1CF;
-    /* 0x01D0 */ s8 unk_1D0;
-    /* 0x01D1 */ s8 unk_1D1;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ EnKusa2ActionFunc actionFunc;
+    /* 0x194 */ struct EnKusa2* unk_194[9];
+    /* 0x1B8 */ EnKusa2UnkBssSubStruct* unk_1B8;
+    /* 0x1BC */ s16 unk_1BC;
+    /* 0x1BE */ s8 unk_1BE;
+    /* 0x1C0 */ struct EnKusa2* unk_1C0;
+    /* 0x1C4 */ s16 unk_1C4;
+    /* 0x1C6 */ UNK_TYPE1 unk1C6[0x2];
+    /* 0x1C8 */ s16 unk_1C8;
+    /* 0x1CA */ s16 unk_1CA;
+    /* 0x1CC */ s16 unk_1CC;
+    /* 0x1CE */ s8 unk_1CE;
+    /* 0x1CF */ u8 unk_1CF;
+    /* 0x1D0 */ s8 unk_1D0;
+    /* 0x1D1 */ s8 unk_1D1;
 } EnKusa2; // size = 0x1D4
 
 extern const ActorInit En_Kusa2_InitVars;
diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h
index a683e3f79a..ad6014dd9f 100644
--- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h
+++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h
@@ -8,10 +8,10 @@ struct EnLiftNuts;
 typedef void (*EnLiftNutsActionFunc)(struct EnLiftNuts*, PlayState*);
 
 typedef struct EnLiftNuts {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x90];
-    /* 0x01D4 */ EnLiftNutsActionFunc actionFunc;
-    /* 0x01D8 */ char unk_1D8[0x180];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x90];
+    /* 0x1D4 */ EnLiftNutsActionFunc actionFunc;
+    /* 0x1D8 */ char unk_1D8[0x180];
 } EnLiftNuts; // size = 0x358
 
 extern const ActorInit En_Lift_Nuts_InitVars;
diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h
index 91b8db8714..9d5a1eb247 100644
--- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h
+++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h
@@ -13,26 +13,26 @@ typedef void (*EnLookNutsActionFunc)(struct EnLookNuts*, PlayState*);
 #define LOOKNUTS_GET_PATROL_LOCATION(thisx) (((thisx)->params >> 0x7) & 0x1F)
 
 typedef struct EnLookNuts {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[DEKU_PALACE_GUARD_LIMB_MAX];
-    /* 0x01CA */ Vec3s morphTable[DEKU_PALACE_GUARD_LIMB_MAX];
-    /* 0x020C */ EnLookNutsActionFunc actionFunc;
-    /* 0x0210 */ Path *path;
-    /* 0x0214 */ s16 currentPathIndex; // Index for the point where the deku guard is in its path 
-    /* 0x0216 */ s16 eyeState;
-    /* 0x0218 */ s16 blinkTimer; 
-    /* 0x021A */ s16 eventTimer; // Timer to trigger when another event within the actor will happen
-    /* 0x021C */ s16 state;
-    /* 0x021E */ s16 switchFlag;
-    /* 0x0220 */ s16 pathLocation; // Determines path that a guard will patrol
-    /* 0x0222 */ s16 isPlayerDetected;
-    /* 0x0224 */ s16 waitTimer; // Timer for how long the deku guard will take a break for
-    /* 0x0226 */ s16 spawnIndex;
-    /* 0x0228 */ UNK_TYPE4 pad228; // Unused necessary padding
-    /* 0x022C */ Vec3f headRotation;
-    /* 0x0238 */ Vec3f headRotTarget; // Target value for head rotation
-    /* 0x0244 */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[DEKU_PALACE_GUARD_LIMB_MAX];
+    /* 0x1CA */ Vec3s morphTable[DEKU_PALACE_GUARD_LIMB_MAX];
+    /* 0x20C */ EnLookNutsActionFunc actionFunc;
+    /* 0x210 */ Path *path;
+    /* 0x214 */ s16 currentPathIndex; // Index for the point where the deku guard is in its path 
+    /* 0x216 */ s16 eyeState;
+    /* 0x218 */ s16 blinkTimer; 
+    /* 0x21A */ s16 eventTimer; // Timer to trigger when another event within the actor will happen
+    /* 0x21C */ s16 state;
+    /* 0x21E */ s16 switchFlag;
+    /* 0x220 */ s16 pathLocation; // Determines path that a guard will patrol
+    /* 0x222 */ s16 isPlayerDetected;
+    /* 0x224 */ s16 waitTimer; // Timer for how long the deku guard will take a break for
+    /* 0x226 */ s16 spawnIndex;
+    /* 0x228 */ UNK_TYPE4 pad228; // Unused necessary padding
+    /* 0x22C */ Vec3f headRotation;
+    /* 0x238 */ Vec3f headRotTarget; // Target value for head rotation
+    /* 0x244 */ ColliderCylinder collider;
 } EnLookNuts; // size = 0x290
 
 extern const ActorInit En_Look_Nuts_InitVars;
diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
index d3b6590d4a..14d0227704 100644
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
@@ -8,10 +8,10 @@ struct EnMThunder;
 typedef void (*EnMThunderActionFunc)(struct EnMThunder*, PlayState*);
 
 typedef struct EnMThunder {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x74];
-    /* 0x01B8 */ EnMThunderActionFunc actionFunc;
-    /* 0x01BC */ char unk_1BC[0x8];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x74];
+    /* 0x1B8 */ EnMThunderActionFunc actionFunc;
+    /* 0x1BC */ char unk_1BC[0x8];
 } EnMThunder; // size = 0x1C4
 
 extern const ActorInit En_M_Thunder_InitVars;
diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h
index 2dce575b53..1af506c587 100644
--- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h
+++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h
@@ -11,20 +11,20 @@ typedef void (*EnMarutaActionFunc)(struct EnMaruta*, PlayState*);
 #define ENMARUTA_GET_FF00(thisx) (((thisx)->params & 0xFF00) >> 8)
 
 typedef struct EnMaruta {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnMarutaActionFunc actionFunc;
-    /* 0x0148 */ ColliderCylinder collider;
-    /* 0x0194 */ Vec3f unk_194;
-    /* 0x01A0 */ Vec3f* unk_1A0;
-    /* 0x01A4 */ Vec3f unk_1A4[8];
-    /* 0x0204 */ Vec3f unk_204;
-    /* 0x0210 */ s32 unk_210;
-    /* 0x0214 */ s32 unk_214;
-    /* 0x0218 */ s16 unk_218;
-    /* 0x021A */ s16 unk_21A;
-    /* 0x021C */ s16 unk_21C;
-    /* 0x021E */ s16 unk_21E;
-    /* 0x0220 */ s16 unk_220;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnMarutaActionFunc actionFunc;
+    /* 0x148 */ ColliderCylinder collider;
+    /* 0x194 */ Vec3f unk_194;
+    /* 0x1A0 */ Vec3f* unk_1A0;
+    /* 0x1A4 */ Vec3f unk_1A4[8];
+    /* 0x204 */ Vec3f unk_204;
+    /* 0x210 */ s32 unk_210;
+    /* 0x214 */ s32 unk_214;
+    /* 0x218 */ s16 unk_218;
+    /* 0x21A */ s16 unk_21A;
+    /* 0x21C */ s16 unk_21C;
+    /* 0x21E */ s16 unk_21E;
+    /* 0x220 */ s16 unk_220;
 } EnMaruta; // size = 0x224
 
 extern const ActorInit En_Maruta_InitVars;
diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h
index 754b36d304..427bafa1ef 100644
--- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h
+++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h
@@ -8,9 +8,9 @@ struct EnMinideath;
 typedef void (*EnMinideathActionFunc)(struct EnMinideath*, PlayState*);
 
 typedef struct EnMinideath {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnMinideathActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x164];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnMinideathActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x164];
 } EnMinideath; // size = 0x2AC
 
 extern const ActorInit En_Minideath_InitVars;
diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h
index 9862f37610..ed6cd69979 100644
--- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h
+++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h
@@ -9,16 +9,16 @@ struct EnMk;
 typedef void (*EnMkActionFunc)(struct EnMk*, PlayState*);
 
 typedef struct EnMk {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ Vec3s jointTable[OBJECT_MK_LIMB_MAX];
-    /* 0x0222 */ Vec3s morphTable[OBJECT_MK_LIMB_MAX];
-    /* 0x0270 */ Vec3s unk_270;
-    /* 0x0276 */ s16 unk_276[2];
-    /* 0x027A */ u16 unk_27A;
-    /* 0x027C */ s16 unk_27C;
-    /* 0x0280 */ EnMkActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ Vec3s jointTable[OBJECT_MK_LIMB_MAX];
+    /* 0x222 */ Vec3s morphTable[OBJECT_MK_LIMB_MAX];
+    /* 0x270 */ Vec3s unk_270;
+    /* 0x276 */ s16 unk_276[2];
+    /* 0x27A */ u16 unk_27A;
+    /* 0x27C */ s16 unk_27C;
+    /* 0x280 */ EnMkActionFunc actionFunc;
 } EnMk; // size = 0x284
 
 extern const ActorInit En_Mk_InitVars;
diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h
index 4dcc552be2..200186c447 100644
--- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h
+++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h
@@ -8,9 +8,9 @@ struct EnMkk;
 typedef void (*EnMkkActionFunc)(struct EnMkk*, PlayState*);
 
 typedef struct EnMkk {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnMkkActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x8C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnMkkActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x8C];
 } EnMkk; // size = 0x1D4
 
 extern const ActorInit En_Mkk_InitVars;
diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.h b/src/overlays/actors/ovl_En_Mm/z_en_mm.h
index dc028a8729..e278c8bfd6 100644
--- a/src/overlays/actors/ovl_En_Mm/z_en_mm.h
+++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.h
@@ -8,10 +8,10 @@ struct EnMm;
 typedef void (*EnMmActionFunc)(struct EnMm*, PlayState*);
 
 typedef struct EnMm {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ s16 unk_190;
-    /* 0x0194 */ EnMmActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ s16 unk_190;
+    /* 0x194 */ EnMmActionFunc actionFunc;
 } EnMm; // size = 0x198
 
 #endif // Z_EN_MM_H
diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
index d9e7a028c1..1b3dcc0aa5 100644
--- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
+++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
@@ -8,10 +8,10 @@ struct EnMm2;
 typedef void (*EnMm2ActionFunc)(struct EnMm2*, PlayState*);
 
 typedef struct EnMm2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ UNK_TYPE1 unk_144[0x44];
-    /* 0x0188 */ EnMm2ActionFunc actionFunc;
-    /* 0x018C */ UNK_TYPE1 unk_18C[0x128];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ UNK_TYPE1 unk_144[0x44];
+    /* 0x188 */ EnMm2ActionFunc actionFunc;
+    /* 0x18C */ UNK_TYPE1 unk_18C[0x128];
 } EnMm2; // size = 0x2B4
 
 extern const ActorInit En_Mm2_InitVars;
diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h
index fe6fa69783..b6f653935e 100644
--- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h
+++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h
@@ -8,21 +8,21 @@ struct EnMm3;
 typedef void (*EnMm3ActionFunc)(struct EnMm3*, PlayState*);
 
 typedef struct EnMm3 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ ColliderCylinder collider;
-    /* 0x01D4 */ EnMm3ActionFunc actionFunc;
-    /* 0x01D8 */ UNK_TYPE1 unk1D8[4];
-    /* 0x01DC */ s32 unk_1DC;
-    /* 0x01E0 */ Vec3s jointTable[16];
-    /* 0x0240 */ Vec3s morphTable[16];
-    /* 0x02A0 */ Vec3s unk_2A0;
-    /* 0x02A6 */ Vec3s unk_2A6;
-    /* 0x02AC */ s16 unk_2AC;
-    /* 0x02AE */ s16 unk_2AE;
-    /* 0x02B0 */ u16 unk_2B0;
-    /* 0x02B2 */ u16 unk_2B2;
-    /* 0x02B4 */ u16 unk_2B4;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ ColliderCylinder collider;
+    /* 0x1D4 */ EnMm3ActionFunc actionFunc;
+    /* 0x1D8 */ UNK_TYPE1 unk1D8[4];
+    /* 0x1DC */ s32 unk_1DC;
+    /* 0x1E0 */ Vec3s jointTable[16];
+    /* 0x240 */ Vec3s morphTable[16];
+    /* 0x2A0 */ Vec3s unk_2A0;
+    /* 0x2A6 */ Vec3s unk_2A6;
+    /* 0x2AC */ s16 unk_2AC;
+    /* 0x2AE */ s16 unk_2AE;
+    /* 0x2B0 */ u16 unk_2B0;
+    /* 0x2B2 */ u16 unk_2B2;
+    /* 0x2B4 */ u16 unk_2B4;
 } EnMm3; // size = 0x2B8
 
 extern const ActorInit En_Mm3_InitVars;
diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h
index e61fa6921f..495b8f07bb 100644
--- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h
+++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h
@@ -8,9 +8,9 @@ struct EnMnk;
 typedef void (*EnMnkActionFunc)(struct EnMnk*, PlayState*);
 
 typedef struct EnMnk {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x2A4];
-    /* 0x03E8 */ EnMnkActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x2A4];
+    /* 0x3E8 */ EnMnkActionFunc actionFunc;
 } EnMnk; // size = 0x3EC
 
 extern const ActorInit En_Mnk_InitVars;
diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h
index d36d385b08..159116928c 100644
--- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h
+++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h
@@ -10,39 +10,39 @@ typedef void (*EnMushi2ActionFunc)(struct EnMushi2*, PlayState*);
 #define ENMUSHI2_GET_3(thisx) ((thisx)->params & 3)
 
 typedef struct {
-    /* 0x00 */ s16 unk_00;
-    /* 0x02 */ s16 unk_02;
-} EnMushi2Struct;
+    /* 0x0 */ s16 unk_00;
+    /* 0x2 */ s16 unk_02;
+} EnMushi2Struct; // size = 0x4
 
 typedef struct EnMushi2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[24];
-    /* 0x0218 */ Vec3s morphTable[24];
-    /* 0x02A8 */ ColliderJntSph collider;
-    /* 0x02C8 */ ColliderJntSphElement colliderElements[1];
-    /* 0x0308 */ EnMushi2ActionFunc actionFunc;
-    /* 0x030C */ s32 unk_30C;
-    /* 0x0310 */ Vec3f unk_310;
-    /* 0x031C */ Vec3f unk_31C;
-    /* 0x0328 */ Vec3f unk_328;
-    /* 0x0334 */ CollisionPoly* poly;
-    /* 0x0338 */ s32 polyBgId;
-    /* 0x033C */ Vec3f unk_33C;
-    /* 0x0348 */ f32 unk_348;
-    /* 0x034C */ struct ObjBean* unk_34C;
-    /* 0x0350 */ f32 unk_350;
-    /* 0x0354 */ f32 unk_354;
-    /* 0x0358 */ f32 unk_358;
-    /* 0x035C */ f32 unk_35C;
-    /* 0x0360 */ f32 unk_360;
-    /* 0x0364 */ s16 unk_364;
-    /* 0x0366 */ s16 unk_366;
-    /* 0x0368 */ s16 unk_368;
-    /* 0x036A */ s16 unk_36A;
-    /* 0x036C */ s16 unk_36C;
-    /* 0x036E */ s16 unk_36E;
-    /* 0x0370 */ s16 unk_370;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[24];
+    /* 0x218 */ Vec3s morphTable[24];
+    /* 0x2A8 */ ColliderJntSph collider;
+    /* 0x2C8 */ ColliderJntSphElement colliderElements[1];
+    /* 0x308 */ EnMushi2ActionFunc actionFunc;
+    /* 0x30C */ s32 unk_30C;
+    /* 0x310 */ Vec3f unk_310;
+    /* 0x31C */ Vec3f unk_31C;
+    /* 0x328 */ Vec3f unk_328;
+    /* 0x334 */ CollisionPoly* poly;
+    /* 0x338 */ s32 polyBgId;
+    /* 0x33C */ Vec3f unk_33C;
+    /* 0x348 */ f32 unk_348;
+    /* 0x34C */ struct ObjBean* unk_34C;
+    /* 0x350 */ f32 unk_350;
+    /* 0x354 */ f32 unk_354;
+    /* 0x358 */ f32 unk_358;
+    /* 0x35C */ f32 unk_35C;
+    /* 0x360 */ f32 unk_360;
+    /* 0x364 */ s16 unk_364;
+    /* 0x366 */ s16 unk_366;
+    /* 0x368 */ s16 unk_368;
+    /* 0x36A */ s16 unk_36A;
+    /* 0x36C */ s16 unk_36C;
+    /* 0x36E */ s16 unk_36E;
+    /* 0x370 */ s16 unk_370;
 } EnMushi2; // size = 0x374
 
 extern const ActorInit En_Mushi2_InitVars;
diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.h b/src/overlays/actors/ovl_En_Muto/z_en_muto.h
index 12517f1e30..e05e294920 100644
--- a/src/overlays/actors/ovl_En_Muto/z_en_muto.h
+++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.h
@@ -8,26 +8,26 @@ struct EnMuto;
 typedef void (*EnMutoActionFunc)(struct EnMuto*, PlayState*);
 
 typedef struct EnMuto {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[17];
-    /* 0x01EE */ Vec3s morphTable[17];
-    /* 0x0254 */ EnMutoActionFunc actionFunc;
-    /* 0x0258 */ Vec3s headRot;
-    /* 0x025E */ Vec3s headRotTarget;
-    /* 0x0262 */ Vec3s waistRot;
-    /* 0x026A */ Vec3s waistRotTarget;
-    /* 0x0270 */ s16 unusedCounter;
-    /* 0x0274 */ f32 frameIndex;
-    /* 0x0278 */ s16 isInDialogue;
-    /* 0x027A */ s16 textIdIndex;
-    /* 0x027C */ s16 yawTowardsTarget;
-    /* 0x0280 */ s32 isInMayorsRoom;
-    /* 0x0284 */ s32 shouldSetHeadRotation;
-    /* 0x0288 */ Actor* targetActor;
-    /* 0x028C */ s32 cutsceneState;
-    /* 0x0290 */ s32 animIndex;
-    /* 0x0294 */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[17];
+    /* 0x1EE */ Vec3s morphTable[17];
+    /* 0x254 */ EnMutoActionFunc actionFunc;
+    /* 0x258 */ Vec3s headRot;
+    /* 0x25E */ Vec3s headRotTarget;
+    /* 0x262 */ Vec3s waistRot;
+    /* 0x26A */ Vec3s waistRotTarget;
+    /* 0x270 */ s16 unusedCounter;
+    /* 0x274 */ f32 frameIndex;
+    /* 0x278 */ s16 isInDialogue;
+    /* 0x27A */ s16 textIdIndex;
+    /* 0x27C */ s16 yawTowardsTarget;
+    /* 0x280 */ s32 isInMayorsRoom;
+    /* 0x284 */ s32 shouldSetHeadRotation;
+    /* 0x288 */ Actor* targetActor;
+    /* 0x28C */ s32 cutsceneState;
+    /* 0x290 */ s32 animIndex;
+    /* 0x294 */ ColliderCylinder collider;
 } EnMuto; // size = 0x2E0
 
 extern const ActorInit En_Muto_InitVars;
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 1fab2e6493..b094456d92 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.h
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h
@@ -8,10 +8,10 @@ struct EnNb;
 typedef void (*EnNbActionFunc)(struct EnNb*, PlayState*);
 
 typedef struct EnNb {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnNbActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x110];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ EnNbActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x110];
 } EnNb; // size = 0x29C
 
 extern const ActorInit En_Nb_InitVars;
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 aaa3c0fe68..2be60884e7 100644
--- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h
+++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h
@@ -9,15 +9,15 @@ struct EnNiw;
 typedef void (*EnNiwActionFunc)(struct EnNiw*, PlayState*);
 
 typedef struct {
-    /* 0x0000 */ u8 isEnabled;
-    /* 0x0004 */ Vec3f pos;
-    /* 0x0010 */ Vec3f vel;
-    /* 0x001C */ Vec3f accel;
-    /* 0x0028 */ s16 life;
-    /* 0x002A */ s16 zRotStart;
-    /* 0x002C */ f32 scale;
-    /* 0x0030 */ f32 zRot;
-    /* 0x0034 */ u8 timer;
+    /* 0x00 */ u8 isEnabled;
+    /* 0x04 */ Vec3f pos;
+    /* 0x10 */ Vec3f vel;
+    /* 0x1C */ Vec3f accel;
+    /* 0x28 */ s16 life;
+    /* 0x2A */ s16 zRotStart;
+    /* 0x2C */ f32 scale;
+    /* 0x30 */ f32 zRot;
+    /* 0x34 */ u8 timer;
 } EnNiwFeather; // size = 0x38
 
 #define NIW_FEATHER_COUNT 20
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
index 38f19a6b14..6825adb4d3 100644
--- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
+++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
@@ -8,9 +8,9 @@ struct EnOkarinaTag;
 typedef void (*EnOkarinaTagActionFunc)(struct EnOkarinaTag*, PlayState*);
 
 typedef struct EnOkarinaTag {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnOkarinaTagActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x14];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnOkarinaTagActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x14];
 } EnOkarinaTag; // size = 0x15C
 
 extern const ActorInit En_Okarina_Tag_InitVars;
diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
index a4b30069a7..c23a4db364 100644
--- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
+++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
@@ -8,10 +8,10 @@ struct EnOkuta;
 typedef void (*EnOkutaActionFunc)(struct EnOkuta*, PlayState*);
 
 typedef struct EnOkuta {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnOkutaActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x1A8];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ EnOkutaActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x1A8];
 } EnOkuta; // size = 0x334
 
 extern const ActorInit En_Okuta_InitVars;
diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.h b/src/overlays/actors/ovl_En_Osk/z_en_osk.h
index 32c27d29ff..d8a4be4ce3 100644
--- a/src/overlays/actors/ovl_En_Osk/z_en_osk.h
+++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.h
@@ -13,15 +13,15 @@ typedef void (*EnOskActionFunc)(struct EnOsk*, PlayState*);
 #define ENOSK_2 2
 
 typedef struct EnOsk {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[17];
-    /* 0x01EE */ Vec3s morphTable[17];
-    /* 0x0254 */ s16 unk_254;
-    /* 0x0256 */ s16 unk_256;
-    /* 0x0258 */ u16 unk_258;
-    /* 0x025C */ f32 unk_25C;
-    /* 0x0260 */ EnOskActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[17];
+    /* 0x1EE */ Vec3s morphTable[17];
+    /* 0x254 */ s16 unk_254;
+    /* 0x256 */ s16 unk_256;
+    /* 0x258 */ u16 unk_258;
+    /* 0x25C */ f32 unk_25C;
+    /* 0x260 */ EnOskActionFunc actionFunc;
 } EnOsk; // size = 0x264
 
 extern const ActorInit En_Osk_InitVars;
diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.h b/src/overlays/actors/ovl_En_Osn/z_en_osn.h
index 30ce8e5388..fdc8ed2c76 100644
--- a/src/overlays/actors/ovl_En_Osn/z_en_osn.h
+++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.h
@@ -8,22 +8,22 @@ struct EnOsn;
 typedef void (*EnOsnActionFunc)(struct EnOsn*, PlayState*);
 
 typedef struct EnOsn {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ EnOsnActionFunc actionFunc;
-    /* 0x01D8 */ Vec3s unk_1D8;
-    /* 0x01DE */ Vec3s unk_1DE;
-    /* 0x01E4 */ UNK_TYPE1 unk_1E4[0x6];
-    /* 0x01EA */ u16  unk_1EA;
-    /* 0x01EC */ u8 unk_1EC;
-    /* 0x01ED */ u8 unk_1ED;
-    /* 0x01EE */ s16 cutscene;
-    /* 0x01F0 */ u8 unk_1F0;
-    /* 0x01F1 */ UNK_TYPE1 unk_1F1[0x3];
-    /* 0x01F4 */ u16 unk_1F4;
-    /* 0x01F6 */ s32 unk_1F6;
-    /* 0x01FA */ u8 unk_1FA;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ EnOsnActionFunc actionFunc;
+    /* 0x1D8 */ Vec3s unk_1D8;
+    /* 0x1DE */ Vec3s unk_1DE;
+    /* 0x1E4 */ UNK_TYPE1 unk_1E4[0x6];
+    /* 0x1EA */ u16  unk_1EA;
+    /* 0x1EC */ u8 unk_1EC;
+    /* 0x1ED */ u8 unk_1ED;
+    /* 0x1EE */ s16 cutscene;
+    /* 0x1F0 */ u8 unk_1F0;
+    /* 0x1F1 */ UNK_TYPE1 unk_1F1[0x3];
+    /* 0x1F4 */ u16 unk_1F4;
+    /* 0x1F6 */ s32 unk_1F6;
+    /* 0x1FA */ u8 unk_1FA;
 } EnOsn; // size = 0x1FB
 
 extern const ActorInit En_Osn_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.h b/src/overlays/actors/ovl_En_Ot/z_en_ot.h
index 4f940fda82..6f4bf21051 100644
--- a/src/overlays/actors/ovl_En_Ot/z_en_ot.h
+++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.h
@@ -29,39 +29,39 @@ typedef struct {
 } EnOtUnkStruct; // size = 0x5C
 
 typedef struct EnOt {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnOtActionFunc actionFunc;
-    /* 0x0148 */ SkelAnime skelAnime;
-    /* 0x018C */ ColliderCylinder collider;
-    /* 0x01D8 */ Vec3s jointTable[19];
-    /* 0x024A */ Vec3s morphTable[19];
-    /* 0x02BC */ s32 animIdx;
-    /* 0x02C0 */ ActorPathing actorPath;
-    /* 0x032C */ u16 unk_32C;
-    /* 0x0330 */ Vec3f unk_330;
-    /* 0x033C */ s32 unk_33C;
-    /* 0x0340 */ s32 unk_340;
-    /* 0x0344 */ s16 unk_344;
-    /* 0x0346 */ s16 unk_346;
-    /* 0x0348 */ Vec3f unk_348;
-    /* 0x0354 */ s16 unk_354;
-    /* 0x0356 */ s16 cutscenes[4];
-    /* 0x0360 */ struct EnOt* unk_360;
-    /* 0x0364 */ LightNode* lightNode;
-    /* 0x0368 */ LightInfo lightInfo;
-    /* 0x0378 */ Vec3f unk_378;
-    /* 0x0384 */ u8 unk_384;
-    /* 0x0388 */ s32 unk_388;
-    /* 0x038C */ s32 unk_38C;
-    /* 0x0390 */ s16 unk_390;
-    /* 0x0394 */ Vec3f unk_394;
-    /* 0x03A0 */ s16 unk_3A0;
-    /* 0x03A4 */ EnOtUnkStruct unk_3A4[10];
-    /* 0x073C */ s16 unk_73C;
-    /* 0x0740 */ f32 unk_740;
-    /* 0x0744 */ Color_RGB8 unk_744;
-    /* 0x0747 */ Color_RGB8 unk_747;
-    /* 0x074C */ Vec3f unk_74C;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnOtActionFunc actionFunc;
+    /* 0x148 */ SkelAnime skelAnime;
+    /* 0x18C */ ColliderCylinder collider;
+    /* 0x1D8 */ Vec3s jointTable[19];
+    /* 0x24A */ Vec3s morphTable[19];
+    /* 0x2BC */ s32 animIdx;
+    /* 0x2C0 */ ActorPathing actorPath;
+    /* 0x32C */ u16 unk_32C;
+    /* 0x330 */ Vec3f unk_330;
+    /* 0x33C */ s32 unk_33C;
+    /* 0x340 */ s32 unk_340;
+    /* 0x344 */ s16 unk_344;
+    /* 0x346 */ s16 unk_346;
+    /* 0x348 */ Vec3f unk_348;
+    /* 0x354 */ s16 unk_354;
+    /* 0x356 */ s16 cutscenes[4];
+    /* 0x360 */ struct EnOt* unk_360;
+    /* 0x364 */ LightNode* lightNode;
+    /* 0x368 */ LightInfo lightInfo;
+    /* 0x378 */ Vec3f unk_378;
+    /* 0x384 */ u8 unk_384;
+    /* 0x388 */ s32 unk_388;
+    /* 0x38C */ s32 unk_38C;
+    /* 0x390 */ s16 unk_390;
+    /* 0x394 */ Vec3f unk_394;
+    /* 0x3A0 */ s16 unk_3A0;
+    /* 0x3A4 */ EnOtUnkStruct unk_3A4[10];
+    /* 0x73C */ s16 unk_73C;
+    /* 0x740 */ f32 unk_740;
+    /* 0x744 */ Color_RGB8 unk_744;
+    /* 0x747 */ Color_RGB8 unk_747;
+    /* 0x74C */ Vec3f unk_74C;
 } EnOt; // size = 0x758
 
 extern const ActorInit En_Ot_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 9da8ed9d72..781fd308c7 100644
--- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h
+++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h
@@ -21,39 +21,39 @@ typedef enum {
 } EnOwlType;
 
 typedef struct EnOwl {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime1;
-    /* 0x01D4 */ Vec3s jointTable1[21];
-    /* 0x0252 */ Vec3s morphTable1[21];
-    /* 0x02D0 */ SkelAnime skelAnime2;
-    /* 0x0314 */ Vec3s jointTable2[16];
-    /* 0x0374 */ Vec3s morphTable2[16];
-    /* 0x03D4 */ SkelAnime* skelAnime3;
-    /* 0x03D8 */ s16 unk_3D8;
-    /* 0x03DA */ s16 unk_3DA;
-    /* 0x03DC */ s16 unk_3DC;
-    /* 0x03DE */ s16 unk_3DE;
-    /* 0x03E0 */ s16 eyeTexIndex;
-    /* 0x03E2 */ s16 blinkTimer;
-    /* 0x03E4 */ f32 unk_3E4;
-    /* 0x03E8 */ u16 actionFlags;
-    /* 0x03EA */ s16 unk_3EA;
-    /* 0x03EC */ s16 unk_3EC;
-    /* 0x03F0 */ f32 unk_3F0;
-    /* 0x03F4 */ Path* path;
-    /* 0x03F8 */ s32 unk_3F8;
-    /* 0x03FC */ s32 unk_3FC;
-    /* 0x0400 */ s16 unk_400[3];
-    /* 0x0406 */ s16 unk_406;
-    /* 0x0408 */ u8 unk_408;
-    /* 0x0409 */ u8 unk_409;
-    /* 0x040A */ u8 unk_40A;
-    /* 0x040B */ u8 unk_40B;
-    /* 0x040C */ u8 unk_40C;
-    /* 0x040D */ u8 unk_40D;
-    /* 0x0410 */ EnOwlActionFunc actionFunc;
-    /* 0x0414 */ EnOwlFunc unk_414;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime1;
+    /* 0x1D4 */ Vec3s jointTable1[21];
+    /* 0x252 */ Vec3s morphTable1[21];
+    /* 0x2D0 */ SkelAnime skelAnime2;
+    /* 0x314 */ Vec3s jointTable2[16];
+    /* 0x374 */ Vec3s morphTable2[16];
+    /* 0x3D4 */ SkelAnime* skelAnime3;
+    /* 0x3D8 */ s16 unk_3D8;
+    /* 0x3DA */ s16 unk_3DA;
+    /* 0x3DC */ s16 unk_3DC;
+    /* 0x3DE */ s16 unk_3DE;
+    /* 0x3E0 */ s16 eyeTexIndex;
+    /* 0x3E2 */ s16 blinkTimer;
+    /* 0x3E4 */ f32 unk_3E4;
+    /* 0x3E8 */ u16 actionFlags;
+    /* 0x3EA */ s16 unk_3EA;
+    /* 0x3EC */ s16 unk_3EC;
+    /* 0x3F0 */ f32 unk_3F0;
+    /* 0x3F4 */ Path* path;
+    /* 0x3F8 */ s32 unk_3F8;
+    /* 0x3FC */ s32 unk_3FC;
+    /* 0x400 */ s16 unk_400[3];
+    /* 0x406 */ s16 unk_406;
+    /* 0x408 */ u8 unk_408;
+    /* 0x409 */ u8 unk_409;
+    /* 0x40A */ u8 unk_40A;
+    /* 0x40B */ u8 unk_40B;
+    /* 0x40C */ u8 unk_40C;
+    /* 0x40D */ u8 unk_40D;
+    /* 0x410 */ EnOwlActionFunc actionFunc;
+    /* 0x414 */ EnOwlFunc unk_414;
 } EnOwl; // size = 0x418
 
 extern const ActorInit En_Owl_InitVars;
diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.h b/src/overlays/actors/ovl_En_Paper/z_en_paper.h
index 292358e4a7..9c4e6cc501 100644
--- a/src/overlays/actors/ovl_En_Paper/z_en_paper.h
+++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.h
@@ -8,9 +8,9 @@ struct EnPaper;
 typedef void (*EnPaperActionFunc)(struct EnPaper*, PlayState*);
 
 typedef struct EnPaper {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnPaperActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0xC40];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnPaperActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0xC40];
 } EnPaper; // size = 0xD88
 
 extern const ActorInit En_Paper_InitVars;
diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.h b/src/overlays/actors/ovl_En_Pm/z_en_pm.h
index 1a16ece453..4de822535c 100644
--- a/src/overlays/actors/ovl_En_Pm/z_en_pm.h
+++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.h
@@ -10,52 +10,52 @@ typedef s32 (*EnPmFunc)(struct EnPm*, PlayState*);
 typedef s32 (*EnPmFunc2)(struct EnPm*, PlayState*);
 
 typedef struct EnPm {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnPmActionFunc actionFunc;
-    /* 0x018C */ EnPmFunc2 unk_18C;
-    /* 0x0190 */ ColliderCylinder colliderCylinder;
-    /* 0x01DC */ ColliderSphere colliderSphere;
-    /* 0x0234 */ Path* timePath;
-    /* 0x0238 */ Vec3f timePathTargetPos;
-    /* 0x0244 */ f32 timePathProgress;
-    /* 0x0248 */ s32 timePathTotalTime;
-    /* 0x024C */ s32 timePathWaypointTime;
-    /* 0x0250 */ s32 timePathWaypoint;
-    /* 0x0254 */ s32 timePathElapsedTime;
-    /* 0x0258 */ u8 unk_258;
-    /* 0x025C */ UNK_TYPE* unk_25C;
-    /* 0x0260 */ s8 unk_260;
-    /* 0x0264 */ s32 unk_264;
-    /* 0x0268 */ Actor* unk_268;
-    /* 0x026C */ Vec3f unk_26C;
-    /* 0x0278 */ Vec3f unk_278;
-    /* 0x0284 */ Vec3f unk_284;
-    /* 0x0290 */ Vec3s unk_290;
-    /* 0x0296 */ Vec3s jointTable[16];
-    /* 0x02F6 */ Vec3s morphTable[16];
-    /* 0x0356 */ u16 unk_356;
-    /* 0x0358 */ u16 unk_358;
-    /* 0x035C */ f32 unk_35C;
-    /* 0x0360 */ f32 unk_360;
-    /* 0x0364 */ f32 unk_364;
-    /* 0x0368 */ f32 unk_368;
-    /* 0x036C */ s16 unk_36C;
-    /* 0x036E */ s16 unk_36E;
-    /* 0x0370 */ s16 unk_370;
-    /* 0x0372 */ s16 unk_372;
-    /* 0x0374 */ s16 timePathTimeSpeed;
-    /* 0x0376 */ s16 unk_376;
-    /* 0x0378 */ s16 unk_378;
-    /* 0x037C */ EnPmFunc unk_37C;
-    /* 0x0380 */ s32 unk_380;
-    /* 0x0384 */ s32 unk_384;
-    /* 0x0388 */ s32 unk_388;
-    /* 0x038C */ s32 unk_38C;
-    /* 0x0390 */ UNK_TYPE1 unk390[0x4];
-    /* 0x0394 */ s32 unk_394;
-    /* 0x0398 */ s32 unk_398;
-    /* 0x039C */ UNK_TYPE1 unk39C[0x4];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnPmActionFunc actionFunc;
+    /* 0x18C */ EnPmFunc2 unk_18C;
+    /* 0x190 */ ColliderCylinder colliderCylinder;
+    /* 0x1DC */ ColliderSphere colliderSphere;
+    /* 0x234 */ Path* timePath;
+    /* 0x238 */ Vec3f timePathTargetPos;
+    /* 0x244 */ f32 timePathProgress;
+    /* 0x248 */ s32 timePathTotalTime;
+    /* 0x24C */ s32 timePathWaypointTime;
+    /* 0x250 */ s32 timePathWaypoint;
+    /* 0x254 */ s32 timePathElapsedTime;
+    /* 0x258 */ u8 unk_258;
+    /* 0x25C */ UNK_TYPE* unk_25C;
+    /* 0x260 */ s8 unk_260;
+    /* 0x264 */ s32 unk_264;
+    /* 0x268 */ Actor* unk_268;
+    /* 0x26C */ Vec3f unk_26C;
+    /* 0x278 */ Vec3f unk_278;
+    /* 0x284 */ Vec3f unk_284;
+    /* 0x290 */ Vec3s unk_290;
+    /* 0x296 */ Vec3s jointTable[16];
+    /* 0x2F6 */ Vec3s morphTable[16];
+    /* 0x356 */ u16 unk_356;
+    /* 0x358 */ u16 unk_358;
+    /* 0x35C */ f32 unk_35C;
+    /* 0x360 */ f32 unk_360;
+    /* 0x364 */ f32 unk_364;
+    /* 0x368 */ f32 unk_368;
+    /* 0x36C */ s16 unk_36C;
+    /* 0x36E */ s16 unk_36E;
+    /* 0x370 */ s16 unk_370;
+    /* 0x372 */ s16 unk_372;
+    /* 0x374 */ s16 timePathTimeSpeed;
+    /* 0x376 */ s16 unk_376;
+    /* 0x378 */ s16 unk_378;
+    /* 0x37C */ EnPmFunc unk_37C;
+    /* 0x380 */ s32 unk_380;
+    /* 0x384 */ s32 unk_384;
+    /* 0x388 */ s32 unk_388;
+    /* 0x38C */ s32 unk_38C;
+    /* 0x390 */ UNK_TYPE1 unk390[0x4];
+    /* 0x394 */ s32 unk_394;
+    /* 0x398 */ s32 unk_398;
+    /* 0x39C */ UNK_TYPE1 unk39C[0x4];
 } EnPm; // size = 0x3A0
 
 extern const ActorInit En_Pm_InitVars;
diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
index 88d240c588..3d70aa8a43 100644
--- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
+++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
@@ -8,10 +8,10 @@ struct EnPoComposer;
 typedef void (*EnPoComposerActionFunc)(struct EnPoComposer*, PlayState*);
 
 typedef struct EnPoComposer {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0xF0];
-    /* 0x0234 */ EnPoComposerActionFunc actionFunc;
-    /* 0x0238 */ char unk_238[0x108];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0xF0];
+    /* 0x234 */ EnPoComposerActionFunc actionFunc;
+    /* 0x238 */ char unk_238[0x108];
 } EnPoComposer; // size = 0x340
 
 extern const ActorInit En_Po_Composer_InitVars;
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 8923a70991..67e84d0dc0 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
@@ -12,32 +12,32 @@ typedef void (*EnPoSistersActionFunc)(struct EnPoSisters*, PlayState*);
 #define ENPOSISTERS_GET_1000(thisx) ((thisx)->params & 0x1000)
 
 typedef struct EnPoSisters {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnPoSistersActionFunc actionFunc;
-    /* 0x018C */ u8 unk_18C;
-    /* 0x018D */ u8 unk_18D;
-    /* 0x018E */ u8 unk_18E;
-    /* 0x018F */ u8 unk_18F;
-    /* 0x0190 */ u8 unk_190;
-    /* 0x0191 */ u8 unk_191;
-    /* 0x0192 */ s16 unk_192;
-    /* 0x0194 */ s16 unk_194;
-    /* 0x0196 */ Vec3s jointTable[12];
-    /* 0x01DE */ Vec3s morphTable[12];
-    /* 0x0226 */ u8 unk_226;
-    /* 0x0227 */ u8 unk_227;
-    /* 0x0228 */ u8 unk_228;
-    /* 0x0229 */ u8 unk_229;
-    /* 0x022C */ Vec3f unk_22C[8];
-    /* 0x028C */ Vec3f limbPos[8];
-    /* 0x02EC */ f32 unk_2EC;
-    /* 0x02F0 */ f32 drawDmgEffAlpha;
-    /* 0x02F4 */ f32 drawDmgEffScale;
-    /* 0x02F8 */ LightNode* lightNode;
-    /* 0x02FC */ LightInfo lightInfo;
-    /* 0x030C */ ColliderCylinder collider;
-    /* 0x0358 */ MtxF unk_358;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnPoSistersActionFunc actionFunc;
+    /* 0x18C */ u8 unk_18C;
+    /* 0x18D */ u8 unk_18D;
+    /* 0x18E */ u8 unk_18E;
+    /* 0x18F */ u8 unk_18F;
+    /* 0x190 */ u8 unk_190;
+    /* 0x191 */ u8 unk_191;
+    /* 0x192 */ s16 unk_192;
+    /* 0x194 */ s16 unk_194;
+    /* 0x196 */ Vec3s jointTable[12];
+    /* 0x1DE */ Vec3s morphTable[12];
+    /* 0x226 */ u8 unk_226;
+    /* 0x227 */ u8 unk_227;
+    /* 0x228 */ u8 unk_228;
+    /* 0x229 */ u8 unk_229;
+    /* 0x22C */ Vec3f unk_22C[8];
+    /* 0x28C */ Vec3f limbPos[8];
+    /* 0x2EC */ f32 unk_2EC;
+    /* 0x2F0 */ f32 drawDmgEffAlpha;
+    /* 0x2F4 */ f32 drawDmgEffScale;
+    /* 0x2F8 */ LightNode* lightNode;
+    /* 0x2FC */ LightInfo lightInfo;
+    /* 0x30C */ ColliderCylinder collider;
+    /* 0x358 */ MtxF unk_358;
 } EnPoSisters; // size = 0x398
 
 extern const ActorInit En_Po_Sisters_InitVars;
diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h
index fc0e7db74b..083b44f3f5 100644
--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h
@@ -8,33 +8,33 @@ struct EnPoh;
 typedef void (*EnPohActionFunc)(struct EnPoh*, PlayState*);
 
 typedef struct EnPoh {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnPohActionFunc actionFunc;
-    /* 0x018C */ u8 unk_18C;
-    /* 0x018D */ u8 unk_18D;
-    /* 0x018E */ s16 unk_18E;
-    /* 0x0190 */ s16 unk_190;
-    /* 0x0192 */ s16 unk_192;
-    /* 0x0194 */ u8 unk_194;
-    /* 0x0195 */ u8 unk_195;
-    /* 0x0196 */ u8 unk_196;
-    /* 0x0197 */ u8 unk_197;
-    /* 0x0198 */ u8 unk_198;
-    /* 0x0199 */ u8 unk_199;
-    /* 0x019A */ u8 unk_19A;
-    /* 0x019B */ u8 unk_19B;
-    /* 0x019C */ Vec3s jointTable[21];
-    /* 0x021A */ Vec3s morphTable[21];
-    /* 0x0298 */ f32 drawDmgEffAlpha;
-    /* 0x029C */ f32 drawDmgEffScale;
-    /* 0x02A0 */ Vec3f limbPos[10];
-    /* 0x0318 */ LightNode* lightNode;
-    /* 0x031C */ LightInfo lightInfo;
-    /* 0x032C */ ColliderCylinder colliderCylinder;
-    /* 0x0378 */ ColliderJntSph colliderSph;
-    /* 0x0398 */ ColliderJntSphElement colliderSphElements[1];
-    /* 0x03D8 */ MtxF unk_3D8;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnPohActionFunc actionFunc;
+    /* 0x18C */ u8 unk_18C;
+    /* 0x18D */ u8 unk_18D;
+    /* 0x18E */ s16 unk_18E;
+    /* 0x190 */ s16 unk_190;
+    /* 0x192 */ s16 unk_192;
+    /* 0x194 */ u8 unk_194;
+    /* 0x195 */ u8 unk_195;
+    /* 0x196 */ u8 unk_196;
+    /* 0x197 */ u8 unk_197;
+    /* 0x198 */ u8 unk_198;
+    /* 0x199 */ u8 unk_199;
+    /* 0x19A */ u8 unk_19A;
+    /* 0x19B */ u8 unk_19B;
+    /* 0x19C */ Vec3s jointTable[21];
+    /* 0x21A */ Vec3s morphTable[21];
+    /* 0x298 */ f32 drawDmgEffAlpha;
+    /* 0x29C */ f32 drawDmgEffScale;
+    /* 0x2A0 */ Vec3f limbPos[10];
+    /* 0x318 */ LightNode* lightNode;
+    /* 0x31C */ LightInfo lightInfo;
+    /* 0x32C */ ColliderCylinder colliderCylinder;
+    /* 0x378 */ ColliderJntSph colliderSph;
+    /* 0x398 */ ColliderJntSphElement colliderSphElements[1];
+    /* 0x3D8 */ MtxF unk_3D8;
 } EnPoh; // size = 0x418
 
 extern const ActorInit En_Poh_InitVars;
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 bf70acb8d7..4fab409b21 100644
--- a/src/overlays/actors/ovl_En_Pp/z_en_pp.h
+++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.h
@@ -8,10 +8,10 @@ struct EnPp;
 typedef void (*EnPpActionFunc)(struct EnPp*, PlayState*);
 
 typedef struct EnPp {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x17C];
-    /* 0x02C0 */ EnPpActionFunc actionFunc;
-    /* 0x02C4 */ char unk_2C4[0x328];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x17C];
+    /* 0x2C0 */ EnPpActionFunc actionFunc;
+    /* 0x2C4 */ char unk_2C4[0x328];
 } EnPp; // size = 0x5EC
 
 extern const ActorInit En_Pp_InitVars;
diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.h b/src/overlays/actors/ovl_En_Pr/z_en_pr.h
index 4b36fee9c9..6a5fe8b5a8 100644
--- a/src/overlays/actors/ovl_En_Pr/z_en_pr.h
+++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.h
@@ -13,45 +13,45 @@ typedef void (*EnPrActionFunc)(struct EnPr*, PlayState*);
 #define ENPR_FF00_MIN 0
 
 typedef struct EnPr {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[10];
-    /* 0x01C4 */ Vec3s morphTable[10];
-    /* 0x0200 */ EnPrActionFunc actionFunc;
-    /* 0x0204 */ u8 unk_204;
-    /* 0x0206 */ s16 unk_206;
-    /* 0x0208 */ s16 unk_208;
-    /* 0x020A */ s16 unk_20A;
-    /* 0x020C */ s16 unk_20C;
-    /* 0x020E */ s16 unk_20E;
-    /* 0x0210 */ s16 unk_210;
-    /* 0x0212 */ s16 unk_212;
-    /* 0x0214 */ s16 unk_214;
-    /* 0x0216 */ s16 unk_216;
-    /* 0x0218 */ UNK_TYPE1 unk218[4];
-    /* 0x021C */ s32 unk_21C;
-    /* 0x0220 */ UNK_TYPE1 unk220[0x8];
-    /* 0x0228 */ s32 unk_228;
-    /* 0x022C */ s16 unk_22C;
-    /* 0x022E */ s16 drawDmgEffAlpha;
-    /* 0x0230 */ s16 drawDmgEffType;
-    /* 0x0234 */ f32 unk_234;
-    /* 0x0238 */ f32 unk_238;
-    /* 0x023C */ Vec3f limbPos[10];
-    /* 0x02B4 */ f32 unk_2B4;
-    /* 0x02B8 */ f32 unk_2B8;
-    /* 0x02BC */ f32 unk_2BC;
-    /* 0x02C0 */ f32 unk_2C0;
-    /* 0x02C4 */ f32 unk_2C4;
-    /* 0x02C8 */ f32 unk_2C8;
-    /* 0x02CC */ f32 unk_2CC;
-    /* 0x02D0 */ s16 unk_2D0;
-    /* 0x02D2 */ s16 unk_2D2;
-    /* 0x02D4 */ Vec3f unk_2D4;
-    /* 0x02E0 */ Vec3f unk_2E0;
-    /* 0x02EC */ UNK_TYPE1 unk2EC[0xC];
-    /* 0x02F8 */ Actor* unk_2F8;
-    /* 0x02FC */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[10];
+    /* 0x1C4 */ Vec3s morphTable[10];
+    /* 0x200 */ EnPrActionFunc actionFunc;
+    /* 0x204 */ u8 unk_204;
+    /* 0x206 */ s16 unk_206;
+    /* 0x208 */ s16 unk_208;
+    /* 0x20A */ s16 unk_20A;
+    /* 0x20C */ s16 unk_20C;
+    /* 0x20E */ s16 unk_20E;
+    /* 0x210 */ s16 unk_210;
+    /* 0x212 */ s16 unk_212;
+    /* 0x214 */ s16 unk_214;
+    /* 0x216 */ s16 unk_216;
+    /* 0x218 */ UNK_TYPE1 unk218[4];
+    /* 0x21C */ s32 unk_21C;
+    /* 0x220 */ UNK_TYPE1 unk220[0x8];
+    /* 0x228 */ s32 unk_228;
+    /* 0x22C */ s16 unk_22C;
+    /* 0x22E */ s16 drawDmgEffAlpha;
+    /* 0x230 */ s16 drawDmgEffType;
+    /* 0x234 */ f32 unk_234;
+    /* 0x238 */ f32 unk_238;
+    /* 0x23C */ Vec3f limbPos[10];
+    /* 0x2B4 */ f32 unk_2B4;
+    /* 0x2B8 */ f32 unk_2B8;
+    /* 0x2BC */ f32 unk_2BC;
+    /* 0x2C0 */ f32 unk_2C0;
+    /* 0x2C4 */ f32 unk_2C4;
+    /* 0x2C8 */ f32 unk_2C8;
+    /* 0x2CC */ f32 unk_2CC;
+    /* 0x2D0 */ s16 unk_2D0;
+    /* 0x2D2 */ s16 unk_2D2;
+    /* 0x2D4 */ Vec3f unk_2D4;
+    /* 0x2E0 */ Vec3f unk_2E0;
+    /* 0x2EC */ UNK_TYPE1 unk2EC[0xC];
+    /* 0x2F8 */ Actor* unk_2F8;
+    /* 0x2FC */ ColliderCylinder collider;
 } EnPr; // size = 0x348
 
 extern const ActorInit En_Pr_InitVars;
diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
index 3721a98cc4..df5afef4e4 100644
--- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
+++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
@@ -11,44 +11,44 @@ typedef void (*EnPr2ActionFunc)(struct EnPr2*, PlayState*);
 #define ENPR2_GET_FF0(thisx) (((thisx)->params >> 4) & 0xFF)
 
 typedef struct EnPr2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[5];
-    /* 0x01A6 */ Vec3s morphtable[5];
-    /* 0x01C4 */ EnPr2ActionFunc actionFunc;
-    /* 0x01C8 */ s16 unk_1C8;
-    /* 0x01CC */ Path* path;
-    /* 0x01D0 */ s32 unk_1D0;
-    /* 0x01D4 */ s16 unk_1D4;
-    /* 0x01D6 */ s16 unk_1D6;
-    /* 0x01D8 */ s16 unk_1D8;
-    /* 0x01DA */ s16 unk_1DA;
-    /* 0x01DC */ s16 unk_1DC;
-    /* 0x01DE */ s16 unk_1DE;
-    /* 0x01E0 */ s16 unk_1E0;
-    /* 0x01E2 */ UNK_TYPE1 unk1E2[2];
-    /* 0x01E4 */ s16 unk_1E4;
-    /* 0x01E6 */ s16 unk_1E6;
-    /* 0x01E8 */ UNK_TYPE1 unk1E8[4];
-    /* 0x01EC */ s16 unk_1EC;
-    /* 0x01EE */ s16 unk_1EE;
-    /* 0x01F0 */ s16 unk_1F0;
-    /* 0x01F2 */ s16 unk_1F2;
-    /* 0x01F4 */ s16 unk_1F4;
-    /* 0x01F8 */ f32 unk_1F8;
-    /* 0x01FC */ f32 unk_1FC;
-    /* 0x0200 */ f32 unk_200;
-    /* 0x0204 */ f32 unk_204;
-    /* 0x0208 */ f32 unk_208;
-    /* 0x020C */ f32 unk_20C;
-    /* 0x0210 */ s32 unk_210;
-    /* 0x0214 */ UNK_TYPE1 unk214[4];
-    /* 0x0218 */ s32 unk_218;
-    /* 0x021C */ Vec3f unk_21C;
-    /* 0x0228 */ Vec3f unk_228;
-    /* 0x0234 */ Vec3f unk_234[5];
-    /* 0x0270 */ Vec3f unk_270;
-    /* 0x027C */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[5];
+    /* 0x1A6 */ Vec3s morphtable[5];
+    /* 0x1C4 */ EnPr2ActionFunc actionFunc;
+    /* 0x1C8 */ s16 unk_1C8;
+    /* 0x1CC */ Path* path;
+    /* 0x1D0 */ s32 unk_1D0;
+    /* 0x1D4 */ s16 unk_1D4;
+    /* 0x1D6 */ s16 unk_1D6;
+    /* 0x1D8 */ s16 unk_1D8;
+    /* 0x1DA */ s16 unk_1DA;
+    /* 0x1DC */ s16 unk_1DC;
+    /* 0x1DE */ s16 unk_1DE;
+    /* 0x1E0 */ s16 unk_1E0;
+    /* 0x1E2 */ UNK_TYPE1 unk1E2[2];
+    /* 0x1E4 */ s16 unk_1E4;
+    /* 0x1E6 */ s16 unk_1E6;
+    /* 0x1E8 */ UNK_TYPE1 unk1E8[4];
+    /* 0x1EC */ s16 unk_1EC;
+    /* 0x1EE */ s16 unk_1EE;
+    /* 0x1F0 */ s16 unk_1F0;
+    /* 0x1F2 */ s16 unk_1F2;
+    /* 0x1F4 */ s16 unk_1F4;
+    /* 0x1F8 */ f32 unk_1F8;
+    /* 0x1FC */ f32 unk_1FC;
+    /* 0x200 */ f32 unk_200;
+    /* 0x204 */ f32 unk_204;
+    /* 0x208 */ f32 unk_208;
+    /* 0x20C */ f32 unk_20C;
+    /* 0x210 */ s32 unk_210;
+    /* 0x214 */ UNK_TYPE1 unk214[4];
+    /* 0x218 */ s32 unk_218;
+    /* 0x21C */ Vec3f unk_21C;
+    /* 0x228 */ Vec3f unk_228;
+    /* 0x234 */ Vec3f unk_234[5];
+    /* 0x270 */ Vec3f unk_270;
+    /* 0x27C */ ColliderCylinder collider;
 } EnPr2; // size = 0x2C8
 
 extern const ActorInit En_Pr2_InitVars;
diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.h b/src/overlays/actors/ovl_En_Prz/z_en_prz.h
index 3d9e740d12..75087c9bce 100644
--- a/src/overlays/actors/ovl_En_Prz/z_en_prz.h
+++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.h
@@ -10,36 +10,36 @@ typedef void (*EnPrzActionFunc)(struct EnPrz*, PlayState*);
 #define ENPRZ_GET(thisx) ((thisx)->params & 0xFF)
 
 typedef struct EnPrz {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[5];
-    /* 0x01A6 */ Vec3s morphTable[5];
-    /* 0x01C4 */ EnPrzActionFunc actionFunc;
-    /* 0x01C8 */ u8 unk_1C8;
-    /* 0x01CC */ Vec3f unk_1CC;
-    /* 0x01D8 */ Vec3f unk_1D8;
-    /* 0x01E4 */ s16 unk_1E4;
-    /* 0x01E6 */ s16 unk_1E6;
-    /* 0x01E8 */ s16 unk_1E8;
-    /* 0x01EA */ s16 unk_1EA;
-    /* 0x01EC */ s16 unk_1EC;
-    /* 0x01EE */ s16 unk_1EE;
-    /* 0x01F0 */ UNK_TYPE1 unk1F0[2];
-    /* 0x01F2 */ s16 unk_1F2;
-    /* 0x01F4 */ UNK_TYPE1 unk1F4[8];
-    /* 0x01FC */ s16 unk_1FC;
-    /* 0x01FE */ s16 unk_1FE;
-    /* 0x0200 */ UNK_TYPE1 unk200[2];
-    /* 0x0202 */ s16 unk_202;
-    /* 0x0204 */ s32 unk_204;
-    /* 0x0208 */ f32 unk_208;
-    /* 0x020C */ f32 unk_20C;
-    /* 0x0210 */ f32 unk_210;
-    /* 0x0214 */ f32 unk_214;
-    /* 0x0218 */ f32 unk_218;
-    /* 0x021C */ UNK_TYPE1 unk21C[4];
-    /* 0x0220 */ Actor* unk_220;
-    /* 0x0224 */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[5];
+    /* 0x1A6 */ Vec3s morphTable[5];
+    /* 0x1C4 */ EnPrzActionFunc actionFunc;
+    /* 0x1C8 */ u8 unk_1C8;
+    /* 0x1CC */ Vec3f unk_1CC;
+    /* 0x1D8 */ Vec3f unk_1D8;
+    /* 0x1E4 */ s16 unk_1E4;
+    /* 0x1E6 */ s16 unk_1E6;
+    /* 0x1E8 */ s16 unk_1E8;
+    /* 0x1EA */ s16 unk_1EA;
+    /* 0x1EC */ s16 unk_1EC;
+    /* 0x1EE */ s16 unk_1EE;
+    /* 0x1F0 */ UNK_TYPE1 unk1F0[2];
+    /* 0x1F2 */ s16 unk_1F2;
+    /* 0x1F4 */ UNK_TYPE1 unk1F4[8];
+    /* 0x1FC */ s16 unk_1FC;
+    /* 0x1FE */ s16 unk_1FE;
+    /* 0x200 */ UNK_TYPE1 unk200[2];
+    /* 0x202 */ s16 unk_202;
+    /* 0x204 */ s32 unk_204;
+    /* 0x208 */ f32 unk_208;
+    /* 0x20C */ f32 unk_20C;
+    /* 0x210 */ f32 unk_210;
+    /* 0x214 */ f32 unk_214;
+    /* 0x218 */ f32 unk_218;
+    /* 0x21C */ UNK_TYPE1 unk21C[4];
+    /* 0x220 */ Actor* unk_220;
+    /* 0x224 */ ColliderCylinder collider;
 } EnPrz; // size = 0x270
 
 extern const ActorInit En_Prz_InitVars;
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 cba584667c..ba60b4bf0e 100644
--- a/src/overlays/actors/ovl_En_Pst/z_en_pst.h
+++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.h
@@ -8,10 +8,10 @@ struct EnPst;
 typedef void (*EnPstActionFunc)(struct EnPst*, PlayState*);
 
 typedef struct EnPst {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnPstActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x94];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x44];
+    /* 0x188 */ EnPstActionFunc actionFunc;
+    /* 0x18C */ char unk_18C[0x94];
 } EnPst; // size = 0x220
 
 extern const ActorInit En_Pst_InitVars;
diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h
index 9ff585d6b3..65e8e9736c 100644
--- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h
+++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h
@@ -13,29 +13,29 @@ typedef void (*EnRailgibudActionFunc)(struct EnRailgibud*, PlayState*);
 #define ENRAILGIBUD_GET_PATH(thisx) (((thisx)->params & 0xFF00) >> 8)
 
 typedef struct EnRailgibud {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ EnRailgibudActionFunc actionFunc;
-    /* 0x01D8 */ Vec3f limbPos[15];
-    /* 0x028C */ s32 limbIndex;
-    /* 0x0290 */ UNK_TYPE1 unk290[0x4];
-    /* 0x0294 */ Vec3s* points;
-    /* 0x0298 */ s32 currentPoint;
-    /* 0x029C */ s32 pathCount;
-    /* 0x02A0 */ f32 drawDmgEffAlpha;
-    /* 0x02A4 */ f32 drawDmgEffScale;
-    /* 0x02A8 */ Vec3s jointTable[GIBDO_LIMB_MAX];
-    /* 0x0344 */ Vec3s morphTable[GIBDO_LIMB_MAX];
-    /* 0x03E0 */ Vec3s headRotation;
-    /* 0x03E6 */ Vec3s upperBodyRotation;
-    /* 0x03EC */ s16 shouldWalkForward; // Only used by the "main" Gibdo
-    /* 0x03EE */ s16 shouldWalkForwardNextFrame; // Only used by the "main" Gibdo
-    /* 0x03F0 */ union {
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ EnRailgibudActionFunc actionFunc;
+    /* 0x1D8 */ Vec3f limbPos[15];
+    /* 0x28C */ s32 limbIndex;
+    /* 0x290 */ UNK_TYPE1 unk290[0x4];
+    /* 0x294 */ Vec3s* points;
+    /* 0x298 */ s32 currentPoint;
+    /* 0x29C */ s32 pathCount;
+    /* 0x2A0 */ f32 drawDmgEffAlpha;
+    /* 0x2A4 */ f32 drawDmgEffScale;
+    /* 0x2A8 */ Vec3s jointTable[GIBDO_LIMB_MAX];
+    /* 0x344 */ Vec3s morphTable[GIBDO_LIMB_MAX];
+    /* 0x3E0 */ Vec3s headRotation;
+    /* 0x3E6 */ Vec3s upperBodyRotation;
+    /* 0x3EC */ s16 shouldWalkForward; // Only used by the "main" Gibdo
+    /* 0x3EE */ s16 shouldWalkForwardNextFrame; // Only used by the "main" Gibdo
+    /* 0x3F0 */ union {
                     s16 grabState;
                     s16 cutsceneAnimationIndex;
                 };
-    /* 0x03F2 */ union {
+    /* 0x3F2 */ union {
                     s16 playerStunWaitTimer; // Cannot stun the player if this is non-zero
                     s16 grabDamageTimer;
                     s16 headShakeTimer;
@@ -43,16 +43,16 @@ typedef struct EnRailgibud {
                     s16 deathTimer;
                     s16 sinkTimer;
                 };
-    /* 0x03F4 */ s16 grabWaitTimer; // Cannot grab the player if this is non-zero
-    /* 0x03F6 */ s16 drawDmgEffTimer;
-    /* 0x03F8 */ s16 type;
-    /* 0x03FA */ s16 isInvincible;
-    /* 0x03FC */ u16 actorActionCommand;
-    /* 0x03FE */ u16 csAction;
-    /* 0x0400 */ u16 textId;
-    /* 0x0402 */ s16 timeInitialized; // unused other than setting it
-    /* 0x0404 */ u8 drawDmgEffType;
-    /* 0x0405 */ s8 unk_405; // related to player->unk_ADD
+    /* 0x3F4 */ s16 grabWaitTimer; // Cannot grab the player if this is non-zero
+    /* 0x3F6 */ s16 drawDmgEffTimer;
+    /* 0x3F8 */ s16 type;
+    /* 0x3FA */ s16 isInvincible;
+    /* 0x3FC */ u16 actorActionCommand;
+    /* 0x3FE */ u16 csAction;
+    /* 0x400 */ u16 textId;
+    /* 0x402 */ s16 timeInitialized; // unused other than setting it
+    /* 0x404 */ u8 drawDmgEffType;
+    /* 0x405 */ s8 unk_405; // related to player->unk_ADD
 } EnRailgibud; // size = 0x408
 
 extern const ActorInit En_Railgibud_InitVars;
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 94076046af..0affac4f12 100644
--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h
@@ -31,45 +31,45 @@ typedef enum {
 } EnRdType;
 
 typedef struct EnRd {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnRdActionFunc actionFunc;
-    /* 0x018C */ EnRdSetupDanceFunc setupDanceFunc;
-    /* 0x0190 */ ColliderCylinder collider;
-    /* 0x01DC */ Vec3f limbPos[15];
-    /* 0x0290 */ s32 limbIndex;
-    /* 0x0294 */ f32 drawDmgEffAlpha;
-    /* 0x0298 */ f32 drawDmgEffScale;
-    /* 0x029C */ Vec3s jointTable[REDEAD_LIMB_MAX];
-    /* 0x0338 */ Vec3s morphTable[REDEAD_LIMB_MAX];
-    /* 0x03D4 */ s16 headShakeTimer;
-    /* 0x03D6 */ union {
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnRdActionFunc actionFunc;
+    /* 0x18C */ EnRdSetupDanceFunc setupDanceFunc;
+    /* 0x190 */ ColliderCylinder collider;
+    /* 0x1DC */ Vec3f limbPos[15];
+    /* 0x290 */ s32 limbIndex;
+    /* 0x294 */ f32 drawDmgEffAlpha;
+    /* 0x298 */ f32 drawDmgEffScale;
+    /* 0x29C */ Vec3s jointTable[REDEAD_LIMB_MAX];
+    /* 0x338 */ Vec3s morphTable[REDEAD_LIMB_MAX];
+    /* 0x3D4 */ s16 headShakeTimer;
+    /* 0x3D6 */ union {
                     s16 animationJudderTimer;
                     s16 stunTimer;
                     s16 deathTimer;
                     s16 coffinRiseForwardAccelTimer;
                 };
-    /* 0x03D8 */ s16 headYRotation;
-    /* 0x03DA */ s16 upperBodyYRotation;
-    /* 0x03DC */ s16 flags;
-    /* 0x03DE */ s16 alpha;
-    /* 0x03E0 */ s16 sunsSongStunTimer;
-    /* 0x03E2 */ UNK_TYPE1 unk3E2[0x2];
-    /* 0x03E4 */ union {
+    /* 0x3D8 */ s16 headYRotation;
+    /* 0x3DA */ s16 upperBodyYRotation;
+    /* 0x3DC */ s16 flags;
+    /* 0x3DE */ s16 alpha;
+    /* 0x3E0 */ s16 sunsSongStunTimer;
+    /* 0x3E2 */ UNK_TYPE1 unk3E2[0x2];
+    /* 0x3E4 */ union {
                     s16 danceEndTimer;
                     s16 pirouetteRotationalVelocity;
                 };
-    /* 0x03E6 */ s16 drawDmgEffTimer;
-    /* 0x03E8 */ u8 drawDmgEffType;
-    /* 0x03E9 */ u8 stunnedBySunsSong;
-    /* 0x03EA */ u8 grabDamageTimer;
-    /* 0x03EB */ u8 grabState;
-    /* 0x03EC */ u8 isMourning;
-    /* 0x03ED */ u8 playerStunWaitTimer; // Cannot stun the player if this is non-zero
-    /* 0x03EE */ u8 grabWaitTimer; // Cannot grab the player if this is non-zero
-    /* 0x03EF */ u8 action;
-    /* 0x03F0 */ u8 damageEffect;
-    /* 0x03F1 */ s8 unk_3F1; // related to player->unk_ADD
+    /* 0x3E6 */ s16 drawDmgEffTimer;
+    /* 0x3E8 */ u8 drawDmgEffType;
+    /* 0x3E9 */ u8 stunnedBySunsSong;
+    /* 0x3EA */ u8 grabDamageTimer;
+    /* 0x3EB */ u8 grabState;
+    /* 0x3EC */ u8 isMourning;
+    /* 0x3ED */ u8 playerStunWaitTimer; // Cannot stun the player if this is non-zero
+    /* 0x3EE */ u8 grabWaitTimer; // Cannot grab the player if this is non-zero
+    /* 0x3EF */ u8 action;
+    /* 0x3F0 */ u8 damageEffect;
+    /* 0x3F1 */ s8 unk_3F1; // related to player->unk_ADD
 } EnRd; // size = 0x3F4
 
 extern const ActorInit En_Rd_InitVars;
diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.h b/src/overlays/actors/ovl_En_Rg/z_en_rg.h
index f3a7bd54dc..fe0a000b67 100644
--- a/src/overlays/actors/ovl_En_Rg/z_en_rg.h
+++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.h
@@ -22,34 +22,34 @@ typedef struct {
 } EnRgStruct; // size = 0x3C
 
 typedef struct EnRg {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnRgActionFunc actionFunc;
-    /* 0x018C */ Actor* unk_18C;
-    /* 0x0190 */ ColliderCylinder collider1;
-    /* 0x01DC */ ColliderSphere collider2;
-    /* 0x0234 */ Path* path;
-    /* 0x0238 */ Vec3s jointTable[18];
-    /* 0x02A4 */ Vec3s morphTable[18];
-    /* 0x0310 */ u16 unk_310;
-    /* 0x0314 */ f32 unk_314;
-    /* 0x0318 */ s16 unk_318;
-    /* 0x031A */ UNK_TYPE1 unk31A[2];
-    /* 0x031C */ s16 unk_31C;
-    /* 0x031E */ s16 unk_31E;
-    /* 0x0320 */ s16 unk_320;
-    /* 0x0322 */ s16 unk_322;
-    /* 0x0324 */ s16 unk_324;
-    /* 0x0326 */ s16 unk_326;
-    /* 0x0328 */ s16 unk_328[3];
-    /* 0x032E */ s16 unk_32E[3];
-    /* 0x0334 */ s32 unk_334;
-    /* 0x0338 */ UNK_TYPE1 unk338[4];
-    /* 0x033C */ s32 unk_33C;
-    /* 0x0340 */ s32 unk_340;
-    /* 0x0344 */ s32 unk_344;
-    /* 0x0348 */ s32 numCheckpointsAheadOfPlayer;
-    /* 0x034C */ EnRgStruct unk_34C[32];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnRgActionFunc actionFunc;
+    /* 0x18C */ Actor* unk_18C;
+    /* 0x190 */ ColliderCylinder collider1;
+    /* 0x1DC */ ColliderSphere collider2;
+    /* 0x234 */ Path* path;
+    /* 0x238 */ Vec3s jointTable[18];
+    /* 0x2A4 */ Vec3s morphTable[18];
+    /* 0x310 */ u16 unk_310;
+    /* 0x314 */ f32 unk_314;
+    /* 0x318 */ s16 unk_318;
+    /* 0x31A */ UNK_TYPE1 unk31A[2];
+    /* 0x31C */ s16 unk_31C;
+    /* 0x31E */ s16 unk_31E;
+    /* 0x320 */ s16 unk_320;
+    /* 0x322 */ s16 unk_322;
+    /* 0x324 */ s16 unk_324;
+    /* 0x326 */ s16 unk_326;
+    /* 0x328 */ s16 unk_328[3];
+    /* 0x32E */ s16 unk_32E[3];
+    /* 0x334 */ s32 unk_334;
+    /* 0x338 */ UNK_TYPE1 unk338[4];
+    /* 0x33C */ s32 unk_33C;
+    /* 0x340 */ s32 unk_340;
+    /* 0x344 */ s32 unk_344;
+    /* 0x348 */ s32 numCheckpointsAheadOfPlayer;
+    /* 0x34C */ EnRgStruct unk_34C[32];
 } EnRg; // size = 0xACC
 
 extern const ActorInit En_Rg_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.h b/src/overlays/actors/ovl_En_Ru/z_en_ru.h
index 319c6a1bc7..29c903aff2 100644
--- a/src/overlays/actors/ovl_En_Ru/z_en_ru.h
+++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.h
@@ -8,9 +8,9 @@ struct EnRu;
 typedef void (*EnRuActionFunc)(struct EnRu*, PlayState*);
 
 typedef struct EnRu {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnRuActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x30C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnRuActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x30C];
 } EnRu; // size = 0x454
 
 extern const ActorInit En_Ru_InitVars;
diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.h b/src/overlays/actors/ovl_En_Rz/z_en_rz.h
index c65985904a..5106d14130 100644
--- a/src/overlays/actors/ovl_En_Rz/z_en_rz.h
+++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.h
@@ -8,9 +8,9 @@ struct EnRz;
 typedef void (*EnRzActionFunc)(struct EnRz*, PlayState*);
 
 typedef struct EnRz {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x2EC];
-    /* 0x0430 */ EnRzActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x2EC];
+    /* 0x430 */ EnRzActionFunc actionFunc;
 } EnRz; // size = 0x434
 
 extern const ActorInit En_Rz_InitVars;
diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h
index cd9d8e0c97..7d8e7627f0 100644
--- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h
+++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h
@@ -10,10 +10,10 @@ struct EnSGoro;
 typedef void (*EnSGoroActionFunc)(struct EnSGoro*, PlayState*);
 
 typedef struct EnSGoro {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x48];
-    /* 0x018C */ EnSGoroActionFunc actionFunc;
-    /* 0x0190 */ char unk_190[0x180];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x48];
+    /* 0x18C */ EnSGoroActionFunc actionFunc;
+    /* 0x190 */ char unk_190[0x180];
 } EnSGoro; // size = 0x310
 
 extern const ActorInit En_S_Goro_InitVars;
diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h
index df9bd68011..f2b3e68e84 100644
--- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h
+++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h
@@ -8,11 +8,11 @@ struct EnSb;
 typedef void (*EnSbActionFunc)(struct EnSb*, PlayState*);
 
 typedef enum {
-    /* 0x00 */ SHELLBLADE_OPEN,
-    /* 0x01 */ SHELLBLADE_WAIT_CLOSED,
-    /* 0x02 */ SHELLBLADE_WAIT_OPEN,
-    /* 0x03 */ SHELLBLADE_LUNGE,
-    /* 0x04 */ SHELLBLADE_BOUNCE
+    /* 0x0 */ SHELLBLADE_OPEN,
+    /* 0x1 */ SHELLBLADE_WAIT_CLOSED,
+    /* 0x2 */ SHELLBLADE_WAIT_OPEN,
+    /* 0x3 */ SHELLBLADE_LUNGE,
+    /* 0x4 */ SHELLBLADE_BOUNCE
 } ShellbladeState;
 
 typedef struct EnSb {
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 c48d628bec..80d7ed20eb 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
@@ -10,9 +10,9 @@ struct EnScRuppe;
 typedef void (*EnScRuppeActionFunc)(struct EnScRuppe*, PlayState*);
 
 typedef struct EnScRuppe {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ EnScRuppeActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ EnScRuppeActionFunc actionFunc;
     /* 0x194 */ s16 ruppeDisplayTime;
     /* 0x196 */ s16 ruppeIndex;
 } EnScRuppe; // size = 0x198
diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h
index c3f66a6cee..3f6f435449 100644
--- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h
+++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h
@@ -14,37 +14,37 @@ typedef void (*EnScopenutsActionFunc)(struct EnScopenuts*, PlayState*);
 #define ENSCOPENUTS_3E0_1 1
 
 typedef struct EnScopenuts {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[28];
-    /* 0x0230 */ Vec3s morphTable[28];
-    /* 0x02D8 */ EnScopenutsActionFunc actionFunc;
-    /* 0x02DC */ ColliderCylinder collider;
-    /* 0x0328 */ u16 unk_328;
-    /* 0x032C */ f32 unk_32C;
-    /* 0x0330 */ Path* path;
-    /* 0x0334 */ s32 unk_334;
-    /* 0x0338 */ s16 unk_338;
-    /* 0x033A */ UNK_TYPE1 unk33A[2];
-    /* 0x033C */ u16 unk_33C;
-    /* 0x033E */ s16 unk_33E;
-    /* 0x0340 */ s16 unk_340;
-    /* 0x0342 */ UNK_TYPE1 unk342[0x6];
-    /* 0x0348 */ s32 unk_348;
-    /* 0x034C */ s16 unk_34C;
-    /* 0x034E */ s16 unk_34E;
-    /* 0x0350 */ f32 unk_350;
-    /* 0x0354 */ UNK_TYPE1 unk354[4];
-    /* 0x0358 */ s16 unk_358;
-    /* 0x035A */ s16 unk_35A;
-    /* 0x035C */ f32 unk_35C;
-    /* 0x0360 */ f32 unk_360;
-    /* 0x0364 */ f32 unk_364;
-    /* 0x0368 */ f32 unk_368;
-    /* 0x036C */ s16 unk_36C;
-    /* 0x036E */ s16 unk_36E;
-    /* 0x0370 */ s16 unk_370;
-    /* 0x0372 */ s16 unk_372;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[28];
+    /* 0x230 */ Vec3s morphTable[28];
+    /* 0x2D8 */ EnScopenutsActionFunc actionFunc;
+    /* 0x2DC */ ColliderCylinder collider;
+    /* 0x328 */ u16 unk_328;
+    /* 0x32C */ f32 unk_32C;
+    /* 0x330 */ Path* path;
+    /* 0x334 */ s32 unk_334;
+    /* 0x338 */ s16 unk_338;
+    /* 0x33A */ UNK_TYPE1 unk33A[2];
+    /* 0x33C */ u16 unk_33C;
+    /* 0x33E */ s16 unk_33E;
+    /* 0x340 */ s16 unk_340;
+    /* 0x342 */ UNK_TYPE1 unk342[0x6];
+    /* 0x348 */ s32 unk_348;
+    /* 0x34C */ s16 unk_34C;
+    /* 0x34E */ s16 unk_34E;
+    /* 0x350 */ f32 unk_350;
+    /* 0x354 */ UNK_TYPE1 unk354[4];
+    /* 0x358 */ s16 unk_358;
+    /* 0x35A */ s16 unk_35A;
+    /* 0x35C */ f32 unk_35C;
+    /* 0x360 */ f32 unk_360;
+    /* 0x364 */ f32 unk_364;
+    /* 0x368 */ f32 unk_368;
+    /* 0x36C */ s16 unk_36C;
+    /* 0x36E */ s16 unk_36E;
+    /* 0x370 */ s16 unk_370;
+    /* 0x372 */ s16 unk_372;
 } EnScopenuts; // size = 0x374
 
 extern const ActorInit En_Scopenuts_InitVars;
diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h
index 0835f61356..44d3873e90 100644
--- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h
+++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h
@@ -8,9 +8,9 @@ struct EnSekihi;
 typedef void (*EnSekihiActionFunc)(struct EnSekihi*, PlayState*);
 
 typedef struct EnSekihi {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x24];
-    /* 0x0168 */ EnSekihiActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x24];
+    /* 0x168 */ EnSekihiActionFunc actionFunc;
 } EnSekihi; // size = 0x16C
 
 extern const ActorInit En_Sekihi_InitVars;
diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h
index bce0273c60..49023ce7f7 100644
--- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h
+++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h
@@ -11,39 +11,39 @@ typedef void (*EnSellnutsActionFunc)(struct EnSellnuts*, PlayState*);
 #define ENSELLNUTS_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
 
 typedef struct EnSellnuts {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[28];
-    /* 0x0230 */ Vec3s morphTable[28];
-    /* 0x02D8 */ EnSellnutsActionFunc actionFunc;
-    /* 0x02DC */ ColliderCylinder collider;
-    /* 0x0328 */ s16 unk_328;
-    /* 0x032C */ f32 unk_32C;
-    /* 0x0330 */ Path* path;
-    /* 0x0334 */ s32 unk_334;
-    /* 0x0338 */ u16 unk_338;
-    /* 0x033A */ u16 unk_33A;
-    /* 0x033C */ s16 cutscene;
-    /* 0x033E */ UNK_TYPE1 unk33E[0x2];
-    /* 0x0340 */ u16 unk_340;
-    /* 0x0342 */ u16 unk_342;
-    /* 0x0344 */ s16 unk_344;
-    /* 0x0346 */ UNK_TYPE1 unk346[0x4];
-    /* 0x034A */ s16 unk_34A;
-    /* 0x034C */ s16 unk_34C;
-    /* 0x034E */ s16 unk_34E;
-    /* 0x0350 */ s16 unk_350;
-    /* 0x0354 */ f32 unk_354;
-    /* 0x0358 */ f32 unk_358;
-    /* 0x035C */ f32 unk_35C;
-    /* 0x0360 */ f32 unk_360;
-    /* 0x0364 */ s16 unk_364;
-    /* 0x0366 */ s16 unk_366;
-    /* 0x0368 */ s16 unk_368;
-    /* 0x036A */ UNK_TYPE1 unk36A[0x2];
-    /* 0x036C */ f32 unk_36C;
-    /* 0x0370 */ f32 unk_370;
-    /* 0x0374 */ f32 unk_374;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[28];
+    /* 0x230 */ Vec3s morphTable[28];
+    /* 0x2D8 */ EnSellnutsActionFunc actionFunc;
+    /* 0x2DC */ ColliderCylinder collider;
+    /* 0x328 */ s16 unk_328;
+    /* 0x32C */ f32 unk_32C;
+    /* 0x330 */ Path* path;
+    /* 0x334 */ s32 unk_334;
+    /* 0x338 */ u16 unk_338;
+    /* 0x33A */ u16 unk_33A;
+    /* 0x33C */ s16 cutscene;
+    /* 0x33E */ UNK_TYPE1 unk33E[0x2];
+    /* 0x340 */ u16 unk_340;
+    /* 0x342 */ u16 unk_342;
+    /* 0x344 */ s16 unk_344;
+    /* 0x346 */ UNK_TYPE1 unk346[0x4];
+    /* 0x34A */ s16 unk_34A;
+    /* 0x34C */ s16 unk_34C;
+    /* 0x34E */ s16 unk_34E;
+    /* 0x350 */ s16 unk_350;
+    /* 0x354 */ f32 unk_354;
+    /* 0x358 */ f32 unk_358;
+    /* 0x35C */ f32 unk_35C;
+    /* 0x360 */ f32 unk_360;
+    /* 0x364 */ s16 unk_364;
+    /* 0x366 */ s16 unk_366;
+    /* 0x368 */ s16 unk_368;
+    /* 0x36A */ UNK_TYPE1 unk36A[0x2];
+    /* 0x36C */ f32 unk_36C;
+    /* 0x370 */ f32 unk_370;
+    /* 0x374 */ f32 unk_374;
 } EnSellnuts; // size = 0x378
 
 extern const ActorInit En_Sellnuts_InitVars;
diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h
index 03e7763737..032e1f1161 100644
--- a/src/overlays/actors/ovl_En_Si/z_en_si.h
+++ b/src/overlays/actors/ovl_En_Si/z_en_si.h
@@ -8,9 +8,9 @@ struct EnSi;
 typedef void (*EnSiActionFunc)(struct EnSi*, PlayState*);
 
 typedef struct EnSi {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnSiActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x58];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnSiActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x58];
 } EnSi; // size = 0x1A0
 
 extern const ActorInit En_Si_InitVars;
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 2e3d8e10a5..0026048380 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
@@ -10,30 +10,30 @@ typedef void (*EnSkbActionFunc)(struct EnSkb*, PlayState*);
 #define ENSKB_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
 
 typedef struct EnSkb {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ ColliderJntSph collider;
-    /* 0x01A8 */ ColliderJntSphElement colliderElements[2];
-    /* 0x0228 */ EnSkbActionFunc actionFunc;
-    /* 0x022C */ f32 drawDmgEffAlpha;
-    /* 0x0230 */ f32 drawDmgEffScale;
-    /* 0x0234 */ Vec3f limbPos[14];
-    /* 0x02DC */ s32 limbCount;
-    /* 0x02E0 */ Vec3s jointTable[20];
-    /* 0x0358 */ Vec3s morphTable[20];
-    /* 0x03D0 */ s16 unk_3D0;
-    /* 0x03D2 */ s16 drawDmgEffTimer;
-    /* 0x03D4 */ s16 unk_3D4;
-    /* 0x03D6 */ s16 unk_3D6;
-    /* 0x03D8 */ s16 unk_3D8;
-    /* 0x03DA */ s16 unk_3DA;
-    /* 0x03DC */ s16 unk_3DC;
-    /* 0x03DE */ s16 unk_3DE;
-    /* 0x03E0 */ s16 unk_3E0;
-    /* 0x03E2 */ s16 unk_3E2;
-    /* 0x03E4 */ u8 unk_3E4;
-    /* 0x03E5 */ u8 unk_3E5;
-    /* 0x03E6 */ u8 drawDmgEffType;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ ColliderJntSph collider;
+    /* 0x1A8 */ ColliderJntSphElement colliderElements[2];
+    /* 0x228 */ EnSkbActionFunc actionFunc;
+    /* 0x22C */ f32 drawDmgEffAlpha;
+    /* 0x230 */ f32 drawDmgEffScale;
+    /* 0x234 */ Vec3f limbPos[14];
+    /* 0x2DC */ s32 limbCount;
+    /* 0x2E0 */ Vec3s jointTable[20];
+    /* 0x358 */ Vec3s morphTable[20];
+    /* 0x3D0 */ s16 unk_3D0;
+    /* 0x3D2 */ s16 drawDmgEffTimer;
+    /* 0x3D4 */ s16 unk_3D4;
+    /* 0x3D6 */ s16 unk_3D6;
+    /* 0x3D8 */ s16 unk_3D8;
+    /* 0x3DA */ s16 unk_3DA;
+    /* 0x3DC */ s16 unk_3DC;
+    /* 0x3DE */ s16 unk_3DE;
+    /* 0x3E0 */ s16 unk_3E0;
+    /* 0x3E2 */ s16 unk_3E2;
+    /* 0x3E4 */ u8 unk_3E4;
+    /* 0x3E5 */ u8 unk_3E5;
+    /* 0x3E6 */ u8 drawDmgEffType;
 } EnSkb; // size = 0x3E8
 
 extern const ActorInit En_Skb_InitVars;
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 c90c49340f..dacbd824c8 100644
--- a/src/overlays/actors/ovl_En_Slime/z_en_slime.h
+++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.h
@@ -8,9 +8,9 @@ struct EnSlime;
 typedef void (*EnSlimeActionFunc)(struct EnSlime*, PlayState*);
 
 typedef struct EnSlime {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnSlimeActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0xC0];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnSlimeActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0xC0];
 } EnSlime; // size = 0x208
 
 extern const ActorInit En_Slime_InitVars;
diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h
index d344f034a1..6706de8462 100644
--- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h
+++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h
@@ -8,9 +8,9 @@ struct EnSnowwd;
 typedef void (*EnSnowwdActionFunc)(struct EnSnowwd*, PlayState*);
 
 typedef struct EnSnowwd {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x50];
-    /* 0x0194 */ EnSnowwdActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x50];
+    /* 0x194 */ EnSnowwdActionFunc actionFunc;
 } EnSnowwd; // size = 0x198
 
 extern const ActorInit En_Snowwd_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
index 45122c4c3d..72a82e6928 100644
--- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
+++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
@@ -14,46 +14,46 @@ typedef void (*EnSshActionFunc)(struct EnSsh*, PlayState*);
 #define SSH_STATE_FATHER (1 << 5)
 
 typedef enum {
-    SSH_ANIM_UNK0, // Unused animation. Possibly being knocked back?
-    SSH_ANIM_UP,
-    SSH_ANIM_WAIT,
-    SSH_ANIM_LAND,
-    SSH_ANIM_DROP,
-    SSH_ANIM_UNK5, // Slower version of ANIM_DROP
-    SSH_ANIM_UNK6  // Faster repeating version of ANIM_UNK0
+    /* 0x0 */ SSH_ANIM_UNK0, // Unused animation. Possibly being knocked back?
+    /* 0x1 */ SSH_ANIM_UP,
+    /* 0x2 */ SSH_ANIM_WAIT,
+    /* 0x3 */ SSH_ANIM_LAND,
+    /* 0x4 */ SSH_ANIM_DROP,
+    /* 0x5 */ SSH_ANIM_UNK5, // Slower version of ANIM_DROP
+    /* 0x6 */ SSH_ANIM_UNK6  // Faster repeating version of ANIM_UNK0
 } EnSshAnimation;
 
 #define ENSSH_IS_CHILD(thisx) ((thisx)->params & 0xF)
 
 typedef struct EnSsh {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[30];
-    /* 0x023C */ Vec3s morphtable[30];
-    /* 0x02F0 */ EnSshActionFunc actionFunc;
-    /* 0x02F4 */ ColliderCylinder collider1[6];
-    /* 0x04BC */ ColliderJntSph collider2;
-    /* 0x04DC */ ColliderJntSphElement collider2Elements[1];
-    /* 0x051C */ s16 initialYaw;
-    /* 0x051E */ s16 maxTurnRate;
-    /* 0x0520 */ s16 unkTimer;
-    /* 0x0522 */ s16 spinTimer;
-    /* 0x0524 */ s16 hitTimer;
-    /* 0x0526 */ s16 invincibilityTimer;
-    /* 0x0528 */ s16 sfxTimer;
-    /* 0x052A */ s16 stunTimer;
-    /* 0x052C */ s16 animTimer;
-    /* 0x052E */ s16 swayTimer;
-    /* 0x0530 */ s32 blureIdx;
-    /* 0x0534 */ f32 colliderScale;
-    /* 0x0538 */ f32 floorHeightOffset;
-    /* 0x053C */ Vec3f ceilingPos;
-    /* 0x0548 */ UNK_TYPE1 unk_548[0x78];
-    /* 0x05C0 */ s16 swayAngle;
-    /* 0x05C2 */ u16 stateFlags;
-    /* 0x05C4 */ u8 hitCount;
-    /* 0x05C6 */ s16 blinkState;
-    /* 0x05C8 */ s16 blinkTimer;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[30];
+    /* 0x23C */ Vec3s morphtable[30];
+    /* 0x2F0 */ EnSshActionFunc actionFunc;
+    /* 0x2F4 */ ColliderCylinder collider1[6];
+    /* 0x4BC */ ColliderJntSph collider2;
+    /* 0x4DC */ ColliderJntSphElement collider2Elements[1];
+    /* 0x51C */ s16 initialYaw;
+    /* 0x51E */ s16 maxTurnRate;
+    /* 0x520 */ s16 unkTimer;
+    /* 0x522 */ s16 spinTimer;
+    /* 0x524 */ s16 hitTimer;
+    /* 0x526 */ s16 invincibilityTimer;
+    /* 0x528 */ s16 sfxTimer;
+    /* 0x52A */ s16 stunTimer;
+    /* 0x52C */ s16 animTimer;
+    /* 0x52E */ s16 swayTimer;
+    /* 0x530 */ s32 blureIdx;
+    /* 0x534 */ f32 colliderScale;
+    /* 0x538 */ f32 floorHeightOffset;
+    /* 0x53C */ Vec3f ceilingPos;
+    /* 0x548 */ UNK_TYPE1 unk_548[0x78];
+    /* 0x5C0 */ s16 swayAngle;
+    /* 0x5C2 */ u16 stateFlags;
+    /* 0x5C4 */ u8 hitCount;
+    /* 0x5C6 */ s16 blinkState;
+    /* 0x5C8 */ s16 blinkTimer;
 } EnSsh; // size = 0x5CC
 
 extern const ActorInit En_Ssh_InitVars;
diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h
index b858117b4d..f4eb8e5f28 100644
--- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h
+++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h
@@ -8,10 +8,10 @@ struct EnStoneheishi;
 typedef void (*EnStoneheishiActionFunc)(struct EnStoneheishi*, PlayState*);
 
 typedef struct EnStoneheishi {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x110];
-    /* 0x0254 */ EnStoneheishiActionFunc actionFunc;
-    /* 0x0258 */ char unk_258[0x6C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x110];
+    /* 0x254 */ EnStoneheishiActionFunc actionFunc;
+    /* 0x258 */ char unk_258[0x6C];
 } EnStoneheishi; // size = 0x2C4
 
 extern const ActorInit En_Stone_heishi_InitVars;
diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h
index 93e1f32ba3..5c2b639ef8 100644
--- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h
+++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h
@@ -8,10 +8,10 @@ struct EnStopheishi;
 typedef void (*EnStopheishiActionFunc)(struct EnStopheishi*, PlayState*);
 
 typedef struct EnStopheishi {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x110];
-    /* 0x0254 */ EnStopheishiActionFunc actionFunc;
-    /* 0x0258 */ char unk_258[0x90];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x110];
+    /* 0x254 */ EnStopheishiActionFunc actionFunc;
+    /* 0x258 */ char unk_258[0x90];
 } EnStopheishi; // size = 0x2E8
 
 extern const ActorInit En_Stop_heishi_InitVars;
diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h
index 1ffc67ae20..7bf39b6c2e 100644
--- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h
+++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h
@@ -14,40 +14,40 @@ typedef void (*EnSwActionFunc)(struct EnSw*, PlayState*);
 #define ENSW_GET_FF00(thisx) ((((thisx)->params & 0xFF00) >> 8) & 0xFF)
 
 typedef struct EnSw {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnSwActionFunc actionFunc;
-    /* 0x018C */ ColliderSphere collider;
-    /* 0x01E4 */ Path* unk_1E4;
-    /* 0x01E8 */ Vec3s jointTable[30];
-    /* 0x029C */ Vec3s morphTable[30];
-    /* 0x0350 */ Vec3f unk_350;
-    /* 0x035C */ Vec3f unk_35C;
-    /* 0x0368 */ Vec3f unk_368;
-    /* 0x0374 */ Vec3f unk_374;
-    /* 0x0380 */ Vec3f unk_380[12];
-    /* 0x0410 */ u16 unk_410;
-    /* 0x0412 */ u8 drawDmgEffType;
-    /* 0x0414 */ f32 unk_414;
-    /* 0x0418 */ f32 drawDmgEffFrozenSteamScales[12];
-    /* 0x0448 */ f32 unk_448;
-    /* 0x044C */ f32 unk_44C;
-    /* 0x0450 */ f32 unk_450;
-    /* 0x0454 */ s16 unk_454;
-    /* 0x0456 */ s16 unk_456;
-    /* 0x0458 */ s16 unk_458;
-    /* 0x045A */ s16 unk_45A;
-    /* 0x045C */ s16 unk_45C;
-    /* 0x045E */ s16 unk_45E;
-    /* 0x0460 */ s16 unk_460;
-    /* 0x0462 */ s16 unk_462;
-    /* 0x0464 */ s16 unk_464[12];
-    /* 0x047C */ s16 unk_47C[12];
-    /* 0x0494 */ s16 unk_494;
-    /* 0x0496 */ s16 unk_496;
-    /* 0x0498 */ s16 unk_498;
-    /* 0x049C */ s32 unk_49C;
-    /* 0x04A0 */ s32 unk_4A0;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnSwActionFunc actionFunc;
+    /* 0x18C */ ColliderSphere collider;
+    /* 0x1E4 */ Path* unk_1E4;
+    /* 0x1E8 */ Vec3s jointTable[30];
+    /* 0x29C */ Vec3s morphTable[30];
+    /* 0x350 */ Vec3f unk_350;
+    /* 0x35C */ Vec3f unk_35C;
+    /* 0x368 */ Vec3f unk_368;
+    /* 0x374 */ Vec3f unk_374;
+    /* 0x380 */ Vec3f unk_380[12];
+    /* 0x410 */ u16 unk_410;
+    /* 0x412 */ u8 drawDmgEffType;
+    /* 0x414 */ f32 unk_414;
+    /* 0x418 */ f32 drawDmgEffFrozenSteamScales[12];
+    /* 0x448 */ f32 unk_448;
+    /* 0x44C */ f32 unk_44C;
+    /* 0x450 */ f32 unk_450;
+    /* 0x454 */ s16 unk_454;
+    /* 0x456 */ s16 unk_456;
+    /* 0x458 */ s16 unk_458;
+    /* 0x45A */ s16 unk_45A;
+    /* 0x45C */ s16 unk_45C;
+    /* 0x45E */ s16 unk_45E;
+    /* 0x460 */ s16 unk_460;
+    /* 0x462 */ s16 unk_462;
+    /* 0x464 */ s16 unk_464[12];
+    /* 0x47C */ s16 unk_47C[12];
+    /* 0x494 */ s16 unk_494;
+    /* 0x496 */ s16 unk_496;
+    /* 0x498 */ s16 unk_498;
+    /* 0x49C */ s32 unk_49C;
+    /* 0x4A0 */ s32 unk_4A0;
 } EnSw; // size = 0x4A4
 
 extern const ActorInit En_Sw_InitVars;
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
index c2f02c068b..1719f81612 100644
--- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
+++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
@@ -17,36 +17,36 @@ typedef struct {
     /* 0x08 */ f32 y;
     /* 0x0C */ f32 z;
     /* 0x10 */ s32 variable;
-} EnSyatekiManUnkStruct;
+} EnSyatekiManUnkStruct; // size = 0x14
 
 typedef struct EnSyatekiMan {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnSyatekiManActionFunc actionFunc;
-    /* 0x018C */ Path* path;
-    /* 0x0190 */ s32 unk_190;
-    /* 0x0194 */ s32 unk_194;
-    /* 0x0198 */ Vec3s jointTable[BURLY_GUY_LIMB_MAX];
-    /* 0x01F8 */ Vec3s morphTable[BURLY_GUY_LIMB_MAX];
-    /* 0x0258 */ Vec3s unk_258;
-    /* 0x025E */ Vec3s unk_25E;
-    /* 0x0264 */ s16 eyeIndex;
-    /* 0x0266 */ s16 blinkTimer;
-    /* 0x0268 */ UNK_TYPE1 unk268[0x2];
-    /* 0x026A */ s16 unk_26A;
-    /* 0x026C */ s16 unk_26C;
-    /* 0x026E */ s16 unk_26E;
-    /* 0x0270 */ s16 unk_270;
-    /* 0x0272 */ s16 unk_272;
-    /* 0x0274 */ s16 unk_274;
-    /* 0x0276 */ s16 unk_276;
-    /* 0x0278 */ s16 unk_278;
-    /* 0x027A */ s16 unk_27A;
-    /* 0x027C */ s16 unk_27C;
-    /* 0x027E */ s16 unk_27E;
-    /* 0x0280 */ s16 unk_280;
-    /* 0x0282 */ s16 unk_282;
-    /* 0x0284 */ s16 unk_284;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnSyatekiManActionFunc actionFunc;
+    /* 0x18C */ Path* path;
+    /* 0x190 */ s32 unk_190;
+    /* 0x194 */ s32 unk_194;
+    /* 0x198 */ Vec3s jointTable[BURLY_GUY_LIMB_MAX];
+    /* 0x1F8 */ Vec3s morphTable[BURLY_GUY_LIMB_MAX];
+    /* 0x258 */ Vec3s unk_258;
+    /* 0x25E */ Vec3s unk_25E;
+    /* 0x264 */ s16 eyeIndex;
+    /* 0x266 */ s16 blinkTimer;
+    /* 0x268 */ UNK_TYPE1 unk268[0x2];
+    /* 0x26A */ s16 unk_26A;
+    /* 0x26C */ s16 unk_26C;
+    /* 0x26E */ s16 unk_26E;
+    /* 0x270 */ s16 unk_270;
+    /* 0x272 */ s16 unk_272;
+    /* 0x274 */ s16 unk_274;
+    /* 0x276 */ s16 unk_276;
+    /* 0x278 */ s16 unk_278;
+    /* 0x27A */ s16 unk_27A;
+    /* 0x27C */ s16 unk_27C;
+    /* 0x27E */ s16 unk_27E;
+    /* 0x280 */ s16 unk_280;
+    /* 0x282 */ s16 unk_282;
+    /* 0x284 */ s16 unk_284;
 } EnSyatekiMan; // size = 0x288
 
 extern const ActorInit En_Syateki_Man_InitVars;
diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.h b/src/overlays/actors/ovl_En_Tab/z_en_tab.h
index 3e06c0b2af..25eec79266 100644
--- a/src/overlays/actors/ovl_En_Tab/z_en_tab.h
+++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.h
@@ -10,39 +10,39 @@ typedef void (*EnTabActionFunc)(struct EnTab*, PlayState*);
 typedef s32 (*EnTabUnkFunc)(struct EnTab*, PlayState*);
 
 typedef struct EnTab {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnTabActionFunc actionFunc;
-    /* 0x018C */ ColliderCylinder collider;
-    /* 0x01D8 */ u8 unk_1D8;
-    /* 0x01DC */ s32 unk_1DC;
-    /* 0x01E0 */ Actor* unk_1E0;
-    /* 0x01E4 */ EnGm* unk_1E4;
-    /* 0x01E8 */ Vec3f unk_1E8[2];
-    /* 0x0200 */ Vec3s unk_200[2];
-    /* 0x020C */ Vec3s jointTable[20];
-    /* 0x0284 */ Vec3s morphTable[20];
-    /* 0x02FC */ u16 unk_2FC;
-    /* 0x0300 */ f32 unk_300;
-    /* 0x0304 */ f32 unk_304;
-    /* 0x0308 */ f32 unk_308;
-    /* 0x030C */ s16 unk_30C;
-    /* 0x030E */ UNK_TYPE1 unk30E[4];
-    /* 0x0312 */ s16 unk_312;
-    /* 0x0314 */ s16 unk_314;
-    /* 0x0316 */ s16 unk_316;
-    /* 0x0318 */ s16 unk_318;
-    /* 0x031A */ s16 unk_31A;
-    /* 0x031C */ s16 unk_31C;
-    /* 0x031E */ s16 unk_31E;
-    /* 0x0320 */ s16 unk_320;
-    /* 0x0322 */ s16 unk_322;
-    /* 0x0324 */ s16 unk_324;
-    /* 0x0328 */ EnTabUnkFunc unk_328;
-    /* 0x032C */ s32 unk_32C;
-    /* 0x0330 */ UNK_TYPE1 unk330[4];
-    /* 0x0334 */ s32 unk_334;
-    /* 0x0338 */ s32 unk_338;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnTabActionFunc actionFunc;
+    /* 0x18C */ ColliderCylinder collider;
+    /* 0x1D8 */ u8 unk_1D8;
+    /* 0x1DC */ s32 unk_1DC;
+    /* 0x1E0 */ Actor* unk_1E0;
+    /* 0x1E4 */ EnGm* unk_1E4;
+    /* 0x1E8 */ Vec3f unk_1E8[2];
+    /* 0x200 */ Vec3s unk_200[2];
+    /* 0x20C */ Vec3s jointTable[20];
+    /* 0x284 */ Vec3s morphTable[20];
+    /* 0x2FC */ u16 unk_2FC;
+    /* 0x300 */ f32 unk_300;
+    /* 0x304 */ f32 unk_304;
+    /* 0x308 */ f32 unk_308;
+    /* 0x30C */ s16 unk_30C;
+    /* 0x30E */ UNK_TYPE1 unk30E[4];
+    /* 0x312 */ s16 unk_312;
+    /* 0x314 */ s16 unk_314;
+    /* 0x316 */ s16 unk_316;
+    /* 0x318 */ s16 unk_318;
+    /* 0x31A */ s16 unk_31A;
+    /* 0x31C */ s16 unk_31C;
+    /* 0x31E */ s16 unk_31E;
+    /* 0x320 */ s16 unk_320;
+    /* 0x322 */ s16 unk_322;
+    /* 0x324 */ s16 unk_324;
+    /* 0x328 */ EnTabUnkFunc unk_328;
+    /* 0x32C */ s32 unk_32C;
+    /* 0x330 */ UNK_TYPE1 unk330[4];
+    /* 0x334 */ s32 unk_334;
+    /* 0x338 */ s32 unk_338;
 } EnTab; // size = 0x33C
 
 extern const ActorInit En_Tab_InitVars;
diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h
index f81e7d6979..cc707f0279 100644
--- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h
+++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h
@@ -8,10 +8,10 @@ struct EnTakaraya;
 typedef void (*EnTakarayaActionFunc)(struct EnTakaraya*, PlayState*);
 
 typedef struct EnTakaraya {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x164];
-    /* 0x02A8 */ EnTakarayaActionFunc actionFunc;
-    /* 0x02AC */ char unk_2AC[0x10];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x164];
+    /* 0x2A8 */ EnTakarayaActionFunc actionFunc;
+    /* 0x2AC */ char unk_2AC[0x10];
 } EnTakaraya; // size = 0x2BC
 
 extern const ActorInit En_Takaraya_InitVars;
diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.h b/src/overlays/actors/ovl_En_Talk/z_en_talk.h
index 38ac58764f..393a457b51 100644
--- a/src/overlays/actors/ovl_En_Talk/z_en_talk.h
+++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.h
@@ -10,8 +10,8 @@ struct EnTalk;
 typedef void (*EnTalkActionFunc)(struct EnTalk*, PlayState*);
 
 typedef struct EnTalk {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnTalkActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnTalkActionFunc actionFunc;
 } EnTalk; // size = 0x148
 
 extern const ActorInit En_Talk_InitVars;
diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h
index 1bbb3ad2ea..efbcc31082 100644
--- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h
+++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h
@@ -8,24 +8,24 @@ struct EnTanron2;
 typedef void (*EnTanron2ActionFunc)(struct EnTanron2*, PlayState*);
 
 typedef struct EnTanron2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnTanron2ActionFunc actionFunc;
-    /* 0x0148 */ s16 unk_148;
-    /* 0x014A */ s16 unk_14A;
-    /* 0x014C */ s16 unk_14C;
-    /* 0x014E */ s16 unk_14E;
-    /* 0x0150 */ s16 unk_150;
-    /* 0x0152 */ s16 unk_152;
-    /* 0x0154 */ s16 unk_154;
-    /* 0x0156 */ s16 unk_156;
-    /* 0x0158 */ u8 unk_158;
-    /* 0x0159 */ u8 unk_159;
-    /* 0x015A */ u8 unk_15A;
-    /* 0x015B */ u8 unk_15B;
-    /* 0x015C */ f32 unk_15C;
-    /* 0x0160 */ f32 unk_160;
-    /* 0x0164 */ ColliderCylinder collider1;
-    /* 0x01B0 */ ColliderCylinder collider2;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnTanron2ActionFunc actionFunc;
+    /* 0x148 */ s16 unk_148;
+    /* 0x14A */ s16 unk_14A;
+    /* 0x14C */ s16 unk_14C;
+    /* 0x14E */ s16 unk_14E;
+    /* 0x150 */ s16 unk_150;
+    /* 0x152 */ s16 unk_152;
+    /* 0x154 */ s16 unk_154;
+    /* 0x156 */ s16 unk_156;
+    /* 0x158 */ u8 unk_158;
+    /* 0x159 */ u8 unk_159;
+    /* 0x15A */ u8 unk_15A;
+    /* 0x15B */ u8 unk_15B;
+    /* 0x15C */ f32 unk_15C;
+    /* 0x160 */ f32 unk_160;
+    /* 0x164 */ ColliderCylinder collider1;
+    /* 0x1B0 */ ColliderCylinder collider2;
 } EnTanron2; // size = 0x1FC
 
 extern const ActorInit En_Tanron2_InitVars;
diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h
index 576309694f..9f9e470212 100644
--- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h
+++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h
@@ -15,14 +15,14 @@ struct EnTanron5;
 
 typedef struct EnTanron5 {
     /* 0x000 */ Actor actor;
-    /* 0x0144 */ s16 unk_144;
-    /* 0x0148 */ Gfx* unk_148;
-    /* 0x014C */ ColliderCylinder collider;
-    /* 0x0198 */ s16 unk_198;
-    /* 0x019A */ s16 unk_19A;
-    /* 0x019C */ f32 unk_19C;
-    /* 0x01A0 */ u8 unk_1A0;
-    /* 0x01A1 */ u8 unk_1A1;
+    /* 0x144 */ s16 unk_144;
+    /* 0x148 */ Gfx* unk_148;
+    /* 0x14C */ ColliderCylinder collider;
+    /* 0x198 */ s16 unk_198;
+    /* 0x19A */ s16 unk_19A;
+    /* 0x19C */ f32 unk_19C;
+    /* 0x1A0 */ u8 unk_1A0;
+    /* 0x1A1 */ u8 unk_1A1;
 } EnTanron5; // size = 0x1A4
 
 extern const ActorInit En_Tanron5_InitVars;
diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.h b/src/overlays/actors/ovl_En_Test3/z_en_test3.h
index a2731c7958..9d902bad19 100644
--- a/src/overlays/actors/ovl_En_Test3/z_en_test3.h
+++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.h
@@ -8,10 +8,10 @@ struct EnTest3;
 typedef void (*EnTest3ActionFunc)(struct EnTest3*, PlayState*);
 
 typedef struct EnTest3 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x628];
-    /* 0x076C */ EnTest3ActionFunc actionFunc;
-    /* 0x0770 */ char unk_770[0x648];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x628];
+    /* 0x76C */ EnTest3ActionFunc actionFunc;
+    /* 0x770 */ char unk_770[0x648];
 } EnTest3; // size = 0xDB8
 
 extern const ActorInit En_Test3_InitVars;
diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.h b/src/overlays/actors/ovl_En_Test4/z_en_test4.h
index e26331ed57..5f39f9f564 100644
--- a/src/overlays/actors/ovl_En_Test4/z_en_test4.h
+++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.h
@@ -8,14 +8,14 @@ struct EnTest4;
 typedef void (*EnTest4ActionFunc)(struct EnTest4*, PlayState*);
 
 typedef struct EnTest4 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ s8 unk_144; // 0 on night, 1 on day
-    /* 0x0145 */ u8 transitionCsTimer;
-    /* 0x0146 */ u16 unk_146;
-    /* 0x0148 */ u16 nextBellTime; // Next time the bell will sound
-    /* 0x014A */ u16 lastBellTime; // Last time the bell sounded
-    /* 0x014C */ u8 state;
-    /* 0x0150 */ EnTest4ActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ s8 unk_144; // 0 on night, 1 on day
+    /* 0x145 */ u8 transitionCsTimer;
+    /* 0x146 */ u16 unk_146;
+    /* 0x148 */ u16 nextBellTime; // Next time the bell will sound
+    /* 0x14A */ u16 lastBellTime; // Last time the bell sounded
+    /* 0x14C */ u8 state;
+    /* 0x150 */ EnTest4ActionFunc actionFunc;
 } EnTest4; // size = 0x154
 
 typedef enum {
diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.h b/src/overlays/actors/ovl_En_Test5/z_en_test5.h
index 6481e254b6..bcfcd98e33 100644
--- a/src/overlays/actors/ovl_En_Test5/z_en_test5.h
+++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.h
@@ -10,11 +10,11 @@ struct EnTest5; // SpringWaterModifier
 typedef void (*EnTest5ActionFunc)(struct EnTest5*, PlayState*);
 
 typedef struct EnTest5 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ Vec3f minPos;
-    /* 0x0150 */ f32 xLength;
-    /* 0x0154 */ f32 zLength;
-    /* 0x0158 */ EnTest5ActionFunc actionFunc;    
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ Vec3f minPos;
+    /* 0x150 */ f32 xLength;
+    /* 0x154 */ f32 zLength;
+    /* 0x158 */ EnTest5ActionFunc actionFunc;    
 } EnTest5; // size = 0x15C
 
 extern const ActorInit En_Test5_InitVars;
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 c34b6b8fbc..8bc2cff4e0 100644
--- a/src/overlays/actors/ovl_En_Test6/z_en_test6.h
+++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.h
@@ -18,35 +18,35 @@ enum {
 typedef struct {
     /* 0x00 */ LightNode* node;
     /* 0x04 */ LightInfo info;
-} EnTest6Light;
+} EnTest6Light; // size = 0x14
 
 typedef struct EnTest6 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnTest6ActionFunc actionFunc;
-    /* 0x0148 */ Gfx* unk_148;
-    /* 0x014C */ f32 unk_14C;
-    /* 0x0150 */ f32 unk_150;
-    /* 0x0154 */ f32 unk_154;
-    /* 0x0158 */ f32 unk_158;
-    /* 0x015C */ f32 unk_15C;
-    /* 0x0160 */ f32 unk_160;
-    /* 0x0164 */ EnTest6Light lights[2];
-    /* 0x018C */ DbCameraUnkStruct unk_18C;
-    /* 0x020C */ Vec3f unk_20C[6];
-    /* 0x0254 */ Vec3f (*unk_254)[64];
-    /* 0x0258 */ Vec3f unk_258;
-    /* 0x0264 */ Vec3f unk_264;
-    /* 0x0270 */ f32 unk_270;
-    /* 0x0274 */ s16 unk_274;
-    /* 0x0276 */ s16 unk_276;
-    /* 0x0278 */ s16 unk_278;
-    /* 0x027A */ s16 unk_27A;
-    /* 0x027C */ s16 unk_27C;
-    /* 0x027E */ s16 unk_27E;
-    /* 0x0280 */ s16 unk_280;
-    /* 0x0282 */ s16 unk_282;
-    /* 0x0284 */ s16 unk_284;
-    /* 0x0286 */ s16 unk_286;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnTest6ActionFunc actionFunc;
+    /* 0x148 */ Gfx* unk_148;
+    /* 0x14C */ f32 unk_14C;
+    /* 0x150 */ f32 unk_150;
+    /* 0x154 */ f32 unk_154;
+    /* 0x158 */ f32 unk_158;
+    /* 0x15C */ f32 unk_15C;
+    /* 0x160 */ f32 unk_160;
+    /* 0x164 */ EnTest6Light lights[2];
+    /* 0x18C */ DbCameraUnkStruct unk_18C;
+    /* 0x20C */ Vec3f unk_20C[6];
+    /* 0x254 */ Vec3f (*unk_254)[64];
+    /* 0x258 */ Vec3f unk_258;
+    /* 0x264 */ Vec3f unk_264;
+    /* 0x270 */ f32 unk_270;
+    /* 0x274 */ s16 unk_274;
+    /* 0x276 */ s16 unk_276;
+    /* 0x278 */ s16 unk_278;
+    /* 0x27A */ s16 unk_27A;
+    /* 0x27C */ s16 unk_27C;
+    /* 0x27E */ s16 unk_27E;
+    /* 0x280 */ s16 unk_280;
+    /* 0x282 */ s16 unk_282;
+    /* 0x284 */ s16 unk_284;
+    /* 0x286 */ s16 unk_286;
 } EnTest6; // size = 0x288
 
 extern const ActorInit En_Test6_InitVars;
diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h
index b2303d0b52..2798b99b3d 100644
--- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h
+++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h
@@ -8,9 +8,9 @@ struct EnTg;
 typedef void (*EnTgActionFunc)(struct EnTg*, PlayState*);
 
 typedef struct EnTg {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnTgActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x400];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnTgActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x400];
 } EnTg; // size = 0x548
 
 extern const ActorInit En_Tg_InitVars;
diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
index 6684f630bf..698d963bed 100644
--- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
+++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
@@ -18,28 +18,28 @@ typedef struct {
 } EnThiefbirdUnkStruct; // size = 0x24
 
 typedef struct EnThiefbird {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnThiefbirdActionFunc actionFunc;
-    /* 0x018C */ u8 drawDmgEffType;
-    /* 0x018E */ s16 unk_18E;
-    /* 0x0190 */ s16 unk_190;
-    /* 0x0192 */ s16 unk_192;
-    /* 0x0194 */ s16 unk_194;
-    /* 0x0196 */ s16 unk_196[6];
-    /* 0x01A2 */ Vec3s jointTable[17];
-    /* 0x0208 */ Vec3s morphTable[17];
-    /* 0x0270 */ ColliderJntSph collider;
-    /* 0x0290 */ ColliderJntSphElement colliderElements[3];
-    /* 0x0350 */ Vec3f limbPos[11];
-    /* 0x03D4 */ f32 drawDmgEffAlpha;
-    /* 0x03D8 */ f32 drawDmgEffScale;
-    /* 0x03DC */ f32 drawDmgEffFrozenSteamScale;
-    /* 0x03E0 */ f32 unk_3E0;
-    /* 0x03E4 */ Gfx* unk_3E4;
-    /* 0x03E8 */ Gfx* unk_3E8;
-    /* 0x03EC */ EnItem00* unk_3EC;
-    /* 0x03F0 */ EnThiefbirdUnkStruct unk_3F0[40];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnThiefbirdActionFunc actionFunc;
+    /* 0x18C */ u8 drawDmgEffType;
+    /* 0x18E */ s16 unk_18E;
+    /* 0x190 */ s16 unk_190;
+    /* 0x192 */ s16 unk_192;
+    /* 0x194 */ s16 unk_194;
+    /* 0x196 */ s16 unk_196[6];
+    /* 0x1A2 */ Vec3s jointTable[17];
+    /* 0x208 */ Vec3s morphTable[17];
+    /* 0x270 */ ColliderJntSph collider;
+    /* 0x290 */ ColliderJntSphElement colliderElements[3];
+    /* 0x350 */ Vec3f limbPos[11];
+    /* 0x3D4 */ f32 drawDmgEffAlpha;
+    /* 0x3D8 */ f32 drawDmgEffScale;
+    /* 0x3DC */ f32 drawDmgEffFrozenSteamScale;
+    /* 0x3E0 */ f32 unk_3E0;
+    /* 0x3E4 */ Gfx* unk_3E4;
+    /* 0x3E8 */ Gfx* unk_3E8;
+    /* 0x3EC */ EnItem00* unk_3EC;
+    /* 0x3F0 */ EnThiefbirdUnkStruct unk_3F0[40];
 } EnThiefbird; // size = 0x990
 
 extern const ActorInit En_Thiefbird_InitVars;
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 7f420bc909..6ee46c1d3f 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
@@ -13,8 +13,8 @@ typedef void (*EnTimeTagActionFunc)(struct EnTimeTag*, PlayState*);
 #define ENTIMETAG_GET_E000(thisx) (((thisx)->params & 0xE000) >> 0xD)
 
 typedef struct EnTimeTag {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnTimeTagActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnTimeTagActionFunc actionFunc;
 } EnTimeTag; // size = 0x148
 
 extern const ActorInit En_Time_Tag_InitVars;
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 c17955ec8b..2d3a13a37a 100644
--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h
@@ -16,25 +16,25 @@ enum {
 };
 
 typedef struct EnTite {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[25];
-    /* 0x021E */ Vec3s morphTable[25];
-    /* 0x02B4 */ EnTiteActionFunc actionFunc;
-    /* 0x02B8 */ u8 unk_2B8;
-    /* 0x02B9 */ u8 unk_2B9;
-    /* 0x02BA */ s8 unk_2BA;
-    /* 0x02BB */ u8 drawDmgEffType;
-    /* 0x02BC */ s16 unk_2BC;
-    /* 0x02BE */ s16 unk_2BE;
-    /* 0x02C0 */ s32 unk_2C0;
-    /* 0x02C4 */ f32 drawDmgEffAlpha;
-    /* 0x02C8 */ f32 drawDmgEffScale;
-    /* 0x02CC */ f32 drawDmgEffFrozenSteamScale;
-    /* 0x02D0 */ Vec3f limbPos[9];
-    /* 0x033C */ Vec3f unk_33C[9];
-    /* 0x03A8 */ Gfx* unk_3A8;
-    /* 0x03AC */ ColliderSphere collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[25];
+    /* 0x21E */ Vec3s morphTable[25];
+    /* 0x2B4 */ EnTiteActionFunc actionFunc;
+    /* 0x2B8 */ u8 unk_2B8;
+    /* 0x2B9 */ u8 unk_2B9;
+    /* 0x2BA */ s8 unk_2BA;
+    /* 0x2BB */ u8 drawDmgEffType;
+    /* 0x2BC */ s16 unk_2BC;
+    /* 0x2BE */ s16 unk_2BE;
+    /* 0x2C0 */ s32 unk_2C0;
+    /* 0x2C4 */ f32 drawDmgEffAlpha;
+    /* 0x2C8 */ f32 drawDmgEffScale;
+    /* 0x2CC */ f32 drawDmgEffFrozenSteamScale;
+    /* 0x2D0 */ Vec3f limbPos[9];
+    /* 0x33C */ Vec3f unk_33C[9];
+    /* 0x3A8 */ Gfx* unk_3A8;
+    /* 0x3AC */ ColliderSphere collider;
 } EnTite; // size = 0x404
 
 extern const ActorInit En_Tite_InitVars;
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
index a5ff1b8175..279cd08100 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
@@ -13,54 +13,54 @@ typedef void (*EnTkUnkFunc)(struct EnTk*, PlayState*);
 #define ENTK_GET_F800(thisx) ((((thisx)->params >> 0xB) & 0x1F) & 0xFF)
 
 typedef struct EnTk {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnTkActionFunc actionFunc;
-    /* 0x018C */ ColliderCylinder collider;
-    /* 0x01D8 */ Vec3s jointTable[18];
-    /* 0x0244 */ Vec3s morphTable[18];
-    /* 0x02B0 */ s8 unk_2B0;
-    /* 0x02B1 */ s8 unk_2B1;
-    /* 0x02B4 */ Vec3f unk_2B4;
-    /* 0x02C0 */ s16 unk_2C0;
-    /* 0x02C2 */ s16 unk_2C2;
-    /* 0x02C4 */ s16 unk_2C4;
-    /* 0x02C6 */ s16 unk_2C6;
-    /* 0x02C8 */ UNK_TYPE1 unk2C8[0x2];
-    /* 0x02CA */ u16 unk_2CA;
-    /* 0x02CC */ s16 unk_2CC;
-    /* 0x02D0 */ s32 unk_2D0;
-    /* 0x02D4 */ s32 unk_2D4;
-    /* 0x02D8 */ f32 unk_2D8;
-    /* 0x02DC */ f32 unk_2DC;
-    /* 0x02E0 */ s32 unk_2E0;
-    /* 0x02E4 */ s16 unk_2E4;
-    /* 0x02E6 */ u16 unk_2E6;
-    /* 0x02E8 */ s16 unk_2E8;
-    /* 0x02EC */ Vec3f unk_2EC;
-    /* 0x02F8 */ Vec3s unk_2F8;
-    /* 0x0300 */ Vec3f unk_300;
-    /* 0x030C */ EnTkUnkFunc unk_30C;
-    /* 0x0310 */ s16 unk_310;
-    /* 0x0312 */ s16 cutscenes[2];
-    /* 0x0316 */ s16 unk_316;
-    /* 0x0318 */ s16 unk_318;
-    /* 0x031A */ s16 unk_31A;
-    /* 0x031C */ s16 unk_31C;
-    /* 0x0320 */ f32 unk_320;
-    /* 0x0324 */ Vec3f unk_324[6];
-    /* 0x036C */ s32 unk_36C;
-    /* 0x0370 */ UNK_TYPE1 unk370[0x58];
-    /* 0x03C8 */ Path* timePath;
-    /* 0x03CC */ u8 unk_3CC;
-    /* 0x03CE */ u16 unk_3CE;
-    /* 0x03D0 */ s32 timePathTimeSpeed;
-    /* 0x03D4 */ Vec3f timePathTargetPos;
-    /* 0x03E0 */ f32 timePathProgress;
-    /* 0x03E4 */ s32 timePathTotalTime;
-    /* 0x03E8 */ s32 timePathWaypointTime;
-    /* 0x03EC */ s32 timePathWaypoint;
-    /* 0x03F0 */ s32 timePathElapsedTime;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnTkActionFunc actionFunc;
+    /* 0x18C */ ColliderCylinder collider;
+    /* 0x1D8 */ Vec3s jointTable[18];
+    /* 0x244 */ Vec3s morphTable[18];
+    /* 0x2B0 */ s8 unk_2B0;
+    /* 0x2B1 */ s8 unk_2B1;
+    /* 0x2B4 */ Vec3f unk_2B4;
+    /* 0x2C0 */ s16 unk_2C0;
+    /* 0x2C2 */ s16 unk_2C2;
+    /* 0x2C4 */ s16 unk_2C4;
+    /* 0x2C6 */ s16 unk_2C6;
+    /* 0x2C8 */ UNK_TYPE1 unk2C8[0x2];
+    /* 0x2CA */ u16 unk_2CA;
+    /* 0x2CC */ s16 unk_2CC;
+    /* 0x2D0 */ s32 unk_2D0;
+    /* 0x2D4 */ s32 unk_2D4;
+    /* 0x2D8 */ f32 unk_2D8;
+    /* 0x2DC */ f32 unk_2DC;
+    /* 0x2E0 */ s32 unk_2E0;
+    /* 0x2E4 */ s16 unk_2E4;
+    /* 0x2E6 */ u16 unk_2E6;
+    /* 0x2E8 */ s16 unk_2E8;
+    /* 0x2EC */ Vec3f unk_2EC;
+    /* 0x2F8 */ Vec3s unk_2F8;
+    /* 0x300 */ Vec3f unk_300;
+    /* 0x30C */ EnTkUnkFunc unk_30C;
+    /* 0x310 */ s16 unk_310;
+    /* 0x312 */ s16 cutscenes[2];
+    /* 0x316 */ s16 unk_316;
+    /* 0x318 */ s16 unk_318;
+    /* 0x31A */ s16 unk_31A;
+    /* 0x31C */ s16 unk_31C;
+    /* 0x320 */ f32 unk_320;
+    /* 0x324 */ Vec3f unk_324[6];
+    /* 0x36C */ s32 unk_36C;
+    /* 0x370 */ UNK_TYPE1 unk370[0x58];
+    /* 0x3C8 */ Path* timePath;
+    /* 0x3CC */ u8 unk_3CC;
+    /* 0x3CE */ u16 unk_3CE;
+    /* 0x3D0 */ s32 timePathTimeSpeed;
+    /* 0x3D4 */ Vec3f timePathTargetPos;
+    /* 0x3E0 */ f32 timePathProgress;
+    /* 0x3E4 */ s32 timePathTotalTime;
+    /* 0x3E8 */ s32 timePathWaypointTime;
+    /* 0x3EC */ s32 timePathWaypoint;
+    /* 0x3F0 */ s32 timePathElapsedTime;
 } EnTk; // size = 0x3F4
 
 extern const ActorInit En_Tk_InitVars;
diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.h b/src/overlays/actors/ovl_En_Tru/z_en_tru.h
index 5e64c3a903..7e1c233806 100644
--- a/src/overlays/actors/ovl_En_Tru/z_en_tru.h
+++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.h
@@ -22,41 +22,41 @@ typedef struct {
 } EnTruUnkStruct; // size = 0x30
 
 typedef struct EnTru {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnTruActionFunc actionFunc;
-    /* 0x018C */ ColliderSphere collider;
-    /* 0x01E4 */ Path* path;
-    /* 0x01E8 */ s32 unk_1E8;
-    /* 0x01EC */ Vec3f unk_1EC;
-    /* 0x01F8 */ Vec3f unk_1F8;
-    /* 0x0204 */ Vec3s unk_204;
-    /* 0x020A */ Vec3s jointTable[27];
-    /* 0x02AC */ Vec3s morphTable[27];
-    /* 0x034E */ u16 unk_34E;
-    /* 0x0350 */ UNK_TYPE1 unk350[0x4];
-    /* 0x0354 */ s32* unk_354;
-    /* 0x0358 */ f32 unk_358;
-    /* 0x035C */ f32 unk_35C;
-    /* 0x0360 */ s16 unk_360;
-    /* 0x0362 */ s16 unk_362;
-    /* 0x0364 */ s16 unk_364;
-    /* 0x0366 */ s16 unk_366;
-    /* 0x0368 */ s16 unk_368;
-    /* 0x036A */ s16 unk_36A;
-    /* 0x036C */ s16 unk_36C;
-    /* 0x036E */ s16 unk_36E;
-    /* 0x0370 */ s16 unk_370;
-    /* 0x0372 */ s16 unk_372;
-    /* 0x0374 */ s16 unk_374;
-    /* 0x0378 */ EnTruUnkFunc unk_378;
-    /* 0x037C */ s32 unk_37C;
-    /* 0x0380 */ UNK_TYPE1 unk380[0x4];
-    /* 0x0384 */ s32 unk_384;
-    /* 0x0388 */ s32 unk_388;
-    /* 0x038C */ s32 unk_38C;
-    /* 0x0390 */ s32 unk_390;
-    /* 0x0394 */ EnTruUnkStruct unk_394[30];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnTruActionFunc actionFunc;
+    /* 0x18C */ ColliderSphere collider;
+    /* 0x1E4 */ Path* path;
+    /* 0x1E8 */ s32 unk_1E8;
+    /* 0x1EC */ Vec3f unk_1EC;
+    /* 0x1F8 */ Vec3f unk_1F8;
+    /* 0x204 */ Vec3s unk_204;
+    /* 0x20A */ Vec3s jointTable[27];
+    /* 0x2AC */ Vec3s morphTable[27];
+    /* 0x34E */ u16 unk_34E;
+    /* 0x350 */ UNK_TYPE1 unk350[0x4];
+    /* 0x354 */ s32* unk_354;
+    /* 0x358 */ f32 unk_358;
+    /* 0x35C */ f32 unk_35C;
+    /* 0x360 */ s16 unk_360;
+    /* 0x362 */ s16 unk_362;
+    /* 0x364 */ s16 unk_364;
+    /* 0x366 */ s16 unk_366;
+    /* 0x368 */ s16 unk_368;
+    /* 0x36A */ s16 unk_36A;
+    /* 0x36C */ s16 unk_36C;
+    /* 0x36E */ s16 unk_36E;
+    /* 0x370 */ s16 unk_370;
+    /* 0x372 */ s16 unk_372;
+    /* 0x374 */ s16 unk_374;
+    /* 0x378 */ EnTruUnkFunc unk_378;
+    /* 0x37C */ s32 unk_37C;
+    /* 0x380 */ UNK_TYPE1 unk380[0x4];
+    /* 0x384 */ s32 unk_384;
+    /* 0x388 */ s32 unk_388;
+    /* 0x38C */ s32 unk_38C;
+    /* 0x390 */ s32 unk_390;
+    /* 0x394 */ EnTruUnkStruct unk_394[30];
 } EnTru; // size = 0x934
 
 extern const ActorInit En_Tru_InitVars;
diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h
index 657049aa29..670d0d728a 100644
--- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h
+++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h
@@ -12,33 +12,33 @@ typedef void (*EnTruMtActionFunc)(struct EnTruMt*, PlayState*);
 #define ENTRUMT_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
 
 typedef struct EnTruMt {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnTruMtActionFunc actionFunc;
-    /* 0x0148 */ SkelAnime skelAnime;
-    /* 0x018C */ ColliderSphere collider;
-    /* 0x01E4 */ Vec3s jointTable[OBJECT_TRU_LIMB_MAX];
-    /* 0x0286 */ Vec3s morphTable[OBJECT_TRU_LIMB_MAX];
-    /* 0x0328 */ u16 unk_328;
-    /* 0x032A */ UNK_TYPE1 unk32A[0xC];
-    /* 0x0336 */ Vec3s unk_336;
-    /* 0x033C */ Vec3f unk_33C;
-    /* 0x0348 */ s16 unk_348;
-    /* 0x034A */ s16 unk_34A;
-    /* 0x034C */ s16 unk_34C;
-    /* 0x034E */ s16 unk_34E;
-    /* 0x0350 */ Vec3f unk_350;
-    /* 0x035C */ Vec3f unk_35C;
-    /* 0x0368 */ Path* path;
-    /* 0x036C */ s32 unk_36C;
-    /* 0x0370 */ Vec3f unk_370;
-    /* 0x037C */ UNK_TYPE1 unk37C[0xC];
-    /* 0x0388 */ s16 unk_388;
-    /* 0x038A */ s16 unk_38A;
-    /* 0x038C */ s16 unk_38C;
-    /* 0x038E */ Vec3s unk_38E;
-    /* 0x0394 */ s16 unk_394;
-    /* 0x0398 */ Vec3f unk_398;
-    /* 0x03A4 */ u8 unk_3A4;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnTruMtActionFunc actionFunc;
+    /* 0x148 */ SkelAnime skelAnime;
+    /* 0x18C */ ColliderSphere collider;
+    /* 0x1E4 */ Vec3s jointTable[OBJECT_TRU_LIMB_MAX];
+    /* 0x286 */ Vec3s morphTable[OBJECT_TRU_LIMB_MAX];
+    /* 0x328 */ u16 unk_328;
+    /* 0x32A */ UNK_TYPE1 unk32A[0xC];
+    /* 0x336 */ Vec3s unk_336;
+    /* 0x33C */ Vec3f unk_33C;
+    /* 0x348 */ s16 unk_348;
+    /* 0x34A */ s16 unk_34A;
+    /* 0x34C */ s16 unk_34C;
+    /* 0x34E */ s16 unk_34E;
+    /* 0x350 */ Vec3f unk_350;
+    /* 0x35C */ Vec3f unk_35C;
+    /* 0x368 */ Path* path;
+    /* 0x36C */ s32 unk_36C;
+    /* 0x370 */ Vec3f unk_370;
+    /* 0x37C */ UNK_TYPE1 unk37C[0xC];
+    /* 0x388 */ s16 unk_388;
+    /* 0x38A */ s16 unk_38A;
+    /* 0x38C */ s16 unk_38C;
+    /* 0x38E */ Vec3s unk_38E;
+    /* 0x394 */ s16 unk_394;
+    /* 0x398 */ Vec3f unk_398;
+    /* 0x3A4 */ u8 unk_3A4;
 } EnTruMt; // size = 0x3A8
 
 extern const ActorInit En_Tru_Mt_InitVars;
diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h
index 199f98ce7a..ce61376495 100644
--- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h
+++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h
@@ -16,17 +16,17 @@ typedef void (*EnTsnActionFunc)(struct EnTsn*, PlayState*);
 #define ENTSN_F_1 1
 
 typedef struct EnTsn {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ SkelAnime skelAnime;
-    /* 0x01D4 */ EnTsnActionFunc actionFunc;
-    /* 0x01D8 */ struct EnTsn* unk_1D8;
-    /* 0x01DC */ UNK_TYPE1 unk1DC[0x44];
-    /* 0x0220 */ u16 unk_220;
-    /* 0x0222 */ Vec3s unk_222;
-    /* 0x0228 */ Vec3s unk_228;
-    /* 0x022E */ s16 unk_22E;
-    /* 0x0230 */ s16 unk_230;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ SkelAnime skelAnime;
+    /* 0x1D4 */ EnTsnActionFunc actionFunc;
+    /* 0x1D8 */ struct EnTsn* unk_1D8;
+    /* 0x1DC */ UNK_TYPE1 unk1DC[0x44];
+    /* 0x220 */ u16 unk_220;
+    /* 0x222 */ Vec3s unk_222;
+    /* 0x228 */ Vec3s unk_228;
+    /* 0x22E */ s16 unk_22E;
+    /* 0x230 */ s16 unk_230;
 } EnTsn; // size = 0x234
 
 extern const ActorInit En_Tsn_InitVars;
diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
index 2d0b771b2e..db3b9cbe40 100644
--- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
+++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
@@ -8,11 +8,11 @@ struct EnTuboTrap;
 typedef void (*EnTuboTrapActionFunc)(struct EnTuboTrap*, PlayState*);
 
 typedef struct EnTuboTrap {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnTuboTrapActionFunc actionFunc;
-    /* 0x0148 */ f32 targetHeight;
-    /* 0x014C */ Vec3f originPos;
-    /* 0x0158 */ ColliderCylinder collider;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnTuboTrapActionFunc actionFunc;
+    /* 0x148 */ f32 targetHeight;
+    /* 0x14C */ Vec3f originPos;
+    /* 0x158 */ ColliderCylinder collider;
 } EnTuboTrap; // size = 0x1A4
 
 extern const ActorInit En_Tubo_Trap_InitVars;
diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.h b/src/overlays/actors/ovl_En_Twig/z_en_twig.h
index 31328b99ec..2caebeb82c 100644
--- a/src/overlays/actors/ovl_En_Twig/z_en_twig.h
+++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.h
@@ -8,10 +8,10 @@ struct EnTwig;
 typedef void (*EnTwigActionFunc)(struct EnTwig*, PlayState*);
 
 typedef struct EnTwig {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ EnTwigActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x2C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ EnTwigActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x2C];
 } EnTwig; // size = 0x18C
 
 extern const ActorInit En_Twig_InitVars;
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 9c82938749..17cd47230a 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
@@ -8,9 +8,9 @@ struct EnViewer;
 typedef void (*EnViewerActionFunc)(struct EnViewer*, PlayState*);
 
 typedef struct EnViewer {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnViewerActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x10];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnViewerActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x10];
 } EnViewer; // size = 0x158
 
 extern const ActorInit En_Viewer_InitVars;
diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.h b/src/overlays/actors/ovl_En_Vm/z_en_vm.h
index 69c16dd719..dd1c36aa21 100644
--- a/src/overlays/actors/ovl_En_Vm/z_en_vm.h
+++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h
@@ -14,25 +14,25 @@ typedef void (*EnVmActionFunc)(struct EnVm*, PlayState*);
 #define ENVM_FF00_FF 0xFF
 
 typedef struct EnVm {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[11];
-    /* 0x01CA */ Vec3s morphTable[11];
-    /* 0x020C */ EnVmActionFunc actionFunc;
-    /* 0x0210 */ u8 unk_210;
-    /* 0x0212 */ s16 unk_212;
-    /* 0x0214 */ s16 unk_214;
-    /* 0x0216 */ s16 unk_216;
-    /* 0x0218 */ s16 unk_218;
-    /* 0x021C */ f32 unk_21C;
-    /* 0x0220 */ f32 unk_220;
-    /* 0x0224 */ f32 unk_224;
-    /* 0x0228 */ Vec3f unk_228;
-    /* 0x0234 */ Vec3f unk_234;
-    /* 0x0240 */ ColliderJntSph colliderJntSph;
-    /* 0x0260 */ ColliderJntSphElement colliderJntSphElements[2];
-    /* 0x02E0 */ ColliderTris colliderTris;
-    /* 0x0300 */ ColliderTrisElement colliderTrisElements[1];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[11];
+    /* 0x1CA */ Vec3s morphTable[11];
+    /* 0x20C */ EnVmActionFunc actionFunc;
+    /* 0x210 */ u8 unk_210;
+    /* 0x212 */ s16 unk_212;
+    /* 0x214 */ s16 unk_214;
+    /* 0x216 */ s16 unk_216;
+    /* 0x218 */ s16 unk_218;
+    /* 0x21C */ f32 unk_21C;
+    /* 0x220 */ f32 unk_220;
+    /* 0x224 */ f32 unk_224;
+    /* 0x228 */ Vec3f unk_228;
+    /* 0x234 */ Vec3f unk_234;
+    /* 0x240 */ ColliderJntSph colliderJntSph;
+    /* 0x260 */ ColliderJntSphElement colliderJntSphElements[2];
+    /* 0x2E0 */ ColliderTris colliderTris;
+    /* 0x300 */ ColliderTrisElement colliderTrisElements[1];
 } EnVm; // size = 0x35C
 
 extern const ActorInit En_Vm_InitVars;
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 64ca9b58bc..af7c6f18cf 100644
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
@@ -25,9 +25,9 @@
  * the timer to 130 frames if the player strays too far from the Wallmaster's current position.
  */
 typedef enum {
-    /* 0x00 */ WALLMASTER_TYPE_TIMER_ONLY,
-    /* 0x01 */ WALLMASTER_TYPE_PROXIMITY,
-    /* 0x02 */ WALLMASTER_TYPE_FLAG
+    /* 0x0 */ WALLMASTER_TYPE_TIMER_ONLY,
+    /* 0x1 */ WALLMASTER_TYPE_PROXIMITY,
+    /* 0x2 */ WALLMASTER_TYPE_FLAG
 } WallmasterType;
 
 struct EnWallmas;
diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c
index d17a3780af..499ca365f2 100644
--- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c
+++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c
@@ -89,23 +89,23 @@ void EnWaterEffect_Init(Actor* thisx, PlayState* play) {
         this->actor.update = func_80A59C04;
         this->actor.draw = func_80A5A184;
         this->unk_DC6 = Rand_ZeroFloat(100.0f) + 60.0f;
-    } else if ((this->actor.params == ENWATEREFFECT_777) || (this->actor.params == ENWATEREFFECT_778) ||
-               (this->actor.params == ENWATEREFFECT_779) || (this->actor.params == ENWATEREFFECT_780)) {
+    } else if ((this->actor.params == ENWATEREFFECT_309) || (this->actor.params == ENWATEREFFECT_30A) ||
+               (this->actor.params == ENWATEREFFECT_30B) || (this->actor.params == ENWATEREFFECT_30C)) {
         this->actor.update = func_80A5A534;
         this->actor.draw = func_80A5A6B8;
         this->actor.shape.rot.y = Rand_ZeroFloat(0x10000);
         Actor_SetScale(&this->actor, this->actor.shape.rot.z * 0.0002f);
 
-        if (this->actor.params == ENWATEREFFECT_777) {
+        if (this->actor.params == ENWATEREFFECT_309) {
             Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WATER_EFFECT, this->actor.world.pos.x, this->actor.world.pos.y,
                         this->actor.world.pos.z, 0, 0, this->actor.shape.rot.z, 0x30A);
             Actor_Spawn(&play->actorCtx, play, ACTOR_EN_WATER_EFFECT, this->actor.world.pos.x, this->actor.world.pos.y,
                         this->actor.world.pos.z, 0, 0, this->actor.shape.rot.z, 0x30B);
-        } else if (this->actor.params == ENWATEREFFECT_778) {
+        } else if (this->actor.params == ENWATEREFFECT_30A) {
             this->unk_DC4 = -3;
-        } else if (this->actor.params == ENWATEREFFECT_779) {
+        } else if (this->actor.params == ENWATEREFFECT_30B) {
             this->unk_DC4 = -6;
-        } else if (this->actor.params == ENWATEREFFECT_780) {
+        } else if (this->actor.params == ENWATEREFFECT_30C) {
             this->unk_DC4 = 23;
         }
 
@@ -620,7 +620,7 @@ void func_80A5A6B8(Actor* thisx, PlayState* play2) {
     Matrix_Push();
     Matrix_Push();
 
-    if ((this->actor.params == ENWATEREFFECT_777) || (this->actor.params == ENWATEREFFECT_778)) {
+    if ((this->actor.params == ENWATEREFFECT_309) || (this->actor.params == ENWATEREFFECT_30A)) {
         if (this->unk_E2C > 1.0f) {
             func_8012C2DC(play->state.gfxCtx);
             AnimatedMat_Draw(play, Lib_SegmentedToVirtual(object_water_effect_Matanimheader_000DE0));
@@ -648,7 +648,7 @@ void func_80A5A6B8(Actor* thisx, PlayState* play2) {
         Matrix_Pop();
     }
 
-    if ((this->unk_E34 > 1.0f) && (this->actor.params != ENWATEREFFECT_780)) {
+    if ((this->unk_E34 > 1.0f) && (this->actor.params != ENWATEREFFECT_30C)) {
         func_8012C2DC(play->state.gfxCtx);
         AnimatedMat_Draw(play, Lib_SegmentedToVirtual(object_water_effect_Matanimheader_000E40));
         Matrix_Scale(this->unk_DC8[3].y, this->unk_DC8[3].z, this->unk_DC8[3].y, MTXMODE_APPLY);
@@ -660,7 +660,7 @@ void func_80A5A6B8(Actor* thisx, PlayState* play2) {
 
     Matrix_Pop();
 
-    if ((this->actor.params == ENWATEREFFECT_777) || (this->actor.params == ENWATEREFFECT_780)) {
+    if ((this->actor.params == ENWATEREFFECT_309) || (this->actor.params == ENWATEREFFECT_30C)) {
         func_8012C2DC(play->state.gfxCtx);
         AnimatedMat_Draw(play, Lib_SegmentedToVirtual(object_water_effect_Matanimheader_000E58));
         Matrix_Scale(this->unk_DC8[4].y, this->unk_DC8[4].z, this->unk_DC8[4].y, MTXMODE_APPLY);
@@ -670,7 +670,7 @@ void func_80A5A6B8(Actor* thisx, PlayState* play2) {
         gSPDisplayList(POLY_XLU_DISP++, object_water_effect_DL_000CD8);
     }
 
-    if (this->actor.params == ENWATEREFFECT_777) {
+    if (this->actor.params == ENWATEREFFECT_309) {
         func_8012C2DC(play->state.gfxCtx);
 
         for (i = 0; i < ARRAY_COUNT(this->unk_144) / 2; i++, ptr++) {
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 774b858cda..35aebd83e7 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
@@ -19,11 +19,11 @@ typedef struct {
 } EnWaterEffectStruct; // size = 0x40
 
 enum {
-    /* 0x  1 */ ENWATEREFFECT_1 = 1,
-    /* 0x309 */ ENWATEREFFECT_777 = 777,
-    /* 0x30A */ ENWATEREFFECT_778,
-    /* 0x30B */ ENWATEREFFECT_779,
-    /* 0x30C */ ENWATEREFFECT_780,
+    /* 0x001 */ ENWATEREFFECT_1 = 1,
+    /* 0x309 */ ENWATEREFFECT_309 = 0x309,
+    /* 0x30A */ ENWATEREFFECT_30A,
+    /* 0x30B */ ENWATEREFFECT_30B,
+    /* 0x30C */ ENWATEREFFECT_30C,
 };
 
 typedef struct EnWaterEffect {
diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h
index cf15b02249..adf19ce8c2 100644
--- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h
+++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h
@@ -8,10 +8,10 @@ struct EnWdhand;
 typedef void (*EnWdhandActionFunc)(struct EnWdhand*, PlayState*);
 
 typedef struct EnWdhand {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0xA4];
-    /* 0x01E8 */ EnWdhandActionFunc actionFunc;
-    /* 0x01EC */ char unk_1EC[0x268];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0xA4];
+    /* 0x1E8 */ EnWdhandActionFunc actionFunc;
+    /* 0x1EC */ char unk_1EC[0x268];
 } EnWdhand; // size = 0x454
 
 extern const ActorInit En_Wdhand_InitVars;
diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h
index d4666db0ae..38570dd9e4 100644
--- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h
+++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h
@@ -11,30 +11,30 @@ typedef void (*EnWfActionFunc)(struct EnWf*, PlayState*);
 #define ENWF_GET_80(thisx) ((thisx)->params & 0x80)
 
 typedef struct EnWf {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[WOLFOS_NORMAL_LIMB_MAX];
-    /* 0x020C */ Vec3s morphTable[WOLFOS_NORMAL_LIMB_MAX];
-    /* 0x0290 */ EnWfActionFunc actionFunc;
-    /* 0x0294 */ u8 eyeIndex;
-    /* 0x0295 */ u8 unk_295;
-    /* 0x0296 */ u8 drawDmgEffType;
-    /* 0x0298 */ s16 unk_298;
-    /* 0x029A */ s16 unk_29A;
-    /* 0x029C */ s16 unk_29C;
-    /* 0x029E */ s16 unk_29E;
-    /* 0x02A0 */ s16 unk_2A0;
-    /* 0x02A2 */ u16 unk_2A2;
-    /* 0x02A4 */ f32 unk_2A4;
-    /* 0x02A8 */ f32 unk_2A8;
-    /* 0x02AC */ f32 drawDmgEffAlpha;
-    /* 0x02B0 */ f32 drawDmgEffScale;
-    /* 0x02B4 */ f32 drawDmgEffFrozenSteamScale;
-    /* 0x02B8 */ Vec3f limbPos[10];
-    /* 0x0330 */ ColliderJntSph collider1;
-    /* 0x0350 */ ColliderJntSphElement collider1Elements[4];
-    /* 0x0450 */ ColliderCylinder collider2;
-    /* 0x049C */ ColliderCylinder collider3;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[WOLFOS_NORMAL_LIMB_MAX];
+    /* 0x20C */ Vec3s morphTable[WOLFOS_NORMAL_LIMB_MAX];
+    /* 0x290 */ EnWfActionFunc actionFunc;
+    /* 0x294 */ u8 eyeIndex;
+    /* 0x295 */ u8 unk_295;
+    /* 0x296 */ u8 drawDmgEffType;
+    /* 0x298 */ s16 unk_298;
+    /* 0x29A */ s16 unk_29A;
+    /* 0x29C */ s16 unk_29C;
+    /* 0x29E */ s16 unk_29E;
+    /* 0x2A0 */ s16 unk_2A0;
+    /* 0x2A2 */ u16 unk_2A2;
+    /* 0x2A4 */ f32 unk_2A4;
+    /* 0x2A8 */ f32 unk_2A8;
+    /* 0x2AC */ f32 drawDmgEffAlpha;
+    /* 0x2B0 */ f32 drawDmgEffScale;
+    /* 0x2B4 */ f32 drawDmgEffFrozenSteamScale;
+    /* 0x2B8 */ Vec3f limbPos[10];
+    /* 0x330 */ ColliderJntSph collider1;
+    /* 0x350 */ ColliderJntSphElement collider1Elements[4];
+    /* 0x450 */ ColliderCylinder collider2;
+    /* 0x49C */ ColliderCylinder collider3;
 } EnWf; // size = 0x4E8
 
 extern const ActorInit En_Wf_InitVars;
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 835007d0b8..a1ae32032c 100644
--- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h
+++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h
@@ -8,16 +8,16 @@ struct EnWiz;
 typedef void (*EnWizActionFunc)(struct EnWiz*, PlayState*);
 
 typedef struct EnWiz {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x268];
-    /* 0x03AC */ EnWizActionFunc actionFunc;
-    /* 0x03B0 */ char unk_3B0[0xA];
-    /* 0x03BA */ s16 unk_3BA;
-    /* 0x03BC */ char unk_3BC[0x8C];
-    /* 0x0448 */ s32 unk_448;
-    /* 0x044C */ char unk_44C[0x2FE];
-    /* 0x074A */ s16 unk_74A;
-    /* 0x074C */ char unk_74C[0x634];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x268];
+    /* 0x3AC */ EnWizActionFunc actionFunc;
+    /* 0x3B0 */ char unk_3B0[0xA];
+    /* 0x3BA */ s16 unk_3BA;
+    /* 0x3BC */ char unk_3BC[0x8C];
+    /* 0x448 */ s32 unk_448;
+    /* 0x44C */ char unk_44C[0x2FE];
+    /* 0x74A */ s16 unk_74A;
+    /* 0x74C */ char unk_74C[0x634];
 } EnWiz; // size = 0xD80
 
 extern const ActorInit En_Wiz_InitVars;
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
index 1541e1cd4d..eeb2725796 100644
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
@@ -8,10 +8,10 @@ struct EnZl4;
 typedef void (*EnZl4ActionFunc)(struct EnZl4*, PlayState*);
 
 typedef struct EnZl4 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x14C];
-    /* 0x0290 */ EnZl4ActionFunc actionFunc;
-    /* 0x0294 */ char unk_294[0x60];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x14C];
+    /* 0x290 */ EnZl4ActionFunc actionFunc;
+    /* 0x294 */ char unk_294[0x60];
 } EnZl4; // size = 0x2F4
 
 extern const ActorInit En_Zl4_InitVars;
diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h
index 0dc75a7309..b53ee19f84 100644
--- a/src/overlays/actors/ovl_En_Zo/z_en_zo.h
+++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h
@@ -12,29 +12,29 @@ typedef void (*EnZoActionFunc)(struct EnZo*, PlayState*);
 #define ENZO_NO_PATH 0x3F
 
 typedef struct EnZo {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnZoActionFunc actionFunc;
-    /* 0x0148 */ SkelAnime skelAnime;
-    /* 0x0194 */ ColliderCylinder collider;
-    /* 0x01D8 */ UNK_TYPE1 unk_1D8[0x4];
-    /* 0x01DC */ Path* path;
-    /* 0x01E0 */ s16 waypoint;
-    /* 0x01E4 */ Vec3f leftFootPos;
-    /* 0x01F0 */ Vec3f rightFootPos;
-    /* 0x01FC */ u8 isLeftFootGrounded;
-    /* 0x01FD */ u8 isRightFootGrounded;
-    /* 0x01FE */ Vec3s jointTable[ZORA_LIMB_MAX];
-    /* 0x0276 */ Vec3s morphTable[ZORA_LIMB_MAX];
-    /* 0x02EE */ Vec3s trackTarget;
-    /* 0x02F4 */ Vec3s headRot;
-    /* 0x02FA */ Vec3s upperBodyRot;
-    /* 0x0300 */ UNK_TYPE1 unk_300[0x12];
-    /* 0x0312 */ s16 limbRotY[20];
-    /* 0x033A */ s16 limbRotZ[20];
-    /* 0x0364 */ Vec3f bodyPartsPos[15];
-    /* 0x041A */ UNK_TYPE1 unk_41A[0x6];
-    /* 0x041E */ s16 eyeIndex;
-    /* 0x0420 */ s16 blinkTimer;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnZoActionFunc actionFunc;
+    /* 0x148 */ SkelAnime skelAnime;
+    /* 0x194 */ ColliderCylinder collider;
+    /* 0x1D8 */ UNK_TYPE1 unk_1D8[0x4];
+    /* 0x1DC */ Path* path;
+    /* 0x1E0 */ s16 waypoint;
+    /* 0x1E4 */ Vec3f leftFootPos;
+    /* 0x1F0 */ Vec3f rightFootPos;
+    /* 0x1FC */ u8 isLeftFootGrounded;
+    /* 0x1FD */ u8 isRightFootGrounded;
+    /* 0x1FE */ Vec3s jointTable[ZORA_LIMB_MAX];
+    /* 0x276 */ Vec3s morphTable[ZORA_LIMB_MAX];
+    /* 0x2EE */ Vec3s trackTarget;
+    /* 0x2F4 */ Vec3s headRot;
+    /* 0x2FA */ Vec3s upperBodyRot;
+    /* 0x300 */ UNK_TYPE1 unk_300[0x12];
+    /* 0x312 */ s16 limbRotY[20];
+    /* 0x33A */ s16 limbRotZ[20];
+    /* 0x364 */ Vec3f bodyPartsPos[15];
+    /* 0x41A */ UNK_TYPE1 unk_41A[0x6];
+    /* 0x41E */ s16 eyeIndex;
+    /* 0x420 */ s16 blinkTimer;
 } EnZo; // size = 0x424
 
 #endif // Z_EN_ZO_H
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 7c34efb85a..cd9ccc9088 100644
--- a/src/overlays/actors/ovl_En_Zob/z_en_zob.h
+++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.h
@@ -15,21 +15,21 @@ enum {
 };
 
 typedef struct EnZob {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[24];
-    /* 0x0218 */ Vec3s morphTable[24];
-    /* 0x02A8 */ ColliderCylinder collider;
-    /* 0x02F4 */ u16 unk_2F4;
-    /* 0x02F6 */ Vec3s unk_2F6;
-    /* 0x02FC */ Vec3s unk_2FC;
-    /* 0x0302 */ s16 unk_302;
-    /* 0x0304 */ u16 unk_304;
-    /* 0x0306 */ s16 unk_306[4];
-    /* 0x030E */ s16 unk_30E;
-    /* 0x0310 */ s16 unk_310;
-    /* 0x0312 */ s16 unk_312;
-    /* 0x0314 */ EnZobActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[24];
+    /* 0x218 */ Vec3s morphTable[24];
+    /* 0x2A8 */ ColliderCylinder collider;
+    /* 0x2F4 */ u16 unk_2F4;
+    /* 0x2F6 */ Vec3s unk_2F6;
+    /* 0x2FC */ Vec3s unk_2FC;
+    /* 0x302 */ s16 unk_302;
+    /* 0x304 */ u16 unk_304;
+    /* 0x306 */ s16 unk_306[4];
+    /* 0x30E */ s16 unk_30E;
+    /* 0x310 */ s16 unk_310;
+    /* 0x312 */ s16 unk_312;
+    /* 0x314 */ EnZobActionFunc actionFunc;
 } EnZob; // size = 0x318
 
 extern const ActorInit En_Zob_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 9e50b085cb..2fd9b74004 100644
--- a/src/overlays/actors/ovl_En_Zod/z_en_zod.h
+++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.h
@@ -8,9 +8,9 @@ struct EnZod;
 typedef void (*EnZodActionFunc)(struct EnZod*, PlayState*);
 
 typedef struct EnZod {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x158];
-    /* 0x029C */ EnZodActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x158];
+    /* 0x29C */ EnZodActionFunc actionFunc;
 } EnZod; // size = 0x2A0
 
 extern const ActorInit En_Zod_InitVars;
diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c
index 234cf43e68..c0597617d3 100644
--- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c
+++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c
@@ -96,14 +96,14 @@ void EnZoraegg_Init(Actor* thisx, PlayState* play) {
     this->actor.gravity = -5.0f;
 
     switch (ENZORAEGG_GET_1F(&this->actor)) {
-        case ENZORAEGG_1F_0:
+        case ENZORAEGG_1F_00:
             if (Flags_GetSwitch(play, ENZORAEGG_GET_FE00(&this->actor))) {
                 Actor_MarkForDeath(&this->actor);
                 return;
             }
             break;
 
-        case ENZORAEGG_1F_17:
+        case ENZORAEGG_1F_11:
             if (func_80B319A8(play) >= 7) {
                 Actor_MarkForDeath(&this->actor);
                 this->actor.home.rot.z = 1;
@@ -111,26 +111,26 @@ void EnZoraegg_Init(Actor* thisx, PlayState* play) {
             }
             break;
 
-        case ENZORAEGG_1F_3:
-        case ENZORAEGG_1F_4:
-        case ENZORAEGG_1F_5:
-        case ENZORAEGG_1F_6:
-        case ENZORAEGG_1F_7:
-        case ENZORAEGG_1F_8:
-        case ENZORAEGG_1F_9:
+        case ENZORAEGG_1F_03:
+        case ENZORAEGG_1F_04:
+        case ENZORAEGG_1F_05:
+        case ENZORAEGG_1F_06:
+        case ENZORAEGG_1F_07:
+        case ENZORAEGG_1F_08:
+        case ENZORAEGG_1F_09:
             if (gSaveContext.save.weekEventReg[19] & 0x40) {
                 Actor_MarkForDeath(&this->actor);
                 return;
             }
             break;
 
+        case ENZORAEGG_1F_0A:
+        case ENZORAEGG_1F_0B:
+        case ENZORAEGG_1F_0C:
+        case ENZORAEGG_1F_0D:
+        case ENZORAEGG_1F_0E:
+        case ENZORAEGG_1F_0F:
         case ENZORAEGG_1F_10:
-        case ENZORAEGG_1F_11:
-        case ENZORAEGG_1F_12:
-        case ENZORAEGG_1F_13:
-        case ENZORAEGG_1F_14:
-        case ENZORAEGG_1F_15:
-        case ENZORAEGG_1F_16:
             if (!(gSaveContext.save.weekEventReg[19] & 0x40)) {
                 Actor_MarkForDeath(&this->actor);
                 return;
@@ -139,49 +139,49 @@ void EnZoraegg_Init(Actor* thisx, PlayState* play) {
     }
 
     switch (ENZORAEGG_GET_1F(&this->actor)) {
-        case ENZORAEGG_1F_0:
+        case ENZORAEGG_1F_00:
             this->actionFunc = func_80B320E0;
             this->actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_8);
             this->actor.targetMode = 3;
             break;
 
-        case ENZORAEGG_1F_1:
+        case ENZORAEGG_1F_01:
             this->actionFunc = func_80B322BC;
             func_80B31590(this);
             break;
 
-        case ENZORAEGG_1F_2:
+        case ENZORAEGG_1F_02:
             this->actionFunc = func_80B32390;
             func_80B31590(this);
             break;
 
-        case ENZORAEGG_1F_3:
-        case ENZORAEGG_1F_4:
-        case ENZORAEGG_1F_5:
-        case ENZORAEGG_1F_6:
-        case ENZORAEGG_1F_7:
-        case ENZORAEGG_1F_8:
-        case ENZORAEGG_1F_9:
-            this->actorActionCmd = sp40[(ENZORAEGG_GET_1F(&this->actor)) - ENZORAEGG_1F_3];
+        case ENZORAEGG_1F_03:
+        case ENZORAEGG_1F_04:
+        case ENZORAEGG_1F_05:
+        case ENZORAEGG_1F_06:
+        case ENZORAEGG_1F_07:
+        case ENZORAEGG_1F_08:
+        case ENZORAEGG_1F_09:
+            this->actorActionCmd = sp40[(ENZORAEGG_GET_1F(&this->actor)) - ENZORAEGG_1F_03];
             Animation_PlayOnce(&this->skelAnime, &object_zoraegg_Anim_001E08);
             this->unk_1EC = 1;
             this->unk_1EE = 0;
             this->unk_1EF = 0;
             this->actionFunc = func_80B32B10;
-            if (((ENZORAEGG_GET_1F(&this->actor)) - ENZORAEGG_1F_3) >= func_80B319A8(play)) {
+            if (((ENZORAEGG_GET_1F(&this->actor)) - ENZORAEGG_1F_03) >= func_80B319A8(play)) {
                 this->actionFunc = func_80B32B3C;
                 this->actor.draw = NULL;
             }
             break;
 
+        case ENZORAEGG_1F_0A:
+        case ENZORAEGG_1F_0B:
+        case ENZORAEGG_1F_0C:
+        case ENZORAEGG_1F_0D:
+        case ENZORAEGG_1F_0E:
+        case ENZORAEGG_1F_0F:
         case ENZORAEGG_1F_10:
-        case ENZORAEGG_1F_11:
-        case ENZORAEGG_1F_12:
-        case ENZORAEGG_1F_13:
-        case ENZORAEGG_1F_14:
-        case ENZORAEGG_1F_15:
-        case ENZORAEGG_1F_16:
-            this->actorActionCmd = sp40[(ENZORAEGG_GET_1F(&this->actor)) - ENZORAEGG_1F_10];
+            this->actorActionCmd = sp40[(ENZORAEGG_GET_1F(&this->actor)) - ENZORAEGG_1F_0A];
             this->unk_1EC = 2;
             this->actionFunc = func_80B324B0;
             Animation_PlayLoop(&this->skelAnime, &object_zoraegg_Anim_004FE4);
@@ -190,7 +190,7 @@ void EnZoraegg_Init(Actor* thisx, PlayState* play) {
             this->unk_1EA |= 3;
             break;
 
-        case ENZORAEGG_1F_17:
+        case ENZORAEGG_1F_11:
             Actor_SetScale(&this->actor, 0.0006f);
             this->actionFunc = func_80B32D08;
             this->actor.world.pos.y -= this->actor.shape.yOffset * this->actor.scale.y;
@@ -251,7 +251,7 @@ Actor* func_80B31CB4(PlayState* play) {
     Actor* actor = play->actorCtx.actorLists[ACTORCAT_ITEMACTION].first;
 
     while (actor != NULL) {
-        if ((actor->id == ACTOR_EN_ZORAEGG) && (ENZORAEGG_GET_1F(actor) == ENZORAEGG_1F_17) &&
+        if ((actor->id == ACTOR_EN_ZORAEGG) && (ENZORAEGG_GET_1F(actor) == ENZORAEGG_1F_11) &&
             (actor->home.rot.z == 0)) {
             actor->home.rot.z = 1;
             return actor;
@@ -265,7 +265,7 @@ Actor* func_80B31D14(PlayState* play) {
     Actor* actor = play->actorCtx.actorLists[ACTORCAT_ITEMACTION].first;
 
     while (actor != NULL) {
-        if ((actor->id == ACTOR_EN_ZORAEGG) && (ENZORAEGG_GET_1F(actor) == ENZORAEGG_1F_3)) {
+        if ((actor->id == ACTOR_EN_ZORAEGG) && (ENZORAEGG_GET_1F(actor) == ENZORAEGG_1F_03)) {
             return actor;
         }
         actor = actor->next;
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 e5e638a222..b5b19afde8 100644
--- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h
+++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h
@@ -11,52 +11,52 @@ typedef void (*EnZoraeggActionFunc)(struct EnZoraegg*, PlayState*);
 #define ENZORAEGG_GET_FE00(thisx) (((thisx)->params & 0xFE00) >> 9)
 
 enum {
-    /* 0 */ ENZORAEGG_1F_0,
-    /* 1 */ ENZORAEGG_1F_1,
-    /* 2 */ ENZORAEGG_1F_2,
-    /* 3 */ ENZORAEGG_1F_3,
-    /* 4 */ ENZORAEGG_1F_4,
-    /* 5 */ ENZORAEGG_1F_5,
-    /* 6 */ ENZORAEGG_1F_6,
-    /* 7 */ ENZORAEGG_1F_7,
-    /* 8 */ ENZORAEGG_1F_8,
-    /* 9 */ ENZORAEGG_1F_9,
-    /* 10 */ ENZORAEGG_1F_10,
-    /* 11 */ ENZORAEGG_1F_11,
-    /* 12 */ ENZORAEGG_1F_12,
-    /* 13 */ ENZORAEGG_1F_13,
-    /* 14 */ ENZORAEGG_1F_14,
-    /* 15 */ ENZORAEGG_1F_15,
-    /* 16 */ ENZORAEGG_1F_16,
-    /* 17 */ ENZORAEGG_1F_17,
-    /* 18 */ ENZORAEGG_1F_18,
-    /* 19 */ ENZORAEGG_1F_19,
-    /* 20 */ ENZORAEGG_1F_20,
-    /* 21 */ ENZORAEGG_1F_21,
-    /* 22 */ ENZORAEGG_1F_22,
-    /* 23 */ ENZORAEGG_1F_23,
-    /* 24 */ ENZORAEGG_1F_24,
-    /* 25 */ ENZORAEGG_1F_25,
+    /* 0x00 */ ENZORAEGG_1F_00,
+    /* 0x01 */ ENZORAEGG_1F_01,
+    /* 0x02 */ ENZORAEGG_1F_02,
+    /* 0x03 */ ENZORAEGG_1F_03,
+    /* 0x04 */ ENZORAEGG_1F_04,
+    /* 0x05 */ ENZORAEGG_1F_05,
+    /* 0x06 */ ENZORAEGG_1F_06,
+    /* 0x07 */ ENZORAEGG_1F_07,
+    /* 0x08 */ ENZORAEGG_1F_08,
+    /* 0x09 */ ENZORAEGG_1F_09,
+    /* 0x0A */ ENZORAEGG_1F_0A,
+    /* 0x0B */ ENZORAEGG_1F_0B,
+    /* 0x0C */ ENZORAEGG_1F_0C,
+    /* 0x0D */ ENZORAEGG_1F_0D,
+    /* 0x0E */ ENZORAEGG_1F_0E,
+    /* 0x0F */ ENZORAEGG_1F_0F,
+    /* 0x10 */ ENZORAEGG_1F_10,
+    /* 0x11 */ ENZORAEGG_1F_11,
+    /* 0x12 */ ENZORAEGG_1F_12,
+    /* 0x13 */ ENZORAEGG_1F_13,
+    /* 0x14 */ ENZORAEGG_1F_14,
+    /* 0x15 */ ENZORAEGG_1F_15,
+    /* 0x16 */ ENZORAEGG_1F_16,
+    /* 0x17 */ ENZORAEGG_1F_17,
+    /* 0x18 */ ENZORAEGG_1F_18,
+    /* 0x19 */ ENZORAEGG_1F_19,
 };
 
 typedef struct EnZoraegg {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ Vec3s jointTable[7];
-    /* 0x01B2 */ Vec3s morphTable[7];
-    /* 0x01DC */ Actor* unk_1DC;
-    /* 0x01E0 */ f32 unk_1E0;
-    /* 0x01E4 */ f32 unk_1E4;
-    /* 0x01E8 */ s16 unk_1E8;
-    /* 0x01EA */ u16 unk_1EA;
-    /* 0x01EC */ u8 unk_1EC;
-    /* 0x01ED */ u8 unk_1ED;
-    /* 0x01EE */ u8 unk_1EE;
-    /* 0x01EF */ u8 unk_1EF;
-    /* 0x01F0 */ u16 actorActionCmd;
-    /* 0x01F2 */ s16 unk_1F2;
-    /* 0x01F4 */ s16 unk_1F4;
-    /* 0x01F8 */ EnZoraeggActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ Vec3s jointTable[7];
+    /* 0x1B2 */ Vec3s morphTable[7];
+    /* 0x1DC */ Actor* unk_1DC;
+    /* 0x1E0 */ f32 unk_1E0;
+    /* 0x1E4 */ f32 unk_1E4;
+    /* 0x1E8 */ s16 unk_1E8;
+    /* 0x1EA */ u16 unk_1EA;
+    /* 0x1EC */ u8 unk_1EC;
+    /* 0x1ED */ u8 unk_1ED;
+    /* 0x1EE */ u8 unk_1EE;
+    /* 0x1EF */ u8 unk_1EF;
+    /* 0x1F0 */ u16 actorActionCmd;
+    /* 0x1F2 */ s16 unk_1F2;
+    /* 0x1F4 */ s16 unk_1F4;
+    /* 0x1F8 */ EnZoraeggActionFunc actionFunc;
 } EnZoraegg; // size = 0x1FC
 
 extern const ActorInit En_Zoraegg_InitVars;
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 92dc2c062f..99125aad34 100644
--- a/src/overlays/actors/ovl_En_Zos/z_en_zos.h
+++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.h
@@ -15,19 +15,19 @@ enum {
 };
 
 typedef struct EnZos {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ Vec3s jointTable[18];
-    /* 0x01B0 */ Vec3s morphTable[18];
-    /* 0x021C */ SkelAnime skelAnime;
-    /* 0x0260 */ ColliderCylinder collider;
-    /* 0x02AC */ s16 unk_2AC;
-    /* 0x02AE */ s16 unk_2AE;
-    /* 0x02B0 */ UNK_TYPE1 unk2B0[6];
-    /* 0x02B6 */ u16 unk_2B6;
-    /* 0x02B8 */ s16 unk_2B8;
-    /* 0x02BA */ s16 unk_2BA;
-    /* 0x02BC */ s16 unk_2BC;
-    /* 0x02C0 */ EnZosActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ Vec3s jointTable[18];
+    /* 0x1B0 */ Vec3s morphTable[18];
+    /* 0x21C */ SkelAnime skelAnime;
+    /* 0x260 */ ColliderCylinder collider;
+    /* 0x2AC */ s16 unk_2AC;
+    /* 0x2AE */ s16 unk_2AE;
+    /* 0x2B0 */ UNK_TYPE1 unk2B0[6];
+    /* 0x2B6 */ u16 unk_2B6;
+    /* 0x2B8 */ s16 unk_2B8;
+    /* 0x2BA */ s16 unk_2BA;
+    /* 0x2BC */ s16 unk_2BC;
+    /* 0x2C0 */ EnZosActionFunc actionFunc;
 } EnZos; // size = 0x2C4
 
 extern const ActorInit En_Zos_InitVars;
diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.h b/src/overlays/actors/ovl_En_Zot/z_en_zot.h
index 14da492d80..b72328b202 100644
--- a/src/overlays/actors/ovl_En_Zot/z_en_zot.h
+++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.h
@@ -11,22 +11,22 @@ typedef void (*EnZotActionFunc)(struct EnZot*, PlayState*);
 #define ENZOT_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
 
 typedef struct EnZot {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ ColliderCylinder collider;
-    /* 0x01D4 */ Vec3s jointTable[20];
-    /* 0x024C */ Vec3s morphTable[20];
-    /* 0x02C4 */ Vec3s unk_2C4;
-    /* 0x02CA */ Vec3s unk_2CA;
-    /* 0x02D0 */ Path* path;
-    /* 0x02D4 */ s32 unk_2D4;
-    /* 0x02D8 */ Actor* unk_2D8[5];
-    /* 0x02EC */ s16 unk_2EC;
-    /* 0x02EE */ s16 unk_2EE;
-    /* 0x02F0 */ s16 unk_2F0;
-    /* 0x02F2 */ u16 unk_2F2;
-    /* 0x02F4 */ s16 unk_2F4;
-    /* 0x02F8 */ EnZotActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ ColliderCylinder collider;
+    /* 0x1D4 */ Vec3s jointTable[20];
+    /* 0x24C */ Vec3s morphTable[20];
+    /* 0x2C4 */ Vec3s unk_2C4;
+    /* 0x2CA */ Vec3s unk_2CA;
+    /* 0x2D0 */ Path* path;
+    /* 0x2D4 */ s32 unk_2D4;
+    /* 0x2D8 */ Actor* unk_2D8[5];
+    /* 0x2EC */ s16 unk_2EC;
+    /* 0x2EE */ s16 unk_2EE;
+    /* 0x2F0 */ s16 unk_2F0;
+    /* 0x2F2 */ u16 unk_2F2;
+    /* 0x2F4 */ s16 unk_2F4;
+    /* 0x2F8 */ EnZotActionFunc actionFunc;
 } EnZot; // size = 0x2FC
 
 extern const ActorInit En_Zot_InitVars;
diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.h b/src/overlays/actors/ovl_En_Zov/z_en_zov.h
index 4078424d97..cabb82b435 100644
--- a/src/overlays/actors/ovl_En_Zov/z_en_zov.h
+++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.h
@@ -15,26 +15,26 @@ typedef s32 (*EnZovUnkFunc)(PlayState*, struct EnZov*);
 #define ENZOV_F_2 2
 
 typedef struct EnZov {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnZovUnkFunc unk_144;
-    /* 0x0148 */ Vec3s jontTable[23];
-    /* 0x01D2 */ Vec3s morphTable[23];
-    /* 0x025C */ SkelAnime skelAnime;
-    /* 0x02A0 */ ColliderCylinder collider;
-    /* 0x02EC */ s16 unk_2EC;
-    /* 0x02EE */ s16 unk_2EE;
-    /* 0x02F0 */ Vec3s unk_2F0;
-    /* 0x02F6 */ Vec3s unk_2F6;
-    /* 0x02FC */ Vec3f unk_2FC;
-    /* 0x0308 */ Vec3f unk_308;
-    /* 0x0314 */ Vec3f unk_314;
-    /* 0x0320 */ u16 unk_320;
-    /* 0x0322 */ s16 unk_322;
-    /* 0x0324 */ s16 unk_324;
-    /* 0x0326 */ s16 unk_326;
-    /* 0x0328 */ s16 unk_328[2];
-    /* 0x032C */ s16 unk_32C;
-    /* 0x0330 */ EnZovActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnZovUnkFunc unk_144;
+    /* 0x148 */ Vec3s jontTable[23];
+    /* 0x1D2 */ Vec3s morphTable[23];
+    /* 0x25C */ SkelAnime skelAnime;
+    /* 0x2A0 */ ColliderCylinder collider;
+    /* 0x2EC */ s16 unk_2EC;
+    /* 0x2EE */ s16 unk_2EE;
+    /* 0x2F0 */ Vec3s unk_2F0;
+    /* 0x2F6 */ Vec3s unk_2F6;
+    /* 0x2FC */ Vec3f unk_2FC;
+    /* 0x308 */ Vec3f unk_308;
+    /* 0x314 */ Vec3f unk_314;
+    /* 0x320 */ u16 unk_320;
+    /* 0x322 */ s16 unk_322;
+    /* 0x324 */ s16 unk_324;
+    /* 0x326 */ s16 unk_326;
+    /* 0x328 */ s16 unk_328[2];
+    /* 0x32C */ s16 unk_32C;
+    /* 0x330 */ EnZovActionFunc actionFunc;
 } EnZov; // size = 0x334
 
 extern const ActorInit En_Zov_InitVars;
diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.h b/src/overlays/actors/ovl_En_Zow/z_en_zow.h
index 8faeae73f0..777a0aa9dc 100644
--- a/src/overlays/actors/ovl_En_Zow/z_en_zow.h
+++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.h
@@ -24,19 +24,19 @@ typedef struct {
 } EnZowStruct; // size = 0x38
 
 typedef struct EnZow {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ SkelAnime skelAnime;
-    /* 0x0188 */ ColliderCylinder collider;
-    /* 0x01D4 */ Vec3s jointTable[20];
-    /* 0x024C */ Vec3s morphTable[20];
-    /* 0x02C4 */ s16 unk_2C4;
-    /* 0x02C6 */ s16 unk_2C6;
-    /* 0x02C8 */ s16 unk_2C8;
-    /* 0x02CA */ u16 unk_2CA;
-    /* 0x02CC */ s16 unk_2CC;
-    /* 0x02CE */ s16 unk_2CE;
-    /* 0x02D0 */ EnZowStruct unk_2D0[15];
-    /* 0x0618 */ EnZowActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ ColliderCylinder collider;
+    /* 0x1D4 */ Vec3s jointTable[20];
+    /* 0x24C */ Vec3s morphTable[20];
+    /* 0x2C4 */ s16 unk_2C4;
+    /* 0x2C6 */ s16 unk_2C6;
+    /* 0x2C8 */ s16 unk_2C8;
+    /* 0x2CA */ u16 unk_2CA;
+    /* 0x2CC */ s16 unk_2CC;
+    /* 0x2CE */ s16 unk_2CE;
+    /* 0x2D0 */ EnZowStruct unk_2D0[15];
+    /* 0x618 */ EnZowActionFunc actionFunc;
 } EnZow; // size = 0x61C
 
 extern const ActorInit En_Zow_InitVars;
diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
index d859b57134..aac8d0834f 100644
--- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
+++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
@@ -11,20 +11,20 @@ struct ItemEtcetera;
 typedef void (*ItemEtceteraActionFunc)(struct ItemEtcetera*, PlayState*);
 
 typedef enum {
-    /* 0x00 */ ITEM_ETC_BOTTLE_1,
-    /* 0x01 */ ITEM_ETC_BOTTLE_2,
-    /* 0x02 */ ITEM_ETC_BOTTLE_3,
-    /* 0x03 */ ITEM_ETC_BOTTLE_4,
-    /* 0x04 */ ITEM_ETC_BOTTLE_5,
-    /* 0x05 */ ITEM_ETC_BOTTLE_6,
-    /* 0x06 */ ITEM_ETC_KEY_SMALL,
-    /* 0x07 */ ITEM_ETC_ARROW_FIRE,
-    /* 0x08 */ ITEM_ETC_RUPEE_GREEN_CHEST_GAME,
-    /* 0x09 */ ITEM_ETC_RUPEE_BLUE_CHEST_GAME,
-    /* 0x0A */ ITEM_ETC_RUPEE_RED_CHEST_GAME,
-    /* 0x0B */ ITEM_ETC_RUPEE_PURPLE_CHEST_GAME,
-    /* 0x0C */ ITEM_ETC_HEART_PIECE_CHEST_GAME,
-    /* 0x0D */ ITEM_ETC_KEY_SMALL_CHEST_GAME
+    /* 0x0 */ ITEM_ETC_BOTTLE_1,
+    /* 0x1 */ ITEM_ETC_BOTTLE_2,
+    /* 0x2 */ ITEM_ETC_BOTTLE_3,
+    /* 0x3 */ ITEM_ETC_BOTTLE_4,
+    /* 0x4 */ ITEM_ETC_BOTTLE_5,
+    /* 0x5 */ ITEM_ETC_BOTTLE_6,
+    /* 0x6 */ ITEM_ETC_KEY_SMALL,
+    /* 0x7 */ ITEM_ETC_ARROW_FIRE,
+    /* 0x8 */ ITEM_ETC_RUPEE_GREEN_CHEST_GAME,
+    /* 0x9 */ ITEM_ETC_RUPEE_BLUE_CHEST_GAME,
+    /* 0xA */ ITEM_ETC_RUPEE_RED_CHEST_GAME,
+    /* 0xB */ ITEM_ETC_RUPEE_PURPLE_CHEST_GAME,
+    /* 0xC */ ITEM_ETC_HEART_PIECE_CHEST_GAME,
+    /* 0xD */ ITEM_ETC_KEY_SMALL_CHEST_GAME
 } ItemEtceteraType;
 
 typedef struct ItemEtcetera {
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 4d748e3b52..3ba21c444e 100644
--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
@@ -9,35 +9,35 @@ struct MirRay;
 
 // Locations of light beams in sMirRayData
 typedef enum {
-    /* 0 */ MIRRAY_SPIRIT_BOMBCHUIWAROOM_DOWNLIGHT,
-    /* 1 */ MIRRAY_SPIRIT_SUNBLOCKROOM_DOWNLIGHT,
-    /* 2 */ MIRRAY_SPIRIT_SINGLECOBRAROOM_DOWNLIGHT,
-    /* 3 */ MIRRAY_SPIRIT_ARMOSROOM_DOWNLIGHT,
-    /* 4 */ MIRRAY_SPIRIT_TOPROOM_DOWNLIGHT,
-    /* 5 */ MIRRAY_SPIRIT_TOPROOM_CEILINGMIRROR,
-    /* 6 */ MIRRAY_SPIRIT_SINGLECOBRAROOM_COBRA,
-    /* 7 */ MIRRAY_SPIRIT_TOPROOM_COBRA1,
-    /* 8 */ MIRRAY_SPIRIT_TOPROOM_COBRA2,
-    /* 9 */ MIRRAY_GANONSCASTLE_SPIRITTRIAL_DOWNLIGHT,
-    /* 10 */ MIRRAY_MAX,
+    /* 0x0 */ MIRRAY_SPIRIT_BOMBCHUIWAROOM_DOWNLIGHT,
+    /* 0x1 */ MIRRAY_SPIRIT_SUNBLOCKROOM_DOWNLIGHT,
+    /* 0x2 */ MIRRAY_SPIRIT_SINGLECOBRAROOM_DOWNLIGHT,
+    /* 0x3 */ MIRRAY_SPIRIT_ARMOSROOM_DOWNLIGHT,
+    /* 0x4 */ MIRRAY_SPIRIT_TOPROOM_DOWNLIGHT,
+    /* 0x5 */ MIRRAY_SPIRIT_TOPROOM_CEILINGMIRROR,
+    /* 0x6 */ MIRRAY_SPIRIT_SINGLECOBRAROOM_COBRA,
+    /* 0x7 */ MIRRAY_SPIRIT_TOPROOM_COBRA1,
+    /* 0x8 */ MIRRAY_SPIRIT_TOPROOM_COBRA2,
+    /* 0x9 */ MIRRAY_GANONSCASTLE_SPIRITTRIAL_DOWNLIGHT,
+    /* 0xA */ MIRRAY_MAX,
 } MirRayBeamLocations;
 
 typedef struct MirRay {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderJntSph collider1;
-    /* 0x0164 */ ColliderJntSphElement collider1Elements[1];
-    /* 0x01A4 */ ColliderQuad collider2;
-    /* 0x0224 */ f32 reflectIntensity; // Reflection occurs if it is positive, brightness depends on it
-    /* 0x0228 */ Vec3f shieldCorners[6];
-    /* 0x0270 */ f32 reflectRange;
-    /* 0x0274 */ Vec3f sourcePt;
-    /* 0x0280 */ Vec3f poolPt;
-    /* 0x028C */ s16 sourceEndRad;
-    /* 0x028E */ s16 poolEndRad;
-    /* 0x0290 */ s16 lightPointRad;
-    /* 0x0294 */ LightNode* lightNode;
-    /* 0x0298 */ LightInfo lightInfo;
-    /* 0x02A6 */ u8 unLit; // Conditioned on. set in Cobra?
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderJntSph collider1;
+    /* 0x164 */ ColliderJntSphElement collider1Elements[1];
+    /* 0x1A4 */ ColliderQuad collider2;
+    /* 0x224 */ f32 reflectIntensity; // Reflection occurs if it is positive, brightness depends on it
+    /* 0x228 */ Vec3f shieldCorners[6];
+    /* 0x270 */ f32 reflectRange;
+    /* 0x274 */ Vec3f sourcePt;
+    /* 0x280 */ Vec3f poolPt;
+    /* 0x28C */ s16 sourceEndRad;
+    /* 0x28E */ s16 poolEndRad;
+    /* 0x290 */ s16 lightPointRad;
+    /* 0x294 */ LightNode* lightNode;
+    /* 0x298 */ LightInfo lightInfo;
+    /* 0x2A6 */ u8 unLit; // Conditioned on. set in Cobra?
 } MirRay; // size = 0x2A8
 
 extern const ActorInit Mir_Ray_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h
index bffe794d5f..fa2b1c6361 100644
--- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h
+++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h
@@ -11,12 +11,12 @@ struct ObjAqua;
 typedef void (*ObjAquaActionFunc)(struct ObjAqua*, PlayState*);
 
 typedef struct ObjAqua {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ ObjAquaActionFunc actionFunc;
-    /* 0x0194 */ s16 counter;
-    /* 0x0196 */ u8 alpha;
-    /* 0x0198 */ s16 unk_198;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ ObjAquaActionFunc actionFunc;
+    /* 0x194 */ s16 counter;
+    /* 0x196 */ u8 alpha;
+    /* 0x198 */ s16 unk_198;
 } ObjAqua; // size = 0x19C
 
 extern const ActorInit Obj_Aqua_InitVars;
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 ab92c6b854..a0c91f2140 100644
--- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h
+++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h
@@ -23,19 +23,19 @@ enum {
 };
 
 typedef struct ObjArmos {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ SkelAnime skelAnime;
-    /* 0x01A0 */ Vec3s jointTable[OBJECT_AM_LIMB_MAX];
-    /* 0x01F4 */ Vec3s morphTable[OBJECT_AM_LIMB_MAX];
-    /* 0x0248 */ ObjArmosActionFunc actionFunc;
-    /* 0x024C */ u32 unk_24C;
-    /* 0x0250 */ Vec3f unk_250;
-    /* 0x025C */ f32* unk_25C;
-    /* 0x0260 */ f32 unk_260;
-    /* 0x0264 */ s16 unk_264;
-    /* 0x0266 */ s16 unk_266[4];
-    /* 0x026E */ s16 unk_26E;
-    /* 0x0270 */ s16 unk_270;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ SkelAnime skelAnime;
+    /* 0x1A0 */ Vec3s jointTable[OBJECT_AM_LIMB_MAX];
+    /* 0x1F4 */ Vec3s morphTable[OBJECT_AM_LIMB_MAX];
+    /* 0x248 */ ObjArmosActionFunc actionFunc;
+    /* 0x24C */ u32 unk_24C;
+    /* 0x250 */ Vec3f unk_250;
+    /* 0x25C */ f32* unk_25C;
+    /* 0x260 */ f32 unk_260;
+    /* 0x264 */ s16 unk_264;
+    /* 0x266 */ s16 unk_266[4];
+    /* 0x26E */ s16 unk_26E;
+    /* 0x270 */ s16 unk_270;
 } ObjArmos; // size = 0x274
 
 extern const ActorInit Obj_Armos_InitVars;
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 7ff2610aa4..5af772007a 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
@@ -17,9 +17,9 @@ typedef void (*ObjBeanUnkFunc)(struct ObjBean*);
 #define OBJBEAN_GET_3(thisx) ((thisx)->home.rot.z & 3)
 
 enum {
-    /* 0x00 */ ENOBJBEAN_GET_C000_0,
-    /* 0x01 */ ENOBJBEAN_GET_C000_1,
-    /* 0x02 */ ENOBJBEAN_GET_C000_2,
+    /* 0x0 */ ENOBJBEAN_GET_C000_0,
+    /* 0x1 */ ENOBJBEAN_GET_C000_1,
+    /* 0x2 */ ENOBJBEAN_GET_C000_2,
 };
 
 typedef struct ObjBean {
diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h
index 3023ab0854..7e28abd457 100644
--- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h
+++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h
@@ -10,13 +10,13 @@ typedef void (*ObjBigicicleActionFunc)(struct ObjBigicicle*, PlayState*);
 #define OBJBIGICLE_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
 
 typedef struct ObjBigicicle {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjBigicicleActionFunc actionFunc;
-    /* 0x0148 */ u8 unk_148;
-    /* 0x0149 */ u8 unk_149;
-    /* 0x014A */ s16 unk_14A;
-    /* 0x014C */ ColliderCylinder collider1;
-    /* 0x0198 */ ColliderCylinder collider2;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjBigicicleActionFunc actionFunc;
+    /* 0x148 */ u8 unk_148;
+    /* 0x149 */ u8 unk_149;
+    /* 0x14A */ s16 unk_14A;
+    /* 0x14C */ ColliderCylinder collider1;
+    /* 0x198 */ ColliderCylinder collider2;
 } ObjBigicicle; // size = 0x1E4
 
 extern const ActorInit Obj_Bigicicle_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
index 6f191f79af..95af6757c6 100644
--- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
+++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
@@ -8,8 +8,8 @@ struct ObjBlockstop;
 typedef void (*ObjBlockstopActionFunc)(struct ObjBlockstop*, PlayState*);
 
 typedef struct ObjBlockstop {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjBlockstopActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjBlockstopActionFunc actionFunc;
 } ObjBlockstop; // size = 0x148
 
 extern const ActorInit Obj_Blockstop_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h
index 110b89dded..a3ed2b147b 100644
--- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h
+++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h
@@ -18,7 +18,7 @@ typedef struct ObjBoat {
     /* 0x162 */ UNK_TYPE1 pad_162;
     /* 0x163 */ u8 unk_163;
     /* 0x164 */ Vec3s* unk_164;
-} ObjBoat;
+} ObjBoat; // size = 0x168
 
 extern const ActorInit Obj_Boat_InitVars;
 
diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
index 602b3a788a..50e0bbf92c 100644
--- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
+++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
@@ -22,14 +22,14 @@ typedef struct {
 } ObjBombiwaStruct; // size = 0x1C
 
 typedef struct ObjBombiwa {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ ObjBombiwaStruct unk_190[4];
-    /* 0x0200 */ s8 unk_200;
-    /* 0x0201 */ s8 unk_201;
-    /* 0x0202 */ s8 unk_202;
-    /* 0x0203 */ u8 unk_203;
-    /* 0x0204 */ ObjBombiwaActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ ObjBombiwaStruct unk_190[4];
+    /* 0x200 */ s8 unk_200;
+    /* 0x201 */ s8 unk_201;
+    /* 0x202 */ s8 unk_202;
+    /* 0x203 */ u8 unk_203;
+    /* 0x204 */ ObjBombiwaActionFunc actionFunc;
 } ObjBombiwa; // size = 0x208
 
 extern const ActorInit Obj_Bombiwa_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h
index e3104d7239..69e1885303 100644
--- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h
+++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h
@@ -10,7 +10,7 @@ typedef void (*BumperCollideActorFunc)(struct ObjBoyo*, void*);
 typedef struct {
     /* 0x0 */ s16 id;
     /* 0x4 */ BumperCollideActorFunc actorCollideFunc;
-} BumperCollideInfo;
+} BumperCollideInfo; // size = 0x8
 
 typedef struct ObjBoyo {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h
index 4a689fa096..a3a4e6d933 100644
--- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h
+++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h
@@ -39,22 +39,22 @@ struct ObjChan;
 typedef void (*ObjChanActionFunc)(struct ObjChan*, PlayState*);
 
 typedef struct ObjChan {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjChanActionFunc actionFunc;
-    /* 0x0148 */ ColliderCylinder collider;
-    /* 0x0194 */ u8 myPotIndex; // For OBJCHAN_SUBTYPE_POT: which pot is this?
-    /* 0x0196 */ s16 fireDelayFrames;
-    /* 0x0198 */ UNK_TYPE1 unk198[0x12];
-    /* 0x01AA */ u8 stateFlags;
-    /* 0x01AC */ struct ObjChan* pots[5]; // For OBJCHAN_SUBTYPE_BODY: pointers to pot actors
-    /* 0x01C0 */ Vec3f unk1C0;
-    /* 0x01CC */ f32 unk1CC;
-    /* 0x01D0 */ f32 unk1D0;
-    /* 0x01D4 */ s16 unk1D4;
-    /* 0x01D8 */ f32 flameSize;
-    /* 0x01DC */ s16 rotationSpeed; // Main object only. Slowly ramps up under some circumstances. In other circumstances it's immediately set to maximum speed.
-    /* 0x01DE */ s16 rotation; // Increases as the chandelier spins. Don't know why they didn't use the actor's rotation variable.
-    /* 0x01E0 */ s16 cutscenes[2];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjChanActionFunc actionFunc;
+    /* 0x148 */ ColliderCylinder collider;
+    /* 0x194 */ u8 myPotIndex; // For OBJCHAN_SUBTYPE_POT: which pot is this?
+    /* 0x196 */ s16 fireDelayFrames;
+    /* 0x198 */ UNK_TYPE1 unk198[0x12];
+    /* 0x1AA */ u8 stateFlags;
+    /* 0x1AC */ struct ObjChan* pots[5]; // For OBJCHAN_SUBTYPE_BODY: pointers to pot actors
+    /* 0x1C0 */ Vec3f unk1C0;
+    /* 0x1CC */ f32 unk1CC;
+    /* 0x1D0 */ f32 unk1D0;
+    /* 0x1D4 */ s16 unk1D4;
+    /* 0x1D8 */ f32 flameSize;
+    /* 0x1DC */ s16 rotationSpeed; // Main object only. Slowly ramps up under some circumstances. In other circumstances it's immediately set to maximum speed.
+    /* 0x1DE */ s16 rotation; // Increases as the chandelier spins. Don't know why they didn't use the actor's rotation variable.
+    /* 0x1E0 */ s16 cutscenes[2];
 } ObjChan; // size = 0x1E4
 
 extern const ActorInit Obj_Chan_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
index 709740b598..ed51885766 100644
--- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
+++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
@@ -16,22 +16,22 @@ typedef void (*ObjCombActionFunc)(struct ObjComb*, PlayState*);
 #define OBJCOMB_GET_8000(thisx) (((thisx)->params >> 0xE) & 2)
 
 typedef struct ObjComb {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjCombActionFunc actionFunc;
-    /* 0x0148 */ ColliderJntSph collider;
-    /* 0x0168 */ ColliderJntSphElement colliderElement;
-    /* 0x01A8 */ s16 unk_1A8;
-    /* 0x01AA */ s16 unk_1AA;
-    /* 0x01AC */ s16 unk_1AC;
-    /* 0x01AE */ s16 unk_1AE;
-    /* 0x01B0 */ s16 unk_1B0;
-    /* 0x01B2 */ s8 unk_1B2;
-    /* 0x01B3 */ s8 unk_1B3;
-    /* 0x01B4 */ s8 unk_1B4;
-    /* 0x01B5 */ s8 unk_1B5;
-    /* 0x01B6 */ s8 unk_1B6;
-    /* 0x01B7 */ s8 unk_1B7;
-    /* 0x01B8 */ s8 unk_1B8;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjCombActionFunc actionFunc;
+    /* 0x148 */ ColliderJntSph collider;
+    /* 0x168 */ ColliderJntSphElement colliderElement;
+    /* 0x1A8 */ s16 unk_1A8;
+    /* 0x1AA */ s16 unk_1AA;
+    /* 0x1AC */ s16 unk_1AC;
+    /* 0x1AE */ s16 unk_1AE;
+    /* 0x1B0 */ s16 unk_1B0;
+    /* 0x1B2 */ s8 unk_1B2;
+    /* 0x1B3 */ s8 unk_1B3;
+    /* 0x1B4 */ s8 unk_1B4;
+    /* 0x1B5 */ s8 unk_1B5;
+    /* 0x1B6 */ s8 unk_1B6;
+    /* 0x1B7 */ s8 unk_1B7;
+    /* 0x1B8 */ s8 unk_1B8;
 } ObjComb; // size = 0x1BC
 
 extern const ActorInit Obj_Comb_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h
index ee687ae6e1..8b915a184c 100644
--- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h
+++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h
@@ -8,10 +8,10 @@ struct ObjDanpeilift;
 typedef void (*ObjDanpeiliftActionFunc)(struct ObjDanpeilift*, PlayState*);
 
 typedef struct ObjDanpeilift {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ ObjDanpeiliftActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x2C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ ObjDanpeiliftActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x2C];
 } ObjDanpeilift; // size = 0x18C
 
 extern const ActorInit Obj_Danpeilift_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h
index 2d1e43dcca..ece93f6274 100644
--- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h
+++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h
@@ -8,17 +8,17 @@ struct ObjDora;
 typedef void (*ObjDoraActionFunc)(struct ObjDora*, PlayState*);
 
 typedef struct ObjDora {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderTris colliderTris;
-    /* 0x0164 */ ColliderTrisElement colliderTrisElements[6];
-    /* 0x038C */ ObjDoraActionFunc actionFunc;
-    /* 0x0390 */ Vec3f gongForce;
-    /* 0x039C */ Vec2s gongAngle;
-    /* 0x03A0 */ s16 lastGongHitType;
-    /* 0x03A2 */ Vec2s gongRotation; // gongAngle * gongForce. Used in ObjDora_Draw.
-    /* 0x03A6 */ s16 rupeeDropTimer;
-    /* 0x03A8 */ s16 collisionCooldownTimer;
-    /* 0x03AA */ s16 unk3AA; // Set but not used
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderTris colliderTris;
+    /* 0x164 */ ColliderTrisElement colliderTrisElements[6];
+    /* 0x38C */ ObjDoraActionFunc actionFunc;
+    /* 0x390 */ Vec3f gongForce;
+    /* 0x39C */ Vec2s gongAngle;
+    /* 0x3A0 */ s16 lastGongHitType;
+    /* 0x3A2 */ Vec2s gongRotation; // gongAngle * gongForce. Used in ObjDora_Draw.
+    /* 0x3A6 */ s16 rupeeDropTimer;
+    /* 0x3A8 */ s16 collisionCooldownTimer;
+    /* 0x3AA */ s16 unk3AA; // Set but not used
 } ObjDora; // size = 0x3AC
 
 extern const ActorInit Obj_Dora_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h
index 42dc3e181e..e2f37350ab 100644
--- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h
+++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h
@@ -42,18 +42,18 @@ typedef struct {
 } ObjDrifticeStruct; // size = 0xCC
 
 typedef struct ObjDriftice {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ObjDrifticeActionFunc actionFunc;
-    /* 0x0160 */ s32 unk_160;
-    /* 0x0164 */ s32 unk_164;
-    /* 0x0168 */ s32 unk_168;
-    /* 0x016C */ Vec3s* unk_16C;
-    /* 0x0170 */ ObjDrifticeStruct unk_170;
-    /* 0x023C */ f32 unk_23C;
-    /* 0x0240 */ f32 unk_240;
-    /* 0x0244 */ s16 unk_244;
-    /* 0x0248 */ s32 unk_248;
-    /* 0x024C */ s32 unk_24C;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ObjDrifticeActionFunc actionFunc;
+    /* 0x160 */ s32 unk_160;
+    /* 0x164 */ s32 unk_164;
+    /* 0x168 */ s32 unk_168;
+    /* 0x16C */ Vec3s* unk_16C;
+    /* 0x170 */ ObjDrifticeStruct unk_170;
+    /* 0x23C */ f32 unk_23C;
+    /* 0x240 */ f32 unk_240;
+    /* 0x244 */ s16 unk_244;
+    /* 0x248 */ s32 unk_248;
+    /* 0x24C */ s32 unk_24C;
 } ObjDriftice; // size = 0x250
 
 extern const ActorInit Obj_Driftice_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h
index 4d6a971eb0..bc01ceac4d 100644
--- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h
+++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h
@@ -15,17 +15,17 @@ typedef void (*ObjFireshieldActionFunc)(struct ObjFireshield*);
 #define OBJFIRESHIELD_GET_ROTX(thisx) ((thisx)->home.rot.x & 1)
 
 typedef struct ObjFireshield {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ ObjFireshieldActionFunc actionFunc;
-    /* 0x0194 */ s32 unk_194;
-    /* 0x0198 */ f32 unk_198;
-    /* 0x019C */ s32 unk_19C;
-    /* 0x01A0 */ s32 unk_1A0;
-    /* 0x01A4 */ s16 unk_1A4;
-    /* 0x01A6 */ u8 unk_1A6;
-    /* 0x01A7 */ s8 unk_1A7;
-    /* 0x01A8 */ s8 unk_1A8;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ ObjFireshieldActionFunc actionFunc;
+    /* 0x194 */ s32 unk_194;
+    /* 0x198 */ f32 unk_198;
+    /* 0x19C */ s32 unk_19C;
+    /* 0x1A0 */ s32 unk_1A0;
+    /* 0x1A4 */ s16 unk_1A4;
+    /* 0x1A6 */ u8 unk_1A6;
+    /* 0x1A7 */ s8 unk_1A7;
+    /* 0x1A8 */ s8 unk_1A8;
 } ObjFireshield; // size = 0x1AC
 
 extern const ActorInit Obj_Fireshield_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h
index 93a095d031..3e803672ca 100644
--- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h
+++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h
@@ -11,14 +11,14 @@ typedef void (*ObjFlowerpotActionFunc)(struct ObjFlowerpot*, PlayState*);
 #define ENOBJFLOWERPOT_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
 
 typedef struct ObjFlowerpot {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderJntSph collider;
-    /* 0x0164 */ ColliderJntSphElement colliderElements[2];
-    /* 0x01E4 */ ObjFlowerpotActionFunc actionFunc;
-    /* 0x01E8 */ s16 unk_1E8;
-    /* 0x01EA */ u8 unk_1EA;
-    /* 0x01EB */ s8 unk_1EB;
-    /* 0x01EC */ s8 unk_1EC;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderJntSph collider;
+    /* 0x164 */ ColliderJntSphElement colliderElements[2];
+    /* 0x1E4 */ ObjFlowerpotActionFunc actionFunc;
+    /* 0x1E8 */ s16 unk_1E8;
+    /* 0x1EA */ u8 unk_1EA;
+    /* 0x1EB */ s8 unk_1EB;
+    /* 0x1EC */ s8 unk_1EC;
 } ObjFlowerpot; // size = 0x1F0
 
 extern const ActorInit Obj_Flowerpot_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h
index 1c87108dfe..be73c70b50 100644
--- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h
+++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h
@@ -13,7 +13,6 @@ typedef struct ObjGrassStruct1_1 {
     /* 0x0E */ s8 unk_0E;
     /* 0x0F */ u8 unk_0F;
     /* 0x10 */ u8 unk_10;
-    /* 0x11 */ UNK_TYPE1 unk_11[0x3];
 } ObjGrassStruct1_1; // size = 0x14
 
 typedef struct {
diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h
index f46940f1b1..0e59033fcb 100644
--- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h
+++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h
@@ -10,13 +10,13 @@ struct ObjGrassStruct1_1;
 typedef void (*ObjGrassCarryActionFunc)(struct ObjGrassCarry*, PlayState*);
 
 typedef struct ObjGrassCarry {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ struct ObjGrass* unk_190;
-    /* 0x0194 */ struct ObjGrassStruct1_1* unk_194;
-    /* 0x0198 */ s16 unk_198;
-    /* 0x019A */ s16 unk_19A;
-    /* 0x019C */ ObjGrassCarryActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ struct ObjGrass* unk_190;
+    /* 0x194 */ struct ObjGrassStruct1_1* unk_194;
+    /* 0x198 */ s16 unk_198;
+    /* 0x19A */ s16 unk_19A;
+    /* 0x19C */ ObjGrassCarryActionFunc actionFunc;
 } ObjGrassCarry; // size = 0x1A0
 
 extern const ActorInit Obj_Grass_Carry_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h
index 4de9a0d80a..a4e5d233c3 100644
--- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h
+++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h
@@ -11,17 +11,17 @@ typedef void (*ObjHakaisiActionFunc)(struct ObjHakaisi*, PlayState*);
 #define OBJHAKAISI_GET_SWITCHFLAG(thisx) (((thisx)->params & 0xFF00) >> 8)
 
 typedef struct ObjHakaisi {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ObjHakaisiActionFunc actionFunc;
-    /* 0x0160 */ Vec3f unk_160[3];
-    /* 0x0184 */ Vec3f unk_184;
-    /* 0x0190 */ s32 switchFlag;
-    /* 0x0194 */ s16 unk_194;
-    /* 0x0196 */ s16 unk_196;
-    /* 0x0198 */ s16 unk_198;
-    /* 0x019A */ s16 unk_19A;
-    /* 0x019C */ s16 unk_19C;
-    /* 0x019E */ u8 unk_19E;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ObjHakaisiActionFunc actionFunc;
+    /* 0x160 */ Vec3f unk_160[3];
+    /* 0x184 */ Vec3f unk_184;
+    /* 0x190 */ s32 switchFlag;
+    /* 0x194 */ s16 unk_194;
+    /* 0x196 */ s16 unk_196;
+    /* 0x198 */ s16 unk_198;
+    /* 0x19A */ s16 unk_19A;
+    /* 0x19C */ s16 unk_19C;
+    /* 0x19E */ u8 unk_19E;
 } ObjHakaisi; // size = 0x1A0
 
 extern const ActorInit Obj_Hakaisi_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h
index ae3fcf160a..5d9a8e39b9 100644
--- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h
+++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h
@@ -8,12 +8,12 @@ struct ObjHariko;
 typedef void (*ObjHarikoActionFunc)(struct ObjHariko*, PlayState*);
 
 typedef struct ObjHariko {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjHarikoActionFunc actionFunc;
-    /* 0x0148 */ f32 bobbleStep;
-    /* 0x014C */ Vec3s headRotation;
-    /* 0x0152 */ s16 headOffset;
-    /* 0x0154 */ s16 unk154; // Set but not used
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjHarikoActionFunc actionFunc;
+    /* 0x148 */ f32 bobbleStep;
+    /* 0x14C */ Vec3s headRotation;
+    /* 0x152 */ s16 headOffset;
+    /* 0x154 */ s16 unk154; // Set but not used
 } ObjHariko; // size = 0x158
 
 extern const ActorInit Obj_Hariko_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
index e5fcb433b8..375a18625a 100644
--- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
+++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
@@ -8,9 +8,9 @@ struct ObjHsblock;
 typedef void (*ObjHsblockActionFunc)(struct ObjHsblock*, PlayState*);
 
 typedef struct ObjHsblock {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ ObjHsblockActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ ObjHsblockActionFunc actionFunc;
 } ObjHsblock; // size = 0x160
 
 extern const ActorInit Obj_Hsblock_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h
index 5ef9b27177..67b428182f 100644
--- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h
+++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h
@@ -20,13 +20,13 @@ typedef struct {
 } EnHugebombiwaStruct; // size = 0x28
 
 typedef struct ObjHugebombiwa {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder collider;
-    /* 0x0190 */ EnHugebombiwaStruct unk_190[20];
-    /* 0x04B0 */ s16 unk_4B0;
-    /* 0x04B2 */ s8 unk_4B2;
-    /* 0x04B3 */ s8 unk_4B3;
-    /* 0x04B4 */ ObjHugebombiwaActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder collider;
+    /* 0x190 */ EnHugebombiwaStruct unk_190[20];
+    /* 0x4B0 */ s16 unk_4B0;
+    /* 0x4B2 */ s8 unk_4B2;
+    /* 0x4B3 */ s8 unk_4B3;
+    /* 0x4B4 */ ObjHugebombiwaActionFunc actionFunc;
 } ObjHugebombiwa; // size = 0x4B8
 
 extern const ActorInit Obj_Hugebombiwa_InitVars;
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 a2d5ebd11a..d84069ec06 100644
--- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
+++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
@@ -23,35 +23,35 @@ enum {
 };
 
 typedef struct ObjHunsui {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ObjHunsuiActionFunc actionFunc;
-    /* 0x0160 */ s16 unk_160;
-    /* 0x0164 */ s32 unk_164;
-    /* 0x0168 */ s32 unk_168;
-    /* 0x016C */ s8 unk_16C;
-    /* 0x016D */ s8 unk_16D;
-    /* 0x016E */ s8 unk_16E;
-    /* 0x0170 */ s16 unk_170;
-    /* 0x0172 */ u16 unk_172;
-    /* 0x0174 */ f32 unk_174;
-    /* 0x0178 */ f32 unk_178;
-    /* 0x017C */ s16 unk_17C;
-    /* 0x0180 */ s32 unk_180;
-    /* 0x0184 */ s16 unk_184;
-    /* 0x0186 */ s16 unk_186;
-    /* 0x0188 */ s16 unk_188;
-    /* 0x018A */ s16 unk_18A;
-    /* 0x018C */ s16 unk_18C;
-    /* 0x0190 */ f32 unk_190;
-    /* 0x0194 */ f32 unk_194;
-    /* 0x0198 */ f32 unk_198;
-    /* 0x019C */ f32 unk_19C;
-    /* 0x01A0 */ f32 unk_1A0;
-    /* 0x01A4 */ s16 unk_1A4;
-    /* 0x0196 */ UNK_TYPE1 unk1A6[0x6];
-    /* 0x01AC */ f32 unk_1AC;
-    /* 0x01B0 */ f32 unk_1B0;
-    /* 0x01B4 */ BgDblueMovebg* unk_1B4;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ObjHunsuiActionFunc actionFunc;
+    /* 0x160 */ s16 unk_160;
+    /* 0x164 */ s32 unk_164;
+    /* 0x168 */ s32 unk_168;
+    /* 0x16C */ s8 unk_16C;
+    /* 0x16D */ s8 unk_16D;
+    /* 0x16E */ s8 unk_16E;
+    /* 0x170 */ s16 unk_170;
+    /* 0x172 */ u16 unk_172;
+    /* 0x174 */ f32 unk_174;
+    /* 0x178 */ f32 unk_178;
+    /* 0x17C */ s16 unk_17C;
+    /* 0x180 */ s32 unk_180;
+    /* 0x184 */ s16 unk_184;
+    /* 0x186 */ s16 unk_186;
+    /* 0x188 */ s16 unk_188;
+    /* 0x18A */ s16 unk_18A;
+    /* 0x18C */ s16 unk_18C;
+    /* 0x190 */ f32 unk_190;
+    /* 0x194 */ f32 unk_194;
+    /* 0x198 */ f32 unk_198;
+    /* 0x19C */ f32 unk_19C;
+    /* 0x1A0 */ f32 unk_1A0;
+    /* 0x1A4 */ s16 unk_1A4;
+    /* 0x196 */ UNK_TYPE1 unk1A6[0x6];
+    /* 0x1AC */ f32 unk_1AC;
+    /* 0x1B0 */ f32 unk_1B0;
+    /* 0x1B4 */ BgDblueMovebg* unk_1B4;
 } ObjHunsui; // size = 0x1B8
 
 extern const ActorInit Obj_Hunsui_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
index c1efd768d3..601c5c9e78 100644
--- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
+++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
@@ -12,13 +12,13 @@ typedef void (*ObjIcePolyActionFunc)(struct ObjIcePoly*, PlayState*);
 #define OBJICEPOLY_FF_FF 0xFF
 
 typedef struct ObjIcePoly {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjIcePolyActionFunc actionFunc;
-    /* 0x0148 */ u8 unk_148;
-    /* 0x0149 */ u8 unk_149;
-    /* 0x014A */ s16 unk_14A;
-    /* 0x014C */ ColliderCylinder colliders1[2];
-    /* 0x01E4 */ ColliderCylinder colliders2[2];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjIcePolyActionFunc actionFunc;
+    /* 0x148 */ u8 unk_148;
+    /* 0x149 */ u8 unk_149;
+    /* 0x14A */ s16 unk_14A;
+    /* 0x14C */ ColliderCylinder colliders1[2];
+    /* 0x1E4 */ ColliderCylinder colliders2[2];
 } ObjIcePoly; // size = 0x27C
 
 extern const ActorInit Obj_Ice_Poly_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h
index 31ef0d80f6..fa817781a9 100644
--- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h
+++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h
@@ -27,8 +27,8 @@ typedef struct {
 } ObjIceBlockUnkStruct2; // size = 0x10
 
 typedef struct {
-    f32 unk_00;
-    f32 unk_04;
+    /* 0x0 */ f32 unk_00;
+    /* 0x4 */ f32 unk_04;
 } ObjIceBlockUnkStruct3; // size = 0x8
 
 typedef struct {
@@ -48,34 +48,34 @@ typedef struct {
 } ObjIceBlockUnkStruct4; // size = 0x24
 
 typedef struct ObjIceblock {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ColliderCylinder collider;
-    /* 0x01A8 */ ObjIceblockActionFunc actionFunc;
-    /* 0x01AC */ ObjIceblockExtendedDrawFunc extendedDrawFunc;
-    /* 0x01B0 */ s32 unk_1B0;
-    /* 0x01B4 */ ObjIceBlockUnkStruct unk_1B4[4];
-    /* 0x01F4 */ ObjIceBlockUnkStruct2 unk_1F4[5];
-    /* 0x0244 */ f32 unk_244;
-    /* 0x0248 */ Vec3f unk_248;
-    /* 0x0254 */ Vec3s unk_254;
-    /* 0x025C */ f32 unk_25C;
-    /* 0x0260 */ f32 unk_260;
-    /* 0x0264 */ f32* unk_264;
-    /* 0x0268 */ f32 unk_268;
-    /* 0x026C */ s16 unk_26C;
-    /* 0x026E */ s16 unk_26E[4];
-    /* 0x0276 */ s16 unk_276;
-    /* 0x0278 */ s16 unk_278;
-    /* 0x027C */ ObjIceBlockUnkStruct4 unk_27C;
-    /* 0x02A0 */ s16 stateTimer; // re-used per-actionFunc
-    /* 0x02A2 */ s16 unk_2A2;
-    /* 0x02A4 */ f32 unk_2A4;
-    /* 0x02A8 */ f32 unk_2A8;
-    /* 0x02AC */ s16 unk_2AC;
-    /* 0x02AE */ s16 meltTimer; // starts at 450 frames = 22 seconds
-    /* 0x02B0 */ s8 unk_2B0;
-    /* 0x02B1 */ s8 spawnCutsceneTimer;
-    /* 0x02B4 */ f32 unk_2B4;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ColliderCylinder collider;
+    /* 0x1A8 */ ObjIceblockActionFunc actionFunc;
+    /* 0x1AC */ ObjIceblockExtendedDrawFunc extendedDrawFunc;
+    /* 0x1B0 */ s32 unk_1B0;
+    /* 0x1B4 */ ObjIceBlockUnkStruct unk_1B4[4];
+    /* 0x1F4 */ ObjIceBlockUnkStruct2 unk_1F4[5];
+    /* 0x244 */ f32 unk_244;
+    /* 0x248 */ Vec3f unk_248;
+    /* 0x254 */ Vec3s unk_254;
+    /* 0x25C */ f32 unk_25C;
+    /* 0x260 */ f32 unk_260;
+    /* 0x264 */ f32* unk_264;
+    /* 0x268 */ f32 unk_268;
+    /* 0x26C */ s16 unk_26C;
+    /* 0x26E */ s16 unk_26E[4];
+    /* 0x276 */ s16 unk_276;
+    /* 0x278 */ s16 unk_278;
+    /* 0x27C */ ObjIceBlockUnkStruct4 unk_27C;
+    /* 0x2A0 */ s16 stateTimer; // re-used per-actionFunc
+    /* 0x2A2 */ s16 unk_2A2;
+    /* 0x2A4 */ f32 unk_2A4;
+    /* 0x2A8 */ f32 unk_2A8;
+    /* 0x2AC */ s16 unk_2AC;
+    /* 0x2AE */ s16 meltTimer; // starts at 450 frames = 22 seconds
+    /* 0x2B0 */ s8 unk_2B0;
+    /* 0x2B1 */ s8 spawnCutsceneTimer;
+    /* 0x2B4 */ f32 unk_2B4;
 } ObjIceblock; // size = 0x2B8
 
 extern const ActorInit Obj_Iceblock_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h
index 3a250b2ff5..8526f49765 100644
--- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h
+++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h
@@ -16,25 +16,25 @@ typedef void (*ObjKendoKanbanActionFunc)(struct ObjKendoKanban*, PlayState*);
 #define OBJKENDOKANBAN_F_8 (1 << 3)
 
 typedef struct ObjKendoKanban {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderCylinder colliderCylinder;
-    /* 0x0190 */ ColliderTris colliderTris;
-    /* 0x01B0 */ ColliderTrisElement colliderTrisElements[2];
-    /* 0x0268 */ ObjKendoKanbanActionFunc actionFunc;
-    /* 0x026C */ Vec3f unk_26C[4];
-    /* 0x029C */ Vec3f unk_29C[4];
-    /* 0x02CC */ Vec3f unk_2CC;
-    /* 0x02D8 */ Vec3f unk_2D8;
-    /* 0x02E4 */ Vec3f unk_2E4;
-    /* 0x02F0 */ Vec3f unk_2F0;
-    /* 0x02FC */ s32 unk_2FC;
-    /* 0x0300 */ s16 unk_300;
-    /* 0x0302 */ s16 unk_302;
-    /* 0x0304 */ s16 unk_304;
-    /* 0x0306 */ UNK_TYPE1 pad306[2];
-    /* 0x0308 */ s16 unk_308;
-    /* 0x030A */ s16 unk_30A;
-    /* 0x030C */ u8 unk_30C;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderCylinder colliderCylinder;
+    /* 0x190 */ ColliderTris colliderTris;
+    /* 0x1B0 */ ColliderTrisElement colliderTrisElements[2];
+    /* 0x268 */ ObjKendoKanbanActionFunc actionFunc;
+    /* 0x26C */ Vec3f unk_26C[4];
+    /* 0x29C */ Vec3f unk_29C[4];
+    /* 0x2CC */ Vec3f unk_2CC;
+    /* 0x2D8 */ Vec3f unk_2D8;
+    /* 0x2E4 */ Vec3f unk_2E4;
+    /* 0x2F0 */ Vec3f unk_2F0;
+    /* 0x2FC */ s32 unk_2FC;
+    /* 0x300 */ s16 unk_300;
+    /* 0x302 */ s16 unk_302;
+    /* 0x304 */ s16 unk_304;
+    /* 0x306 */ UNK_TYPE1 pad306[2];
+    /* 0x308 */ s16 unk_308;
+    /* 0x30A */ s16 unk_30A;
+    /* 0x30C */ u8 unk_30C;
 } ObjKendoKanban; // size = 0x310
 
 extern const ActorInit Obj_Kendo_Kanban_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
index 9cbd57ef78..5f319558e1 100644
--- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
+++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
@@ -9,8 +9,8 @@
 #define KIBAKO2_CONTENTS(thisx) (((thisx)->params >> 0xF) & 1)
 
 typedef enum {
-    /*  0   */ CONTENTS_COLLECTIBLE,
-    /*  1   */ CONTENTS_SKULLTULA
+    /* 0 */ CONTENTS_COLLECTIBLE,
+    /* 1 */ CONTENTS_SKULLTULA
 } ObjKibako2Contents;
 
 struct ObjKibako2;
diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h
index dad54478cb..c4a9298fa3 100644
--- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h
+++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h
@@ -10,11 +10,11 @@ struct ObjKzsaku;
 typedef void (*ObjKzsakuActionFunc)(struct ObjKzsaku*, PlayState*);
 
 typedef struct ObjKzsaku {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ObjKzsakuActionFunc actionFunc;
-    /* 0x0160 */ f32 raisedAmount;
-    /* 0x0164 */ s32 switchFlag;
-    /* 0x0168 */ s16 timer;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ObjKzsakuActionFunc actionFunc;
+    /* 0x160 */ f32 raisedAmount;
+    /* 0x164 */ s32 switchFlag;
+    /* 0x168 */ s16 timer;
 } ObjKzsaku; // size = 0x16C
 
 extern const ActorInit Obj_Kzsaku_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
index 4abba15fd0..291ad33554 100644
--- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
+++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
@@ -8,10 +8,10 @@ struct ObjLift;
 typedef void (*ObjLiftActionFunc)(struct ObjLift*, PlayState*);
 
 typedef struct ObjLift {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ ObjLiftActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x1C];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ ObjLiftActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x1C];
 } ObjLift; // size = 0x17C
 
 extern const ActorInit Obj_Lift_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h
index c8a0b23df1..eb16a7a92c 100644
--- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h
+++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h
@@ -11,12 +11,12 @@ struct ObjLightblock;
 typedef void (*ObjLightblockActionFunc)(struct ObjLightblock*, PlayState*);
 
 typedef struct ObjLightblock {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ColliderCylinder collider;
-    /* 0x01A8 */ ObjLightblockActionFunc actionFunc;
-    /* 0x01AC */ s8 timer;
-    /* 0x01AD */ u8 alpha;
-    /* 0x01AE */ s8 collisionCounter;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ColliderCylinder collider;
+    /* 0x1A8 */ ObjLightblockActionFunc actionFunc;
+    /* 0x1AC */ s8 timer;
+    /* 0x1AD */ u8 alpha;
+    /* 0x1AE */ s8 collisionCounter;
 } ObjLightblock; // size = 0x1B0
 
 extern const ActorInit Obj_Lightblock_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
index 4934e635ec..03ed6dc4e1 100644
--- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
+++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
@@ -10,23 +10,23 @@ typedef void (*ObjMureActionFunc)(struct ObjMure*, PlayState*);
 #define OBJMURE_MAX_SPAWNS 15
 
 typedef struct {
-    Actor actor;
+    /* 0x000 */ Actor actor;
     /* 0x144 */ char unk_144[0x53];
     /* 0x197 */ u8 unk_197;
-} ObjMureChild;
+} ObjMureChild; // size = 0x198
 
 typedef struct ObjMure {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjMureActionFunc actionFunc;
-    /* 0x0148 */ s16 chNum;
-    /* 0x014A */ s16 ptn;
-    /* 0x014C */ s16 svNum;
-    /* 0x014E */ s16 type;
-    /* 0x0150 */ Actor* children[OBJMURE_MAX_SPAWNS];
-    /* 0x018C */ u8 childrenStates[OBJMURE_MAX_SPAWNS];
-    /* 0x019C */ s16 unk_19C;
-    /* 0x019E */ s16 unk_19E;
-    /* 0x01A0 */ s16 unk_1A0;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjMureActionFunc actionFunc;
+    /* 0x148 */ s16 chNum;
+    /* 0x14A */ s16 ptn;
+    /* 0x14C */ s16 svNum;
+    /* 0x14E */ s16 type;
+    /* 0x150 */ Actor* children[OBJMURE_MAX_SPAWNS];
+    /* 0x18C */ u8 childrenStates[OBJMURE_MAX_SPAWNS];
+    /* 0x19C */ s16 unk_19C;
+    /* 0x19E */ s16 unk_19E;
+    /* 0x1A0 */ s16 unk_1A0;
 } ObjMure; // size = 0x1A4
 
 extern const ActorInit Obj_Mure_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
index fdb6af93cb..bf13c3fbc3 100644
--- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
+++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
@@ -8,9 +8,9 @@ struct ObjMure2;
 typedef void (*ObjMure2ActionFunc)(struct ObjMure2*, PlayState*);
 
 typedef struct ObjMure2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjMure2ActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x38];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjMure2ActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x38];
 } ObjMure2; // size = 0x180
 
 extern const ActorInit Obj_Mure2_InitVars;
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 edab30561b..d217511983 100644
--- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
+++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
@@ -8,9 +8,9 @@ struct ObjMure3;
 typedef void (*ObjMure3ActionFunc)(struct ObjMure3*, PlayState*);
 
 typedef struct ObjMure3 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjMure3ActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x20];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjMure3ActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x20];
 } ObjMure3; // size = 0x168
 
 extern const ActorInit Obj_Mure3_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h
index 007569ecd4..7b4c3a5b86 100644
--- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h
+++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h
@@ -16,12 +16,12 @@ typedef void (*ObjNozokiActionFunc)(struct ObjNozoki*, PlayState*);
 #define OBJNOZOKI_400 0x400
 
 typedef struct ObjNozoki {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ u8 unk_15C;
-    /* 0x015D */ u8 unk_15D;
-    /* 0x015E */ s8 unk_15E;
-    /* 0x015F */ s8 unk_15F;
-    /* 0x0160 */ ObjNozokiActionFunc actionFunc;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ u8 unk_15C;
+    /* 0x15D */ u8 unk_15D;
+    /* 0x15E */ s8 unk_15E;
+    /* 0x15F */ s8 unk_15F;
+    /* 0x160 */ ObjNozokiActionFunc actionFunc;
 } ObjNozoki; // size = 0x164
 
 extern const ActorInit Obj_Nozoki_InitVars;
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 d8c0502869..2565722db3 100644
--- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h
+++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h
@@ -8,10 +8,10 @@ struct ObjOcarinalift;
 typedef void (*ObjOcarinaliftActionFunc)(struct ObjOcarinalift*, PlayState*);
 
 typedef struct ObjOcarinalift {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ ObjOcarinaliftActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x18];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ ObjOcarinaliftActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x18];
 } ObjOcarinalift; // size = 0x178
 
 extern const ActorInit Obj_Ocarinalift_InitVars;
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 d26920203f..ade27ca439 100644
--- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
+++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
@@ -38,26 +38,26 @@ enum {
 #define PUSHBLOCK_MOVE_UNDER     (1 << 8)
 
 typedef struct ObjOshihiki {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ObjOshihikiActionFunc actionFunc;
-    /* 0x0160 */ u16 stateFlags;
-    /* 0x0162 */ s16 timer;
-    /* 0x0164 */ f32 yawSin;
-    /* 0x0168 */ f32 yawCos;
-    /* 0x016C */ f32 pushSpeed;
-    /* 0x0170 */ f32 pushDist;
-    /* 0x0174 */ f32 direction;
-    /* 0x0178 */ s32 floorBgIds[5];
-    /* 0x018C */ CollisionPoly* floorPolys[5];
-    /* 0x01A0 */ f32 floorHeights[5];
-    /* 0x01B4 */ s16 highestFloor;
-    /* 0x01B6 */ u8 cantMove;
-    /* 0x01B8 */ struct ObjOshihiki* blockUnder;
-    /* 0x01BC */ f32 underDistX;
-    /* 0x01C0 */ f32 underDistZ;
-    /* 0x01C4 */ s8 textureStep;
-    /* 0x01C5 */ Color_RGB8 color;
-    /* 0x01C8 */ AnimatedMaterial* texture;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ObjOshihikiActionFunc actionFunc;
+    /* 0x160 */ u16 stateFlags;
+    /* 0x162 */ s16 timer;
+    /* 0x164 */ f32 yawSin;
+    /* 0x168 */ f32 yawCos;
+    /* 0x16C */ f32 pushSpeed;
+    /* 0x170 */ f32 pushDist;
+    /* 0x174 */ f32 direction;
+    /* 0x178 */ s32 floorBgIds[5];
+    /* 0x18C */ CollisionPoly* floorPolys[5];
+    /* 0x1A0 */ f32 floorHeights[5];
+    /* 0x1B4 */ s16 highestFloor;
+    /* 0x1B6 */ u8 cantMove;
+    /* 0x1B8 */ struct ObjOshihiki* blockUnder;
+    /* 0x1BC */ f32 underDistX;
+    /* 0x1C0 */ f32 underDistZ;
+    /* 0x1C4 */ s8 textureStep;
+    /* 0x1C5 */ Color_RGB8 color;
+    /* 0x1C8 */ AnimatedMaterial* texture;
 } ObjOshihiki; // size = 0x1CC
 
 extern const ActorInit Obj_Oshihiki_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h
index a092a69bda..6d16baa7b3 100644
--- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h
+++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h
@@ -8,10 +8,10 @@ struct ObjPurify;
 typedef void (*ObjPurifyActionFunc)(struct ObjPurify*, PlayState*);
 
 typedef struct ObjPurify {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ ObjPurifyActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x10];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ ObjPurifyActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x10];
 } ObjPurify; // size = 0x170
 
 extern const ActorInit Obj_Purify_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
index a20c8af438..be15ac11ac 100644
--- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
+++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
@@ -10,9 +10,9 @@ struct ObjRoomtimer;
 typedef void (*ObjRoomtimerActionFunc)(struct ObjRoomtimer*, PlayState*);
 
 typedef struct ObjRoomtimer {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjRoomtimerActionFunc actionFunc;
-    /* 0x0148 */ s32 switchFlag;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjRoomtimerActionFunc actionFunc;
+    /* 0x148 */ s32 switchFlag;
 } ObjRoomtimer; // size = 0x14C
 
 extern const ActorInit Obj_Roomtimer_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h
index 83131e4d9b..97a2e6ede2 100644
--- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h
+++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h
@@ -10,26 +10,26 @@ typedef void (*ObjSkateblockActionFunc)(struct ObjSkateblock*, PlayState*);
 #define OBJSKAEBLOCK_GET_F(thisx) ((thisx)->params & 0xF)
 
 typedef struct {
-    /* 0x00 */ CollisionPoly* poly;
-    /* 0x04 */ f32 height;
-    /* 0x08 */ s32 bgId;
+    /* 0x0 */ CollisionPoly* poly;
+    /* 0x4 */ f32 height;
+    /* 0x8 */ s32 bgId;
 } ObjSkateblockFloor; // size = 0xC
 
 typedef struct ObjSkateblock {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ObjSkateblockActionFunc actionFunc;
-    /* 0x0160 */ f32 unk_160;
-    /* 0x0164 */ f32 unk_164;
-    /* 0x0168 */ f32 unk_168;
-    /* 0x016C */ f32* unk_16C;
-    /* 0x0170 */ s16 unk_170;
-    /* 0x0172 */ s16 unk_172[4];
-    /* 0x017A */ s16 unk_17A;
-    /* 0x017C */ s16 unk_17C;
-    /* 0x0180 */ f32 unk_180;
-    /* 0x0184 */ ObjSkateblockFloor unk_184[5];
-    /* 0x01C0 */ u8 unk_1C0;
-    /* 0x01C1 */ u8 unk_1C1;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ObjSkateblockActionFunc actionFunc;
+    /* 0x160 */ f32 unk_160;
+    /* 0x164 */ f32 unk_164;
+    /* 0x168 */ f32 unk_168;
+    /* 0x16C */ f32* unk_16C;
+    /* 0x170 */ s16 unk_170;
+    /* 0x172 */ s16 unk_172[4];
+    /* 0x17A */ s16 unk_17A;
+    /* 0x17C */ s16 unk_17C;
+    /* 0x180 */ f32 unk_180;
+    /* 0x184 */ ObjSkateblockFloor unk_184[5];
+    /* 0x1C0 */ u8 unk_1C0;
+    /* 0x1C1 */ u8 unk_1C1;
 } ObjSkateblock; // size = 0x1C4
 
 extern const ActorInit Obj_Skateblock_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h
index 2b88a6b2c8..b6990fc1c2 100644
--- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h
+++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h
@@ -11,17 +11,17 @@ typedef void (*ObjSnowball2ActionFunc)(struct ObjSnowball2*, PlayState*);
 #define ENOBJSNOWBALL2_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
 
 typedef struct ObjSnowball2 {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ColliderJntSph collider;
-    /* 0x0164 */ ColliderJntSphElement colliderElements[1];
-    /* 0x01A4 */ ObjSnowball2ActionFunc actionFunc;
-    /* 0x01A8 */ s16 unk_1A8;
-    /* 0x01AA */ s16 unk_1AA;
-    /* 0x01AC */ s8 unk_1AC;
-    /* 0x01AD */ u8 unk_1AD;
-    /* 0x01AE */ s8 unk_1AE;
-    /* 0x01AF */ s8 unk_1AF;
-    /* 0x01B0 */ UNK_TYPE1 unk1B0[4];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ColliderJntSph collider;
+    /* 0x164 */ ColliderJntSphElement colliderElements[1];
+    /* 0x1A4 */ ObjSnowball2ActionFunc actionFunc;
+    /* 0x1A8 */ s16 unk_1A8;
+    /* 0x1AA */ s16 unk_1AA;
+    /* 0x1AC */ s8 unk_1AC;
+    /* 0x1AD */ u8 unk_1AD;
+    /* 0x1AE */ s8 unk_1AE;
+    /* 0x1AF */ s8 unk_1AF;
+    /* 0x1B0 */ UNK_TYPE1 unk1B0[4];
 } ObjSnowball2; // size = 0x1B4
 
 extern const ActorInit Obj_Snowball2_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h
index 86eeb54b52..3fdb835976 100644
--- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h
+++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h
@@ -11,20 +11,20 @@ typedef void (*ObjSpidertentActionFunc)(struct ObjSpidertent*, PlayState*);
 #define OBJSPIDERTENT_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
 
 typedef struct ObjSpidertent {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ColliderTris collider;
-    /* 0x017C */ ColliderTrisElement colliderElements[6];
-    /* 0x03A4 */ Vec3f unk_3A4;
-    /* 0x03B0 */ f32 unk_3B0[4];
-    /* 0x03C0 */ u8 unk_3C0;
-    /* 0x03C1 */ s8 unk_3C1;
-    /* 0x03C2 */ u8 unk_3C2;
-    /* 0x03C3 */ u8 unk_3C3;
-    /* 0x03C4 */ u8 unk_3C4;
-    /* 0x03C5 */ u8 unk_3C5;
-    /* 0x03C6 */ s8 unk_3C6;
-    /* 0x03C7 */ s8 unk_3C7;
-    /* 0x03C8 */ ObjSpidertentActionFunc actionFunc;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ColliderTris collider;
+    /* 0x17C */ ColliderTrisElement colliderElements[6];
+    /* 0x3A4 */ Vec3f unk_3A4;
+    /* 0x3B0 */ f32 unk_3B0[4];
+    /* 0x3C0 */ u8 unk_3C0;
+    /* 0x3C1 */ s8 unk_3C1;
+    /* 0x3C2 */ u8 unk_3C2;
+    /* 0x3C3 */ u8 unk_3C3;
+    /* 0x3C4 */ u8 unk_3C4;
+    /* 0x3C5 */ u8 unk_3C5;
+    /* 0x3C6 */ s8 unk_3C6;
+    /* 0x3C7 */ s8 unk_3C7;
+    /* 0x3C8 */ ObjSpidertentActionFunc actionFunc;
 } ObjSpidertent; // size = 0x3CC
 
 extern const ActorInit Obj_Spidertent_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h
index c265e7d659..741385264a 100644
--- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h
+++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h
@@ -18,9 +18,9 @@ typedef s32 (*ObjSpinyrollColFunc)(CollisionContext*, f32*, CollisionPoly**, s32
 #define OBJSPINYROLL_GET_C000_1 1
 
 typedef struct {
-    /* 0x00 */ f32 unk_00;
-    /* 0x04 */ CollisionPoly* unk_04;
-    /* 0x08 */ s32 bgId;
+    /* 0x0 */ f32 unk_00;
+    /* 0x4 */ CollisionPoly* unk_04;
+    /* 0x8 */ s32 bgId;
 } ObjSpinyrollSubStruct; // size = 0xC
 
 typedef struct {
@@ -34,26 +34,26 @@ typedef struct {
 } ObjSpinyrollStruct2; // size = 0xF8?
 
 typedef struct ObjSpinyroll {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ColliderTris collider;
-    /* 0x017C */ ColliderTrisElement colliderElements[6];
-    /* 0x03A4 */ ObjSpinyrollStruct2 unk_3A4;
-    ///* 0x0494 */ ObjSpinyrollStruct* unk_494; // alternative testing
-    ///* 0x0498 */ s32 unk_498;
-    /* 0x049C */ s32 unk_49C;
-    /* 0x04A0 */ ObjSpinyrollActionFunc actionFunc;
-    /* 0x04A4 */ f32 unk_4A4;
-    /* 0x04A8 */ s32 unk_4A8;
-    /* 0x04AC */ Vec3f unk_4AC[2];
-    /* 0x04C4 */ Vec3f unk_4C4;
-    /* 0x04D0 */ f32 unk_4D0;
-    /* 0x04D4 */ f32 unk_4D4;
-    /* 0x04D8 */ s16 unk_4D8;
-    /* 0x04DA */ s16 unk_4DA;
-    /* 0x04DC */ s16 unk_4DC;
-    /* 0x04DE */ s16 unk_4DE;
-    /* 0x04E0 */ s16 unk_4E0;
-    /* 0x04E2 */ s16 unk_4E2;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ColliderTris collider;
+    /* 0x17C */ ColliderTrisElement colliderElements[6];
+    /* 0x3A4 */ ObjSpinyrollStruct2 unk_3A4;
+    ///* 0x494 */ ObjSpinyrollStruct* unk_494; // alternative testing
+    ///* 0x498 */ s32 unk_498;
+    /* 0x49C */ s32 unk_49C;
+    /* 0x4A0 */ ObjSpinyrollActionFunc actionFunc;
+    /* 0x4A4 */ f32 unk_4A4;
+    /* 0x4A8 */ s32 unk_4A8;
+    /* 0x4AC */ Vec3f unk_4AC[2];
+    /* 0x4C4 */ Vec3f unk_4C4;
+    /* 0x4D0 */ f32 unk_4D0;
+    /* 0x4D4 */ f32 unk_4D4;
+    /* 0x4D8 */ s16 unk_4D8;
+    /* 0x4DA */ s16 unk_4DA;
+    /* 0x4DC */ s16 unk_4DC;
+    /* 0x4DE */ s16 unk_4DE;
+    /* 0x4E0 */ s16 unk_4E0;
+    /* 0x4E2 */ s16 unk_4E2;
 } ObjSpinyroll; // size = 0x4E4
 
 extern const ActorInit Obj_Spinyroll_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
index 34d7019e83..f208a60cf5 100644
--- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
+++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
@@ -33,31 +33,31 @@ typedef enum {
 #define OBJSWITCH_INVERSE_BLUE 0x30
 
 typedef struct ObjSwitch {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ObjSwitchActionFunc actionFunc;
-    /* 0x0160 */ s16 floorSwitchReleaseTimer;
-    /* 0x0162 */ s16 disableCrystalSwitchTimer;
-    /* 0x0164 */ s8 eyeTexIndex;
-    /* 0x0165 */ s8 sfxTimer;
-    /* 0x0168 */ s32 crystalAnimTimer;
-    /* 0x016C */ Color_RGB8 color;
-    /* 0x016F */ u8 collisionFlags;
-    /* 0x0170 */ s8 floorSwitchPlayerSnapState;
-    /* 0x0171 */ s8 nextSwitchFlagState;
-    /* 0x0172 */ s8 isPlayingCutscene;
-    /* 0x0174 */ ObjSwitchSetupActionFunc setupFunc;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ObjSwitchActionFunc actionFunc;
+    /* 0x160 */ s16 floorSwitchReleaseTimer;
+    /* 0x162 */ s16 disableCrystalSwitchTimer;
+    /* 0x164 */ s8 eyeTexIndex;
+    /* 0x165 */ s8 sfxTimer;
+    /* 0x168 */ s32 crystalAnimTimer;
+    /* 0x16C */ Color_RGB8 color;
+    /* 0x16F */ u8 collisionFlags;
+    /* 0x170 */ s8 floorSwitchPlayerSnapState;
+    /* 0x171 */ s8 nextSwitchFlagState;
+    /* 0x172 */ s8 isPlayingCutscene;
+    /* 0x174 */ ObjSwitchSetupActionFunc setupFunc;
     union {
         struct {
-    /* 0x0178 */ ColliderJntSph colliderJntSph;
-    /* 0x0198 */ ColliderJntSphElement colliderJntSphElements[1];
+    /* 0x178 */ ColliderJntSph colliderJntSph;
+    /* 0x198 */ ColliderJntSphElement colliderJntSphElements[1];
         };
         struct {
-    /* 0x0178 */ ColliderTris colliderTris;
-    /* 0x0198 */ ColliderTrisElement colliderTrisElements[2];
+    /* 0x178 */ ColliderTris colliderTris;
+    /* 0x198 */ ColliderTrisElement colliderTrisElements[2];
         };
     };
-    /* 0x0250 */ f32 floorSwitchUpScale;
-    /* 0x0254 */ f32 floorSwitchDownScale;
+    /* 0x250 */ f32 floorSwitchUpScale;
+    /* 0x254 */ f32 floorSwitchDownScale;
 } ObjSwitch; // size = 0x258
 
 extern const ActorInit Obj_Switch_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h
index 4002f25c4b..29654f9924 100644
--- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h
+++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h
@@ -8,9 +8,9 @@ struct ObjSwprize;
 typedef void (*ObjSwprizeActionFunc)(struct ObjSwprize*, PlayState*);
 
 typedef struct ObjSwprize {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjSwprizeActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x4];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjSwprizeActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x4];
 } ObjSwprize; // size = 0x14C
 
 extern const ActorInit Obj_Swprize_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h
index 0b2251d098..603041d9f3 100644
--- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h
+++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h
@@ -8,9 +8,9 @@ struct ObjTakarayaWall;
 typedef void (*ObjTakarayaWallActionFunc)(struct ObjTakarayaWall*, PlayState*);
 
 typedef struct ObjTakarayaWall {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjTakarayaWallActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x98];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjTakarayaWallActionFunc actionFunc;
+    /* 0x148 */ char unk_148[0x98];
 } ObjTakarayaWall; // size = 0x1E0
 
 extern const ActorInit Obj_Takaraya_Wall_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h
index 9e79cf7973..d1220bf339 100644
--- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h
+++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h
@@ -8,10 +8,10 @@ struct ObjTaru;
 typedef void (*ObjTaruActionFunc)(struct ObjTaru*, PlayState*);
 
 typedef struct ObjTaru {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x64];
-    /* 0x01A8 */ ObjTaruActionFunc actionFunc;
-    /* 0x01AC */ char unk_1AC[0x4];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x64];
+    /* 0x1A8 */ ObjTaruActionFunc actionFunc;
+    /* 0x1AC */ char unk_1AC[0x4];
 } ObjTaru; // size = 0x1B0
 
 extern const ActorInit Obj_Taru_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h
index 8ddd39eb98..49e47af199 100644
--- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h
+++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h
@@ -8,10 +8,10 @@ struct ObjTokeiTobira;
 typedef void (*ObjTokeiTobiraActionFunc)(struct ObjTokeiTobira*, PlayState*);
 
 typedef struct ObjTokeiTobira {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ ObjTokeiTobiraActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x10];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ ObjTokeiTobiraActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x10];
 } ObjTokeiTobira; // size = 0x170
 
 extern const ActorInit Obj_Tokei_Tobira_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
index a12c0b5883..28233c911d 100644
--- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
+++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
@@ -18,17 +18,17 @@ typedef void (*ObjTsuboUnkFunc)(struct ObjTsubo*, PlayState*);
 #define OBJ_TSUBO_ZROT(thisx) ((thisx)->home.rot.z)
 
 typedef struct ObjTsubo {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjTsuboActionFunc actionFunc;
-    /* 0x0148 */ ColliderCylinder cylinderCollider;
-    /* 0x0194 */ s8 unk_194;
-    /* 0x0195 */ s8 unk_195;
-    /* 0x0196 */ s8 homeRoom;
-    /* 0x0197 */ s8 unk_197;
-    /* 0x0198 */ s8 unk_198;
-    /* 0x0199 */ s8 objBankIndex;
-    /* 0x019A */ s8 unk_19A;
-    /* 0x019B */ u8 unk_19B;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjTsuboActionFunc actionFunc;
+    /* 0x148 */ ColliderCylinder cylinderCollider;
+    /* 0x194 */ s8 unk_194;
+    /* 0x195 */ s8 unk_195;
+    /* 0x196 */ s8 homeRoom;
+    /* 0x197 */ s8 unk_197;
+    /* 0x198 */ s8 unk_198;
+    /* 0x199 */ s8 objBankIndex;
+    /* 0x19A */ s8 unk_19A;
+    /* 0x19B */ u8 unk_19B;
 } ObjTsubo; // size = 0x19C
 
 extern const ActorInit Obj_Tsubo_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.h b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h
index b421187e44..d343d3a512 100644
--- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.h
+++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h
@@ -8,10 +8,10 @@ struct ObjUm;
 typedef void (*ObjUmActionFunc)(struct ObjUm*, PlayState*);
 
 typedef struct ObjUm {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ ObjUmActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x384];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ ObjUmActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x384];
 } ObjUm; // size = 0x4E4
 
 extern const ActorInit Obj_Um_InitVars;
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 351bc93b1b..7c4cdd8a5a 100644
--- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h
+++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h
@@ -8,10 +8,10 @@ struct ObjUsiyane;
 typedef void (*ObjUsiyaneActionFunc)(struct ObjUsiyane*, PlayState*);
 
 typedef struct ObjUsiyane {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
-    /* 0x015C */ ObjUsiyaneActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x5E8];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x18];
+    /* 0x15C */ ObjUsiyaneActionFunc actionFunc;
+    /* 0x160 */ char unk_160[0x5E8];
 } ObjUsiyane; // size = 0x748
 
 extern const ActorInit Obj_Usiyane_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h
index 11913355da..38dee86fb2 100644
--- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h
+++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h
@@ -28,19 +28,19 @@ typedef struct {
 } ObjVspinyrollStruct3; // size = 0x1E8
 
 typedef struct ObjVspinyroll {
-    /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x015C */ ColliderCylinder collider;
-    /* 0x01A8 */ ObjVspinyrollStruct3 unk_1A8;
-    /* 0x0390 */ ObjVspinyrollActionFunc actionFunc;
-    /* 0x0394 */ f32 unk_394;
-    /* 0x0398 */ s32 unk_398;
-    /* 0x039C */ Vec3f unk_39C[2];
-    /* 0x03B4 */ Vec3f unk_3B4;
-    /* 0x03C0 */ s16 unk_3C0;
-    /* 0x03C2 */ s16 unk_3C2;
-    /* 0x03C4 */ s16 unk_3C4;
-    /* 0x03C6 */ s16 unk_3C6;
-    /* 0x03C8 */ s16 unk_3C8;
+    /* 0x000 */ DynaPolyActor dyna;
+    /* 0x15C */ ColliderCylinder collider;
+    /* 0x1A8 */ ObjVspinyrollStruct3 unk_1A8;
+    /* 0x390 */ ObjVspinyrollActionFunc actionFunc;
+    /* 0x394 */ f32 unk_394;
+    /* 0x398 */ s32 unk_398;
+    /* 0x39C */ Vec3f unk_39C[2];
+    /* 0x3B4 */ Vec3f unk_3B4;
+    /* 0x3C0 */ s16 unk_3C0;
+    /* 0x3C2 */ s16 unk_3C2;
+    /* 0x3C4 */ s16 unk_3C4;
+    /* 0x3C6 */ s16 unk_3C6;
+    /* 0x3C8 */ s16 unk_3C8;
 } ObjVspinyroll; // size = 0x3CC
 
 extern const ActorInit Obj_Vspinyroll_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h
index 9b498cf4ba..5f6e05546b 100644
--- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h
+++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h
@@ -8,10 +8,10 @@ struct ObjWturn;
 typedef void (*ObjWturnActionFunc)(struct ObjWturn*, PlayState*);
 
 typedef struct ObjWturn {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ ObjWturnActionFunc actionFunc;
-    /* 0x0148 */ s16 camId;
-    /* 0x014A */ s16 unk_14A;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ ObjWturnActionFunc actionFunc;
+    /* 0x148 */ s16 camId;
+    /* 0x14A */ s16 unk_14A;
 } ObjWturn; // size = 0x14C
 
 extern const ActorInit Obj_Wturn_InitVars;
diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
index e7872dd8c8..922b1f89b8 100644
--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
@@ -8,9 +8,9 @@ struct OceffSpot;
 typedef void (*OceffSpotActionFunc)(struct OceffSpot*, PlayState*);
 
 typedef struct OceffSpot {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x30];
-    /* 0x0174 */ OceffSpotActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x30];
+    /* 0x174 */ OceffSpotActionFunc actionFunc;
 } OceffSpot; // size = 0x178
 
 extern const ActorInit Oceff_Spot_InitVars;
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 a170215baa..460ede8447 100644
--- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
+++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
@@ -8,9 +8,9 @@ struct OceffStorm;
 typedef void (*OceffStormActionFunc)(struct OceffStorm*, PlayState*);
 
 typedef struct OceffStorm {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x8];
-    /* 0x014C */ OceffStormActionFunc actionFunc;
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x8];
+    /* 0x14C */ OceffStormActionFunc actionFunc;
 } OceffStorm; // size = 0x150
 
 extern const ActorInit Oceff_Storm_InitVars;
diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
index 2005c92874..cb25f15534 100644
--- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
+++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
@@ -8,10 +8,10 @@ struct ShotSun;
 typedef void (*ShotSunActionFunc)(struct ShotSun*, PlayState*);
 
 typedef struct ShotSun {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x4C];
-    /* 0x0190 */ ShotSunActionFunc actionFunc;
-    /* 0x0194 */ char unk_194[0xC];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ char unk_144[0x4C];
+    /* 0x190 */ ShotSunActionFunc actionFunc;
+    /* 0x194 */ char unk_194[0xC];
 } ShotSun; // size = 0x1A0
 
 extern const ActorInit Shot_Sun_InitVars;