mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-12 21:45:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
TakaRikka
2025-12-05 21:14:19 -08:00
parent cfb4f00592 ae9fa8922a
commit 05435b4593
219 changed files with 8399 additions and 7176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DMatBlock.h
+6
View File
@@ -2,6 +2,7 @@
#define J2DMATBLOCK_H
#include "JSystem/J2DGraph/J2DTevs.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JUtility/TColor.h"
class JUTFont;
@@ -117,6 +118,7 @@ public:
}
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
J3D_PANIC(250, index < 4, "Error : range over.");
mTevColor[index] = color;
}
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
@@ -212,6 +214,7 @@ public:
}
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
J3D_PANIC(360, index < 4, "Error : range over.");
mTevColor[index] = color;
}
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
@@ -309,6 +312,7 @@ public:
}
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
J3D_PANIC(468, index < 4, "Error : range over.");
mTevColor[index] = color;
}
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
@@ -406,6 +410,7 @@ public:
}
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
J3D_PANIC(579, index < 4, "Error : range over.");
mTevColor[index] = color;
}
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
@@ -504,6 +509,7 @@ public:
}
virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
virtual void setTevColor(u32 index, J2DGXColorS10 color) {
J3D_PANIC(691, index < 4, "Error : range over.");
mTevColor[index] = color;
}
virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
include/JSystem/JAudio2/JASAramStream.h
+2 -2
View File
@@ -11,8 +11,6 @@ namespace JASDsp {
class TChannel;
}
#define CHANNEL_MAX 6
/**
* @ingroup jsystem-jaudio
*
@@ -130,6 +128,8 @@ public:
static u32 getBlockSize() { return sBlockSize; }
static const int CHANNEL_MAX = 6;
/* 0x000 */ OSMessageQueue field_0x000;
/* 0x020 */ OSMessageQueue field_0x020;
/* 0x040 */ void* field_0x040[16];
include/JSystem/JAudio2/JASHeapCtrl.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
void* getBase() { return mBase; }
bool isAllocated() { return mBase; }
u32 getSize() { return mSize; }
u32 getSize() const { return mSize; }
/* 0x00 */ JSUTree<JASHeap> mTree;
/* 0x1C */ OSMutex mMutex;
include/JSystem/JAudio2/JAUStreamAramMgr.h
+1 -2
View File
@@ -59,7 +59,6 @@ public:
}
return NULL;
}
// NONMATCHING regalloc
virtual bool deleteStreamAram(u32 param_0) {
for (u32 i = 0; i < field_0x4c; i++) {
if (!this->field_0x4.test(i)) {
@@ -80,7 +79,7 @@ public:
if (!heap) {
heap = JASKernel::getAramHeap();
}
if (numReserve < 1) {
if (numReserve <= 0) {
numReserve = 1;
}
JUT_ASSERT(83, numReserve <= MAX_CHUNKS);
include/JSystem/JGadget/binary.h
+6
View File
@@ -1,6 +1,7 @@
#ifndef BINARY_H
#define BINARY_H
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/types.h"
#include "JSystem/JGadget/search.h"
@@ -14,7 +15,12 @@ struct TEBit {
const void* parseVariableUInt_16_32_following(const void* pu16, u32* pu32First, u32* pu32Second,
TEBit* tebit);
inline bool isPower2(unsigned int arg0) {
return arg0 != 0 && (arg0 & arg0 - 1) == 0;
}
inline u32 align_roundUp(unsigned int arg0, unsigned int uAlign) {
JUT_ASSERT(98, isPower2(uAlign));
return (arg0 + uAlign - 1) & ~(uAlign - 1);
}
include/JSystem/JGadget/linklist.h
+1 -1
View File
@@ -235,7 +235,7 @@ struct TLinkList : TNodeLinkList {
iterator end() { return iterator(TNodeLinkList::end()); }
const_iterator end() const { return const_iterator(const_cast<TLinkList*>(this)->end()); }
T& front() { return *begin(); }
T& back() { return *--end(); }
T& back() { JUT_ASSERT(652, !empty()); return *--end(); }
void pop_front() { erase(TNodeLinkList::begin()); }
void Push_front(T* element) { Insert(begin(), element); }
void Push_back(T* element) { Insert(end(), element); }
include/JSystem/JGadget/search.h
+2 -2
View File
@@ -111,14 +111,14 @@ inline Iterator findUpperBound_binary_end(Iterator first, Iterator last, const T
}
template <typename Iterator, typename T, typename Predicate>
Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val, Predicate p) {
inline Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val, Predicate p) {
return current == last || p(val, *current) ?
findUpperBound_binary_end(first, current, val, p) :
findUpperBound_binary_begin(current, last, val, p);
}
template <typename Iterator, typename T>
Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val) {
inline Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val) {
return findUpperBound_binary_current(first, last, current, val, std::less<T>());
}
include/JSystem/JGadget/vector.h
+2 -2
View File
@@ -51,7 +51,7 @@ struct TVector_pointer_void : TVector<void*, TAllocator> {
void insert(void**, void* const&);
void clear() { erase(begin(), end()); }
void push_back(const void*& ref) { insert(end(), (void* const&)ref); }
void push_back(void* const& ref) { insert(end(), ref); }
};
template <typename T>
@@ -66,7 +66,7 @@ struct TVector_pointer : TVector_pointer_void {
T* end() { return (T*)TVector_pointer_void::end(); }
void push_back(const T& ref) {
static_cast<TVector_pointer_void*>(this)->push_back((const void*&)ref);
static_cast<TVector_pointer_void*>(this)->push_back(ref);
}
};
include/JSystem/JGeometry.h
+7 -11
View File
@@ -268,19 +268,15 @@ struct TVec3<f32> : public Vec {
return inv_norm * sq;
}
void normalize(const TVec3<f32>& other) {
f32 normalize(const TVec3<f32>& other) {
f32 sq = other.squared();
if (sq <= TUtil<f32>::epsilon()) {
zero();
return;
}
f32 norm;
if (sq <= 0.0f) {
norm = sq;
} else {
norm = fsqrt_step(sq);
return 0.0f;
}
f32 norm = TUtil<f32>::inv_sqrt(sq);
scale(norm, other);
return norm * sq;
}
f32 length() const {
@@ -411,12 +407,12 @@ struct TVec2 {
TVec2(T v) { set(v); }
template <typename U>
TVec2(U x, U y) { set(x, y); }
TVec2(const U x, const U y) { set(x, y); }
void set(T v) { y = x = v; }
template <typename U>
void set(U x, U y) {
void set(const U x, const U y) {
this->x = x;
this->y = y;
}
@@ -518,7 +514,7 @@ struct TBox2 : public TBox<TVec2<T> > {
}
}
void set(const TBox2& other) { set(other.i, other.f); }
void set(const TBox<TVec2<T> >& other) { set(other.i, other.f); }
void set(const TVec2<f32>& i, const TVec2<f32>& f) { this->i.set(i), this->f.set(f); }
void set(f32 x0, f32 y0, f32 x1, f32 y1) { this->i.set(x0, y0); this->f.set(x1, y1); }
};
include/JSystem/JKernel/JKRAram.h
+1 -1
View File
@@ -85,7 +85,7 @@ inline u8* JKRAramToMainRam(u32 p1, u8* p2, u32 p3, JKRExpandSwitch p4, u32 p5,
return JKRAram::aramToMainRam(p1, p2, p3, p4, p5, p6, p7, p8);
}
inline JKRAramBlock *JKRMainRamToAram(u8 *buf, u32 bufSize, u32 alignedSize, JKRExpandSwitch expandSwitch, u32 fileSize, JKRHeap *heap, int id, u32 *pSize) {
inline JKRAramBlock* JKRMainRamToAram(u8 *buf, u32 bufSize, u32 alignedSize, JKRExpandSwitch expandSwitch, u32 fileSize, JKRHeap *heap, int id, u32 *pSize) {
return JKRAram::mainRamToAram(buf, bufSize, alignedSize, expandSwitch, fileSize, heap, id, pSize);
}
include/JSystem/JMath/JMath.h
+1 -1
View File
@@ -37,7 +37,7 @@ inline float __frsqrtes(__REGISTER double f) {
#endif
}
inline f32 JMAFastSqrt(__REGISTER f32 input) {
inline f32 JMAFastSqrt(__REGISTER const f32 input) {
#ifdef __MWERKS__
if (input > 0.0f) {
__REGISTER f32 out;
include/JSystem/JParticle/JPAEmitter.h
+1 -1
View File
@@ -264,7 +264,7 @@ public:
/* 0xE8 */ JPAResource* mpRes;
/* 0xEC */ JPAEmitterCallBack* mpEmtrCallBack;
/* 0xF0 */ JPAParticleCallBack* mpPtclCallBack;
/* 0xF4 */ volatile u32 mStatus;
/* 0xF4 */ u32 mStatus;
/* 0xF8 */ f32 mEmitCount;
/* 0xFC */ f32 mScaleOut;
/* 0x100 */ u32 mTick;
include/JSystem/JStudio/JStudio/ctb.h
+4 -5
View File
@@ -55,8 +55,7 @@ struct data {
}
const void* getContent() const {
const THeaderData* header = (THeaderData*) getRaw();
return header->content;
return ((THeaderData*) getRaw())->content;
}
};
@@ -86,7 +85,7 @@ struct data {
}
const void* getBlockEnd_() const {
return get()->field_0x8;
return ((const TBlockData*)getRaw())->field_0x8;
}
const void* get_ID() const {
@@ -134,11 +133,11 @@ struct TControl {
JStudio::ctb::TObject* getObject(void const*, u32);
JStudio::ctb::TObject* getObject_index(u32);
TFactory* getFactory() { return pFactory_; }
TFactory* getFactory() const { return pFactory_; }
void setFactory(TFactory* factory) { pFactory_ = factory; }
/* 0x4 */ TFactory* pFactory_;
/* 0x8 */ JGadget::TLinkList<TObject, -12> mList;
/* 0x8 */ JGadget::TLinkList<TObject, -12> ocObject_;
};
struct TParse : public JGadget::binary::TParse_header_block {
include/JSystem/JStudio/JStudio/functionvalue.h
+1 -7
View File
@@ -157,7 +157,6 @@ private:
class TFunctionValue_constant : public TFunctionValue {
public:
TFunctionValue_constant();
virtual ~TFunctionValue_constant() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -195,7 +194,6 @@ public:
const TFunctionValue_composite::TData&, f64);
TFunctionValue_composite();
virtual ~TFunctionValue_composite() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -232,7 +230,6 @@ class TFunctionValue_transition : public TFunctionValue,
public TFunctionValueAttribute_interpolate {
public:
TFunctionValue_transition();
virtual ~TFunctionValue_transition() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -264,7 +261,6 @@ public:
typedef f64 (*update_INTERPOLATE)(const TFunctionValue_list&, const TIndexData_&);
TFunctionValue_list();
virtual ~TFunctionValue_list() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -380,7 +376,6 @@ public:
typedef f64 (*update_INTERPOLATE)(const TFunctionValue_list_parameter&, f64);
TFunctionValue_list_parameter();
virtual ~TFunctionValue_list_parameter() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -499,7 +494,6 @@ public:
};
TFunctionValue_hermite();
virtual ~TFunctionValue_hermite() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -545,7 +539,7 @@ inline f64 extrapolateParameter_clamp(f64 value, f64 max) {
return 0.0;
if (max <= value)
value = max;
return max;
return value;
}
include/JSystem/JStudio/JStudio/jstudio-control.h
+28 -28
View File
@@ -142,31 +142,31 @@ public:
*pDst = rSrc;
}
void transformOnSet_transform(TTransform_position* param_1, TTransform_position* param_2) const {
transformOnSet_transformTranslation(*param_1, param_2);
void transformOnSet_transform(const TTransform_position &param_1, TTransform_position* param_2) const {
transformOnSet_transformTranslation(param_1, param_2);
}
void transformOnSet_transform(TTransform_translation_rotation_scaling* param_1,
void transformOnSet_transform(const TTransform_translation_rotation_scaling& param_1,
TTransform_translation_rotation_scaling* param_2) const {
transformOnSet_transformTranslation(param_1->translation, &param_2->translation);
transformOnSet_transformRotation(param_1->rotation, &param_2->rotation);
transformOnSet_transformScaling(param_1->scaling, &param_2->scaling);
transformOnSet_transformTranslation(param_1.translation, &param_2->translation);
transformOnSet_transformRotation(param_1.rotation, &param_2->rotation);
transformOnSet_transformScaling(param_1.scaling, &param_2->scaling);
}
TTransform_position* transformOnSet_transform_ifEnabled(TTransform_position* param_1,
const TTransform_position* transformOnSet_transform_ifEnabled(const TTransform_position& param_1,
TTransform_position* param_2) const {
if (!transformOnSet_isEnabled()) {
return param_1;
return &param_1;
}
transformOnSet_transform(param_1, param_2);
return param_2;
}
TTransform_translation_rotation_scaling*
transformOnSet_transform_ifEnabled(TTransform_translation_rotation_scaling* param_1,
const TTransform_translation_rotation_scaling*
transformOnSet_transform_ifEnabled(const TTransform_translation_rotation_scaling& param_1,
TTransform_translation_rotation_scaling* param_2) const {
if (!transformOnSet_isEnabled()) {
return param_1;
return &param_1;
}
transformOnSet_transform(param_1, param_2);
return param_2;
@@ -187,33 +187,33 @@ public:
MTXMultVecSR(transformOnGet_getMatrix(), &rSrc, pDst);
}
void transformOnGet_transform(TTransform_position_direction* param_1,
void transformOnGet_transform(const TTransform_position_direction& param_1,
TTransform_position_direction* pDst) const {
JUT_ASSERT(289, pDst!=NULL);
transformOnGet_transformTranslation(param_1->position, &pDst->position);
transformOnGet_transformDirection(param_1->direction, &pDst->direction);
transformOnGet_transformTranslation(param_1.position, &pDst->position);
transformOnGet_transformDirection(param_1.direction, &pDst->direction);
}
TTransform_position_direction*
transformOnGet_transform_ifEnabled(TTransform_position_direction& param_1,
const TTransform_position_direction*
transformOnGet_transform_ifEnabled(const TTransform_position_direction& param_1,
TTransform_position_direction* param_2) const {
if (!transformOnGet_isEnabled()) {
return &param_1;
}
transformOnGet_transform(&param_1, param_2);
transformOnGet_transform(param_1, param_2);
return param_2;
}
void transformOnGet_transform(TTransform_position* param_1,
void transformOnGet_transform(const TTransform_position& param_1,
TTransform_position* pDst) const {
transformOnGet_transformTranslation(*param_1, pDst);
transformOnGet_transformTranslation(param_1, pDst);
}
TTransform_position*
transformOnGet_transform_ifEnabled(TTransform_position* param_1,
const TTransform_position*
transformOnGet_transform_ifEnabled(const TTransform_position& param_1,
TTransform_position* param_2) const {
if (!transformOnGet_isEnabled()) {
return param_1;
return &param_1;
}
transformOnGet_transform(param_1, param_2);
return param_2;
@@ -257,18 +257,18 @@ public:
MTXMultVecSR(transformOnSet_getMatrix(), &rSrc, pDst);
}
void transformOnSet_transform(TTransform_position_direction* param_1,
void transformOnSet_transform(const TTransform_position_direction& param_1,
TTransform_position_direction* pDst) const {
JUT_ASSERT(219, pDst!=NULL);
transformOnSet_transformTranslation(param_1->position, &pDst->position);
transformOnSet_transformDirection(param_1->direction, &pDst->direction);
transformOnSet_transformTranslation(param_1.position, &pDst->position);
transformOnSet_transformDirection(param_1.direction, &pDst->direction);
}
TTransform_position_direction*
transformOnSet_transform_ifEnabled(TTransform_position_direction* param_1,
const TTransform_position_direction*
transformOnSet_transform_ifEnabled(const TTransform_position_direction& param_1,
TTransform_position_direction* param_2) const {
if (!transformOnSet_isEnabled()) {
return param_1;
return &param_1;
}
transformOnSet_transform(param_1, param_2);
return param_2;
include/JSystem/JStudio/JStudio/object-id.h
+12 -8
View File
@@ -9,7 +9,7 @@ namespace object {
struct TIDData {
public:
TIDData(const void* id, u32 id_size) : mID(id), mID_size(id_size) {}
TIDData(const void* pID, u32 uIDSize_) : mID(pID), mID_size(uIDSize_) {}
static bool isEqual(JStudio::object::TIDData const&, JStudio::object::TIDData const&);
inline const u8* getID() const { return (const u8*)mID; }
@@ -20,17 +20,21 @@ protected:
/* 0x04 */ u32 mID_size;
};
struct TObject_ID : public TIDData {
TObject_ID(const void* id, u32 id_size) : TIDData(id, id_size) {}
struct TObject_ID {
TObject_ID(const void* id, u32 id_size) : mData(id, id_size) {}
~TObject_ID() {}
TIDData const& getIDData() const { return *this; }
const u8 *getID() const { return TIDData::getID(); }
TIDData const& getIDData() const { return mData; }
const u8 *getID() const { return mData.getID(); }
TIDData mData;
};
struct TPRObject_ID_equal : public TIDData {
TPRObject_ID_equal(const void* id, u32 id_size) : TIDData(id, id_size) {}
struct TPRObject_ID_equal {
TPRObject_ID_equal(const void* id, u32 id_size) : mData(id, id_size) {}
~TPRObject_ID_equal() {}
bool operator()(TObject_ID const& id) const { return TIDData::isEqual(id.getIDData(), *this); }
bool operator()(TObject_ID const& id) const { return TIDData::isEqual(id.getIDData(), mData); }
TIDData mData;
};
} // namespace object
include/JSystem/JStudio/JStudio_JStage/control.h
+2 -2
View File
@@ -28,7 +28,7 @@ struct TCreateObject : public JStudio::TCreateObject {
};
struct TAdaptor_object_ {
TAdaptor_object_(JStage::TSystem const*param_2, JStage::TObject *param_3) :
TAdaptor_object_(const JStudio::TAdaptor *, JStage::TSystem const*param_2, JStage::TObject *param_3) :
pJSGSystem_(param_2), pJSGObject_(param_3) {}
void adaptor_object_data_(void const*, u32, void const*, u32);
JStage::TObject* adaptor_object_findJSGObject_(char const*);
@@ -258,7 +258,7 @@ struct TAdaptor_light : public JStudio::TAdaptor_light, public TAdaptor_object_
virtual void operator()(f32, JStudio::TAdaptor*) const;
virtual ~TVVOutput_direction_() {}
void adaptor_setOutput_(TAdaptor* adaptor) {
void adaptor_setOutput_(TAdaptor* adaptor) const {
adaptor->adaptor_referVariableValue(field_0x4)->setOutput(this);
}
include/JSystem/JSupport/JSupport.h
+4
View File
@@ -41,6 +41,10 @@ inline u8 JSUHiByte(u16 in) {
return in >> 8;
}
inline u16 JSUHiHalf(u32 in) {
return (in >> 16);
}
inline u16 JSULoHalf(u32 param_0) {return param_0; }
#endif
include/SSystem/SComponent/c_cc_d.h
+1
View File
@@ -379,6 +379,7 @@ public:
void OnTgNoSlingHitInfSet() { mObjTg.OnSPrmBit(0x40); }
void OnAtVsBitSet(u32 prm) { mObjAt.OnSPrmBit(prm); }
void OffAtVsBitSet(u32 prm) { mObjAt.OffSPrmBit(prm); }
void OffTgNoAtHitInfSet() { mObjTg.OffSPrmBit(0x20); }
}; // Size = 0x40
include/SSystem/SComponent/c_sxyz.h
+1 -2
View File
@@ -11,8 +11,7 @@ class csXyz : public SVec {
public:
static const csXyz Zero;
~csXyz() {}
/* inline */ csXyz() {}
/* inline */ csXyz(const csXyz& other) : SVec(other){};
csXyz() {}
csXyz(s16, s16, s16);
csXyz operator+(csXyz&);
void operator+=(csXyz&);
include/d/actor/d_a_alink.h
+724 -286
View File
File diff suppressed because it is too large Load Diff
include/d/actor/d_a_e_dn.h
+72 -76
View File
@@ -13,56 +13,56 @@
*
* @details
*
*/
*/
class e_dn_class {
public:
e_dn_class();
/* 0x0000 */ fopEn_enemy_c actor;
/* 0x05AC */ request_of_phase_process_class mPhase;
/* 0x05B4 */ s16 mMode;
/* 0x05B6 */ u8 field_0x5b6;
/* 0x05B7 */ u8 field_0x5b7;
/* 0x05B8 */ u8 field_0x5b8;
/* 0x05B9 */ u8 field_0x5b9;
/* 0x05AC */ request_of_phase_process_class phase;
/* 0x05B4 */ s16 mode;
/* 0x05B6 */ u8 arg0;
/* 0x05B7 */ u8 arg1;
/* 0x05B8 */ u8 arg2;
/* 0x05B9 */ u8 arg3;
/* 0x05BC */ cXyz field_0x5bc;
/* 0x05C8 */ cXyz field_0x5c8;
/* 0x05D4 */ s16 field_0x5d4;
/* 0x05D4 */ s16 cur_angle_y_target;
/* 0x05D6 */ s16 field_0x5d6;
/* 0x05D8 */ s8 field_0x5d8;
/* 0x05DC */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x05E0 */ int mAnmID;
/* 0x05E4 */ J3DModel* mpKnifeModel;
/* 0x05E8 */ Z2CreatureEnemy mSound;
/* 0x068C */ J3DModel* mpShieldModel;
/* 0x0690 */ J3DModel* mpSkullModel;
/* 0x05DC */ mDoExt_McaMorfSO* anm_p;
/* 0x05E0 */ int anm_no;
/* 0x05E4 */ J3DModel* knife_model;
/* 0x05E8 */ Z2CreatureEnemy sound;
/* 0x068C */ J3DModel* tate_model;
/* 0x0690 */ J3DModel* skull_model;
/* 0x0694 */ s8 field_0x694;
/* 0x0698 */ cXyz field_0x698;
/* 0x0698 */ cXyz skull_trans;
/* 0x06A4 */ cXyz field_0x6a4;
/* 0x06B0 */ s16 field_0x6b0;
/* 0x06B2 */ s16 field_0x6b2;
/* 0x06B4 */ dJntCol_c mJntCol;
/* 0x06C4 */ s8 field_0x6c4;
/* 0x06C8 */ f32 field_0x6c8;
/* 0x06CC */ s16 field_0x6cc;
/* 0x06CE */ s16 mAction;
/* 0x06D0 */ f32 mPlayerDistance;
/* 0x06D4 */ s16 mYAngleToPlayer;
/* 0x06D6 */ s16 mXAngleToPlayer;
/* 0x06D8 */ f32 field_0x6d8;
/* 0x06DC */ u32 mShadowKey;
/* 0x06E0 */ s16 field_0x6e0[4];
/* 0x06E8 */ s16 field_0x6e8;
/* 0x06EA */ s16 field_0x6ea;
/* 0x06EC */ s16 field_0x6ec;
/* 0x06EE */ s8 field_0x6ee;
/* 0x06EF */ s8 field_0x6ef;
/* 0x06F0 */ s8 field_0x6f0;
/* 0x06F1 */ s8 field_0x6f1;
/* 0x06B0 */ s16 skull_y_rot;
/* 0x06B2 */ s16 skull_x_rot;
/* 0x06B4 */ dJntCol_c jc;
/* 0x06C4 */ s8 death_flag;
/* 0x06C8 */ f32 color;
/* 0x06CC */ s16 frame_counter;
/* 0x06CE */ s16 action;
/* 0x06D0 */ f32 pl_dir;
/* 0x06D4 */ s16 search_angle_y;
/* 0x06D6 */ s16 search_angle_x;
/* 0x06D8 */ f32 pl_range;
/* 0x06DC */ u32 shadow_key;
/* 0x06E0 */ s16 timer[4];
/* 0x06E8 */ s16 invulnerability_timer;
/* 0x06EA */ s16 unk_timer_1;
/* 0x06EC */ s16 unk_timer_2;
/* 0x06EE */ s8 tail_at_sph_flag;
/* 0x06EF */ s8 at_chk_flag;
/* 0x06F0 */ s8 at_sph_center_flag;
/* 0x06F1 */ s8 guard_flag;
/* 0x06F2 */ s8 field_0x6f2;
/* 0x06F3 */ s8 field_0x6f3;
/* 0x06F4 */ s8 field_0x6f4;
/* 0x06F5 */ u8 field_0x6f5;
/* 0x06F6 */ s16 field_0x6f6;
/* 0x06F8 */ s16 field_0x6f8;
/* 0x06FA */ s16 field_0x6fa;
@@ -75,16 +75,16 @@ public:
/* 0x070C */ s16 field_0x70c;
/* 0x070E */ s16 field_0x70e;
/* 0x0710 */ s8 field_0x710;
/* 0x0711 */ u8 field_0x711[15];
/* 0x0720 */ f32 field_0x720;
/* 0x0714 */ cXyz field_0x711;
/* 0x0720 */ f32 cur_pos_y_offset;
/* 0x0724 */ csXyz field_0x724;
/* 0x072A */ csXyz field_0x72a;
/* 0x0730 */ csXyz field_0x730;
/* 0x0736 */ s8 field_0x736;
/* 0x0737 */ s8 field_0x737;
/* 0x0738 */ cXyz field_0x738;
/* 0x0744 */ int field_0x744;
/* 0x0748 */ u8 field_0x748[4];
/* 0x0736 */ s8 unk_timer_3;
/* 0x0737 */ s8 left_right_flag;
/* 0x0738 */ cXyz find_pos;
/* 0x0744 */ int learn;
/* 0x0748 */ u8 field_0x748[0x74c - 0x748];
/* 0x074C */ f32 field_0x74c;
/* 0x0750 */ s16 field_0x750;
/* 0x0754 */ f32 field_0x754;
@@ -95,49 +95,45 @@ public:
/* 0x07A4 */ csXyz field_0x7a4[11];
/* 0x07E8 */ f32 field_0x7e8;
/* 0x07EC */ s16 field_0x7ec[2];
/* 0x07F0 */ s16 field_0x7f0;
/* 0x07F2 */ s16 field_0x7f2;
/* 0x07F4 */ s16 field_0x7f4;
/* 0x07F6 */ s16 field_0x7f6;
/* 0x07FA */ s16 field_0x7f8;
/* 0x07FA */ s16 field_0x7fa;
/* 0x07F0 */ s16 jnt_waist_z_rot;
/* 0x07F2 */ s16 jnt_arml1_z_rot_offset;
/* 0x07F4 */ s16 jnt_arml2_z_rot_offset;
/* 0x07F6 */ s16 jnt_armr1_z_rot_offset;
/* 0x07FA */ s16 jnt_armr2_z_rot_offset;
/* 0x07FA */ s16 jnt_legl1_y_rot;
/* 0x07FC */ s16 field_0x7fc[3];
/* 0x0802 */ s16 field_0x802[4];
/* 0x080A */ s16 field_0x80a;
/* 0x080C */ s16 field_0x80c;
/* 0x080A */ s16 death_jnt_rot;
/* 0x080C */ s16 death_jnt_rot_counter;
/* 0x080E */ csXyz field_0x80e[4];
/* 0x0826 */ s16 field_0x826;
/* 0x0828 */ s16 field_0x828;
/* 0x082A */ s16 field_0x82a;
/* 0x082C */ s16 field_0x82c;
/* 0x082E */ s8 field_0x82e;
/* 0x082F */ u8 field_0x82f;
/* 0x0830 */ s16 field_0x830;
/* 0x0832 */ s16 field_0x832;
/* 0x0834 */ u8 field_0x834[2];
/* 0x0826 */ s16 jnt_tail_y_rot_offset;
/* 0x0828 */ s16 unk_timer_4;
/* 0x082A */ s16 angle_y_offset;
/* 0x082C */ s16 unk_counter_1;
/* 0x082E */ s8 snap_angle_y_flag;
/* 0x0830 */ csXyz field_0x830;
/* 0x0836 */ csXyz field_0x836;
/* 0x083C */ f32 field_0x83c;
/* 0x0840 */ s16 field_0x840;
/* 0x0842 */ s16 field_0x842;
/* 0x0844 */ dBgS_AcchCir mAcchCir;
/* 0x0884 */ dBgS_ObjAcch mObjAcch;
/* 0x0840 */ s16 unk_timer_5;
/* 0x0842 */ s16 unk_counter_2;
/* 0x0844 */ dBgS_AcchCir acchcir;
/* 0x0884 */ dBgS_ObjAcch objacch;
/* 0x0A5C */ f32 field_0xa5c;
/* 0x0A60 */ dCcD_Stts mStts;
/* 0x0A9C */ dCcD_Sph field_0xa9c[3];
/* 0x0E44 */ dCcD_Sph field_0xe44;
/* 0x0F7C */ dCcD_Sph field_0xf7c;
/* 0x10B4 */ dCcU_AtInfo mAtInfo;
/* 0x10D8 */ u8 field_0x10d8;
/* 0x10D9 */ u8 field_0x10d9;
/* 0x10DA */ s8 field_0x10da;
/* 0x10DB */ u8 field_0x10db;
/* 0x0A60 */ dCcD_Stts stts;
/* 0x0A9C */ dCcD_Sph cc_sph[3];
/* 0x0E44 */ dCcD_Sph at_sph;
/* 0x0F7C */ dCcD_Sph tate_sph;
/* 0x10B4 */ dCcU_AtInfo at_info;
/* 0x10D8 */ u8 status;
/* 0x10D9 */ u8 hio_init;
/* 0x10DA */ s8 unk_timer_6;
/* 0x10DC */ u32 field_0x10dc;
/* 0x10E0 */ u32 field_0x10e0;
/* 0x10E4 */ s8 field_0x10e4;
/* 0x10E4 */ s8 set_smoke_flag;
/* 0x10E8 */ u32 field_0x10e8[2];
/* 0x10F0 */ u32 field_0x10f0[2];
/* 0x10F8 */ u32 field_0x10f8;
/* 0x10FC */ u32 field_0x10fc;
/* 0x10F8 */ u32 dn_tail_blur_a_prtcl;
/* 0x10FC */ u32 dn_tail_blur_b_prtcl;
/* 0x1100 */ u8 field_0x1100[12];
};
include/d/actor/d_a_e_fb.h
+1 -1
View File
@@ -71,7 +71,7 @@ private:
/* 0xA30 */ dCcD_Sph mSphere2;
/* 0xB68 */ dCcD_Sph mAtSph;
/* 0xCA0 */ dCcU_AtInfo mAtInfo;
// Seems that the orig developers didn't size mKeys correctly, as ideally it should be len=8, not len=7:
// !@bug Seems that the orig developers didn't size mKeys correctly, as ideally it should be len=8, not len=7:
/* 0xCC4 */ u32 mKeys[7];
/* 0xCE0 */ u8 mHIOInit;
/* 0xCE1 */ u8 field_0xce1[0xCE8 - 0xCE1];
include/d/actor/d_a_e_mk.h
+82 -77
View File
@@ -15,7 +15,8 @@
*
* @details
*
*/
*/
class e_mk_class {
public:
enum e_mk_ACTION {
@@ -30,98 +31,102 @@ public:
ACT_R04_DEMO = 35,
};
/* 0x000 */ fopEn_enemy_c enemy;
/* 0x5AC */ request_of_phase_process_class mPhase;
/* 0x5B4 */ s16 mMode;
/* 0x5B6 */ u8 mParam;
/* 0x5B7 */ u8 field_0x5b7;
/* 0x5B8 */ cXyz field_0x5b8;
enum Demo_Mode {
/* 0x0 */ DEMO_MODE_NONE,
/* 0x1 */ DEMO_MODE_START,
/* 0x2 */ DEMO_MODE_END,
/* 0x3 */ DEMO_MODE_R04,
/* 0x4 */ DEMO_MODE_BOHIT,
/* 0xA */ DEMO_MODE_FINISH = 0xA,
};
/* 0x000 */ fopEn_enemy_c actor;
/* 0x5AC */ request_of_phase_process_class phase;
/* 0x5B4 */ s16 mode;
/* 0x5B6 */ u8 arg0;
/* 0x5B8 */ cXyz posTarget;
/* 0x5C4 */ u8 field_0x5c4[0x5c8 - 0x5c4];
/* 0x5C8 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x5CC */ int mAnm;
/* 0x5D0 */ mDoExt_btpAnm* mBtp;
/* 0x5C8 */ mDoExt_McaMorfSO* anmP;
/* 0x5CC */ int anmNo;
/* 0x5D0 */ mDoExt_btpAnm* btpP;
/* 0x5D4 */ s16 field_0x5d4;
/* 0x5D8 */ f32 field_0x5d8;
/* 0x5DC */ mDoExt_McaMorf* mpCrownModelMorf;
/* 0x5E0 */ s8 field_0x5e0;
/* 0x5E4 */ cXyz field_0x5e4;
/* 0x5F0 */ csXyz field_0x5f0;
/* 0x5F6 */ u8 field_0x5f6[0x5fc - 0x5f6];
/* 0x5D8 */ f32 btpFrame;
/* 0x5DC */ mDoExt_McaMorf* crownAnmP;
/* 0x5E0 */ s8 unkFlag1;
/* 0x5E4 */ cXyz crownPos;
/* 0x5F0 */ csXyz unkRotation;
/* 0x5F6 */ csXyz field_0x5f6;
/* 0x5FC */ f32 field_0x5fc;
/* 0x600 */ f32 field_0x600;
/* 0x604 */ f32 field_0x604;
/* 0x608 */ J3DModel* mpBoomerangModel;
/* 0x60C */ s8 field_0x60c;
/* 0x60D */ s8 field_0x60d;
/* 0x60E */ s8 field_0x60e;
/* 0x60F */ u8 field_0x60f;
/* 0x610 */ Z2CreatureEnemy mSound;
/* 0x608 */ J3DModel* boomerangModelP;
/* 0x60C */ s8 crownStatus;
/* 0x60D */ s8 boomerangStatus;
/* 0x60E */ s8 btpFrameFlag;
/* 0x610 */ Z2CreatureEnemy sound;
/* 0x6B4 */ s16 field_0x6b4;
/* 0x6B6 */ s16 mAction;
/* 0x6B8 */ f32 mDistToPlayer;
/* 0x6BC */ s16 mAngleToPlayer;
/* 0x6BE */ s8 field_0x6be;
/* 0x6BF */ u8 field_0x6bf;
/* 0x6C0 */ cXyz field_0x6c0;
/* 0x6CC */ cXyz field_0x6cc;
/* 0x6D8 */ f32 field_0x6d8;
/* 0x6DC */ cXyz field_0x6dc;
/* 0x6E8 */ daPillar_c* mPillar;
/* 0x6EC */ daPillar_c* mHasira;
/* 0x6F0 */ u32 mShadowKey1;
/* 0x6F4 */ u32 mShadowKey2;
/* 0x6F8 */ s8 field_0x6f8;
/* 0x6F9 */ u8 field_0x6f9;
/* 0x6FA */ s16 field_0x6fa;
/* 0x6FC */ s16 field_0x6fc[4];
/* 0x704 */ s16 field_0x704;
/* 0x706 */ s8 field_0x706;
/* 0x707 */ s8 field_0x707;
/* 0x708 */ fpc_ProcID field_0x708;
/* 0x70C */ e_db_class* field_0x70c;
/* 0x710 */ fpc_ProcID mBabaChildID;
/* 0x714 */ fpc_ProcID mBabaChildID2;
/* 0x718 */ s8 field_0x718;
/* 0x719 */ s8 field_0x719;
/* 0x71A */ s8 field_0x71a;
/* 0x71B */ s8 field_0x71b;
/* 0x71C */ s8 field_0x71c;
/* 0x71D */ s8 field_0x71d;
/* 0x71E */ s8 field_0x71e;
/* 0x71F */ u8 field_0x71f;
/* 0x720 */ dBgS_AcchCir mAcchCir;
/* 0x760 */ dBgS_ObjAcch mAcch;
/* 0x938 */ dCcU_AtInfo mAtInfo;
/* 0x95C */ dCcD_Stts field_0x95c;
/* 0x998 */ dCcD_Sph field_0x998;
/* 0xAD0 */ dCcD_Sph field_0xad0;
/* 0x6B6 */ s16 action;
/* 0x6B8 */ f32 distToPl;
/* 0x6BC */ s16 angleToPl;
/* 0x6BE */ s8 unkFlag2;
/* 0x6C0 */ cXyz prevPos;
/* 0x6CC */ cXyz prevPosTarget;
/* 0x6D8 */ f32 PosYTransOffset;
/* 0x6DC */ cXyz posTargetStep;
/* 0x6E8 */ daPillar_c* prevHasira;
/* 0x6EC */ daPillar_c* hasira;
/* 0x6F0 */ u32 shadowKey1;
/* 0x6F4 */ u32 shadowKey2;
/* 0x6F8 */ s8 unkFlag3;
/* 0x6FA */ s16 unkCounter1;
/* 0x6FC */ s16 timer[4];
/* 0x704 */ s16 invulnerabilityTimer;
/* 0x706 */ s8 tubaTimer;
/* 0x707 */ s8 unkFlag4;
/* 0x708 */ fpc_ProcID boomerangId;
/* 0x70C */ e_db_class* db;
/* 0x710 */ fpc_ProcID dbId1;
/* 0x714 */ fpc_ProcID dbId2;
/* 0x718 */ s8 unkFlag5;
/* 0x719 */ s8 unkCounter2;
/* 0x71A */ s8 unkTimer1;
/* 0x71B */ s8 setSmokeFlag;
/* 0x71C */ s8 unkCounter3;
/* 0x71D */ s8 firstHasiraFlag;
/* 0x71E */ s8 demoHasiraFlag;
/* 0x720 */ dBgS_AcchCir acchcir;
/* 0x760 */ dBgS_ObjAcch acch;
/* 0x938 */ dCcU_AtInfo atInfo;
/* 0x95C */ dCcD_Stts stts;
/* 0x998 */ dCcD_Sph sph;
/* 0xAD0 */ dCcD_Sph tgSph;
/* 0xC08 */ u32 field_0xc08;
/* 0xC0C */ u32 field_0xc0c;
/* 0xC10 */ u32 field_0xc10;
/* 0xC14 */ u32 field_0xc14;
/* 0xC18 */ u32 field_0xc18[2];
/* 0xC20 */ u32 field_0xc20[4];
/* 0xC30 */ s16 field_0xc30;
/* 0xC32 */ s16 mDemoMode;
/* 0xC34 */ s16 mDemoCamTimer;
/* 0xC38 */ cXyz mCamEye;
/* 0xC44 */ cXyz mCamCenter;
/* 0xC50 */ cXyz field_0xc50;
/* 0xC5C */ cXyz field_0xc5c;
/* 0xC68 */ cXyz field_0xc68;
/* 0xC74 */ cXyz field_0xc74;
/* 0xC80 */ f32 mDemoCamFovy;
/* 0xC84 */ f32 field_0xc84;
/* 0xC88 */ f32 field_0xc88;
/* 0xC18 */ u32 boEno1Prtcls[2];
/* 0xC20 */ u32 boEno0Prtcls[4];
/* 0xC30 */ s16 demoMode;
/* 0xC32 */ s16 demoSubMode;
/* 0xC34 */ s16 demoCamCounter;
/* 0xC38 */ cXyz camEye;
/* 0xC44 */ cXyz camCenter;
/* 0xC50 */ cXyz camEyeTarget;
/* 0xC5C */ cXyz camCenterTarget;
/* 0xC68 */ cXyz distToCamEyeTarget;
/* 0xC74 */ cXyz distToCamCenterTarget;
/* 0xC80 */ f32 demoCamFovy;
/* 0xC84 */ f32 camStepScale1;
/* 0xC88 */ f32 camStepScale2;
/* 0xC8C */ f32 field_0xc8c;
/* 0xC90 */ f32 field_0xc90;
/* 0xC94 */ u8 field_0xc94[0xc98 - 0xc94];
/* 0xC98 */ f32 field_0xc98;
/* 0xC9C */ f32 field_0xc9c;
/* 0xCA0 */ s16 field_0xca0;
/* 0xCA4 */ dMsgFlow_c mMsgFlow;
/* 0xCA0 */ s16 prevPlShapeAngle;
/* 0xCA4 */ dMsgFlow_c msgFlow;
/* 0xCF0 */ u8 field_0xcf0[0xcf5 - 0xcf0];
/* 0xCF5 */ u8 field_0xcf5;
/* 0xCF5 */ u8 hioInit;
};
STATIC_ASSERT(sizeof(e_mk_class) == 0xcf8);
include/d/actor/d_a_e_mk_bo.h
+3 -2
View File
@@ -12,7 +12,8 @@
*
* @details
*
*/
*/
class e_mk_bo_class {
public:
/* 0x000 */ fopEn_enemy_c enemy;
@@ -21,7 +22,7 @@ public:
/* 0x5B8 */ Z2SoundObjSimple sound;
/* 0x5D8 */ s16 counter;
/* 0x5DA */ s16 action;
/* 0x5DC */ s16 field_0x5dc;
/* 0x5DC */ s16 mode;
/* 0x5E0 */ cXyz field_0x5e0;
/* 0x5EC */ s16 field_0x5ec;
/* 0x5EE */ s16 field_0x5ee;
include/d/actor/d_a_horse.h
+25 -20
View File
@@ -38,6 +38,13 @@ public:
class daHoZelda_c;
class daHorse_hio_c;
class daHorse_hio_c0;
#if DEBUG
#define HORSE_HIO_CLASS daHorse_hio_c
#else
#define HORSE_HIO_CLASS daHorse_hio_c0
#endif
/**
* @ingroup actors-unsorted
@@ -231,11 +238,9 @@ public:
~daHorse_c();
u32 getLashDashStart() const { return checkResetStateFlg0(RFLG0_LASH_DASH_START); }
bool checkNoBombProc() const { return m_procID == PROC_WAIT_e || m_procID == PROC_MOVE_e; }
BOOL checkResetStateFlg0(daHorse_RFLG0 flag) const { return m_resetStateFlg0 & flag; }
bool checkEndResetStateFlg0(daHorse_ERFLG0 flag) const { return m_endResetStateFlg0 & flag; }
BOOL checkNoBombProc() const { return !(m_procID == PROC_WAIT_e || m_procID == PROC_MOVE_e); }
u32 checkResetStateFlg0(daHorse_RFLG0 flag) const { return m_resetStateFlg0 & flag; }
u32 checkEndResetStateFlg0(daHorse_ERFLG0 flag) const { return m_endResetStateFlg0 & flag; }
u32 checkStateFlg0(daHorse_FLG0 flag) const { return m_stateFlg0 & flag; }
f32 getNormalMaxSpeedF() { return m_normalMaxSpeedF; }
f32 getLashMaxSpeedF() { return m_lashMaxSpeedF; }
@@ -267,21 +272,21 @@ public:
void setZeldaActor(fopAc_ac_c* i_actor) { m_zeldaActorKeep.setData(i_actor); }
u32 checkTurnStandCamera() const { return checkResetStateFlg0(RFLG0_TURN_STAND_CAMERA); }
BOOL checkTurnStand() const { return checkResetStateFlg0(RFLG0_TURN_STAND); }
u32 checkTurnStand() const { return checkResetStateFlg0(RFLG0_TURN_STAND); }
u32 checkRodeoMode() const { return checkStateFlg0(FLG0_RODEO_MODE); }
bool checkCutTurnCancel() const { return checkEndResetStateFlg0(ERFLG0_CUT_TURN_CANCEL); }
bool checkTurnCancelKeep() const { return checkStateFlg0(FLG0_TURN_CANCEL_KEEP); }
BOOL checkRodeoLeft() const { return checkStateFlg0(FLG0_RODEO_LEFT); }
BOOL checkHorseCallWait() const { return checkStateFlg0(FLG0_NO_DRAW_WAIT); }
u32 checkCutTurnCancel() const { return checkEndResetStateFlg0(ERFLG0_CUT_TURN_CANCEL); }
u32 checkTurnCancelKeep() const { return checkStateFlg0(FLG0_TURN_CANCEL_KEEP); }
u32 checkRodeoLeft() const { return checkStateFlg0(FLG0_RODEO_LEFT); }
u32 checkHorseCallWait() const { return checkStateFlg0(FLG0_NO_DRAW_WAIT); }
BOOL checkTurn() const { return m_procID == PROC_TURN_e && field_0x1720 == 0; }
BOOL checkStop() const { return m_procID == PROC_STOP_e; }
BOOL checkJump() const { return m_procID == PROC_JUMP_e; }
bool checkWait() const { return m_procID == PROC_WAIT_e; }
bool checkLand() const { return m_procID == PROC_LAND_e && field_0x171a == 0; }
bool checkGetOff() const { return fabsf(speedF) < 3.0f; }
BOOL checkEnemySearch() { return checkResetStateFlg0(RFLG0_ENEMY_SEARCH); }
bool checkOriginalDemo() const { return field_0x16b8 == 3; }
bool checkHorseDemoMode() { return field_0x16b8 != 0; }
BOOL checkWait() const { return m_procID == PROC_WAIT_e; }
BOOL checkLand() const { return m_procID == PROC_LAND_e && field_0x171a == 0; }
BOOL checkGetOff() const { return fabsf(speedF) < 3.0f; }
u32 checkEnemySearch() { return checkResetStateFlg0(RFLG0_ENEMY_SEARCH); }
BOOL checkOriginalDemo() const { return field_0x16b8 == 3; }
BOOL checkHorseDemoMode() { return field_0x16b8 != 0; }
s16 checkCowHit() const { return m_cowHit; }
s16 getCowHitAngle() const { return m_cowHitAngle; }
u8 getRodeoPointCnt() const { return m_rodeoPointCnt; }
@@ -333,7 +338,7 @@ public:
u32 getShadowID() const { return m_shadowID; }
bool checkInputOnR() const { return m_padStickValue > 0.05f; }
BOOL checkInputOnR() const { return m_padStickValue > 0.05f; }
void onBagMaterial() {
m_modelData->getMaterialNodePointer(5)->getShape()->show();
@@ -354,7 +359,7 @@ public:
/* 0x0594 */ mDoExt_AnmRatioPack m_anmRatio[3];
/* 0x05AC */ mDoExt_MtxCalcOldFrame* m_oldFrame;
/* 0x05B0 */ daPy_frameCtrl_c m_frameCtrl[3];
/* 0x05F8 */ daHorse_hio_c* m_hio;
/* 0x05F8 */ HORSE_HIO_CLASS* m_hio;
/* 0x05FC */ dBgS_AcchCir m_acchcir[3];
/* 0x06BC */ dBgS_HorseAcch m_acch;
/* 0x0894 */ dCcD_Stts m_cc_stts;
@@ -566,15 +571,15 @@ class daHorse_hio_c : public JORReflexible {
public:
daHorse_hio_c() {
#if DEBUG
mParameters = daHorse_hio_c0::m;
m = daHorse_hio_c0::m;
#endif
}
#if DEBUG
virtual ~daHorse_hio_c() {}
void genMessage(JORMContext*);
/* 0x4 */ s8 id;
/* 0x8 */ daHorse_hio_c1 mParameters;
#endif
/* 0x8 */ daHorse_hio_c1 m;
};
#endif /* D_A_HORSE_H */
include/d/actor/d_a_hozelda.h
+11 -3
View File
@@ -48,6 +48,8 @@ struct daHoZelda_hio_c1 {
};
struct daHoZelda_hio_c0 {
daHoZelda_hio_c0() {}
static daHoZelda_hio_c1 const m;
};
@@ -55,7 +57,7 @@ class daHoZelda_hio_c : public JORReflexible {
public:
daHoZelda_hio_c() {
#if DEBUG
mParameters = daHoZelda_hio_c0::m;
m = daHoZelda_hio_c0::m;
#endif
}
@@ -64,10 +66,16 @@ public:
#if DEBUG
void genMessage(JORMContext*);
virtual ~daHoZelda_hio_c() {}
/* 0x8 */ daHoZelda_hio_c1 mParameters;
/* 0x8 */ daHoZelda_hio_c1 m;
#endif
};
#if DEBUG
#define HOZELDA_HIO_CLASS daHoZelda_hio_c
#else
#define HOZELDA_HIO_CLASS daHoZelda_hio_c0
#endif
/**
* @ingroup actors-unsorted
* @class daHoZelda_c
@@ -125,7 +133,7 @@ public:
/* 0x6A8 */ mDoExt_bckAnm mBowBck;
/* 0x6C4 */ daPy_actorKeep_c mArrowAcKeep;
/* 0x6CC */ daPy_actorKeep_c mGndAcKeep;
/* 0x6D4 */ daHoZelda_hio_c* mpHIO;
/* 0x6D4 */ HOZELDA_HIO_CLASS* mpHIO;
/* 0x6D8 */ u8 mBowMode;
/* 0x6D9 */ u8 mAnmTimer;
/* 0x6DA */ u8 field_0x6da;
include/d/actor/d_a_npc.h
+2 -5
View File
@@ -196,7 +196,7 @@ public:
const int getIdx() { return mIdx; }
dPath* getPathInfo() { return mPathInfo; }
const dPath* getPathInfo() { return mPathInfo; }
void onReverse() {
mDirection = 1;
@@ -450,11 +450,8 @@ public:
void calc(BOOL);
void initialize() {
//TODO: Separate decl is fakematch, but using 0 directly in the setall call causes
// weird issues in some functions that call this.
u8 zero = 0;
for (int i = 0; i < 2; i++) {
mAngle[i].setall(zero);
mAngle[i].setall(0);
mPower[i] = 0.0f;
}
mStagger = 0;
include/d/actor/d_a_npc_ykw.h
+8 -1
View File
@@ -4,6 +4,13 @@
#include "d/actor/d_a_npc.h"
class daNpc_ykW_HIO_c;
class daNpc_ykW_Param_c;
#if DEBUG
#define NPC_YKW_HIO_CLASS daNpc_ykW_HIO_c
#else
#define NPC_YKW_HIO_CLASS daNpc_ykW_Param_c
#endif
/**
* @ingroup actors-npcs
@@ -139,7 +146,7 @@ public:
field_0x101c = 10;
}
/* 0x0E40 */ daNpc_ykW_HIO_c* mpHIO;
/* 0x0E40 */ NPC_YKW_HIO_CLASS* mpHIO;
/* 0x0E44 */ dCcD_Cyl mCyl;
/* 0x0F80 */ u8 field_0xf80;
/* 0x0F84 */ daNpcT_ActorMngr_c mActorMngrs[5];
include/d/actor/d_a_obj_bemos.h
+1
View File
@@ -7,6 +7,7 @@
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_ext.h"
#include "JSystem/JParticle/JPAEmitter.h"
/**
* @ingroup actors-objects
include/d/actor/d_a_obj_brakeeff.h
+1 -2
View File
@@ -1,10 +1,9 @@
#ifndef D_A_OBJ_BRAKEEFF_H
#define D_A_OBJ_BRAKEEFF_H
#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/d_cc_d.h"
#include "mtx.h"
#include "f_op/f_op_actor.h"
class J3DModel;
class mDoExt_brkAnm;
include/d/actor/d_a_obj_damCps.h
+46 -1
View File
@@ -1,6 +1,51 @@
#ifndef D_A_OBJ_DAMCPS_H
#define D_A_OBJ_DAMCPS_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor.h"
#include "m_Do/m_Do_hostIO.h"
/**
* @ingroup actors-objects
* @class daObjDamCps_c
* @brief Damage Cylinder
*
* @details
*
*/
class daObjDamCps_c : public fopAc_ac_c {
#ifdef DEBUG
public:
daObjDamCps_c() {};
void initBaseMtx();
void setBaseMtx();
int Create();
int create();
int execute();
int draw();
int _delete();
u8 getSwNo();
private:
/* 0x0570 */ dCcD_Stts mStts;
/* 0x05AC */ dCcD_Cps mCps;
/* 0x06F0 */ cM3dGCpsS mCapsule;
/* 0x070C */ Mtx mMtx;
/* 0x073C */ cXyz mScale;
#endif
};
class daObjDamCps_HIO_c : public mDoHIO_entry_c {
public:
daObjDamCps_HIO_c();
void genMessage(JORMContext*);
virtual ~daObjDamCps_HIO_c() {};
/* 0x08 */ f32 field_0x08;
/* 0x0C */ u8 mAdj;
/* 0x0E */ csXyz mAngle;
/* 0x14 */ cXyz mScale;
};
#endif /* D_A_OBJ_DAMCPS_H */
include/d/actor/d_a_obj_pdtile.h
+1 -1
View File
@@ -58,7 +58,7 @@ private:
/* 0x7BC */ char* mArcName;
/* 0x7C0 */ u32 mDzbId;
/* 0x7C4 */ u32 mBmdId;
/* 0x7C8 */ Vec* mCullBox;
/* 0x7C8 */ cull_box* mCullBox;
/* 0x7CC */ f32 field_0x7cc;
/* 0x7D0 */ u8 field_0x7d0;
/* 0x7D4 */ int field_0x7d4;
include/d/actor/d_a_obj_waterPillar.h
+1 -1
View File
@@ -119,7 +119,7 @@ private:
return shape_angle.x & 0xFF;
}
s32 getParam(u8 shift, u8 bit) {
s32 getParam(int shift, int bit) {
return fopAcM_GetParamBit(this, shift, bit);
}
include/d/actor/d_a_player.h
+32 -27
View File
@@ -716,9 +716,9 @@ public:
cXyz getRightHandPos() const { return mRightHandPos; }
const cXyz getLeftHandPos() const { return mLeftHandPos; }
const cXyz getItemPos() const { return mItemPos; }
bool getDkCaught() const { return checkNoResetFlg1(FLG1_DK_CAUGHT); }
bool getDkCaught2() const { return checkNoResetFlg0(FLG0_DK_CAUGHT); }
bool getStCaught() const { return checkNoResetFlg1(FLG1_UNK_80000000); }
BOOL getDkCaught() const { return checkNoResetFlg1(FLG1_DK_CAUGHT); }
BOOL getDkCaught2() const { return checkNoResetFlg0(FLG0_DK_CAUGHT); }
BOOL getStCaught() const { return checkNoResetFlg1(FLG1_UNK_80000000); }
/* vt 0X008 */ virtual cXyz* getMidnaAtnPos() const { return NULL; }
/* vt 0X00C */ virtual void setMidnaMsgNum(fopAc_ac_c*, u16) {}
@@ -779,9 +779,9 @@ public:
/* vt 0X0E8 */ virtual void setAnimeFrame(f32) {}
/* vt 0X0EC */ virtual BOOL checkWolfLock(fopAc_ac_c*) const { return FALSE; }
/* vt 0X0F0 */ virtual bool cancelWolfLock(fopAc_ac_c*) { return FALSE; }
/* vt 0X0F4 */ virtual s32 getAtnActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
/* vt 0X0F8 */ virtual s32 getItemID() const { return fpcM_ERROR_PROCESS_ID_e; }
/* vt 0X0FC */ virtual u32 getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
/* vt 0X0F4 */ virtual fpc_ProcID getAtnActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
/* vt 0X0F8 */ virtual fpc_ProcID getItemID() const { return fpcM_ERROR_PROCESS_ID_e; }
/* vt 0X0FC */ virtual fpc_ProcID getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
/* vt 0X100 */ virtual BOOL exchangeGrabActor(fopAc_ac_c*) { return FALSE; }
/* vt 0X104 */ virtual BOOL setForceGrab(fopAc_ac_c*, int, int) { return FALSE; }
/* vt 0X108 */ virtual void setForcePutPos(cXyz const&) {}
@@ -879,7 +879,7 @@ public:
/* vt 0X278 */ virtual BOOL checkMetamorphose() const { return FALSE; }
/* vt 0X27C */ virtual BOOL checkWolfDownAttackPullOut() const { return FALSE; }
/* vt 0X280 */ virtual BOOL checkBootsOrArmorHeavy() const { return FALSE; }
/* vt 0X284 */ virtual s32 getBottleOpenAppearItem() const { return fpcM_ERROR_PROCESS_ID_e; }
/* vt 0X284 */ virtual fpc_ProcID getBottleOpenAppearItem() const { return fpcM_ERROR_PROCESS_ID_e; }
/* vt 0X288 */ virtual bool checkItemSwordEquip() const { return FALSE; }
/* vt 0X28C */ virtual f32 getSinkShapeOffset() const { return 0.0f; }
/* vt 0X290 */ virtual BOOL checkSinkDead() const { return FALSE; }
@@ -1170,9 +1170,6 @@ public:
static daMidna_c* getMidnaActor() { return m_midnaActor; }
static void setMidnaActor(fopAc_ac_c* actor) { m_midnaActor = (daMidna_c*)actor; }
// not sure how to define this properly
// static void onWolfEnemyCatch(fopAc_ac_c* i_actorP) { onWolfEnemyBiteAll(i_actorP,8);}
BOOL checkWolfEnemyCatchOwn(fopAc_ac_c* i_actorP) { return checkWolfEnemyBiteAllOwn(i_actorP); }
BOOL checkWolfEnemyHangBiteOwn(const fopAc_ac_c* i_actorP) const { return checkWolfEnemyBiteAllOwn(i_actorP); }
BOOL checkWolfEnemyLeftThrow() const { return checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); }
@@ -1225,23 +1222,23 @@ public:
void setSumouForceTackle() { mSpecialMode = 0x1B; }
void setSumouForceGraspCancel() { mSpecialMode = 0x24; }
BOOL checkSumouPushFront() const { return mSpecialMode == 7; }
BOOL checkSumouPushBack() const { return mSpecialMode == 8; }
BOOL checkSumouTackleSuccess() const { return mSpecialMode == 0xF; }
BOOL checkSumouTackleSuccessPunch() const { return mSpecialMode == 0x10; }
BOOL checkSumouTackleMiss() const { return mSpecialMode == 0x11; }
BOOL checkSumouTackleDraw() const { return mSpecialMode == 0x12; }
BOOL checkSumouPunchSuccess() const { return mSpecialMode == 0x13; }
BOOL checkSumouPunchMiss() const { return mSpecialMode == 0x14; }
BOOL checkSumouPunchDraw() const { return mSpecialMode == 0x15; }
BOOL checkSumouWait() const { return mSpecialMode == 0x16; }
BOOL checkSumouLeftMove() const { return mSpecialMode == 0x17; }
BOOL checkSumouRightMove() const { return mSpecialMode == 0x18; }
BOOL checkSumouSlideLeft() const { return mSpecialMode == 0x19; }
BOOL checkSumouSlideRight() const { return mSpecialMode == 0x1A; }
BOOL checkSumouPunchStagger() const { return mSpecialMode == 0x1F; }
BOOL checkSumouTackleStagger() const { return mSpecialMode == 0x20; }
BOOL checkSumouGraspRelease() const { return mSpecialMode == 0x23; }
bool checkSumouPushFront() const { return mSpecialMode == 7; }
bool checkSumouPushBack() const { return mSpecialMode == 8; }
bool checkSumouTackleSuccess() const { return mSpecialMode == 0xF; }
bool checkSumouTackleSuccessPunch() const { return mSpecialMode == 0x10; }
bool checkSumouTackleMiss() const { return mSpecialMode == 0x11; }
bool checkSumouTackleDraw() const { return mSpecialMode == 0x12; }
bool checkSumouPunchSuccess() const { return mSpecialMode == 0x13; }
bool checkSumouPunchMiss() const { return mSpecialMode == 0x14; }
bool checkSumouPunchDraw() const { return mSpecialMode == 0x15; }
bool checkSumouWait() const { return mSpecialMode == 0x16; }
bool checkSumouLeftMove() const { return mSpecialMode == 0x17; }
bool checkSumouRightMove() const { return mSpecialMode == 0x18; }
bool checkSumouSlideLeft() const { return mSpecialMode == 0x19; }
bool checkSumouSlideRight() const { return mSpecialMode == 0x1A; }
bool checkSumouPunchStagger() const { return mSpecialMode == 0x1F; }
bool checkSumouTackleStagger() const { return mSpecialMode == 0x20; }
bool checkSumouGraspRelease() const { return mSpecialMode == 0x23; }
void onHeavyState() { onNoResetFlg0(FLG0_UNK_40000000); }
void onHeavyStateMidnaPanic() {
@@ -1260,4 +1257,12 @@ public:
int daPy_addCalcShort(s16* param_0, s16 param_1, s16 param_2, s16 param_3, s16 param_4);
inline daPy_py_c* daPy_getPlayerActorClass() {
return (daPy_py_c*)dComIfGp_getPlayer(0);
}
inline daPy_py_c* daPy_getLinkPlayerActorClass() {
return dComIfGp_getLinkPlayer();
}
#endif /* D_A_D_A_PLAYER_H */
include/d/actor/d_a_scene_exit.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
inline int create();
u8 getArg1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u8 getArg0() { return fopAcM_GetParam(this); }
u8 getArg0() { return fopAcM_GetParam(this) & 0xFF; }
u8 getSwNo() { return fopAcM_GetParam(this) >> 0x18; }
u16 getOffEventBit() { return home.angle.z & 0xFFF; }
u16 getOnEventBit() { return home.angle.x & 0xFFF; }
include/d/actor/d_a_tag_TWgate.h
+2 -2
View File
@@ -17,7 +17,7 @@ public:
/* 0x3 */ TYPE_HYRAL,
};
enum EAction {
enum Mode_e {
/* 0x00 */ ACT_WAIT,
/* 0x01 */ ACT_DEMO_FILONE_1,
/* 0x02 */ ACT_DEMO_FILONE_2,
@@ -106,7 +106,7 @@ public:
(this->*(*mAction))();
}
void setAction(EAction action) {
void setAction(Mode_e action) {
mActionID = action;
mAction = ActionTable[mActionID];
callInit();
include/d/actor/d_a_tag_kmsg.h
+19 -23
View File
@@ -59,50 +59,46 @@ public:
u32 getFlowNodeNo() {
u16 rv = home.angle.z;
if (rv == 0xffff) {
return -1;
}
return rv;
return rv == 0xFFFF ? -1 : rv;
}
u8 getBitSW() {
return home.angle.x;
u16 r31 = home.angle.x;
return (u16)(r31 & 0xFF);
}
u32 getTalkAngle() {
u32 talkAngle = (fopAcM_GetParam(this) >> 5) & 0x7;
if (talkAngle == 7) {
return 0;
} else {
return talkAngle > 6 ? 6 : talkAngle;
}
u32 talkAngle = (fopAcM_GetParam(this) & 0xE0) >> 5;
return talkAngle == 7 ? 0 :
talkAngle > 6 ? 6 :
talkAngle;
}
u32 getTalkDis() {
u32 talkDis = fopAcM_GetParam(this) & 0x1f;
if (talkDis == 0x1f) {
return 0;
} else {
return talkDis > 0x13 ? 0x13 : talkDis;
}
u32 talkDis = fopAcM_GetParam(this) & 0x1F;
return talkDis == 0x1F ? 0 :
talkDis > 0x13 ? 0x13 :
talkDis;
}
f32 getAttnPosOffset() {
u32 attnPosOffset = (fopAcM_GetParam(this) & 0xff0000) >> 0x10;
if (attnPosOffset == 0xff) {
if (attnPosOffset == 0xFF) {
return G_CM3D_F_INF;
} else {
return attnPosOffset;
}
f32 f31 = attnPosOffset;
return f31;
}
u32 getChkType() {
return home.angle.x & 0x8000;
u8 getChkType() {
u16 r31 = home.angle.x;
return (bool)(r31 & 0x8000);
}
f32 getEyePosOffset() {
u32 eyeOffset = (fopAcM_GetParam(this) & 0xff00) >> 8;
return (eyeOffset == 0xff) ? 0 : eyeOffset;
f32 f31 = eyeOffset == 0xFF ? 0 : eyeOffset;
return f31;
}
};
include/d/actor/d_a_tbox.h
+1 -29
View File
@@ -5,6 +5,7 @@
#include "d/d_cc_d.h"
#include "d/d_bg_s_acch.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_kankyo.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
@@ -197,33 +198,4 @@ private:
STATIC_ASSERT(sizeof(daTbox_c) == 0xA30);
class daTbox_HIO_c : public mDoHIO_entry_c {
public:
daTbox_HIO_c();
virtual ~daTbox_HIO_c() {}
void genMessage(JORMContext*);
/* 0x04 */ u8 mItemNo;
/* 0x05 */ u8 mUseDebugItemNo;
/* 0x06 */ u8 mClearSwitch;
/* 0x07 */ u8 mDemoType;
/* 0x08 */ u8 mDebugLightColorEnabled;
/* 0x09 */ u8 mTimerDisplay;
/* 0x0A */ u8 mCheckDisplay;
/* 0x0B */ u8 mSaveOff;
/* 0x0C */ f32 mGravity;
/* 0x10 */ cXyz mLightOffset;
/* 0x1C */ s16 mLightColorR;
/* 0x1E */ s16 mLightColorG;
/* 0x20 */ s16 mLightColorB;
/* 0x24 */ f32 mLightPower;
/* 0x28 */ f32 mFluctuationRate;
/* 0x2C */ f32 mEnvColorInfluence;
/* 0x30 */ s16 mFluctuationSpeed;
/* 0x32 */ u8 mForPlacementCheck;
};
STATIC_ASSERT(sizeof(daTbox_HIO_c) == 0x34);
#endif /* D_A_TBOX_H */
include/d/d_bg_s.h
+51 -2
View File
@@ -3,6 +3,7 @@
#include "d/d_bg_w_base.h"
#include "JSystem/JHostIO/JORReflexible.h"
#include <dolphin/os.h>
#include "global.h"
class dBgW;
@@ -80,6 +81,11 @@ public:
virtual void genMessage(JORMContext*);
virtual ~dBgS_HIO();
BOOL ChkLineOff();
BOOL ChkCheckCounter();
BOOL ChkLineTimer();
BOOL ChkGroundCheckTimer();
/* 0x04 */ u8 field_0x4[0x6 - 0x4];
/* 0x06 */ u16 field_0x6;
/* 0x08 */ u16 field_0x8;
@@ -90,6 +96,12 @@ public:
#endif
};
extern int g_line_counter;
extern OSStopwatch s_line_sw;
extern int g_ground_counter;
extern OSStopwatch s_ground_sw;
class dBgS : public cBgS {
public:
dBgS() {}
@@ -139,8 +151,45 @@ public:
u32 GetMtrlSndId(const cBgS_PolyInfo& param_0) { return dKy_pol_sound_get(&param_0); }
void DebugDrawPoly(dBgW_Base *param_1) {}
fopAc_ac_c* GetActorPointer(cBgS_PolyInfo const& param_0) const { return cBgS::GetActorPointer(param_0); }
bool LineCross(cBgS_LinChk* i_linChk) { return ((cBgS*)this)->LineCross(i_linChk); }
f32 GroundCross(cBgS_GndChk* i_gndChk) { return (f32)((cBgS*)this)->GroundCross(i_gndChk); }
bool LineCross(cBgS_LinChk* i_linChk) {
#ifdef DEBUG
if (m_hio.ChkLineOff()) {
return false;
}
if (m_hio.ChkCheckCounter()) {
g_line_counter++;
}
if (m_hio.ChkLineTimer()) {
OSStartStopwatch(&s_line_sw);
}
bool rt = cBgS::LineCross(i_linChk);
if (m_hio.ChkLineTimer()) {
OSStopStopwatch(&s_line_sw);
OSDumpStopwatch(&s_line_sw);
}
return rt;
#else
return cBgS::LineCross(i_linChk);
#endif
}
f32 GroundCross(cBgS_GndChk* i_gndChk) {
#ifdef DEBUG
if (m_hio.ChkCheckCounter()) {
g_ground_counter++;
}
if (m_hio.ChkGroundCheckTimer()) {
OSStartStopwatch(&s_ground_sw);
}
f32 rt = cBgS::GroundCross(i_gndChk);
if (m_hio.ChkGroundCheckTimer()) {
OSStopStopwatch(&s_ground_sw);
OSDumpStopwatch(&s_ground_sw);
}
return rt;
#else
return cBgS::GroundCross(i_gndChk);
#endif
}
void ChkDeleteActorRegist(fopAc_ac_c*);
include/d/d_bg_s_movebg_actor.h
+1
View File
@@ -2,6 +2,7 @@
#define D_BG_D_BG_S_MOVEBG_ACTOR_H
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_bg_s_poly_info.h"
class dBgW;
typedef void (*MoveBGActor_SetFunc)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*,
include/d/d_cc_d.h
-1
View File
@@ -417,7 +417,6 @@ public:
bool ChkTgHookshotThrough() { return mGObjTg.ChkSPrm(0x80); }
void OffTgHookShotNoHitMark() {mGObjTg.OffSPrm(0x400);}
bool ChkTgShieldHit() { return mGObjTg.ChkRPrm(2); }
void OffTgNoAtHitInfSet() { mObjTg.OffSPrmBit(0x20); }
bool ChkTgSpinnerReflect() { return mGObjTg.ChkSPrm(0x200); }
static const Z2SoundID m_hitSeID[24];
include/d/d_com_inf_game.h
+12 -22
View File
@@ -290,7 +290,7 @@ public:
dVibration_c& getVibration() { return mVibration; }
camera_class* getCamera(int idx) { return mCameraInfo[idx].mCamera; }
void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; }
fopAc_ac_c* getPlayer(int idx) { return (fopAc_ac_c*)mPlayer[idx * 2]; }
fopAc_ac_c* getPlayer(int idx) { return mPlayerInfo[idx].mpPlayer; }
dPa_control_c* getParticle() { return mParticle; }
dEvent_manager_c& getEvtManager() { return mEvtManager; }
dAttention_c* getAttention() { return &mAttention; }
@@ -653,16 +653,16 @@ public:
void* getItemTable() { return mItemTable; }
void setPlayerPtr(int i, fopAc_ac_c* ptr) { mPlayerPtr[i] = ptr; }
void setPlayer(int i, fopAc_ac_c* player) { mPlayer[i] = (daAlink_c*)player; }
void setPlayerInfo(int i, fopAc_ac_c* ptr, int camIdx) {
mPlayer[i] = (daAlink_c*)ptr;
mPlayerCameraID[camIdx] = 0;
void setPlayer(int i, fopAc_ac_c* player) { mPlayerInfo[i].mpPlayer = player; }
void setPlayerInfo(int i, fopAc_ac_c* player, int cam) {
mPlayerInfo[i].mpPlayer = player;
mPlayerInfo[i].mCameraID = cam;
}
void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] |= flag; }
void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] &= ~flag; }
u32 checkPlayerStatus(int param_0, int i, u32 flag) { return mPlayerStatus[param_0][i] & flag; }
int getPlayerCameraID(int i) { return mPlayerCameraID[i * 8]; }
int getPlayerCameraID(int i) { return mPlayerInfo[i].mCameraID; }
int getCameraPlayer1ID(int i) { return mCameraInfo[i].field_0x5; }
int getCameraPlayer2ID(int i) { return mCameraInfo[i].field_0x6; }
int getCameraWinID(int i) { return mCameraInfo[i].field_0x4; }
@@ -814,8 +814,10 @@ public:
/* 0x04E0E */ u16 mStatus;
/* 0x04E10 */ dDlst_window_c mWindow[1];
/* 0x04E3C */ dComIfG_camera_info_class mCameraInfo[1];
/* 0x04E74 */ daAlink_c* mPlayer[1];
/* 0x04E78 */ s8 mPlayerCameraID[1];
/* 0x04E74 */ struct {
/* 0x0 */ fopAc_ac_c* mpPlayer;
/* 0x4 */ s8 mCameraID;
} mPlayerInfo[1];
/* 0x04E7C */ fopAc_ac_c* mPlayerPtr[2]; // 0: Player, 1: Horse ; type may be wrong
/* 0x04E84 */ dComIfG_item_info_class mItemInfo;
/* 0x04FB0 */ dComIfG_MesgCamInfo_c mMesgCamInfo;
@@ -3990,8 +3992,8 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* i_pos,
inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* i_pos,
const dKy_tevstr_c* param_3) {
return dComIfGp_particle_set(param_0, param_1, i_pos, param_3, 0, 0, 0xFF, 0, 0xFFFFFFFF, 0,
0, 0);
return dComIfGp_particle_set(param_0, param_1, i_pos, param_3, NULL, NULL, 0xFF, NULL, -1, NULL,
NULL, NULL);
}
inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos,
@@ -4428,16 +4430,4 @@ inline void dComIfGd_set3DlineMatDark(mDoExt_3DlineMat_c* param_0) {
g_dComIfG_gameInfo.drawlist.set3DlineMatDark(param_0);
}
inline daPy_py_c* daPy_getLinkPlayerActorClass() {
return dComIfGp_getLinkPlayer();
}
inline daPy_py_c* daPy_getPlayerActorClass() {
return (daPy_py_c*)dComIfGp_getPlayer(0);
}
inline daAlink_c* daAlink_getAlinkActorClass() {
return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR);
}
#endif /* D_COM_D_COM_INF_GAME_H */
include/d/d_event.h
+4
View File
@@ -128,7 +128,11 @@ public:
u8 getMode() const { return mMode; }
void onHindFlag(u16 flag) { mHindFlag |= flag; }
#ifdef DEBUG
void offHindFlag(u16 flag) { mHindFlag &= (u16)~flag; }
#else
void offHindFlag(u16 flag) { mHindFlag &= ~flag; }
#endif
u16 checkHind(u16 flag) { return flag & mHindFlag; }
u8 checkCompulsory() { return mCompulsory; }
include/d/d_msg_object.h
-2
View File
@@ -744,8 +744,6 @@ public:
/* 0x35C */ dMsgObject_HowlHIO_c mHowlHIO;
};
#ifndef DISABLE_MSG_OBJECT_EXTERN
extern dMsgObject_HIO_c g_MsgObject_HIO_c;
#endif
#endif /* D_MSG_D_MSG_OBJECT_H */
include/f_op/f_op_actor.h
+16 -18
View File
@@ -169,8 +169,8 @@ public:
BOOL checkCommandCatch() { return mCommand == dEvtCmd_INCATCH_e; }
BOOL checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; }
BOOL checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; }
bool checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; }
bool checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; }
BOOL checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; }
BOOL checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; }
void setCommand(u16 command) { mCommand = command; }
void setMapToolId(u8 id) { mMapToolId = id; }
@@ -309,14 +309,14 @@ public:
void setBallModelEffect(dKy_tevstr_c*);
void drawBallModel(dKy_tevstr_c*);
bool checkWolfNoLock() const { return mFlags & fopEn_flag_WolfNoLock; }
BOOL checkWolfNoLock() const { return mFlags & fopEn_flag_WolfNoLock; }
BOOL checkHeadLockFlg() const { return mFlags & fopEn_flag_HeadLock; }
BOOL checkWolfBiteDamage() const { return mFlags & fopEn_flag_WolfBiteDamage; }
bool checkWolfDownPullFlg() const { return mFlags & fopEn_flag_WolfDownPull; }
bool checkDownFlg() { return mFlags & fopEn_flag_Down; }
bool checkCutDownHitFlg() const { return mFlags & fopEn_flag_CutDownHit; }
bool checkWolfDownStartFlg() const { return mFlags & fopEn_flag_WolfDownStart; }
bool checkDeadFlg() const { return mFlags & fopEn_flag_Dead; }
BOOL checkWolfDownPullFlg() const { return mFlags & fopEn_flag_WolfDownPull; }
BOOL checkDownFlg() { return mFlags & fopEn_flag_Down; }
BOOL checkCutDownHitFlg() const { return mFlags & fopEn_flag_CutDownHit; }
BOOL checkWolfDownStartFlg() const { return mFlags & fopEn_flag_WolfDownStart; }
BOOL checkDeadFlg() const { return mFlags & fopEn_flag_Dead; }
BOOL checkThrowMode(u8 param_1) const { return mThrowMode & param_1; }
u32* getMidnaBindID(int i_idx) { return mMidnaBindID + i_idx; }
@@ -329,26 +329,24 @@ public:
void onWolfDownStartFlg() { mFlags |= (fopEn_flag_WolfDownPull | fopEn_flag_WolfDownStart); }
void onWolfDownPullEndFlg() { mFlags |= fopEn_flag_WolfDownPullEnd; }
void onWolfNoLock() { mFlags |= (u16)fopEn_flag_WolfNoLock; }
void onDownFlg() { mFlags |= fopEn_flag_Down; }
void onHeadLockFlg() { mFlags |= fopEn_flag_HeadLock; }
void onDownFlg() { mFlags |= (u16)fopEn_flag_Down; }
void onHeadLockFlg() { mFlags |= (u16)fopEn_flag_HeadLock; }
#if DEBUG
void offWolfBiteDamage() { mFlags &= (u16)~fopEn_flag_WolfBiteDamage; }
void offCutDownHitFlg() { mFlags &= (u16)~fopEn_flag_CutDownHit; }
void offWolfDownPullFlg() { mFlags &= ~fopEn_flag_WolfDownPull; }
void offDownFlg() { mFlags &= (u16)~(fopEn_flag_WolfDownPull | fopEn_flag_WolfDownStart | fopEn_flag_CutDownHit | fopEn_flag_Down); }
void offWolfNoLock() { mFlags &= (u16)~fopEn_flag_WolfNoLock; }
void offHeadLockFlg() { mFlags &= (u16)~fopEn_flag_HeadLock; }
void offThrowMode(u8 throwMode) { mThrowMode &= (u8)~throwMode; }
#else
void offWolfBiteDamage() { mFlags &= ~fopEn_flag_WolfBiteDamage; }
#endif
void offCutDownHitFlg() { mFlags &= ~fopEn_flag_CutDownHit; }
void offWolfDownPullFlg() { mFlags &= ~fopEn_flag_WolfDownPull; }
void offDownFlg() { mFlags &= ~(fopEn_flag_WolfDownPull | fopEn_flag_WolfDownStart | fopEn_flag_CutDownHit | fopEn_flag_Down); }
#if DEBUG
void offWolfNoLock() { mFlags &= (u16)~fopEn_flag_WolfNoLock; }
#else
void offWolfNoLock() { mFlags &= ~fopEn_flag_WolfNoLock; }
#endif
void offHeadLockFlg() { mFlags &= ~fopEn_flag_HeadLock; }
#if DEBUG
void offThrowMode(u8 throwMode) { mThrowMode &= (u8)~throwMode; }
#else
void offThrowMode(u8 throwMode) { mThrowMode &= ~(throwMode & 0xFF); }
#endif
include/m_Do/m_Do_ext.h
+1 -1
View File
@@ -174,7 +174,7 @@ public:
private:
/* 0x14 */ J3DAnmTransform* mAnm;
/* 0x18 */ J3DMtxCalc* mpMtxCalc;
/* 0x18 */ J3DMtxCalcAnimation<J3DMtxCalcAnimationAdaptorDefault<J3DMtxCalcCalcTransformMaya>, J3DMtxCalcJ3DSysInitMaya>* mpMtxCalc;
}; // Size: 0x1C
STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x1C);
include/m_Do/m_Do_mtx.h
+4 -4
View File
@@ -250,7 +250,7 @@ public:
* @param a The source Vec
* @param b The output Vec
*/
static void multVec(const Vec* a, Vec* b) { MTXMultVec(now, a, b); }
static void multVec(const Vec* a, Vec* b) { PSMTXMultVec(now, a, b); }
/**
* Multiplies a given Vec `a` by the `now` Matrix's "Scale-and-Rotate" component and places the result into Vec `b`
@@ -268,7 +268,7 @@ public:
* @param count The size of the array
*/
static void multVecArray(const Vec* src, Vec* dst, u32 count) {
MTXMultVecArray(now, src, dst, count);
PSMTXMultVecArray(now, src, dst, count);
}
static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); }
@@ -327,7 +327,7 @@ public:
*/
static void ZrotM(s16 z) { mDoMtx_ZrotM(now, z); }
static void inverse() { MTXInverse(now, now); }
static void inverse() { PSMTXInverse(now, now); }
static void inverseTranspose() { mDoMtx_inverseTranspose(now, now); }
@@ -350,7 +350,7 @@ public:
}
static void identity() {
MTXIdentity(now);
PSMTXIdentity(now);
}
static Mtx now;