enum work

include/d/actor/d_a_npc_shad.h

@@ -29,6 +29,101 @@ public:
     typedef bool (daNpcShad_c::*ActionFn)(void*);
     typedef BOOL (daNpcShad_c::*EventFn)(int);
 
+    enum Animation {
+        /* 0x00 */ ANM_NONE,
+        /* 0x01 */ ANM_F_TALK_A,
+        /* 0x02 */ ANM_F_HAPPY,
+        /* 0x03 */ ANM_F_ANGER,
+        /* 0x04 */ ANM_F_DISCOURAGED,
+        /* 0x05 */ ANM_F_CHANT,
+        /* 0x06 */ ANM_F_KOMON,
+        /* 0x07 */ ANM_F_SURPRISE,
+        /* 0x08 */ ANM_FH_SURPRISE,
+        /* 0x09 */ ANM_FH_KOMON,
+        /* 0x0A */ ANM_FH_HAPPY,
+        /* 0x0B */ ANM_FH_ANGER,
+        /* 0x0C */ ANM_FH_DISCOURAGED,
+        /* 0x0D */ ANM_WAIT_A,
+        /* 0x0E */ ANM_TALK_A,
+        /* 0x0F */ ANM_STEP,
+        /* 0x10 */ ANM_STEPB,
+        /* 0x11 */ ANM_BOOK_WAIT,
+        /* 0x12 */ ANM_BOOK_TALK_A,
+        /* 0x13 */ ANM_HI,
+        /* 0x14 */ ANM_RUN_A,
+        /* 0x15 */ ANM_WALK_A,
+        /* 0x16 */ ANM_SIT_A,
+        /* 0x17 */ ANM_LOOKBACK,
+        /* 0x18 */ ANM_CHANT,
+        /* 0x19 */ ANM_DISCOURAGED,
+        /* 0x1A */ ANM_DISCOURAGED_WAIT,
+        /* 0x1B */ ANM_SITTALK_A,
+        /* 0x1C */ ANM_LOOK,
+        /* 0x1D */ ANM_LOOK_WAIT,
+        /* 0x1E */ ANM_SAD_WALK,
+        /* 0x1F */ ANM_LOOKUP,
+        /* 0x20 */ ANM_TAKE_KOMON,
+        /* 0x21 */ ANM_READ_KOMON,
+        /* 0x22 */ ANM_SURPRISE,
+        /* 0x23 */ ANM_SURPRISE_WAIT,
+    };
+
+    enum Expression {
+        /* 0x0 */ EXPR_TALK_A,
+        /* 0x1 */ EXPR_HAPPY,
+        /* 0x2 */ EXPR_ANGER,
+        /* 0x3 */ EXPR_DISCOURAGED,
+        /* 0x4 */ EXPR_KOMON,
+        /* 0x5 */ EXPR_SURPRISE,
+        /* 0x6 */ EXPR_H_SURPRISE,
+        /* 0x7 */ EXPR_H_KOMON,
+        /* 0x8 */ EXPR_H_HAPPY,
+        /* 0x9 */ EXPR_H_ANGER,
+        /* 0xA */ EXPR_H_DISCOURAGED,
+        /* 0xB */ EXPR_CHANT,
+        /* 0xC */ EXPR_NONE,
+    };
+
+    enum Expression_BTP {
+        /* 0x0 */ EXPR_BTP_SHAD,
+        /* 0x1 */ EXPR_BTP_F_ANGER,
+        /* 0x2 */ EXPR_BTP_F_DISCOURAGED,
+        /* 0x3 */ EXPR_BTP_F_HAPPY,
+        /* 0x4 */ EXPR_BTP_F_KOMON,
+        /* 0x5 */ EXPR_BTP_F_SURPRISE,
+        /* 0x6 */ EXPR_BTP_FH_SURPRISE,
+        /* 0x7 */ EXPR_BTP_FH_KOMON,
+        /* 0x8 */ EXPR_BTP_FH_ANGER,
+        /* 0x9 */ EXPR_BTP_FH_DISCOURAGED,
+        /* 0xA */ EXPR_BTP_FH_HAPPY
+    };
+
+    enum Motion {
+        /* 0x00 */ MOT_WAIT_A,
+        /* 0x01 */ MOT_BOOK_TALK_A,
+        /* 0x02 */ MOT_BOOK_WAIT,
+        /* 0x03 */ MOT_HI,
+        /* 0x04 */ MOT_SIT_A,
+        /* 0x05 */ MOT_LOOKBACK,
+        /* 0x06 */ MOT_DISCOURAGED,
+        /* 0x07 */ MOT_DISCOURAGED_WAIT,
+        /* 0x08 */ MOT_TALK_A,
+        /* 0x09 */ MOT_SITTALK_A,
+        /* 0x0A */ MOT_LOOK,
+        /* 0x0B */ MOT_TAKE_KOMON,
+        /* 0x0C */ MOT_READ_KOMON,
+        /* 0x0D */ MOT_LOOK_WAIT,
+        /* 0x0E */ MOT_SURPRISE,
+        /* 0x0F */ MOT_SURPRISE_WAIT,
+        /* 0x10 */ MOT_LOOKUP,
+        /* 0x11 */ MOT_SAD_WALK,
+        /* 0x12 */ MOT_CHANT,
+        /* 0x13 */ MOT_RUN_A,
+        /* 0x14 */ MOT_WALK_A,
+        /* 0x15 */ MOT_STEP,
+        /* 0x16 */ MOT_STEPB,
+    };
+
     /* 80AD820C */ daNpcShad_c() : daNpcF_c() {}
     /* 80AD8420 */ ~daNpcShad_c();
     /* 80AD8620 */ cPhs__Step Create();
@@ -47,7 +142,7 @@ public:
     /* 80AD9E04 */ inline bool getPathPoint(u8, int, Vec*);
     /* 80AD9E90 */ inline bool isSneaking();
     /* 80AD9F00 */ bool wait_type0(void*);
-    /* 80ADA630 */ void setMotion(int, f32, int);
+    /* 80ADA630 */ void setMotion(int, f32, BOOL);
     /* 80ADA674 */ void setExpression(int, f32);
     /* 80ADA6A0 */ bool wait_type1(void*);
     /* 80ADB428 */ bool wait_type2(void*);
@@ -125,8 +220,8 @@ public:
     }
 
 private:
-    /* 0xB48 */ J3DModel* field_0xb48;
-    /* 0xB4C */ J3DModel* field_0xb4c;
+    /* 0xB48 */ J3DModel* mBookKnifeModel;
+    /* 0xB4C */ J3DModel* mKomonshoModel;
     /* 0xB50 */ Z2Creature mSound;
     /* 0xBE0 */ daNpcF_MatAnm_c* mpMatAnm;
     /* 0xBE4 */ daNpcF_Lookat_c mLookat;
@@ -141,7 +236,7 @@ private:
     /* 0xE10 */ int field_0xe10;
     /* 0xE14 */ s16 field_0xe14;
     /* 0xE16 */ s16 field_0xe16;
-    /* 0xE18 */ s16 field_0xe18;
+    /* 0xE18 */ s16 mLookMode;
     /* 0xE1A */ u16 field_0xe1a;
     /* 0xE1C */ s16 field_0xe1c;
     /* 0xE1E */ u8 field_0xe1e;