mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-29 23:38:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_ji1 a bit closer

Browse Source
This commit is contained in:
LagoLunatic
2025-06-20 16:36:56 -04:00
parent 61dc0f6d28
commit 32e5848095
6 changed files with 159 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_fallrock.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
void setParticle(int, cXyz*);
static char m_arcname[];
static f32 m_fallen;
static f32 m_falllen;
static s16 m_rot_speed;
static const dCcD_SrcCyl m_cyl_src;
include/d/actor/d_a_npc_ji1.h
+7 -3
View File
@@ -48,8 +48,8 @@ public:
BOOL isItemWaitAnim();
BOOL isClearRecord(short);
void setClearRecord(short);
BOOL normalSubActionHarpoonGuard(short);
BOOL normalSubActionGuard(short);
void normalSubActionHarpoonGuard(short);
void normalSubActionGuard(short);
BOOL normalAction(void*);
BOOL kaitenExpAction(void*);
BOOL kaitenspeakAction(void*);
@@ -160,6 +160,10 @@ public:
/* 0x2D4 */ SubAction_t mSubAction;
/* 0x2E0 */ dPa_smokeEcallBack field_0x2E0;
/* 0x300 */ dPa_smokeEcallBack field_0x300;
#if VERSION == VERSION_DEMO
/* 0x320 */ JPABaseEmitter* field_0x320_demo;
/* 0x324 */ JPABaseEmitter* field_0x324_demo;
#endif
/* 0x320 */ cXyz field_0x320;
/* 0x32C */ s16 field_0x32C;
/* 0x330 */ mDoExt_McaMorf* mpOrcaMorf;
@@ -282,7 +286,7 @@ public:
void genMessage(JORMContext* ctx);
public:
/* 0x004 */ s8 field_0x04;
/* 0x004 */ s8 mNo;
/* 0x008 */ f32 field_0x08;
/* 0x00C */ s16 field_0x0C;
/* 0x00E */ s16 field_0x0E;
include/m_Do/m_Do_ext.h
+1 -1
View File
@@ -347,7 +347,7 @@ public:
void stopZelAnime();
J3DModel* getModel() { return mpModel; }
u8 getPlayMode() { return mFrameCtrl.getAttribute(); }
int getPlayMode() { return mFrameCtrl.getAttribute(); }
void setPlayMode(int mode) { mFrameCtrl.setAttribute(mode); }
f32 getStartFrame() { return mFrameCtrl.getStart(); }
void setStartFrame(f32 frame) { mFrameCtrl.setStart(frame); }