mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-04 02:47:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
TakaRikka
2021-11-10 23:54:31 -08:00
parent 74ed2da8bc
commit 70eabb12bd
47 changed files with 3777 additions and 3726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+2
View File
@@ -299,6 +299,8 @@ public:
virtual ~J3DFrameCtrl() {}
f32 getRate() const { return mRate; }
f32 getFrame() const { return mFrame; }
u8 getAttribute() const { return mAttribute; }
void setAttribute(u8 attr) { mAttribute = attr; }
void setEnd(s16 end) { mEnd = end; }
void setRate(f32 rate) { mRate = rate; }
include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
+2
View File
@@ -124,6 +124,8 @@ public:
/* 800A4820 */ virtual ~J3DMaterialAnm();
/* 8032C3C4 */ virtual void calc(J3DMaterial*) const;
const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; }
private:
/* 0x04 */ J3DMatColorAnm mMatColorAnm[2];
/* 0x14 */ J3DTexMtxAnm mTexMtxAnm[8];
include/JSystem/J3DGraphAnimator/J3DModel.h
+2 -1
View File
@@ -34,7 +34,7 @@ public:
/* 803281B4 */ void calcBumpMtx();
/* 803282B8 */ void calcBBoardMtx();
/* 803282EC */ void prepareShapePackets();
Mtx* getAnmMtx(int);
MtxP getAnmMtx(int);
/* 80327CA4 */ virtual void update();
/* 80327E4C */ virtual void entry();
@@ -48,6 +48,7 @@ public:
void onFlag(u32 flag) { mFlags |= flag; }
void offFlag(u32 flag) { mFlags &= ~flag; }
bool checkFlag(u32 flag) const { return (mFlags & flag) ? true : false; }
Mtx& getBaseTRMtx() { return mBaseTransformMtx; }
// is there a better way to handle inlines with same name as non-inlines?
MtxP i_getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); }
include/JSystem/J3DGraphBase/J3DMaterial.h
+1
View File
@@ -49,6 +49,7 @@ public:
J3DColorBlock* getColorBlock() const { return mColorBlock; }
J3DTexGenBlock* getTexGenBlock() const { return mTexGenBlock; }
J3DDisplayListObj* getSharedDisplayListObj() const { return mSharedDLObj; }
J3DShape* getShape() { return mShape; }
J3DMaterialAnm* getMaterialAnm() const {
if ((u32)mMaterialAnm < 0xC0000000) {
return mMaterialAnm;
include/JSystem/J3DGraphBase/J3DShape.h
+2
View File
@@ -48,6 +48,8 @@ public:
void setVertexDataPointer(J3DVertexData* pVtxData) { mVertexData = pVtxData; }
void* getVcdVatCmd() const { return mVcdVatCmd; }
void setVcdVatCmd(void* pVatCmd) { mVcdVatCmd = pVatCmd; }
void show() { offFlag(1); }
void hide() { onFlag(1); }
static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }
include/JSystem/JMath/JMath.h
+8
View File
@@ -10,6 +10,14 @@ inline f32 JMAFastReciprocal(f32 value) {
return __fres(value);
}
inline f32 JMAFastSqrt(f32 input) {
if (input > 0.0f) {
f64 tmp = __frsqrte(input);
return tmp * input;
}
return input;
}
namespace JMath {
inline f32 fastReciprocal(f32 value) {
include/SSystem/SComponent/c_cc_d.h
+12 -2
View File
@@ -273,6 +273,7 @@ public:
u8 GetWeightUc() const { return mWeight; }
void SetWeight(u8 weight) { mWeight = weight; }
fopAc_ac_c* GetAc() { return mActor; }
void SetActor(void* ac) { mActor = (fopAc_ac_c*)ac; }
}; // Size = 0x1C
STATIC_ASSERT(0x1C == sizeof(cCcD_Stts));
@@ -281,8 +282,8 @@ class cCcD_Obj; // placeholder
class cCcD_ObjCommonBase {
protected:
/* 0x00 */ int mSPrm;
/* 0x04 */ int mRPrm;
/* 0x00 */ u32 mSPrm;
/* 0x04 */ u32 mRPrm;
/* 0x08 */ cCcD_Obj* mHitObj;
/* 0x0C vtable */
public:
@@ -295,6 +296,8 @@ public:
s32 getRPrm() const { return mRPrm; }
cCcD_Obj* getHitObj() { return mHitObj; }
u32 MskSPrm(u32 mask) const { return mSPrm & mask; }
void OnSPrmBit(u32 flag) { mSPrm |= flag; }
void OffSPrmBit(u32 flag) { mSPrm &= ~flag; }
};
STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase));
@@ -311,6 +314,8 @@ public:
bool ChkSet() const { return MskSPrm(1); }
u8 GetAtp() const { return mAtp; }
u32 MskType(u32 msk) const { return mType & msk; }
void SetType(u32 type) { mType = type; }
void SetAtp(int atp) { mAtp = atp; }
protected:
/* 0x10 */ int mType;
@@ -388,6 +393,11 @@ public:
bool ChkAtType(u32 type) const { return mObjAt.MskType(type); }
u32 ChkCoNoCrr() const { return mObjCo.ChkNoCrr(); }
u32 ChkCoSph3DCrr() const { return mObjCo.ChkSph3DCrr(); }
void OnAtSPrmBit(u32 flag) { mObjAt.OnSPrmBit(flag); }
void OffAtSPrmBit(u32 flag) { mObjAt.OffSPrmBit(flag); }
void SetAtType(u32 type) { mObjAt.SetType(type); }
void OnAtSetBit() { mObjAt.OnSPrmBit(1); }
void SetAtAtp(int atp) { mObjAt.SetAtp(atp); }
}; // Size = 0x40
include/SSystem/SComponent/c_lib.h
+12
View File
@@ -42,6 +42,18 @@ inline u8 cLib_checkBit(u8& pVar, u8 pBit) {
return pVar & pBit;
}
template<typename T>
inline T cLib_minMaxLimit(T param_0, T min, T max) {
if (param_0 < min) {
return max;
}
min = param_0;
if (min > max) {
min = max;
}
return min;
}
void MtxInit(void);
void MtxTrans(float, float, float, unsigned char);
void MtxScale(float, float, float, unsigned char);
include/SSystem/SComponent/c_xyz.h
+5
View File
@@ -2,6 +2,7 @@
#define C_XYZ_H
#include "dolphin/mtx/vec.h"
#include "msl_c/math.h"
#include "global.h"
struct cXyz : Vec {
@@ -116,6 +117,10 @@ struct cXyz : Vec {
cXyz tmp2(other.x, 0, other.z);
return tmp.abs2(tmp2);
}
f32 absXZ(const Vec& other) const {
f32 abs = abs2XZ(other);
return sqrtf(abs);
}
f32 getMagXZ() const { return cXyz(this->x, 0, this->z).getSquareMag(); }
};
include/d/a/d_a_alink.h
+909 -415
View File
File diff suppressed because it is too large Load Diff
include/d/a/d_a_player.h
+248 -165
View File
@@ -27,11 +27,18 @@ private:
/* 0x48 */ ResTIMG* field_0x48;
};
struct daPy_boomerangMove_c {
class daPy_boomerangMove_c {
public:
/* 8015E5B0 */ void initOffset(cXyz const*);
/* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16);
/* 8015E87C */ void bgCheckAfterOffset(cXyz const*);
};
private:
/* 0x0 */ u8 field_0x0;
/* 0x2 */ u16 field_0x2;
/* 0x4 */ f32 field_0x4;
/* 0x8 */ f32 field_0x8;
}; // Size: 0xC
class daPy_anmHeap_c {
public:
@@ -66,14 +73,15 @@ private:
class daPy_actorKeep_c {
public:
daPy_actorKeep_c(void);
void setActor(void);
daPy_actorKeep_c();
void setActor();
void setData(fopAc_ac_c*);
void clearData(void);
void clearData();
u32 getID(void) const { return mID; }
u32 getID() const { return mID; }
void setID(u32 id) { mID = id; }
fopAc_ac_c* getActor(void) const { return mActor; }
fopAc_ac_c* getActor() const { return mActor; }
fopAc_ac_c* getActorConst() const { return mActor; }
private:
u32 mID;
@@ -84,8 +92,8 @@ class daPy_frameCtrl_c : public J3DFrameCtrl {
public:
/* 80140D24 */ ~daPy_frameCtrl_c();
/* 80140D80 */ daPy_frameCtrl_c();
bool checkAnmEnd(void);
void updateFrame(void);
bool checkAnmEnd();
void updateFrame();
void setFrameCtrl(u8, short, short, float, float);
u16 getEndFlg() { return mEndFlg; }
@@ -103,12 +111,17 @@ private:
/* 0x16 */ u16 mNowSetFlg;
};
class Z2WolfHowlMgr;
class daBoomerang_c;
class daPy_demo_c {
public:
void setSpecialDemoType();
void setDemoType(u16 pType) { mDemoType = pType; }
u16 getDemoType() const { return mDemoType; }
void setDemoMode(u32 mode) { mDemoMode = mode; }
u32 getDemoMode() const { return mDemoMode; }
private:
/* 0x00 */ u16 mDemoType;
@@ -117,24 +130,32 @@ private:
/* 0x06 */ s16 mParam2;
/* 0x08 */ int mParam0;
/* 0x0C */ int mParam1;
/* 0x10 */ int mDemoMode;
/* 0x10 */ u32 mDemoMode;
/* 0x14 */ float mStick;
/* 0x18 */ cXyz mDemoPos0;
}; // Size = 0x24
}; // Size: 0x24
class daPy_py_c : public fopAc_ac_c {
public:
/* 0x0568 */ u8 field_0x568[8];
/* 0x0570 */ int mNoResetFlg0;
/* 0x0574 */ int mNoResetFlg1;
/* 0x0578 */ int mNoResetFlg2;
/* 0x057C */ int mNoResetFlg3;
/* 0x0580 */ int mResetFlg0;
/* 0x0584 */ int mResetFlg1;
/* 0x0588 */ int mEndResetFlg0;
/* 0x058C */ int mEndResetFlg1;
/* 0x0590 */ int mEndResetFlg2;
/* 0x0594 */ u8 field_0x594[0x10];
/* 0x0568 */ u8 mCutType;
/* 0x0569 */ u8 mComboCutCount;
/* 0x056A */ u8 mSpecialMode; // maybe needs better name
/* 0x056B */ u8 field_0x56b;
/* 0x056C */ s16 mDamageTimer;
/* 0x056E */ u8 field_0x56e[2];
/* 0x0570 */ u32 mNoResetFlg0;
/* 0x0574 */ u32 mNoResetFlg1;
/* 0x0578 */ u32 mNoResetFlg2;
/* 0x057C */ u32 mNoResetFlg3;
/* 0x0580 */ u32 mResetFlg0;
/* 0x0584 */ u32 mResetFlg1;
/* 0x0588 */ u32 mEndResetFlg0;
/* 0x058C */ u32 mEndResetFlg1;
/* 0x0590 */ u32 mEndResetFlg2;
/* 0x0594 */ f32 field_0x594;
/* 0x0598 */ u8 field_0x598[0x4];
/* 0x059C */ s16 mLookAngleY;
/* 0x059E */ u8 field_0x59e[0x6];
/* 0x05A4 */ cXyz mHeadTopPos;
/* 0x05B0 */ cXyz mItemPos;
/* 0x05BC */ cXyz mSwordTopPos;
@@ -147,23 +168,67 @@ public:
public:
enum daPy_FLG0 {
EquipHeavyBoots = 0x2000000,
MagneBootsOn = 0x1000,
UnkFrollCrashFlg2 = 0x10,
UnkFrollCrashFlg1 = 0x8
EQUIP_HEAVY_BOOTS = 0x2000000,
FLG0_UNK_8000000 = 0x8000000,
FLG0_UNK_1000000 = 0x1000000,
UNDER_WATER_MOVEMENT = 0x800000,
FLG0_UNK_80000 = 0x80000,
FLG0_UNK_8000 = 0x8000,
MAGNE_BOOTS_ON = 0x1000,
FLG0_UNK_40 = 0x40,
UNK_F_ROLL_CRASH_2 = 0x10,
UNK_F_ROLL_CRASH_1 = 0x8
};
enum daPy_FLG1 { Wolf = 0x2000000, ThrowDamage = 0x4000 };
enum daPy_FLG2 { BoarSingleBattle = 0x1800000, UnkArmor = 0x80000, Unk = 1 };
enum daPy_FLG3 { CopyRodThrowAfter = 0x40000 };
enum daPy_ERFLG0 {};
enum daPy_ERFLG1 { GanonFinish = 0x80000000, UnkForcePutPos = 0x2000 };
enum daPy_FLG1 { IS_WOLF = 0x2000000, THROW_DAMAGE = 0x4000 };
enum daPy_FLG2 { FLG2_UNK_4080000 = 0x4080000, FLG2_UNK_2080000 = 0x2080000, BOAR_SINGLE_BATTLE = 0x1800000, STATUS_WINDOW_DRAW = 0x400000, UNK_ARMOR = 0x80000, UNK_FLG2_2 = 2, UNK_DAPY_FLG2_1 = 1 };
enum daPy_FLG3 { FLG3_UNK_100000 = 0x100000, COPY_ROD_THROW_AFTER = 0x40000 };
enum daPy_ERFLG0 { ERFLG0_UNK_8000000 = 0x8000000, ERFLG0_UNK_1000000 = 0x1000000, ERFLG0_UNK_100000 = 0x100000, };
enum daPy_ERFLG1 { GANON_FINISH = 0x80000000, UNK_FORCE_PUT_POS = 0x2000 };
enum daPy_ERFLG2 {};
enum daPy_RFLG0 {};
enum daPy_RFLG0 {
RFLG0_UNK_8000000 = 0x8000000,
RFLG0_UNK_80 = 0x80,
RFLG0_UNK_40 = 0x40,
RFLG0_UNK_2 = 0x2,
};
enum {
/* 0x01 */ SMODE_SUMO_READY = 1,
/* 0x25 */ SMODE_SUMO_LOSE = 37,
/* 0x2A */ SMODE_GOAT_STOP = 42,
/* 0x2B */ SMODE_GORON_THROW,
/* 0x2C */ SMODE_CARGO_CARRY,
};
enum CutType {
/* 0x01 */ TYPE_CUT_VERTICAL = 1,
/* 0x02 */ TYPE_CUT_STAB,
/* 0x03 */ TYPE_CUT_SWEEP,
/* 0x04 */ TYPE_CUT_HORIZONTAL,
/* 0x05 */ TYPE_CUT_HEAD, // Helm Splitter
/* 0x06 */ TYPE_CUT_LEFT_SWEEP_FINISH,
/* 0x07 */ TYPE_CUT_DOWN_FINISH,
/* 0x08 */ TYPE_CUT_TURN_RIGHT,
/* 0x0A */ TYPE_CUT_JUMP = 10,
/* 0x10 */ TYPE_CUT_AIR = 0x10,
/* 0x12 */ TYPE_CUT_LARGE_JUMP_INIT = 0x12,
/* 0x13 */ TYPE_CUT_LARGE_JUMP,
/* 0x14 */ TYPE_CUT_LARGE_JUMP_FINISH,
/* 0x15 */ TYPE_CUT_RIGHT_SWEEP_FINISH,
/* 0x16 */ TYPE_CUT_TURN_LEFT,
/* 0x17 */ TYPE_CUT_LARGE_TURN_LEFT,
/* 0x18 */ TYPE_CUT_LARGE_TURN_RIGHT,
/* 0x1A */ TYPE_CUT_FAST_MOVE = 0x1A,
/* 0x1E */ TYPE_CUT_TWIRL = 0x1E, // Back Slice
/* 0x1F */ TYPE_CUT_FAST,
/* 0x20 */ TYPE_CUT_STAB_FINISH,
/* 0x21 */ TYPE_CUT_STAB_COMBO,
};
void setParamData(int, int, int, int);
int checkFishingRodItem(int);
void checkBombItem(int);
void checkBottleItem(int);
static BOOL checkBombItem(int);
static BOOL checkBottleItem(int);
void checkDrinkBottleItem(int);
static BOOL checkOilBottleItem(int);
static BOOL checkOpenBottleItem(int);
@@ -171,7 +236,7 @@ public:
static BOOL checkHookshotItem(int);
static BOOL checkTradeItem(int);
static BOOL checkDungeonWarpItem(int);
BOOL checkMasterSwordEquip();
static BOOL checkMasterSwordEquip();
void checkWoodShieldEquip();
f32 getAttentionOffsetY();
s16 checkNowWolfEyeUp();
@@ -183,105 +248,104 @@ public:
void linkGrabSubjectNoDraw(fopAc_ac_c*);
void wolfGrabSubjectNoDraw(fopAc_ac_c*);
void checkRoomRestartStart();
void checkCarryStartLightBallA();
void checkCarryStartLightBallB();
static u32 checkCarryStartLightBallA();
static u32 checkCarryStartLightBallB();
float getSpinnerRideSpeed() const;
void checkSpinnerReflectEffect();
void checkBoomerangCharge();
bool checkBoomerangChargeTime();
void getThrowBoomerangActor();
static daBoomerang_c* getThrowBoomerangActor();
void cancelBoomerangLockActor(fopAc_ac_c*);
void setPlayerDamage(int, int);
void setMidnaMotionNum(int);
void setMidnaFaceNum(int);
int checkNoResetFlg0(daPy_FLG0) const;
int checkEquipHeavyBoots() const;
int checkBoarSingleBattle(void) const;
int checkBoarSingleBattle() const;
int checkEndResetFlg0(daPy_ERFLG0) const;
void onNoResetFlg2(daPy_py_c::daPy_FLG2);
void offNoResetFlg0(daPy_py_c::daPy_FLG0);
int checkEndResetFlg2(daPy_py_c::daPy_ERFLG2) const;
bool getSumouMode() const;
int checkNoResetFlg3(daPy_py_c::daPy_FLG3) const;
void checkShieldGet();
BOOL checkShieldGet();
void onNoResetFlg0(daPy_py_c::daPy_FLG0);
int checkEndResetFlg1(daPy_py_c::daPy_ERFLG1) const;
void offNoResetFlg1(daPy_py_c::daPy_FLG1);
void offNoResetFlg2(daPy_py_c::daPy_FLG2);
int checkWolf() const;
void checkSwordGet();
BOOL checkSwordGet();
int checkResetFlg0(daPy_py_c::daPy_RFLG0) const;
int checkNoResetFlg2(daPy_py_c::daPy_FLG2) const;
int checkMagneBootsOn() const;
virtual void unk();
virtual bool getMidnaAtnPos(void) const;
virtual cXyz* getMidnaAtnPos() const;
virtual void setMidnaMsgNum(fopAc_ac_c*, u16);
virtual Mtx* getModelMtx(void);
virtual Mtx* getInvMtx(void);
virtual cXyz* getShadowTalkAtnPos(void);
virtual float getGroundY();
virtual Mtx* getLeftItemMatrix(void);
virtual Mtx* getRightItemMatrix(void);
virtual Mtx* getLeftHandMatrix(void);
virtual Mtx* getRightHandMatrix(void);
virtual Mtx* getLinkBackBone1Matrix(void);
virtual Mtx* getWolfMouthMatrix(void);
virtual Mtx* getWolfBackbone2Matrix(void);
virtual bool getBottleMtx(void);
virtual bool checkPlayerGuard(void) const;
virtual bool checkPlayerFly() const;
virtual bool checkFrontRoll() const;
virtual bool checkWolfDash() const;
virtual bool checkAutoJump(void) const;
virtual bool checkSideStep(void) const;
virtual bool checkWolfTriggerJump(void) const;
virtual bool checkGuardBreakMode(void) const;
virtual bool checkLv3Slide(void) const;
virtual bool checkWolfHowlDemoMode(void) const;
virtual bool checkChainBlockPushPull(void);
virtual bool checkElecDamage(void) const;
virtual bool checkEmptyBottleSwing(void) const;
virtual bool checkBottleSwingMode(void) const;
virtual bool checkHawkWait(void) const;
virtual bool checkGoatThrow(void) const;
virtual bool checkGoatThrowAfter(void) const;
virtual bool checkWolfTagLockJump(void) const;
virtual bool checkWolfTagLockJumpLand(void) const;
virtual bool checkWolfRope(void);
virtual bool checkWolfRopeHang(void) const;
virtual bool checkRollJump(void) const;
virtual bool checkGoronRideWait(void) const;
virtual bool checkWolfChain(void) const;
virtual bool checkWolfWait(void) const;
virtual bool checkWolfJumpAttack(void) const;
virtual bool checkWolfRSit(void) const;
virtual bool checkBubbleFly(void) const;
virtual bool checkBottleDrinkEnd(void) const;
virtual bool checkWolfDig(void) const;
virtual bool checkCutCharge(void) const;
virtual bool checkCutTurnCharge(void) const;
virtual bool checkCutLargeJumpCharge(void) const;
virtual MtxP getModelMtx();
virtual MtxP getInvMtx();
virtual cXyz* getShadowTalkAtnPos();
virtual f32 getGroundY();
virtual MtxP getLeftItemMatrix();
virtual MtxP getRightItemMatrix();
virtual MtxP getLeftHandMatrix();
virtual MtxP getRightHandMatrix();
virtual MtxP getLinkBackBone1Matrix();
virtual MtxP getWolfMouthMatrix();
virtual MtxP getWolfBackbone2Matrix();
virtual MtxP getBottleMtx();
virtual BOOL checkPlayerGuard() const;
virtual u32 checkPlayerFly() const;
virtual BOOL checkFrontRoll() const;
virtual BOOL checkWolfDash() const;
virtual BOOL checkAutoJump() const;
virtual bool checkSideStep() const;
virtual bool checkWolfTriggerJump() const;
virtual BOOL checkGuardBreakMode() const;
virtual bool checkLv3Slide() const;
virtual bool checkWolfHowlDemoMode() const;
virtual bool checkChainBlockPushPull();
virtual BOOL checkElecDamage() const;
virtual BOOL checkEmptyBottleSwing() const;
virtual BOOL checkBottleSwingMode() const;
virtual BOOL checkHawkWait() const;
virtual BOOL checkGoatThrow() const;
virtual BOOL checkGoatThrowAfter() const;
virtual BOOL checkWolfTagLockJump() const;
virtual BOOL checkWolfTagLockJumpLand() const;
virtual bool checkWolfRope();
virtual BOOL checkWolfRopeHang() const;
virtual BOOL checkRollJump() const;
virtual BOOL checkGoronRideWait() const;
virtual BOOL checkWolfChain() const;
virtual BOOL checkWolfWait() const;
virtual BOOL checkWolfJumpAttack() const;
virtual BOOL checkWolfRSit() const;
virtual bool checkBubbleFly() const;
virtual BOOL checkBottleDrinkEnd() const;
virtual BOOL checkWolfDig() const;
virtual BOOL checkCutCharge() const;
virtual BOOL checkCutTurnCharge() const;
virtual BOOL checkCutLargeJumpCharge() const;
virtual bool getBokoFlamePos(cXyz*);
virtual bool checkComboCutTurn(void) const;
virtual bool checkClimbMove(void) const;
virtual bool checkGrassWhistle(void) const;
virtual bool checkBoarRun(void) const;
virtual bool checkFmChainPut(void) const;
virtual bool checkHorseElecDamage(void) const;
virtual float getBaseAnimeFrameRate(void) const;
virtual float getBaseAnimeFrame(void) const;
virtual BOOL checkComboCutTurn() const;
virtual BOOL checkClimbMove() const;
virtual BOOL checkGrassWhistle() const;
virtual BOOL checkBoarRun() const;
virtual bool checkFmChainPut() const;
virtual bool checkHorseElecDamage() const;
virtual float getBaseAnimeFrameRate() const;
virtual float getBaseAnimeFrame() const;
virtual void setAnimeFrame(float);
virtual bool checkWolfLock(fopAc_ac_c*) const;
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual bool getAtnActorID(void) const;
virtual s32 getItemID(void) const;
virtual bool getGrabActorID(void) const;
virtual s32 getAtnActorID() const;
virtual s32 getItemID() const;
virtual s32 getGrabActorID() const;
virtual bool exchangeGrabActor(fopAc_ac_c*);
virtual bool setForceGrab(fopAc_ac_c*, int, int);
virtual void setForcePutPos(cXyz const&);
virtual bool checkPlayerNoDraw(void);
virtual bool checkRopeTag(void);
virtual bool checkPlayerNoDraw();
virtual bool checkRopeTag();
virtual void voiceStart(u32);
virtual void seStartOnlyReverb(u32);
virtual void seStartOnlyReverbLevel(u32);
@@ -289,14 +353,14 @@ public:
virtual void setGrabCollisionOffset(float, float, cBgS_PolyInfo*);
virtual void onMagneGrab(float, float);
virtual void onFrollCrashFlg(u8, int);
virtual bool getModelJointMtx(u16);
virtual bool getHeadMtx(void);
virtual MtxP getModelJointMtx(u16);
virtual MtxP getHeadMtx();
virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
// virtual void checkCutJumpCancelTurn() const;
virtual bool checkIronBallReturn(void) const;
virtual bool checkIronBallGroundStop(void) const;
virtual bool checkSingleBoarBattleSecondBowReady(void) const;
virtual bool checkPointSubWindowMode(void) const;
virtual BOOL checkCutJumpCancelTurn() const;
virtual bool checkIronBallReturn() const;
virtual bool checkIronBallGroundStop() const;
virtual BOOL checkSingleBoarBattleSecondBowReady() const;
virtual bool checkPointSubWindowMode() const;
virtual void setClothesChange(int);
virtual void setPlayerPosAndAngle(float (*)[4]);
virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*);
@@ -306,27 +370,27 @@ public:
virtual bool setRollJump(float, float, short);
virtual void playerStartCollisionSE(u32, u32);
virtual void changeTextureAnime(u16, u16, int);
virtual void cancelChangeTextureAnime(void);
virtual void cancelDungeonWarpReadyNeck(void);
virtual void cancelChangeTextureAnime();
virtual void cancelDungeonWarpReadyNeck();
virtual void onSceneChangeArea(u8, u8, fopAc_ac_c*);
virtual void onSceneChangeAreaJump(u8, u8, fopAc_ac_c*);
virtual void onSceneChangeDead(u8, int);
virtual bool checkHorseRide() const;
virtual bool checkBoarRide() const;
virtual bool checkCanoeRide() const;
virtual bool checkBoardRide() const;
virtual u32 checkHorseRide() const;
virtual u32 checkBoarRide() const;
virtual u32 checkCanoeRide() const;
virtual u32 checkBoardRide() const;
virtual u32 checkSpinnerRide() const;
virtual bool getSpinnerActor(void);
virtual bool checkHorseRideNotReady(void) const;
virtual bool checkArrowChargeEnd(void) const;
virtual void getSearchBallScale(void) const;
virtual bool checkFastShotTime(void);
virtual bool checkNoEquipItem(void) const;
virtual bool checkFireMaterial(void) const;
virtual fopAc_ac_c* getSpinnerActor();
virtual BOOL checkHorseRideNotReady() const;
virtual bool checkArrowChargeEnd() const;
virtual f32 getSearchBallScale() const;
virtual s16 checkFastShotTime();
virtual bool checkNoEquipItem() const;
virtual bool checkFireMaterial() const;
virtual bool checkKandelaarSwing(int) const;
virtual bool getBoardCutTurnOffsetAngleY(void) const;
virtual cXyz* getMagneHitPos(void);
virtual cXyz* getMagneBootsTopVec(void);
virtual s16 getBoardCutTurnOffsetAngleY() const;
virtual cXyz* getMagneHitPos();
virtual cXyz* getMagneBootsTopVec();
virtual bool getKandelaarFlamePos();
virtual bool checkUseKandelaar(int);
virtual void setDkCaught(fopAc_ac_c*);
@@ -337,53 +401,53 @@ public:
virtual void setWolfEnemyHangBiteAngle(short);
virtual void setKandelaarMtx(float (*)[4], int, int);
virtual bool getStickAngleFromPlayerShape(short*) const;
virtual bool checkSpinnerPathMove(void);
virtual bool checkSpinnerTriggerAttack(void);
virtual void onSpinnerPathForceRemove(void);
virtual bool getIronBallBgHit(void) const;
virtual bool getIronBallCenterPos(void);
virtual bool checkCanoeFishingGetLeft(void) const;
virtual bool checkCanoeFishingGetRight(void) const;
virtual bool checkBeeChildDrink(void) const;
virtual void skipPortalObjWarp(void);
virtual bool checkSpinnerPathMove();
virtual bool checkSpinnerTriggerAttack();
virtual void onSpinnerPathForceRemove();
virtual bool getIronBallBgHit() const;
virtual bool getIronBallCenterPos();
virtual bool checkCanoeFishingGetLeft() const;
virtual bool checkCanoeFishingGetRight() const;
virtual u8 checkBeeChildDrink() const;
virtual void skipPortalObjWarp();
virtual bool checkTreasureRupeeReturn(int) const;
virtual void setSumouReady(fopAc_ac_c*);
virtual bool checkAcceptDungeonWarpAlink(int);
virtual bool getSumouCounter(void) const;
virtual bool checkSumouWithstand(void) const;
virtual void cancelGoronThrowEvent(void);
virtual s16 getSumouCounter() const;
virtual s16 checkSumouWithstand() const;
virtual void cancelGoronThrowEvent();
virtual void setSumouGraspCancelCount(int);
virtual void setSumouPushBackDirection(short);
virtual void setSumouLoseHeadUp(void);
virtual s16 getGiantPuzzleAimAngle(void) const;
virtual void setSumouLoseHeadUp();
virtual s16 getGiantPuzzleAimAngle() const;
virtual void setGoronSideMove(fopAc_ac_c*);
virtual void setCargoCarry(fopAc_ac_c*);
virtual bool getDpdFarFlg(void) const;
virtual bool getHookshotTopPos(void);
virtual bool checkHookshotReturnMode(void) const;
virtual bool checkHookshotShootReturnMode(void) const;
virtual bool checkOctaIealHang(void) const;
virtual void cancelOctaIealHang(void);
virtual void cancelDragonHangBackJump(void);
virtual void setOctaIealWildHang(void);
virtual bool checkDragonHangRide(void) const;
virtual bool getDpdFarFlg() const;
virtual bool getHookshotTopPos();
virtual bool checkHookshotReturnMode() const;
virtual bool checkHookshotShootReturnMode() const;
virtual bool checkOctaIealHang() const;
virtual void cancelOctaIealHang();
virtual void cancelDragonHangBackJump();
virtual void setOctaIealWildHang();
virtual bool checkDragonHangRide() const;
virtual void changeDragonActor(fopAc_ac_c*);
virtual bool getClothesChangeWaitTimer(void) const;
virtual bool getShieldChangeWaitTimer(void) const;
virtual bool getSwordChangeWaitTimer(void) const;
virtual bool checkMetamorphose(void) const;
virtual bool checkWolfDownAttackPullOut(void) const;
virtual bool checkBootsOrArmorHeavy(void) const;
virtual s32 getBottleOpenAppearItem(void) const;
virtual bool checkItemSwordEquip(void) const;
virtual float getSinkShapeOffset(void) const;
virtual bool checkSinkDead(void) const;
virtual bool checkHorseStart(void);
virtual bool getWolfHowlMgrP(void);
virtual bool checkWolfHowlSuccessAnime(void) const;
virtual bool checkCopyRodTopUse(void);
virtual bool checkCopyRodEquip(void) const;
virtual bool checkCutJumpMode(void) const;
virtual u8 getClothesChangeWaitTimer() const;
virtual u8 getShieldChangeWaitTimer() const;
virtual u8 getSwordChangeWaitTimer() const;
virtual BOOL checkMetamorphose() const;
virtual BOOL checkWolfDownAttackPullOut() const;
virtual BOOL checkBootsOrArmorHeavy() const;
virtual s32 getBottleOpenAppearItem() const;
virtual bool checkItemSwordEquip() const;
virtual float getSinkShapeOffset() const;
virtual BOOL checkSinkDead() const;
virtual BOOL checkHorseStart();
virtual Z2WolfHowlMgr* getWolfHowlMgrP();
virtual BOOL checkWolfHowlSuccessAnime() const;
virtual bool checkCopyRodTopUse();
virtual bool checkCopyRodEquip() const;
virtual BOOL checkCutJumpMode() const;
bool getSumouCameraMode() const {
bool sumouCameraMode = false;
@@ -393,18 +457,37 @@ public:
return sumouCameraMode;
}
bool checkStatusWindowDraw() { return i_checkNoResetFlg2(STATUS_WINDOW_DRAW); }
// 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; }
int i_checkNoResetFlg1(daPy_FLG1 pFlag) const { return mNoResetFlg1 & pFlag; }
int i_checkNoResetFlg2(daPy_FLG2 pFlag) const { return mNoResetFlg2 & pFlag; }
int i_checkNoResetFlg3(daPy_FLG3 pFlag) const { return mNoResetFlg3 & pFlag; }
void i_onNoResetFlg0(int pFlg) { mNoResetFlg0 |= pFlg; }
void i_onNoResetFlg1(int pFlg) { mNoResetFlg1 |= pFlg; }
void i_onNoResetFlg2(int pFlg) { mNoResetFlg2 |= pFlg; }
void i_onNoResetFlg3(int pFlg) { mNoResetFlg3 |= pFlg; }
void i_offNoResetFlg0(int pFlg) { mNoResetFlg0 &= ~pFlg; }
void i_offNoResetFlg3(int pFlg) { mNoResetFlg3 &= ~pFlg; }
void i_offResetFlg0(int flag) { mResetFlg0 &= ~flag; }
void i_onResetFlg0(int flag) { mResetFlg0 |= flag; }
void i_onResetFlg1(int flag) { mResetFlg1 |= flag; }
void i_onEndResetFlg0(int flag) { mEndResetFlg0 |= flag; }
int i_checkResetFlg0(daPy_py_c::daPy_RFLG0 flag) const { return mResetFlg0 & flag; }
int i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 flag) const { return mEndResetFlg0 & flag; }
void i_onEndResetFlg1(daPy_ERFLG1 pFlg) { mEndResetFlg1 |= pFlg; }
int i_checkWolf() { return i_checkNoResetFlg1(Wolf); }
BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(EquipHeavyBoots); }
int i_checkWolf() const { return i_checkNoResetFlg1(IS_WOLF); }
BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(EQUIP_HEAVY_BOOTS); }
BOOL i_checkMagneBootsOn() const { return i_checkNoResetFlg0(MAGNE_BOOTS_ON); }
inline u32 getLastSceneMode();
inline bool checkWoodSwordEquip();
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline BOOL checkNowWolf();
inline bool checkZoraWearFlg() const;
static u8 m_midnaActor[4];
};
include/d/cc/d_cc_d.h
+22 -1
View File
@@ -57,6 +57,7 @@ public:
/* 80083830 */ void Move();
/* 8008523C */ virtual ~dCcD_GStts() {}
void ClrTg() { mTg = 0; }
void SetAtApid(unsigned int id) { mAtApid = id; }
// private:
/* 0x04 */ u8 mAt;
@@ -108,7 +109,11 @@ public:
u32 GetGFlag() const { return mGFlag; }
u32 GetRPrm() const { return mRPrm; }
u32 MskSPrm(u32 mask) const { return mGFlag & mask; }
u32 MskRPrm(u32 mask) const { return mRPrm & mask; }
bool ChkSPrm(u32 mask) const { return MskSPrm(mask); }
void OnSPrm(u32 flag) { mGFlag |= flag; }
void OffSPrm(u32 flag) { mGFlag &= ~flag; }
bool ChkRPrm(u32 flag) const { return MskRPrm(flag); }
}; // Size = 0x1C
class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase {
@@ -117,6 +122,9 @@ public:
/* 80083C44 */ virtual ~dCcD_GObjAt() {}
void SetVec(cXyz& vec) { mVec = vec; }
cXyz& GetVec() { return mVec; }
void SetHitMark(u8 mark) { mHitMark = mark; }
void SetSe(u8 se) { mSe = se; }
void SetMtrl(u8 mtrl) { mMtrl = mtrl; }
// private:
/* 0x1C */ u8 mSe;
@@ -156,7 +164,7 @@ public:
/* 800840E4 */ virtual ~dCcD_GObjInf();
/* 80084268 */ cCcD_GObjInf* GetGObjInf();
/* 8008426C */ virtual void ClrAtHit();
/* 800842C0 */ s32 ChkAtHit();
/* 800842C0 */ u32 ChkAtHit();
/* 80084318 */ void ResetAtHit();
/* 80084358 */ cCcD_Obj* GetAtHitObj();
/* 800843A8 */ cCcD_GObjInf* GetAtHitGObj();
@@ -176,6 +184,15 @@ public:
void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); }
bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); }
void OnAtNoHitMark() { mGObjAt.OnSPrm(2); }
void OffAtNoHitMark() { mGObjAt.OffSPrm(2); }
void OnAtNoConHit() { mGObjAt.OnSPrm(1); }
void OffAtNoConHit() { mGObjAt.OffSPrm(1); }
void SetAtHitMark(u8 mark) { mGObjAt.SetHitMark(mark); }
void SetAtSe(u8 se) { mGObjAt.SetSe(se); }
void SetAtMtrl(u8 mtrl) { mGObjAt.SetMtrl(mtrl); }
fopAc_ac_c* GetAtHitAc() { return mGObjAt.GetAc(); }
bool ChkAtShieldHit() { return mGObjAt.ChkRPrm(1); }
static u32 const m_hitSeID[24];
@@ -224,6 +241,10 @@ public:
dCcD_Tri() {}
};
enum dCcG_At_Spl {
/* 0x1 */ dCcG_At_Spl_UNK_01 = 1,
};
dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* param_0);
#endif /* D_CC_D_CC_D_H */
include/d/com/d_com_inf_game.h
+49 -2
View File
@@ -176,6 +176,15 @@ public:
void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; }
JKRArchive* getMain2DArchive() { return mMain2DArchive; }
J2DGrafContext* getCurrentGrafPort() { return mCurrentGrafPort; }
dVibration_c& getVibration() { return mVibration; }
void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] |= flag; }
BOOL checkCameraAttentionStatus(int i, u32 flag) { return mCameraInfo[i].mCameraAttentionStatus & flag; }
s8 getPlayerCameraID(int i) { return mPlayerCameraID[i]; }
void set3DStatus(u8 status, u8 direction, u8 flag) {
m3DStatus = status;
m3DDirection = direction;
m3DSetFlag = flag;
}
public:
/* 0x00000 */ dBgS mDBgS;
@@ -384,8 +393,8 @@ public:
/* 0x04FD4 */ fopAc_ac_c* mMesgCamInfoActor8;
/* 0x04FD8 */ fopAc_ac_c* mMesgCamInfoActor9;
/* 0x04FDC */ fopAc_ac_c* mMesgCamInfoActor10;
/* 0x04FE0 */ int mPlayerStatus;
/* 0x04FE4 */ u8 field_0x4fe4[0x14];
/* 0x04FE0 */ u32 mPlayerStatus[2];
/* 0x04FE8 */ u8 field_0x4fe8[0x10];
/* 0x04FF8 */ __d_timer_info_c mTimerInfo;
/* 0x0500C */ dDlst_window_c* mCurrentWindow;
/* 0x05010 */ void* mCurrentView;
@@ -451,6 +460,8 @@ void dComIfGs_setSelectEquipSword(u8);
void dComIfGs_setSelectEquipShield(u8);
void* dComIfG_getStageRes(char const*);
void dComLbG_PhaseHandler(request_of_phase_process_class*, int (**param_1)(void*), void*);
void dComIfGp_addSelectItemNum(int, s16);
BOOL dComIfGs_isOneZoneSwitch(int, int);
inline void dComIfGp_setRStatus(u8 status, u8 flag) {
g_dComIfG_gameInfo.play.setRStatus(status, flag);
@@ -1019,4 +1030,40 @@ inline dBgS& dComIfG_Bgsp() {
return g_dComIfG_gameInfo.play.mDBgS;
}
inline s16 dComIfGs_getStartPoint() {
return g_dComIfG_gameInfo.info.getRestart().getStartPoint();
}
inline dVibration_c& dComIfGp_getVibration() {
return g_dComIfG_gameInfo.play.getVibration();
}
inline void dComIfGp_setPlayerStatus0(int param_0, u32 flag) {
g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 0, flag);
}
inline void dComIfGp_setPlayerStatus1(int param_0, u32 flag) {
g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 1, flag);
}
inline dEvent_manager_c* dComIfGp_getPEvtManager() {
return &g_dComIfG_gameInfo.play.getEvtManager();
}
inline void dComIfGp_evmng_cutEnd(int param_0) {
dComIfGp_getPEvtManager()->cutEnd(param_0);
}
inline BOOL dComIfGp_checkCameraAttentionStatus(int i, u32 flag) {
return g_dComIfG_gameInfo.play.checkCameraAttentionStatus(i, flag);
}
inline void dComIfGp_set3DStatus(u8 status, u8 direction, u8 flag) {
g_dComIfG_gameInfo.play.set3DStatus(status, direction, flag);
}
inline u8 dComIfGs_getLastSceneMode() {
return g_dComIfG_gameInfo.info.getRestart().getLastMode();
}
#endif /* D_COM_D_COM_INF_GAME_H */
include/d/d_attention.h
+20 -2
View File
@@ -148,6 +148,16 @@ public:
/* 80070178 */ virtual void execute(u16, J3DTransformInfo*);
};
struct dist_entry {
f32 field_0x0;
f32 field_0x4;
f32 field_0x8;
f32 field_0xc;
f32 field_0x10;
f32 field_0x14;
u32 field_0x18;
}; // Size: 0x1C
class dAttention_c {
public:
dAttention_c() {}
@@ -185,14 +195,22 @@ public:
/* 800736CC */ void LockonTargetPId(s32);
/* 80073734 */ void ActionTarget(s32);
/* 8007378C */ void CheckObjectTarget(s32);
/* 800737E4 */ void LockonTruth();
/* 800737E4 */ bool LockonTruth();
/* 80073838 */ void checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32);
dAttCatch_c& getCatghTarget() { return mCatghTarget; }
bool chkFlag(u32 flag) { return mFlags & flag; }
bool Lockon() {
bool chk = true;
if (!LockonTruth() && !chkFlag(0x20000000)) {
chk = false;
}
return chk;
}
static u8 loc_type_tbl[12];
static u8 act_type_tbl[20];
static u8 dist_table[6552];
static dist_entry dist_table[234];
static u32 loc_type_num;
static u32 act_type_num;
static u32 chk_type_tbl;
include/d/d_bomb.h
+8
View File
@@ -41,6 +41,14 @@ public:
bool checkFlowerBombWait(fopAc_ac_c*);
bool checkWaterBomb(fopAc_ac_c*);
bool checkInsectBombMove(fopAc_ac_c*);
static fopAc_ac_c* createNormalBombPlayer(cXyz* p_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(0x221, 8, p_pos, -1, NULL, NULL, -1, NULL, NULL);
}
static fopAc_ac_c* createWaterBombPlayer(cXyz* p_pos) {
return (fopAc_ac_c*)fopAcM_fastCreate(0x221, 9, p_pos, -1, NULL, NULL, -1, NULL, NULL);
}
};
#endif /* D_D_BOMB_H */
include/d/d_jnt_col.h
+2
View File
@@ -20,6 +20,8 @@ public:
/* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
/* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*);
bool checkPassNum(int bit) { return field_0xc & (1 << bit); }
/* 0x00 */ dJntColData_c* mData;
/* 0x04 */ J3DModel* mModel;
/* 0x08 */ int field_0x8;
include/d/event/d_event.h
+2
View File
@@ -80,6 +80,8 @@ public:
void isOrderOK();
u16 chkFlag2(u16 flag) { return flag & mFlag2; }
bool runCheck() { return field_0xe5 != 0; }
u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
public:
/* 0x000 */ u8 field_0x0[4];
include/d/event/d_event_manager.h
+1 -1
View File
@@ -48,7 +48,7 @@ public:
void startCheckOld(char const*);
void endCheck(s16);
void endCheckOld(char const*);
void getMyStaffId(char const*, fopAc_ac_c*, int);
s32 getMyStaffId(char const*, fopAc_ac_c*, int);
void getIsAddvance(int);
void getMyActIdx(int, char const* const*, int, int, int);
void getMyNowCutName(int);
include/d/kankyo/d_kankyo.h
+13 -6
View File
@@ -114,7 +114,6 @@ struct GB_MAPLE_COL_CHANGE {
class dKy_tevstr_c {
public:
private:
/* 0x000 */ J3DLightObj field_0x000;
/* 0x074 */ J3DLightObj field_0x074[6];
/* 0x32C */ cXyz field_0x32c;
@@ -124,10 +123,18 @@ private:
/* 0x34C */ int field_0x34c;
/* 0x350 */ int field_0x350;
/* 0x354 */ int field_0x354;
/* 0x358 */ int field_0x358;
/* 0x35C */ int field_0x35c;
/* 0x360 */ int field_0x360;
/* 0x364 */ int field_0x364;
/* 0x358 */ u16 field_0x358;
/* 0x35A */ u16 field_0x35a;
/* 0x35C */ u16 field_0x35c;
/* 0x35E */ u8 field_0x35e[2];
/* 0x360 */ u8 field_0x360;
/* 0x361 */ u8 field_0x361;
/* 0x362 */ u8 field_0x362;
/* 0x363 */ u8 field_0x363;
/* 0x364 */ u8 field_0x364;
/* 0x365 */ u8 field_0x365;
/* 0x366 */ u8 field_0x366;
/* 0x367 */ u8 field_0x367;
/* 0x368 */ f32 field_0x368;
/* 0x36C */ f32 field_0x36c;
/* 0x370 */ f32 field_0x370;
@@ -655,6 +662,6 @@ public:
STATIC_ASSERT(sizeof(dScnKy_env_light_c) == 4880);
BOOL dKy_darkworld_stage_check(char const*, int);
bool dKy_darkworld_stage_check(char const*, int);
#endif /* D_KANKYO_D_KANKYO_H */
include/d/save/d_save.h
+9
View File
@@ -315,6 +315,10 @@ enum ItemTable {
/* 0xFF */ NO_ITEM
};
enum EquipItem {
/* 0x103 */ EQUIP_SWORD = 0x103,
};
enum CollectItem {
/* 0x0 */ COLLECT_CLOTHING,
/* 0x1 */ COLLECT_SWORD,
@@ -915,6 +919,9 @@ class dSv_restart_c {
public:
void setRoom(const cXyz&, s16, s8);
s16 getStartPoint() const { return mStartPoint; }
u32 getLastMode() const { return mLastMode; }
private:
/* 0x00 */ s8 mRoomNo;
/* 0x01 */ u8 field_0x01[3];
@@ -999,6 +1006,8 @@ public:
dSv_zone_c* getZones() { return mZone; }
dSv_player_c& getPlayer() { return mSavedata.getPlayer(); }
dSv_event_c& getTmp() { return mTmp; }
dSv_restart_c& getRestart() { return mRestart; }
dSv_event_c& getEvent() { return mSavedata.getEvent(); }
s64 getStartTime() { return mStartTime; }
s64 getSaveTotalTime() { return mSaveTotalTime; }
void initDan(s8 param_0) { mDan.init(param_0); }
include/f_op/f_op_actor.h
+3 -3
View File
@@ -19,7 +19,7 @@ public:
void onCondition(u16);
void offCondition(u16);
bool checkCommandCatch();
bool checkCommandDoor();
BOOL checkCommandDoor();
bool checkCommandDemoAccrpt();
void setCommand(u16 command) { mCommand = command; }
@@ -52,7 +52,7 @@ public:
struct actor_place {
cXyz mPosition;
csXyz mAngle;
u8 mRoomNo;
s8 mRoomNo;
};
struct actor_attention_types {
@@ -88,7 +88,7 @@ public:
/* 0x4E4 */ csXyz mCollisionRot;
/* 0x4EC */ cXyz mScale;
/* 0x4F8 */ cXyz mSpeed;
/* 0x504 */ Mtx* mCullMtx;
/* 0x504 */ MtxP mCullMtx;
union {
struct {
/* 0x508 */ cXyz mMin;
include/f_op/f_op_actor_mng.h
+14
View File
@@ -54,6 +54,8 @@ public:
static bool gndCheck(const cXyz*);
static u8 mGndCheck[84];
static f32 mGroundY;
static f32 getGroundY() { return mGroundY; }
};
class fopAcM_wt_c {
@@ -100,6 +102,10 @@ inline u32 fopAcM_GetParam(const void* pActor) {
return fpcM_GetParam(pActor);
}
inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) {
return p_actor->mGroup;
}
inline void fopAcM_OnStatus(fopAc_ac_c* pActor, u32 flag) {
pActor->mStatus |= flag;
}
@@ -132,6 +138,14 @@ inline csXyz& fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) {
return pActor->mCollisionRot;
}
inline bool fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) {
return p_actor->mCondition & flag;
}
inline void fopAcM_OnCondition(fopAc_ac_c* p_actor, u32 flag) {
p_actor->mCondition |= flag;
}
void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData);
void fopAcM_setStageLayer(void*);
int fopAcM_setRoomLayer(void*, int);
include/m_Do/m_Do_audio.h
+4
View File
@@ -31,4 +31,8 @@ public:
extern JKRSolidHeap* g_mDoAud_audioHeap;
inline void mDoAud_bgmSetSwordUsing(s32 id) {
Z2AudioMgr::getInterface()->mSeqMgr.bgmSetSwordUsing(id);
}
#endif /* M_DO_M_DO_AUDIO_H */
include/m_Do/m_Do_ext.h
+3 -1
View File
@@ -87,8 +87,10 @@ public:
/* 80140DF0 */ ~mDoExt_AnmRatioPack();
/* 80140E2C */ mDoExt_AnmRatioPack();
void setRatio(f32 ratio) { mRatio = ratio; }
private:
/* 0x0 */ float mRatio;
/* 0x0 */ f32 mRatio;
/* 0x4 */ J3DAnmTransform* mAnmTransform;
}; // Size = 0x8
include/rel/d/a/d_a_boomerang/d_a_boomerang.h
+122
View File
@@ -2,5 +2,127 @@
#define D_A_BOOMERANG_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/particle/d_particle_copoly.h"
#include "Z2AudioLib/Z2SoundObject.h"
class daBoomerang_sight_c {
public:
/* 8049E0B8 */ void createHeap();
/* 8049E36C */ void initialize();
/* 8049EB64 */ void playAnime(int, int);
/* 8049EDA8 */ void initFrame(int);
/* 8049EDE8 */ void copyNumData(int);
/* 8049EEC8 */ void setSight(cXyz const*, int);
/* 8049EF60 */ void draw();
/* 804A278C */ virtual ~daBoomerang_sight_c();
private:
/* 0x04 */ J2DScreen* field_0x4;
/* 0x08 */ J2DPane* field_0x8;
/* 0x0C */ J2DPane* field_0xc;
/* 0x10 */ J2DPane* field_0x10;
/* 0x14 */ J2DPane* field_0x14;
/* 0x18 */ J2DAnmBase* field_0x18;
/* 0x1C */ J2DAnmBase* field_0x1c;
/* 0x20 */ J2DScreen* field_0x20;
/* 0x24 */ J2DPane* field_0x24;
/* 0x28 */ J2DPane* field_0x28;
/* 0x2C */ J2DPane* field_0x2c;
/* 0x30 */ J2DPane* field_0x30;
/* 0x34 */ J2DAnmBase* field_0x34;
/* 0x38 */ J2DAnmBase* field_0x38;
/* 0x3C */ J2DScreen* field_0x3c;
/* 0x40 */ J2DPane* field_0x40;
/* 0x44 */ J2DPane* field_0x44;
/* 0x48 */ J2DPane* field_0x48;
/* 0x4C */ J2DPane* field_0x4c;
/* 0x50 */ J2DAnmBase* field_0x50;
/* 0x54 */ J2DAnmBase* field_0x54;
/* 0x58 */ J2DAnmBase* field_0x58;
/* 0x5C */ J2DAnmBase* field_0x5c;
/* 0x60 */ bool mRedSight;
/* 0x61 */ u8 mReserve;
/* 0x62 */ u8 mAlpha[6];
/* 0x68 */ f32 field_0x68[6];
/* 0x80 */ f32 field_0x80[6];
/* 0x98 */ f32 field_0x98[6];
/* 0xB0 */ f32 field_0xb0[6];
/* 0xC8 */ cXyz field_0xc8[6];
}; // Size: 0x110
struct daMirror_c;
class daAlink_c;
class daBoomerang_c : public fopAc_ac_c {
public:
enum daBoomerang_FLG0 {
/* 0x80 */ WIND_CATCH = 0x80,
};
/* 8049F280 */ void windModelCallBack();
/* 8049F39C */ void draw();
/* 8049F5F4 */ void lockLineCallback(fopAc_ac_c*);
/* 8049F660 */ void moveLineCallback(fopAc_ac_c*);
/* 8049F710 */ void pushLockList(int);
/* 8049F818 */ void cancelLockActorBase(fopAc_ac_c*);
/* 8049F874 */ void setAimActorBase(fopAc_ac_c*);
/* 8049F8B0 */ void setLockActor(fopAc_ac_c*, int);
/* 8049F9A4 */ void resetLockActor();
/* 8049F9F0 */ void setRoomInfo();
/* 8049FAA4 */ void setKeepMatrix();
/* 8049FBAC */ void setMoveMatrix();
/* 8049FCD0 */ void setRotAngle();
/* 8049FD6C */ void setAimPos();
/* 8049FE6C */ void checkBgHit(cXyz*, cXyz*);
/* 804A006C */ void setEffectTraceMatrix(u32*, u16);
/* 804A012C */ void setEffect();
/* 804A0874 */ void procWait();
/* 804A0F0C */ void procMove();
/* 804A1814 */ void execute();
/* 804A1BF4 */ ~daBoomerang_c();
/* 804A1EE4 */ void createHeap();
/* 804A2084 */ void create();
/* 804A230C */ daBoomerang_c();
void onStateFlg0(daBoomerang_FLG0 flag) { mStateFlg0 |= flag; }
void onWindCatch() { onStateFlg0(WIND_CATCH); }
private:
/* 0x568 */ daMirror_c* field_0x568;
/* 0x56C */ J3DModel* field_0x56c;
/* 0x570 */ daAlink_c* field_0x570;
/* 0x574 */ u8 field_0x574[0x1C];
/* 0x590 */ J3DModel* field_0x590;
/* 0x594 */ void* field_0x594;
/* 0x598 */ daBoomerang_sight_c mSight;
/* 0x6A8 */ int field_0x6a8;
/* 0x6AC */ int field_0x6ac[5];
/* 0x6C0 */ fopAc_ac_c* field_0x6c0[5];
/* 0x6D4 */ u8 field_0x6d4[8];
/* 0x6DC */ cXyz field_0x6dc[5];
/* 0x718 */ u8 field_0x718[5];
/* 0x720 */ Z2SoundObjSimple field_0x720;
/* 0x740 */ dBgS_Acch field_0x740;
/* 0x918 */ dPaPo_c field_0x918;
/* 0x950 */ u8 field_0x950;
/* 0x951 */ u8 field_0x951;
/* 0x952 */ u8 field_0x952;
/* 0x953 */ u8 field_0x953;
/* 0x954 */ u8 field_0x954;
/* 0x955 */ u8 field_0x955;
/* 0x956 */ u8 field_0x956;
/* 0x957 */ u8 field_0x957;
/* 0x958 */ s16 field_0x958;
/* 0x95A */ s16 field_0x95a;
/* 0x95C */ s16 field_0x95c;
/* 0x95E */ s16 field_0x95e;
/* 0x960 */ s16 field_0x960;
/* 0x962 */ s16 field_0x962;
/* 0x964 */ u32 mStateFlg0;
};
#endif /* D_A_BOOMERANG_H */
include/rel/d/a/d_a_crod/d_a_crod.h
+22
View File
@@ -1,6 +1,28 @@
#ifndef D_A_CROD_H
#define D_A_CROD_H
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "dolphin/types.h"
class daCrod_c {
public:
/* 80141A94 */ void setControllActorData();
/* 804A2E38 */ void createHeap();
/* 804A2F18 */ void create();
/* 804A3304 */ ~daCrod_c();
/* 804A34B0 */ void setRoomInfo();
/* 804A34B4 */ void setMatrix();
/* 804A3500 */ void posMove();
/* 804A3580 */ void setBckAnm(u16);
/* 804A35FC */ void setReturn();
/* 804A365C */ void setLightPower();
/* 804A36D8 */ void execute();
/* 804A3FD4 */ void draw();
static fopAc_ac_c* makeIronBallDummy(fopAc_ac_c* p_actor) {
return (fopAc_ac_c*)fopAcM_fastCreate(0x2F4, 6, &p_actor->mCurrent.mPosition, fopAcM_GetRoomNo(p_actor), NULL, NULL, -1, NULL, NULL);
}
};
#endif /* D_A_CROD_H */
include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
+198
View File
@@ -2,5 +2,203 @@
#define D_A_OBJ_CARRY_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_xyz.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
class daObjCarry_c : public fopAc_ac_c {
public:
enum {
/* 0x0 */ TYPE_TSUBO, // Small Blue Pot
/* 0x1 */ TYPE_OOTSUBO, // Big Red Pot
/* 0x2 */ TYPE_KIBAKO, // Box
/* 0x3 */ TYPE_IRON_BALL, // Cannon Ball
/* 0x4 */ TYPE_TARU, // Barrel
/* 0x5 */ TYPE_DOKURO, // Skull
/* 0x6 */ TYPE_BOKKURI, // Deku Nut
/* 0x7 */ TYPE_TSUBO_2, // Small Red Pot
/* 0x8 */ TYPE_BALL_S, // Light Ball A
/* 0x9 */ TYPE_BALL_S_2, // Light Ball B
/* 0xA */ TYPE_AOTSUBO, // Big Blue Pot
/* 0xB */ TYPE_LV8_BALL,
/* 0xC */ TYPE_TSUBO_S, // Small pot - Twilight
/* 0xD */ TYPE_TSUBO_B, // Big pot - Twilight
};
/* 80031CF8 */ static void clrSaveFlag();
/* 80031D04 */ static void setSaveFlag();
/* 80031D10 */ void chkSaveFlag();
/* 80031D24 */ void getPos(int);
/* 80031D38 */ void savePos(int, cXyz);
/* 80031D64 */ void onSttsFlag(int, u8);
/* 80031D78 */ void offSttsFlag(int, u8);
/* 80031D8C */ void chkSttsFlag(int, u8);
/* 80031DAC */ void setRoomNo(int, s8);
/* 80031DB8 */ void getRoomNo(int);
/* 8046F6A4 */ void data();
/* 8046F6BC */ void getArcName();
/* 8046F6D4 */ void getBmdName();
/* 8046F6EC */ void checkFlag(u8);
/* 8046F724 */ void initBaseMtx();
/* 8046F7AC */ void setBaseMtx();
/* 8046FACC */ void preInit();
/* 8046FB78 */ daObjCarry_c();
/* 8046FFA4 */ void checkBreakWolfAttack();
/* 8046FFF8 */ void checkCarryBoomerang();
/* 80470054 */ void checkCarryHookshot();
/* 80470080 */ void checkCarryWolf();
/* 804700B4 */ void checkCarryOneHand();
/* 804700F0 */ void Create();
/* 804705DC */ void CreateInit_tsubo();
/* 80470650 */ void CreateInit_ootubo();
/* 80470674 */ void CreateInit_kibako();
/* 804706D4 */ void CreateInit_ironball();
/* 804707E0 */ void CreateInit_taru();
/* 80470840 */ void CreateInit_dokuro();
/* 80470890 */ void CreateInit_bokkuri();
/* 804709DC */ void CreateInit_LightBall();
/* 80470AB4 */ void CreateInit_Lv8Ball();
/* 80470B5C */ void CreateHeap();
/* 80470BF4 */ void create();
/* 80470CF0 */ void checkCreate_LightBallA();
/* 8047114C */ void checkCreate_LightBallB();
/* 804715A8 */ void checkCreate_Lv8Ball();
/* 80471680 */ void resetIconPosForLightBallA();
/* 804716D4 */ void setIconPosForLightBallAAtR00();
/* 804717B4 */ void setIconPosForLightBallBAtR00();
/* 80471894 */ void resetIconPosForLightBallB();
/* 804718E8 */ void execute();
/* 8047233C */ void checkCulling();
/* 80472460 */ void draw();
/* 80472730 */ void debugDraw();
/* 80472734 */ void _delete();
/* 80472B54 */ void crr_pos();
/* 80472D8C */ void check_sink(f32*);
/* 80472E5C */ void calc_gravity();
/* 80472EF0 */ void checkRollAngle();
/* 80473050 */ void mode_proc_call();
/* 804733E8 */ void mode_init_wait();
/* 804734B0 */ void mode_proc_wait();
/* 80473718 */ void mode_init_walk(u8);
/* 804737CC */ void mode_proc_walk();
/* 80473ED8 */ void mode_init_carry();
/* 804741A8 */ void mode_proc_carry();
/* 80474448 */ void mode_init_drop(u8);
/* 80474540 */ void mode_proc_drop();
/* 80474618 */ void mode_init_float();
/* 80474734 */ void mode_proc_float();
/* 80474A08 */ void mode_init_sink();
/* 80474B8C */ void mode_proc_sink();
/* 80474D64 */ void mode_init_yogan();
/* 80474E08 */ void mode_proc_yogan();
/* 80474E98 */ bool mode_proc_magne();
/* 80474EA0 */ bool mode_proc_magneCarry();
/* 80474EA8 */ void mode_init_boomCarry();
/* 80474FA8 */ void mode_proc_boomCarry();
/* 80475014 */ void mode_init_growth();
/* 804750C8 */ void mode_proc_growth();
/* 8047515C */ bool mode_proc_end();
/* 80475164 */ void mode_init_dbDrop(u8);
/* 80475210 */ void mode_proc_dbDrop();
/* 80475238 */ void mode_init_hookCarry();
/* 80475354 */ void mode_proc_hookCarry();
/* 80475384 */ void mode_init_fit();
/* 80475450 */ void mode_proc_fit();
/* 80475478 */ void mode_proc_controled();
/* 804754D0 */ void mode_init_resetLightBall();
/* 80475598 */ void mode_proc_resetLightBall();
/* 80475618 */ void chkSinkAll();
/* 8047567C */ void chkWaterLineIn();
/* 804756D4 */ void chkSinkObj();
/* 8047573C */ void bg_check();
/* 80476618 */ void check_bg_damage_proc_base();
/* 80476764 */ void bg_damage_proc_kotubo();
/* 804767C4 */ void bg_damage_proc_ootubo();
/* 804767E4 */ void bg_damage_proc_kibako();
/* 80476804 */ bool bg_damage_proc_ironball();
/* 8047680C */ void bg_damage_proc_taru();
/* 8047682C */ void bg_damage_proc_dokuro();
/* 8047684C */ void bg_damage_proc_bokkuri();
/* 80476930 */ bool bg_damage_proc_LightBall();
/* 80476938 */ bool bg_damage_proc_Lv8Ball();
/* 80476940 */ void obj_break(bool, bool, bool);
/* 80476A5C */ void check_cc_damage_proc_base(bool);
/* 80476B04 */ void cc_damage_proc_kotubo();
/* 80476B68 */ void cc_damage_proc_ootubo();
/* 80476B88 */ void cc_damage_proc_kibako();
/* 80476CE4 */ void cc_damage_proc_ironball();
/* 80476E04 */ void cc_damage_proc_taru();
/* 80476F88 */ void cc_damage_proc_dokuro();
/* 80476FA8 */ void cc_damage_proc_bokkuri();
/* 804771B0 */ bool cc_damage_proc_LightBall();
/* 804771B8 */ bool cc_damage_proc_Lv8Ball();
/* 804771C0 */ void eff_break_tuboBmd(u16, cXyz);
/* 8047731C */ void eff_break_kibakoBmd(cXyz);
/* 8047747C */ void eff_break_tsubo();
/* 804774D4 */ void eff_break_ootubo();
/* 8047752C */ void eff_break_kibako();
/* 80477574 */ void eff_break_ironball();
/* 80477578 */ void eff_break_taru();
/* 804775BC */ void eff_break_dokuro();
/* 80477614 */ void eff_break_bokkuri();
/* 80477798 */ void eff_break_kotubo2();
/* 804777F0 */ void eff_break_LightBall();
/* 804777F4 */ void eff_break_ootubo2();
/* 8047784C */ void eff_break_Lv8Ball();
/* 80477850 */ void eff_break_tsuboL8();
/* 804778A8 */ void eff_break_ootuboL8();
/* 80477900 */ void se_break(cBgS_PolyInfo*);
/* 80477990 */ void se_put(cBgS_PolyInfo*);
/* 80477A14 */ void se_put_water();
/* 80477A98 */ void se_fall_water();
/* 80477B1C */ void calc_rot_axis_base(u8);
/* 80477FE0 */ void calc_rot_axis_tsubo();
/* 80478004 */ void calc_rot_axis_ootubo();
/* 80478028 */ void calc_rot_axis_kibako();
/* 8047814C */ void calc_rot_axis_ironball();
/* 80478170 */ void calc_rot_axis_taru();
/* 80478190 */ void calc_rot_axis_dokuro();
/* 804781B4 */ void calc_rot_axis_bokkuri();
/* 804783C0 */ void calc_rot_axis_kotubo2();
/* 804783E4 */ void calc_rot_axis_LightBall();
/* 80478408 */ void calc_rot_axis_Lv8Ball();
/* 8047842C */ void set_wind_power();
/* 80478808 */ void exec_proc_tsubo();
/* 80478828 */ void exec_proc_ootubo();
/* 80478848 */ void exec_proc_kibako();
/* 8047884C */ void exec_proc_ironball();
/* 804788C4 */ void exec_proc_taru();
/* 804788C8 */ void exec_proc_dokuro();
/* 804788CC */ void exec_proc_bokkuri();
/* 80478C18 */ void exec_proc_LightBall();
/* 80478CE4 */ void exec_proc_Lv8Ball();
/* 80478D78 */ void bg_damage_proc_call();
/* 80478F50 */ void cc_damage_proc_call();
/* 80479128 */ void eff_break_call();
/* 804792D4 */ void calc_rot_call();
/* 80479480 */ void obj_execute_proc_call();
/* 8047962C */ void setTgHitCallBack();
/* 80479648 */ void setCoHitCallBack();
/* 80479664 */ void CreateInitCall();
s32 getType() { return mType; }
static u8 const mData[2072];
private:
/* 0x568 */ u8 field_0x568[8];
/* 0x570 */ J3DModel* field_0x570;
/* 0x574 */ dBgS_Acch field_0x574;
/* 0x74C */ dBgS_AcchCir field_0x74c;
/* 0x78C */ dCcD_Stts field_0x78c;
/* 0x7C8 */ dCcD_Cyl field_0x7c8;
/* 0x904 */ dCcD_Sph field_0x904;
/* 0xA3C */ dCcD_Cps field_0xa3c;
/* 0xB80 */ dCcD_Cyl field_0xb80;
/* 0xCBC */ u8 field_0xcbc[0x34];
/* 0xCF0 */ u8 mType;
/* 0xCF4 */ cXyz field_0xcf4;
/* 0xD00 */
};
#endif /* D_A_OBJ_CARRY_H */
include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h
+22
View File
@@ -1,6 +1,28 @@
#ifndef D_A_TAG_MMSG_H
#define D_A_TAG_MMSG_H
#include "d/a/d_a_player.h"
#include "dolphin/types.h"
class daTagMmsg_c : public fopAc_ac_c {
public:
/* 80D5B918 */ void create();
/* 80D5BAB4 */ ~daTagMmsg_c();
/* 80D5BB30 */ void execute();
void onUseFlg() { mUseFlg = true; }
private:
/* 0x568 */ u8 field_0x568;
/* 0x569 */ u8 field_0x569;
/* 0x56A */ u8 mAttention;
/* 0x56B */ u8 field_0x56b;
/* 0x56C */ bool mUseFlg;
/* 0x56D */ u8 field_0x56d[3];
/* 0x570 */ u16 field_0x570;
/* 0x572 */ u16 field_0x572;
/* 0x574 */ f32 field_0x574;
/* 0x578 */ f32 field_0x578;
};
#endif /* D_A_TAG_MMSG_H */