mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few actor headers

Browse Source
This commit is contained in:
LagoLunatic
2023-12-02 23:32:38 -05:00
parent 48fa3cf3de
commit 556e4a1b32
6 changed files with 168 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_kytag04.h
+9 -9
View File
@@ -5,14 +5,14 @@
class kytag04_class : public fopAc_ac_c {
public:
/* 0x00 */ u8 mState;
/* 0x01 */ u8 mOffColPat;
/* 0x02 */ u8 mOnColPat;
/* 0x03 */ u8 mSwitchId;
/* 0x04 */ int mTimer;
/* 0x08 */ int mTimerThreshold;
/* 0x0C */ f32 mScaleX;
/* 0x10 */ f32 mScaleY;
}; /* size = 0x2A0 */
/* 0x290 */ u8 mState;
/* 0x291 */ u8 mOffColPat;
/* 0x292 */ u8 mOnColPat;
/* 0x293 */ u8 mSwitchId;
/* 0x294 */ int mTimer;
/* 0x298 */ int mTimerThreshold;
/* 0x29C */ f32 mScaleX;
/* 0x2A0 */ f32 mScaleY;
};
#endif /* D_A_KYTAG04_H */
include/d/actor/d_a_npc_hr.h
+147 -1
View File
@@ -2,8 +2,10 @@
#define D_A_NPC_HR_H
#include "f_op/f_op_actor.h"
#include "d/d_cc_d.h"
#include "d/d_particle.h"
class daNpc_Wind_Eff : public fopAc_ac_c {
class daNpc_Wind_Eff {
public:
void init();
void remove();
@@ -24,4 +26,148 @@ public:
/* 0x35 */ u8 m35[0x38 - 0x35];
};
class daNpc_Wind_Clothes {
public:
void setSquallPos(int);
void create(fopAc_ac_c*, unsigned char, float*, int);
void end();
void proc();
void init();
void remove();
public:
/* 0x000 */ daNpc_Wind_Eff mEff[4];
/* 0x0E0 */ s16 mSquallCounter[4];
/* 0x0E8 */ cXyz mSquallPos[4];
/* 0x118 */ u8 m118;
/* 0x119 */ u8 m119[0x11C - 0x119];
/* 0x11C */ u32 mActorProcID;
/* 0x120 */ f32 m120;
/* 0x124 */ f32 m124;
/* 0x128 */ f32 m128;
/* 0x12C */ f32 m12C;
/* 0x130 */ f32 m130;
};
class daNpc_Hr_c : public fopAc_ac_c {
public:
void ChkOrder(unsigned char) {}
void ClrOrder() {}
void SetOrder(unsigned char) {}
void chkEvFlag(unsigned short) {}
void chkFlag(unsigned short) {}
void clrEvFlag(unsigned short) {}
void clrFlag(unsigned short) {}
void getBackboneJntNum() {}
void getBackbone_y() {}
void getHeadJntNum() {}
void getHead_x() {}
void getHead_y() {}
void incAttnSetCount() {}
void setAction(int (daNpc_Hr_c::*)(void*), void*) {}
void setAttentionBasePos(cXyz) {}
void setEvFlag(unsigned short) {}
void setEyePos(cXyz) {}
void setFlag(unsigned short) {}
void getShapeType();
void getSwbit();
void XyCheckCB(int);
void onHide(int);
void offHide(int);
void defaultSetPos(cXyz*);
void getNowEventAction();
void demoInitWind();
void demoProcWind(int);
void demoInitWait();
void demoProcWait();
void demoInitSpeak();
void demoProcSpeak();
void demoProcPatten();
void demoProcTact0();
void demoProcTact1();
void demoProcTact2();
void demoProcTact3();
void calcKaijou(int);
void demoInitMove();
void demoInitSmall();
void demoProcSmall();
void demoProcMove();
void demoInitChange();
void demoInitCom();
void demoProcCom();
void demoProc();
void node_Ht_ant(int);
void initTexPatternAnm(bool);
void playTexPatternAnm();
void setTexPtn(signed char);
void setAnm(signed char);
void setAnmStatus();
void eventOrder();
void checkOrder();
void next_msgStatus(unsigned long*);
void getMsg();
void setCollision();
void nextAnm(signed char, int);
void msgAnm(unsigned char);
void talkInit();
void talk();
void init();
void setAttention(bool);
void getNowJointY();
void getTornadoPos(int, cXyz*);
void rideTornado();
void getLookBackMode();
void lookBack();
void rt_search();
void rt_hide();
void rt_intro();
void to_rt_hit();
void to_rt_tact();
void rt_angry();
void rt_win();
void rt_hit0();
void rt_hit1();
void ht_hide();
void wait01();
void wait02();
void endTalk();
void endTact();
void setEmitFlash(float);
void smokeProc();
void talk01();
void ht_tact01();
void wait_action(void*);
BOOL _draw();
BOOL _execute();
BOOL _delete();
s32 _create();
void CreateHeap();
public:
/* 0x290 */ u8 m290[0x294 - 0x290];
/* 0x294 */ cXyz mPos;
/* 0x2A0 */ u8 m2A0[0x2A8 - 0x2A0];
/* 0x2A8 */ request_of_phase_process_class mResHrPhs;
/* 0x2B0 */ u8 m2B0[0x314 - 0x2B0];
/* 0x314 */ cCcD_Obj mObj0;
/* 0x364 */ u8 m364[0x42C - 0x364];
/* 0x42C */ cM3dGCyl m42C;
/* 0x444 */ u8 m444[0x598 - 0x444];
/* 0x598 */ cM3dGCyl m598;
/* 0x5B0 */ u8 m5B0[0x608 - 0x5B0];
/* 0x608 */ u16 m608;
/* 0x60A */ u8 m60A[0x60C - 0x60A];
/* 0x60C */ u8 m60C;
/* 0x60D */ u8 m60D[0x610 - 0x60D];
/* 0x610 */ dPa_followEcallBack mSmokeCallBack;
/* 0x624 */ u8 m624[0x638 - 0x624];
/* 0x638 */ u8 m638;
/* 0x639 */ u8 m639[0x63A - 0x639];
/* 0x63A */ u8 mType;
/* 0x63B */ u8 m63B[0x694 - 0x63B];
/* 0x694 */ daNpc_Wind_Clothes mClothes;
/* 0x7C8 */ u8 m7C8[0x828 - 0x7C8];
};
#endif /* D_A_NPC_HR_H */
include/d/actor/d_a_obj_ekskz.h
+4 -5
View File
@@ -8,22 +8,21 @@
#include "m_Do/m_Do_ext.h"
namespace daObjEkskz {
class Act_c : public fopAc_ac_c {
class Act_c : public dBgS_MoveBgActor {
public:
void prm_get_swSave() const {}
void CreateHeap();
s32 Create();
int CreateHeap();
int Create();
void Mthd_Create();
BOOL Delete();
void Mthd_Delete();
void set_mtx();
void init_mtx();
void Execute(float(**)[3][4]);
int Execute(float(**)[3][4]);
BOOL Draw();
public:
/* 0x000 */ dBgS_MoveBgActor parent;
/* 0x2C8 */ u8 m2C8[0x2D0 - 0x2C8];
/* 0x2D0 */ J3DModel* mpModel;
/* 0x2D4 */ dCcD_Stts mStts;
include/d/actor/d_a_obj_table.h
+4 -5
View File
@@ -6,22 +6,21 @@
#include "SSystem/SComponent/c_phase.h"
namespace daObjTable {
class Act_c : public fopAc_ac_c {
class Act_c : public dBgS_MoveBgActor {
public:
void prm_get_mdl() const {}
void CreateHeap();
s32 Create();
int CreateHeap();
int Create();
void Mthd_Create();
BOOL Delete();
void Mthd_Delete();
void set_mtx();
void init_mtx();
void Execute(float(**)[3][4]);
int Execute(float(**)[3][4]);
BOOL Draw();
public:
/* 0x000 */ dBgS_MoveBgActor parent;
/* 0x2C8 */ request_of_phase_process_class mPhs;
/* 0x2D0 */ J3DModel* mpModel;
};
include/d/actor/d_a_obj_vfan.h
+4 -5
View File
@@ -7,23 +7,22 @@
#include "SSystem/SComponent/c_phase.h"
namespace daObjVfan {
class Act_c : public fopAc_ac_c {
class Act_c : public dBgS_MoveBgActor {
public:
void prm_get_swSave() const {}
void CreateHeap();
s32 Create();
int CreateHeap();
int Create();
void Mthd_Create();
BOOL Delete();
void Mthd_Delete();
void set_mtx();
void init_mtx();
void ParticleSet();
void Execute(float(**)[3][4]);
int Execute(float(**)[3][4]);
BOOL Draw();
public:
/* 0x000 */ dBgS_MoveBgActor parent;
/* 0x2C8 */ request_of_phase_process_class mPhs;
/* 0x2D0 */ J3DModel* mpModel;
/* 0x2D4 */ dCcD_Stts mStts;
src/d/actor/d_a_npc_hr.cpp
-10
View File
@@ -485,13 +485,3 @@ static BOOL daNpc_Hr_Draw(daNpc_Hr_c*) {
static BOOL daNpc_Hr_IsDelete(daNpc_Hr_c*) {
/* Nonmatching */
}
/* 00005F84-00005FA0 .text setEyePos__10daNpc_Hr_cF4cXyz */
void daNpc_Hr_c::setEyePos(cXyz) {
/* Nonmatching */
}
/* 00005FA0-00005FBC .text setAttentionBasePos__10daNpc_Hr_cF4cXyz */
void daNpc_Hr_c::setAttentionBasePos(cXyz) {
/* Nonmatching */
}