Skip to content

Commit 5ce5bf2

Browse files
authored
npc_kn mostly done (#2609)
* npc_kn mostly done * fix shieldD * pr fixes * weak func fixes
1 parent 956e84b commit 5ce5bf2

File tree

10 files changed

+5466
-2666
lines changed

10 files changed

+5466
-2666
lines changed

include/d/actor/d_a_npc_gwolf.h

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @details
1212
*
1313
*/
14-
class daNpc_GWolf_c : public fopAc_ac_c {
14+
class daNpc_GWolf_c : public daNpcF_c {
1515
public:
1616
/* 809F30AC */ daNpc_GWolf_c();
1717
/* 809F34C0 */ void create();
@@ -47,18 +47,18 @@ class daNpc_GWolf_c : public fopAc_ac_c {
4747
/* 809F797C */ void test(void*);
4848
/* 809F7A30 */ void getGroundSlope(dBgS_ObjAcch&, s16);
4949

50-
/* 809F32C0 */ ~daNpc_GWolf_c();
51-
/* 809F4258 */ void setParam();
52-
/* 809F4390 */ BOOL main();
53-
/* 809F4558 */ BOOL ctrlBtk();
54-
/* 809F4638 */ void adjustShapeAngle();
55-
/* 809F4698 */ void setAttnPos();
56-
/* 809F4BB0 */ bool setExpressionAnm(int, bool);
57-
/* 809F4BB8 */ void setExpression(int, f32);
58-
/* 809F4BBC */ bool setMotionAnm(int, f32);
59-
/* 809F4DE8 */ void setMotion(int, f32, int);
60-
/* 809F4E2C */ BOOL drawDbgInfo();
61-
/* 809F4E34 */ void drawOtherMdls();
50+
/* 809F32C0 */ virtual ~daNpc_GWolf_c();
51+
/* 809F4258 */ virtual void setParam();
52+
/* 809F4390 */ virtual BOOL main();
53+
/* 809F4558 */ virtual BOOL ctrlBtk();
54+
/* 809F4638 */ virtual void adjustShapeAngle();
55+
/* 809F4698 */ virtual void setAttnPos();
56+
/* 809F4BB0 */ virtual bool setExpressionAnm(int, bool);
57+
/* 809F4BB8 */ virtual void setExpression(int, f32);
58+
/* 809F4BBC */ virtual void setMotionAnm(int, f32);
59+
/* 809F4DE8 */ virtual void setMotion(int, f32, int);
60+
/* 809F4E2C */ virtual BOOL drawDbgInfo();
61+
/* 809F4E34 */ virtual void drawOtherMdls();
6262

6363
void setHowlingEndFlag() { field_0xe1c = 2; }
6464
void setHowlingFlag() { field_0xe1c = 1; }
@@ -67,14 +67,17 @@ class daNpc_GWolf_c : public fopAc_ac_c {
6767
static u8 mEvtCutList[60];
6868

6969
private:
70-
// /* 0xB48 */ Z2Creature mCreature;
71-
// /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
72-
// /* 0xBDC */ daNpcF_Lookat_c mLookAt;
73-
// /* 0xC78 */ daNpcF_ActorMngr_c mActorMng[2];
74-
// /* 0xC88 */ u8 field_0xc88[4];
75-
// /* 0xC8C */ dCcD_Cyl mCyl;
76-
// /* 0xDC8 */ u8 field_0xdc8[0xE1C - 0xdc8];
77-
/* 0x568 */ u8 field_0xb48[0xE1C - 0x568];
70+
/* 0xB48 */ Z2Creature mSound;
71+
/* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
72+
/* 0xBDC */ daNpcF_Lookat_c mLookAt;
73+
/* 0xC78 */ daNpcF_ActorMngr_c mActorMng[2];
74+
/* 0xC88 */ u8 field_0xC88[0xC8C - 0xC88];
75+
/* 0xC8C */ dCcD_Cyl mCcCyl;
76+
/* 0xDC8 */ u8 field_0xDC8[0xE08 - 0xDC8];
77+
/* 0xE08 */ int field_0xe08;
78+
/* 0xE0C */ u8 field_0xE0C[0xE14 - 0xE0C];
79+
/* 0xE14 */ u32 field_0xe14;
80+
/* 0xE18 */ u8 field_0xe18[0xE1C - 0xE18];
7881
/* 0xE1C */ u8 field_0xe1c;
7982
};
8083

0 commit comments

Comments
 (0)