mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
Miscellaneous TU fixes (#2662)
This commit is contained in:
@@ -75,6 +75,7 @@ public:
|
||||
/* 80A28F74 */ int escape(int);
|
||||
/* 80A2908C */ int iyan_look(int);
|
||||
/* 80A29164 */ int turn_hana(int);
|
||||
void dummy();
|
||||
/* 80A291E8 */ int wait_dummy(int);
|
||||
/* 80A2926C */ int cheer(int);
|
||||
/* 80A29458 */ BOOL _turn_to_link(s16);
|
||||
|
||||
@@ -25,7 +25,6 @@ public:
|
||||
/* 80BEE0B8 */ cXyz getTargetPos() { return mPositions[4]; }
|
||||
|
||||
/* 80BECF30 */ void draw();
|
||||
/* 80BED9C4 */ virtual ~FlagCloth_c() {}
|
||||
|
||||
cXyz* getPos() { return mPositions; }
|
||||
cXyz* getNormal() { return mNormals; }
|
||||
@@ -76,7 +75,6 @@ public:
|
||||
/* 80BED44C */ void setCollision();
|
||||
/* 80BED480 */ int createHeap();
|
||||
/* 80BED6A0 */ int create();
|
||||
/* 80BED7A4 */ daObjFlag2_c();
|
||||
/* 80BEDCE0 */ int draw();
|
||||
/* 80BEDEE0 */ ~daObjFlag2_c();
|
||||
inline int execute();
|
||||
|
||||
@@ -16,13 +16,20 @@ class FlagCloth2_c : public J3DPacket {
|
||||
public:
|
||||
/* 80BEEDE4 */ void execute();
|
||||
/* 80BEEF74 */ inline void calcFlagNormal(cXyz*, int);
|
||||
static void initCcSphere(fopAc_ac_c*);
|
||||
/* 80BEF278 */ inline cXyz calcFlagFactor(cXyz*, cXyz*, cXyz*, int);
|
||||
/* 80BEF790 */ virtual ~FlagCloth2_c();
|
||||
/* 80BEFD08 */ void initFlagPos(cXyz*, fopAc_ac_c*);
|
||||
/* 80BF00A0 */ virtual void draw();
|
||||
/* 80BF0434 */ cXyz getTargetPos() { return mPositions[4]; }
|
||||
/* 80BF0434 */ cXyz getTargetPos() { return mPositions[4]; }
|
||||
|
||||
inline void calcFlagNormalBack();
|
||||
void calcFlagNormalBack() {
|
||||
cXyz* pNormal = getNormal();
|
||||
cXyz* pNormalBack = getNormalBack();
|
||||
for (int i = 0; i < 36; pNormal++, pNormalBack++, i++) {
|
||||
pNormalBack->set(-pNormal->x, -pNormal->y, -pNormal->z);
|
||||
}
|
||||
}
|
||||
cXyz* getPos() { return mPositions; }
|
||||
cXyz* getVec() { return mVecs; }
|
||||
cXyz* getNormal() { return mNormals; }
|
||||
@@ -43,14 +50,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void calcFlagFactorSub(cXyz* param_1, cXyz* param_2, cXyz* param_3, f32 param_4) {
|
||||
cXyz acStack_2c = *param_2 - *param_1;
|
||||
param_4 = acStack_2c.abs() - param_4;
|
||||
cXyz cStack_38 = acStack_2c.normZC();
|
||||
param_4 *= mSpringRate;
|
||||
cStack_38 *= param_4;
|
||||
*param_3 += cStack_38;
|
||||
}
|
||||
void calcFlagFactorSub(cXyz* param_1, cXyz* param_2, cXyz* param_3, f32 param_4);
|
||||
|
||||
/* 0x010 */ GXTexObj mTexObj;
|
||||
/* 0x030 */ dKy_tevstr_c mTevStr;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
struct ito_s {
|
||||
/* 0x000 */ mDoExt_3DlineMat0_c mLineMat;
|
||||
/* 0x01C */ f32 field_0x1c[120];
|
||||
/* 0x01C */ f32 field_0x1c[6][20];
|
||||
/* 0x1FC */ cXyz field_0x1fc[6];
|
||||
/* 0x244 */ s16 field_0x244[6];
|
||||
/* 0x250 */ f32 field_0x250;
|
||||
|
||||
@@ -22,13 +22,11 @@ int PrmAbstract(const fopAc_ac_c* i_actor, T i_prmA, T i_prmB) {
|
||||
return ((1 << i_prmA) - 1) & (param >> i_prmB);
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
class HioVarious_c {
|
||||
public:
|
||||
static void init(JORReflexible*, const char*);
|
||||
static void clean(JORReflexible*);
|
||||
};
|
||||
#endif
|
||||
|
||||
}; // namespace daObj
|
||||
|
||||
|
||||
Reference in New Issue
Block a user