1 files changed, 25 insertions, 25 deletions
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 83055d5bf..a5d9bd434 100644
--- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h
+++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h
@@ -8,18 +8,18 @@ struct EnBombers;
 
 typedef void (*EnBombersActionFunc)(struct EnBombers*, PlayState*);
 
-#define ENBOMBERS_GET_F(thisx) ((thisx)->params & 0xF)
-#define ENBOMBERS_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
+#define ENBOMBERS_GET_NUMBER(thisx) ((thisx)->params & 0xF)
+#define ENBOMBERS_GET_TYPE(thisx) (((thisx)->params >> 4) & 0xF)
 
 typedef enum {
-    /* 0 */ ENBOMBERS_F_0,
-    /* 1 */ ENBOMBERS_F_1,
-    /* 2 */ ENBOMBERS_F_2,
-    /* 3 */ ENBOMBERS_F_3,
-    /* 4 */ ENBOMBERS_F_4
-} EnBombersParam;
+    /* 0 */ ENBOMBERS_NO_1,
+    /* 1 */ ENBOMBERS_NO_2,
+    /* 2 */ ENBOMBERS_NO_3,
+    /* 3 */ ENBOMBERS_NO_4,
+    /* 4 */ ENBOMBERS_NO_5
+} EnBombersNumber;
 
-#define ENBOMBERS_F0_0 0
+#define ENBOMBERS_TYPE_NPC 0
 
 typedef struct EnBombers {
     /* 0x000 */ Actor actor;
@@ -27,26 +27,26 @@ typedef struct EnBombers {
     /* 0x188 */ Vec3s jointTable[OBJECT_CS_LIMB_MAX];
     /* 0x206 */ Vec3s morphTable[OBJECT_CS_LIMB_MAX];
     /* 0x284 */ EnBombersActionFunc actionFunc;
-    /* 0x288 */ s16 unk_288;
-    /* 0x28A */ s16 unk_28A;
+    /* 0x288 */ s16 headRotZ;
+    /* 0x28A */ s16 headRotX;
     /* 0x28C */ UNK_TYPE1 unk28C[2];
-    /* 0x28E */ s16 unk_28E;
-    /* 0x290 */ s16 unk_290;
-    /* 0x294 */ Vec3f unk_294;
-    /* 0x2A0 */ s16 unk_2A0;
+    /* 0x28E */ s16 headRotTargetZ;
+    /* 0x290 */ s16 headRotTargetX;
+    /* 0x294 */ Vec3f walkTarget;
+    /* 0x2A0 */ s16 npcState;
     /* 0x2A2 */ UNK_TYPE1 unk2A2[2];
-    /* 0x2A4 */ s16 unk_2A4;
-    /* 0x2A6 */ s16 unk_2A6;
-    /* 0x2A8 */ s16 unk_2A8;
-    /* 0x2AA */ s16 unk_2AA;
+    /* 0x2A4 */ s16 targetYaw;
+    /* 0x2A6 */ s16 talkState;
+    /* 0x2A8 */ s16 idleTimer;
+    /* 0x2AA */ s16 walkTimer;
     /* 0x2AC */ s16 unk_2AC;
     /* 0x2B0 */ f32 animEndFrame;
-    /* 0x2B4 */ f32 unk_2B4;
-    /* 0x2B8 */ s16 unk_2B8;
-    /* 0x2BA */ s16 unk_2BA;
-    /* 0x2BC */ s16 unk_2BC;
-    /* 0x2BE */ s16 unk_2BE;
-    /* 0x2C0 */ s16 unk_2C0;
+    /* 0x2B4 */ f32 walkMaxStep;
+    /* 0x2B8 */ s16 eyeIndex;
+    /* 0x2BA */ s16 blinkTimer;
+    /* 0x2BC */ s16 type;
+    /* 0x2BE */ s16 number;
+    /* 0x2C0 */ s16 action;
     /* 0x2C4 */ s32 animIndex;
     /* 0x2C8 */ ColliderCylinder collider;
 } EnBombers; // size = 0x314