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

Clean up HIO reg accesses

Browse Source
This commit is contained in:
LagoLunatic
2025-07-17 21:41:40 -04:00
parent ce8a70bfb0
commit 67259edeeb
28 changed files with 64 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_fganon.h
+1 -1
View File
@@ -123,7 +123,7 @@ public:
virtual ~daFganon_HIO_c() {}
public:
/* 0x00 */ // vtable
/* 0x00 */ // vtable
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 m05;
/* 0x06 */ u8 m06;
include/d/actor/d_a_npc_km1.h
+4 -4
View File
@@ -89,7 +89,7 @@ public:
/* 0x6D8 */ J3DAnmTexPattern* m_head_tex_pattern;
/* 0x6DC */ mDoExt_btpAnm mBtpAnm;
/* 0x6F0 */ u8 mBtpFrame;
/* 0x6F1 */ u8 field_0x6F1;
/* 0x6F1 */ u8 field_0x6F1;
/* 0x6F2 */ s16 field_0x6F2;
/* 0x6F4 */ ActionFunc field_0x6F4;
/* 0x700 */ dNpc_EventCut_c mEventCut;
@@ -104,14 +104,14 @@ public:
/* 0x7AC */ f32 field_0x7AC;
/* 0x7B0 */ s16 field_0x7B0;
/* 0x7B2 */ s16 field_0x7B2;
/* 0x7B4 */ s8 field_0x7B4;
/* 0x7B4 */ s8 field_0x7B4;
/* 0x7B5 */ s8 field_0x7B5;
/* 0x7B6 */ u8 field_0x7B6;
/* 0x7B7 */ u8 field_0x7B7;
/* 0x7B8 */ u8 field_0x7B8;
/* 0x7B9 */ u8 field_0x7B9[0x7BC - 0x7B9];
/* 0x7BC */ s32 field_0x7BC;
/* 0x7C0 */ s32 field_0x7C0;
/* 0x7BC */ s32 field_0x7BC;
/* 0x7C0 */ s32 field_0x7C0;
/* 0x7C4 */ u8 field_0x7C4;
/* 0x7C5 */ u8 field_0x7C5;
/* 0x7C6 */ bool mHeadOnlyFollow;
include/d/actor/d_a_obj_hha.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
void exe_normal(daObjHha_c*);
void exe_move(daObjHha_c*);
void draw_normal(daObjHha_c*);
public:
public:
/* 0x00 */ J3DModel* mpModel;
/* 0x04 */ dBgW* mpBgw;
/* 0x08 */ cXyz mPos; // Position offset from current.pos
include/d/actor/d_a_obj_shmrgrd.h
+1 -1
View File
@@ -28,7 +28,7 @@ public:
return false;
} else {
return fopAcM_isSwitch(const_cast<daObjShmrgrd_c*>(this), prm_get_swSave());
}
}
}
void on_switch() const {
if (prm_get_swSave() != 0xFF) {
include/d/actor/d_a_obj_smplbg.h
+2 -2
View File
@@ -17,7 +17,7 @@ namespace daObjSmplbg {
struct Attr_c {
/* 0x00 */ u32 mHeapSize;
/* 0x04 */ const char* mResName;
/* 0x08 */ s16 mBDLFileIndex;
/* 0x08 */ s16 mBDLFileIndex;
/* 0x0A */ s16 mDZBFileIndex;
/* 0x0C */ MoveBGActor_SetFunc mMoveBGProc;
/* 0x10 */ u32 mFlags;
@@ -26,7 +26,7 @@ namespace daObjSmplbg {
/* 0x18 */ s16 mCullMinZ;
/* 0x1A */ s16 mCullMaxX;
/* 0x1C */ s16 mCullMaxY;
/* 0x1E */ s16 mCullMaxZ;
/* 0x1E */ s16 mCullMaxZ;
/* 0x20 */ f32 mEyeOffset;
};
include/d/actor/d_a_obj_table.h
+1 -1
View File
@@ -8,7 +8,7 @@
namespace daObjTable {
class Act_c : public dBgS_MoveBgActor {
public:
public:
virtual BOOL CreateHeap();
virtual BOOL Create();
cPhs_State Mthd_Create();
include/d/actor/d_a_player_HIO.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
/* 0x68 */ f32 field_0x68;
/* 0x6C */ f32 field_0x6C;
/* 0x70 */ f32 field_0x70;
/* 0x74 */ f32 field_0x74;
/* 0x74 */ f32 field_0x74;
/* 0x78 */ f32 field_0x78;
/* 0x7C */ f32 field_0x7C;
/* 0x80 */ f32 field_0x80;
include/d/actor/d_a_shand.h
+4 -4
View File
@@ -26,9 +26,9 @@ public:
/* 0x2C8 */ cXyz field_2C8;
/* 0x2D4 */ cXyz field_2D4;
/* 0x2E0 */ u8 unused_2E0[0x2F0 - 0x2E0];
/* 0x2F0 */ float field_2F0;
/* 0x2F4 */ float field_2F4;
/* 0x2F8 */ float field_2F8;
/* 0x2F0 */ float field_2F0;
/* 0x2F4 */ float field_2F4;
/* 0x2F8 */ float field_2F8;
/* 0x2FC */ float field_2FC;
/* 0x300 */ float field_300;
/* 0x304 */ float field_304;
@@ -37,7 +37,7 @@ public:
/* 0x310 */ cXyz* field_310;
/* 0x314 */ u8* field_314;
/* 0x318 */ short field_318;
/* 0x31C */ shand_s field_31C[20];
/* 0x31C */ shand_s field_31C[20];
/* 0x54C */ mDoExt_3DlineMat1_c mLineMat;
/* 0x588 */ dCcD_Stts mStts;
/* 0x5C4 */ dCcD_Sph mSph;
include/d/actor/d_a_tag_attention.h
+2 -2
View File
@@ -52,12 +52,12 @@ namespace daTagAttention {
return true;
}
int prm_get_Type() const
int prm_get_Type() const
{
return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S);
}
int prm_get_swSave() const
int prm_get_swSave() const
{
return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S);
}
include/d/actor/d_a_tornado.h
+15 -15
View File
@@ -14,23 +14,23 @@ class daTornado_HIO_c0 {
class daTornado_c : public fopAc_ac_c {
public:
float getJointXPos(int jno) const {
if (mpModel)
return mpModel->getAnmMtx(jno)[0][3];
else
return current.pos.x;
float getJointXPos(int jno) const {
if (mpModel)
return mpModel->getAnmMtx(jno)[0][3];
else
return current.pos.x;
}
float getJointYPos(int jno) const {
if (mpModel)
return mpModel->getAnmMtx(jno)[1][3];
else
return current.pos.y;
float getJointYPos(int jno) const {
if (mpModel)
return mpModel->getAnmMtx(jno)[1][3];
else
return current.pos.y;
}
float getJointZPos(int jno) const {
if (mpModel)
return mpModel->getAnmMtx(jno)[2][3];
else
return current.pos.z;
float getJointZPos(int jno) const {
if (mpModel)
return mpModel->getAnmMtx(jno)[2][3];
else
return current.pos.z;
}
void getScaleEnd() {}
void getSmallScaleEnd() {}
include/d/d_camera.h
+1 -1
View File
@@ -165,7 +165,7 @@ public:
/* 0x1C */ cSAngle mBank;
/* 0x1E */ s16 m1E;
} m00;
}
}
/* 0x0A4 */ m0A4[2];
/* 0x0E4 */ int mStageMapToolCameraIdx;
/* 0x0E8 */ int m0E8;
include/d/d_com_inf_game.h
+3 -3
View File
@@ -523,9 +523,9 @@ public:
u8 getPictureStatus() { return mPictureStatus; }
void setPictureStatusOn() { mPictureStatus = 2; }
void setPictureStatusGetOn(u8 to_set) {
mPictureStatus = 3;
field_0x495f = to_set;
void setPictureStatusGetOn(u8 to_set) {
mPictureStatus = 3;
field_0x495f = to_set;
}
u8 getScopeMesgStatus() { return mScopeMesgStatus; }
include/d/d_grass.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*);
void hitCheck(int);
public:
public:
/* 0x00 */ u8 mState;
/* 0x01 */ u8 mInitFlags;
/* 0x02 */ s8 mAnimIdx;
include/d/d_particle.h
+3 -3
View File
@@ -129,7 +129,7 @@ public:
void setSpeed (f32 vel) { mVelFade1 = vel; }
void setPitch (f32 pitch) { mVelFade2 = pitch; }
void setMaxSpeed (f32 vel) { mMaxParticleVelocity = vel; }
void setMaxDisSpeed (f32 vel) { mVelSpeed = vel; }
void setMaxDisSpeed (f32 vel) { mVelSpeed = vel; }
void setAnchor (cXyz* anchorPos1, cXyz* anchorPos2) { mCollapsePos[0].set(*anchorPos1); mCollapsePos[1].set(*anchorPos2); }
virtual ~dPa_waveEcallBack() {}
@@ -489,8 +489,8 @@ public:
void draw2DmenuFore(JPADrawInfo* inf) { draw(inf, dPtclGroup_2DmenuFore_e); }
void draw2DmenuBack(JPADrawInfo* inf) { draw(inf, dPtclGroup_2DmenuBack_e); }
u32 getParticleNum() { return mEmitterMng->getParticleNumber(); }
u32 getEmitterNum() { return mEmitterMng->getEmitterNumber(); }
u32 getParticleNum() { return mEmitterMng->getParticleNumber(); }
u32 getEmitterNum() { return mEmitterMng->getEmitterNumber(); }
int addModelEmitter(dPa_modelEmitter_c *emitter) { return mModelControl->add(emitter); }
void drawModelParticle() { mModelControl->draw(); }