mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 22:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

pr fixes

Browse Source
This commit is contained in:
Pheenoh
2023-02-04 17:45:01 -07:00
parent 9eb63d9f68
commit cede55ba30
4 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DModel.h
+1 -14
View File
@@ -24,19 +24,6 @@ struct J3DUnkCalc2 {
virtual void calc(J3DModelData* mpModelData);
};
struct UserArea {
u8 field_0x00[0x60e];
s16 field_0x60e;
s16 field_0x610;
s16 field_0x612;
u8 field_0x614[0x14];
s16 field_0x628;
s16 field_0x62a;
u8 field_0x62c[0x12];
s16 field_0x63e;
s16 field_0x640;
};
typedef void (*J3DCalcCallBack)(J3DModel*, u32 timing);
class J3DModel {
@@ -97,7 +84,7 @@ public:
// is there a better way to handle inlines with same name as non-inlines?
MtxP i_getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); }
void i_setAnmMtx(int p1, Mtx mtx) { return mMtxBuffer->setAnmMtx(p1, mtx); }
void i_setAnmMtx(int p1, Mtx mtx) { mMtxBuffer->setAnmMtx(p1, mtx); }
/* 0x04 */ J3DModelData* mModelData;
/* 0x08 */ u32 mFlags;
include/rel/d/a/d_a_do/d_a_do.h
+3 -7
View File
@@ -69,11 +69,7 @@ struct daDo_HIO_tmp {
/* 0x1E */ u16 mWaterHuntAnimType;
};
struct some_class {
};
class daDo_HIO_c : public some_class {
class daDo_HIO_c {
public:
/* 80667D4C */ daDo_HIO_c();
/* 8066ED40 */ virtual ~daDo_HIO_c();
@@ -131,10 +127,10 @@ public:
/* 0x617 */ u8 field_0x617;
/* 0x618 */ cXyz mUnkPos; // something to do with the dog's eye position
/* 0x624 */ s16 field_0x624;
/* 0x63C */ s16 field_0x63c;
/* 0x626 */ csXyz field_0x626;
/* 0x62C */ u8 field_0x62c[18];
/* 0x63E */ csXyz field_0x63e;
/* 0x644 */ f32 field_0x644;
/* 0x000 */ u8 field_0x000[20]; // some alignment issue here
/* 0x648 */ f32 field_0x648;
/* 0x64C */ f32 field_0x64c;
/* 0x650 */ f32 field_0x650;