d_a_crod almost fully OK (#270)

This commit is contained in:
TakaRikka
2023-02-05 08:09:29 -07:00
committed by GitHub
parent 1124554ae1
commit 24b833b205
61 changed files with 1386 additions and 4080 deletions
+15 -1
View File
@@ -1234,7 +1234,7 @@ public:
}; // Size: 0x10
/* 8009D87C */ bool getE3Zhint();
/* 8009D884 */ char* getAlinkArcName();
/* 8009D884 */ static char* getAlinkArcName();
/* 8009DA60 */ static bool checkStageName(char const*);
/* 8009DA98 */ void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*);
/* 8009DB64 */ void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*);
@@ -3228,6 +3228,18 @@ public:
return var_r4;
}
MtxP getCopyRodMtx() {
if (mHeldItemModel != NULL) {
return mHeldItemModel->i_getAnmMtx(0);
}
return NULL;
}
cXyz* getRootPosP() { return &field_0x3834; }
const cXyz& getBoomerangCatchPos() const { return field_0x3534; }
f32 getCopyRodBallDisFlyMax() const { return mSearchBallScale; }
void clearIronBallActor() { field_0x173c.SetActor(this); }
BOOL checkCanoeRideOwn(const fopAc_ac_c* param_0) const { return checkCanoeRide() && mRideAcKeep.getActorConst() == param_0; }
bool checkWolfDashMode() const { return i_checkNoResetFlg1(FLG1_DASH_MODE); }
@@ -3243,6 +3255,8 @@ public:
bool checkGrabGlide() { return checkGrabRooster(); }
bool checkCopyRodRevive() const { return mProcID == PROC_COPY_ROD_REVIVE; }
BOOL i_checkRideOn() const { return mRideStatus != 0; }
bool checkSwimDashMode() const { return i_checkNoResetFlg1(FLG1_DASH_MODE); }
+9 -3
View File
@@ -98,7 +98,10 @@ private:
class daPy_actorKeep_c {
public:
daPy_actorKeep_c();
daPy_actorKeep_c() {
clearData();
}
void setActor();
void setData(fopAc_ac_c*);
void clearData();
@@ -192,8 +195,8 @@ public:
/* 0x0590 */ u32 mEndResetFlg2;
/* 0x0594 */ f32 field_0x594;
/* 0x0598 */ f32 field_0x598;
/* 0x059C */ s16 mLookAngleY;
/* 0x059E */ s16 field_0x59e;
/* 0x059C */ s16 mBodyAngleX;
/* 0x059E */ s16 mBodyAngleY;
/* 0x05A0 */ u8 field_0x5a0[0x4];
/* 0x05A4 */ cXyz mHeadTopPos;
/* 0x05B0 */ cXyz mItemPos;
@@ -708,6 +711,9 @@ public:
}
}
s16 getBodyAngleX() const { return mBodyAngleX; }
s16 getBodyAngleY() const { return mBodyAngleY; }
// some functions use these function as an inline
// is there a better way to handle this?
int i_checkNoResetFlg0(daPy_FLG0 pFlag) const { return mNoResetFlg0 & pFlag; }
+1
View File
@@ -559,5 +559,6 @@ void dKy_GxFog_tevstr_set(dKy_tevstr_c*);
void dKy_plight_set(LIGHT_INFLUENCE* param_0);
void dKy_tevstr_init(dKy_tevstr_c* param_0, s8 param_1, u8 param_2);
SND_INFLUENCE* dKy_Sound_get();
void dKy_plight_cut(LIGHT_INFLUENCE* param_0);
#endif /* D_KANKYO_D_KANKYO_H */