diff options
Diffstat (limited to 'include')
88 files changed, 292 insertions, 79 deletions
diff --git a/include/DynamicLink.h b/include/DynamicLink.h index df6dfd3ab9..db282a3ee9 100644 --- a/include/DynamicLink.h +++ b/include/DynamicLink.h @@ -18,7 +18,10 @@ struct DynamicModuleControlBase { /* 800188DC */ virtual const char* getModuleName() const { return NULL; }; /* 80263210 */ virtual int getModuleSize() const { return 0; }; /* 80263200 */ virtual const char* getModuleTypeString() const {return "Base";}; - virtual void dump(); +#if __MWERKS__ && __MWERKS__ < 0x4200 + // This is illegal function overloading, but MWCC for GC allows it. MWCC for Wii does not. + virtual void dump(); +#endif /* 80262470 */ static void dump(); /* 802631FC */ virtual void dump2() {}; /* 802631DC */ virtual bool do_load() {return true;}; diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h index f138657749..e8252bb4f5 100644 --- a/include/JSystem/J2DGraph/J2DPictureEx.h +++ b/include/JSystem/J2DGraph/J2DPictureEx.h @@ -33,8 +33,8 @@ public: /* 803069D8 */ virtual void setCullBack(_GXCullMode); /* 803069B8 */ virtual void setAlpha(u8); /* 80303AB4 */ virtual void drawSelf(f32, f32, f32 (*)[3][4]); - /* 80306A24 */ virtual void isUsed(ResTIMG const*); - /* 803071A4 */ virtual void isUsed(ResFONT const*); + /* 80306A24 */ virtual bool isUsed(ResTIMG const*); + /* 803071A4 */ virtual bool isUsed(ResFONT const*); /* 80306A0C */ virtual void rewriteAlpha(); /* 803071C4 */ virtual void setAnimation(J2DAnmBase*); /* 80256064 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); } @@ -44,7 +44,7 @@ public: /* 80306B48 */ virtual void setAnimation(J2DAnmTevRegKey*); /* 80306B74 */ virtual void setAnimation(J2DAnmVisibilityFull*); /* 80306B7C */ virtual void setAnimation(J2DAnmVtxColor*); - /* 80306C70 */ virtual void animationPane(J2DAnmTransform const*); + /* 80306C70 */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*); /* 80303640 */ virtual void initiate(ResTIMG const*, ResTLUT const*); /* 803039CC */ virtual bool prepareTexture(u8); /* 80306ED4 */ virtual bool append(ResTIMG const*, f32); @@ -84,8 +84,8 @@ public: /* 80306370 */ virtual bool setBlack(JUtility::TColor); /* 803063F8 */ virtual bool setWhite(JUtility::TColor); /* 80306480 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 803068F8 */ virtual void getBlack() const; - /* 80306958 */ virtual void getWhite() const; + /* 803068F8 */ virtual JUtility::TColor getBlack() const; + /* 80306958 */ virtual JUtility::TColor getWhite() const; /* 80256034 */ virtual J2DMaterial* getMaterial() const { return mMaterial; } /* 80303B80 */ virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]); /* 80303BDC */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16, diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index e6b668d27f..902a24ba55 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -52,7 +52,7 @@ public: J3DTevBlock* getTevBlock() const { return mTevBlock; } J3DColorBlock* getColorBlock() const { return mColorBlock; } J3DTexGenBlock* getTexGenBlock() const { return mTexGenBlock; } - J3DDisplayListObj* getSharedDisplayListObj() const { return mSharedDLObj; } + J3DDisplayListObj* getSharedDisplayListObj() { return mSharedDLObj; } J3DIndBlock* getIndBlock() const { return mIndBlock; } J3DShape* getShape() { return mShape; } J3DJoint* getJoint() { return mJoint; } diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h index 7a3fa71c66..fd8156e587 100644 --- a/include/JSystem/JFramework/JFWSystem.h +++ b/include/JSystem/JFramework/JFWSystem.h @@ -23,9 +23,9 @@ struct JFWSystem { static u32 fifoBufSize; static u32 aramAudioBufSize; static u32 aramGraphBufSize; - static u32 streamPriority; - static u32 decompPriority; - static u32 aPiecePriority; + static s32 streamPriority; + static s32 decompPriority; + static s32 aPiecePriority; static ResFONT* systemFontRes; static GXRenderModeObj* renderMode; static u32 exConsoleBufferSize; diff --git a/include/JSystem/JGadget/define.h b/include/JSystem/JGadget/define.h new file mode 100644 index 0000000000..753bc9d5ab --- /dev/null +++ b/include/JSystem/JGadget/define.h @@ -0,0 +1,46 @@ +#ifndef DEFINE_H +#define DEFINE_H + +#include "types.h" + +#ifdef __cplusplus +extern "C" { + +class JGadget_outMessage { +public: + typedef void (*MessageFunc)(const char*, int, const char*); + + static void warning(const char*, int, const char*); + + JGadget_outMessage(MessageFunc fn, const char* file, int line); + ~JGadget_outMessage(); + + JGadget_outMessage& operator<<(int param_1) { return *this << (s32)param_1; } + JGadget_outMessage& operator<<(u16); + JGadget_outMessage& operator<<(unsigned int); + JGadget_outMessage& operator<<(u8); + JGadget_outMessage& operator<<(const char* str); + JGadget_outMessage& operator<<(s8); + JGadget_outMessage& operator<<(s32); + JGadget_outMessage& operator<<(u32); + JGadget_outMessage& operator<<(const void*); + +private: + MessageFunc mMsgFunc; + char mBuffer[256]; + char* mWrite_p; + char* mFile; + int mLine; +}; + +#define JGADGET_ASSERTWARN(cond) ((cond) || (false)) + +#define JGADGET_EXITWARN(cond) \ + if (!(cond)) { \ + false; \ + return false; \ + } +} +#endif + +#endif diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index a34ec2b705..fca7ba42f5 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -341,7 +341,7 @@ struct TVec3<f32> : public Vec { } bool isZero() const { - return squared() <= 32.0f * FLT_EPSILON; + return squared() <= TUtil<f32>::epsilon(); } void cross(const TVec3<f32>& a, const TVec3<f32>& b) { diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h index 3a066f70ad..0e82126cc7 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/include/JSystem/JHostIO/JORReflexible.h @@ -35,11 +35,14 @@ struct JORServer; class JOREventListener { public: +#ifdef DEBUG virtual void listenPropertyEvent(const JORPropertyEvent*) = 0; +#endif }; class JORReflexible : public JOREventListener { public: +#ifdef DEBUG JORReflexible(); static JORServer* getJORServer(); @@ -48,6 +51,7 @@ public: virtual void genObjectInfo(const JORGenEvent*); virtual void genMessage(JORMContext*) = 0; virtual void listenNodeEvent(const JORNodeEvent*); +#endif }; #endif /* JORREFLEXIBLE_H */ diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index 8298d44481..321c22646a 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -212,16 +212,15 @@ namespace JMathInlineVEC { #endif } - inline f32 C_VECSquareMag(const Vec* v) { + inline f32 C_VECSquareMag(register const Vec* v) { register f32 x_y; register f32 z; register f32 res; - register const f32* src = &v->x; #ifdef __MWERKS__ asm { - psq_l x_y, 0(src), 0, 0 + psq_l x_y, 0(v), 0, 0 ps_mul x_y, x_y, x_y - lfs z, 8(src) + lfs z, 8(v) ps_madd res, z, z, x_y ps_sum0 res, res, x_y, x_y } diff --git a/include/JSystem/JStage/JSGActor.h b/include/JSystem/JStage/JSGActor.h index 4deeae1c66..ed3fc82930 100644 --- a/include/JSystem/JStage/JSGActor.h +++ b/include/JSystem/JStage/JSGActor.h @@ -10,6 +10,16 @@ namespace JStage { * */ struct TActor : public TObject { + enum { + ID_NORMAL = -1, + ID_UNK_1 = 1, + ID_UNK_2 = 2, + ID_UNK_3 = 3, + ID_UNK_4 = 4, + ID_UNK_5 = 5, + ID_UNK_6 = 6, + }; + /* 80280A48 */ virtual ~TActor() = 0; /* 80280AA8 */ virtual s32 JSGFGetType() const; /* 80280AB0 */ virtual void JSGGetTranslation(Vec*) const; diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 182b2bbc43..a9b411a1f1 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -178,6 +178,8 @@ struct TAdaptor { /* 80286648 */ static void adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor*, JStudio::TControl*, u32, void const*, u32); + const char* adaptor_getID_string() const; + void adaptor_setObject_(const TObject* pObject) { pObject_ = pObject; } diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/include/JSystem/JStudio/JStudio_JStage/control.h index 19d7f69ba5..45052de6f7 100644 --- a/include/JSystem/JStudio/JStudio_JStage/control.h +++ b/include/JSystem/JStudio/JStudio_JStage/control.h @@ -157,7 +157,10 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T JStage::TActor* get_pJSG_() { return (JStage::TActor*) pJSGObject_; } + // TODO: Why doesn't this line compile with MWCC version Wii/1.0? +#if __MWERKS__ && __MWERKS__ < 0x4200 static TVVOutputObject saoVVOutput_[2]; +#endif static TVVOutput_ANIMATION_FRAME_ saoVVOutput_ANIMATION_FRAME_[3]; /* 0x130 */ u32 field_0x130; @@ -220,7 +223,10 @@ struct TAdaptor_camera : public JStudio::TAdaptor_camera, public TAdaptor_object JStage::TCamera* get_pJSG_() { return (JStage::TCamera*)pJSGObject_; } + // TODO: Why doesn't this line compile with MWCC version Wii/1.0? +#if __MWERKS__ && __MWERKS__ < 0x4200 static TVVOutput saoVVOutput_[5]; +#endif /* 0x108 */ int field_0x108; /* 0x10C */ JStage::TObject* field_0x10c; @@ -248,7 +254,10 @@ struct TAdaptor_fog : public JStudio::TAdaptor_fog, public TAdaptor_object_ { JStage::TFog* get_pJSG_() { return (JStage::TFog*)pJSGObject_; } + // TODO: Why doesn't this line compile with MWCC version Wii/1.0? +#if __MWERKS__ && __MWERKS__ < 0x4200 static TVariableValueOutput_object_<TAdaptor_fog, JStage::TFog> saoVVOutput_[3]; +#endif }; struct TAdaptor_light : public JStudio::TAdaptor_light, public TAdaptor_object_ { diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 233469b652..a1c0cf11d7 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -50,7 +50,7 @@ public: mFontSizeX = x; mFontSizeY = y; } - void setHeight(u32 height) { + void setHeight(unsigned int height) { mHeight = height; if (mHeight > mMaxLines) { mHeight = mMaxLines; diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/include/JSystem/JUtility/JUTGraphFifo.h index 1c53ecef78..3672001890 100644 --- a/include/JSystem/JUtility/JUTGraphFifo.h +++ b/include/JSystem/JUtility/JUTGraphFifo.h @@ -35,6 +35,6 @@ private: /* 0x10 */ u8 field_0x10[0xC]; }; -inline void JUTCreateFifo(u32 bufSize) { new JUTGraphFifo(bufSize); } +inline JUTGraphFifo* JUTCreateFifo(u32 bufSize) { return new JUTGraphFifo(bufSize); } #endif /* JUTGRAPHFIFO_H */ diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 958f0dec80..88dd42600b 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -126,7 +126,7 @@ struct cXyz : Vec { f32 getMagXZ() const { return cXyz(this->x, 0, this->z).getSquareMag(); } - f32 getDotProduct(const Vec& other) const { return VECDotProduct(this, &other); } + f32 getDotProduct(const Vec& other) const { return PSVECDotProduct(this, &other); } f32 inprod(const Vec& other) const { return getDotProduct(other); } f32 inprodXZ(const Vec& other) const { return x * other.x + z * other.z; } diff --git a/include/Z2AudioLib/Z2Instances.h b/include/Z2AudioLib/Z2Instances.h index 71e2fa7433..0f1a02cdb1 100644 --- a/include/Z2AudioLib/Z2Instances.h +++ b/include/Z2AudioLib/Z2Instances.h @@ -7,30 +7,30 @@ #include "JSystem/JAudio2/JAUSoundTable.h" #define AUDIO_INSTANCES \ - JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance; \ - JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance; \ - Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance; \ - Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance; \ - Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance; \ - Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance; \ - Z2DebugSys* JASGlobalInstance<Z2DebugSys>::sInstance; \ - JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance; \ - Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance; \ - Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance; \ - JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance; \ - JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance; \ - JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance; \ - Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance; \ - JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance; \ - JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance; \ - JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance; \ - JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance; \ - Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance; \ - Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance; \ - Z2Audience* JASGlobalInstance<Z2Audience>::sInstance; \ - Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance; \ - Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance; \ - Z2SpeechMgr* JASGlobalInstance<Z2SpeechMgr>::sInstance; \ - Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance; + template<> JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance; \ + template<> JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance; \ + template<> Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance; \ + template<> Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance; \ + template<> Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance; \ + template<> Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance; \ + template<> Z2DebugSys* JASGlobalInstance<Z2DebugSys>::sInstance; \ + template<> JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance; \ + template<> Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance; \ + template<> Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance; \ + template<> JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance; \ + template<> JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance; \ + template<> JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance; \ + template<> Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance; \ + template<> JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance; \ + template<> JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance; \ + template<> JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance; \ + template<> JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance; \ + template<> Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance; \ + template<> Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance; \ + template<> Z2Audience* JASGlobalInstance<Z2Audience>::sInstance; \ + template<> Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance; \ + template<> Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance; \ + template<> Z2SpeechMgr* JASGlobalInstance<Z2SpeechMgr>::sInstance; \ + template<> Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance; -#endif
\ No newline at end of file +#endif diff --git a/include/Z2AudioLib/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo.h index df17a68936..668a1164cb 100644 --- a/include/Z2AudioLib/Z2SoundInfo.h +++ b/include/Z2AudioLib/Z2SoundInfo.h @@ -23,6 +23,8 @@ public: /* 802BBA10 */ const char* getStreamFilePath(JAISoundID); /* 802BBAC8 */ int getSwBit(JAISoundID) const; /* 802BBB48 */ void getSoundInfo_(JAISoundID, JAISound*) const; + + BOOL isValid() const; }; diff --git a/include/d/actor/d_a_andsw.h b/include/d/actor/d_a_andsw.h index 996f1882b5..1053330a09 100644 --- a/include/d/actor/d_a_andsw.h +++ b/include/d/actor/d_a_andsw.h @@ -21,7 +21,7 @@ public: return fopAcM_GetParamBit(this,8,8); } - u16 getTimer() { + u8 getTimer() { return fopAcM_GetParamBit(this,16,8); } @@ -39,5 +39,14 @@ public: /* 0x56A */ s16 mTimer; }; +class daAndsw_HIO_c : public mDoHIO_entry_c { +public: + daAndsw_HIO_c(); + + void genMessage(JORMContext*); + + /* 0x06 */ u8 field_0x6; +}; + #endif /* D_A_ANDSW_H */ diff --git a/include/d/actor/d_a_b_dr.h b/include/d/actor/d_a_b_dr.h index e1eee25589..6fcb950933 100644 --- a/include/d/actor/d_a_b_dr.h +++ b/include/d/actor/d_a_b_dr.h @@ -176,11 +176,13 @@ private: STATIC_ASSERT(sizeof(daB_DR_c) == 0x2860); -class daB_DR_HIO_c { +class daB_DR_HIO_c : public JORReflexible { public: /* 805BAE6C */ daB_DR_HIO_c(); /* 805C6B94 */ virtual ~daB_DR_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ s8 field_0x4; /* 0x08 */ f32 model_size; /* 0x0C */ f32 fall_accel; diff --git a/include/d/actor/d_a_e_pz.h b/include/d/actor/d_a_e_pz.h index 48cbd40db0..a87afadc09 100644 --- a/include/d/actor/d_a_e_pz.h +++ b/include/d/actor/d_a_e_pz.h @@ -125,11 +125,13 @@ public: STATIC_ASSERT(sizeof(daE_PZ_c) == 0xEF8); -class daE_PZ_HIO_c { +class daE_PZ_HIO_c : public JORReflexible { public: /* 8075856C */ daE_PZ_HIO_c(); /* 80760C60 */ virtual ~daE_PZ_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ s8 no; /* 0x08 */ f32 body_model_size; /* 0x0C */ f32 portal_model_size; diff --git a/include/d/actor/d_a_myna.h b/include/d/actor/d_a_myna.h index ddcca50ec8..4ea9b699d0 100644 --- a/include/d/actor/d_a_myna.h +++ b/include/d/actor/d_a_myna.h @@ -189,6 +189,8 @@ public: // Must be inlined but defined in .cpp for sinit to match inline daMyna_HIO_c(); + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; // DAT_8094ba40 /* 0x08 */ f32 field_0x08; // DAT_8094ba44 /* 0x0C */ f32 field_0x0C; // DAT_8094ba48 diff --git a/include/d/actor/d_a_npc_cd2.h b/include/d/actor/d_a_npc_cd2.h index 9d6ef87538..58dd227d9f 100644 --- a/include/d/actor/d_a_npc_cd2.h +++ b/include/d/actor/d_a_npc_cd2.h @@ -80,7 +80,7 @@ public: /* 0x850 */ dCcD_Stts mStts; /* 0x88C */ dCcD_Cyl mCyl; /* 0x9C8 */ dNpcLib_lookat_c mLookat; - /* 0xA98 */ int field_0xa98; + /* 0xA98 */ int m_type; /* 0xA9C */ u8 field_0xa9c[0xAA0 - 0xA9C]; /* 0xAA4 */ int field_0xaa0; /* 0xAA4 */ int field_0xaa4; diff --git a/include/d/actor/d_a_obj_Turara.h b/include/d/actor/d_a_obj_Turara.h index e8f4c7d409..63649da81f 100644 --- a/include/d/actor/d_a_obj_Turara.h +++ b/include/d/actor/d_a_obj_Turara.h @@ -92,6 +92,8 @@ public: /* 80B9CB8C */ daTurara_HIO_c(); /* 80B9E5B4 */ virtual ~daTurara_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; /* 0x08 */ f32 mGravity; /* 0x0c */ f32 mMaxGravity; diff --git a/include/d/actor/d_a_obj_TvCdlst.h b/include/d/actor/d_a_obj_TvCdlst.h index 765c4924e9..14d8a8ec31 100644 --- a/include/d/actor/d_a_obj_TvCdlst.h +++ b/include/d/actor/d_a_obj_TvCdlst.h @@ -2,7 +2,7 @@ #define D_A_OBJ_TVCDLST_H #include "f_op/f_op_actor_mng.h" -#include "include/d/d_com_inf_game.h" +#include "d/d_com_inf_game.h" /** * @ingroup actors-objects @@ -59,6 +59,8 @@ public: /* 80B9ECCC */ daTvCdlst_HIO_c(); /* 80B9F7B0 */ virtual ~daTvCdlst_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_barDesk.h b/include/d/actor/d_a_obj_barDesk.h index ba7076f4e9..45ca0ead3e 100644 --- a/include/d/actor/d_a_obj_barDesk.h +++ b/include/d/actor/d_a_obj_barDesk.h @@ -47,6 +47,8 @@ public: /* 80BA918C */ daBarDesk_HIO_c(); /* 80BA9A90 */ ~daBarDesk_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_bmWindow.h b/include/d/actor/d_a_obj_bmWindow.h index 4b264d7872..8b12634125 100644 --- a/include/d/actor/d_a_obj_bmWindow.h +++ b/include/d/actor/d_a_obj_bmWindow.h @@ -77,6 +77,8 @@ public: /* 80BB820C */ daBmWindow_HIO_c(); /* 80BB964C */ virtual ~daBmWindow_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 field_0x04; /* 0x05 */ u8 field_0x05; /* 0x08 */ f32 field_0x08; diff --git a/include/d/actor/d_a_obj_bsGate.h b/include/d/actor/d_a_obj_bsGate.h index 7a1b497ae3..18d423f48e 100644 --- a/include/d/actor/d_a_obj_bsGate.h +++ b/include/d/actor/d_a_obj_bsGate.h @@ -53,6 +53,8 @@ public: /* 80BC288C */ daBsGate_HIO_c(); /* 80BC30F4 */ ~daBsGate_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 mOpenSpeed; /* 0x8 */ f32 mCloseSpeed; /* 0xC */ u8 mShockStrength; diff --git a/include/d/actor/d_a_obj_bubblePilar.h b/include/d/actor/d_a_obj_bubblePilar.h index 5db9043d57..7243f98fed 100644 --- a/include/d/actor/d_a_obj_bubblePilar.h +++ b/include/d/actor/d_a_obj_bubblePilar.h @@ -63,6 +63,8 @@ public: /* 80BC33EC */ daBubbPilar_HIO_c(); /* 80BC3F90 */ virtual ~daBubbPilar_HIO_c() {}; + void genMessage(JORMContext*); + u8 field_0x4; u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_drop.h b/include/d/actor/d_a_obj_drop.h index 24a750e36d..5d4f904ede 100644 --- a/include/d/actor/d_a_obj_drop.h +++ b/include/d/actor/d_a_obj_drop.h @@ -94,5 +94,10 @@ public: STATIC_ASSERT(sizeof(daObjDrop_c) == 0xa7c); +class daObjDrop_HIO_c { +public: + u8 pad[0x17]; + /* 0x17 */ u8 field_0x17; +}; #endif /* D_A_OBJ_DROP_H */ diff --git a/include/d/actor/d_a_obj_fireWood.h b/include/d/actor/d_a_obj_fireWood.h index 3af0c29a02..1852e6f495 100644 --- a/include/d/actor/d_a_obj_fireWood.h +++ b/include/d/actor/d_a_obj_fireWood.h @@ -48,6 +48,8 @@ public: /* 80BE762C */ daFireWood_HIO_c(); /* 80BE7F24 */ virtual ~daFireWood_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 mFlameOffsetY; /* 0x8 */ f32 mCollisionRadius; /* 0xC */ u8 mWaitTime; diff --git a/include/d/actor/d_a_obj_fireWood2.h b/include/d/actor/d_a_obj_fireWood2.h index cb3d0bf778..aa3a445c4f 100644 --- a/include/d/actor/d_a_obj_fireWood2.h +++ b/include/d/actor/d_a_obj_fireWood2.h @@ -51,6 +51,8 @@ public: /* 80BE824C */ daFireWood2_HIO_c(); /* 80BE8E54 */ virtual ~daFireWood2_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 mFlameOffsetY; /* 0x08 */ f32 mCollisionDiameter; /* 0x0C */ f32 mCollisionHeight; diff --git a/include/d/actor/d_a_obj_glowSphere.h b/include/d/actor/d_a_obj_glowSphere.h index e2f3d8f5f8..2b83499a2b 100644 --- a/include/d/actor/d_a_obj_glowSphere.h +++ b/include/d/actor/d_a_obj_glowSphere.h @@ -169,6 +169,8 @@ public: /* 80BF934C */ daGlwSph_HIO_c(); /* 80BFA76C */ virtual ~daGlwSph_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 speed; /* 0x8 */ f32 speed2; }; diff --git a/include/d/actor/d_a_obj_groundwater.h b/include/d/actor/d_a_obj_groundwater.h index b5f4bd3ed2..dd4ffecc00 100644 --- a/include/d/actor/d_a_obj_groundwater.h +++ b/include/d/actor/d_a_obj_groundwater.h @@ -76,6 +76,8 @@ public: /* 80C134AC */ daGrdWater_HIO_c(); /* 80C148A8 */ virtual ~daGrdWater_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 field_0x04; /* 0x05 */ u8 field_0x05; /* 0x06 */ u8 field_0x06; diff --git a/include/d/actor/d_a_obj_heavySw.h b/include/d/actor/d_a_obj_heavySw.h index 9818d843cb..1d59072374 100644 --- a/include/d/actor/d_a_obj_heavySw.h +++ b/include/d/actor/d_a_obj_heavySw.h @@ -63,6 +63,8 @@ public: /* 80C1CAEC */ daHeavySw_HIO_c(); /* 80C1D9D8 */ virtual ~daHeavySw_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; /* 0x08 */ f32 field_0x08; /* 0x0C */ f32 field_0x0c; diff --git a/include/d/actor/d_a_obj_hsTarget.h b/include/d/actor/d_a_obj_hsTarget.h index cae38a2421..86c9df8d28 100644 --- a/include/d/actor/d_a_obj_hsTarget.h +++ b/include/d/actor/d_a_obj_hsTarget.h @@ -31,10 +31,12 @@ private: STATIC_ASSERT(sizeof(daHsTarget_c) == 0x5B0); -class daHsTarget_HIO_c : mDoHIO_entry_c { +class daHsTarget_HIO_c : public mDoHIO_entry_c { public: /* 80C1F42C */ daHsTarget_HIO_c(); /* 80C1F7F4 */ virtual ~daHsTarget_HIO_c() {} + + void genMessage(JORMContext*); }; #endif /* D_A_OBJ_HSTARGET_H */ diff --git a/include/d/actor/d_a_obj_kiPot.h b/include/d/actor/d_a_obj_kiPot.h index dd2bfc4399..2b18f00c26 100644 --- a/include/d/actor/d_a_obj_kiPot.h +++ b/include/d/actor/d_a_obj_kiPot.h @@ -37,8 +37,9 @@ public: /* 80C44D0C */ daKiPot_HIO_c(); /* 80C450E8 */ virtual ~daKiPot_HIO_c() {}; - /* 0x00 */ /* vtable */ + void genMessage(JORMContext*); + /* 0x00 */ /* vtable */ /* 0x06 */ u8 field_0x06; }; diff --git a/include/d/actor/d_a_obj_ktOnFire.h b/include/d/actor/d_a_obj_ktOnFire.h index 2f7bd572de..3dde8f503b 100644 --- a/include/d/actor/d_a_obj_ktOnFire.h +++ b/include/d/actor/d_a_obj_ktOnFire.h @@ -40,10 +40,12 @@ public: /* 8058C60C */ daKtOnFire_HIO_c(); /* 8058CEA8 */ ~daKtOnFire_HIO_c() {} - u8 mTimer; - u8 mColor1R; - u8 mColor1G; - u8 mColor1B; + void genMessage(JORMContext*); + + u8 mTimer; + u8 mColor1R; + u8 mColor1G; + u8 mColor1B; }; diff --git a/include/d/actor/d_a_obj_lv1Candle00.h b/include/d/actor/d_a_obj_lv1Candle00.h index cba9ac9a22..681959f6e7 100644 --- a/include/d/actor/d_a_obj_lv1Candle00.h +++ b/include/d/actor/d_a_obj_lv1Candle00.h @@ -57,6 +57,8 @@ public: /* 80C55D0C */ daLv1Cdl00_HIO_c(); /* 80C56970 */ ~daLv1Cdl00_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_lv1Candle01.h b/include/d/actor/d_a_obj_lv1Candle01.h index ceefc61d09..dc39d497aa 100644 --- a/include/d/actor/d_a_obj_lv1Candle01.h +++ b/include/d/actor/d_a_obj_lv1Candle01.h @@ -53,6 +53,8 @@ public: /* 80C56CAC */ daLv1Cdl01_HIO_c(); /* 80C5777C */ ~daLv1Cdl01_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_lv2Candle.h b/include/d/actor/d_a_obj_lv2Candle.h index 80d39e2794..f2b24881f8 100644 --- a/include/d/actor/d_a_obj_lv2Candle.h +++ b/include/d/actor/d_a_obj_lv2Candle.h @@ -71,6 +71,8 @@ public: /* 8058E04C */ daLv2Candle_HIO_c(); /* 8058F050 */ ~daLv2Candle_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 mTimer; /* 0x08 */ f32 mPow; /* 0x0C */ f32 mAnmMaxStep; diff --git a/include/d/actor/d_a_obj_lv3Candle.h b/include/d/actor/d_a_obj_lv3Candle.h index b776421978..8bc4dcbe38 100644 --- a/include/d/actor/d_a_obj_lv3Candle.h +++ b/include/d/actor/d_a_obj_lv3Candle.h @@ -56,6 +56,8 @@ public: /* 80C57ACC */ daLv3Candle_HIO_c(); /* 80C58484 */ virtual ~daLv3Candle_HIO_c() {} + void genMessage(JORMContext*); + /* 0x00 vtable */ /* 0x04 */ u8 field_0x04; }; diff --git a/include/d/actor/d_a_obj_lv3Water.h b/include/d/actor/d_a_obj_lv3Water.h index fc73ac290a..34d9134913 100644 --- a/include/d/actor/d_a_obj_lv3Water.h +++ b/include/d/actor/d_a_obj_lv3Water.h @@ -71,8 +71,9 @@ public: /* 80C587CC */ daLv3Water_HIO_c(); /* 80C59C34 */ virtual ~daLv3Water_HIO_c(); - /* 0x00 */ /* vtable */ + void genMessage(JORMContext*); + /* 0x00 */ /* vtable */ /* 0x04 */ u8 field_0x04; }; diff --git a/include/d/actor/d_a_obj_lv3Water2.h b/include/d/actor/d_a_obj_lv3Water2.h index aca3e4a947..595d87a686 100644 --- a/include/d/actor/d_a_obj_lv3Water2.h +++ b/include/d/actor/d_a_obj_lv3Water2.h @@ -95,9 +95,7 @@ struct daLv3Water2_HIO_c : public mDoHIO_entry_c { /* 80C5A40C */ daLv3Water2_HIO_c(); /* 80C5B14C */ ~daLv3Water2_HIO_c() {} - #ifdef DEBUG void genMessage(JORMContext*); - #endif /* 0x04 */ u8 mLevelControlWaitFrames; }; diff --git a/include/d/actor/d_a_obj_lv4CandleDemoTag.h b/include/d/actor/d_a_obj_lv4CandleDemoTag.h index 59ab82225b..ef7a0b1fe7 100644 --- a/include/d/actor/d_a_obj_lv4CandleDemoTag.h +++ b/include/d/actor/d_a_obj_lv4CandleDemoTag.h @@ -58,6 +58,8 @@ public: /* 80C5C9EC */ dalv4CandleDemoTag_HIO_c(); /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c(); + void genMessage(JORMContext*); + /* 0x4 */ s16 mEnemyWaitTime; }; diff --git a/include/d/actor/d_a_obj_lv4CandleTag.h b/include/d/actor/d_a_obj_lv4CandleTag.h index cbd8e2e8d3..f2832796d9 100644 --- a/include/d/actor/d_a_obj_lv4CandleTag.h +++ b/include/d/actor/d_a_obj_lv4CandleTag.h @@ -74,6 +74,8 @@ public: /* 80C5D44C */ dalv4CandleTag_HIO_c(); /* 80C5D9C0 */ ~dalv4CandleTag_HIO_c() {} + void genMessage(JORMContext*); + u8 mTimer; }; diff --git a/include/d/actor/d_a_obj_lv4Gate.h b/include/d/actor/d_a_obj_lv4Gate.h index fdad984ff8..a8ebdbebc2 100644 --- a/include/d/actor/d_a_obj_lv4Gate.h +++ b/include/d/actor/d_a_obj_lv4Gate.h @@ -51,6 +51,8 @@ public: /* 80C5EB6C */ daLv4Gate_HIO_c(); /* 80C5F348 */ virtual ~daLv4Gate_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 mMoveSpeed; /* 0x8 */ u8 mShockStrength; }; diff --git a/include/d/actor/d_a_obj_lv4HsTarget.h b/include/d/actor/d_a_obj_lv4HsTarget.h index 20bb3a1e90..45d6814bf4 100644 --- a/include/d/actor/d_a_obj_lv4HsTarget.h +++ b/include/d/actor/d_a_obj_lv4HsTarget.h @@ -34,6 +34,8 @@ class daLv4HsTarget_HIO_c : public mDoHIO_entry_c { public: /* 80C5F62C */ daLv4HsTarget_HIO_c(); /* 80C5F990 */ virtual ~daLv4HsTarget_HIO_c() {} + + void genMessage(JORMContext*); }; #endif /* D_A_OBJ_LV4HSTARGET_H */ diff --git a/include/d/actor/d_a_obj_lv4PoGate.h b/include/d/actor/d_a_obj_lv4PoGate.h index 7678f39d20..8f23e002e2 100644 --- a/include/d/actor/d_a_obj_lv4PoGate.h +++ b/include/d/actor/d_a_obj_lv4PoGate.h @@ -70,6 +70,8 @@ public: /* 80C5FBEC */ daLv4PoGate_HIO_c(); /* 80C60758 */ virtual ~daLv4PoGate_HIO_c() {}; + void genMessage(JORMContext*); + /* 0x04 */ f32 mOpenSpeed; /* 0x08 */ f32 mCloseStep1Speed; /* 0x0C */ f32 mCloseStep2Speed; diff --git a/include/d/actor/d_a_obj_lv5FloorBoard.h b/include/d/actor/d_a_obj_lv5FloorBoard.h index 660906c6d0..d35d7cb61e 100644 --- a/include/d/actor/d_a_obj_lv5FloorBoard.h +++ b/include/d/actor/d_a_obj_lv5FloorBoard.h @@ -56,6 +56,8 @@ public: /* 80C6A60C */ daFlorBoad_HIO_c(); /* 80C6B058 */ virtual ~daFlorBoad_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ cXyz field_0x4; /* 0x10 */ u8 field_0x10; /* 0x11 */ u8 field_0x11; diff --git a/include/d/actor/d_a_obj_lv5IceWall.h b/include/d/actor/d_a_obj_lv5IceWall.h index 278bb330e5..3efb3bc7cd 100644 --- a/include/d/actor/d_a_obj_lv5IceWall.h +++ b/include/d/actor/d_a_obj_lv5IceWall.h @@ -65,6 +65,8 @@ public: /* 80C6B42C */ daIceWall_HIO_c(); /* 80C6C550 */ virtual ~daIceWall_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ cXyz xyz; /* 0x10 */ u8 hitcount; /* 0x11 */ u8 hitcount2; diff --git a/include/d/actor/d_a_obj_lv5SwIce.h b/include/d/actor/d_a_obj_lv5SwIce.h index f86e08aacc..a3b883d31f 100644 --- a/include/d/actor/d_a_obj_lv5SwIce.h +++ b/include/d/actor/d_a_obj_lv5SwIce.h @@ -57,6 +57,8 @@ public: /* 80C6C94C */ daLv5SwIce_HIO_c(); /* 80C6D418 */ virtual ~daLv5SwIce_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 hitcount; }; diff --git a/include/d/actor/d_a_obj_lv8OptiLift.h b/include/d/actor/d_a_obj_lv8OptiLift.h index cb8944138a..e57e938a1f 100644 --- a/include/d/actor/d_a_obj_lv8OptiLift.h +++ b/include/d/actor/d_a_obj_lv8OptiLift.h @@ -94,6 +94,8 @@ public: /* 80C8A30C */ daOptiLift_HIO_c(); /* 80C8B900 */ virtual ~daOptiLift_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 mStopDisappearTime; /* 0x05 */ u8 mStartMoveTime; /* 0x06 */ u8 mColorAnmFrame; diff --git a/include/d/actor/d_a_obj_magLift.h b/include/d/actor/d_a_obj_magLift.h index 1b34833362..4ab4ae9d9c 100644 --- a/include/d/actor/d_a_obj_magLift.h +++ b/include/d/actor/d_a_obj_magLift.h @@ -70,6 +70,8 @@ public: /* 80C8DA2C */ daMagLift_HIO_c(); /* 80C8E5B0 */ virtual ~daMagLift_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_magLiftRot.h b/include/d/actor/d_a_obj_magLiftRot.h index 109e0548fb..c981f9d089 100644 --- a/include/d/actor/d_a_obj_magLiftRot.h +++ b/include/d/actor/d_a_obj_magLiftRot.h @@ -66,6 +66,8 @@ public: /* 80C8E94C */ daMagLiftRot_HIO_c(); /* 80C8FA3C */ virtual ~daMagLiftRot_HIO_c(); + void genMessage(JORMContext*); + /* 0x04 */ u8 mWaitTime; /* 0x08 */ f32 mInitSpeed; /* 0x0C */ f32 mAcceleration; diff --git a/include/d/actor/d_a_obj_onsenTaru.h b/include/d/actor/d_a_obj_onsenTaru.h index 2740785f6a..2bfc2bd9c4 100644 --- a/include/d/actor/d_a_obj_onsenTaru.h +++ b/include/d/actor/d_a_obj_onsenTaru.h @@ -82,6 +82,8 @@ public: /* 80CA85CC */ daOnsTaru_HIO_c(); /* 80CA9A78 */ virtual ~daOnsTaru_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ s16 mCoolTime; /* 0x06 */ u8 mVibration; /* 0x08 */ f32 mSmokeScale; diff --git a/include/d/actor/d_a_obj_pillar.h b/include/d/actor/d_a_obj_pillar.h index e393353d94..359d8c16b1 100644 --- a/include/d/actor/d_a_obj_pillar.h +++ b/include/d/actor/d_a_obj_pillar.h @@ -93,6 +93,8 @@ public: /* 80CAF32C */ daPillar_HIO_c(); /* 80CB0928 */ virtual ~daPillar_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ daPillar_c::sdata_t mShakeData; /* 0x10 */ u8 field_0x10[0x1C - 0x10]; /* 0x1C */ f32 field_0x1c; diff --git a/include/d/actor/d_a_obj_rfHole.h b/include/d/actor/d_a_obj_rfHole.h index f7f47732bf..0bbdbb2dba 100644 --- a/include/d/actor/d_a_obj_rfHole.h +++ b/include/d/actor/d_a_obj_rfHole.h @@ -60,6 +60,8 @@ public: /* 80CB8E6C */ daRfHole_HIO_c(); /* 80CB99D8 */ virtual ~daRfHole_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; /* 0x08 */ f32 field_0x08; /* 0x0C */ f32 field_0x0c; diff --git a/include/d/actor/d_a_obj_sWallShutter.h b/include/d/actor/d_a_obj_sWallShutter.h index 3502b30c6b..488099f3f1 100644 --- a/include/d/actor/d_a_obj_sWallShutter.h +++ b/include/d/actor/d_a_obj_sWallShutter.h @@ -73,6 +73,8 @@ public: /* 805981EC */ daSwShutter_HIO_c(); /* 80598ECC */ virtual ~daSwShutter_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 mInitSpeed; /* 0x08 */ f32 mMaxSpeed; /* 0x0C */ f32 mAcceleration; diff --git a/include/d/actor/d_a_obj_saidan.h b/include/d/actor/d_a_obj_saidan.h index 156614e19d..80402e783f 100644 --- a/include/d/actor/d_a_obj_saidan.h +++ b/include/d/actor/d_a_obj_saidan.h @@ -49,6 +49,8 @@ struct daSaidan_HIO_c : public mDoHIO_entry_c { /* 80CC3DAC */ daSaidan_HIO_c(); /* 80CC4478 */ virtual ~daSaidan_HIO_c() {} + void genMessage(JORMContext*); + /* 0x00 vtable */ /* 0x04 */ f32 mMaxStep; /* 0x08 */ f32 mTargetPosX; diff --git a/include/d/actor/d_a_obj_snowEffTag.h b/include/d/actor/d_a_obj_snowEffTag.h index f568d5da9f..406434f9b6 100644 --- a/include/d/actor/d_a_obj_snowEffTag.h +++ b/include/d/actor/d_a_obj_snowEffTag.h @@ -39,6 +39,8 @@ public: /* 80CDF0AC */ daSnowEffTag_HIO_c(); /* 80CDF674 */ virtual ~daSnowEffTag_HIO_c(); + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 mDisplayRange; /* 0x6 */ u8 mTop; diff --git a/include/d/actor/d_a_obj_syRock.h b/include/d/actor/d_a_obj_syRock.h index 246cc726b3..d22e8dff2c 100644 --- a/include/d/actor/d_a_obj_syRock.h +++ b/include/d/actor/d_a_obj_syRock.h @@ -111,6 +111,8 @@ public: /* 80D022AC */ daSyRock_HIO_c(); /* 80D03C44 */ ~daSyRock_HIO_c() {}; + void genMessage(JORMContext*); + /* 0x04 */ f32 mShakeAmplitude; // "揺れ強さ" "Shake strength" | Slider /* 0x08 */ f32 mShakeXOscillationAngle; // "振幅Ｘ" "Amplitude X" | Slider /* 0x0C */ f32 mShakeZOscillationAngle; // "振幅Ｚ" "Amplitude Z" | Slider diff --git a/include/d/actor/d_a_obj_timeFire.h b/include/d/actor/d_a_obj_timeFire.h index 25c3f4d491..ae8422ba31 100644 --- a/include/d/actor/d_a_obj_timeFire.h +++ b/include/d/actor/d_a_obj_timeFire.h @@ -51,6 +51,8 @@ public: /* 80D0E8EC */ daTimeFire_HIO_c(); /* 80D0F038 */ virtual ~daTimeFire_HIO_c() {} + void genMessage(JORMContext*); + u8 field_0x4; }; diff --git a/include/d/actor/d_a_obj_treesh.h b/include/d/actor/d_a_obj_treesh.h index 267e086613..916bb9195f 100644 --- a/include/d/actor/d_a_obj_treesh.h +++ b/include/d/actor/d_a_obj_treesh.h @@ -41,6 +41,8 @@ public: /* 80D1F0CC */ daTreeSh_HIO_c(); /* 80D1F81C */ virtual ~daTreeSh_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ s16 shake_strength; /* 0x6 */ s16 shake_speed; /* 0x8 */ s16 field_0x8; diff --git a/include/d/actor/d_a_obj_waterGate.h b/include/d/actor/d_a_obj_waterGate.h index d9918e1cf2..b0d9d62422 100644 --- a/include/d/actor/d_a_obj_waterGate.h +++ b/include/d/actor/d_a_obj_waterGate.h @@ -58,9 +58,7 @@ struct daWtGate_HIO_c : public mDoHIO_entry_c { /* 80D2BB8C */ daWtGate_HIO_c(); /* 80D2C3C0 */ ~daWtGate_HIO_c() {}; - #ifdef DEBUG void genMessage(JORMContext*); - #endif /* 0x4 */ f32 mMaxSpeed; /* 0x8 */ u8 field_0x8; // Modified, but never read; unused? diff --git a/include/d/actor/d_a_obj_waterPillar.h b/include/d/actor/d_a_obj_waterPillar.h index af54ca5c79..72fa1b9b5d 100644 --- a/include/d/actor/d_a_obj_waterPillar.h +++ b/include/d/actor/d_a_obj_waterPillar.h @@ -151,6 +151,8 @@ struct daWtPillar_HIO_c : public mDoHIO_entry_c { /* 80D2C6CC */ daWtPillar_HIO_c(); /* 80D2DF34 */ ~daWtPillar_HIO_c() {}; + void genMessage(JORMContext*); + /* 0x04 */ cXyz field_0x04; /* 0x10 */ csXyz field_0x10; /* 0x16 */ s8 mForTesting; // "----------- テスト用 ----------" "----------- For Testing ----------" | Checkbox diff --git a/include/d/actor/d_a_obj_wdStick.h b/include/d/actor/d_a_obj_wdStick.h index 1e9f531599..6bc492bb9f 100644 --- a/include/d/actor/d_a_obj_wdStick.h +++ b/include/d/actor/d_a_obj_wdStick.h @@ -92,6 +92,8 @@ public: /* 80D31B4C */ daWdStick_HIO_c(); /* 80D34030 */ virtual ~daWdStick_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 field_0x04; /* 0x05 */ u8 field_0x05; /* 0x06 */ s16 field_0x06; diff --git a/include/d/actor/d_a_obj_yobikusa.h b/include/d/actor/d_a_obj_yobikusa.h index 0cffc12b5c..7a61d4eb58 100644 --- a/include/d/actor/d_a_obj_yobikusa.h +++ b/include/d/actor/d_a_obj_yobikusa.h @@ -29,7 +29,7 @@ public: typedef struct actionFuncEntry { actionFunc initFn; actionFunc execFn; - }; + } actionFuncEntry; typedef struct attributes { /* 0x00 */ f32 field_0x00; @@ -50,7 +50,7 @@ public: /* 0x3A */ s16 field_0x3a; /* 0x3C */ s16 mNewLeafTickSpeed; /* 0x3E */ s16 mPickLeafTickSpeed; - }; + } attributes; /* 8059C9F8 */ void setAction(daObjYobikusa_c::Mode_e); /* 8059CA2C */ void callInit(); diff --git a/include/d/actor/d_a_obj_zrTurara.h b/include/d/actor/d_a_obj_zrTurara.h index e7df96ba3c..0666969829 100644 --- a/include/d/actor/d_a_obj_zrTurara.h +++ b/include/d/actor/d_a_obj_zrTurara.h @@ -61,6 +61,8 @@ public: /* 80D4056C */ daZrTurara_HIO_c(); /* 80D414BC */ ~daZrTurara_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 mDebrisRange; /* 0x8 */ u8 mDebrisNum; }; diff --git a/include/d/actor/d_a_obj_zrTuraraRock.h b/include/d/actor/d_a_obj_zrTuraraRock.h index 0d178e6f6a..211ba3581e 100644 --- a/include/d/actor/d_a_obj_zrTuraraRock.h +++ b/include/d/actor/d_a_obj_zrTuraraRock.h @@ -56,6 +56,8 @@ public: /* 80D4188C */ daZrTuraRc_HIO_c(); /* 80D422D0 */ ~daZrTuraRc_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; /* 0x08 */ f32 mGravity; /* 0x0C */ f32 mMaxFallSpeed; diff --git a/include/d/actor/d_a_tag_CstaSw.h b/include/d/actor/d_a_tag_CstaSw.h index ecb13d2111..98e30c4c70 100644 --- a/include/d/actor/d_a_tag_CstaSw.h +++ b/include/d/actor/d_a_tag_CstaSw.h @@ -27,6 +27,8 @@ public: /* 805A202C */ daTagCstaSw_HIO_c(); /* 805A2480 */ virtual ~daTagCstaSw_HIO_c(); + void genMessage(JORMContext*); + u8 unk_0x4; }; diff --git a/include/d/actor/d_a_tag_lv6CstaSw.h b/include/d/actor/d_a_tag_lv6CstaSw.h index 90af63fac4..1fb95f9fff 100644 --- a/include/d/actor/d_a_tag_lv6CstaSw.h +++ b/include/d/actor/d_a_tag_lv6CstaSw.h @@ -26,6 +26,8 @@ public: /* 80D5B2EC */ daLv6CstaSw_HIO_c(); /* 80D5B740 */ virtual ~daLv6CstaSw_HIO_c(); + void genMessage(JORMContext*); + u8 unk_0x4; }; diff --git a/include/d/actor/d_a_tag_poFire.h b/include/d/actor/d_a_tag_poFire.h index 0b02ee5025..d198e1c876 100644 --- a/include/d/actor/d_a_tag_poFire.h +++ b/include/d/actor/d_a_tag_poFire.h @@ -22,6 +22,8 @@ public: /* 80D5DACC */ daTagPoFire_HIO_c(); /* 80D5DCB0 */ virtual ~daTagPoFire_HIO_c(); + void genMessage(JORMContext*); + u8 unk_0x4; }; diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h index 2987743ece..ce0e14b68f 100644 --- a/include/d/actor/d_a_tbox.h +++ b/include/d/actor/d_a_tbox.h @@ -192,11 +192,13 @@ private: STATIC_ASSERT(sizeof(daTbox_c) == 0xA30); -class daTbox_HIO_c : mDoHIO_entry_c { +class daTbox_HIO_c : public mDoHIO_entry_c { public: /* 80490D2C */ daTbox_HIO_c(); /* 804960B8 */ virtual ~daTbox_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 mItemNo; /* 0x05 */ u8 mUseDebugItemNo; /* 0x06 */ u8 mClearSwitch; diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h index 93e80820e9..eb8b5dd706 100644 --- a/include/d/actor/d_a_ykgr.h +++ b/include/d/actor/d_a_ykgr.h @@ -8,10 +8,12 @@ #include "d/d_com_inf_game.h" #include "d/d_particle.h" -struct daYkgr_HIO_c : mDoHIO_entry_c { +struct daYkgr_HIO_c : public mDoHIO_entry_c { daYkgr_HIO_c(); /* 805A8D98 */ virtual ~daYkgr_HIO_c(); + void genMessage(JORMContext*); + /* 0x04 */ u8 field_0x4; /* 0x08 */ s32 field_0x8; /* 0x0C */ s32 field_0xc; diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index bea35dbd26..0c357afd9d 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -116,6 +116,8 @@ public: /* 80075F94 */ virtual ~dBgS_Acch(); + void DrawWall(dBgS&); + cXyz* GetPos() { return pm_pos; } cXyz* GetOldPos() { return pm_old_pos; } f32 GetGroundH() const { return m_ground_h; } diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 730f9eea3d..95b57f812f 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -410,6 +410,8 @@ public: /* 8018295C */ void footHeightOf(fopAc_ac_c*); /* 801829AC */ cSAngle Bank() { return mBank + mShake.field_0x40; } + void debugDraw(); + bool Active() { return field_0x24 == 0; } f32 TrimHeight() { return mTrimHeight; } int Type() { return mCurType; } diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 6bb9ee04ad..47be9c8d55 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -85,11 +85,11 @@ public: /* 80038098 */ virtual ~dDemo_actor_c(); /* 800387EC */ virtual void JSGSetData(u32, void const*, u32); /* 8003A05C */ virtual s32 JSGFindNodeID(char const* param_0) const { - JUT_ASSERT(mModel != 0); + JUT_ASSERT(0, mModel != 0); return mModel->getModelData()->getJointName()->getIndex(param_0); } /* 8003A088 */ virtual bool JSGGetNodeTransformation(u32 param_0, Mtx param_1) const { - JUT_ASSERT(mModel != 0); + JUT_ASSERT(0, mModel != 0); cMtx_copy(mModel->getAnmMtx((u16)param_0), param_1); return true; } @@ -365,14 +365,16 @@ public: static void offStatus(u32 status) { m_status &= ~status; } static void setBranchData(const u8* p_data) { m_branchData = p_data; } static s16 getBranchId() { return m_branchId; } + static s16 getBranchNum() { return m_branchNum; } static jmessage_tControl* getMesgControl() { return m_mesgControl; } static dDemo_camera_c* getCamera() { - JUT_ASSERT(m_object != 0); + JUT_ASSERT(0, m_object != 0); return m_object->getActiveCamera(); } static s16 m_branchId; + static s16 m_branchNum; static dDemo_system_c* m_system; static JStudio::TControl* m_control; static JStudio_JStage::TCreateObject* m_stage; diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h index c0fc567107..74d5497d91 100644 --- a/include/d/d_kankyo.h +++ b/include/d/d_kankyo.h @@ -492,6 +492,15 @@ inline dScnKy_env_light_c* dKy_getEnvlight() { return &g_env_light; } +class dKankyo_HIO_c { +public: + u8 pad[0xB4]; + /* 0xB4 */ u8 field_0xB4; + /* 0xB8 */ f32 field_0xB8; +}; + +extern dKankyo_HIO_c g_kankyoHIO; + enum dKy_dice_wether_mode { DICE_MODE_SUNNY_e, DICE_MODE_CLOUDY_e, diff --git a/include/d/d_map_path_dmap.h b/include/d/d_map_path_dmap.h index 556ae024ca..d7fc6edf93 100644 --- a/include/d/d_map_path_dmap.h +++ b/include/d/d_map_path_dmap.h @@ -67,7 +67,7 @@ public: /* 8003F754 */ static void remove(); static s8 getNowStayFloorNo() { - JUT_ASSERT(mNowStayFloorNoDecisionFlg); + JUT_ASSERT(0, mNowStayFloorNoDecisionFlg); s8 floor_no = 0; if (mNowStayFloorNoDecisionFlg) { diff --git a/include/d/d_menu_letter.h b/include/d/d_menu_letter.h index d376babc7f..6a517e22a7 100644 --- a/include/d/d_menu_letter.h +++ b/include/d/d_menu_letter.h @@ -68,7 +68,7 @@ private: /* 0x014 */ mDoDvdThd_mountArchive_c* mpMount; /* 0x018 */ J2DScreen* mpMenuScreen; /* 0x01C */ J2DScreen* mpMenuDMYScreen; - /* 0x020 */ J2DScreen* mpMenuBaseScreen; + /* 0x020 */ J2DScreen* mpBaseScreen; /* 0x024 */ J2DScreen* mpSdwScreen; /* 0x028 */ J2DScreen* mpLetterScreen[2]; /* 0x030 */ J2DScreen* mpIconScreen; diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 0b5f416819..bce624e396 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -42,7 +42,7 @@ public: return --mCount; } - static const int NAME_MAX = 8; + static const int NAME_MAX = 9; private: /* 0x00 */ char mArchiveName[11]; diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index c01f7a3fc5..816ca182d1 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -28,6 +28,8 @@ public: class dScnPly_preLoad_HIO_c : public mDoHIO_entry_c { public: /* 8025ADC0 */ virtual ~dScnPly_preLoad_HIO_c() {} + + void genMessage(JORMContext*); }; class dScnPly_env_otherHIO_c { diff --git a/include/d/d_save.h b/include/d/d_save.h index 6419052425..3ca0ce4642 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -18,7 +18,6 @@ #define MAX_INSECT_NUM 24 #define MAX_VISIBLE_HEARTPIECES 4 #define MAX_POH_NUM 100 -#define BOMB_BAG_MAX 3 #define BOTTLE_MAX 4 #define TBOX_MAX 64 #define DSV_MEMBIT_ENUM_MAX 8 @@ -320,6 +319,8 @@ public: void setRodTypeLevelUp(); void setBaitItem(u8 i_itemNo); + static const int BOMB_BAG_MAX = 3; + private: /* 0x00 */ u8 mItems[24]; /* 0x18 */ u8 mItemSlots[24]; diff --git a/include/dolphin/gx/GXGeometry.h b/include/dolphin/gx/GXGeometry.h index 188fa7a590..c12a6f1b46 100644 --- a/include/dolphin/gx/GXGeometry.h +++ b/include/dolphin/gx/GXGeometry.h @@ -28,7 +28,7 @@ void GXBegin(GXPrimitive type, GXVtxFmt vtxfmt, u16 nverts); static inline void GXEnd(void) { #if DEBUG extern GXBool __GXinBegin; - extern void OSPanic(char* file, int line, char* msg, ...); + extern void OSPanic(const char* file, int line, const char* msg, ...); if (!__GXinBegin) { OSPanic(__FILE__, 118, "GXEnd: called without a GXBegin"); } diff --git a/include/dolphin/os.h b/include/dolphin/os.h index 75094d3119..c38031b324 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -209,7 +209,7 @@ __declspec(weak) void OSVReport(const char* format, va_list list); #define OS_REPORT(...) OSReport(__VA_ARGS__) #define OS_WARNING(...) OSReport_Warning(__VA_ARGS__) #define OS_REPORT_ERROR(...) OSReport_Error(__VA_ARGS__) -#define OS_PANIC(msg) OSPanic(__FILE__, __LINE__, msg) +#define OS_PANIC(line, msg) OSPanic(__FILE__, line, msg) #else #define OS_REPORT(...) #define OS_WARNING(...) diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 55e37df021..9d061526b5 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -29,6 +29,8 @@ typedef char *Ptr; typedef int BOOL; +typedef unsigned int uint; + #define FALSE 0 #define TRUE 1 diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 3cfdce5ff1..e9ae3e1a4d 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -64,6 +64,9 @@ enum fopAc_Cull_e { fopAc_CULLBOX_11_e, fopAc_CULLBOX_12_e, fopAc_CULLBOX_13_e, +#ifdef DEBUG + fopAc_CULLBOX_14_e, +#endif fopAc_CULLBOX_CUSTOM_e, fopAc_CULLSPHERE_0_e, fopAc_CULLSPHERE_1_e, @@ -79,6 +82,9 @@ enum fopAc_Cull_e { fopAc_CULLSPHERE_11_e, fopAc_CULLSPHERE_12_e, fopAc_CULLSPHERE_13_e, +#ifdef DEBUG + fopAc_CULLSPHERE_14_e, +#endif fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index b36ed828a8..ea0694e0d8 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -29,7 +29,7 @@ "Delete -> " actor_name_str "(id=%d)\n" #define fopAcM_RegisterCreateID(actor_class, i_this, actor_name_str) \ - static_cast<actor_class*>(i_this); \ + actor_class* a_this = static_cast<actor_class*>(i_this); \ const fpc_ProcID procID = fopAcM_GetID(i_this); \ "Create -> " actor_name_str "(id=%d)\n" @@ -376,7 +376,7 @@ inline int fopAcM_GetCullSize(const fopAc_ac_c* i_actor) { } inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) { - return (i_culltype >= 0 && i_culltype < 14) || i_culltype == 14; + return (i_culltype >= 0 && i_culltype < fopAc_CULLBOX_CUSTOM_e) || i_culltype == fopAc_CULLBOX_CUSTOM_e; } inline const cXyz& fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) { @@ -757,12 +757,14 @@ inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_ } #ifdef DEBUG -#define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg, ...) \ - fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg, __VA_ARGS__) +#define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg) \ + fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg) #else #define fopAcM_setWarningMessage(...) #endif +void fopAcM_getNameString(fopAc_ac_c*, char*); + class fopAcM_lc_c { public: fopAcM_lc_c() { mLineCheck.ClrSttsRoofOff(); } diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 71b2d935ee..e87c2fbebc 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -119,11 +119,11 @@ inline void mDoMtx_quatRotAxisRad(Quaternion* q, const Vec* axis, f32 rad) { } inline void mDoMtx_identity(Mtx m) { - MTXIdentity(m); + PSMTXIdentity(m); } inline void mDoMtx_concat(const Mtx a, const Mtx b, Mtx c) { - MTXConcat(a, b, c); + PSMTXConcat(a, b, c); } inline void mDoMtx_inverse(const Mtx a, Mtx b) { |