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

big d_a_alink pass (#214)

Browse Source 
* d_a_alink pass1 wip

* more d_a_alink work

* remove asm

* more daalink work

* 20% dol code decompiled

* fixed some nonmatchings for building

* a few daalink functions and labeling some HIO data
This commit is contained in:
TakaRikka
2022-12-19 11:06:32 -08:00
committed by GitHub
parent 1114b13da8
commit ca71275bbe
727 changed files with 15610 additions and 33013 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+11 -3
View File
@@ -278,6 +278,13 @@ STATIC_ASSERT(sizeof(J3DAnmColorFullData) == 0x34);
class J3DAnmBase {
public:
J3DAnmBase(s16 i_frameMax) {
mAttribute = 0;
field_0x5 = 0;
mFrameMax = i_frameMax;
mFrame = 0.0f;
}
virtual ~J3DAnmBase();
u8 getAttribute() const { return mAttribute; }
@@ -287,6 +294,7 @@ public:
private:
/* 0x4 */ u8 mAttribute;
/* 0x5 */ u8 field_0x5;
/* 0x6 */ s16 mFrameMax;
/* 0x8 */ f32 mFrame;
}; // Size: 0xC
@@ -539,7 +547,7 @@ class J3DAnmCluster : public J3DAnmBase {
public:
/* 8032BCAC */ virtual ~J3DAnmCluster();
/* 8032BF44 */ virtual s32 getKind() const;
/* 8032BF4C */ virtual void getWeight(u16) const;
/* 8032BF4C */ virtual f32 getWeight(u16) const;
private:
/* 0x0C */ f32* field_0xc;
@@ -549,7 +557,7 @@ class J3DAnmClusterFull : public J3DAnmCluster {
public:
/* 8032BCAC */ virtual ~J3DAnmClusterFull();
/* 8032BF44 */ virtual s32 getKind() const;
/* 8032BF4C */ virtual void getWeight(u16) const;
/* 8032BF4C */ virtual f32 getWeight(u16) const;
private:
/* 0x10 */ int field_0x10;
@@ -559,7 +567,7 @@ class J3DAnmClusterKey : public J3DAnmCluster {
public:
/* 8032C044 */ virtual ~J3DAnmClusterKey();
/* 8032C0B0 */ virtual s32 getKind() const;
/* 8032A218 */ virtual void getWeight(u16) const;
/* 8032A218 */ virtual f32 getWeight(u16) const;
private:
/* 0x10 */ int field_0x10;
include/JSystem/J3DGraphAnimator/J3DModelData.h
+1
View File
@@ -47,6 +47,7 @@ public:
bool isLocked() { return mMaterialTable.isLocked(); }
void entryTexMtxAnimator(J3DAnmTextureSRTKey* anm) { mMaterialTable.entryTexMtxAnimator(anm); }
void entryTevRegAnimator(J3DAnmTevRegKey* anm) { mMaterialTable.entryTevRegAnimator(anm); }
void entryTexNoAnimator(J3DAnmTexPattern* anm) { mMaterialTable.entryTexNoAnimator(anm); }
int removeTexNoAnimator(J3DAnmTexPattern* anm) {
return mMaterialTable.removeTexNoAnimator(anm);
}
include/JSystem/J3DGraphBase/J3DMaterial.h
+2
View File
@@ -61,6 +61,8 @@ public:
}
J3DNBTScale* getNBTScale() const { return mTexGenBlock->getNBTScale(); }
void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
public:
/* 0x04 */ J3DMaterial* mNext;
/* 0x08 */ J3DShape* mShape;
include/JSystem/J3DGraphBase/J3DShapeMtx.h
+1
View File
@@ -50,6 +50,7 @@ public:
static void setCurrentPipeline(u32 pipeline) { sCurrentPipeline = pipeline; }
static void setLODFlag(u8 flag) { struct_804515B0[1] = flag; }
static u8 getLODFlag() { return struct_804515B0[1]; }
static void resetMtxLoadCache();
private:
include/JSystem/J3DGraphLoader/J3DAnmLoader.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "dolphin/types.h"
enum J3DAnmLoaderDataBaseFlag { UNK_FLAG0 };
enum J3DAnmLoaderDataBaseFlag { J3DLOADER_UNK_FLAG0 };
struct J3DAnmBase;
include/JSystem/JAudio2/JAISeMgr.h
+4
View File
@@ -39,6 +39,8 @@ public:
/* 8029F8B0 */ virtual bool isUsingSeqData(JAISeqDataRegion const&);
/* 8029F91C */ virtual void releaseSeqData(JAISeqDataRegion const&);
JAISoundParamsMove* getParams() { return &mParams; }
/* 0x04 */ JASNonCopyable field_0x4;
/* 0x08 */ JAISoundParamsMove mParams;
/* 0x58 */ JSUList<JAISe> mSeList;
@@ -66,6 +68,8 @@ public:
/* 802A0168 */ virtual bool isUsingSeqData(JAISeqDataRegion const&);
/* 802A01D8 */ virtual void releaseSeqData(JAISeqDataRegion const&);
JAISeCategoryMgr* getCategory(int categoryIndex) { return &mCategoryMgrs[categoryIndex]; }
private:
/* 0x008 */ JAIAudience* mAudience;
/* 0x00C */ JAISeqDataMgr* mSeqDataMgr;
include/JSystem/JKernel/JKRArchive.h
+3 -4
View File
@@ -62,7 +62,7 @@ public:
u32 name_offset;
u16 field_0x8;
u16 num_entries;
s32 first_file_index;
u32 first_file_index;
};
struct SDIFileEntry {
@@ -163,8 +163,9 @@ public:
/* vt[19] */ virtual u32 getExpandSize(SDIFileEntry*) const;
u32 countFile() const { return mArcInfoBlock->num_file_entries; }
s32 countDirectory() const { return mArcInfoBlock->num_nodes; }
protected:
public:
/* 0x00 */ // vtable
/* 0x04 */ // JKRFileLoader
/* 0x38 */ JKRHeap* mHeap;
@@ -173,8 +174,6 @@ protected:
/* 0x40 */ s32 mEntryNum;
/* 0x44 */ SArcDataInfo* mArcInfoBlock;
/* 0x48 */ SDIDirEntry* mNodes;
public:
/* 0x4C */ SDIFileEntry* mFiles;
protected:
include/JSystem/JKernel/JKRDvdFile.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
/* vt[07] */ virtual s32 getFileSize(void) const; /* override */
/* vt[08] */ virtual bool open(s32);
private:
// private:
/* 0x00 */ // vtable
/* 0x04 */ // JKRFile
/* 0x1C */ OSMutex mMutex1;
include/JSystem/JKernel/JKRSolidHeap.h
+1 -1
View File
@@ -21,7 +21,7 @@ protected:
void* allocFromHead(u32, int);
void* allocFromTail(u32, int);
s32 getUsedSize() { return mSize - getTotalFreeSize(); }
static s32 getUsedSize(JKRSolidHeap* heap) { return heap->mSize - heap->getTotalFreeSize(); }
public:
/* vt[04] */ virtual u32 getHeapType(void); /* override */
include/JSystem/JMath/JMath.h
+11 -1
View File
@@ -11,9 +11,19 @@ inline f32 JMAFastReciprocal(f32 value) {
return __fres(value);
}
inline float __frsqrtes(register double f) {
register float out;
// clang-format off
asm {
frsqrte out, f
}
// clang-format on
return out;
}
inline f32 JMAFastSqrt(f32 input) {
if (input > 0.0f) {
f64 tmp = __frsqrte(input);
f32 tmp = __frsqrtes(input);
return tmp * input;
}
return input;
include/JSystem/JParticle/JPAMath.h
+3 -1
View File
@@ -2,8 +2,10 @@
#define JPAMATH_H
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
#include "JSystem/JGeometry.h"
void JPAGetXYZRotateMtx(s16 x, s16 y, s16 z, Mtx dst);
void JPASetRMtxTVecfromMtx(f32 const (*param_0)[4], f32 (*param_1)[4],
JGeometry::TVec3<f32>* param_2);
#endif /* JPAMATH_H */
include/JSystem/JParticle/JPAParticle.h
+4
View File
@@ -9,6 +9,7 @@
#include "JSystem/JParticle/JPADynamicsBlock.h"
#include "JSystem/JParticle/JPAResource.h"
#include "JSystem/JParticle/JPAMath.h"
class JKRHeap;
class JPABaseEmitter;
@@ -205,6 +206,7 @@ public:
enum {
JPAEmtrStts_StopEmit = 0x01,
JPAEmtrStts_StopCalc = 0x02,
JPAEmtrStts_StopDraw = 0x04,
JPAEmtrStts_FirstEmit = 0x10,
JPAEmtrStts_RateStepEmit = 0x20,
JPAEmtrStts_Immortal = 0x40,
@@ -234,6 +236,7 @@ public:
u8 getDrawTimes() const { return mDrawTimes; }
void setRate(f32 rate) { mRate = rate; }
void setEmitterCallBackPtr(JPAEmitterCallBack* ptr) { mpEmtrCallBack = ptr; }
void setGlobalRTMatrix(const Mtx m) { JPASetRMtxTVecfromMtx(m, mGlobalRot, &mGlobalTrs); }
f32 get_r_f() { return mRndm.get_rndm_f(); }
f32 get_r_zp() { return mRndm.get_rndm_zp(); }
@@ -251,6 +254,7 @@ public:
void quitImmortalEmitter() { clearStatus(JPAEmtrStts_Immortal); }
void stopCalcEmitter() { setStatus(JPAEmtrStts_StopCalc); }
void playCalcEmitter() { clearStatus(JPAEmtrStts_StopCalc); }
void stopDrawParticle() { setStatus(JPAEmtrStts_StopDraw); }
public:
/* 0x00 */ Vec mLocalScl;
include/JSystem/JStudio/JStudio/functionvalue.h
+2 -2
View File
@@ -167,7 +167,7 @@ private:
f64 fValue_;
};
class TFunctionValue_composite : TFunctionValue, TFunctionValueAttribute_refer {
class TFunctionValue_composite : public TFunctionValue, public TFunctionValueAttribute_refer {
public:
struct TData {
TData(void* data) : u32data((u32)data) {}
@@ -216,7 +216,7 @@ public:
const TData* data_getData() const { return &data; }
void data_setData(const TData& dat) { data = dat; }
private:
// private:
UnkFunc pfn_;
TData data;
};
include/JSystem/JStudio/JStudio/jstudio-control.h
+2
View File
@@ -68,6 +68,8 @@ public:
transform_setOrigin_TxyzRy(xyz, rotY);
}
void setSecondPerFrame(double param_0) { mSecondPerFrame = param_0; }
/* 0x58 */ f64 mSecondPerFrame;
/* 0x60 */ fvb::TControl fvb_Control;
/* 0x74 */ ctb::TControl ctb_Control;
include/JSystem/JSupport/JSUList.h
+1 -1
View File
@@ -147,7 +147,7 @@ public:
T* operator->() { return this->getObject(); }
private:
// private:
JSULink<T>* mLink;
};
include/JSystem/JUtility/JUTConsole.h
+2 -1
View File
@@ -19,7 +19,8 @@ public:
enum OutputFlag {
/* 0x0 */ OUTPUT_NONE,
/* 0x1 */ OUTPUT_OSREPORT,
/* 0x2 */ OUTPUT_CONSOLE
/* 0x2 */ OUTPUT_CONSOLE,
/* 0x3 */ OUTPUT_OSR_AND_CONSOLE,
};
/* 802E73E4 */ static JUTConsole* create(unsigned int, void*, u32);
include/JSystem/JUtility/JUTDirectFile.h
+9
View File
@@ -3,4 +3,13 @@
#include "dolphin/types.h"
struct JUTDirectFile {
/* 802E8730 */ void fetch32byte();
/* 802E87F8 */ JUTDirectFile();
/* 802E881C */ ~JUTDirectFile();
/* 802E8860 */ bool fopen(char const*);
/* 802E88FC */ bool fclose();
/* 802E8958 */ int fgets(void*, int);
};
#endif /* JUTDIRECTFILE_H */
include/JSystem/JUtility/JUTFader.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 0x0A */ u16 field_0xa;
/* 0x0C */ JUtility::TColor mColor;
/* 0x10 */ JGeometry::TBox2<f32> mBox;
/* 0x20 */ EStatus mEStatus;
/* 0x20 */ int mEStatus;
/* 0x24 */ u32 field_0x24;
};
include/SSystem/SComponent/c_bg_s_lin_chk.h
+1
View File
@@ -31,6 +31,7 @@ public:
void SetHit() { field_0x4c |= 16; }
u32 ChkHit() const { return field_0x4c & 16; }
void SetCross(const cXyz& pos) { mLin.SetEnd(pos); }
cXyz& i_GetCross() { return mLin.GetEnd(); }
cM3dGLin* GetLinP() { return &mLin; }
bool ChkBackFlag() const { return mBackFlag; }
bool ChkFrontFlag() const { return mFrontFlag; }
include/SSystem/SComponent/c_cc_d.h
+11
View File
@@ -11,6 +11,11 @@
#include "f_op/f_op_actor.h"
#include "global.h"
enum CcG_Tg_HitMark {
CcG_Tg_UNK_MARK_6 = 6,
CcG_Tg_UNK_MARK_8 = 8,
};
class cCcD_PntAttr;
class cCcD_CpsAttr;
class cCcD_TriAttr;
@@ -341,6 +346,7 @@ public:
u32 MskType(u32 msk) const { return mType & msk; }
void SetType(u32 type) { mType = type; }
void SetAtp(int atp) { mAtp = atp; }
void ClrSet() { OffSPrmBit(1); }
protected:
/* 0x10 */ int mType;
@@ -361,6 +367,7 @@ public:
void SetType(u32 type) { mType = type; }
u32 GetGrp() const { return MskSPrm(0x1E); }
bool ChkSet() const { return MskSPrm(1); }
void ClrSet() { OffSPrmBit(1); }
private:
/* 0x10 */ int mType;
@@ -429,6 +436,10 @@ public:
void OffCoSetBit() { mObjCo.ClrSet(); }
void SetTgType(u32 type) { mObjTg.SetType(type); }
void OnTgSPrmBit(u32 flag) { mObjTg.OnSPrmBit(flag); }
void OffAtSetBit() { mObjAt.ClrSet(); }
void OnTgSetBit() { mObjTg.OnSPrmBit(1); }
void OffTgSetBit() { mObjTg.ClrSet(); }
void OnCoSetBit() { mObjCo.OnSPrmBit(1); }
}; // Size = 0x40
include/SSystem/SComponent/c_lib.h
+31 -31
View File
@@ -4,47 +4,46 @@
#include "MSL_C/math.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
inline bool cLib_IsZero(f32 f) {
return fabsf(f) < 8e-11f;
inline bool cLib_IsZero(f32 value) {
return fabsf(value) < 8e-11f;
}
void cLib_memCpy(void* dst, const void* src, unsigned long size);
void cLib_memSet(void* ptr, int value, unsigned long size);
float cLib_addCalc(float*, float, float, float, float);
void cLib_addCalc2(float*, float, float, float);
void cLib_addCalc0(float*, float, float);
float cLib_addCalcPos(cXyz*, const cXyz&, float, float, float);
float cLib_addCalcPosXZ(cXyz*, const cXyz&, float, float, float);
void cLib_addCalcPos2(cXyz*, const cXyz&, float, float);
void cLib_addCalcPosXZ2(cXyz*, const cXyz&, float, float);
short cLib_addCalcAngleS(short*, short, short, short, short);
void cLib_addCalcAngleS2(short*, short, short, short);
f32 cLib_addCalc(f32* o_value, f32 target, f32 scale, f32 maxStep, f32 minStep);
void cLib_addCalc2(f32* o_value, f32 target, f32 scale, f32 maxStep);
void cLib_addCalc0(f32* o_value, f32 scale, f32 maxStep);
f32 cLib_addCalcPos(cXyz* o_value, cXyz const& target, f32 scale, f32 maxStep, f32 minStep);
f32 cLib_addCalcPosXZ(cXyz* o_value, cXyz const& target, f32 scale, f32 maxStep, f32 minStep);
void cLib_addCalcPos2(cXyz* o_value, cXyz const& target, f32 scale, f32 maxStep);
void cLib_addCalcPosXZ2(cXyz* o_value, cXyz const& target, f32 scale, f32 maxStep);
s16 cLib_addCalcAngleS(s16* o_value, s16 target, s16 scale, s16 maxStep, s16 minStep);
void cLib_addCalcAngleS2(s16* o_value, s16 target, s16 scale, s16 maxStep);
int cLib_chaseUC(unsigned char*, unsigned char, unsigned char);
int cLib_chaseS(short*, short, short);
int cLib_chaseF(float* value, float target, float step);
int cLib_chasePos(cXyz*, const cXyz&, float);
int cLib_chasePosXZ(cXyz*, const cXyz&, float);
int cLib_chaseAngleS(short*, short, short);
int cLib_chaseUC(u8* o_value, u8 target, u8 step);
int cLib_chaseS(s16* o_value, s16 target, s16 step);
int cLib_chaseF(f32* o_value, f32 target, f32 step);
int cLib_chasePos(cXyz* o_value, cXyz const& target, f32 step);
int cLib_chasePosXZ(cXyz* o_value, cXyz const& target, f32 step);
int cLib_chaseAngleS(s16* o_value, s16 target, s16 step);
s16 cLib_targetAngleY(const Vec* lhs, const Vec* rhs);
s16 cLib_targetAngleY(const Vec& lhs, const Vec& rhs);
short cLib_targetAngleX(const cXyz*, const cXyz*);
s16 cLib_targetAngleX(const cXyz*, const cXyz*);
void cLib_offsetPos(cXyz*, const cXyz*, short, const cXyz*);
void cLib_offsetPos(cXyz* pDest, cXyz const* pSrc, s16 angle, cXyz const* vec);
s32 cLib_distanceAngleS(s16 x, s16 y);
inline void cLib_offBit(u8& pVar, u8 pBit) {
pVar &= ~pBit;
inline void cLib_offBit(u8& value, u8 bit) {
value &= ~bit;
}
inline void cLib_onBit(u8& pVar, u8 pBit) {
pVar |= pBit;
inline void cLib_onBit(u8& value, u8 bit) {
value |= bit;
}
inline u8 cLib_checkBit(u8& pVar, u8 pBit) {
return pVar & pBit;
inline u8 cLib_checkBit(u8& value, u8 bit) {
return value & bit;
}
template <typename T>
@@ -53,11 +52,12 @@ inline T cLib_minMaxLimit(T val, T min, T max) {
if (val < min) {
ret = min;
} else {
ret = max;
if (val <= max) {
ret = val;
if (val > max) {
val = max;
}
ret = val;
}
return ret;
}
@@ -65,8 +65,8 @@ template <typename T>
T cLib_calcTimer(T* val);
void MtxInit(void);
void MtxTrans(float, float, float, unsigned char);
void MtxScale(float, float, float, unsigned char);
void MtxTrans(f32, f32, f32, u8);
void MtxScale(f32, f32, f32, u8);
void MtxPosition(cXyz*, cXyz*);
void MtxPush(void);
Mtx* MtxPull(void);
include/SSystem/SComponent/c_m3d_g_cyl.h
+4 -3
View File
@@ -24,15 +24,16 @@ public:
virtual ~cM3dGCyl() {}
void Set(const cM3dGCylS&);
void Set(const cXyz&, f32, f32);
void SetC(const cXyz&);
void SetH(f32);
void SetR(f32);
void SetC(const cXyz& pos);
void SetH(f32 h);
void SetR(f32 r);
bool cross(const cM3dGSph*, cXyz*) const;
bool cross(const cM3dGCyl*, cXyz*) const;
void calcMinMax(cXyz*, cXyz*);
const cXyz& GetCP(void) const { return mCenter; }
f32 GetR(void) const { return mRadius; }
f32 GetH(void) const { return mHeight; }
cXyz& GetC() { return mCenter; }
bool Cross(const cM3dGCps* cps, cXyz* xyz) const { return cM3d_Cross_CpsCyl(*cps, *this, xyz); }
bool Cross(const cM3dGTri& tri, cXyz* xyz) const { return cM3d_Cross_CylTri(this, &tri, xyz); }
include/SSystem/SComponent/c_m3d_g_lin.h
+1
View File
@@ -25,6 +25,7 @@ public:
cXyz& GetStartP(void) { return mStart; }
const cXyz& GetEndP(void) const { return mEnd; }
cXyz& GetEndP(void) { return mEnd; }
cXyz& GetEnd() { return mEnd; }
}; // Size = 0x1C
STATIC_ASSERT(0x1C == sizeof(cM3dGLin));
include/SSystem/SComponent/c_math.h
+8
View File
@@ -29,4 +29,12 @@ inline s16 cM_deg2s(f32 val) {
return val * 182.04445f;
}
inline f32 cM_fsin(f32 v) {
return JMASSin(cM_rad2s(v));
}
inline f32 cM_sht2d(f32 v) {
return v * 0.005493164f;
}
#endif /* C_MATH_H */
include/SSystem/SComponent/c_xyz.h
+1 -5
View File
@@ -54,11 +54,7 @@ struct cXyz : Vec {
z -= f;
}
void operator-=(const Vec& other) { PSVECSubtract(this, &other, this); }
void operator+=(const Vec& vec) {
x += vec.x;
y += vec.y;
z += vec.z;
}
void operator+=(const Vec& other) { PSVECAdd(this, &other, this); }
void operator*=(f32 scale) { PSVECScale(this, this, scale); }
/* 80266C6C */ cXyz getCrossProduct(Vec const&) const;
/* 80266CBC */ cXyz outprod(Vec const&) const;
include/Z2AudioLib/Z2Creature.h
+4
View File
@@ -72,6 +72,10 @@ public:
int startHitItemSE(u32, u32, Z2SoundObjBase*, float);
void setResumeAttack(bool);
void setInWater(bool status) {
mFlags = (u8)((mFlags & ~0x40) | ((status << 6) & 0x40)); // what is going on here
}
static Z2CreatureLink* mLinkPtr;
private:
include/Z2AudioLib/Z2SoundHandles.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
u32 getNumHandles() const { return this->getNumLinks(); }
private:
u8 mNumHandles;
/* 0xC */ u8 mNumHandles;
};
#endif /* Z2SOUNDHANDLES_H */
include/Z2AudioLib/Z2SoundMgr.h
+3
View File
@@ -27,6 +27,9 @@ public:
/* 802A9EE8 */ /* virtual */ void startSound(JAISoundID, JAISoundHandle*,
JGeometry::TVec3<f32> const*);
/* 0x000 */ void* vtable; // remove later
JAISeMgr* getSeMgr() { return &mSeMgr; }
private:
/* 0x004 */ JAISeMgr mSeMgr;
/* 0x728 */ JAISeqMgr mSeqMgr;
include/Z2AudioLib/Z2SoundObject.h
+15 -1
View File
@@ -72,14 +72,28 @@ public:
};
class Z2DopplerSoundObjBase : public Z2SoundHandles {
public:
Z2DopplerSoundObjBase();
~Z2DopplerSoundObjBase();
virtual void temp(); // temp to build OK, remove later
virtual void framework(u32, s8);
virtual void init(Vec*, u8);
virtual void startSound(JAISoundID, u32, s8);
virtual void startLevelSound(JAISoundID, u32, s8);
/* 0x14 */ Z2SoundStarter* field_0x14;
/* 0x18 */ JGeometry::TVec3<f32>* field_0x18;
/* 0x1C */ u16 field_0x1c;
/* 0x1E */ u8 field_0x1e;
/* 0x1F */ bool field_0x1f;
/* 0x20 */ JGeometry::TVec3<f32> field_0x20;
/* 0x2C */ JGeometry::TVec3<f32> field_0x2c;
};
class Z2SoundObjArrow : public Z2DopplerSoundObjBase {
public:
/* 802BEB38 */ Z2SoundObjArrow();
/* 802BEB74 */ virtual void init(Vec*, u8);
};
#endif /* Z2SOUNDOBJECT_H */
include/c/c_dylink.h
+1
View File
@@ -18,5 +18,6 @@ struct DynamicNameTableEntry {
};
int cDyl_InitAsyncIsDone();
void cDyl_InitAsync();
#endif /* C_C_DYLINK_H */
include/d/a/d_a_alink.h
+1316 -1308
View File
File diff suppressed because it is too large Load Diff
include/d/a/d_a_player.h
+122 -32
View File
@@ -21,6 +21,9 @@ public:
/* 8015F384 */ void setSightImage(ResTIMG*);
bool getDrawFlg() { return mDrawFlag; }
void onDrawFlg() { mDrawFlag = true; }
void offDrawFlg() { mDrawFlag = false; }
void setPos(const cXyz* i_pos) { mPos = *i_pos; }
private:
/* 0x04 */ bool mDrawFlag;
@@ -37,6 +40,9 @@ public:
/* 8015E654 */ int posMove(cXyz*, s16*, fopAc_ac_c*, s16);
/* 8015E87C */ void bgCheckAfterOffset(cXyz const*);
static void initDropAngleY() { m_dropAngleY = 0x4000; }
static void offEventKeepFlg() { m_eventKeepFlg = 0; }
static s16 m_dropAngleY;
static s16 m_eventKeepFlg;
@@ -138,15 +144,18 @@ public:
void setSpecialDemoType();
void setDemoType(u16 pType) { mDemoType = pType; }
u16 getDemoType() const { return mDemoType; }
int getDemoType() const { return mDemoType; }
void setDemoMode(u32 mode) { mDemoMode = mode; }
u32 getDemoMode() const { return mDemoMode; }
int getParam1() const { return mParam1; }
void setOriginalDemoType() { setDemoType(3); }
void i_setSpecialDemoType() { setDemoType(5); }
void setSystemDemoType() { setDemoType(2); }
void setStick(f32 stick) { mStick = stick; }
void setMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
s16 getMoveAngle() const { return mDemoMoveAngle; }
f32 getStick() { return mStick; }
int getParam0() const { return mParam0; }
private:
/* 0x00 */ u16 mDemoType;
@@ -156,7 +165,7 @@ private:
/* 0x08 */ int mParam0;
/* 0x0C */ int mParam1;
/* 0x10 */ u32 mDemoMode;
/* 0x14 */ float mStick;
/* 0x14 */ f32 mStick;
/* 0x18 */ cXyz mDemoPos0;
}; // Size: 0x24
@@ -191,8 +200,8 @@ public:
/* 0x05BC */ cXyz mSwordTopPos;
/* 0x05C8 */ cXyz mLeftHandPos;
/* 0x05D4 */ cXyz mRightHandPos;
/* 0x05E0 */ cXyz mLeftFootPosP;
/* 0x05EC */ cXyz mRightFootPosP;
/* 0x05E0 */ cXyz mLeftFootPos;
/* 0x05EC */ cXyz mRightFootPos;
/* 0x05F8 */ u8 field_0x5f8[0xC];
/* 0x0604 */ daPy_demo_c mDemo;
@@ -221,25 +230,34 @@ public:
FLG0_UNK_2 = 2,
FLG0_HVY_STATE = FLG0_UNK_40000000 | FLG0_EQUIP_HVY_BOOTS | FLG0_UNK_20000,
FLG0_UNK_14000 = 0x14000,
};
enum daPy_FLG1 {
FLG1_UNK_40000000 = 0x40000000,
FLG1_UNK_10000000 = 0x10000000,
FLG1_UNK_4000000 = 0x4000000,
FLG1_IS_WOLF = 0x2000000,
FLG1_UNK_400000 = 0x400000,
FLG1_DASH_MODE = 0x400000,
FLG1_UNK_10000 = 0x10000,
FLG1_UNK_8000 = 0x8000,
FLG1_THROW_DAMAGE = 0x4000,
FLG1_UNK_80 = 0x80,
FLG1_UNK_40 = 0x40,
FLG1_UNK_20 = 0x20,
FLG1_UNK_10 = 0x10,
FLG1_UNK_4 = 4,
FLG1_UNK_2 = 2,
FLG1_UNK_1 = 1,
};
enum daPy_FLG2 {
FLG2_UNK_20000000 = 0x20000000,
FLG2_UNK_10000000 = 0x10000000,
FLG2_UNK_4080000 = 0x4080000,
FLG2_UNK_2080000 = 0x2080000,
FLG2_BOAR_SINGLE_BATTLE = 0x1800000,
FLG2_UNK_8000000 = 0x8000000,
FLG2_UNK_1000000 = 0x1000000,
FLG2_UNK_800000 = 0x800000,
FLG2_STATUS_WINDOW_DRAW = 0x400000,
@@ -250,6 +268,8 @@ public:
FLG2_UNK_20000 = 0x20000,
FLG2_SCN_CHG_START = 0x8000,
FLG2_UNK_4000 = 0x4000,
FLG2_UNK_1000 = 0x1000,
FLG2_UNK_200 = 0x200,
FLG2_UNK_80 = 0x80,
FLG2_UNK_40 = 0x40,
FLG2_UNK_10 = 0x10,
@@ -262,15 +282,25 @@ public:
enum daPy_FLG3 {
FLG3_UNK_40000000 = 0x40000000,
FLG3_UNK_20000000 = 0x20000000,
FLG3_UNK_4000000 = 0x4000000,
FLG3_UNK_2000000 = 0x2000000,
FLG3_UNK_1000000 = 0x1000000,
FLG3_UNK_100000 = 0x100000,
FLG3_UNK_80000 = 0x80000,
FLG3_COPY_ROD_THROW_AFTER = 0x40000,
FLG3_UNK_4000 = 0x4000,
FLG3_UNK_200 = 0x200,
FLG3_UNK_100 = 0x100,
FLG3_UNK_40 = 0x40,
FLG3_UNK_20 = 0x20,
FLG3_UNK_10 = 0x10,
FLG3_UNK_4 = 4,
};
enum daPy_ERFLG0 {
ERFLG0_UNK_40000000 = 0x40000000,
ERFLG0_UNK_10000000 = 0x10000000,
ERFLG0_UNK_8000000 = 0x8000000,
ERFLG0_UNK_2000000 = 0x2000000,
ERFLG0_UNK_1000000 = 0x1000000,
@@ -279,8 +309,12 @@ public:
ERFLG0_UNK_200000 = 0x200000,
ERFLG0_UNK_100000 = 0x100000,
ERFLG0_UNK_2000 = 0x2000,
ERFLG0_UNK_1000 = 0x1000,
ERFLG0_UNK_400 = 0x400,
ERFLG0_UNK_100 = 0x100,
ERFLG0_UNK_80 = 0x80,
ERFLG0_UNK_40 = 0x40,
ERFLG0_UNK_8 = 8,
ERFLG0_UNK_4 = 4,
ERFLG0_UNK_2 = 2,
ERFLG0_UNK_1 = 1,
@@ -288,11 +322,19 @@ public:
enum daPy_ERFLG1 {
ERFLG1_GANON_FINISH = 0x80000000,
ERFLG1_UNK_40000000 = 0x40000000,
ERFLG1_UNK_10000000 = 0x10000000,
ERFLG1_UNK_4000000 = 0x4000000,
ERFLG1_UNK_40000 = 0x40000,
ERFLG1_UNK_2000 = 0x2000,
ERFLG1_UNK_800 = 0x800,
ERFLG1_UNK_400 = 0x400,
ERFLG1_UNK_200 = 0x200,
ERFLG1_UNK_100 = 0x100,
ERFLG1_UNK_80 = 0x80,
ERFLG1_UNK_10 = 0x10,
ERFLG1_UNK_20 = 0x20,
ERFLG1_UNK_8 = 8,
ERFLG1_UNK_4 = 4,
ERFLG1_UNK_2 = 2,
ERFLG1_UNK_1 = 1,
@@ -300,11 +342,13 @@ public:
enum daPy_ERFLG2 {
ERFLG2_UNK_100 = 0x100,
ERFLG2_UNK_40 = 0x40,
ERFLG2_UNK_20 = 0x20,
};
enum daPy_RFLG0 {
RFLG0_UNK_8000000 = 0x8000000,
RFLG0_UNK_4000000 = 0x4000000,
RFLG0_UNK_4000 = 0x4000,
RFLG0_ENEMY_ATTN_LOCK = 0x1000,
RFLG0_UNK_400 = 0x400,
@@ -314,6 +358,11 @@ public:
RFLG0_UNK_2 = 0x2,
};
enum daPy_RFLG1 {
RFLG1_UNK_30 = 0x30,
RFLG1_UNK_2 = 0x2,
};
enum {
/* 0x01 */ SMODE_SUMO_READY = 1,
/* 0x25 */ SMODE_SUMO_LOSE = 37,
@@ -324,28 +373,51 @@ public:
};
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,
/* 0x01 */ CUT_TYPE_NM_VERTICAL = 1,
/* 0x02 */ CUT_TYPE_NM_STAB,
/* 0x03 */ CUT_TYPE_NM_RIGHT,
/* 0x04 */ CUT_TYPE_NM_LEFT,
/* 0x05 */ CUT_TYPE_HEAD_JUMP, // Helm Splitter
/* 0x06 */ CUT_TYPE_FINISH_LEFT,
/* 0x07 */ CUT_TYPE_FINISH_VERTICAL,
/* 0x08 */ CUT_TYPE_TURN_RIGHT,
/* 0x0A */ CUT_TYPE_JUMP = 10,
/* 0x0B */ CUT_TYPE_DASH_UNK_B,
/* 0x0C */ CUT_TYPE_DASH_UNK_C,
/* 0x0D */ CUT_TYPE_DASH_UNK_D,
/* 0x10 */ CUT_TYPE_AIR = 0x10,
/* 0x11 */ CUT_TYPE_DASH_UNK_11,
/* 0x12 */ CUT_TYPE_LARGE_JUMP_INIT,
/* 0x13 */ CUT_TYPE_LARGE_JUMP,
/* 0x14 */ CUT_TYPE_LARGE_JUMP_FINISH,
/* 0x15 */ CUT_TYPE_FINISH_RIGHT,
/* 0x16 */ CUT_TYPE_TURN_LEFT,
/* 0x17 */ CUT_TYPE_LARGE_TURN_LEFT,
/* 0x18 */ CUT_TYPE_LARGE_TURN_RIGHT,
/* 0x1A */ CUT_TYPE_MORTAL_DRAW_A = 0x1A,
/* 0x1E */ CUT_TYPE_TWIRL = 0x1E, // Back Slice
/* 0x1F */ CUT_TYPE_MORTAL_DRAW_B,
/* 0x20 */ CUT_TYPE_FINISH_STAB,
/* 0x21 */ CUT_TYPE_COMBO_STAB,
/* 0x22 */ CUT_TYPE_HORSE_UNK_22,
/* 0x23 */ CUT_TYPE_HORSE_UNK_23,
/* 0x25 */ CUT_TYPE_DASH_UNK_25 = 0x25,
/* 0x26 */ CUT_TYPE_DASH_UNK_26 = 0x26,
/* 0x27 */ CUT_TYPE_DOWN,
/* 0x29 */ CUT_TYPE_GUARD_ATTACK = 0x29,
/* 0x2A */ CUT_TYPE_HORSE_UNK_2A,
/* 0x2B */ CUT_TYPE_HORSE_TURN,
/* 0x2C */ CUT_TYPE_WOLF_B_LEFT,
/* 0x2D */ CUT_TYPE_WOLF_B_RIGHT,
/* 0x2E */ CUT_TYPE_WOLF_B_FRONT,
/* 0x2F */ CUT_TYPE_WOLF_B_BACK,
/* 0x31 */ CUT_TYPE_WOLF_UNK_31 = 0x31,
/* 0x32 */ CUT_TYPE_WOLF_UNK_32,
/* 0x33 */ CUT_TYPE_WOLF_TURN_LEFT,
/* 0x34 */ CUT_TYPE_WOLF_TURN_RIGHT,
/* 0x36 */ CUT_TYPE_WOLF_LOCK = 0x36,
/* 0x38 */ CUT_TYPE_DASH_UNK_38 = 0x38,
/* 0x39 */ CUT_TYPE_WOLF_UNK_39,
};
static u32 setParamData(int, int, int, int);
@@ -360,7 +432,7 @@ public:
static BOOL checkTradeItem(int);
static BOOL checkDungeonWarpItem(int);
static BOOL checkMasterSwordEquip();
bool checkWoodShieldEquip();
static BOOL checkWoodShieldEquip();
f32 getAttentionOffsetY();
s16 checkNowWolfEyeUp();
static void forceRestartRoom(int, u32, int);
@@ -458,7 +530,7 @@ public:
virtual BOOL checkGoatThrowAfter() const;
virtual BOOL checkWolfTagLockJump() const;
virtual BOOL checkWolfTagLockJumpLand() const;
virtual bool checkWolfRope();
virtual BOOL checkWolfRope();
virtual BOOL checkWolfRopeHang() const;
virtual BOOL checkRollJump() const;
virtual BOOL checkGoronRideWait() const;
@@ -537,7 +609,7 @@ public:
virtual s16 getBoardCutTurnOffsetAngleY() const;
virtual cXyz* getMagneHitPos();
virtual cXyz* getMagneBootsTopVec();
virtual bool getKandelaarFlamePos();
virtual cXyz* getKandelaarFlamePos();
virtual bool checkUseKandelaar(int);
virtual void setDkCaught(fopAc_ac_c*);
virtual void onPressedDamage(cXyz const&, short);
@@ -550,8 +622,8 @@ public:
virtual bool checkSpinnerPathMove();
virtual bool checkSpinnerTriggerAttack();
virtual void onSpinnerPathForceRemove();
virtual bool getIronBallBgHit() const;
virtual bool getIronBallCenterPos();
virtual s16 getIronBallBgHit() const;
virtual cXyz* getIronBallCenterPos();
virtual bool checkCanoeFishingGetLeft() const;
virtual bool checkCanoeFishingGetRight() const;
virtual u8 checkBeeChildDrink() const;
@@ -604,16 +676,28 @@ public:
}
bool i_getSumouMode() const { return getSumouCameraMode(); }
void i_cancelOriginalDemo() {
mDemo.setSystemDemoType();
mDemo.setDemoMode(1);
}
bool checkStatusWindowDraw() { return i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); }
bool checkCargoCarry() const { return mSpecialMode == SMODE_CARGO_CARRY; }
bool getHeavyStateAndBoots() { return i_checkNoResetFlg0(FLG0_HVY_STATE); }
bool checkEnemyAttentionLock() const { return i_checkResetFlg0(RFLG0_ENEMY_ATTN_LOCK); }
bool checkCanoeSlider() const { return mSpecialMode == 0x2D; }
bool checkGoatStopGame() const { return mSpecialMode == 0x2A; }
bool i_checkGoronSideMove() const { return mSpecialMode == 0x2B; }
u8 getCutType() const { return mCutType; }
u16 getSwordAtUpTime() const { return mSwordUpTimer; }
bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); }
bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); }
void offGoronSideMove() {
if (i_checkGoronSideMove()) {
mSpecialMode = 0;
}
}
// some functions use these function as an inline
// is there a better way to handle this?
@@ -628,6 +712,7 @@ public:
void i_onNoResetFlg3(int pFlg) { mNoResetFlg3 |= pFlg; }
void i_offNoResetFlg0(int pFlg) { mNoResetFlg0 &= ~pFlg; }
void i_offNoResetFlg1(int pFlg) { mNoResetFlg1 &= ~pFlg; }
void i_offNoResetFlg2(int pFlg) { mNoResetFlg2 &= ~pFlg; }
void i_offNoResetFlg3(int pFlg) { mNoResetFlg3 &= ~pFlg; }
@@ -637,11 +722,13 @@ public:
void i_onEndResetFlg0(int flag) { mEndResetFlg0 |= flag; }
void i_onEndResetFlg2(int flag) { mEndResetFlg2 |= flag; }
void i_offEndResetFlg2(daPy_ERFLG2 flag) { mEndResetFlg2 &= ~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; }
int i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 flag) const { return mEndResetFlg1 & flag; }
int i_checkEndResetFlg2(daPy_py_c::daPy_ERFLG2 flag) const { return mEndResetFlg2 & flag; }
void i_onEndResetFlg1(daPy_ERFLG1 pFlg) { mEndResetFlg1 |= pFlg; }
@@ -652,9 +739,12 @@ public:
void i_onPlayerNoDraw() { i_onNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void i_offPlayerNoDraw() { i_offNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
inline static u32 i_getLastSceneMode();
inline static u32 getLastSceneMode();
inline static bool checkWoodSwordEquip();
inline static bool checkLightMasterSwordEquip();
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
include/d/bg/d_bg_s_acch.h
+11
View File
@@ -113,6 +113,7 @@ public:
cXyz* GetPos() { return pm_pos; }
cXyz* GetOldPos() { return pm_old_pos; }
f32 GetGroundH() const { return m_ground_h; }
f32 GetRoofHeight() const { return m_roof_height; }
void SetLin() { m_lin.SetStartEnd(*pm_old_pos, *pm_pos); }
bool ChkGroundFind() { return m_flags & GROUND_FIND; }
bool ChkGroundHit() { return m_flags & GROUND_HIT; }
@@ -123,6 +124,7 @@ public:
void SetRoofHit() { m_flags |= ROOF_HIT; }
bool ChkWallHit() { return m_flags & WALL_HIT; }
void OffLineCheckHit() { m_flags &= ~LINE_CHECK_HIT; }
void OffLineCheck() { m_flags &= ~LINE_CHECK; }
bool ChkLineCheckNone() { return m_flags & LINE_CHECK_NONE; }
bool ChkLineCheck() { return m_flags & LINE_CHECK; }
void ClrRoofHit() { m_flags &= ~ROOF_HIT; }
@@ -206,4 +208,13 @@ public:
/* 80BB336C */ virtual ~dBgS_ObjAcch();
};
class dBgS_StatueAcch : public dBgS_Acch {
public:
dBgS_StatueAcch() {
SetStatue();
}
/* 806646F8 */ virtual ~dBgS_StatueAcch();
};
#endif /* D_BG_D_BG_S_ACCH_H */
include/d/cc/d_cc_d.h
+17 -2
View File
@@ -87,7 +87,7 @@ public:
enum dCcG_At_Spl {
/* 0x0 */ dCcG_At_Spl_UNK_0,
/* 0x1 */ dCcG_At_Spl_UNK_01,
/* 0x1 */ dCcG_At_Spl_UNK_1,
};
class dCcD_GObjInf;
@@ -151,6 +151,7 @@ public:
/* 0x2C */ cXyz mVec;
/* 0x38 */ cXyz mRVec;
}; // Size = 0x44
class dCcD_GObjTg : public dCcD_GAtTgCoCommonBase {
public:
/* 800839A0 */ void Set(dCcD_SrcGObjTg const&);
@@ -159,6 +160,7 @@ public:
cXyz& GetVec() { return mVec; }
void SetShieldFrontRangeYAngle(s16* angle) { mShieldFrontRangeYAngle = angle; }
void SetMtrl(u8 mtrl) { mMtrl = mtrl; }
void SetHitMark(CcG_Tg_HitMark mark) { mHitMark = mark; }
private:
/* 0x1C */ u8 mSe;
@@ -171,6 +173,7 @@ private:
/* 0x44 */ s16* mShieldFrontRangeYAngle;
/* 0x48 */ s16 mShieldRange;
}; // Size = 0x4A ?
class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase {
public:
/* 80083B8C */ virtual ~dCcD_GObjCo() {}
@@ -195,11 +198,13 @@ public:
/* 8008457C */ u8 GetTgHitObjSe();
/* 800845B0 */ static u32 getHitSeID(u8, int);
/* 8008460C */ void ClrCoHit();
/* 80084658 */ bool ChkCoHit();
/* 80084658 */ u32 ChkCoHit();
/* 800846B0 */ void ResetCoHit();
/* 800846F0 */ cCcD_Obj* GetCoHitObj();
/* 80084740 */ void Set(dCcD_SrcGObjInf const&);
fopAc_ac_c* GetCoHitAc() { return mGObjCo.GetAc(); }
void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); }
bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); }
void OnAtNoHitMark() { mGObjAt.OnSPrm(2); }
@@ -224,6 +229,16 @@ public:
u8 GetAtMtrl() { return mGObjAt.GetMtrl(); }
fopAc_ac_c* GetTgHitAc() { return mGObjTg.GetAc(); }
void SetTgShieldFrontRangeYAngle(s16* angle) { mGObjTg.SetShieldFrontRangeYAngle(angle); }
void OffTgWolfSpNoDamage() { mGObjTg.OffSPrm(0x800); }
void OnTgWolfSpNoDamage() { mGObjTg.OnSPrm(0x800); }
void SetTgHitMark(CcG_Tg_HitMark mark) { mGObjTg.SetHitMark(mark); }
void OnTgSpShield() { mGObjTg.OnSPrm(0x40); }
void OffTgSpShield() { mGObjTg.OffSPrm(0x40); }
void OnTgShield() { mGObjTg.OnSPrm(0x1); }
void OffTgShield() { mGObjTg.OffSPrm(0x1); }
void OnTgShieldFrontRange() { mGObjTg.OnSPrm(0x8); }
void OffTgShieldFrontRange() { mGObjTg.OffSPrm(0x8); }
bool ChkTgIronBallRebound() { return mGObjTg.ChkSPrm(0x100); }
static u32 const m_hitSeID[24];
include/d/cc/d_cc_s.h
+2
View File
@@ -43,6 +43,8 @@ public:
/* 800872A8 */ virtual void MoveAfterCheck();
/* 80086754 */ virtual void CalcParticleAngle(dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, csXyz*);
void SetMass(cCcD_Obj* i_obj, u8 i_priority) { mMass_Mng.Set(i_obj, i_priority); }
static u8 m_mtrl_hit_tbl[64];
private:
include/d/com/d_com_inf_game.h
+237 -165
View File
@@ -135,7 +135,7 @@ public:
dAttention_c& getAttention() { return mAttention; }
dStage_startStage_c* getStartStage() { return &mStartStage; }
void setSelectItem(int idx, u8 itemId) { mSelectItem[idx] = itemId; }
void setSelectItem(int idx, u8 i_itemNo) { mSelectItem[idx] = i_itemNo; }
u8 getSelectItem(int idx) { return mSelectItem[idx]; }
void setSelectEquip(int idx, u8 item_id) { mSelectEquip[idx] = item_id; }
void setItem(u8 slot, u8 i_no) {
@@ -273,6 +273,7 @@ public:
void setItemMaxLifeCount(s16 max) { mItemMaxLifeCount += max; }
void setOxygen(int oxygen) { mOxygen = oxygen; }
void setNowOxygen(s32 oxygen) { mNowOxygen = oxygen; }
void setOxygenCount(s32 oxygen) { mOxygenCount += oxygen; }
int getOxygen() { return mOxygen; }
void setMaxOxygen(int max) { mMaxOxygen = max; }
int getMaxOxygen() { return mMaxOxygen; }
@@ -395,11 +396,15 @@ public:
void setStatus(u16 status) { mStatus = status; }
s32 checkStatus(u16 flags) { return flags & mStatus; }
void setDirection(u8 i_dir) { mDirection = i_dir; }
bool& isPauseFlag() { return mPauseFlag; }
void offPauseFlag() { mPauseFlag = false; }
void onPauseFlag() { mPauseFlag = true; }
u8 getOxygenShowFlag() { return mOxygenShowFlag; }
void setOxygenShowFlag(u8 flag) { mOxygenShowFlag = flag; }
void show2dOn() { mShow2D = 1; }
void show2dOff() { mShow2D = 0; }
s8 getLayerOld() { return mLayerOld; }
void setMesgCancelButton(u8 button) { mMesgCancelButton = button; }
void setMesgBgm(u8 param_0) { mMesgBgm = param_0; }
@@ -744,6 +749,10 @@ inline dCcS* dComIfG_Ccsp() {
return &g_dComIfG_gameInfo.play.mCcs;
}
inline dCcS& dComIfG_Ccsp2() {
return g_dComIfG_gameInfo.play.mCcs;
}
inline dRes_info_c* dComIfG_getObjectResInfo(const char* arc_name) {
return g_dComIfG_gameInfo.mResControl.getObjectResInfo(arc_name);
}
@@ -770,34 +779,27 @@ void dComIfGs_setMixItemIndex(int i_no, u8 item_index);
u8 dComIfGs_getBottleMax();
u8 dComIfGs_checkGetItem(u8 i_itemNo);
void dComIfGs_setSelectEquipClothes(u8 i_itemNo);
void dComIfGs_setKeyNum(int i_stageNo, u8 keyNum);
void dComIfGs_setKeyNum(int i_stageNo, u8 i_keyNum);
void dComIfGs_BossLife_public_Set(s8);
s8 dComIfGs_sense_type_change_Get();
cXyz& dComIfGs_getWarpPlayerPos();
const char* dComIfGs_getWarpStageName();
s16 dComIfGs_getWarpPlayerAngleY();
s8 dComIfGs_getWarpRoomNo();
BOOL dComIfGs_isOneZoneSwitch(int swBit, int roomNo);
BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo);
void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8, u8);
u16 dComIfGs_getMaxLifeGauge();
void dComIfGs_setWarpMarkFlag(u8);
void dComIfGs_setSelectEquipSword(u8 i_itemNo);
void dComIfGs_setSelectEquipShield(u8 i_itemNo);
inline int i_dComIfGs_isItemFirstBit(u8 i_no) {
return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no);
}
inline u16 i_dComIfGs_getRupee() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupee();
}
BOOL dComIfGs_isVisitedRoom(int i_roomNo);
void dComIfGs_onZoneSwitch(int swBit, int roomNo);
void dComIfGs_onOneZoneSwitch(int param_0, int param_1);
void dComIfGs_offZoneSwitch(int param_0, int param_1);
void dComIfGs_offOneZoneSwitch(int param_0, int param_1);
s8 dComIfGp_getReverb(int roomNo);
void dComIfGs_onZoneSwitch(int i_swBit, int i_roomNo);
void dComIfGs_onOneZoneSwitch(int i_swBit, int i_roomNo);
void dComIfGs_offZoneSwitch(int i_swBit, int i_roomNo);
void dComIfGs_offOneZoneSwitch(int i_swBit, int i_roomNo);
s8 dComIfGp_getReverb(int i_roomNo);
void dComIfGs_gameStart();
int dComIfGs_wolfeye_effect_check();
bool dComIfGs_wolfeye_effect_check();
BOOL dComIfGs_Wolf_Change_Check();
void dComIfGs_onVisitedRoom(int param_0);
void dComIfGs_setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo, u8 param_4,
@@ -807,7 +809,7 @@ void dComIfGs_onStageSwitch(int i_stageNo, int i_no);
void dComIfGs_offStageSwitch(int i_stageNo, int i_no);
void dComIfGs_PolyDamageOff_Set(s8 param_0);
u8 dComIfGs_staffroll_next_go_check();
BOOL dComIfGs_isEventBit(u16 id);
BOOL dComIfGs_isEventBit(u16 i_flag);
int dComIfGs_isItemFirstBit(u8 i_no);
u16 dComIfGs_getRupee();
static u16 dComIfGs_getLife();
@@ -816,6 +818,14 @@ inline void dComIfGs_init() {
g_dComIfG_gameInfo.info.init();
}
inline int i_dComIfGs_isItemFirstBit(u8 i_no) {
return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no);
}
inline u16 i_dComIfGs_getRupee() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupee();
}
inline void dComIfGs_onDungeonItemMap() {
g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemMap();
}
@@ -828,76 +838,68 @@ inline void dComIfGs_onDungeonItemWarp() {
g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemWarp();
}
inline void dComIfGs_setItem(int slot, u8 i_no) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setItem(slot, i_no);
inline void dComIfGs_setItem(int i_slotNo, u8 i_itemNo) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setItem(i_slotNo, i_itemNo);
}
inline void dComIfGs_setOxygen(int amount) {
g_dComIfG_gameInfo.play.setOxygen(amount);
inline void dComIfGs_setOil(u16 i_oil) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setOil(i_oil);
}
inline void dComIfGs_setMaxOxygen(int max) {
g_dComIfG_gameInfo.play.setMaxOxygen(max);
inline void dComIfGs_setMaxOil(u16 i_maxOil) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxOil(i_maxOil);
}
inline void dComIfGs_setOil(u16 amount) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setOil(amount);
inline void dComIfGs_setWalletSize(u8 i_size) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setWalletSize(i_size);
}
inline void dComIfGs_setMaxOil(u16 max) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxOil(max);
inline void dComIfGs_setMagic(u8 i_magic) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMagic(i_magic);
}
inline void dComIfGs_setWalletSize(u8 size) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setWalletSize(size);
inline void dComIfGs_setMaxMagic(u8 i_maxMagic) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxMagic(i_maxMagic);
}
inline void dComIfGs_setMagic(u8 amount) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMagic(amount);
inline void dComIfGs_setRupee(u16 i_rupees) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setRupee(i_rupees);
}
inline void dComIfGs_setMaxMagic(u8 max) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxMagic(max);
inline void dComIfGs_setLife(u16 i_life) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setLife(i_life);
}
inline void dComIfGs_setRupee(u16 amount) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setRupee(amount);
}
inline void dComIfGs_setLife(u16 amount) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setLife(amount);
}
inline void dComIfGs_setMaxLife(u8 max) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxLife(max);
inline void dComIfGs_setMaxLife(u8 i_maxLife) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxLife(i_maxLife);
}
inline void dComIfGs_onDungeonItemBossKey() {
g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemBossKey();
}
inline void dComIfGs_setCollectSword(u8 sword_id) {
g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SWORD, sword_id);
inline void dComIfGs_setCollectSword(u8 i_swordNo) {
g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SWORD, i_swordNo);
}
inline void dComIfGs_setCollectShield(u8 shield_id) {
g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SHIELD, shield_id);
inline void dComIfGs_setCollectShield(u8 i_shieldNo) {
g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SHIELD, i_shieldNo);
}
inline void dComIfGs_setCollectClothes(u8 clothes_id) {
g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_CLOTHING, clothes_id);
inline void dComIfGs_setCollectClothes(u8 i_clothesNo) {
g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_CLOTHING, i_clothesNo);
}
inline void dComIfGs_setRodTypeLevelUp() {
g_dComIfG_gameInfo.info.getPlayer().getItem().setRodTypeLevelUp();
}
inline void dComIfGs_setArrowNum(u8 num) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setArrowNum(num);
inline void dComIfGs_setArrowNum(u8 i_arrowNum) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setArrowNum(i_arrowNum);
}
inline void dComIfGs_setArrowMax(u8 max) {
g_dComIfG_gameInfo.info.getPlayer().getItemMax().setArrowNum(max);
inline void dComIfGs_setArrowMax(u8 i_arrowMax) {
g_dComIfG_gameInfo.info.getPlayer().getItemMax().setArrowNum(i_arrowMax);
}
inline u8 dComIfGs_getPachinkoMax() {
@@ -908,16 +910,16 @@ inline void dComIfGs_setEmptyBombBag() {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag();
}
inline void dComIfGs_setEmptyBombBag(u8 newBomb, u8 bombNum) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(newBomb, bombNum);
inline void dComIfGs_setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(i_newBomb, i_bombNum);
}
inline void dComIfGs_setEmptyBombBagItemIn(u8 newBomb, bool setNum) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(newBomb, setNum);
inline void dComIfGs_setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(i_newBomb, i_setNum);
}
inline void dComIfGs_setEmptyBombBagItemIn(u8 newBomb, u8 bombNum, bool setNum) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(newBomb, bombNum, setNum);
inline void dComIfGs_setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(i_newBomb, i_bombNum, i_setNum);
}
inline void dComIfGs_setEmptyBottle() {
@@ -932,16 +934,16 @@ inline void dComIfGs_setEmptyBottleItemIn(u8 i_itemNo) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottleItemIn(i_itemNo);
}
inline void dComIfGs_setBottleNum(u8 i_bottleIdx, u8 bottle_num) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBottleNum(i_bottleIdx, bottle_num);
inline void dComIfGs_setBottleNum(u8 i_bottleIdx, u8 i_bottleNum) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBottleNum(i_bottleIdx, i_bottleNum);
}
inline void dComIfGs_onEventBit(u16 id) {
g_dComIfG_gameInfo.info.getSavedata().getEvent().onEventBit(id);
inline void dComIfGs_onEventBit(u16 i_flag) {
g_dComIfG_gameInfo.info.getSavedata().getEvent().onEventBit(i_flag);
}
inline BOOL i_dComIfGs_isEventBit(u16 id) {
return g_dComIfG_gameInfo.info.getEvent().isEventBit(id);
inline BOOL i_dComIfGs_isEventBit(u16 i_flag) {
return g_dComIfG_gameInfo.info.getEvent().isEventBit(i_flag);
}
inline void dComIfGs_onLightDropFlag(u8 i_nowLevel) {
@@ -960,8 +962,16 @@ inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo) {
return g_dComIfG_gameInfo.info.isSwitch(i_no, i_roomNo);
}
inline void dComIfGs_onSvZoneSwitch(int zoneNo, int swBit) {
g_dComIfG_gameInfo.info.getZone(zoneNo).getZoneBit().onSwitch(swBit);
inline BOOL dComIfGs_isRegionBit(int i_region) {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().isRegionBit(i_region);
}
inline void dComIfGs_onRegionBit(int i_region) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().onRegionBit(i_region);
}
inline void dComIfGs_onSvZoneSwitch(int i_zoneNo, int i_swBit) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().onSwitch(i_swBit);
}
inline s32 dComIfGs_isDungeonItemMap() {
@@ -976,17 +986,17 @@ inline s32 dComIfGs_isDungeonItemBossKey() {
return g_dComIfG_gameInfo.info.getMemory().getBit().isDungeonItemBossKey();
}
inline u8 dComIfGs_getItem(int slot_no, bool check_combo) {
return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(slot_no, check_combo);
inline u8 dComIfGs_getItem(int i_slotNo, bool i_checkCombo) {
return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(i_slotNo, i_checkCombo);
}
inline BOOL dComIfGs_isCollectSword(u8 sword_id) {
return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_SWORD, sword_id);
inline BOOL dComIfGs_isCollectSword(u8 i_swordNo) {
return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_SWORD, i_swordNo);
}
inline BOOL dComIfGs_isCollectClothing(u8 clothing_id) {
inline BOOL dComIfGs_isCollectClothing(u8 i_clothesNo) {
return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_CLOTHING,
clothing_id);
i_clothesNo);
}
inline u8 dComIfGs_checkBottle(u8 i_itemNo) {
@@ -1025,8 +1035,8 @@ inline u16 i_dComIfGs_getLife() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife();
}
inline void dComIfGs_offEventBit(u16 event) {
g_dComIfG_gameInfo.info.getSavedata().getEvent().offEventBit(event);
inline void dComIfGs_offEventBit(u16 i_flag) {
g_dComIfG_gameInfo.info.getSavedata().getEvent().offEventBit(i_flag);
}
inline const char* dComIfGs_getLastWarpMarkStageName() {
@@ -1065,8 +1075,8 @@ inline u8 dComIfGs_getLightDropNum(u8 i_nowLevel) {
return g_dComIfG_gameInfo.info.getPlayer().getLightDrop().getLightDropNum(i_nowLevel);
}
inline u8 dComIfGs_getSelectItemIndex(int idx) {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectItemIndex(idx);
inline u8 dComIfGs_getSelectItemIndex(int i_no) {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectItemIndex(i_no);
}
inline u8 dComIfGs_getOptVibration() {
@@ -1125,19 +1135,27 @@ inline s32 dComIfGs_isStageBossEnemy() {
return g_dComIfG_gameInfo.info.getMemory().getBit().isStageBossEnemy();
}
inline void dComIfGs_setKeyNum(u8 keyNum) {
g_dComIfG_gameInfo.info.getMemory().getBit().setKeyNum(keyNum);
inline void dComIfGs_setKeyNum(u8 i_keyNum) {
g_dComIfG_gameInfo.info.getMemory().getBit().setKeyNum(i_keyNum);
}
inline BOOL dComIfGs_isSaveVisitedRoom(int param_0, int param_1) {
return g_dComIfG_gameInfo.info.getSavedata().getSave2(param_0)->isVisitedRoom(param_1);
inline BOOL dComIfGs_isSaveVisitedRoom(int param_0, int i_roomNo) {
return g_dComIfG_gameInfo.info.getSavedata().getSave2(param_0)->isVisitedRoom(i_roomNo);
}
inline s16 dComIfGs_getOil() {
inline void dComIfGs_onSaveVisitedRoom(int param_0, int i_roomNo) {
return g_dComIfG_gameInfo.info.getSavedata().getSave2(param_0)->onVisitedRoom(i_roomNo);
}
inline void dComIfGs_offSaveVisitedRoom(int param_0, int i_roomNo) {
return g_dComIfG_gameInfo.info.getSavedata().getSave2(param_0)->offVisitedRoom(i_roomNo);
}
inline u16 dComIfGs_getOil() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getOil();
}
inline s16 dComIfGs_getMaxOil() {
inline u16 dComIfGs_getMaxOil() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMaxOil();
}
@@ -1161,20 +1179,20 @@ inline s32 dComIfGs_isGetMagicUseFlag() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().isMagicFlag(0);
}
inline void dComIfGs_offTmpBit(u16 flag) {
g_dComIfG_gameInfo.info.getTmp().offEventBit(flag);
inline void dComIfGs_offTmpBit(u16 i_flag) {
g_dComIfG_gameInfo.info.getTmp().offEventBit(i_flag);
}
inline BOOL dComIfGs_isDarkClearLV(int i_no) {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isDarkClearLV(i_no);
}
inline BOOL dComIfGs_isTmpBit(u16 flag) {
return g_dComIfG_gameInfo.info.getTmp().isEventBit(flag);
inline BOOL dComIfGs_isTmpBit(u16 i_flag) {
return g_dComIfG_gameInfo.info.getTmp().isEventBit(i_flag);
}
inline void dComIfGs_onTmpBit(u16 flag) {
g_dComIfG_gameInfo.info.getTmp().onEventBit(flag);
inline void dComIfGs_onTmpBit(u16 i_flag) {
g_dComIfG_gameInfo.info.getTmp().onEventBit(i_flag);
}
inline BOOL dComIfGs_isTransformLV(int i_no) {
@@ -1197,20 +1215,20 @@ inline u8 dComIfGs_getBottleNum(u8 i_bottleIdx) {
return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getBottleNum(i_bottleIdx);
}
inline u8 dComIfGs_getBombMax(u8 bombId) {
return g_dComIfG_gameInfo.info.getPlayer().getItemMax().getBombNum(bombId);
inline u8 dComIfGs_getBombMax(u8 i_bombType) {
return g_dComIfG_gameInfo.info.getPlayer().getItemMax().getBombNum(i_bombType);
}
inline void dComIfGs_setBombNum(u8 i_bagIdx, u8 bombId) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBombNum(i_bagIdx, bombId);
inline void dComIfGs_setBombNum(u8 i_bagIdx, u8 i_bombNum) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBombNum(i_bagIdx, i_bombNum);
}
inline void dComIfGs_setPachinkoNum(u8 num) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setPachinkoNum(num);
inline void dComIfGs_setPachinkoNum(u8 i_num) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setPachinkoNum(i_num);
}
inline void dComIfGs_addBottleNum(u8 i_bottleIdx, s16 num) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().addBottleNum(i_bottleIdx, num);
inline void dComIfGs_addBottleNum(u8 i_bottleIdx, s16 i_num) {
g_dComIfG_gameInfo.info.getPlayer().getItemRecord().addBottleNum(i_bottleIdx, i_num);
}
inline void dComIfGs_resetLastWarpAcceptStage() {
@@ -1253,8 +1271,8 @@ inline s8 dComIfGs_getRestartRoomNo() {
return g_dComIfG_gameInfo.info.getRestart().getRoomNo();
}
inline void dComIfGs_setRestartRoomParam(u32 param) {
g_dComIfG_gameInfo.info.getRestart().setRoomParam(param);
inline void dComIfGs_setRestartRoomParam(u32 i_param) {
g_dComIfG_gameInfo.info.getRestart().setRoomParam(i_param);
}
inline u8 dComIfGs_getMagic() {
@@ -1285,44 +1303,44 @@ inline u16 dComIfGs_getDate() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().getDate();
}
inline void dComIfGs_setDate(u16 date) {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setDate(date);
inline void dComIfGs_setDate(u16 i_date) {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setDate(i_date);
}
inline f32 dComIfGs_getTime() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().getTime();
}
inline void dComIfGs_setTime(f32 time) {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setTime(time);
inline void dComIfGs_setTime(f32 i_time) {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setTime(i_time);
}
inline void dComIfGs_onDarkClearLV(int lv) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onDarkClearLV(lv);
inline void dComIfGs_onDarkClearLV(int i_no) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onDarkClearLV(i_no);
}
inline void dComIfGs_onTransformLV(int lv) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onTransformLV(lv);
inline void dComIfGs_onTransformLV(int i_no) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onTransformLV(i_no);
}
inline void dComIfGs_onSaveDunSwitch(int flag) {
g_dComIfG_gameInfo.info.getDan().onSwitch(flag);
inline void dComIfGs_onSaveDunSwitch(int i_swNo) {
g_dComIfG_gameInfo.info.getDan().onSwitch(i_swNo);
}
inline void dComIfGs_offSaveDunSwitch(int flag) {
g_dComIfG_gameInfo.info.getDan().offSwitch(flag);
inline void dComIfGs_offSaveDunSwitch(int i_swNo) {
g_dComIfG_gameInfo.info.getDan().offSwitch(i_swNo);
}
inline u8 dComIfGs_getDataNum() {
return g_dComIfG_gameInfo.info.getDataNum();
}
inline void dComIfGs_setDataNum(u8 num) {
return g_dComIfG_gameInfo.info.setDataNum(num);
inline void dComIfGs_setDataNum(u8 i_num) {
return g_dComIfG_gameInfo.info.setDataNum(i_num);
}
inline void dComIfGs_setNewFile(u8 file) {
return g_dComIfG_gameInfo.info.setNewFile(file);
inline void dComIfGs_setNewFile(u8 i_fileNo) {
return g_dComIfG_gameInfo.info.setNewFile(i_fileNo);
}
inline char* dComIfGs_getPlayerName() {
@@ -1337,26 +1355,26 @@ inline bool dComIfGs_isPlayerFieldLastStayFieldDataExistFlag() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().isFieldDataExistFlag();
}
inline void dComIfGs_setPlayerFieldLastStayInfo(const char* stage, cXyz& pos, s16 angle, s8 point,
u8 region) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(stage, pos, angle, point,
region);
inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos, s16 i_angle, s8 i_point,
u8 i_region) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(i_stage, i_pos, i_angle, i_point,
i_region);
}
inline void dComIfGs_setStartPoint(s16 point) {
g_dComIfG_gameInfo.info.getRestart().setStartPoint(point);
inline void dComIfGs_setStartPoint(s16 i_point) {
g_dComIfG_gameInfo.info.getRestart().setStartPoint(i_point);
}
inline void dComIfGs_clearRoomSwitch(int zoneNo) {
g_dComIfG_gameInfo.info.getZone(zoneNo).getZoneBit().clearRoomSwitch();
inline void dComIfGs_clearRoomSwitch(int i_zoneNo) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().clearRoomSwitch();
}
inline void dComIfGs_clearRoomItem(int zoneNo) {
g_dComIfG_gameInfo.info.getZone(zoneNo).getZoneBit().clearRoomItem();
inline void dComIfGs_clearRoomItem(int i_zoneNo) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().clearRoomItem();
}
inline void dComIfGs_removeZone(int zoneNo) {
g_dComIfG_gameInfo.info.removeZone(zoneNo);
inline void dComIfGs_removeZone(int i_zoneNo) {
g_dComIfG_gameInfo.info.removeZone(i_zoneNo);
}
inline u32 dComIfGs_getTurnRestartParam() {
@@ -1407,20 +1425,20 @@ inline u16 dComIfGs_getRupeeMax() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupeeMax();
}
inline void dComIfGs_onLightDropGetFlag(u8 level) {
g_dComIfG_gameInfo.info.getPlayer().getLightDrop().onLightDropGetFlag(level);
inline void dComIfGs_onLightDropGetFlag(u8 i_nowLevel) {
g_dComIfG_gameInfo.info.getPlayer().getLightDrop().onLightDropGetFlag(i_nowLevel);
}
inline void dComIfGs_setTmpReg(u16 reg, u8 flag) {
g_dComIfG_gameInfo.info.getTmp().setEventReg(reg, flag);
inline void dComIfGs_setTmpReg(u16 i_reg, u8 i_no) {
g_dComIfG_gameInfo.info.getTmp().setEventReg(i_reg, i_no);
}
inline int dComIfGs_getTmpReg(u16 reg) {
return g_dComIfG_gameInfo.info.getTmp().getEventReg(reg);
inline int dComIfGs_getTmpReg(u16 i_reg) {
return g_dComIfG_gameInfo.info.getTmp().getEventReg(i_reg);
}
inline void dComIfGs_setWarashibeItem(u8 itemNo) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setWarashibeItem(itemNo);
inline void dComIfGs_setWarashibeItem(u8 i_itemNo) {
g_dComIfG_gameInfo.info.getPlayer().getItem().setWarashibeItem(i_itemNo);
}
inline void dComIfGs_setBottleItemIn(u8 curItem, u8 newItem) {
@@ -1435,44 +1453,36 @@ inline u8 dComIfGs_checkBombBag(u8 i_itemNo) {
return g_dComIfG_gameInfo.info.getPlayer().getItem().checkBombBag(i_itemNo);
}
inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag);
}
inline bool i_dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag);
}
inline s64 dComIfGs_getTotalTime() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getTotalTime();
}
inline void dComIfGs_setSaveTotalTime(s64 time) {
g_dComIfG_gameInfo.info.setSaveTotalTime(time);
inline void dComIfGs_setSaveTotalTime(s64 i_time) {
g_dComIfG_gameInfo.info.setSaveTotalTime(i_time);
}
inline void dComIfGs_setSaveStartTime(s64 time) {
g_dComIfG_gameInfo.info.setStartTime(time);
inline void dComIfGs_setSaveStartTime(s64 i_time) {
g_dComIfG_gameInfo.info.setStartTime(i_time);
}
inline void dComIfGs_setNoFile(u8 file) {
g_dComIfG_gameInfo.info.setNoFile(file);
inline void dComIfGs_setNoFile(u8 i_file) {
g_dComIfG_gameInfo.info.setNoFile(i_file);
}
inline void* dComIfGs_getPEventBit() {
return g_dComIfG_gameInfo.info.getEvent().getPEventBit();
}
inline bool dComIfGs_isItem(int bitNo, int roomNo) {
return g_dComIfG_gameInfo.info.isItem(bitNo, roomNo);
inline bool dComIfGs_isItem(int i_bitNo, int i_roomNo) {
return g_dComIfG_gameInfo.info.isItem(i_bitNo, i_roomNo);
}
inline void dComIfGs_onItem(int bitNo, int roomNo) {
g_dComIfG_gameInfo.info.onItem(bitNo, roomNo);
inline void dComIfGs_onItem(int i_bitNo, int i_roomNo) {
g_dComIfG_gameInfo.info.onItem(i_bitNo, i_roomNo);
}
inline void dComIfGs_onActor(int bitNo, int roomNo) {
g_dComIfG_gameInfo.info.onActor(bitNo, roomNo);
inline void dComIfGs_onActor(int i_bitNo, int i_roomNo) {
g_dComIfG_gameInfo.info.onActor(i_bitNo, i_roomNo);
}
inline void dComIfGs_setLastWarpAcceptStage(s8 param_0) {
@@ -1487,14 +1497,15 @@ inline u8 dComIfGs_getNewFile() {
return g_dComIfG_gameInfo.info.getNewFile();
}
inline void dComIfGs_setInitDataToCard(u8* p_saveData, int dataNum) {
g_dComIfG_gameInfo.info.initdata_to_card((char*)p_saveData, dataNum);
inline void dComIfGs_setInitDataToCard(u8* i_saveData, int i_dataNum) {
g_dComIfG_gameInfo.info.initdata_to_card((char*)i_saveData, i_dataNum);
}
inline void dComIfGs_setMemoryToCard(u8* p_saveData, int dataNum) {
g_dComIfG_gameInfo.info.memory_to_card((char*)p_saveData, dataNum);
inline void dComIfGs_setMemoryToCard(u8* i_saveData, int i_dataNum) {
g_dComIfG_gameInfo.info.memory_to_card((char*)i_saveData, i_dataNum);
}
void dComIfGp_setSelectItem(int index);
s32 dComIfGp_offHeapLockFlag(int flag);
void dComIfGp_createSubExpHeap2D();
@@ -1510,7 +1521,7 @@ u8 dComIfGp_SelectWarpPt_get();
void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer, f32 lastSpeed,
u32 lastMode, int, s8 wipe, s16 lastAngle, int, int);
void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer);
int dComIfGp_getSelectItemNum(int index);
s16 dComIfGp_getSelectItemNum(int index);
int dComIfGp_getSelectItemMaxNum(int index);
void dComIfGp_mapShow();
void dComIfGp_mapHide();
@@ -1539,9 +1550,18 @@ static u8 dComIfGp_getRStatus();
static dAttCatch_c* dComIfGp_att_getCatghTarget();
static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1);
inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag);
}
inline bool i_dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag);
}
inline void i_dComIfGp_setItemLifeCount(float amount, u8 type) {
g_dComIfG_gameInfo.play.setItemLifeCount(amount, type);
}
inline void i_dComIfGp_setItemRupeeCount(int amount) {
g_dComIfG_gameInfo.play.setItemRupeeCount(amount);
}
@@ -2030,6 +2050,10 @@ inline void dComIfGp_setStatus(u16 status) {
g_dComIfG_gameInfo.play.setStatus(status);
}
inline void dComIfGp_setAdvanceDirection(u8 i_dir) {
g_dComIfG_gameInfo.play.setDirection(i_dir);
}
inline void dComIfGp_setLinkPlayer(fopAc_ac_c* ptr) {
g_dComIfG_gameInfo.play.setPlayerPtr(0, ptr);
}
@@ -2099,7 +2123,11 @@ inline void dComIfGp_setNowOxygen(s32 oxygen) {
g_dComIfG_gameInfo.play.setNowOxygen(oxygen);
}
inline int dComIfGp_getMaxOxygen() {
inline void dComIfGp_setOxygenCount(s32 oxygen) {
g_dComIfG_gameInfo.play.setOxygenCount(oxygen);
}
inline s32 dComIfGp_getMaxOxygen() {
return g_dComIfG_gameInfo.play.getMaxOxygen();
}
@@ -2115,6 +2143,14 @@ inline u8 dComIfGp_getOxygenShowFlag() {
return g_dComIfG_gameInfo.play.getOxygenShowFlag();
}
inline void dComIfGp_onOxygenShowFlag() {
g_dComIfG_gameInfo.play.setOxygenShowFlag(1);
}
inline void dComIfGp_offOxygenShowFlag() {
g_dComIfG_gameInfo.play.setOxygenShowFlag(0);
}
inline u8 dComIfGp_getNeedLightDropNum() {
return g_dComIfG_gameInfo.play.getNeedLightDropNum();
}
@@ -2183,6 +2219,10 @@ inline void dComIfGp_2dShowOn() {
g_dComIfG_gameInfo.play.show2dOn();
}
inline void dComIfGp_2dShowOff() {
g_dComIfG_gameInfo.play.show2dOff();
}
inline s16 dComIfGp_getItemMaxLifeCount() {
return g_dComIfG_gameInfo.play.getItemMaxLifeCount();
}
@@ -2359,6 +2399,10 @@ inline void dComIfGp_event_setGtItm(int i_itemNo) {
g_dComIfG_gameInfo.play.getEvent().setGtItm(i_itemNo);
}
inline void i_dComIfGp_event_reset() {
g_dComIfG_gameInfo.play.getEvent().reset();
}
inline void dComIfGp_evmng_cutEnd(int param_0) {
dComIfGp_getPEvtManager()->cutEnd(param_0);
}
@@ -2446,6 +2490,10 @@ inline int dComIfGp_evmng_getMySubstanceNum(int index, char* name) {
return dComIfGp_getPEvtManager()->getMySubstanceNum(index, name);
}
inline int dComIfGp_evmng_checkStartDemo() {
return dComIfGp_getPEvtManager()->checkStartDemo();
}
inline void dComIfGp_evmng_create() {
g_dComIfG_gameInfo.play.getEvtManager().create();
}
@@ -2509,7 +2557,7 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
param_9, param_10, 1.0f);
}
inline u32 dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
const csXyz* param_4, const cXyz* param_5, u8 param_6,
dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9,
const GXColor* param_10, const cXyz* param_11) {
@@ -2518,7 +2566,7 @@ inline u32 dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tev
param_9, param_10, param_11, 1.0f);
}
inline u32 dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const csXyz* param_3,
inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const csXyz* param_3,
const cXyz* param_4, u8 param_5, dPa_levelEcallBack* param_6,
s8 param_7, const GXColor* param_8, const GXColor* param_9,
const cXyz* param_10) {
@@ -2527,13 +2575,13 @@ inline u32 dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const csXyz*
param_8, param_9, param_10, 1.0f);
}
inline u32 dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2,
inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2,
const cXyz* param_3) {
return dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL,
NULL, NULL);
}
inline u32 dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2,
inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2,
const csXyz* param_3, const cXyz* param_4) {
return dComIfGp_particle_set(param_0, param_1, param_2, param_3, param_4, 0xFF, NULL, -1, NULL,
NULL, NULL);
@@ -2545,6 +2593,30 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
NULL, NULL);
}
inline u32 dComIfGp_particle_setColor(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
const GXColor* param_4, const GXColor* param_5, f32 param_6, u8 param_7,
const csXyz* param_8, const cXyz* param_9, dPa_levelEcallBack* param_10,
s8 param_11, const cXyz* param_12) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_3,
param_8, param_9, param_7, param_10,
param_11, param_4, param_5, param_12,
param_6);
}
inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2,
const GXColor* param_3, const GXColor* param_4, f32 param_5, u8 param_6,
const csXyz* param_7, const cXyz* param_8, dPa_levelEcallBack* param_9,
s8 param_10, const cXyz* param_11) {
return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_0, param_1, param_2, param_7,
param_8, param_6, param_9, param_10,
param_3, param_4, param_11, param_5);
}
inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param_1, const dKy_tevstr_c* param_2,
const GXColor* param_3, const GXColor* param_4, f32 param_5, u8 param_6) {
return dComIfGp_particle_setColor(param_0, param_1, param_2, param_3, param_4, param_5, param_6, NULL, NULL, NULL, -1, NULL);
}
inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) {
g_dComIfG_gameInfo.play.getParticle()->forceOnEventMove(param_0);
}
include/d/d_attention.h
+1 -9
View File
@@ -211,15 +211,7 @@ public:
BOOL chkFlag(u32 flag) { return mFlags & flag; }
void setFlag(u32 flag) { mFlags |= flag; }
void clrFlag(u32 flag) { mFlags &= ~flag; }
s8 Lockon() {
/* s32 chk = true;
if (!LockonTruth() && !chkFlag(0x20000000)) {
chk = false;
}
return chk; */
return !LockonTruth() && !chkFlag(0x20000000);
}
bool Lockon() { return LockonTruth() || chkFlag(0x20000000); } // only matches with -O2?
static type_tbl_entry loc_type_tbl[3];
static type_tbl_entry act_type_tbl[5];
include/d/d_camera.h
+3
View File
@@ -164,6 +164,8 @@ public:
/* 0x40 */ cSAngle field_0x40;
}; // Size: 0x44
/* 80088A7C */ void StartEventCamera(int, int, ...);
/* 80088BBC */ void EndEventCamera(int);
/* 8008908C */ void getEvIntData(int*, char*, int);
/* 80088CB0 */ void getEvIntData(int*, char*);
/* 80089154 */ void getEvFloatData(f32*, char*, f32);
@@ -521,5 +523,6 @@ public:
dCamera_c* dCam_getBody();
dCamera_c* dCam_getCamera();
s16 dCam_getControledAngleY(camera_class* param_0);
#endif /* D_D_CAMERA_H */
include/d/d_demo.h
+2
View File
@@ -118,6 +118,8 @@ public:
/* 80039AAC */ virtual ~dDemo_system_c();
/* 80039528 */ virtual bool JSGFindObject(JStage::TObject**, char const*,
JStage::TEObject) const;
void setObject(dDemo_object_c* i_object) { mpObject = i_object; }
private:
/* 0x4 */ dDemo_object_c* mpObject;
include/d/d_jnt_col.h
+2
View File
@@ -21,6 +21,8 @@ public:
/* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*);
bool checkPassNum(int bit) { return field_0xc & (1 << bit); }
void onPassNum(int num) { field_0xc |= (1 << num); }
void offPassNum(int num) { field_0xc &= ~(1 << num); }
/* 0x00 */ dJntColData_c* mData;
/* 0x04 */ J3DModel* mModel;
include/d/d_procname.h
+5 -2
View File
@@ -1,4 +1,5 @@
#pragma once
#ifndef D_PROCNAME_H
#define D_PROCNAME_H
enum {
PROC_OVERLAP0 = 0x0000,
@@ -793,4 +794,6 @@ enum {
PROC_TIMER = 0x0315,
PROC_METER2 = 0x0316,
PROC_GAMEOVER = 0x0317,
};
};
#endif /* D_PROCNAME_H */
include/d/d_resorce.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
/* 8003AB30 */ static void onWarpMaterial(J3DModelData*);
/* 8003AC1C */ static void offWarpMaterial(J3DModelData*);
/* 8003AD08 */ void setWarpSRT(J3DModelData*, cXyz const&, f32, f32);
/* 8003AE14 */ void loaderBasicBmd(u32, void*);
/* 8003AE14 */ static J3DModelData* loaderBasicBmd(u32, void*);
/* 8003B30C */ int loadResource();
/* 8003B998 */ void deleteArchiveRes();
/* 8003BAC4 */ int setRes(JKRArchive*, JKRHeap*);
include/d/d_stage.h
+5 -1
View File
@@ -292,7 +292,8 @@ struct dStage_MapEvent_dt_c {
/* 0x08 */ u8 field_0x8;
/* 0x09 */ u8 field_0x9;
/* 0x0A */ u8 field_0xA[0xD - 0xA];
/* 0x0D */ char mName[9];
/* 0x0D */ char mName[7];
/* 0x14 */ u16 field_0x14;
/* 0x16 */ u8 field_0x16;
/* 0x17 */ u8 field_0x17;
/* 0x18 */ u8 mSeType; // 1: RIDDLE_A, 2: RIDDLE_B
@@ -908,6 +909,9 @@ int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3,
u32 mode, s16 angle, int param_7);
void dStage_Create();
static s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0);
void dStage_restartRoom(u32 roomParam, u32 mode, int param_2);
struct cBgS_GndChk;
int dStage_RoomCheck(cBgS_GndChk* gndChk);
inline s32 dStage_roomRead_dt_c_GetVrboxswitch(roomRead_data_class& data) {
return data.field_0x2 & 8;
include/d/d_vibration.h
+1 -1
View File
@@ -28,7 +28,7 @@ private:
public:
class {
public:
/* 0x00 */ u32 field_0x0;
/* 0x00 */ u32 field_0x0;
/* 0x04 */ int field_0x4;
/* 0x08 */ s32 field_0x8;
/* 0x0C */ s32 field_0xc;
include/d/kankyo/d_kankyo.h
+2
View File
@@ -35,6 +35,8 @@ static void dKy_vrbox_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32 para
void dKy_GxFog_set();
static void GxFog_set();
static void GxXFog_set();
u8 dKy_pol_argument_get(cBgS_PolyInfo const* i_poly);
void dKy_Sound_set(cXyz param_0, int param_1, unsigned int param_2, int param_3);
struct LIGHT_INFLUENCE {
include/d/meter/d_meter2.h
+2
View File
@@ -116,6 +116,8 @@ public:
/* 80202240 */ virtual void draw();
/* 80201370 */ virtual ~dMeterButton_c();
/* 0x004 */ u8 field_0x4[0x630 - 0x4];
};
class dMeterString_c : public dMeterSub_c {
include/d/particle/d_particle.h
+7 -5
View File
@@ -300,7 +300,7 @@ public:
/* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
/* 8004C838 */ void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*,
cXyz const*, s8);
/* 8004CA90 */ u32 set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8,
/* 8004CA90 */ JPABaseEmitter* set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8,
dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*,
f32);
/* 8004D4CC */ u32 set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
@@ -334,10 +334,10 @@ public:
param_8, param_9, param_10, param_11, param_12);
}
u32 setNormal(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
const csXyz* param_4, const cXyz* param_5, u8 param_6,
dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9,
const GXColor* param_10, const cXyz* param_11, f32 param_12) {
JPABaseEmitter* setNormal(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3,
const csXyz* param_4, const cXyz* param_5, u8 param_6,
dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9,
const GXColor* param_10, const cXyz* param_11, f32 param_12) {
return set(0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8,
param_9, param_10, param_11, param_12);
}
@@ -352,6 +352,8 @@ public:
return ((dPa_selectTexEcallBack*)mTsubo) + idx;
}
static JPAEmitterManager* getEmitterManager() { return mEmitterMng; }
static u8 mTsubo[64];
static u8 mLifeBall[24];
static Mtx mWindViewMatrix;
include/d/save/d_save.h
+37 -37
View File
@@ -376,9 +376,9 @@ enum {
class dSv_player_status_a_c {
public:
void init();
void setSelectItemIndex(int i_no, u8 item_index);
void setSelectItemIndex(int i_no, u8 i_slotNo);
u8 getSelectItemIndex(int i_no) const;
void setMixItemIndex(int i_no, u8 item_index);
void setMixItemIndex(int i_no, u8 i_slotNo);
u8 getMixItemIndex(int i_no) const;
u16 getRupeeMax() const;
int isMagicFlag(u8 i_magic) const;
@@ -392,15 +392,15 @@ public:
u8& getMaxMagic() { return mMaxMagic; }
u8 getSelectEquip(int item) const { return mSelectEquip[item]; }
u8 getTransformStatus() const { return mTransformStatus; }
void setOil(u16 oil) { mOil = oil; }
void setMaxOil(u16 max) { mMaxOil = max; }
void setWalletSize(u8 size) { mWalletSize = size; }
void setMagic(u8 magic) { mMagic = magic; }
void setMaxMagic(u8 max) { mMaxMagic = max; }
void setRupee(u16 rupees) { mRupee = rupees; }
void setLife(u16 life) { mLife = life; }
void setMaxLife(u8 max) { mMaxLife = max; }
void setSelectEquip(int item_index, u8 item) { mSelectEquip[item_index] = item; }
void setOil(u16 i_oil) { mOil = i_oil; }
void setMaxOil(u16 i_maxOil) { mMaxOil = i_maxOil; }
void setWalletSize(u8 i_size) { mWalletSize = i_size; }
void setMagic(u8 i_magic) { mMagic = i_magic; }
void setMaxMagic(u8 i_maxMagic) { mMaxMagic = i_maxMagic; }
void setRupee(u16 i_rupees) { mRupee = i_rupees; }
void setLife(u16 i_life) { mLife = i_life; }
void setMaxLife(u8 i_maxLife) { mMaxLife = i_maxLife; }
void setSelectEquip(int i_equipId, u8 i_itemNo) { mSelectEquip[i_equipId] = i_itemNo; }
private:
/* 0x00 */ u16 mMaxLife;
@@ -431,11 +431,11 @@ public:
void onTransformLV(int i_no);
BOOL isTransformLV(int i_no) const;
void setDateIpl(s64 time) { mDateIpl = time; }
void setDateIpl(s64 i_time) { mDateIpl = i_time; }
u16 getDate() const { return mDate; }
f32 getTime() const { return mTime; }
void setDate(u16 date) { mDate = date; }
void setTime(f32 time) { mTime = time; }
void setDate(u16 i_date) { mDate = i_date; }
void setTime(f32 i_time) { mTime = i_time; }
OSTime getDateIpl() const { return mDateIpl; }
private:
@@ -530,10 +530,10 @@ private:
class dSv_player_item_c {
public:
void init();
void setItem(int item_slot, u8 i_itemNo);
u8 getItem(int slot_no, bool check_combo) const;
void setItem(int i_slotNo, u8 i_itemNo);
u8 getItem(int i_slotNo, bool i_checkCombo) const;
void setLineUpItem();
u8 getLineUpItem(int slot_no) const;
u8 getLineUpItem(int i_slotNo) const;
void setBottleItemIn(u8 curItemIn, u8 newItemIn);
void setEmptyBottleItemIn(u8 i_itemNo);
void setEmptyBottle();
@@ -543,12 +543,12 @@ public:
u8 checkBottle(u8 i_itemNo);
int checkInsectBottle();
u8 checkEmptyBottle();
void setBombBagItemIn(u8 curBomb, u8 newBomb, bool setNum);
void setBombBagItemIn(u8 curBomb, u8 newBomb, u8 bombNum, bool setNum);
void setEmptyBombBagItemIn(u8 newBomb, bool setNum);
void setEmptyBombBagItemIn(u8 newBomb, u8 bombNum, bool setNum);
void setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setNum);
void setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNum, bool i_setNum);
void setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum);
void setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum);
void setEmptyBombBag();
void setEmptyBombBag(u8 newBomb, u8 bombNum);
void setEmptyBombBag(u8 i_newBomb, u8 i_bombNum);
u8 checkBombBag(u8 i_itemNo);
void setWarashibeItem(u8 i_itemNo);
void setRodTypeLevelUp();
@@ -573,16 +573,16 @@ private:
class dSv_player_item_record_c {
public:
void init();
void setBombNum(u8 i_bagIdx, u8 bag_id);
void setBombNum(u8 i_bagIdx, u8 i_bombNum);
u8 getBombNum(u8 i_bagIdx) const;
void setBottleNum(u8 i_bottleIdx, u8 bottle_num);
u8 addBottleNum(u8 i_bottleIdx, s16 num);
void setBottleNum(u8 i_bottleIdx, u8 i_bottleNum);
u8 addBottleNum(u8 i_bottleIdx, s16 i_num);
u8 getBottleNum(u8 i_bottleIdx) const;
u8 getArrowNum() const { return mArrowNum; }
void setArrowNum(u8 amount) { mArrowNum = amount; }
void setArrowNum(u8 i_num) { mArrowNum = i_num; }
u8 getPachinkoNum() const { return mPachinkoNum; }
void setPachinkoNum(u8 num) { mPachinkoNum = num; }
void setPachinkoNum(u8 i_num) { mPachinkoNum = i_num; }
private:
/* 0x0 */ u8 mArrowNum;
@@ -595,10 +595,10 @@ private:
class dSv_player_item_max_c {
public:
void init();
void setBombNum(u8 bomb_id, u8 bomb_max);
u8 getBombNum(u8 bomb_id) const;
void setBombNum(u8 i_bombType, u8 i_maxNum);
u8 getBombNum(u8 i_bombType) const;
void setArrowNum(u8 max) { mItemMax[ARROW_MAX] = max; }
void setArrowNum(u8 i_maxNum) { mItemMax[ARROW_MAX] = i_maxNum; }
u8 getArrowNum() { return mItemMax[ARROW_MAX]; }
private:
@@ -639,7 +639,7 @@ private:
class dSv_light_drop_c {
public:
void init();
void setLightDropNum(u8 i_nowLevel, u8 dropNum);
void setLightDropNum(u8 i_nowLevel, u8 i_dropNum);
u8 getLightDropNum(u8 i_nowLevel) const;
void onLightDropGetFlag(u8 i_nowLevel);
BOOL isLightDropGetFlag(u8 i_nowLevel) const;
@@ -667,7 +667,7 @@ private:
class dSv_fishing_info_c {
public:
void init();
void addFishCount(u8 fish_index);
void addFishCount(u8 i_fishIndex);
private:
/* 0x00 */ u16 mFishCount[16];
@@ -678,9 +678,9 @@ class dSv_player_info_c {
public:
void init();
char* getLinkName() { return mPlayerName; }
void setPlayerName(const char* name) { strcpy((char*)mPlayerName, name); }
void setHorseName(const char* name) { strcpy((char*)mHorseName, name); }
void setTotalTime(s64 time) { mTotalTime = time; }
void setPlayerName(const char* i_name) { strcpy((char*)mPlayerName, i_name); }
void setHorseName(const char* i_name) { strcpy((char*)mHorseName, i_name); }
void setTotalTime(s64 i_time) { mTotalTime = i_time; }
s64 getTotalTime() const { return mTotalTime; }
private:
@@ -802,7 +802,7 @@ public:
s32 isDungeonItem(int i_no) const;
u8 getKeyNum() { return mKeyNum; }
void setKeyNum(u8 keyNum) { mKeyNum = keyNum; }
void setKeyNum(u8 i_keyNum) { mKeyNum = i_keyNum; }
void onDungeonItemMap() { onDungeonItem(MAP); }
s32 isDungeonItemMap() const { return isDungeonItem(MAP); }
void onDungeonItemCompass() { onDungeonItem(COMPASS); }
@@ -884,7 +884,7 @@ STATIC_ASSERT(sizeof(dSv_memory2_c) == 8);
class dSv_danBit_c {
public:
bool init(s8 i_stage);
bool init(s8 i_stageNo);
void onSwitch(int i_no);
void offSwitch(int i_no);
BOOL isSwitch(int i_no) const;
include/dolphin/pad/Pad.h
+1 -1
View File
@@ -33,7 +33,7 @@ void PADSetSpec(int spec);
BOOL PADReset(u32 mask);
void PADClampCircle(PADStatus* status);
void PADClamp(PADStatus* status);
void PADRead(PADStatus* status);
u32 PADRead(PADStatus* status);
void PADControlMotor(s32 channel, u32 command);
BOOL PADRecalibrate(u32 mask);
include/f_ap/f_ap_game.h
+2
View File
@@ -5,6 +5,8 @@
#include "dolphin/types.h"
void fapGm_After();
void fapGm_Create();
void fapGm_Execute();
class fapGm_HIO_c {
public:
include/f_op/f_op_actor.h
+7 -1
View File
@@ -93,13 +93,14 @@ public:
/* 0x497 */ u8 mCullType;
/* 0x498 */ u8 mDemoActorId;
/* 0x499 */ s8 mSubtype;
/* 0x49A */ u8 field_0x49a;
/* 0x49C */ u32 mStatus;
/* 0x4A0 */ u32 mCondition;
/* 0x4A4 */ u32 mParentPcId;
/* 0x4A8 */ actor_place orig;
/* 0x4BC */ actor_place next;
/* 0x4D0 */ actor_place current;
/* 0x4E4 */ csXyz mCollisionRot;
/* 0x4E4 */ csXyz shape_angle;
/* 0x4EC */ cXyz mScale;
/* 0x4F8 */ cXyz mSpeed;
/* 0x504 */ MtxP mCullMtx;
@@ -142,6 +143,11 @@ public:
/* 80019520 */ void setBallModelEffect(dKy_tevstr_c*);
/* 800196A0 */ void drawBallModel(dKy_tevstr_c*);
bool checkWolfNoLock() const { return mFlags & 0x200; }
bool checkHeadLockFlg() const { return mFlags & 0x80; }
bool checkDownFlg() const { return mFlags & 0x1; }
cXyz& getDownPos() { return mDownPos; }
/* 0x568 */ cXyz mDownPos;
/* 0x574 */ cXyz mHeadLockPos;
/* 0x580 */ J3DModel* mBallModel;
include/f_op/f_op_actor_mng.h
+13 -1
View File
@@ -124,6 +124,16 @@ inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) {
return pActor->mStatus & 0x2000;
}
enum fopAcM_CARRY {
fopAcM_CARRY_HEAVY = 2,
fopAcM_CARRY_SIDE = 4,
fopAcM_CARRY_TYPE_8 = 8,
};
inline u32 fopAcM_CheckCarryType(fopAc_ac_c* actor, fopAcM_CARRY type) {
return actor->field_0x49a & type;
}
inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) {
return fopAcM_checkStatus(pActor, 0x100000);
}
@@ -181,7 +191,7 @@ inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) {
}
inline csXyz& fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) {
return pActor->mCollisionRot;
return pActor->shape_angle;
}
inline bool fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) {
@@ -305,6 +315,8 @@ inline void fopAcM_onActor(const fopAc_ac_c* p_actor) {
dComIfGs_onActor(setId, fopAcM_GetHomeRoomNo(p_actor));
}
void fopAcM_initManager();
void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData);
void fopAcM_setStageLayer(void* p_proc);
include/m_Do/m_Do_audio.h
+1
View File
@@ -38,6 +38,7 @@ public:
extern JKRSolidHeap* g_mDoAud_audioHeap;
void mDoAud_Execute();
void mDoAud_resetProcess();
bool mDoAud_resetRecover();
void mDoAud_setSceneName(char const* spot, s32 room, s32 layer);
include/m_Do/m_Do_controller_pad.h
+1
View File
@@ -52,6 +52,7 @@ public:
static f32 getStickY(u32 pad) { return getCpadInfo(pad).mMainStickPosY; }
static f32 getStickValue(u32 pad) { return getCpadInfo(pad).mMainStickValue; }
static s16 getStickAngle(u32 pad) { return getCpadInfo(pad).mMainStickAngle; }
static s16 getStickAngle3D(u32 pad) { return getCpadInfo(pad).mMainStickAngle; }
static f32 getSubStickX(u32 pad) { return getCpadInfo(pad).mCStickPosX; }
static f32 getSubStickY(u32 pad) { return getCpadInfo(pad).mCStickPosY; }
static f32 getSubStickValue(u32 pad) { return getCpadInfo(pad).mCStickValue; }
include/m_Do/m_Do_ext.h
+3
View File
@@ -182,6 +182,7 @@ public:
/* 80140E2C */ mDoExt_AnmRatioPack();
void setRatio(f32 ratio) { mRatio = ratio; }
f32 getRatio() { return mRatio; }
J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
void setAnmTransform(J3DAnmTransform* anm) { mAnmTransform = anm; }
@@ -359,6 +360,7 @@ public:
/* 8000F8CC */ void decOldFrameMorfCounter();
f32 getOldFrameRate() { return mOldFrameRate; }
J3DTransformInfo* getOldFrameTransInfo(int i) { return &mOldFrameTransInfo[i]; }
private:
/* 0x00 */ bool mOldFrameFlg;
@@ -500,6 +502,7 @@ void mDoExt_modelUpdateDL(J3DModel* i_model);
J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 param_1, u32 param_2);
void mDoExt_setAraCacheSize(u32 size);
int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id);
void mDoExt_modelEntryDL(J3DModel* i_model);
struct JUTFont;
JUTFont* mDoExt_getMesgFont();
include/m_Do/m_Do_machine.h
+1
View File
@@ -15,6 +15,7 @@ void exceptionRestart();
void myExceptionCallback(u16, OSContext*, u32, u32);
void my_SysPrintHeap(char const*, void*, u32);
void mDoMch_HeapCheckAll();
int mDoMch_Create();
extern GXRenderModeObj g_ntscZeldaProg;
include/m_Do/m_Do_main.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include "dolphin/types.h"
void version_check();
void* LOAD_COPYDATE(void*);
s32 LOAD_COPYDATE(void*);
class HeapCheck {
public:
include/m_Do/m_Do_mtx.h
+10 -1
View File
@@ -25,6 +25,14 @@ inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) {
PSMTXMultVecSR(m, src, dst);
}
inline void mDoMtx_multVec(Mtx m, const Vec* src, Vec* dst) {
PSMTXMultVec(m, src, dst);
}
inline void mDoMtx_copy(const Mtx src, Mtx dst) {
PSMTXCopy(src, dst);
}
class mDoMtx_stack_c {
public:
/* 8000CCC8 */ static bool push();
@@ -46,6 +54,7 @@ public:
static void transS(f32 x, f32 y, f32 z) { PSMTXTrans(now, x, y, z); }
static void scaleS(f32 x, f32 y, f32 z) { PSMTXScale(now, x, y, z); }
static void multVec(const Vec* a, Vec* b) { PSMTXMultVec(now, a, b); }
static void multVecSR(const Vec* a, Vec* b) { PSMTXMultVecSR(now, a, b); }
static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); }
static void XYZrotM(s16 x, s16 y, s16 z) { mDoMtx_XYZrotM(now, x, y, z); }
static void ZXYrotS(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotS(now, x, y, z); }
@@ -55,7 +64,7 @@ public:
static void XrotM(s16 x) { mDoMtx_XrotM(now, x); }
static void inverse() { PSMTXInverse(now, now); }
static void concat(const Mtx m) { PSMTXConcat(now, m, now); }
static void copy(Mtx m) { PSMTXCopy(now, m); }
static void copy(const Mtx m) { PSMTXCopy(m, now); }
static Mtx now;
static Mtx buffer[16];
include/rel/d/a/d_a_arrow/d_a_arrow.h
+94 -1
View File
@@ -1,6 +1,99 @@
#ifndef D_A_ARROW_H
#define D_A_ARROW_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_procname.h"
#include "d/cc/d_cc_d.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/bg/d_bg_s_lin_chk.h"
#include "d/particle/d_particle.h"
class daArrow_c : public fopAc_ac_c {
public:
/* 80499C6C */ void createHeap();
/* 80499D8C */ void atHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80499FBC */ void decAlphaBlur();
/* 8049A04C */ void setBlur();
/* 8049A110 */ void setLightArrowHitMark(cXyz const*);
/* 8049A1EC */ void setLightChargeEffect(int);
/* 8049A370 */ void setArrowWaterNextPos(cXyz*, cXyz*);
/* 8049A76C */ void setArrowAt(f32);
/* 8049A9CC */ void arrowShooting();
/* 8049AC84 */ void setBombArrowExplode(cXyz*);
/* 8049ACE0 */ void setRoomInfo();
/* 8049AD74 */ void clearNearActorData();
/* 8049AD94 */ void getVibAngle();
/* 8049AE64 */ void setNormalMatrix();
/* 8049AF18 */ void setSmokePos();
/* 8049AFEC */ void setKeepMatrix();
/* 8049B120 */ void setStopActorMatrix();
/* 8049B214 */ void setBombMoveEffect();
/* 8049B370 */ void checkReget();
/* 8049B45C */ void procWait();
/* 8049B764 */ void procMove();
/* 8049C700 */ void procReturnInit(int);
/* 8049C874 */ void procReturn();
/* 8049CB70 */ void procBGStop();
/* 8049CC60 */ void procActorStop();
/* 8049CCCC */ void procActorControllStop();
/* 8049CCF0 */ void procSlingHitInit(cXyz*, dCcD_GObjInf*);
/* 8049CE50 */ void procSlingHit();
/* 8049CEA0 */ void execute();
/* 8049D0CC */ void draw();
/* 8049D440 */ void create();
/* 8049D98C */ ~daArrow_c();
void setBombArrowExplode() { field_0x950 = 0; }
bool checkBombArrow() const { return mIsBombArrow == true; }
static fopAc_ac_c* makeArrow(fopAc_ac_c* i_player, u16 param_1) {
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW,
param_1 << 8,
&i_player->current.pos,
fopAcM_GetRoomNo(i_player),
NULL,
NULL,
-1,
NULL,
NULL);
}
/* 0x568 */ J3DModel* field_0x568;
/* 0x56C */ dBgS_ArrowLinChk field_0x56c;
/* 0x5DC */ dBgS_ObjLinChk field_0x5dc;
/* 0x64C */ dCcD_Stts field_0x64c;
/* 0x688 */ dCcD_Cps field_0x688;
/* 0x7CC */ dCcD_Sph field_0x7cc;
/* 0x904 */ Z2SoundObjArrow field_0x904;
/* 0x93C */ bool mIsBombArrow;
/* 0x93D */ u8 field_0x93d[0x948 - 0x93D];
/* 0x948 */ u8 mReverb;
/* 0x949 */ u8 field_0x949[0x950 - 0x949];
/* 0x950 */ u16 field_0x950;
/* 0x952 */ s16 field_0x952;
/* 0x954 */ s16 field_0x954;
/* 0x956 */ u16 field_0x956;
/* 0x958 */ csXyz field_0x958;
/* 0x960 */ int field_0x960;
/* 0x964 */ u32 field_0x964;
/* 0x968 */ u32 field_0x968;
/* 0x96C */ u8 field_0x96c[0x994 - 0x96C];
/* 0x994 */ u32 mHitAcID;
/* 0x998 */ f32 field_0x998;
/* 0x99C */ f32 field_0x99c;
/* 0x9A0 */ f32 mOutLengthRate;
/* 0x9A4 */ f32 mFlyMax;
/* 0x9A8 */ cXyz field_0x9a8;
/* 0x9B4 */ cXyz field_0x9b4;
/* 0x9C0 */ cXyz mStartPos;
/* 0x9CC */ cXyz field_0x9cc;
/* 0x9D8 */ cXyz field_0x9d8;
/* 0x9E4 */ cXyz field_0x9e4;
/* 0x9F0 */ cXyz mSmokePos;
/* 0x9FC */ cXyz field_0x9fc;
/* 0xA08 */ daPy_actorKeep_c field_0xa08;
/* 0xA10 */ dPa_hermiteEcallBack_c field_0xa10;
/* 0xA28 */ void (daArrow_c::*mProcFunc)();
};
#endif /* D_A_ARROW_H */
include/rel/d/a/d_a_boomerang/d_a_boomerang.h
+39 -12
View File
@@ -4,9 +4,9 @@
#include "JSystem/J2DGraph/J2DScreen.h"
#include "Z2AudioLib/Z2SoundObject.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
#include "d/particle/d_particle_copoly.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
class daBoomerang_sight_c {
public:
@@ -20,6 +20,8 @@ public:
/* 804A278C */ virtual ~daBoomerang_sight_c();
u8 getReserve() const { return mReserve; }
private:
/* 0x04 */ J2DScreen* field_0x4;
/* 0x08 */ J2DPane* field_0x8;
@@ -60,7 +62,8 @@ class daAlink_c;
class daBoomerang_c : public fopAc_ac_c {
public:
enum daBoomerang_FLG0 {
/* 0x80 */ WIND_CATCH = 0x80,
/* 0x800 */ FLG0_LOCK_DIST_CANCEL = 0x800,
/* 0x080 */ WIND_CATCH = 0x80,
};
/* 8049F280 */ void windModelCallBack();
@@ -91,26 +94,34 @@ public:
void onStateFlg0(daBoomerang_FLG0 flag) { mStateFlg0 |= flag; }
void onWindCatch() { onStateFlg0(WIND_CATCH); }
bool checkForceDelete() const { return mForceDelete; }
void onForceDelete() { mForceDelete = true; }
bool checkCharge() const { return true; }
void setThrow() { fopAcM_SetParam(this, 1); }
void setAimActor(fopAc_ac_c* i_actor) { (this->*mpSetAimActorFn)(i_actor); }
void cancelLockActor(fopAc_ac_c* i_actor) { (this->*mpCancelLockActorFn)(i_actor); }
u8 getLockReserve() const { return mSight.getReserve(); }
bool getLockCntMax() { return mLockCnt >= 5; }
void onLockDistanceCancel() { onStateFlg0(FLG0_LOCK_DIST_CANCEL); }
private:
/* 0x568 */ daMirror_c* field_0x568;
/* 0x568 */ J3DModel* field_0x568;
/* 0x56C */ J3DModel* field_0x56c;
/* 0x570 */ daAlink_c* field_0x570;
/* 0x574 */ u8 field_0x574[0x1C];
/* 0x570 */ J3DAnmTextureSRTKey* m_windBtk;
/* 0x574 */ mDoExt_bckAnm field_0x574;
/* 0x590 */ J3DModel* field_0x590;
/* 0x594 */ void* field_0x594;
/* 0x594 */ J3DAnmTextureSRTKey* m_waitEffBtk;
/* 0x598 */ daBoomerang_sight_c mSight;
/* 0x6A8 */ int field_0x6a8;
/* 0x6AC */ int field_0x6ac[5];
/* 0x6A8 */ u32 field_0x6a8;
/* 0x6AC */ u32 field_0x6ac[5];
/* 0x6C0 */ fopAc_ac_c* field_0x6c0[5];
/* 0x6D4 */ u8 field_0x6d4[8];
/* 0x6D4 */ fopAc_ac_c* field_0x6d4;
/* 0x6D8 */ u8 field_0x6d8[4];
/* 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;
/* 0x950 */ u8 mLockCnt;
/* 0x951 */ u8 field_0x951;
/* 0x952 */ u8 field_0x952;
/* 0x953 */ u8 field_0x953;
@@ -125,6 +136,22 @@ private:
/* 0x960 */ s16 field_0x960;
/* 0x962 */ s16 field_0x962;
/* 0x964 */ u32 mStateFlg0;
};
/* 0x968 */ u8 field_0x968[0x990 - 0x968];
/* 0x990 */ cXyz field_0x990;
/* 0x99C */ cXyz field_0x99c;
/* 0x9A8 */ f32 field_0x9a8;
/* 0x9AC */ cXyz field_0x9ac;
/* 0x9B8 */ cXyz field_0x9b8;
/* 0x9C4 */ cXyz field_0x9c4;
/* 0x9D0 */ dCcD_Stts field_0x9d0;
/* 0xA0C */ dCcD_Cps field_0xa0c;
/* 0xB50 */ dCcD_Cyl field_0xb50;
/* 0xC8C */ dBgS_BoomerangLinChk field_0xc8c;
/* 0xCFC */ dBgS_ObjLinChk field_0xcfc;
/* 0xD6C */ dBgS_ObjGndChk field_0xd6c;
/* 0xDC0 */ int (daBoomerang_c::*mpProcFn)();
/* 0xDCC */ void (daBoomerang_c::*mpSetAimActorFn)(fopAc_ac_c*);
/* 0xDD8 */ void (daBoomerang_c::*mpCancelLockActorFn)(fopAc_ac_c*);
}; // Size: 0xDE4
#endif /* D_A_BOOMERANG_H */
include/rel/d/a/d_a_canoe/d_a_canoe.h
+78 -1
View File
@@ -1,6 +1,83 @@
#ifndef D_A_CANOE_H
#define D_A_CANOE_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/cc/d_cc_d.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/bg/d_bg_s_lin_chk.h"
#include "Z2AudioLib/Z2SoundObject.h"
#include "SSystem/SComponent/c_phase.h"
class daCanoe_c : public fopAc_ac_c {
public:
/* 804DA5F4 */ void createHeap();
/* 804DA740 */ void create();
/* 804DAEA8 */ ~daCanoe_c();
/* 804DB008 */ void setRoomInfo();
/* 804DB0B0 */ void setMatrix();
/* 804DB3F4 */ void setCollision();
/* 804DB578 */ void posMove();
/* 804DB754 */ void checkGomikabe(cBgS_PolyInfo&);
/* 804DB7AC */ void setFrontBackPos();
/* 804DB828 */ void frontBackBgCheck();
/* 804DC330 */ void setPaddleEffect();
/* 804DC554 */ void setCanoeSliderEffect();
/* 804DC7B4 */ void execute();
/* 804DD35C */ void draw();
J3DModel* getModel() { return mpModel; }
MtxP getModelMtx() { return mpModel->getBaseTRMtx(); }
bool checkTandem() { return fopAcM_GetParam(this) == 2; }
bool checkJumpRideFlg() { return mJumpRideFlg; }
void incShapeOffsetY(f32 offset) { mShapeOffsetY += offset; }
void incShapeAngleZ(s16 incZ) { shape_angle.z += incZ; }
/* 0x0568 */ request_of_phase_process_class mPhaseReq;
/* 0x0570 */ J3DModel* mpModel;
/* 0x0574 */ J3DModel* mpPaddleModel;
/* 0x0578 */ J3DModel* mpMaskModel;
/* 0x057C */ dCcD_Stts field_0x57c;
/* 0x05B8 */ dBgS_AcchCir field_0x5b8[9];
/* 0x07F8 */ dBgS_LinkAcch field_0x7f8[3];
/* 0x0D80 */ dCcD_Cyl field_0xd80[5];
/* 0x13AC */ dBgS_LinkLinChk field_0x13ac;
/* 0x141C */ Z2SoundObjSimple field_0x141c;
/* 0x143C */ char* mResName;
/* 0x1440 */ u8 mPaddleWaterType;
/* 0x1441 */ u8 field_0x1441;
/* 0x1442 */ u8 field_0x1442;
/* 0x1443 */ u8 mJumpRideFlg;
/* 0x1444 */ u8 field_0x1444;
/* 0x1445 */ u8 mReverb;
/* 0x1446 */ u8 field_0x1446[0x1448 - 0x1446];
/* 0x1448 */ s16 field_0x1448;
/* 0x144A */ u8 field_0x144a[0x144C - 0x144A];
/* 0x144C */ s16 mAimAngle;
/* 0x144E */ s16 field_0x144e;
/* 0x1450 */ s16 field_0x1450;
/* 0x1452 */ s16 field_0x1452;
/* 0x1454 */ s16 field_0x1454;
/* 0x1456 */ s16 field_0x1456;
/* 0x1458 */ s16 field_0x1458;
/* 0x145A */ s16 field_0x145a;
/* 0x145C */ s16 field_0x145c;
/* 0x145E */ s16 field_0x145e;
/* 0x1460 */ s16 field_0x1460;
/* 0x1464 */ u32 mRodID;
/* 0x1468 */ f32 mAimSpeed;
/* 0x146C */ f32 mShapeOffsetY;
/* 0x1470 */ f32 field_0x1470;
/* 0x1474 */ u32 field_0x1474;
/* 0x1478 */ u8 field_0x1478[0x1480 - 0x1478];
/* 0x1480 */ u32 field_0x1480;
/* 0x1484 */ u8 field_0x1484[0x1490 - 0x1484];
/* 0x1490 */ u32 field_0x1490;
/* 0x1494 */ cXyz field_0x1494;
/* 0x14A0 */ cXyz field_0x14a0;
/* 0x14AC */ cXyz field_0x14ac;
/* 0x14B8 */ cXyz field_0x14b8;
/* 0x14C4 */ cXyz field_0x14c4;
/* 0x14D0 */ cXyz field_0x14d0;
}; // Size: 0x14DC
#endif /* D_A_CANOE_H */
include/rel/d/a/d_a_crod/d_a_crod.h
+5 -5
View File
@@ -28,15 +28,15 @@ public:
NULL);
}
fopAc_ac_c* getControllActor() { return mControllActor.getActor(); }
fopAc_ac_c* getControllActor() { return mControllAcKeep.getActor(); }
fopAc_ac_c* getCameraActor() { return mCameraActor.getActor(); }
fopAc_ac_c* getCameraActor() { return mCameraAcKeep.getActor(); }
void setThrow() { fopAcM_SetParam(this, 2); }
private:
/* 0x568 */ J3DModel* field_568;
/* 0x56C */ mDoExt_bckAnm field_0x56c;
/* 0x56C */ mDoExt_bckAnm mBckAnm;
/* 0x588 */ J3DAnmTevRegKey* field_0x588;
/* 0x58C */ J3DAnmTextureSRTKey* field_0x58c;
/* 0x590 */ dCcD_Stts field_0x590;
@@ -46,8 +46,8 @@ private:
/* 0x731 */ u8 field_0x731;
/* 0x732 */ u8 field_0x732;
/* 0x734 */ cXyz field_0x734;
/* 0x740 */ daPy_actorKeep_c mControllActor;
/* 0x748 */ daPy_actorKeep_c mCameraActor;
/* 0x740 */ daPy_actorKeep_c mControllAcKeep;
/* 0x748 */ daPy_actorKeep_c mCameraAcKeep;
}; // Size: 0x750
#endif /* D_A_CROD_H */
include/rel/d/a/d_a_cstatue/d_a_cstatue.h
+70 -1
View File
@@ -1,6 +1,75 @@
#ifndef D_A_CSTATUE_H
#define D_A_CSTATUE_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
#include "d/particle/d_particle_copoly.h"
#include "f_op/f_op_actor.h"
class daCstatue_c : public fopAc_ac_c {
public:
/* 806636AC */ void atHitCallback(fopAc_ac_c*);
/* 806636EC */ void createHeap();
/* 80663D28 */ void create();
/* 80664840 */ ~daCstatue_c();
/* 80664AA0 */ void setRoomInfo();
/* 80664B38 */ void setMatrix();
/* 80664C9C */ void posMove();
/* 8066555C */ void setCollision();
/* 80665E14 */ void checkHammerReverse();
/* 80665F80 */ void setDemo();
/* 80666390 */ void setAnime();
/* 80666B80 */ void initBrk(u16);
/* 80666BF8 */ void initStopBrkBtk();
/* 80666C38 */ void initStartBrkBtk();
/* 80666DE8 */ void execute();
/* 80667438 */ void draw();
bool checkNotSmallType() const { return mType == 1; }
static u8 const m_bckIdxTable[70 + 2 /* padding */];
/* 0x568 */ char* mResName;
/* 0x56C */ request_of_phase_process_class mPhaseReq;
/* 0x574 */ J3DModel* field_0x574;
/* 0x578 */ mDoExt_McaMorfSO* field_0x578;
/* 0x57C */ mDoExt_btkAnm field_0x57c;
/* 0x594 */ mDoExt_brkAnm field_0x594;
/* 0x5AC */ dBgS_AcchCir field_0x5ac[4];
/* 0x6AC */ dBgS_StatueAcch field_0x6ac;
/* 0x884 */ dCcD_Stts field_0x884;
/* 0x8C0 */ dCcD_Cyl field_0x8c0;
/* 0x9FC */ dCcD_Cyl* field_0x9fc;
/* 0xA00 */ dCcD_Cps* field_0xa00;
/* 0xA04 */ dCcD_Cps* field_0xa04;
/* 0xA08 */ dCcD_Sph* field_0xa08;
/* 0xA0C */ mDoExt_invisibleModel field_0xa0c;
/* 0xA14 */ Z2Creature field_0xa14;
/* 0xAA4 */ dPaPo_c field_0xaa4;
/* 0xADC */ u8 mReverb;
/* 0xADD */ u8 mType;
/* 0xADE */ u8 field_0xade;
/* 0xADF */ u8 field_0xadf;
/* 0xAE0 */ u8 field_0xae0;
/* 0xAE1 */ u8 field_0xae1;
/* 0xAE2 */ u8 field_0xae2;
/* 0xAE3 */ u8 field_0xae3;
/* 0xAE4 */ u8 field_0xae4;
/* 0xAE5 */ u8 mBossAtGndHit;
/* 0xAE6 */ u8 field_0xae6[0xAE8 - 0xAE6];
/* 0xAE8 */ s16 field_0xae8;
/* 0xAEA */ s16 field_0xaea;
/* 0xAEC */ u32 mStateFlg0;
/* 0xAF0 */ u32 field_0xaf0;
/* 0xAF4 */ f32 field_0xaf4;
/* 0xAF8 */ f32 field_0xaf8;
/* 0xAFC */ f32 field_0xafc;
/* 0xB00 */ f32 field_0xb00;
/* 0xB04 */ f32 field_0xb04;
/* 0xB08 */ cXyz field_0xb08;
/* 0xB14 */ cXyz field_0xb14;
/* 0xB20 */ cXyz mBallPos;
}; // Size: 0xB2C
#endif /* D_A_CSTATUE_H */
include/rel/d/a/d_a_horse/d_a_horse.h
+13 -7
View File
@@ -51,6 +51,7 @@ public:
enum daHorse_FLG0 {
/* 0x00000020 */ RODEO_LEFT = 0x20,
/* 0x00000040 */ RIDE_START_FLG = 0x40,
/* 0x00000080 */ NO_DRAW_WAIT = 0x80,
/* 0x00010000 */ PLAYER_BACK_RIDE_LASH = 0x10000,
/* 0x20000000 */ TURN_CANCEL_KEEP = 0x20000000,
/* 0x80000000 */ RODEO_MODE = 0x80000000
@@ -158,6 +159,11 @@ public:
void i_changeDemoMode(u32 param_0, int param_1) { field_0x1740 = param_0; field_0x1728 = param_1; }
void i_changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; }
void i_setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*mpSetHorsePosAngleFn)(i_pos, i_angle); }
void onRideFlg() { (this->*mpOnRideFlgFn)(); }
void onStateFlg0(daHorse_FLG0 flag) { mStateFlg0 |= flag; }
void offStateFlg0(daHorse_FLG0 flag) { mStateFlg0 &= ~flag; }
void offNoDrawWait() { offStateFlg0(NO_DRAW_WAIT); }
int checkSpecialWallHit(const cXyz& param_0) { return (this->*mpCheckSpecialWallHitFn)(param_0); }
bool checkTurnStandCamera() const { return checkResetStateFlg0(TURN_STAND_CAMERA); }
bool checkTurnStand() const { return checkResetStateFlg0(TURN_STAND); }
@@ -226,13 +232,13 @@ public:
/* 0x17C4 */ cXyz mDemoPos0;
/* 0x17D0 */ u8 field_0x17d0[0x18A4 - 0x17D0];
/* 0x18A4 */ int (daHorse_c::*mpProcFn)();
/* 0x18A4 */ int (daHorse_c::*mpCheckSpecialWallHitFn)(const cXyz&);
/* 0x18A4 */ void (daHorse_c::*mpSetReinPosHandFn)(int);
/* 0x18A4 */ void (daHorse_c::*mpSetReinPosNormalFn)();
/* 0x18A4 */ int (daHorse_c::*mpCallHorseFn)(const cXyz*);
/* 0x18A4 */ int (daHorse_c::*mpSetHorsePosAngleFn)(const cXyz* i_pos, s16 i_angle);
/* 0x18A4 */ void (daHorse_c::*mpOnRideFlgFn)();
/* 0x18A4 */ void (daHorse_c::*mpOffRideFlgFn)();
/* 0x18B0 */ int (daHorse_c::*mpCheckSpecialWallHitFn)(const cXyz&);
/* 0x18BC */ void (daHorse_c::*mpSetReinPosHandFn)(int);
/* 0x18C8 */ void (daHorse_c::*mpSetReinPosNormalFn)();
/* 0x18D4 */ int (daHorse_c::*mpCallHorseFn)(const cXyz*);
/* 0x18E0 */ int (daHorse_c::*mpSetHorsePosAngleFn)(const cXyz* i_pos, s16 i_angle);
/* 0x18EC */ void (daHorse_c::*mpOnRideFlgFn)();
/* 0x18F8 */ void (daHorse_c::*mpOffRideFlgFn)();
};
#endif /* D_A_HORSE_H */
include/rel/d/a/d_a_mg_rod/d_a_mg_rod.h
+69 -1
View File
@@ -1,6 +1,74 @@
#ifndef D_A_MG_ROD_H
#define D_A_MG_ROD_H
#include "dolphin/types.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
#include "d/msg/d_msg_flow.h"
#include "f_op/f_op_actor.h"
struct mg_rod_s {
/* 0x0 */ cXyz field_0x0[16];
};
struct mg_line_s {
/* 0x0 */ cXyz field_0x0[100];
};
struct mg_hook_s {
/* 0x00 */ cXyz field_0x0[2];
/* 0x18 */ u8 field_0x18[0x20 - 0x18];
};
class dmg_rod_class : public fopAc_ac_c {
public:
/* 804BAC0C */ dmg_rod_class();
f32 getRodStickX() { return mRodStickX; }
f32 getRodStickY() { return mRodStickY; }
bool checkRodEquipPermission() { return field_0x1514 == 0; }
private:
/* 0x0568 */ u8 field_0x568[0x5A4 - 0x568];
/* 0x05A4 */ mg_rod_s field_0x5a4;
/* 0x0664 */ u8 field_0x664[0x6AC - 0x664];
/* 0x06AC */ cXyz field_0x6ac;
/* 0x06B8 */ cXyz field_0x6b8;
/* 0x06C4 */ u8 field_0x6c4[0x6C8 - 0x6C4];
/* 0x06C8 */ cXyz field_0x6c8;
/* 0x06D4 */ cXyz field_0x6d4;
/* 0x06E0 */ u8 field_0x6e0[0x6EC - 0x6E0];
/* 0x06EC */ cXyz field_0x6ec;
/* 0x06F8 */ u8 field_0x6f8[0x71C - 0x6F8];
/* 0x071C */ csXyz field_0x71c[6];
/* 0x0740 */ u8 field_0x740[0x744 - 0x740];
/* 0x0744 */ cXyz field_0x744;
/* 0x0750 */ cXyz field_0x750;
/* 0x075C */ u8 field_0x75c[0x764 - 0x75C];
/* 0x0764 */ cXyz field_0x764;
/* 0x0770 */ mg_line_s field_0x770;
/* 0x0C20 */ u8 field_0xc20[0xFAC - 0xC20];
/* 0x0FAC */ mg_hook_s field_0xfac[2];
/* 0x0FEC */ u8 field_0xfec[0x1060 - 0xFEC];
/* 0x1060 */ cXyz field_0x1060;
/* 0x106C */ cXyz field_0x106c;
/* 0x1078 */ cXyz field_0x1078;
/* 0x1084 */ csXyz field_0x1084;
/* 0x108A */ u8 field_0x108a[0x10B4 - 0x108A];
/* 0x10B4 */ Z2Creature field_0x10b4;
/* 0x1144 */ u8 field_0x1144[0x1190 - 0x1144];
/* 0x1190 */ dBgS_AcchCir field_0x1190;
/* 0x11D0 */ dBgS_ObjAcch field_0x11d0;
/* 0x13A8 */ u8 field_0x13a8[0x1474 - 0x13A8];
/* 0x1474 */ dMsgFlow_c mMsgFlow;
/* 0x14C0 */ u8 field_0x14c0[0x14C8 - 0x14C0];
/* 0x14C8 */ f32 mRodStickX;
/* 0x14CC */ f32 mRodStickY;
/* 0x14D0 */ u8 field_0x14d0[0x1514 - 0x14D0];
/* 0x1514 */ u8 field_0x1514;
/* 0x1515 */ u8 field_0x1515[0x1518 - 0x1515];
/* 0x1518 */ dCcD_Stts field_0x1518;
/* 0x1554 */ dCcD_Sph field_0x1554;
};
#endif /* D_A_MG_ROD_H */
include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h
+1
View File
@@ -15,6 +15,7 @@ public:
u32 getSwNo() { return fopAcM_GetParam(this) >> 0x18; }
u16 getOffEventBit() { return orig.angle.z & 0xFFF; }
u16 getOnEventBit() { return orig.angle.x & 0xFFF; }
u8 getPathID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; }
void setSceneChangeOK() { mSceneChangeOK = true; }
/* 0x568 */ Mtx mMatrix;
include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h
+21 -1
View File
@@ -1,6 +1,26 @@
#ifndef D_A_SKIP_2D_H
#define D_A_SKIP_2D_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
class daSkip2D_c : public fopAc_ac_c {
public:
daSkip2D_c() {
initiate();
}
/* 80D4D498 */ int createHeap();
/* 80D4D4F4 */ int create();
/* 80D4D588 */ int destroy();
/* 80D4D590 */ int draw();
/* 80D4D5D0 */ int execute();
/* 80D4D5D8 */ void initiate();
/* 80D4D674 */ virtual ~daSkip2D_c() {}
/* 0x56C */ u32 field_0x56c;
/* 0x570 */ dMeterButton_c* mpButton;
/* 0x574 */ u8 field_0x574;
}; // Size: 0x578
#endif /* D_A_SKIP_2D_H */
include/rel/d/a/d_a_spinner/d_a_spinner.h
+1
View File
@@ -36,6 +36,7 @@ public:
bool checkSpinnerTagEnd() const { return mSpinnerTag == 5; }
bool checkSpinnerTagIntoIncRot() const { return mSpinnerTag == 4; }
bool checkSpinnerTagInto() const { return mSpinnerTag == 3; }
bool checkGroundHit() { return mAcch.ChkGroundHit(); }
u8 getButtonJump() const { return mButtonJump; }
u8 getJumpFlg() const { return mJumpFlg; }
include/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.h
+15 -1
View File
@@ -1,6 +1,20 @@
#ifndef D_A_TAG_HINIT_H
#define D_A_TAG_HINIT_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class daTagHinit_c : public fopAc_ac_c {
public:
/* 805A3758 */ int create();
/* 805A3820 */ ~daTagHinit_c();
/* 805A389C */ int execute();
/* 0x568 */ u8 field_0x568;
/* 0x569 */ u8 field_0x569;
/* 0x56A */ u8 field_0x56a;
/* 0x56B */ u8 field_0x56b;
/* 0x56C */ u16 field_0x56c;
/* 0x56E */ u16 field_0x56e;
};
#endif /* D_A_TAG_HINIT_H */
include/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.h
+16 -1
View File
@@ -1,6 +1,21 @@
#ifndef D_A_TAG_SETRESTART_H
#define D_A_TAG_SETRESTART_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daTagRestart_c : public fopAc_ac_c {
public:
/* 80D603F8 */ int Create();
/* 80D6048C */ int create();
/* 80D60560 */ int execute();
/* 80D60744 */ int _delete();
/* 0x568 */ s8 mPlayerRoomNo;
/* 0x56C */ cXyz field_0x56c[4];
};
namespace daTagRestart_prm {
inline u8 getFRoomNo(daTagRestart_c* i_tag) { return fopAcM_GetParam(i_tag); }
};
#endif /* D_A_TAG_SETRESTART_H */
include/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.h
+19 -1
View File
@@ -1,6 +1,24 @@
#ifndef D_A_TAG_WARA_HOWL_H
#define D_A_TAG_WARA_HOWL_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daTagWrHowl_c : public fopAc_ac_c {
public:
/* 80D63F38 */ daTagWrHowl_c();
/* 80D63FD4 */ int create();
/* 80D6402C */ int Delete();
/* 80D64034 */ int draw();
/* 80D6403C */ int execute();
/* 80D64090 */ void init();
/* 80D640B4 */ bool chkWlfInTag();
/* 80D63F74 */ virtual ~daTagWrHowl_c();
u8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); }
/* 0x56C */ f32 field_0x56c;
/* 0x570 */ f32 field_0x570;
};
#endif /* D_A_TAG_WARA_HOWL_H */