mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-14 04:23:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

clean up d_wood and d_tree data, match d_wood on JPN, match rest of d_tree .data section

Browse Source
This commit is contained in:
LagoLunatic
2024-10-31 18:43:53 -04:00
parent 64cc277d05
commit 2dfcdd84ab
5 changed files with 925 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_tree.h
+7 -4
View File
@@ -2,6 +2,7 @@
#define D_TREE_H
#include "SSystem/SComponent/c_xyz.h"
#include "d/d_particle.h"
#include "dolphin/mtx/mtx.h"
#include "JSystem/J3DGraphBase/J3DPacket.h"
@@ -9,12 +10,12 @@ class cCcD_Obj;
class dCcMassS_HitInf;
class fopAc_ac_c;
extern const u32 g_dTree_shadowMatDL_SIZE;
extern const u32 g_dTree_Oba_kage_32DL_SIZE;
extern u8 g_dTree_shadowPos[4][3];
extern u8 g_dTree_shadowTexCoord[4][2];
extern u8 g_dTree_shadowMatDL[];
extern u8 g_dTree_Oba_kage_32DL[];
extern u8 g_dTree_shadowPos[12];
extern u8 g_dTree_shadowTexCoord[8];
extern const u32 g_dTree_shadowMatDL_SIZE;
extern const u32 g_dTree_Oba_kage_32DL_SIZE;
class dTree_data_c {
public:
@@ -38,6 +39,8 @@ public:
/* 0x0A0 */ Mtx mShadowMtx;
/* 0x0D0 */ u8 field_0x0D0[0x100 - 0x0D0];
/* 0x100 */ dTree_data_c* mpNext;
static dPa_smokeEcallBack mSmokeEcallback;
};
class dTree_anm_c {
include/d/d_wood.h
+10 -12
View File
@@ -2,7 +2,6 @@
#define D_WOOD_H
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "JSystem/J3DGraphBase/J3DStruct.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/mtx/mtx.h"
#include "d/d_kankyo.h"
@@ -48,7 +47,6 @@ public:
/* 0x000 */ cXyz mPos;
/* 0x00C */ s16 mAnimCooldown; // In frames. Animations will not change unless this is 0.
/* 0x00E */ u8 field_0x00C[0x010 - 0x00E];
/* 0x010 */ State_e mFlags;
/* 0x014 */ AnmID_e mAnmIdx;
/* 0x018 */ Mtx mModelViewMtx;
@@ -56,11 +54,11 @@ public:
/* 0x078 */ Mtx mShadowModelMtx;
/* 0x0A8 */ Mtx mShadowModelViewMtx;
/* 0x0D8 */ Unit_c* mpNext;
/* 0x0DC */ dKy_tevstr_c mTevStr;
};
}; // Size: 0x18C
STATIC_ASSERT(sizeof(Unit_c) == 0x18C);
class Anm_c {
public:
enum Mode_e {
@@ -85,16 +83,16 @@ public:
// The mode_*() function is called to update the animation each frame, until finished
// Their are 8 pre-allocated "normal" animations. When not animating, each unit is assigned one of the 8.
void mode_cut_init(const Anm_c*, short);
void mode_cut_init(const Anm_c*, s16);
void mode_cut(Packet_c*);
void mode_push_into_init(const Anm_c*, short);
void mode_push_into_init(const Anm_c*, s16);
void mode_push_into(Packet_c*);
void mode_push_back_init();
void mode_push_back(Packet_c*);
void mode_fan(Packet_c*);
void mode_norm_init();
void mode_norm(Packet_c*);
void mode_norm_set_wind(float, short);
void mode_norm_set_wind(f32, s16);
void mode_to_norm_init(AnmID_e);
void mode_to_norm(Packet_c*);
@@ -109,11 +107,11 @@ public:
/* 0x60 */ Mode_e mMode;
/* 0x64 */ s16 mCountdown;
/* 0x66 */ s16 mForceDir; // The direction from the wind or actor who instigated this animation
/* 0x68 */ float mWindPow; // 0.0 - 1.0
/* 0x6c */ float mPosOffsetY;
/* 0x70 */ float mPosOffsetZ;
/* 0x74 */ float mVelY;
/* 0x66 */ s16 mForceDir; // The direction from the wind or actor who instigated this animation
/* 0x68 */ f32 mWindPow; // 0.0 - 1.0
/* 0x6c */ f32 mPosOffsetY;
/* 0x70 */ f32 mPosOffsetZ;
/* 0x74 */ f32 mVelY;
/* 0x78 */ s16 mPhaseY[2];
/* 0x7c */ s16 mPhaseX[2];