diff --git a/include/JSystem/JAudio2/JASDSPInterface.h b/include/JSystem/JAudio2/JASDSPInterface.h index c3f843a074..3081075486 100644 --- a/include/JSystem/JAudio2/JASDSPInterface.h +++ b/include/JSystem/JAudio2/JASDSPInterface.h @@ -119,7 +119,7 @@ namespace JASDsp { extern FxBuf* FX_BUF; extern f32 sDSPVolume; - #ifdef DEBUG + #if DEBUG extern s32 dspMutex; #endif }; diff --git a/include/JSystem/JGadget/define.h b/include/JSystem/JGadget/define.h index 4ae789ada2..394a35a3d0 100644 --- a/include/JSystem/JGadget/define.h +++ b/include/JSystem/JGadget/define.h @@ -33,7 +33,7 @@ private: int mLine; }; -#ifdef DEBUG +#if DEBUG #define JGADGET_ASSERTWARN(line, COND) \ ((COND)) || (JGadget_outMessage(JGadget_outMessage::warning, __FILE__, line) << #COND, false); diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h index 04c8f54a37..0f7a7a4db7 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/include/JSystem/JHostIO/JORReflexible.h @@ -35,14 +35,14 @@ struct JORServer; class JOREventListener { public: -#ifdef DEBUG +#if DEBUG virtual void listenPropertyEvent(const JORPropertyEvent*) = 0; #endif }; class JORReflexible : public JOREventListener { public: -#ifdef DEBUG +#if DEBUG JORReflexible(); static JORServer* getJORServer(); diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index afea773716..0284012f49 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -266,7 +266,7 @@ inline JKRHeap* JKRGetRootHeap2() { } #endif -#ifdef DEBUG +#if DEBUG inline void JKRSetDebugFillNotuse(u8 status) { data_804508B1 = status; } inline void JKRSetDebugFillNew(u8 status) { data_804508B2 = status; } inline void JKRSetDebugFillDelete(u8 status) { data_804508B3 = status; } diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index a8724f5496..0e409a879a 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -313,7 +313,7 @@ public: > { TIterator_data_(const TFunctionValue_list_parameter& rParent, const f32* value) { -#ifdef DEBUG +#if DEBUG pOwn_ = &rParent; #endif pf_ = value; @@ -323,7 +323,7 @@ public: void set(const f32* value) { pf_ = value; } friend bool operator==(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -333,9 +333,10 @@ public: } f32 operator*() { -#ifdef DEBUG + // this guard is required - removing it breaks float regalloc in std::upper_bound + #if DEBUG JUT_ASSERT(947, pf_!=NULL); -#endif + #endif return *pf_; } @@ -357,7 +358,7 @@ public: } friend s32 operator-(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -366,7 +367,7 @@ public: return (r1.pf_ - r2.pf_) / suData_size; } -#ifdef DEBUG +#if DEBUG /* 0x00 */ const TFunctionValue_list_parameter* pOwn_; /* 0x04 */ const f32* pf_; #else @@ -421,7 +422,7 @@ public: > { TIterator_data_(const TFunctionValue_hermite& rParent, const f32* value) { -#ifdef DEBUG +#if DEBUG pOwn_ = &rParent; #endif pf_ = value; @@ -435,7 +436,7 @@ public: } friend bool operator==(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -445,7 +446,7 @@ public: } f32 operator*() { -#ifdef DEBUG +#if DEBUG JUT_ASSERT(1098, pf_!=NULL); #endif return *pf_; @@ -469,7 +470,7 @@ public: } friend s32 operator-(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -483,7 +484,7 @@ public: return (r1.pf_ - r2.pf_) / r1.uSize_; } -#ifdef DEBUG +#if DEBUG /* 0x00 */ const TFunctionValue_hermite* pOwn_; /* 0x04 */ const f32* pf_; /* 0x08 */ u32 uSize_; diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 090d71a3ff..3f42a456b5 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -47,7 +47,7 @@ struct TVariableValue { } void setValue_none() { -#ifdef DEBUG +#if DEBUG field_0xc.fv = NULL; #endif field_0x8 = NULL; diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 503a2a73e7..0aba36b476 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -3,7 +3,7 @@ #include "dolphin/os.h" -#ifdef DEBUG +#if DEBUG #define JUT_SHOW_ASSERT(LINE, COND) JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND) #define JUT_ASSERT(LINE, COND) \ diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index 471f2c169a..b82cd29a33 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -15,14 +15,14 @@ public: /* 0x0400 */ cCcD_Obj* mpObjTg[0x300]; /* 0x1000 */ cCcD_Obj* mpObjCo[0x100]; /* 0x1400 */ cCcD_Obj* mpObj[0x500]; -#ifdef DEBUG +#if DEBUG /* 0x2800 */ int m_debug_code; #endif /* 0x2800 */ u16 mObjAtCount; /* 0x2802 */ u16 mObjTgCount; /* 0x2804 */ u16 mObjCoCount; /* 0x2806 */ u16 mObjCount; -#ifdef DEBUG +#if DEBUG /* 0x280C */ u16 field_0x280c; /* 0x280E */ u16 field_0x280e; /* 0x2810 */ u16 field_0x2810; diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index c200fdd73b..eadb0e0675 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -198,7 +198,7 @@ public: JAISoundHandle* getMainBgmHandle() { return &mMainBgmHandle; } JAISoundHandle* getSubBgmHandle() { return &mSubBgmHandle; } - #ifdef DEBUG + #if DEBUG f32 field_0x00_debug; u8 field_0x04_debug; #endif diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index a010fcca58..84eb80f610 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -211,7 +211,7 @@ struct daAlink_WlAnmData { class daAlinkHIO_data_c : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_data_c(); ~daAlinkHIO_data_c(); @@ -220,13 +220,13 @@ public: void baseCopy(); void update(); -#ifdef DEBUG +#if DEBUG virtual void listenPropertyEvent(const JORPropertyEvent* event); #endif #endif public: -#ifdef DEBUG +#if DEBUG /* 0x04 */ int m_anm_num; /* 0x08 */ int m_u8_num; /* 0x0C */ int m_s16_num; @@ -278,7 +278,7 @@ public: class daAlinkHIO_basic_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_basic_c(); ~daAlinkHIO_basic_c() {} @@ -286,7 +286,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_basic_c1 m; #endif }; @@ -329,7 +329,7 @@ public: class daAlinkHIO_move_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_move_c(); ~daAlinkHIO_move_c() {} @@ -337,7 +337,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_move_c1 m; #endif }; @@ -375,7 +375,7 @@ public: class daAlinkHIO_noActAtnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_noActAtnMove_c(); ~daAlinkHIO_noActAtnMove_c() {} @@ -383,7 +383,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_noActAtnMove_c1 m; #endif }; @@ -417,7 +417,7 @@ public: class daAlinkHIO_frontRoll_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_frontRoll_c(); ~daAlinkHIO_frontRoll_c() {} @@ -425,7 +425,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_frontRoll_c1 m; #endif }; @@ -447,7 +447,7 @@ public: class daAlinkHIO_backJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_backJump_c(); ~daAlinkHIO_backJump_c() {} @@ -455,7 +455,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_backJump_c1 m; #endif }; @@ -481,7 +481,7 @@ public: class daAlinkHIO_sideStep_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_sideStep_c(); ~daAlinkHIO_sideStep_c() {} @@ -489,7 +489,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_sideStep_c1 m; #endif }; @@ -519,7 +519,7 @@ public: class daAlinkHIO_slide_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_slide_c(); ~daAlinkHIO_slide_c() {} @@ -527,7 +527,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_slide_c1 m; #endif }; @@ -565,7 +565,7 @@ public: class daAlinkHIO_atnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_atnMove_c(); ~daAlinkHIO_atnMove_c(); @@ -573,7 +573,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_atnMove_c1 m; #endif }; @@ -613,7 +613,7 @@ public: class daAlinkHIO_cutNormal_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutNormal_c(int, float); ~daAlinkHIO_cutNormal_c(); @@ -669,7 +669,7 @@ public: class daAlinkHIO_cutFinish_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutFinish_c(int, float); ~daAlinkHIO_cutFinish_c(); @@ -706,7 +706,7 @@ public: class daAlinkHIO_cutFnJU_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutFnJU_c(); ~daAlinkHIO_cutFnJU_c(); @@ -714,7 +714,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutFnJU_c1 m; #endif }; // Size: 0x88 @@ -743,7 +743,7 @@ public: class daAlinkHIO_cutDash_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutDash_c(int, float); ~daAlinkHIO_cutDash_c(); @@ -775,7 +775,7 @@ public: class daAlinkHIO_cutJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutJump_c(); ~daAlinkHIO_cutJump_c(); @@ -783,7 +783,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutJump_c1 m; #endif }; // Size: 0x78 @@ -826,7 +826,7 @@ public: class daAlinkHIO_cutTurn_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutTurn_c(); ~daAlinkHIO_cutTurn_c(); @@ -834,7 +834,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutTurn_c1 m; #endif }; // Size: 0xCC @@ -869,7 +869,7 @@ public: class daAlinkHIO_hoCut_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_hoCut_c(int, float); ~daAlinkHIO_hoCut_c(); @@ -902,7 +902,7 @@ public: class daAlinkHIO_hoCutCharge_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_hoCutCharge_c(); ~daAlinkHIO_hoCutCharge_c(); @@ -910,7 +910,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_hoCutCharge_c1 m; #endif }; // Size: 0x88 @@ -936,7 +936,7 @@ public: class daAlinkHIO_cutDown_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutDown_c(); ~daAlinkHIO_cutDown_c(); @@ -944,7 +944,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutDown_c1 m; #endif }; // Size: 0xA8 @@ -972,7 +972,7 @@ public: class daAlinkHIO_cutHead_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutHead_c(); ~daAlinkHIO_cutHead_c(); @@ -980,7 +980,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutHead_c1 m; #endif }; // Size: 0x94 @@ -1009,7 +1009,7 @@ public: class daAlinkHIO_cutLargeJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutLargeJump_c(); ~daAlinkHIO_cutLargeJump_c(); @@ -1017,7 +1017,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutLargeJump_c1 m; #endif }; // Size: 0xA8 @@ -1086,7 +1086,7 @@ public: class daAlinkHIO_cut_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cut_c(); ~daAlinkHIO_cut_c(); @@ -1096,7 +1096,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x034 */ daAlinkHIO_cutNormal_c mCutVertical; /* 0x08C */ daAlinkHIO_cutNormal_c mCutLeft; /* 0x0E4 */ daAlinkHIO_cutNormal_c mCutRight; @@ -1147,7 +1147,7 @@ public: class daAlinkHIO_guardAttack_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_guardAttack_c(int, float); ~daAlinkHIO_guardAttack_c(); @@ -1179,7 +1179,7 @@ public: class daAlinkHIO_turnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_turnMove_c(); ~daAlinkHIO_turnMove_c(); @@ -1187,7 +1187,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_turnMove_c1 m; #endif }; @@ -1224,7 +1224,7 @@ public: class daAlinkHIO_guard_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_guard_c(); ~daAlinkHIO_guard_c(); @@ -1232,7 +1232,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x034 */ daAlinkHIO_guardAttack_c mAtPush; /* 0x090 */ daAlinkHIO_guardAttack_c mAtKick; /* 0x0EC */ daAlinkHIO_turnMove_c mTurnMove; @@ -1263,7 +1263,7 @@ public: class daAlinkHIO_crouch_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_crouch_c(); ~daAlinkHIO_crouch_c(); @@ -1271,7 +1271,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_crouch_c1 m; #endif }; @@ -1318,7 +1318,7 @@ public: class daAlinkHIO_autoJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_autoJump_c(); ~daAlinkHIO_autoJump_c(); @@ -1326,7 +1326,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_autoJump_c1 m; #endif }; @@ -1348,7 +1348,7 @@ public: class daAlinkHIO_smallJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_smallJump_c(); ~daAlinkHIO_smallJump_c(); @@ -1356,7 +1356,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_smallJump_c1 m; #endif }; @@ -1377,7 +1377,7 @@ public: class daAlinkHIO_wallCatch_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallCatch_c(); ~daAlinkHIO_wallCatch_c(); @@ -1385,7 +1385,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallCatch_c1 m; #endif }; @@ -1403,7 +1403,7 @@ public: class daAlinkHIO_wallFall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallFall_c(); ~daAlinkHIO_wallFall_c(); @@ -1411,7 +1411,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallFall_c1 m; #endif }; @@ -1432,7 +1432,7 @@ public: class daAlinkHIO_wallMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallMove_c(); ~daAlinkHIO_wallMove_c(); @@ -1440,7 +1440,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallMove_c1 m; #endif }; @@ -1468,7 +1468,7 @@ public: class daAlinkHIO_wallHang_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallHang_c(); ~daAlinkHIO_wallHang_c(); @@ -1476,7 +1476,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_smallJump_c mSmallJump; /* 0x00 */ daAlinkHIO_wallCatch_c mWallCatch; /* 0x00 */ daAlinkHIO_wallFall_c mWallFall; @@ -1515,7 +1515,7 @@ public: class daAlinkHIO_pushpull_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_pushpull_c(); ~daAlinkHIO_pushpull_c(); @@ -1523,7 +1523,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_pushpull_c1 m; #endif }; @@ -1549,7 +1549,7 @@ public: class daAlinkHIO_damNormal_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damNormal_c(); ~daAlinkHIO_damNormal_c(); @@ -1557,7 +1557,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damNormal_c1 m; #endif }; @@ -1593,7 +1593,7 @@ public: class daAlinkHIO_damLaHu_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damLaHu_c(int); ~daAlinkHIO_damLaHu_c(); @@ -1601,7 +1601,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damLaHu_c1 m; #endif }; @@ -1621,7 +1621,7 @@ public: class daAlinkHIO_damHorse_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damHorse_c(); ~daAlinkHIO_damHorse_c(); @@ -1629,7 +1629,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damHorse_c1 m; #endif }; @@ -1656,7 +1656,7 @@ public: class daAlinkHIO_damFall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damFall_c(); ~daAlinkHIO_damFall_c(); @@ -1664,7 +1664,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damFall_c1 m; #endif }; @@ -1686,7 +1686,7 @@ public: class daAlinkHIO_damCaught_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damCaught_c(); ~daAlinkHIO_damCaught_c(); @@ -1694,7 +1694,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damCaught_c1 m; #endif }; @@ -1722,7 +1722,7 @@ public: class daAlinkHIO_damSwim_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damSwim_c(); ~daAlinkHIO_damSwim_c(); @@ -1730,7 +1730,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damSwim_c1 m; #endif }; @@ -1776,7 +1776,7 @@ public: class daAlinkHIO_damage_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damage_c(); ~daAlinkHIO_damage_c(); @@ -1784,7 +1784,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_damage_c1 m; /* 0x34 */ daAlinkHIO_damNormal_c mDamNormal; /* 0x00 */ daAlinkHIO_damLaHu_c mDamLarge; @@ -1821,7 +1821,7 @@ public: class daAlinkHIO_horse_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_horse_c(); ~daAlinkHIO_horse_c(); @@ -1829,7 +1829,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_horse_c1 m; #endif }; @@ -1860,7 +1860,7 @@ public: class daAlinkHIO_canoe_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_canoe_c(); ~daAlinkHIO_canoe_c(); @@ -1868,7 +1868,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_canoe_c1 m; #endif }; @@ -1905,7 +1905,7 @@ public: class daAlinkHIO_bow_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_bow_c(); ~daAlinkHIO_bow_c(); @@ -1913,7 +1913,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bow_c1 m; #endif }; @@ -1941,7 +1941,7 @@ public: class daAlinkHIO_boom_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_boom_c(); ~daAlinkHIO_boom_c(); @@ -1949,7 +1949,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_boom_c1 m; #endif }; @@ -1985,7 +1985,7 @@ public: class daAlinkHIO_bomb_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_bomb_c(); ~daAlinkHIO_bomb_c(); @@ -1993,7 +1993,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bomb_c1 m; #endif }; @@ -2058,7 +2058,7 @@ public: class daAlinkHIO_light_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_light_c(int); ~daAlinkHIO_light_c(); @@ -2066,7 +2066,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_huLight_c1 m; #endif }; @@ -2094,7 +2094,7 @@ public: class daAlinkHIO_kandelaar_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_kandelaar_c(); ~daAlinkHIO_kandelaar_c(); @@ -2102,7 +2102,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_kandelaar_c1 m; #endif }; @@ -2133,7 +2133,7 @@ public: class daAlinkHIO_magneBoots_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_magneBoots_c(); ~daAlinkHIO_magneBoots_c(); @@ -2141,7 +2141,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_magneBoots_c1 m; #endif }; @@ -2159,7 +2159,7 @@ public: class daAlinkHIO_fmChain_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_fmChain_c(); ~daAlinkHIO_fmChain_c(); @@ -2167,7 +2167,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_fmChain_c1 m; #endif }; @@ -2199,7 +2199,7 @@ public: class daAlinkHIO_hookshot_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_hookshot_c(); ~daAlinkHIO_hookshot_c(); @@ -2207,7 +2207,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_hookshot_c1 m; #endif }; @@ -2237,7 +2237,7 @@ public: class daAlinkHIO_spinner_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_spinner_c(); ~daAlinkHIO_spinner_c(); @@ -2245,7 +2245,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_spinner_c1 m; #endif }; @@ -2293,7 +2293,7 @@ public: class daAlinkHIO_ironBall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_ironBall_c(); ~daAlinkHIO_ironBall_c(); @@ -2301,7 +2301,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_ironBall_c1 m; #endif }; @@ -2323,7 +2323,7 @@ public: class daAlinkHIO_copyRod_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_copyRod_c(); ~daAlinkHIO_copyRod_c(); @@ -2331,7 +2331,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_copyRod_c1 m; #endif }; @@ -2351,7 +2351,7 @@ public: class daAlinkHIO_pickUp_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_pickUp_c(); ~daAlinkHIO_pickUp_c(); @@ -2359,7 +2359,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_pickUp_c1 m; #endif }; @@ -2398,7 +2398,7 @@ public: class daAlinkHIO_board_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_board_c(); ~daAlinkHIO_board_c(); @@ -2406,7 +2406,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_board_c1 m; #endif }; @@ -2431,7 +2431,7 @@ public: class daAlinkHIO_bottle_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_bottle_c(); ~daAlinkHIO_bottle_c(); @@ -2439,7 +2439,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bottle_c1 m; #endif }; @@ -2479,7 +2479,7 @@ public: class daAlinkHIO_item_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_item_c(); ~daAlinkHIO_item_c(); @@ -2487,7 +2487,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bow_c mBow; /* 0x00 */ daAlinkHIO_boom_c mBoomerang; /* 0x00 */ daAlinkHIO_bomb_c mBomb; @@ -2538,7 +2538,7 @@ public: class daAlinkHIO_ladder_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_ladder_c(); ~daAlinkHIO_ladder_c(); @@ -2546,7 +2546,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_ladder_c1 m; #endif }; @@ -2578,7 +2578,7 @@ public: class daAlinkHIO_roofHang_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_roofHang_c(); ~daAlinkHIO_roofHang_c(); @@ -2586,7 +2586,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_roofHang_c1 m; #endif }; @@ -2616,7 +2616,7 @@ public: class daAlinkHIO_grab_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_grab_c(); ~daAlinkHIO_grab_c(); @@ -2624,7 +2624,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_grab_c1 m; #endif }; @@ -2691,7 +2691,7 @@ public: class daAlinkHIO_swim_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_swim_c(); ~daAlinkHIO_swim_c(); @@ -2699,7 +2699,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_swim_c1 m; #endif }; @@ -2767,7 +2767,7 @@ public: class daAlinkHIO_wlMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlMove_c(); ~daAlinkHIO_wlMove_c(); @@ -2775,7 +2775,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlMove_c1 m; #endif }; @@ -2810,7 +2810,7 @@ public: class daAlinkHIO_wlMoveNoP_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlMoveNoP_c(); ~daAlinkHIO_wlMoveNoP_c(); @@ -2818,7 +2818,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlMoveNoP_c1 m; #endif }; @@ -2849,7 +2849,7 @@ public: class daAlinkHIO_wlAtnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtnMove_c(); ~daAlinkHIO_wlAtnMove_c(); @@ -2857,7 +2857,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlAtnMove_c1 m; #endif }; @@ -2881,7 +2881,7 @@ public: class daAlinkHIO_wlHowl_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlHowl_c(); ~daAlinkHIO_wlHowl_c(); @@ -2889,7 +2889,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlHowl_c1 m; #endif }; @@ -2915,7 +2915,7 @@ public: class daAlinkHIO_wlSideStep_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlSideStep_c(); ~daAlinkHIO_wlSideStep_c(); @@ -2923,7 +2923,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlSideStep_c1 m; #endif }; @@ -2945,7 +2945,7 @@ public: class daAlinkHIO_wlBackJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlBackJump_c(); ~daAlinkHIO_wlBackJump_c(); @@ -2953,7 +2953,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlBackJump_c1 m; #endif }; @@ -2990,7 +2990,7 @@ public: class daAlinkHIO_wlAutoJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAutoJump_c(); ~daAlinkHIO_wlAutoJump_c(); @@ -2998,7 +2998,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlAutoJump_c1 m; #endif }; @@ -3019,7 +3019,7 @@ public: class daAlinkHIO_wlPush_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlPush_c(); ~daAlinkHIO_wlPush_c(); @@ -3027,7 +3027,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlPush_c1 m; #endif }; @@ -3055,7 +3055,7 @@ public: class daAlinkHIO_wlLie_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlLie_c(); ~daAlinkHIO_wlLie_c(); @@ -3063,7 +3063,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlLie_c1 m; #endif }; @@ -3094,7 +3094,7 @@ public: class daAlinkHIO_wlWallHang_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlWallHang_c(); ~daAlinkHIO_wlWallHang_c(); @@ -3102,7 +3102,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlWallHang_c1 m; #endif }; @@ -3126,7 +3126,7 @@ public: class daAlinkHIO_wlDamNormal_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamNormal_c(); ~daAlinkHIO_wlDamNormal_c(); @@ -3134,7 +3134,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamNormal_c1 m; #endif }; @@ -3166,7 +3166,7 @@ public: class daAlinkHIO_wlDamLaHu_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamLaHu_c(int); ~daAlinkHIO_wlDamLaHu_c(); @@ -3174,7 +3174,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamLaHu_c1 m; #endif }; @@ -3195,7 +3195,7 @@ public: class daAlinkHIO_wlDamCaught_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamCaught_c(); ~daAlinkHIO_wlDamCaught_c(); @@ -3203,7 +3203,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamCaught_c1 m; #endif }; @@ -3228,7 +3228,7 @@ public: class daAlinkHIO_wlDamFall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamFall_c(); ~daAlinkHIO_wlDamFall_c(); @@ -3236,7 +3236,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamFall_c1 m; #endif }; @@ -3260,7 +3260,7 @@ public: class daAlinkHIO_wlDamage_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamage_c(); ~daAlinkHIO_wlDamage_c(); @@ -3268,7 +3268,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlDamage_c1 m; #endif /* 0x00 */ daAlinkHIO_wlDamNormal_c mNormal; @@ -3305,7 +3305,7 @@ public: class daAlinkHIO_wlSlide_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlSlide_c(); ~daAlinkHIO_wlSlide_c(); @@ -3313,7 +3313,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlSlide_c1 m; #endif }; @@ -3340,7 +3340,7 @@ public: class daAlinkHIO_wlRope_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlRope_c(); ~daAlinkHIO_wlRope_c(); @@ -3348,7 +3348,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlRope_c1 m; #endif }; @@ -3386,7 +3386,7 @@ public: class daAlinkHIO_wlAtWait_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtWait_c(int, float); ~daAlinkHIO_wlAtWait_c(); @@ -3413,7 +3413,7 @@ public: class daAlinkHIO_wlAtRoll_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtRoll_c(); ~daAlinkHIO_wlAtRoll_c(); @@ -3421,7 +3421,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtRoll_c1 m; #endif }; // Size: 0x54 @@ -3448,7 +3448,7 @@ public: class daAlinkHIO_wlAtNjump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtNjump_c(); ~daAlinkHIO_wlAtNjump_c(); @@ -3456,7 +3456,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtNjump_c1 m; #endif }; // Size: 0x70 @@ -3489,7 +3489,7 @@ public: class daAlinkHIO_wlAtCjump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtCjump_c(); ~daAlinkHIO_wlAtCjump_c(); @@ -3497,7 +3497,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtCjump_c1 m; #endif }; // Size: 0x98 @@ -3517,7 +3517,7 @@ public: class daAlinkHIO_wlAtLand_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtLand_c(); ~daAlinkHIO_wlAtLand_c(); @@ -3525,7 +3525,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtLand_c1 m; #endif }; // Size: 0x74 @@ -3553,7 +3553,7 @@ public: class daAlinkHIO_wlAtDown_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtDown_c(); ~daAlinkHIO_wlAtDown_c(); @@ -3561,7 +3561,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtDown_c1 m; #endif }; // Size: 0xD0 @@ -3590,7 +3590,7 @@ public: class daAlinkHIO_wlAtLock_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtLock_c(); ~daAlinkHIO_wlAtLock_c(); @@ -3598,7 +3598,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtLock_c1 m; #endif }; // Size: 0x88 @@ -3630,7 +3630,7 @@ public: class daAlinkHIO_wlAtBite_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtBite_c(); ~daAlinkHIO_wlAtBite_c(); @@ -3638,7 +3638,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtBite_c1 m; #endif }; // Size: 0x90 @@ -3675,7 +3675,7 @@ public: class daAlinkHIO_wlAttack_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAttack_c(); ~daAlinkHIO_wlAttack_c(); @@ -3722,7 +3722,7 @@ public: class daAlinkHIO_wlPoint_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlPoint_c(); ~daAlinkHIO_wlPoint_c(); @@ -3730,7 +3730,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlPoint_c1 m; #endif }; @@ -3758,7 +3758,7 @@ public: class daAlinkHIO_wlChain_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlChain_c(); ~daAlinkHIO_wlChain_c(); @@ -3766,7 +3766,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlChain_c1 m; #endif }; @@ -3815,7 +3815,7 @@ public: class daAlinkHIO_wlSwim_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlSwim_c(); ~daAlinkHIO_wlSwim_c(); @@ -3823,7 +3823,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlSwim_c1 m; #endif }; @@ -3844,7 +3844,7 @@ public: class daAlinkHIO_wlGrab_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlGrab_c(); ~daAlinkHIO_wlGrab_c(); @@ -3852,7 +3852,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlGrab_c1 m; #endif }; @@ -3874,7 +3874,7 @@ public: class daAlinkHIO_wlBall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlBall_c(); ~daAlinkHIO_wlBall_c(); @@ -3882,7 +3882,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlBall_c1 m; #endif }; @@ -3929,7 +3929,7 @@ public: class daAlinkHIO_wolf_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wolf_c(); ~daAlinkHIO_wolf_c(); @@ -3939,7 +3939,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlMove_c mWlMove; /* 0x00 */ daAlinkHIO_wlMoveNoP_c mWlMoveNoP; /* 0x00 */ daAlinkHIO_wlAtnMove_c mWlAtnMove; @@ -3965,7 +3965,7 @@ public: }; class daAlinkHIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { @@ -3975,7 +3975,7 @@ public: void jumpStateUpdate(const cXyz*, const cXyz*, f32); void genMessage(JORMContext*); -#ifdef DEBUG +#if DEBUG void readFileData(char*); size_t makeFileOutData(char*, char*); void listenPropertyEvent(const JORPropertyEvent*); diff --git a/include/d/actor/d_a_demo00.h b/include/d/actor/d_a_demo00.h index 4bb1cf8a4a..57a574d0cf 100644 --- a/include/d/actor/d_a_demo00.h +++ b/include/d/actor/d_a_demo00.h @@ -87,7 +87,7 @@ public: /* 0x0568 */ cXyz field_0x568; /* 0x0574 */ csXyz field_0x574; - #ifdef DEBUG + #if DEBUG cXyz debug_field_0x570; csXyz debug_field_0x57c; #endif diff --git a/include/d/actor/d_a_e_yr.h b/include/d/actor/d_a_e_yr.h index 36a9e29c60..cf1c173f7a 100644 --- a/include/d/actor/d_a_e_yr.h +++ b/include/d/actor/d_a_e_yr.h @@ -77,7 +77,7 @@ public: /* 0x70C */ dBgS_AcchCir mAcchCir; /* 0x74C */ dBgS_ObjAcch mAcch; /* 0x924 */ u8 field_0x924; -#ifndef DEBUG +#if !DEBUG /* 0x928 */ f32 field_0x928; #endif /* 0x92C */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_npc_aru.h b/include/d/actor/d_a_npc_aru.h index b48a714e9e..7cdba1eff9 100644 --- a/include/d/actor/d_a_npc_aru.h +++ b/include/d/actor/d_a_npc_aru.h @@ -131,9 +131,7 @@ public: int bullRunning(void*); int skipFence(void*); int talk(void*); - #ifdef DEBUG int test(void*); - #endif daNpc_Aru_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_cd.h b/include/d/actor/d_a_npc_cd.h index fc1e19ef1c..918a29e88a 100644 --- a/include/d/actor/d_a_npc_cd.h +++ b/include/d/actor/d_a_npc_cd.h @@ -54,7 +54,7 @@ struct daNpcCd_HIO_Jnt_c : public JORReflexible { virtual ~daNpcCd_HIO_Jnt_c() {} daNpcCd_HIO_Jnt_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -66,7 +66,7 @@ struct daNpcCd_HIO_Child_c : public JORReflexible { virtual ~daNpcCd_HIO_Child_c() {} daNpcCd_HIO_Child_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -91,7 +91,7 @@ public: daNpcCd_HIO_c(); virtual ~daNpcCd_HIO_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index 88e859acd5..c5ef9f9283 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -274,7 +274,7 @@ public: } void setCollision() { - #ifdef DEBUG + #if DEBUG mCyl.SetR(Cd2_HIO_cylR(m_type)); mCyl.SetH(Cd2_HIO_cylH(m_type)); #endif diff --git a/include/d/actor/d_a_npc_doc.h b/include/d/actor/d_a_npc_doc.h index 114bd9f749..286405d074 100644 --- a/include/d/actor/d_a_npc_doc.h +++ b/include/d/actor/d_a_npc_doc.h @@ -74,10 +74,8 @@ public: OS_REPORT("|%06d:%x|daNpc_Doc_c -> コンストラクト\n", g_Counter.mCounter0, this); } - #if DEBUG int test(void*); - #endif - + BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 4; } BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 8; } s32 getBackboneJointNo() { return 1; } diff --git a/include/d/actor/d_a_npc_fairy.h b/include/d/actor/d_a_npc_fairy.h index 51b1434113..09bed565c5 100644 --- a/include/d/actor/d_a_npc_fairy.h +++ b/include/d/actor/d_a_npc_fairy.h @@ -196,9 +196,7 @@ public: BOOL setAction(actionFunc, int); int wait(int); int talk(int); - #if DEBUG int test(int); - #endif void AppearDemoCall(); void ReturnDemoCall(); void PresentDemoCall(); diff --git a/include/d/actor/d_a_npc_grmc.h b/include/d/actor/d_a_npc_grmc.h index 0bfcd52016..b0ffb6f6f7 100644 --- a/include/d/actor/d_a_npc_grmc.h +++ b/include/d/actor/d_a_npc_grmc.h @@ -13,13 +13,19 @@ * */ +#if DEBUG +#define NPC_GRMC_HIO_CLASS daNpc_grMC_HIO_c +#else +#define NPC_GRMC_HIO_CLASS daNpc_grMC_Param_c +#endif + struct daNpc_grMC_HIOParam { /* 0x0 */ daNpcT_HIOParam common; }; class daNpc_grMC_HIO_c : public mDoHIO_entry_c { public: - /* 0x8 */ daNpc_grMC_HIOParam param; + /* 0x8 */ daNpc_grMC_HIOParam m; }; class daNpc_grMC_Param_c { @@ -92,9 +98,7 @@ public: int tend(void*); int talk(void*); int shop(void*); - #ifdef DEBUG int test(void*); - #endif daNpc_grMC_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, @@ -118,10 +122,7 @@ public: static cutFunc mCutList[1]; private: - #ifdef DEBUG - /* 0xFCC */ daNpc_grMC_HIO_c* mHIO; - #endif - /* 0x0F7C */ u8 field_0xf7c[0xf80 - 0xf7c]; + /* 0x0F7C */ NPC_GRMC_HIO_CLASS* mHIO; /* 0x0F80 */ dCcD_Cyl mCyl; /* 0x10BC */ u8 mType; /* 0x10C0 */ actionFunc mNextAction; diff --git a/include/d/actor/d_a_npc_grr.h b/include/d/actor/d_a_npc_grr.h index fd2384e358..642073e295 100644 --- a/include/d/actor/d_a_npc_grr.h +++ b/include/d/actor/d_a_npc_grr.h @@ -17,7 +17,7 @@ struct daNpc_grR_HIOParam { }; class daNpc_grR_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h index 6122606a61..5234e1bdc2 100644 --- a/include/d/actor/d_a_npc_hoz.h +++ b/include/d/actor/d_a_npc_hoz.h @@ -91,9 +91,7 @@ public: virtual void evtOrder(); virtual int drawDbgInfo(); - #if DEBUG int test(void*); - #endif bool getGameStartFlag() { return mGameStartFlag; } void setPotBreakFlag() { mPotBreakFlag = true; } diff --git a/include/d/actor/d_a_npc_kasi_kyu.h b/include/d/actor/d_a_npc_kasi_kyu.h index 9f611831aa..45fb2d4359 100644 --- a/include/d/actor/d_a_npc_kasi_kyu.h +++ b/include/d/actor/d_a_npc_kasi_kyu.h @@ -20,7 +20,7 @@ struct daNpcKasiKyu_HIOParam { }; class daNpcKasiKyu_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_kasi_mich.h b/include/d/actor/d_a_npc_kasi_mich.h index 1374717fc5..fbda43e3c6 100644 --- a/include/d/actor/d_a_npc_kasi_mich.h +++ b/include/d/actor/d_a_npc_kasi_mich.h @@ -20,7 +20,7 @@ struct daNpcKasiMich_HIOParam { }; class daNpcKasiMich_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h index dede4e1b6c..1c6b9f2e4b 100644 --- a/include/d/actor/d_a_npc_kolin.h +++ b/include/d/actor/d_a_npc_kolin.h @@ -67,9 +67,7 @@ public: int follow(void*); int clothWait(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_Kolin_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_kolinb.h b/include/d/actor/d_a_npc_kolinb.h index dcf4d4744c..6cc9823437 100644 --- a/include/d/actor/d_a_npc_kolinb.h +++ b/include/d/actor/d_a_npc_kolinb.h @@ -115,9 +115,7 @@ public: int cutThankYou(int); int wait(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_Kolinb_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_pachi_besu.h b/include/d/actor/d_a_npc_pachi_besu.h index 0c6bfad3a7..fad0bdc9ab 100644 --- a/include/d/actor/d_a_npc_pachi_besu.h +++ b/include/d/actor/d_a_npc_pachi_besu.h @@ -61,9 +61,7 @@ public: BOOL setAction(actionFunc); BOOL wait(void*); BOOL talk(void*); - #ifdef DEBUG BOOL test(void*); - #endif BOOL _turn_to_link(s16); BOOL _turn_pos(cXyz const&); BOOL _turn_pos(cXyz const&, s16); diff --git a/include/d/actor/d_a_npc_saru.h b/include/d/actor/d_a_npc_saru.h index 21a12d85a7..f4e64d918f 100644 --- a/include/d/actor/d_a_npc_saru.h +++ b/include/d/actor/d_a_npc_saru.h @@ -22,7 +22,7 @@ class daNpc_Saru_Param_c : public JORReflexible { public: virtual ~daNpc_Saru_Param_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -129,7 +129,7 @@ public: static char* mCutNameList[4]; static cutFunc mCutList[4]; private: - #ifdef DEBUG + #if DEBUG /* 0xE90 */ daNpc_Saru_HIO_c* field_0xe90; #endif /* 0xE40 */ u8 field_0xe40[0xe44 - 0xe40]; diff --git a/include/d/actor/d_a_npc_seic.h b/include/d/actor/d_a_npc_seic.h index e08641bf22..3c6f5f3fe8 100644 --- a/include/d/actor/d_a_npc_seic.h +++ b/include/d/actor/d_a_npc_seic.h @@ -60,14 +60,14 @@ class daNpc_seiC_Param_c { }; class daNpc_seiC_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { public: void genMessage(JORMContext*); - #ifdef DEBUG + #if DEBUG /* 0x08 */ daNpc_seiC_HIOParam field_0x8; /* 0x94 */ f32 field_0x94; // "強制会話距離" "Forced conversation distance" | Slider /* 0x98 */ f32 field_0x98; // "会話距離" "Conversation distance" | Slider diff --git a/include/d/actor/d_a_npc_seid.h b/include/d/actor/d_a_npc_seid.h index f3fc27ff27..43abdd2356 100644 --- a/include/d/actor/d_a_npc_seid.h +++ b/include/d/actor/d_a_npc_seid.h @@ -60,14 +60,14 @@ class daNpc_seiD_Param_c { }; class daNpc_seiD_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { public: void genMessage(JORMContext*); - #ifdef DEBUG + #if DEBUG /* 0x08 */ daNpc_seiD_HIOParam field_0x8; // /* 0x94 */ f32 field_0x94; // "強制会話距離" "Forced conversation distance" | Slider // /* 0x98 */ f32 field_0x98; // "会話距離" "Conversation distance" | Slider diff --git a/include/d/actor/d_a_npc_taro.h b/include/d/actor/d_a_npc_taro.h index d2865ca686..cbbb9d44eb 100644 --- a/include/d/actor/d_a_npc_taro.h +++ b/include/d/actor/d_a_npc_taro.h @@ -55,7 +55,7 @@ class daNpc_Taro_Param_c { }; class daNpc_Taro_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_tks.h b/include/d/actor/d_a_npc_tks.h index 75d3933b1d..ed8ee3f54f 100644 --- a/include/d/actor/d_a_npc_tks.h +++ b/include/d/actor/d_a_npc_tks.h @@ -28,7 +28,7 @@ struct daNpcTks_HIOParam { }; class daNpcTks_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_toby.h b/include/d/actor/d_a_npc_toby.h index 607b2fb649..835767d6c2 100644 --- a/include/d/actor/d_a_npc_toby.h +++ b/include/d/actor/d_a_npc_toby.h @@ -90,9 +90,7 @@ public: int walk(void*); int play(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_Toby_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_ykm.h b/include/d/actor/d_a_npc_ykm.h index ae91298e31..558e21402d 100644 --- a/include/d/actor/d_a_npc_ykm.h +++ b/include/d/actor/d_a_npc_ykm.h @@ -249,9 +249,7 @@ public: BOOL cook(void*); BOOL race(void*); BOOL talk(void*); - #ifdef DEBUG BOOL test(void*); - #endif daNpc_ykM_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_ykw.h b/include/d/actor/d_a_npc_ykw.h index cc53c2a0dc..770d452af2 100644 --- a/include/d/actor/d_a_npc_ykw.h +++ b/include/d/actor/d_a_npc_ykw.h @@ -75,9 +75,7 @@ public: int walk(void*); int race(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_ykW_c(const daNpcT_faceMotionAnmData_c * param_0, const daNpcT_motionAnmData_c* param_1, const daNpcT_MotionSeqMngr_c::sequenceStepData_c* param_2, diff --git a/include/d/actor/d_a_npc_zelRo.h b/include/d/actor/d_a_npc_zelRo.h index 3fa60a9ad2..ebac8e8929 100644 --- a/include/d/actor/d_a_npc_zelRo.h +++ b/include/d/actor/d_a_npc_zelRo.h @@ -115,9 +115,7 @@ public: BOOL setAction(actionFunc); int wait(void*); int talk(void*); - #ifdef DEBUG int test(void*); - #endif daNpc_ZelRo_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h index 7b3be1c0e9..51d5f3029f 100644 --- a/include/d/actor/d_a_obj_bemos.h +++ b/include/d/actor/d_a_obj_bemos.h @@ -123,7 +123,7 @@ public: void initActionDead(); void actionDead(); int Draw(); -#ifdef DEBUG +#if DEBUG /* 0x000000 */ void debugDraw(); #endif int Delete(); diff --git a/include/d/actor/d_a_obj_damCps.h b/include/d/actor/d_a_obj_damCps.h index 1ec3bcfca8..1ce75cc663 100644 --- a/include/d/actor/d_a_obj_damCps.h +++ b/include/d/actor/d_a_obj_damCps.h @@ -14,7 +14,7 @@ * */ class daObjDamCps_c : public fopAc_ac_c { -#ifdef DEBUG +#if DEBUG public: daObjDamCps_c() {}; void initBaseMtx(); diff --git a/include/d/actor/d_a_obj_fallobj.h b/include/d/actor/d_a_obj_fallobj.h index 2116d2eac4..52270b2bba 100644 --- a/include/d/actor/d_a_obj_fallobj.h +++ b/include/d/actor/d_a_obj_fallobj.h @@ -68,7 +68,7 @@ private: STATIC_ASSERT(sizeof(daObjFallObj_c) == 0x614); -#ifdef DEBUG +#if DEBUG class daObjFallObj_HIO_c : public mDoHIO_entry_c { public: daObjFallObj_HIO_c(); diff --git a/include/d/actor/d_a_obj_kbacket.h b/include/d/actor/d_a_obj_kbacket.h index 7ffce33504..4c4932d21e 100644 --- a/include/d/actor/d_a_obj_kbacket.h +++ b/include/d/actor/d_a_obj_kbacket.h @@ -22,12 +22,12 @@ struct daObj_KBacket_HIOParam }; class daObj_KBacket_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { public: -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); daObj_KBacket_HIOParam param; diff --git a/include/d/actor/d_a_obj_laundry_rope.h b/include/d/actor/d_a_obj_laundry_rope.h index deede25609..4dba2250dc 100644 --- a/include/d/actor/d_a_obj_laundry_rope.h +++ b/include/d/actor/d_a_obj_laundry_rope.h @@ -45,7 +45,7 @@ public: inline float getStartRate(cXyz* param_1); - #ifdef DEBUG + #if DEBUG const daObjLndRope_Hio_c* attr() const { return &M_Hio; }; diff --git a/include/d/actor/d_a_obj_lv6swturn.h b/include/d/actor/d_a_obj_lv6swturn.h index 3b6e6abac7..cf263b53bf 100644 --- a/include/d/actor/d_a_obj_lv6swturn.h +++ b/include/d/actor/d_a_obj_lv6swturn.h @@ -51,7 +51,7 @@ public: STATIC_ASSERT(sizeof(daObjLv6SwTurn_c) == 0x5cc); -#ifdef DEBUG +#if DEBUG class daObjLv6SwTurn_HIO_c : public mDoHIO_entry_c { public: daObjLv6SwTurn_HIO_c(); diff --git a/include/d/actor/d_a_obj_mie.h b/include/d/actor/d_a_obj_mie.h index 080c68f76d..a07ff24452 100644 --- a/include/d/actor/d_a_obj_mie.h +++ b/include/d/actor/d_a_obj_mie.h @@ -26,7 +26,7 @@ struct daObj_Mie_Param_c { }; class daObj_Mie_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_obj_swchain.h b/include/d/actor/d_a_obj_swchain.h index 028b827129..270fb8f5ab 100644 --- a/include/d/actor/d_a_obj_swchain.h +++ b/include/d/actor/d_a_obj_swchain.h @@ -117,7 +117,7 @@ private: /* 0xA9C */ u8 field_0xa9c; /* 0xA9D */ u8 field_0xa9d; /* 0xA9E */ u8 field_0xa9e; -#ifdef DEBUG +#if DEBUG /* 0xAA0 */ cXyz field_0xac0; #endif }; diff --git a/include/d/actor/d_a_obj_thdoor.h b/include/d/actor/d_a_obj_thdoor.h index b20f4a3a71..508b13573f 100644 --- a/include/d/actor/d_a_obj_thdoor.h +++ b/include/d/actor/d_a_obj_thdoor.h @@ -67,7 +67,7 @@ public: STATIC_ASSERT(sizeof(daObjThDoor_c) == 0x8c0); -#ifdef DEBUG +#if DEBUG class daObjThDoor_HIO_c : public mDoHIO_entry_c { public: daObjThDoor_HIO_c(); diff --git a/include/d/actor/d_a_obj_tobyhouse.h b/include/d/actor/d_a_obj_tobyhouse.h index 7df268b925..420a8ca278 100644 --- a/include/d/actor/d_a_obj_tobyhouse.h +++ b/include/d/actor/d_a_obj_tobyhouse.h @@ -79,7 +79,7 @@ public: STATIC_ASSERT(sizeof(daObjTobyHouse_c) == 0x600); -#ifdef DEBUG +#if DEBUG class daObjTobyHouse_HIO_c : public mDoHIO_entry_c { public: diff --git a/include/d/actor/d_a_obj_togeTrap.h b/include/d/actor/d_a_obj_togeTrap.h index 159afb645e..622d8226ca 100644 --- a/include/d/actor/d_a_obj_togeTrap.h +++ b/include/d/actor/d_a_obj_togeTrap.h @@ -68,7 +68,7 @@ public: daTogeTrap_HIO_c(); ~daTogeTrap_HIO_c() {} - #ifdef DEBUG + #if DEBUG void genMessage(JORMContext* ctx) { // Speed ctx->genLabel("--- 速 出現時---", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/include/d/actor/d_a_obj_volcbom.h b/include/d/actor/d_a_obj_volcbom.h index 1aae1c0269..17f9db911d 100644 --- a/include/d/actor/d_a_obj_volcbom.h +++ b/include/d/actor/d_a_obj_volcbom.h @@ -131,7 +131,7 @@ private: STATIC_ASSERT(sizeof(daObjVolcBom_c) == 0xa1c); -#ifdef DEBUG +#if DEBUG class daObjVolcBom_HIO_c : public mDoHIO_entry_c { public: daObjVolcBom_HIO_c(); diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 7c32803f68..5766b0b4df 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -45,7 +45,7 @@ private: class dAttParam_c : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG /* 0x04 */ s8 mHIOChildNo; #endif @@ -66,7 +66,7 @@ public: /* 0x35 */ u8 mAttnCursorDisappearFrames; /* 0x38 */ f32 field_0x38; /* 0x3C */ f32 field_0x3c; -#ifdef DEBUG +#if DEBUG /* 0x44 */ s32 mDebugDispPosX; /* 0x48 */ s32 mDebugDispPosY; #endif @@ -75,7 +75,7 @@ public: dAttParam_c() {} dAttParam_c(s32); -#ifdef DEBUG +#if DEBUG void connectHIO(char* i_name) { mHIOChildNo = mDoHIO_CREATE_CHILD(i_name, this); } diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h index d300226e3d..082723a828 100644 --- a/include/d/d_bg_s.h +++ b/include/d/d_bg_s.h @@ -66,7 +66,7 @@ u8 dKy_pol_sound_get(cBgS_PolyInfo const* param_0); class dBgS_HIO : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG dBgS_HIO() { field_0x6 = 0; field_0x8 = 0; @@ -152,7 +152,7 @@ public: 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) { - #ifdef DEBUG + #if DEBUG if (m_hio.ChkLineOff()) { return false; } @@ -173,7 +173,7 @@ public: #endif } f32 GroundCross(cBgS_GndChk* i_gndChk) { - #ifdef DEBUG + #if DEBUG if (m_hio.ChkCheckCounter()) { g_ground_counter++; } @@ -193,7 +193,7 @@ public: void ChkDeleteActorRegist(fopAc_ac_c*); -#ifdef DEBUG +#if DEBUG /* 0x1404 */ u8 field_0x1404[0x1408 - 0x1404]; /* 0x1408 */ dBgS_HIO m_hio; #endif diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index 208d838668..f5d7579c97 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -199,7 +199,7 @@ public: /* 0x02C */ u32 m_flags; /* 0x030 */ cXyz* pm_pos; /* 0x034 */ cXyz* pm_old_pos; -#ifdef DEBUG +#if DEBUG /* 0x038 */ cXyz unk_0x38; #endif /* 0x038 */ cXyz* pm_speed; @@ -227,7 +227,7 @@ public: /* 0x0CC */ f32 field_0xcc; /* 0x0D0 */ f32 m_wtr_chk_offset; /* 0x0D4 */ cBgS_PolyInfo* pm_out_poly_info; -#ifdef DEBUG +#if DEBUG /* 0x0E4 */ cXyz unk_0xe4; #endif /* 0x0D8 */ f32 field_0xd8; diff --git a/include/d/d_cc_s.h b/include/d/d_cc_s.h index 977a8ebc8e..2f9b475f70 100644 --- a/include/d/d_cc_s.h +++ b/include/d/d_cc_s.h @@ -65,7 +65,7 @@ public: // /* 0x0000 */ cCcS mCCcS; /* 0x284C */ dCcMassS_Mng mMass_Mng; -#ifdef DEBUG +#if DEBUG /* 0x2AD0 */ u8 field_0x2ad0; #endif }; // Size = 0x2AC4 diff --git a/include/d/d_event.h b/include/d/d_event.h index 2d364fe004..adc09de53d 100644 --- a/include/d/d_event.h +++ b/include/d/d_event.h @@ -128,7 +128,7 @@ public: u8 getMode() const { return mMode; } void onHindFlag(u16 flag) { mHindFlag |= flag; } - #ifdef DEBUG + #if DEBUG void offHindFlag(u16 flag) { mHindFlag &= (u16)~flag; } #else void offHindFlag(u16 flag) { mHindFlag &= ~flag; } diff --git a/include/d/d_event_debug.h b/include/d/d_event_debug.h index 41b679b321..45aab2267c 100644 --- a/include/d/d_event_debug.h +++ b/include/d/d_event_debug.h @@ -1,7 +1,6 @@ #ifndef D_EVENT_D_EVENT_DEBUG_H #define D_EVENT_D_EVENT_DEBUG_H -#ifdef DEBUG #include "JSystem/JHostIO/JORMContext.h" #include "d/d_event.h" @@ -171,6 +170,4 @@ struct dEvM_HIO_c : public JORReflexible { }; }; -#endif /* DEBUG */ - #endif /* D_EVENT_D_EVENT_DEBUG_H */ diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h index db066bd583..0293f52344 100644 --- a/include/d/d_kankyo.h +++ b/include/d/d_kankyo.h @@ -259,7 +259,7 @@ public: /* 0x09B8 */ DUNGEON_LIGHT dungeonlight[8]; /* 0x0C18 */ BOSS_LIGHT field_0x0c18[8]; /* 0x0D58 */ BOSS_LIGHT field_0x0d58[6]; -#ifdef DEBUG +#if DEBUG /* 0x0E48 */ NAVYCHAN navy; /* 0x0E58 */ u8 field_0xe58[0xE68 - 0xE58]; // part of NAVYCHAN? #endif diff --git a/include/d/d_meter_HIO.h b/include/d/d_meter_HIO.h index a03302b0b6..8c0802c31b 100644 --- a/include/d/d_meter_HIO.h +++ b/include/d/d_meter_HIO.h @@ -587,7 +587,7 @@ public: #endif } - #ifdef DEBUG + #if DEBUG virtual void listenPropertyEvent(const JORPropertyEvent*); virtual void genMessage(JORMContext*); @@ -601,7 +601,7 @@ public: /* 0x000 */ // vtable /* 0x004 */ s8 field_0x4; - #ifdef DEBUG + #if DEBUG int field_0x8_debug; #endif /* 0x008 */ f32 mLifeTopPosX; @@ -1185,7 +1185,7 @@ public: }; // Size: 0x28 dMeter_fmapHIO_c(); -#ifdef DEBUG +#if DEBUG void update(); void createEvtCallBackObject(); void deleteEvtCallBackObject(); diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h index 2807f4b877..edfce0ea8a 100644 --- a/include/d/d_msg_flow.h +++ b/include/d/d_msg_flow.h @@ -173,7 +173,7 @@ public: void initWord(fopAc_ac_c*, const char*, u8, int, fopAc_ac_c**); -#ifdef DEBUG +#if DEBUG void dbgPrint(); #endif diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 3d00f861e6..db8efde952 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -52,7 +52,7 @@ private: /* 0x18 */ JKRHeap* heap; /* 0x1C */ JKRSolidHeap* mDataHeap; /* 0x20 */ void** mRes; -#ifdef DEBUG +#if DEBUG /* 0x24 */ void* unk_0x24; #endif }; // Size: 0x24 diff --git a/include/d/d_s_menu.h b/include/d/d_s_menu.h index 751ab970e0..a544c65576 100644 --- a/include/d/d_s_menu.h +++ b/include/d/d_s_menu.h @@ -6,7 +6,7 @@ class mDoDvdThd_toMainRam_c; -#ifdef DEBUG +#if DEBUG class myFontClass : public JUTResFont { public: myFontClass(const ResFONT* i_font, JKRHeap* i_heap) diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index d78fa1b5b3..d0137bcb2c 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -19,7 +19,7 @@ class dScnPly_reg_HIO_c : public JORReflexible { public: virtual ~dScnPly_reg_HIO_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); /* 0x4 */ s8 id; @@ -83,7 +83,7 @@ public: extern dScnPly_env_HIO_c g_envHIO; extern dScnPly_reg_HIO_c g_regHIO; -#ifdef DEBUG +#if DEBUG extern dScnPly_preset_HIO_c g_presetHIO; #endif @@ -95,7 +95,7 @@ extern dScnPly_preset_HIO_c g_presetHIO; * Float Reg(25-29) ... -1.0 - +1.0 */ -#ifdef DEBUG +#if DEBUG // Morita #define TREG_F(i) g_regHIO.mChildReg[0].mFloatReg[i] #define TREG_S(i) g_regHIO.mChildReg[0].mShortReg[i] diff --git a/include/d/d_s_play_env.h b/include/d/d_s_play_env.h index 2f0a28642e..f14e1f6ef3 100644 --- a/include/d/d_s_play_env.h +++ b/include/d/d_s_play_env.h @@ -8,13 +8,13 @@ public: virtual ~dScnPly_env_otherHIO_c() {} void genMessage(JORMContext*); - #ifdef DEBUG + #if DEBUG /* 0x04 */ s8 field_0x04; #endif /* 0x08 */ f32 mShadowDensity; - #ifdef DEBUG + #if DEBUG /* 0x0C */ f32 mCullFarValue; /* 0x10 */ f32 mRailSize; /* 0x14 */ s16 mRailColorR; @@ -28,7 +28,7 @@ public: /* 0x45 */ u8 field_0x45; /* 0x46 */ u8 mDisplayTransparentCyl; - #ifdef DEBUG + #if DEBUG /* 0x47 */ u8 mDisplayShadows; /* 0x48 */ u8 mDisplayShadowImage; /* 0x49 */ u8 mDisplayShadowPoly; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index a6bd3e9d9f..43e3f7e3ad 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1011,7 +1011,7 @@ public: /* 0x54 */ stage_tgsc_class* mDrTg; /* 0x58 */ stage_tgsc_class* mDoor; /* 0x5C */ dStage_FloorInfo_c* mFloorInfo; -#ifdef DEBUG +#if DEBUG /* 0x60 */ int field_0x60; #endif /* 0x60 */ u16 mPlayerNum; @@ -1092,7 +1092,7 @@ public: static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; } static void setZoneNo(int, int); static dBgp_c* getBgp(int i_roomNo) { -#ifdef DEBUG +#if DEBUG // NONMATCHING #else return NULL; diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index 8443abf1d7..204f6e759c 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -88,7 +88,7 @@ public: static const vib_pattern CQ_patt[VIBMODE_Q_MAX]; private: -#ifdef DEBUG +#if DEBUG /* 0x00 */ dVibTest_c mVibTest; #endif diff --git a/include/dolphin/mtx.h b/include/dolphin/mtx.h index c818376fa3..da308658ab 100644 --- a/include/dolphin/mtx.h +++ b/include/dolphin/mtx.h @@ -85,7 +85,7 @@ void PSMTXScaleApply(const Mtx src, Mtx dst, f32 xS, f32 yS, f32 zS); void PSMTXQuat(Mtx m, const Quaternion* q); void PSMTXReflect(Mtx m, const Vec* p, const Vec* n); -#ifdef DEBUG +#if DEBUG #define MTXIdentity C_MTXIdentity #define MTXCopy C_MTXCopy #define MTXConcat C_MTXConcat @@ -145,7 +145,7 @@ void PSMTXMultVecArray(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count) void PSMTXMultVecSR(const Mtx m, const Vec* src, Vec* dst); void PSMTXMultVecArraySR(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTXMultVec C_MTXMultVec #define MTXMultVecArray C_MTXMultVecArray #define MTXMultVecSR C_MTXMultVecSR @@ -184,7 +184,7 @@ void PSMTX44RotRad(Mtx44 m, char axis, f32 rad); void PSMTX44RotTrig(Mtx44 m, char axis, f32 sinA, f32 cosA); void PSMTX44RotAxisRad(Mtx44 m, const Vec* axis, f32 rad); -#ifdef DEBUG +#if DEBUG #define MTX44Identity C_MTX44Identity #define MTX44Copy C_MTX44Copy #define MTX44Concat C_MTX44Concat @@ -234,7 +234,7 @@ void PSMTX44MultVecArray(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 co void PSMTX44MultVecSR(const Mtx44 m, const Vec* src, Vec* dst); void PSMTX44MultVecArraySR(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTX44MultVec C_MTX44MultVec #define MTX44MultVecArray C_MTX44MultVecArray #define MTX44MultVecSR C_MTX44MultVecSR @@ -287,7 +287,7 @@ void PSVECCrossProduct(const Vec* a, const Vec* b, Vec* axb); f32 PSVECSquareDistance(const Vec* a, const Vec* b); f32 PSVECDistance(const Vec* a, const Vec* b); -#ifdef DEBUG +#if DEBUG #define VECAdd C_VECAdd #define VECSubtract C_VECSubtract #define VECScale C_VECScale @@ -338,7 +338,7 @@ void PSQUATNormalize(const Quaternion* src, Quaternion* unit); void PSQUATInverse(const Quaternion* src, Quaternion* inv); void PSQUATDivide(const Quaternion* p, const Quaternion* q, Quaternion* r); -#ifdef DEBUG +#if DEBUG #define QUATAdd C_QUATAdd #define QUATSubtract C_QUATSubtract #define QUATMultiply C_QUATMultiply diff --git a/include/dolphin/os.h b/include/dolphin/os.h index ac0df7b59e..fdac723bf2 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -208,7 +208,7 @@ DECL_WEAK void OSReportForceEnableOff(void); DECL_WEAK void OSReportForceEnableOn(void); DECL_WEAK void OSVReport(const char* format, va_list list); -#ifdef DEBUG +#if DEBUG #define OS_REPORT(...) OSReport(__VA_ARGS__) #define OS_WARNING(...) OSReport_Warning(__VA_ARGS__) #define OS_REPORT_ERROR(...) OSReport_Error(__VA_ARGS__) @@ -261,7 +261,7 @@ extern int __OSInIPL; #define LINE(l0, l1, l2) (l2) #endif -#ifdef DEBUG +#if DEBUG #define ASSERTLINE(line, cond) \ ((cond) || (OSPanic(__FILE__, line, "Failed assertion " #cond), 0)) diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 0d3c80ed88..618caed84f 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -139,7 +139,11 @@ inline void fapGmHIO_set2Ddraw(u8 param_0) { } inline u8 fapGmHIO_get2Ddraw() { + #if DEBUG return g_HIO.mDisplay2D; + #else + return TRUE; + #endif } inline void fapGmHIO_offPrint() { @@ -151,7 +155,11 @@ inline void fapGmHIO_onPrint() { } inline u8 fapGmHIO_getParticle() { + #if DEBUG return g_HIO.mDisplayParticle; + #else + return TRUE; + #endif } #if PLATFORM_WII || PLATFORM_SHIELD diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 8122b42fb7..648196b870 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -64,7 +64,7 @@ enum fopAc_Cull_e { fopAc_CULLBOX_11_e, fopAc_CULLBOX_12_e, fopAc_CULLBOX_13_e, -#ifdef DEBUG +#if DEBUG fopAc_CULLBOX_14_e, #endif fopAc_CULLBOX_CUSTOM_e, @@ -76,7 +76,7 @@ enum fopAc_Cull_e { fopAc_CULLSPHERE_5_e, fopAc_CULLSPHERE_6_e, fopAc_CULLSPHERE_7_e, -#ifdef DEBUG +#if DEBUG fopAc_CULLSPHERE_8_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 b71590829e..955da52ad1 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -83,7 +83,7 @@ struct fopAcM_search_prm { struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { virtual ~fOpAcm_HIO_entry_c() {} - #ifdef DEBUG + #if DEBUG void removeHIO(const fopAc_ac_c* i_this) { removeHIO(*i_this); } void removeHIO(const fopAc_ac_c& i_this) { removeHIO(i_this.base); } void removeHIO(const leafdraw_class& i_this) { removeHIO(i_this.base); } @@ -816,7 +816,7 @@ inline void fopAcM_effSmokeSet2(u32* param_0, u32* param_1, cXyz const* param_2, inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_filename, int i_line, const char* i_msg, ...) { -#ifdef DEBUG +#if DEBUG /* va_list args; va_start(args, i_msg); @@ -834,7 +834,7 @@ void fopAcM_showAssert_f(const fopAc_ac_c*, const char*, int, const char*, ...); #define fopAcM_assert(line, actor, COND, msg) \ (COND) ? (void)0 : (fopAcM_showAssert_f(actor, __FILE__, line, msg)); -#ifdef DEBUG +#if DEBUG #define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg) \ fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg) #else diff --git a/include/f_pc/f_pc_debug_sv.h b/include/f_pc/f_pc_debug_sv.h index d7c942faa5..78a1d98b3e 100644 --- a/include/f_pc/f_pc_debug_sv.h +++ b/include/f_pc/f_pc_debug_sv.h @@ -4,7 +4,7 @@ #include -#ifdef DEBUG +#if DEBUG char* fpcDbSv_getNameString(s16 i_name); diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h index c2058fbe8d..bc446b4c6e 100644 --- a/include/f_pc/f_pc_node_req.h +++ b/include/f_pc/f_pc_node_req.h @@ -36,7 +36,7 @@ typedef struct node_create_request { /* 0x58 */ s16 name; /* 0x5C */ void* data; /* 0x60 */ s16 unk_0x60; -#ifdef DEBUG +#if DEBUG /* 0x64 */ int unk_0x64; /* 0x68 */ int unk_0x68; #endif diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index d393afafcb..94d30ba83d 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -14,7 +14,7 @@ typedef struct standard_create_request_class { /* 0x54 */ void* process_append; /* 0x58 */ stdCreateFunc create_post_method; /* 0x5C */ void* unk_0x5C; -#ifdef DEBUG +#if DEBUG /* 0x60 */ int unk_0x60; #endif } standard_create_request_class; diff --git a/include/global.h b/include/global.h index dbd2d613bf..42990950e1 100644 --- a/include/global.h +++ b/include/global.h @@ -27,6 +27,11 @@ #define REGION_KOR (VERSION == VERSION_WII_KOR) #define REGION_CHN (VERSION == VERSION_SHIELD || VERSION == VERSION_SHIELD_PROD || VERSION == VERSION_SHIELD_DEBUG) +// define DEBUG if it isn't already so it can be used in conditions +#ifndef DEBUG +#define DEBUG 0 +#endif + #define ARRAY_SIZE(o) (s32)(sizeof(o) / sizeof(o[0])) #define ARRAY_SIZEU(o) (sizeof(o) / sizeof(o[0])) diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index f8b9519db4..7eecfbb87e 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -26,7 +26,7 @@ public: class mDoHIO_entry_c : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG mDoHIO_entry_c(); void entryHIO(const char* i_name); void removeHIO(); @@ -73,7 +73,7 @@ void mDoHIO_updateChild(s8 i_no); void mDoHIO_deleteChild(s8 i_no); s8 mDoHIO_createChild(const char*, JORReflexible*); -#ifdef DEBUG +#if DEBUG #define mDoHIO_CREATE_CHILD(i_name, i_node) mDoHIO_createChild(i_name, i_node) #define mDoHIO_DELETE_CHILD(i_no) mDoHIO_deleteChild(i_no) #else diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index f005c5c9d7..1229687094 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -62,7 +62,7 @@ private: }; struct mDoMain { -#ifdef DEBUG +#if DEBUG static int argument; static int e3menu_no; static u32 archiveHeapSize; diff --git a/include/revolution/mtx.h b/include/revolution/mtx.h index bb1051f696..b6687e0c52 100644 --- a/include/revolution/mtx.h +++ b/include/revolution/mtx.h @@ -82,7 +82,7 @@ void PSMTXScaleApply(const Mtx src, Mtx dst, f32 xS, f32 yS, f32 zS); void PSMTXQuat(Mtx m, const Quaternion* q); void PSMTXReflect(Mtx m, const Vec* p, const Vec* n); -#ifdef DEBUG +#if DEBUG #define MTXIdentity C_MTXIdentity #define MTXCopy C_MTXCopy #define MTXConcat C_MTXConcat @@ -142,7 +142,7 @@ void PSMTXMultVecArray(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count) void PSMTXMultVecSR(const Mtx m, const Vec* src, Vec* dst); void PSMTXMultVecArraySR(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTXMultVec C_MTXMultVec #define MTXMultVecArray C_MTXMultVecArray #define MTXMultVecSR C_MTXMultVecSR @@ -181,7 +181,7 @@ void PSMTX44RotRad(Mtx44 m, char axis, f32 rad); void PSMTX44RotTrig(Mtx44 m, char axis, f32 sinA, f32 cosA); void PSMTX44RotAxisRad(Mtx44 m, const Vec* axis, f32 rad); -#ifdef DEBUG +#if DEBUG #define MTX44Identity C_MTX44Identity #define MTX44Copy C_MTX44Copy #define MTX44Concat C_MTX44Concat @@ -231,7 +231,7 @@ void PSMTX44MultVecArray(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 co void PSMTX44MultVecSR(const Mtx44 m, const Vec* src, Vec* dst); void PSMTX44MultVecArraySR(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTX44MultVec C_MTX44MultVec #define MTX44MultVecArray C_MTX44MultVecArray #define MTX44MultVecSR C_MTX44MultVecSR @@ -284,7 +284,7 @@ void PSVECCrossProduct(const Vec* a, const Vec* b, Vec* axb); f32 PSVECSquareDistance(const Vec* a, const Vec* b); f32 PSVECDistance(const Vec* a, const Vec* b); -#ifdef DEBUG +#if DEBUG #define VECAdd C_VECAdd #define VECSubtract C_VECSubtract #define VECScale C_VECScale @@ -335,7 +335,7 @@ void PSQUATNormalize(const Quaternion* src, Quaternion* unit); void PSQUATInverse(const Quaternion* src, Quaternion* inv); void PSQUATDivide(const Quaternion* p, const Quaternion* q, Quaternion* r); -#ifdef DEBUG +#if DEBUG #define QUATAdd C_QUATAdd #define QUATSubtract C_QUATSubtract #define QUATMultiply C_QUATMultiply diff --git a/include/revolution/os.h b/include/revolution/os.h index 626c85d2f9..fd8d94e106 100644 --- a/include/revolution/os.h +++ b/include/revolution/os.h @@ -231,7 +231,7 @@ DECL_WEAK void OSVReport(const char* format, va_list list); DECL_WEAK void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); -#ifdef DEBUG +#if DEBUG #define OS_REPORT(...) OSReport(__VA_ARGS__) #define OS_WARNING(...) OSReport_Warning(__VA_ARGS__) #define OS_REPORT_ERROR(...) OSReport_Error(__VA_ARGS__) @@ -279,7 +279,7 @@ extern OSTime __OSStartTime; extern int __OSInIPL; extern BOOL __OSInReboot; -#ifdef DEBUG +#if DEBUG #define ASSERTLINE(line, cond) \ ((cond) || (OSPanic(__FILE__, line, "Failed assertion " #cond), 0)) diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp index dee52c17d5..0f8f3ff12f 100644 --- a/src/JSystem/JAudio2/JASAiCtrl.cpp +++ b/src/JSystem/JAudio2/JASAiCtrl.cpp @@ -145,7 +145,7 @@ void JASDriver::updateDSP() { JASProbe::start(3, "SFR-UPDATE"); JASDsp::invalChannelAll(); - #ifdef DEBUG + #if DEBUG JASDsp::dspMutex = 1; #endif @@ -160,7 +160,7 @@ void JASDriver::updateDSP() { JUT_ASSERT(254, subFrame <= 10); history[subFrame - r26] = r27; if (subFrame != r26 && f32(history[0]) / r27 < 1.1f) { - #ifdef DEBUG + #if DEBUG static int killCounter; JASReport("kill DSP channel", killCounter); JASDSPChannel::killActiveChannel(); @@ -173,7 +173,7 @@ void JASDriver::updateDSP() { JASChannel::receiveBankDisposeMsg(); JASDSPChannel::updateAll(); - #ifdef DEBUG + #if DEBUG JASDsp::dspMutex = 0; #endif @@ -198,7 +198,7 @@ void JASDriver::readDspBuffer(s16* param_0, u32 param_1) { for (int i = param_1; i < param_1 * 2; i++) { sDspDacBuffer[sDspDacReadBuffer][i] = (s16)r24; } -#ifdef DEBUG +#if DEBUG JASReport("readDspBuffer nbuf:%d sWBuf:%d BCount:%d stat:%d", nbuf, sDspDacWriteBuffer, data_804507A8, sDspStatus); #endif diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp index 0f1efea56a..4d1a2f1d8b 100644 --- a/src/JSystem/JAudio2/JASDSPInterface.cpp +++ b/src/JSystem/JAudio2/JASDSPInterface.cpp @@ -659,6 +659,6 @@ u16 DSP_CreateMap2(u32 param_0) { u32 JASWaveInfo::one = 1; -#ifdef DEBUG +#if DEBUG s32 dspMutex = 1; #endif diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp index f0121ccefe..d244adb0c2 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp @@ -27,9 +27,7 @@ bool JASHeap::alloc(JASHeap* mother, u32 param_1) { JUT_ASSERT(120, mother != NULL); JASMutexLock lock(&mMutex); if (isAllocated()) { -#ifdef DEBUG - OSReport("[JASHeap::alloc] すでにヒープは確保されています。初期化してからにしてください。\n"); -#endif + OS_REPORT("[JASHeap::alloc] すでにヒープは確保されています。初期化してからにしてください。\n"); return 0; } if (!mother->isAllocated()) { @@ -71,9 +69,7 @@ bool JASHeap::alloc(JASHeap* mother, u32 param_1) { } } if (!local_43) { -#ifdef DEBUG - OSReport("[JASHeap::alloc] マザーメモリが足りないので確保できません。\n"); -#endif + OS_REPORT("[JASHeap::alloc] マザーメモリが足りないので確保できません。\n"); return 0; } mother->insertChild(this, local_30, local_34, param_1, false); diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 8af54f234b..08652656b0 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -143,9 +143,7 @@ cleanup: JKRFreeToSysHeap(mem); } if (mMountMode == 0) { -#ifdef DEBUG - OSReport(":::[%s: %d] Cannot alloc memory\n", __FILE__, 415); -#endif + OS_REPORT(":::[%s: %d] Cannot alloc memory\n", __FILE__, 415); if (mDvdFile != NULL) { delete mDvdFile; } diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 6f419b1a52..4c02d4ed8b 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -206,10 +206,8 @@ bool JKRCompArchive::open(s32 entryNum) { { JKRFreeToSysHeap(arcHeader); } - if(mMountMode == 0) { -#ifdef DEBUG - OSReport(":::[%s: %d] Cannot alloc memory in mounting CompArchive\n", __FILE__, 567); -#endif + if (mMountMode == 0) { + OS_REPORT(":::[%s: %d] Cannot alloc memory in mounting CompArchive\n", __FILE__, 567); if(mDvdFile != NULL) { delete mDvdFile; } diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index 03761ac322..de013a2834 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -127,9 +127,7 @@ cleanup: } if (mMountMode == UNKNOWN_MOUNT_MODE) { -#ifdef DEBUG - OSReport(":::Cannot alloc memory [%s][%d]\n", __FILE__, 397); -#endif + OS_REPORT(":::Cannot alloc memory [%s][%d]\n", __FILE__, 397); if (mDvdFile) { delete mDvdFile; } diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index 0f9404edc0..cabbbb3179 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -12,7 +12,7 @@ bool data_804508B0 = 1; -#ifdef DEBUG +#if DEBUG u8 data_804508B1; u8 data_804508B2; u8 data_804508B3; @@ -355,10 +355,8 @@ void JKRHeap::copyMemory(void* dst, void* src, u32 size) { } void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment) { -#ifdef DEBUG - OSReport("Error: Cannot allocate memory %d(0x%x)byte in %d byte alignment from %08x\n", size, + OS_REPORT("Error: Cannot allocate memory %d(0x%x)byte in %d byte alignment from %08x\n", size, size, alignment, heap); -#endif JUTException::panic(__FILE__, 831, "abort\n"); } diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 682e0ff283..4f75164161 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -94,7 +94,7 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio mIsOpen = true; } -#ifdef DEBUG +#if DEBUG if (mMountMode == 0) { OSReport(":::Cannot alloc memory [%s][%d]\n", __FILE__, 460); } diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index c2e159a8d7..a2424c9ca8 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/src/JSystem/JKernel/JKRSolidHeap.cpp @@ -73,7 +73,7 @@ s32 JKRSolidHeap::adjustSize(void) { } void* JKRSolidHeap::do_alloc(u32 size, int alignment) { -#ifdef DEBUG +#if DEBUG // TODO(Julgodis): JUTAssertion::setConfirmMessage /* if (alignment != 0) { int u = abs(alignment); @@ -179,7 +179,7 @@ void JKRSolidHeap::do_freeTail(void) { } void JKRSolidHeap::do_fillFreeArea() { -#ifdef DEBUG +#if DEBUG // fillMemory(mSolidHead, mEnd - mSolidHead, (uint)DAT_8074a8ba); #endif } diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index 2fe3104dcb..a884fcf615 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -185,10 +185,10 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) { next_heap = JKRHeap::getCurrentHeap(); } else if (JKRHeap::getRootHeap()->isSubHeap(next_heap)) { continue; -#ifdef DEBUG + #if PLATFORM_WII || PLATFORM_SHIELD } else if (!JKRHeap::getRootHeap2()->isSubHeap(next_heap)) { continue; -#endif + #endif } else { switch (thread->getCurrentHeapError()) { case 0: @@ -224,10 +224,8 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console const char* print_1 = " -------------------------------------\n"; if (!console) { -#ifdef DEBUG - OSReport(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); - OSReport(print_1); -#endif + OS_REPORT(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); + OS_REPORT(print_1); } else { console->clear(); console->print_f(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); @@ -264,10 +262,8 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console u32 cost_int = (u32)(cost_per_0x18 * 100.0f); u32 cost_float = (u32)(cost_per_0x18 * 1000.0f) % 10; if (!console) { -#ifdef DEBUG - OSReport(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, + OS_REPORT(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, cost_int, cost_float); -#endif } else { console->print_f(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, cost_int, cost_float); diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp index ba8916e9a0..ff7500fdf2 100644 --- a/src/JSystem/JMessage/resource.cpp +++ b/src/JSystem/JMessage/resource.cpp @@ -243,7 +243,7 @@ bool JMessage::TParse::parseBlock_next(const void** ppData_inout, u32* puData_ou } } } else { - #ifdef DEBUG + #if DEBUG JMessage::TResource* pResource = rcResource.Get_groupID(u16GroupID); if (pResource != pResource_) { JGADGET_WARNMSG1(444, "group-ID already exist : ", u16GroupID); diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index c84ee0f76c..bb09bdb5f6 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -678,7 +678,7 @@ void TFunctionValue_list_parameter::data_set(const f32* pf, u32 u) { dat1.set(pfData_); dat2.set(&pfData_[uData_ * 2]); dat3 = dat1; -#ifdef DEBUG +#if DEBUG pfnUpdate_ = NULL; #endif } diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp index 6fde196a91..435c06e2aa 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -36,7 +36,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_prepare() { void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() { adaptor_object_begin_(); const JStage::TActor* pActor = get_pJSG_(); -#ifdef DEBUG +#if DEBUG { // This block is needed to match the stack in debug const JStudio::TObject* pObject = adaptor_getObject(); JUT_ASSERT(72, pObject!=NULL); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h index ea42bc41c9..bd4c0713a8 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h @@ -156,7 +156,7 @@ struct __copy_backward { static T* copy_backward(T* first, T* last, T* result) { -#ifdef DEBUG +#if DEBUG size_t n = static_cast(last - first); result -= n; memmove(result, first, n*sizeof(T)); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h index e03f7ee617..a72e809c18 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h @@ -89,7 +89,7 @@ int __fpclassifyl(long double __value); #define FLT_MAX_EXP 128 #define FLT_MAX_10_EXP 38 -#ifdef DEBUG +#if DEBUG #define FLT_MAX 3.4028235e38f #define FLT_EPSILON 1.1920929e-7f #else diff --git a/src/Z2AudioLib/Z2EnvSeMgr.cpp b/src/Z2AudioLib/Z2EnvSeMgr.cpp index 7bd284d543..0c6884b9a2 100644 --- a/src/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/src/Z2AudioLib/Z2EnvSeMgr.cpp @@ -4,7 +4,7 @@ #include "d/d_save.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG static const char* sSpotName[] = { "F_SP00", "F_SP103", @@ -1039,7 +1039,7 @@ void Z2EnvSeMgr::setHyrulSewerOpen(bool isSewerOpen) { } bool Z2EnvSeMgr::startRiverSe(s8 param_1) { - #ifdef DEBUG + #if DEBUG const char** spotName = sSpotName; #endif @@ -1271,7 +1271,7 @@ void Z2EnvSeMgr::registEtcSePos(Vec* posPtr) { } bool Z2EnvSeMgr::startEtcSe(s8 reverb) { - #ifdef DEBUG + #if DEBUG const char** spotName = sSpotName; #endif diff --git a/src/Z2AudioLib/Z2SeqMgr.cpp b/src/Z2AudioLib/Z2SeqMgr.cpp index 66848bcefd..390d6aa0b1 100644 --- a/src/Z2AudioLib/Z2SeqMgr.cpp +++ b/src/Z2AudioLib/Z2SeqMgr.cpp @@ -106,7 +106,7 @@ Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance(true) { mAllBgmMaster.forceIn(); field_0xa4.forceIn(); - #ifdef DEBUG + #if DEBUG field_0x00_debug = 1.0f; field_0x04_debug = 0; #endif diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 55ee845a30..fe0f981f1c 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -1690,7 +1690,7 @@ daAlinkHIO_c::daAlinkHIO_c() {} daAlinkHIO_wolf_c::~daAlinkHIO_wolf_c() {} -#ifdef DEBUG +#if DEBUG daAlinkHIO_swim_c::~daAlinkHIO_swim_c() {} daAlinkHIO_grab_c::~daAlinkHIO_grab_c() {} @@ -6573,10 +6573,10 @@ void daAlink_c::commonDoubleAnime(J3DAnmTransform* param_0, J3DAnmTransform* par int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB, daAlink_c::daAlink_ANM i_anmA, daAlink_c::daAlink_ANM i_anmB, int param_5, f32 i_morf) { -#ifdef DEBUG +#if DEBUG if (checkWolf()) { // "Player is Wolf, but setting Link animation\n" - OSReport("狼なのにリンクアニメ設定\n"); + OS_REPORT("狼なのにリンクアニメ設定\n"); JUT_ASSERT(8591, FALSE); } #endif @@ -10883,7 +10883,7 @@ int daAlink_c::orderZTalk() { dMeter2Info_onUseButton(0x800); if (midnaTalkTrigger() -#ifdef DEBUG +#if DEBUG && (!mDoCPd_c::getHoldL(PAD_1) || !mDoCPd_c::getHoldR(PAD_1)) #endif ) diff --git a/src/d/actor/d_a_alink_HIO.inc b/src/d/actor/d_a_alink_HIO.inc index 45a476364e..5174833128 100644 --- a/src/d/actor/d_a_alink_HIO.inc +++ b/src/d/actor/d_a_alink_HIO.inc @@ -7,7 +7,7 @@ #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG static void daAlinkHIO_setAnmGenMessage(daAlinkHIO_anm_c* i_anmP, JORMContext* ctx, char* param_3, f32 param_4, int param_5) { diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index 8892cf5fd8..f524aada1d 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -2145,7 +2145,7 @@ int daAlink_c::procCoGetItem() { } daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this); -#ifdef DEBUG +#if DEBUG if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM && fopAcM_GetName(item_partner_p) != PROC_Demo_Item) { @@ -3603,7 +3603,7 @@ int daAlink_c::procNotUseItem() { if (mProcVar3.field_0x300e != 0) { daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this); -#ifdef DEBUG +#if DEBUG if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM && fopAcM_GetName(item_partner_p) != PROC_Demo_Item) { diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 50bdb3455a..12d93d0b62 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_andsw.h" #include "d/d_procname.h" -#ifdef DEBUG +#if DEBUG daAndsw_HIO_c l_HIO; daAndsw_HIO_c::daAndsw_HIO_c() { @@ -42,7 +42,7 @@ int daAndsw_c::create() { return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG l_HIO.entryHIO("ＳＷ監視"); #endif @@ -58,7 +58,7 @@ int daAndsw_c::execute() { if (mTimer == 0) { fopAcM_offSwitch(this,mSwNo); -#ifdef DEBUG +#if DEBUG if (l_HIO.field_0x6 != 0) { OS_REPORT("-- ＳＷ監視状態出力 --\n"); OS_REPORT("sw<%d>ＯＦＦしました\n", mSwNo); @@ -70,19 +70,20 @@ int daAndsw_c::execute() { OS_REPORT("ＳＷ監視：ＳＷＯＦＦしたので処理終わりますSW<%d>\n", mSwNo); } } - } -#ifdef DEBUG - else if (l_HIO.field_0x6 != 0) { - OS_REPORT("sw2<%d>を待っています\n", mSwNo2); - l_HIO.field_0x6 = 0; - } + } else { +#if DEBUG + if (l_HIO.field_0x6 != 0) { + OS_REPORT("sw2<%d>を待っています\n", mSwNo2); + l_HIO.field_0x6 = 0; + } #endif + } return 1; } int daAndsw_c::_delete() { -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index 9a21a5755b..bc67ac8799 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -53,7 +53,7 @@ daB_BH_HIO_c::daB_BH_HIO_c() { down_revive_time = 250; } -#ifdef DEBUG +#if DEBUG void daB_BH_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel(" ボスデグババ手", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("本体サイズ", &model_size, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); @@ -962,17 +962,12 @@ static void damage_check(b_bh_class* i_this) { if (i_this->field_0xa24 != 0) { i_this->mCcSph.OffCoSetBit(); - if (fpcM_Search(s_b_sub, i_this) -#ifdef DEBUG - || mDoCPd_c::getTrigA(PAD_3) -#endif - ) - { + if (fpcM_Search(s_b_sub, i_this) || (DEBUG && mDoCPd_c::getTrigA(PAD_3))) { if (i_this->field_0xa25 != 0) { i_this->mAction = ACTION_B_BOMB_EAT; dComIfGs_onOneZoneSwitch(14, -1); } else { -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigA(PAD_3)) { b_bq_class* var_r25 = (b_bq_class*)fopAcM_SearchByID(a_this->parentActorID); var_r25->field_0x6fd = 1; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index f8737b9570..50ec729841 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -564,7 +564,7 @@ static void b_bq_wait(b_bq_class* i_this) { i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_WAIT, -1); } -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigRight(PAD_1)) { i_this->mAction = ACTION_END; i_this->mMode = 0; diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index b5dad17e5e..0a46a17e15 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -360,7 +360,7 @@ int daB_DR_c::draw() { return 1; } -#ifdef DEBUG +#if DEBUG if (WREG_S(0) != 0 || l_HIO.display_range) { cXyz sp24; cXyz sp18; @@ -1247,7 +1247,7 @@ void daB_DR_c::executeWait() { cXyz sp20; cXyz sp14; -#ifdef DEBUG +#if DEBUG dDbVw_Report(30, 100, "wait tyuu No Attack Timer:%d ", mTimer[2]); #endif @@ -1311,7 +1311,7 @@ void daB_DR_c::executeFlyWait() { fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz sp8; -#ifdef DEBUG +#if DEBUG if (mMoveMode > 1) { if (mTimer[2] != 0) { dDbVw_Report(30, 100, "wait tyuu No Attack Timer:%d ", mTimer[2]); @@ -1383,7 +1383,7 @@ void daB_DR_c::executeTailHit() { cXyz mae; cXyz ato; -#ifdef DEBUG +#if DEBUG if (mTimer[0] != 0) { if (mMoveMode < 13) { dDbVw_Report(30, 100, "Tail Hit chance Timer:%d ", mTimer[0]); @@ -1734,7 +1734,7 @@ void daB_DR_c::executeWeekHit() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz sp50; -#ifdef DEBUG +#if DEBUG if (mTimer[2] != 0) { dDbVw_Report(30, 100, "week HIT chance Timer:%d ", mTimer[2]); } @@ -2133,7 +2133,7 @@ void daB_DR_c::executeBreathAttack() { s16 spA = 0; bool sp8 = false; -#ifdef DEBUG +#if DEBUG if (mTimer[3] != 0) { if (mMoveMode < 100) { dDbVw_Report(30, 100, "Breath tyuu No Attack Timer:%d ", mTimer[3]); @@ -2366,7 +2366,7 @@ void daB_DR_c::executeWindAttack() { bool sp8 = 0; -#ifdef DEBUG +#if DEBUG dDbVw_Report(30, 100, "normal Timer:%d center Timer:%d ", mTimer[1], mTimer[2]); #endif @@ -2900,7 +2900,7 @@ void daB_DR_c::executePillarSearch() { } void daB_DR_c::executePillarWait() { -#ifdef DEBUG +#if DEBUG dDbVw_Report(30, 100, "Pole wait tyuu Timer:%d ", mTimer[0]); if (mTimer[1] != 0) { dDbVw_Report(30, 100, "sukosi zensin :%d ", mTimer[1]); diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 274b17c1c5..c7b21c7e9e 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -171,8 +171,7 @@ static daB_GM_HIO_c l_HIO; static int daB_GM_Draw(b_gm_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - #ifdef DEBUG - # else + #if !DEBUG g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr); #endif @@ -187,7 +186,7 @@ static int daB_GM_Draw(b_gm_class* i_this) { } J3DModel* model = i_this->mpModelMorf->getModel(); - #ifdef DEBUG + #if DEBUG g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr); #endif g_env_light.setLightTevColorType_MAJI(model, &a_this->tevStr); @@ -1618,7 +1617,7 @@ static int daB_GM_Execute(b_gm_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz spD4, spC8; - #ifdef DEBUG + #if DEBUG if (mDoCPd_c::getTrigA(2) && i_this->mDemoMode == 0 && !i_this->mIsDisappear) { i_this->mAction = 0xB; i_this->mMode = 0x14; diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 819bd88b85..0ada4dd212 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -2525,7 +2525,7 @@ static void action(b_gnd_class* i_this) { i_this->field_0xc7d = 0; } -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigR(PAD_2)) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); kankyo->wether = 1; diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 4c104b494d..32220b7988 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -416,7 +416,7 @@ static void core_start(b_ob_class* i_this) { } break; case 1: -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigY(PAD_2)) { i_this->mMode = 2; i_this->mDemoAction = 30; diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 430ddc32a4..92ad841bb3 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -68,7 +68,7 @@ daBd_HIO_c::daBd_HIO_c() { field_0x1E = 0; } -#ifdef DEBUG +#if DEBUG /* daBd_HIO_c::genMessage (JORMContext *) */ void daBd_HIO_c::genMessage(JORMContext* mctx) { mctx->genLabel("小鳥", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 2df6dde570..d69d589785 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -399,7 +399,7 @@ int daBg_c::draw() { break; } -#ifdef DEBUG +#if DEBUG sp50.a = 0xFF; if (g_kankyoHIO.navy.fish_pond_colreg_adjust_ON) { sp50 = g_kankyoHIO.navy.fish_pond_colreg_c0; diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index 2847607a5d..93e8359fdb 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -15,7 +15,7 @@ #include "JSystem/JAudio2/JAUSectionHeap.h" #include "Z2AudioLib/Z2Instances.h" -#ifdef DEBUG +#if DEBUG static BOOL l_debugMode; #endif @@ -616,7 +616,7 @@ int daCanoe_c::execute() { mOldFrontPos = mFrontPos; mOldBackPos = mBackPos; -#ifdef DEBUG +#if DEBUG if (player->checkCanoeRideOwn(this) && daAlink_c::checkDebugMoveInput()) { if (l_debugMode) { l_debugMode = FALSE; diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index c6ca933a7c..2cf5d224a0 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -156,7 +156,7 @@ int daCoach2D_c::create() { return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG l_HOSTIO.entryHIO("馬車アイコン"); #endif } @@ -166,7 +166,7 @@ int daCoach2D_c::create() { int daCoach2D_c::destroy() { dComIfG_resDelete(this, l_arcName); -#ifdef DEBUG +#if DEBUG l_HOSTIO.removeHIO(); #endif @@ -186,7 +186,7 @@ int daCoach2D_c::draw() { } int daCoach2D_c::execute() { -#ifdef DEBUG +#if DEBUG s32 freeSize = mDoExt_getCurrentHeap()->getTotalFreeSize(); #endif diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index f5cab16b26..3b611f5bba 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -18,7 +18,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "m_Do/m_Do_lib.h" #include "d/actor/d_a_movie_player.h" -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" #endif @@ -40,7 +40,7 @@ static UnknownLightData l_lightData = { 0x00000000, }; -#ifndef DEBUG +#if !DEBUG // TODO: what is this? static const u8 lit_3727[0xC] = {}; #endif @@ -113,7 +113,7 @@ void daDemo00_c::setBaseMtx() { if (tevStr.mInitTimer == 1) { field_0x574 = shape_angle; - #ifdef DEBUG + #if DEBUG debug_field_0x570 = current.pos; debug_field_0x57c = shape_angle; #endif @@ -388,7 +388,7 @@ int daDemo00_c::createHeap() { return 0; } - #ifdef DEBUG + #if DEBUG mModel.field_0x5d4->getBaseTRMtx()[0][0] = 1.0f; #endif mModel.field_0x5d4->calc(); @@ -1725,7 +1725,7 @@ int daDemo00_c::draw() { } } - #ifdef DEBUG + #if DEBUG if (field_0x6aa > -1) { dDbVw_Report(0x32, 0x91, "DEMOTOOL ERR : Model ga arunoni hisyakai sindo meirei!!!!"); OSReport_Error("\nDEMOTOOL ERR : Model ga arunoni hisyakai sindo meirei!!!!"); @@ -1754,7 +1754,7 @@ int daDemo00_c::draw() { g_env_light.mDemoAttentionPoint = -1.0f; } - #ifdef DEBUG + #if DEBUG dDbVw_Report(300, 0x19, "DEMO Depth %f", g_env_light.mDemoAttentionPoint); #endif } else { @@ -1769,7 +1769,7 @@ int daDemo00_c::draw() { g_env_light.field_0x1278 = 1.0f; } - #ifdef DEBUG + #if DEBUG dDbVw_Report(10, 0x17C, "\nbloom pat[%d] ratio[%f]", g_env_light.field_0x1278, field_0x6ab); #endif } diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 25807e3dea..4e6b70d020 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -20,7 +20,7 @@ static cXyz l_wolf_offset = cXyz(13.0f, 135.0f, 57.0f); static cXyz l_horse_offset = cXyz(0.0f, 20.0f, 54.0f); -#ifdef DEBUG +#if DEBUG class DitemHIO_c : public mDoHIO_entry_c diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index ea86c9a9ff..b6623e996e 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -23,7 +23,7 @@ public: STATIC_ASSERT(sizeof(daE_DF_HIO_c) == 0xC); -#ifdef DEBUG +#if DEBUG inline void daE_DF_HIO_c::genMessage(JORMContext* i_ctx) { i_ctx->genLabel("デクレシア", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); i_ctx->genSlider("速度", &field_0x8, 0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 382e1dc932..12695a2e6c 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -2581,7 +2581,7 @@ static void action(e_fm_class* i_this) { i_this->mAngleToPlayer = fopAcM_searchPlayerAngleY(actor); -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigStart(PAD_2) && i_this->mAction != ACTION_DOWN) { i_this->mAction = ACTION_DOWN; i_this->mMode = 0; diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index 3b016fceea..1e1ba54ce3 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -47,7 +47,7 @@ daE_MB_HIO_c::daE_MB_HIO_c() { reappear_time = 70; } -#ifdef DEBUG +#if DEBUG void daE_MB_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel(" ボス戦ブーメラン猿", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("基本サイズ", &base_size, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index d1bc0f0533..123fe49ff4 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -68,7 +68,7 @@ daE_NZ_HIO_c::daE_NZ_HIO_c() { mVanishingAlphaSpeed = 30.0f; } -#ifdef DEBUG +#if DEBUG void daE_NZ_HIO_c::genMessage(JORMContext* ctx) { // Ghost Rat ctx->genLabel(" 幽霊ネズミ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index d8876d0974..0a73eadb50 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -89,7 +89,6 @@ int daE_PZ_c::draw() { } if (arg0 == 10) { -#ifdef DEBUG if (WREG_S(0) != 0) { GXColor color; color.r = 0xFF; @@ -98,7 +97,6 @@ int daE_PZ_c::draw() { color.a = 0xFA; dDbVw_drawCircleXlu(home.pos, 100.0f, color, TRUE, 12); } -#endif return 1; } diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 78d3e7d45a..2d3a5b6045 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -82,7 +82,7 @@ daE_WB_HIO_c::daE_WB_HIO_c() { mNoReins = 0; } -#ifdef DEBUG +#if DEBUG void daE_WB_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel(" イノシシ", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("基本サイズ", &base_size, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 107fcb863f..fb53e66cfa 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -163,7 +163,7 @@ daE_WW_HIO_c::daE_WW_HIO_c() { move_range_debug_display = 0; } -#ifdef DEBUG +#if DEBUG void daE_WW_HIO_c::genMessage(JORMContext* mctx) { mctx->genLabel("ホワイトウルフォス", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); mctx->genSlider("モデルサイズ", &model_size, 0.0f, 10.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); @@ -245,7 +245,7 @@ void daE_WW_c::setHeadAngle() { int daE_WW_c::draw() { if (mAction == ACTION_MASTER) { - #ifdef DEBUG + #if DEBUG if (l_HIO.move_range_debug_display != 0) { cXyz curr_pos = current.pos; curr_pos.y += 100.0f; diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index 8915a350eb..6bf2590e6a 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -942,7 +942,7 @@ static void kuki_ha_set(e_yd_class* i_this) { mDoMtx_stack_c::YrotM(rot->y); mDoMtx_stack_c::XrotM(rot->x); mDoMtx_stack_c::ZrotM(i << 13); -#ifdef DEBUG +#if DEBUG if (i_this->actor.current.pos.x == 1.0f && i_this->actor.current.pos.y == 1.0f && i_this->actor.current.pos.z == 1.0f) { diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 7294aacb8f..a583fb29d7 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -36,7 +36,7 @@ daE_YH_HIO_c::daE_YH_HIO_c() { mAttackFreq = 30; } -#ifdef DEBUG +#if DEBUG void daE_YH_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel(" デグババ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); ctx->genSlider("基本サイズ", &mBasicSize, 0.0f, 5.0f, 0, NULL, 0xffff, 0xffff, 0x200, diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index afab19879f..11e9670cdf 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -57,7 +57,7 @@ static u8 data_80807EF8; static daE_YK_HIO_c l_HIO; -#ifdef DEBUG +#if DEBUG void daE_YK_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel("闇キース", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("基本サイズ", &mModelScale, 0.0f, 3.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x512, 24); diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 4ac0bf2da6..c96dc6865e 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -929,9 +929,7 @@ void daE_YM_c::executeDown() { } else { gravity = 0.0f; } -#if DEBUG - OSReport("YM executeDown %d %f %f \n", gnd_cross, current.pos.z, mMode); -#endif + OS_REPORT("YM executeDown %d %f %f \n", gnd_cross, current.pos.z, mMode); field_0x6cf = 0; switch (mMode) { case 0: @@ -3355,10 +3353,8 @@ int daE_YM_c::create() { field_0x6a3 = (current.angle.x & 0xff00) >> 8; if (mSwitchBit != 0xFF && dComIfGs_isSwitch(mSwitchBit, fopAcM_GetRoomNo(this))) { -#ifdef DEBUG // E_YM won't reset because it's already been defeated. - OSReport("E_YM やられ後なので再セットしません\n"); -#endif + OS_REPORT("E_YM やられ後なので再セットしません\n"); return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 997517f4be..5cb4c8fcea 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -224,7 +224,7 @@ int daE_ZH_c::draw() { return 1; } - #ifdef DEBUG + #if DEBUG mBgc.DrawWall(dComIfG_Bgsp()); #endif @@ -1069,7 +1069,7 @@ void daE_ZH_c::executeOpenStart() { break; } - #ifdef DEBUG + #if DEBUG if (ZREG_S(0) == 0) { break; } diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index 8c62cfbeea..b2024a8620 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -949,12 +949,10 @@ cPhs__Step daE_ZM_c::create() { attention_info.distances[fopAc_attn_BATTLE_e] = 0; fopAcM_SetGroup(this, 0); - #ifdef DEBUG if (NREG_S(0) != 0) { fopAcM_SetMin(this, -20000.0f, -10000.0f, -10000.0f); fopAcM_SetMax(this, 20000.0f, 10000.0f, 10000.0f); } - #endif bitSw = 0xFF; bitSw2 = 0xFF; diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 797f4adfcc..ffca6690cd 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -560,6 +560,8 @@ BOOL daHorse_c::checkEnding() { #if DEBUG int l_debugMode; +#else +#define l_debugMode 0 #endif extern int g_horsePosInit; @@ -610,9 +612,7 @@ int daHorse_c::create() { m_offRideFlg = &daHorse_c::offRideFlgSubstance; if (daAlink_getAlinkActorClass()->checkHorseStart() || checkStateFlg0(FLG0_UNK_8000) || -#if DEBUG - g_horsePosInit || -#endif + (DEBUG && g_horsePosInit) || strcmp(dComIfGs_getHorseRestartStageName(), "") == 0 /* dSv_event_flag_c::M_002 - Cutscene - [cutscene: 2] Met with Ilia (brings horse to spring) */ @@ -4301,6 +4301,7 @@ int daHorse_c::execute() { l_debugMode = 1; } } +#endif if (l_debugMode) { f32 f31 = 50.0f; @@ -4318,140 +4319,136 @@ int daHorse_c::execute() { setMatrix(); m_model->calc(); setBodyPart(); - } else { // unsure of the best way to handle this jump -#endif - - animePlay(); - checkDemoAction(); - - (this->*m_proc)(); - - cXyz old_pos(current.pos); - f32 old_speedF = speedF; - speedF *= cM_scos(shape_angle.x); - - if (m_procID == PROC_JUMP_e) { - fopAcM_posMoveF(this, NULL); } else { - fopAcM_posMoveF(this, m_cc_stts.GetCCMoveP()); - if (m_cc_stts.GetCCMoveP()->abs() > 0.0001f) { - s16 old_shape_y = shape_angle.y; - s16 old_angle_y = current.angle.y; + animePlay(); + checkDemoAction(); - for (int i = 0; i < 8; i++) { - if (checkHorseNoMove(1) == 2) { - current.pos -= *m_cc_stts.GetCCMoveP(); - break; + (this->*m_proc)(); + + cXyz old_pos(current.pos); + f32 old_speedF = speedF; + speedF *= cM_scos(shape_angle.x); + + if (m_procID == PROC_JUMP_e) { + fopAcM_posMoveF(this, NULL); + } else { + fopAcM_posMoveF(this, m_cc_stts.GetCCMoveP()); + if (m_cc_stts.GetCCMoveP()->abs() > 0.0001f) { + s16 old_shape_y = shape_angle.y; + s16 old_angle_y = current.angle.y; + + for (int i = 0; i < 8; i++) { + if (checkHorseNoMove(1) == 2) { + current.pos -= *m_cc_stts.GetCCMoveP(); + break; + } + + shape_angle.y += (s16)0x2000; + current.angle.y = shape_angle.y; } - shape_angle.y += (s16)0x2000; - current.angle.y = shape_angle.y; - } - - shape_angle.y = old_shape_y; - current.angle.y = old_angle_y; - } - } - - speedF = old_speedF; - - m_cc_stts.ClrCcMove(); - f32 old_speed_y = speed.y; - - bgCheck(); - m_acch.CrrPos(dComIfG_Bgsp()); - - if (checkStateFlg0(FLG0_UNK_4000)) { - autoGroundHit(); - } else { - current.pos.y = old_pos.y; - speed.y = 0.0f; - } - - if (m_procID == PROC_TOOL_DEMO_e) { - J3DTransformInfo sp70; - m_mtxcalc->getAnm(0)->getTransform(0, &sp70); - - mDoMtx_stack_c::transS(old_pos); - mDoMtx_stack_c::YrotM(shape_angle.y); - - Vec sp54 = {0.0f, 0.0f, 0.0f}; - sp54.x = sp70.mTranslate.x; - f32 f28 = sp70.mTranslate.z; - sp54.z = f28; - - mDoMtx_stack_c::multVec(&sp54, ¤t.pos); - if (field_0x1730 != 0 && -G_CM3D_F_INF != m_acch.GetGroundH()) { - current.pos.y = m_acch.GetGroundH(); - } - } else if (m_procID == PROC_JUMP_e) { - speed.y = old_speed_y; - } - - if (checkStateFlg0(FLG0_UNK_1) && m_acch.ChkGroundHit() && checkStateFlg0(FLG0_UNK_2)) { - if (!checkStateFlg0(FLG0_UNK_1000)) { - dComIfGp_getVibration().StartQuake(VIBMODE_S_DOKUTT, 1, cXyz(0.0f, 1.0f, 0.0f)); - onStateFlg0(FLG0_UNK_1000); - } - } else if (checkStateFlg0(FLG0_UNK_1000)) { - dComIfGp_getVibration().StopQuake(0x1F); - offStateFlg0(FLG0_UNK_1000); - } - - setRoomInfo(0); - setMatrix(); - footBgCheck(); - setTailAngle(); - - m_model->calc(); - setBodyPart(); - - if (m_procID == PROC_TOOL_DEMO_e) { - cXyz sp48; - mDoMtx_multVec(m_model->getAnmMtx(0), &cXyz::BaseX, &sp48); - field_0x170e = cM_atan2s(-sp48.x, -sp48.z); - } else { - field_0x170e = shape_angle.y; - } - - cXyz sp3C; - cXyz sp30; - mDoMtx_multVecZero(m_model->getAnmMtx(0xB), &sp3C); - mDoMtx_multVecZero(m_model->getAnmMtx(0x14), &sp30); - sp30 -= sp3C; - - field_0x1712 = sp30.atan2sX_Z() - field_0x170e; - if (field_0x1712 > 0x2000) { - field_0x1712 = 0x2000; - } else if (field_0x1712 < -0x2000) { - field_0x1712 = -0x2000; - } - - if (checkResetStateFlg0(RFLG0_UNK_1)) { - mDoMtx_stack_c::transS(m_bodyEyePos.x, m_bodyEyePos.y, m_bodyEyePos.z); - mDoMtx_stack_c::YrotM(field_0x170e - field_0x1710); - mDoMtx_stack_c::transM(-field_0x17b8.x, -field_0x17b8.y, -field_0x17b8.z); - - daHorseRein_c* rein_p = m_rein; - cXyz* var_r26; - for (int i = 0; i < 3; i++, rein_p++) { - var_r26 = rein_p->field_0x0[0]; - for (int j = 0; j < rein_p->field_0x8[1]; j++, var_r26++) { - mDoMtx_stack_c::multVec(var_r26, var_r26); + shape_angle.y = old_shape_y; + current.angle.y = old_angle_y; } } - } - field_0x17b8 = m_bodyEyePos; + speedF = old_speedF; - m_sound.framework(m_poly_sound, m_reverb); + m_cc_stts.ClrCcMove(); + f32 old_speed_y = speed.y; - if (field_0x1144 != NULL) { - m_sound.updateAnime(field_0x1144->getFrame(), field_0x1144->getRate()); + bgCheck(); + m_acch.CrrPos(dComIfG_Bgsp()); + + if (checkStateFlg0(FLG0_UNK_4000)) { + autoGroundHit(); + } else { + current.pos.y = old_pos.y; + speed.y = 0.0f; + } + + if (m_procID == PROC_TOOL_DEMO_e) { + J3DTransformInfo sp70; + m_mtxcalc->getAnm(0)->getTransform(0, &sp70); + + mDoMtx_stack_c::transS(old_pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + + Vec sp54 = {0.0f, 0.0f, 0.0f}; + sp54.x = sp70.mTranslate.x; + f32 f28 = sp70.mTranslate.z; + sp54.z = f28; + + mDoMtx_stack_c::multVec(&sp54, ¤t.pos); + if (field_0x1730 != 0 && -G_CM3D_F_INF != m_acch.GetGroundH()) { + current.pos.y = m_acch.GetGroundH(); + } + } else if (m_procID == PROC_JUMP_e) { + speed.y = old_speed_y; + } + + if (checkStateFlg0(FLG0_UNK_1) && m_acch.ChkGroundHit() && checkStateFlg0(FLG0_UNK_2)) { + if (!checkStateFlg0(FLG0_UNK_1000)) { + dComIfGp_getVibration().StartQuake(VIBMODE_S_DOKUTT, 1, cXyz(0.0f, 1.0f, 0.0f)); + onStateFlg0(FLG0_UNK_1000); + } + } else if (checkStateFlg0(FLG0_UNK_1000)) { + dComIfGp_getVibration().StopQuake(0x1F); + offStateFlg0(FLG0_UNK_1000); + } + + setRoomInfo(0); + setMatrix(); + footBgCheck(); + setTailAngle(); + + m_model->calc(); + setBodyPart(); + + if (m_procID == PROC_TOOL_DEMO_e) { + cXyz sp48; + mDoMtx_multVec(m_model->getAnmMtx(0), &cXyz::BaseX, &sp48); + field_0x170e = cM_atan2s(-sp48.x, -sp48.z); + } else { + field_0x170e = shape_angle.y; + } + + cXyz sp3C; + cXyz sp30; + mDoMtx_multVecZero(m_model->getAnmMtx(0xB), &sp3C); + mDoMtx_multVecZero(m_model->getAnmMtx(0x14), &sp30); + sp30 -= sp3C; + + field_0x1712 = sp30.atan2sX_Z() - field_0x170e; + if (field_0x1712 > 0x2000) { + field_0x1712 = 0x2000; + } else if (field_0x1712 < -0x2000) { + field_0x1712 = -0x2000; + } + + if (checkResetStateFlg0(RFLG0_UNK_1)) { + mDoMtx_stack_c::transS(m_bodyEyePos.x, m_bodyEyePos.y, m_bodyEyePos.z); + mDoMtx_stack_c::YrotM(field_0x170e - field_0x1710); + mDoMtx_stack_c::transM(-field_0x17b8.x, -field_0x17b8.y, -field_0x17b8.z); + + daHorseRein_c* rein_p = m_rein; + cXyz* var_r26; + for (int i = 0; i < 3; i++, rein_p++) { + var_r26 = rein_p->field_0x0[0]; + for (int j = 0; j < rein_p->field_0x8[1]; j++, var_r26++) { + mDoMtx_stack_c::multVec(var_r26, var_r26); + } + } + } + + field_0x17b8 = m_bodyEyePos; + + m_sound.framework(m_poly_sound, m_reverb); + + if (field_0x1144 != NULL) { + m_sound.updateAnime(field_0x1144->getFrame(), field_0x1144->getRate()); + } } -#if DEBUG - } -#endif setEffect(); setCollision(); diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index 8ac983ac5a..a4d63f187f 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -60,7 +60,7 @@ static int daKytag14_Execute(kytag14_class* i_this) { if (event1_set == true && event2_unset == true && switch1_set == true && switch2_unset == true) { - #ifdef DEBUG + #if DEBUG if (!g_kankyoHIO.navy.display_save_location) { dDbVw_Report(20, 16, "TAG SavMem STAGE[%s] Room[%d] Lp[%d]", dComIfGp_getStartStageName(), i_this->mSaveRoomNo, i_this->mSavePoint); if (i_this->mSaveRoomNo == -1) { diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 97cc372903..e3fa84cd84 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -13,7 +13,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_lib.h" -#ifdef DEBUG +#if DEBUG void daNpcT_cmnListenPropertyEvent(char* param_0, int* param_1, daNpcT_HIOParam* param_2) { sprintf(¶m_0[*param_1], "%.3ff,\t// 注目オフセット\n", param_2->attention_offset); *param_1 = strlen(param_0); diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index b7b0e12983..778f0c7efe 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -754,7 +754,7 @@ int daBaseNpc_moveBgActor_c::MoveBGCreate(char const* i_arcName, int i_dzbId, Mo return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG if (mpBgw != NULL && mpBgw->ChkUsed()) { BOOL isConnect = mDoCPd_c::isConnect(PAD_3); if (isConnect) { diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 0c2ee96844..6fea49bde1 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -447,7 +447,7 @@ void daNpcF_Lookat_c::initCalc(fopAc_ac_c* i_actor, Mtx i_baseTransformMtx, cXyz param_3[i].setall(0); param_3[i].x = -cM_atan2s(local_90.y, local_90.absXZ()); - #ifdef DEBUG + #if DEBUG if (i_debug) { f32 var_f31 = fabsf(cM_ssin(param_3[i].x)); OS_REPORT(">>>>>>>%d: sin(%d):%f\n", i, abs(param_3[i].x), var_f31); @@ -1905,9 +1905,9 @@ BOOL daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_actor_p) { if (dComIfGp_getAttention()->LockonTarget(i) == i_actor_p && dComIfGp_getAttention()->getActionBtnB() && (dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_TALK_e -#if DEBUG + #if !PLATFORM_GCN || dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_UNK_4 -#endif + #endif )) { ret = TRUE; diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 14b3341b8f..935dc6db6e 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -423,7 +423,7 @@ int daNpc_Aru_c::Draw() { } draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_Aru_c::test), #else FALSE, @@ -2018,11 +2018,8 @@ int daNpc_Aru_c::talk(void* param_1) { return 0; } -#ifdef DEBUG int daNpc_Aru_c::test(void* param_1) { - } -#endif static int daNpc_Aru_Create(void* a_this) { return static_cast(a_this)->create(); diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index c107a11d65..59e55c1cf9 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -1824,7 +1824,6 @@ int daNpc_Bans_c::shop(void* param_1) { return 0; } -#if DEBUG int daNpc_Bans_c::test(void* param_1) { int rv = 0; @@ -1848,7 +1847,6 @@ int daNpc_Bans_c::test(void* param_1) { return rv; } -#endif static int daNpc_Bans_Create(void* i_this) { return static_cast(i_this)->create(); diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 2e84caf79c..191ac9a8f3 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -279,7 +279,7 @@ enum Event { /* 0xC */ EVENT_CONVERSATION_ABOUT_ZORA, }; -#ifndef DEBUG +#if !DEBUG #endif @@ -538,7 +538,7 @@ daNpc_Besu_c::~daNpc_Besu_c() { mpCupModelMorf->stopZelAnime(); } -// #ifdef DEBUG +// #if DEBUG // if (field_0xe40 != NULL) { // field_0xe40->removeHIO(); // } @@ -631,7 +631,7 @@ int daNpc_Besu_c::create() { fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f); mSound.init(¤t.pos, &eyePos, 3, 1); -// #ifdef DEBUG +// #if DEBUG // field_0xe40 = &l_HIO; // // "Beth": // field_0xe40->entryHIO("ベス"); @@ -1248,14 +1248,14 @@ void daNpc_Besu_c::action() { } if (actor_p != NULL && mType != 5 -#ifndef DEBUG +#if !DEBUG && !chkNurse() #endif ) { mStagger.setParam(this, actor_p, mCurAngle.y); setDamage(0, 0xC, 0x12); // FIXME: Fakematch -#ifdef DEBUG +#if DEBUG mStagger.setPower(0.0f); #else for (int i = 0; i < 2; i++) { @@ -1268,7 +1268,7 @@ void daNpc_Besu_c::action() { if (mStagger.checkRebirth()) { // FIXME: Fakematch -#ifdef DEBUG +#if DEBUG mStagger.initialize(); #else for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 5271a16fc1..0fd2cc3734 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -2700,7 +2700,7 @@ cPhs__Step daNpcChat_c::Create() { mSound.init(¤t.pos, &eyePos, 3, 1); mSound.setMdlType(mType, false, mTwilight & 0xFF); - #ifdef DEBUG + #if DEBUG // mHIO = l_HIO; mHIO->entryHIO("多人数会話NPC"); #endif @@ -3065,7 +3065,7 @@ void daNpcChat_c::setParam() { } } - #ifdef DEBUG + #if DEBUG scale.set(daNpcChat_Param_c::m.common.scale, daNpcChat_Param_c::m.common.scale, daNpcChat_Param_c::m.common.scale); mAcchCir.SetWallR(daNpcChat_Param_c::m.common.width); mAcchCir.SetWallH(daNpcChat_Param_c::m.common.knee_length); diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index ad1c90cf8b..cacfe23527 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -284,7 +284,7 @@ int daNpcChin_c::Create() { mpHIO = &l_HIO; // "W Hook Shot Shop" mpHIO->entryHIO("Wフックショット屋"); -#endif + #endif mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length); diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index 01d043abc6..00c3eb5fdf 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -11,6 +11,12 @@ #include "d/actor/d_a_npc_henna.h" #include "Z2AudioLib/Z2Instances.h" +#if DEBUG +#define NPC_DF_HEAP_SIZE 0x4B000 +#else +#define NPC_DF_HEAP_SIZE 0x3B90 +#endif + static int daNpc_Df_Draw(npc_df_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor; df_s* df_p = i_this->mDfs; @@ -369,13 +375,7 @@ static cPhs__Step daNpc_Df_Create(fopAc_ac_c* i_this) { OS_REPORT("NPC_DF//////////////NPC_DF SET 1 !!\n"); - if ( - #if DEBUG - !fopAcM_entrySolidHeap(i_this, useHeapInit, 0x4B000) - #else - !fopAcM_entrySolidHeap(i_this, useHeapInit, 0x3B90) - #endif - ) { + if (!fopAcM_entrySolidHeap(i_this, useHeapInit, NPC_DF_HEAP_SIZE)) { OS_REPORT("//////////////NPC_DF SET NON !!\n"); return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 063d741c84..0bf2359a43 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -274,11 +274,14 @@ int daNpc_Doc_c::Draw() { mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]); } - #if DEBUG - return draw(chkAction(&daNpc_Doc_c::test), FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE); - #else - return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE); - #endif + return draw( +#if DEBUG + chkAction(&daNpc_Doc_c::test), +#else + FALSE, +#endif + FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE + ); } int daNpc_Doc_c::createHeapCallBack(fopAc_ac_c* i_this) { @@ -827,6 +830,10 @@ int daNpc_Doc_c::talk(void* param_0) { return 0; } +int daNpc_Doc_c::test(void* i_this) { + // DEBUG NONMATCHING +} + static int daNpc_Doc_Create(void* i_this) { return ((daNpc_Doc_c*)i_this)->create(); } diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index aeb2a1c8c8..66d5c726a5 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -834,7 +834,7 @@ void daNpcDoorBoy_c::setAttnPos() { sp28.y = current.pos.y; field_0xc98.SetC(sp28); - #ifdef DEBUG + #if DEBUG field_0xc98.SetH(daNpcDoorBoy_Param_c::m.common.height); field_0xc98.SetR(daNpcDoorBoy_Param_c::m.common.width); #endif diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index 93f40b34e0..be4f8be689 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -1239,7 +1239,6 @@ int daNpc_Fairy_c::talk(int param_1) { return 1; } -#if DEBUG int daNpc_Fairy_c::test(int param_1) { int rv = 0; @@ -1263,7 +1262,6 @@ int daNpc_Fairy_c::test(int param_1) { return rv; } -#endif void daNpc_Fairy_c::AppearDemoCall() { if (mType == TYPE_50F) { diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp index 3c3805dc17..0f58c48228 100644 --- a/src/d/actor/d_a_npc_fguard.cpp +++ b/src/d/actor/d_a_npc_fguard.cpp @@ -147,7 +147,7 @@ void daNpcFgd_c::checkGroundHeight() { } void daNpcFgd_c::setCollision() { - #ifdef DEBUG + #if DEBUG mCyl.SetR(Cd2_HIO_cylR(m_type)); mCyl.SetH(Cd2_HIO_cylH(m_type)); #endif diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index 4b43840afe..621dc26fe3 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -320,7 +320,7 @@ int daNpc_grMC_c::Execute() { int daNpc_grMC_c::Draw() { return draw( - #ifdef DEBUG + #if DEBUG chkAction(&daNpc_grMC_c::test), #else FALSE, @@ -737,7 +737,6 @@ int daNpc_grMC_c::shop(void* param_1) { return 0; } -#ifdef DEBUG int daNpc_grMC_c::test(void* param_1) { int rv = 0; @@ -749,8 +748,8 @@ int daNpc_grMC_c::test(void* param_1) { mMode = 2; // fallthrough case 2: - mFaceMotionSeqMngr.setNo(mHIO->param.common.face_expression, -1.0f, FALSE, 0); - mMotionSeqMngr.setNo(mHIO->param.common.motion, -1.0f, FALSE, 0); + mFaceMotionSeqMngr.setNo(mHIO->m.common.face_expression, -1.0f, FALSE, 0); + mMotionSeqMngr.setNo(mHIO->m.common.motion, -1.0f, FALSE, 0); mJntAnm.lookNone(0); attention_info.flags = 0; break; @@ -761,7 +760,6 @@ int daNpc_grMC_c::test(void* param_1) { return rv; } -#endif static int daNpc_grMC_Create(void* a_this) { return static_cast(a_this)->create(); diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 1e203b485f..c2619aa657 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -215,7 +215,7 @@ daNpc_grR_c::~daNpc_grR_c() { mAnm_p->stopZelAnime(); } - #ifdef DEBUG + #if DEBUG if (mHIO != NULL) { mHIO->removeHIO(); } diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index fbc4aea70a..f8beca273e 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -335,11 +335,7 @@ int daNpc_grS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { void daNpc_grS_c::setParam() { actionFunc oldAction = mpNextActionFn; -#if DEBUG - u32 flags = 0x42; -#else - u32 flags = 0xa; -#endif + u32 flags = fopAc_AttnFlag_TALK_e | fopAc_AttnFlag_SPEAK_e; selectAction(); diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index 1a282ca486..813ca5e215 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -528,7 +528,7 @@ static int daNpcGuard_Execute(void* i_this) { } void daNpcGuard_c::setCollision() { -#ifdef DEBUG +#if DEBUG mCyl.SetR(Cd2_HIO_cylR(m_type)); mCyl.SetH(Cd2_HIO_cylH(m_type)); #endif diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index dd342f124e..dd9cd849b5 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -396,11 +396,14 @@ int daNpc_Hoz_c::Draw() { modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]); } - #if DEBUG - return draw(chkAction(&daNpc_Hoz_c::test), FALSE, daNpc_Hoz_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE); - #else - return draw(FALSE, FALSE, daNpc_Hoz_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE); - #endif + return draw( +#if DEBUG + chkAction(&daNpc_Hoz_c::test), +#else + FALSE, +#endif + FALSE, daNpc_Hoz_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE + ); } int daNpc_Hoz_c::createHeapCallBack(fopAc_ac_c* actor) { @@ -824,6 +827,10 @@ BOOL daNpc_Hoz_c::drawDbgInfo() { return false; } +int daNpc_Hoz_c::test(void* i_this) { + // DEBUG NONMATCHING +} + int daNpc_Hoz_c::selectAction() { field_0xfac = NULL; diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 0757b6cdb9..7aefa40ac8 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -890,7 +890,7 @@ void daNpcKasiHana_c::setAttnPos() { mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; mCyl.SetC(sp28); - #ifdef DEBUG + #if DEBUG mCyl.SetH(mHIO->m.common.height); mCyl.SetR(mHIO->m.common.width); #endif diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 47e87fa936..60c4d24a07 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -417,7 +417,7 @@ void daNpcKasiKyu_c::setAttnPos() { mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; mCyl.SetC(sp28); - #ifdef DEBUG + #if DEBUG mCyl.SetH(daNpcKasiKyu_Param_c::m.common.height); mCyl.SetR(daNpcKasiKyu_Param_c::m.common.width); #endif diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index 365dcc81cb..d217e50df9 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -417,7 +417,7 @@ void daNpcKasiMich_c::setAttnPos() { mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; mCyl.SetC(sp28); - #ifdef DEBUG + #if DEBUG mCyl.SetH(daNpcKasiMich_Param_c::m.common.height); mCyl.SetR(daNpcKasiMich_Param_c::m.common.width); #endif diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index fd077d36ec..15a9b4e71e 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -4980,7 +4980,7 @@ int daNpc_Kn_c::setSlipPrtcl() { mDoMtx_stack_c::multVecZero(&mParticleMngr[0].mPos); mParticleMngr[0].mPos.y -= 20.0f; mParticleMngr[0].mAngle = current.angle; - #ifdef DEBUG + #if DEBUG mParticleMngr[0].mAngle.y -= (s16) 0x8000; #else mParticleMngr[0].mAngle.y -= 0x8000; @@ -4991,7 +4991,7 @@ int daNpc_Kn_c::setSlipPrtcl() { mDoMtx_stack_c::multVecZero(&mParticleMngr[1].mPos); mParticleMngr[1].mPos.y -= 20.0f; mParticleMngr[1].mAngle = current.angle; - #ifdef DEBUG + #if DEBUG mParticleMngr[1].mAngle.y -= (s16) 0x8000; #else mParticleMngr[1].mAngle.y -= 0x8000; diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index b25da3e05c..5a63a56ad8 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -1090,7 +1090,7 @@ void daNpc_Kolin_c::changeBck(int* param_1, int* param_2) { int daNpc_Kolin_c::selectAction() { mNextAction = NULL; -#ifdef DEBUG +#if DEBUG if (daNpc_Kolin_Param_c::m.common.debug_mode_ON) { mNextAction = &daNpc_Kolin_c::test; return 1; diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index 488a1bad91..72a428872a 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -590,7 +590,7 @@ int daNpc_Kolinb_c::drawDbgInfo() { int daNpc_Kolinb_c::selectAction() { mNextAction = NULL; -#ifdef DEBUG +#if DEBUG if (daNpc_Kolinb_Param_c::m.common.debug_mode_ON) { mNextAction = &daNpc_Kolinb_c::test; return 1; diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 7f5f79a424..1a4cf2b58c 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -608,7 +608,7 @@ void daNpc_Len_c::action() { if (mStagger.checkRebirth()) { // FIXME: Fakematch - same issue in npc_besu -#ifdef DEBUG +#if DEBUG mStagger.initialize(); #else for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index ddd7e999e8..13f879df14 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -1847,7 +1847,7 @@ void daNpcMoiR_c::setParam() { } } - #ifdef DEBUG + #if DEBUG scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale); mAcchCir.SetWallR(mpHIO->m.common.width); mAcchCir.SetWallH(mpHIO->m.common.knee_length); diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 385bbdd023..4c78c54d94 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -629,7 +629,7 @@ int daNpc_Pachi_Besu_c::Draw() { } return draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_Pachi_Besu_c::test), #else FALSE, @@ -1088,11 +1088,9 @@ BOOL daNpc_Pachi_Besu_c::talk(void* param_1) { return FALSE; } -#ifdef DEBUG BOOL daNpc_Pachi_Besu_c::test(void* param_1) { // DEBUG NONMATCHING } -#endif BOOL daNpc_Pachi_Besu_c::_turn_to_link(s16 param_1) { cXyz pos(*fopAcM_GetPosition_p(daPy_getPlayerActorClass())); diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index f12acc8ed2..f392fc6717 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -667,7 +667,7 @@ int daNpc_Pachi_Maro_c::Draw() { } return draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_Pachi_Maro_c::test), #else FALSE, diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 3e5d7c2a16..8b7c1cc658 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -917,7 +917,7 @@ int daNpc_Pachi_Taro_c::Draw() { } return draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_Pachi_Taro_c::test), #else FALSE, diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index f6b1269912..014c8d4466 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -311,10 +311,10 @@ int daNpc_Raca_c::Draw() { } draw( -#ifdef DEBUG +#if DEBUG chkAction(mAction), #else - 0, + FALSE, #endif FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE ); diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 49eac2f188..735152b035 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -312,7 +312,7 @@ int daNpc_Saru_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f); mSound.init(¤t.pos, &eyePos, 3, 1); - #ifdef DEBUG + #if DEBUG field_0xe90->entryHIO("サル"); // Monkey #endif reset(); @@ -552,7 +552,7 @@ void daNpc_Saru_c::setParam() { } void daNpc_Saru_c::setAfterTalkMotion() { - #ifdef DEBUG + #if DEBUG mFaceMotionSeqMngr.getNo(); #endif mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, 0, 0); diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index b6f10081f2..6c32627cf8 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -61,7 +61,7 @@ daNpc_seiC_c::~daNpc_seiC_c() { mpMorf[0]->stopZelAnime(); } - #ifdef DEBUG + #if DEBUG if (field_0xe40 != NULL) { field_0xe40->removeHIO(); } @@ -137,7 +137,7 @@ int daNpc_seiC_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); mSound.init(¤t.pos, &eyePos, 3, 1); -#ifdef DEBUG +#if DEBUG //field_0xe40->field_0x8 = &l_HIO; field_0xe40->entryHIO("光の精霊ｃ"); // Spirit of Light c #endif diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index 15cb2ff20e..431cac1c9a 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -61,7 +61,7 @@ daNpc_seiD_c::~daNpc_seiD_c() { mpMorf[0]->stopZelAnime(); } - #ifdef DEBUG + #if DEBUG if (field_0xe40 != NULL) { field_0xe40->removeHIO(); } @@ -137,7 +137,7 @@ int daNpc_seiD_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); mSound.init(¤t.pos, &eyePos, 3, 1); -#ifdef DEBUG +#if DEBUG //field_0xe40->field_0x8 = &l_HIO; field_0xe40->entryHIO("光の精霊ｄ"); // Spirit of Light d #endif diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 3ac9028e85..6d4f42c386 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -245,7 +245,7 @@ daNpc_Taro_c::~daNpc_Taro_c() { mpMorf[0]->stopZelAnime(); } - #ifdef DEBUG + #if DEBUG if (field_0xe40 != NULL) { field_0xe40->removeHIO(); } @@ -300,7 +300,7 @@ int daNpc_Taro_c::create() { mSound.init(¤t.pos, &eyePos, 3, 1); field_0x9c0.init(&mAcch, 0.0f, 0.0f); -#ifdef DEBUG +#if DEBUG // I'm unsure exactly how we're supposed to set + use the param ptr in the debug build... // field_0xe40 = &l_HIO; // field_0xe40->entryHIO("タロ"); @@ -894,7 +894,7 @@ void daNpc_Taro_c::action() { hitActor, mCurAngle.y); setDamage(0, 17, 33); - #ifdef DEBUG + #if DEBUG mStagger.setPower(0.0f); #else for (int i = 0; i < 2; i++) { @@ -906,7 +906,7 @@ void daNpc_Taro_c::action() { mJntAnm.lookNone(1); } if (mStagger.checkRebirth()) { - #ifdef DEBUG + #if DEBUG mStagger.initialize(); #else for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 1821b6a827..cdbfadc75b 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -1099,7 +1099,7 @@ static cPhs__Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) { l_HIO.field_0x4 = -1; } - #ifdef DEBUG + #if DEBUG fopAcM_OnStatus(a_this, 0); #endif diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index 9ce3e37e5a..ce20c8387b 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -2950,7 +2950,7 @@ void daNpcTks_c::setAttnPos() { if (!fopAcM_checkCarryNow(this)) { if (!field_0x138a) { mCyl.SetC(current.pos); - #ifdef DEBUG + #if DEBUG mCyl.SetH(daNpcTks_Param_c::m.common.height); mCyl.SetR(daNpcTks_Param_c::m.common.width); #endif diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 3599d0656e..e8ea58b0be 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -418,9 +418,10 @@ int daNpc_Toby_c::Draw() { #if DEBUG chkAction(&daNpc_Toby_c::test), #else - 0, + FALSE, #endif - 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0); + FALSE, mRealShadowSize, NULL, 100.0f, 0, 0, 0 + ); } int daNpc_Toby_c::createHeapCallBack(fopAc_ac_c* i_this) { @@ -2182,11 +2183,9 @@ int daNpc_Toby_c::talk(void*) { return 0; } -#if DEBUG int daNpc_Toby_c::test(void* param_0) { // TODO } -#endif static int daNpc_Toby_Create(void* i_this) { return static_cast(i_this)->create(); diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index 4c59f1667f..cba5eaa209 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -116,7 +116,7 @@ static void npc_worm_normal(npc_worm_class* i_this) { a_this->eventInfo.onCondition(dEvtCnd_40_e); } - #ifndef DEBUG + #if !DEBUG if (i_this->field_0x5e8[1] == 0) { i_this->field_0x5a6 = 2; i_this->field_0x5a8 = 0; diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 236f0f51e6..fe9655e2c3 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -930,7 +930,7 @@ void daNpcWrestler_c::setAttnPos() { if (chkAction(&daNpcWrestler_c::wait) || chkAction(&daNpcWrestler_c::talk)) { field_0xc90.SetC(sp68); -#ifdef DEBUG +#if DEBUG field_0xc90.SetH(field_0xbdc->field_0x0); field_0xc90.SetR(field_0xbdc->mWallR); #endif @@ -1909,7 +1909,7 @@ bool daNpcWrestler_c::talk(void* param_1) { setAction(&daNpcWrestler_c::gotoArena); } else { int choiceNo = mFlow.getChoiceNo(); -#ifdef DEBUG +#if DEBUG // "Choice %s\n", (choiceNo == 0) ? "Yes" : "No" OS_REPORT("二択分岐 %s\n", (choiceNo == 0) ? "はい" : "いいえ"); #endif @@ -3765,7 +3765,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { fopAcM_effSmokeSet1(&field_0xde8, &field_0xdec, &sp3c, NULL, 0.8f, &tevStr, 1); } -#ifdef DEBUG +#if DEBUG mDemoCam.field_0x18.set(0.0f, 0.0f, -100.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -3791,7 +3791,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { break; case 5: -#ifdef DEBUG +#if DEBUG mDemoCam.field_0x18.set(0.0f, 0.0f, -100.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -3852,7 +3852,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { dComIfGp_getVibration().StartShock(3, 15, cXyz(0.0f, 1.0f, 0.0f)); } -#ifdef DEBUG +#if DEBUG mDoMtx_stack_c::transS(fopAcM_GetPosition(daPy_getPlayerActorClass())); mDoMtx_stack_c::YrotM(fopAcM_GetShapeAngle_p(daPy_getPlayerActorClass())->y); mDoMtx_stack_c::transM(field_0xbd8->field_0xd0); @@ -3878,7 +3878,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { break; case 9: -#ifdef DEBUG +#if DEBUG mDoMtx_stack_c::transS(fopAcM_GetPosition(daPy_getPlayerActorClass())); mDoMtx_stack_c::YrotM(fopAcM_GetShapeAngle_p(daPy_getPlayerActorClass())->y); mDoMtx_stack_c::transM(field_0xbd8->field_0xdc); @@ -4700,7 +4700,7 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry(int i_cutIndex) { case '0009': if (setTalkAngle() && talkProc(NULL, TRUE, NULL)) { int choice_no = mFlow.getChoiceNo(); -#ifdef DEBUG +#if DEBUG // "Two-way split %s\n", (mFlow.getChoiceNo() == 0) ? "Yes" : "No" OS_REPORT("二択分岐 %s\n", (choice_no == 0) ? "はい" : "いいえ"); #endif @@ -4829,7 +4829,7 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry3_4(int i_cutIndex) { case '0001': if (setTalkAngle() && talkProc(NULL, TRUE, NULL)) { s16 choice_no = mFlow.getChoiceNo(); -#ifdef DEBUG +#if DEBUG char* choice; if (choice_no == 0) { choice = "はい"; diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 8b620aaa6a..390c94e71e 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -776,7 +776,7 @@ int daNpc_ykM_c::Draw() { } rv = draw( - #ifdef DEBUG + #if DEBUG chkAction(&daNpc_ykM_c::test), #else FALSE, @@ -3470,9 +3470,7 @@ BOOL daNpc_ykM_c::race(void* param_1) { angleY = cLib_targetAngleY(&field_0x14fc, &daPy_getPlayerActorClass()->current.pos); if (field_0x1560 < 0 || -#if DEBUG - field_0x1558.field_0x0 >= 0 && -#endif + (!DEBUG || field_0x1558.field_0x0 >= 0) && (field_0x14fc.abs2(daPy_getPlayerActorClass()->current.pos) < 640000.0f && (angleY < -0x4000 || angleY > 0x4000))) { field_0x1560 = -1; mGndChk.SetPos(&daPy_getPlayerActorClass()->current.pos); @@ -3695,7 +3693,6 @@ BOOL daNpc_ykM_c::talk(void* param_1) { return FALSE; } -#ifdef DEBUG BOOL daNpc_ykM_c::test(void* param_1) { int rv = FALSE; switch (mMode) { @@ -3718,7 +3715,6 @@ BOOL daNpc_ykM_c::test(void* param_1) { return rv; } -#endif static int daNpc_ykM_Create(void* i_this) { return ((daNpc_ykM_c*)i_this)->create(); diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 5b7bcb9274..db9f8bdb69 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -452,11 +452,14 @@ int daNpc_ykW_c::Draw() { modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]); } + result = draw( #if DEBUG - result = draw(chkAction(NULL), 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0); + chkAction(NULL), #else - result = draw(FALSE, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0); + FALSE, #endif + 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0 + ); if (field_0x1069 != 0) { fopAc_ac_c* actor = mActorMngrs[3].getActorP(); @@ -2982,7 +2985,6 @@ int daNpc_ykW_c::talk(void* param_0) { return 0; } -#if DEBUG int daNpc_ykW_c::test(void* param_0) { int retval = 0; @@ -3008,7 +3010,6 @@ int daNpc_ykW_c::test(void* param_0) { return retval; } -#endif static int daNpc_ykW_Create(void* i_this) { diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index cd1834497d..03285707f5 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -254,11 +254,14 @@ int daNpc_zanB_c::Draw() { mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]); } - #if DEBUG - return draw(chkAction(&daNpc_zanB_c::test), FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE); - #else - return draw(FALSE, FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE); - #endif + return draw( +#if DEBUG + chkAction(&daNpc_zanB_c::test), +#else + FALSE, +#endif + FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE + ); } int daNpc_zanB_c::createHeapCallBack(fopAc_ac_c* i_this) { diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index 90e2d58dd7..a80d0770bb 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -251,7 +251,7 @@ int daNpc_ZelRo_c::Draw() { } return draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_ZelRo_c::test), #else FALSE, @@ -626,12 +626,10 @@ int daNpc_ZelRo_c::talk(void* param_1) { return 0; } -#ifdef DEBUG int daNpc_ZelRo_c::test(void* param_1) { int rt = 0; return rt; } -#endif static int daNpc_ZelRo_Create(void* a_this) { return static_cast(a_this)->create(); diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 79070ef87d..b0f4cab482 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -313,11 +313,14 @@ int daNpc_Zelda_c::Draw() { modelData->getMaterialNodePointer(getEyeballRMaterialNo())->setMaterialAnm(mpMatAnm[1]); } + return draw( #if DEBUG - return draw(chkAction(NULL), TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE); + chkAction(NULL), #else - return draw(NULL, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE); + FALSE, #endif + TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE + ); } int daNpc_Zelda_c::createHeapCallBack(fopAc_ac_c* i_this) { diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index 60ae5611d0..b1fffc09ee 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -163,7 +163,7 @@ int daTurara_c::create() { fopAcM_setCullSizeBox2(this, mpModel[field_0x984]->getModelData()); setBaseMtx(); field_0x994 = 1; - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("つらら"); #endif } diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index 8d81ca3b03..9eed1d4c4b 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -31,7 +31,7 @@ daAmiShutter_HIO_c::daAmiShutter_HIO_c() { mWaitTime = 0; } -#ifdef DEBUG +#if DEBUG void daAmiShutter_HIO_c::genMessage(JORMContext* i_ctx) { i_ctx->genSlider("open速度", &mMaxOpenSpeed, 0.1f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24); @@ -102,7 +102,7 @@ cPhs__Step daAmiShutter_c::create() { init_modeWait(); } setBaseMtx(); - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("アミシャッター"); #endif } @@ -263,7 +263,7 @@ int daAmiShutter_c::Draw() { int daAmiShutter_c::Delete() { dComIfG_resDelete(&mPhaseReq, "S_Zami"); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 5ef55edd9d..910f90ac72 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -51,7 +51,7 @@ static bool l_HIOInit; static daObj_BattaHIO_c l_HIO; -#ifdef DEBUG +#if DEBUG void daObj_BattaHIO_c::genMessage(JORMContext* ctx) { // Golden bugs diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index aa68a2a6a5..af4d0ac41c 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -38,7 +38,7 @@ s16 const daObjBm_c::M_dir_base[4] = { 0xC000, }; -#ifdef DEBUG +#if DEBUG class daObjBm_HIO_c : public mDoHIO_entry_c { public: daObjBm_HIO_c(); @@ -391,7 +391,7 @@ int daObjBm_c::CreateHeap() { } mpBtkAnm->setFrame(mpBtkAnm->getEndFrame()); -#ifdef DEBUG +#if DEBUG pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0x18); JUT_ASSERT(840, pbtk != NULL); #endif @@ -447,8 +447,8 @@ int daObjBm_c::create1st() { return phase_state; } -#ifdef DEBUG OS_REPORT("新ビーモス：0x%x\n", fopAcM_GetParam(this)); +#if DEBUG l_HIO.entryHIO("ビーモス"); #endif } @@ -457,7 +457,7 @@ int daObjBm_c::create1st() { } int daObjBm_c::Execute(Mtx** param_0) { -#ifdef DEBUG +#if DEBUG scale.setall(l_HIO.mBodyScale); mpModel->setBaseScale(scale); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -1727,7 +1727,7 @@ int daObjBm_c::Draw() { return 1; } -#ifdef DEBUG +#if DEBUG void daObjBm_c::debugDraw() { if (l_HIO.mDebugDraw) { GXColor local_4c = { diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 13c8980ac9..a572152de7 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -1286,32 +1286,28 @@ int daObjCarry_c::CreateHeap() { int daObjCarry_c::create() { preInit(); -#ifdef DEBUG - if (prm_chk_type_lightball() && strcmp(dComIfGp_getStartStageName(), "T_ENE02") == 0) { - goto next; - } -#endif + if (!(DEBUG && prm_chk_type_lightball() && + strcmp(dComIfGp_getStartStageName(), "T_ENE02") == 0)) { + int create_phase; + create_phase = cPhs_NEXT_e; - int create_phase; - create_phase = cPhs_NEXT_e; + switch (mType) { + case TYPE_BALL_S: + create_phase = (cPhs__Step)checkCreate_LightBallA(); + break; + case TYPE_BALL_S_2: + create_phase = (cPhs__Step)checkCreate_LightBallB(); + break; + case TYPE_LV8_BALL: + create_phase = (cPhs__Step)checkCreate_Lv8Ball(); + break; + } - switch (mType) { - case TYPE_BALL_S: - create_phase = (cPhs__Step)checkCreate_LightBallA(); - break; - case TYPE_BALL_S_2: - create_phase = (cPhs__Step)checkCreate_LightBallB(); - break; - case TYPE_LV8_BALL: - create_phase = (cPhs__Step)checkCreate_Lv8Ball(); - break; + if (create_phase != cPhs_NEXT_e) { + return create_phase; + } } - if (create_phase != cPhs_NEXT_e) { - return create_phase; - } - -next: int phase_state = dComIfG_resLoad(&mPhaseReq, getArcName()); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, data().m_heapSize)) { @@ -1970,7 +1966,7 @@ int daObjCarry_c::draw() { } void daObjCarry_c::debugDraw() { -#ifdef DEBUG +#if DEBUG if (KREG_S(8) == 10000 && !mRotAxis.isZero()) { cXyz start(current.pos); start.y += 35.0f; diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index 3c8b4cf25c..6e7d602dc2 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -228,7 +228,7 @@ bool daObjCRVFENCE_c::checkViewArea(cXyz* param_1) { bool rv = false; bool bVar1 = false; - #ifdef DEBUG + #if DEBUG if (sp24.x >= 0.0f) { if (sp24.y <= FB_WIDTH) { bVar1 = true; diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index 59f07bf625..2bdbdf644a 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_damCps.h" -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" static daObjDamCps_HIO_c l_HIO; @@ -210,7 +210,7 @@ extern actor_process_profile_definition g_profile_Obj_DamCps = { 0, // mParameters &g_fopAc_Method.base, // sub_method 629, // mPriority -#ifdef DEBUG +#if DEBUG &l_daObjDamCps_Method, // sub_method #else NULL, // sub_method diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index d2b87753d4..318780b5e3 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -110,7 +110,7 @@ void daObjDigSnow_c::mode_init_dig() { if (gnd_height != -G_CM3D_F_INF) { mGroundHeight = gnd_height; } else { -#ifdef DEBUG +#if DEBUG // "No BG under digsnow!" OS_REPORT_ERROR("掘る雪の下にＢＧがありません！"); fopAcM_delete(this); diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index f8bee55fd7..cac20e8ce2 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -19,7 +19,7 @@ #include "d/actor/d_a_e_ymb.h" #include "f_op/f_op_camera_mng.h" -#ifdef DEBUG +#if DEBUG daObjDrop_HIO_c l_HIO; #endif @@ -215,7 +215,7 @@ int daObjDrop_c::modeNoParent() { parentActorID = fopAcM_GetID(pparent); setMode(MODE_PARENT_WAIT_e); } else { -#ifdef DEBUG +#if DEBUG if (!l_HIO.field_0x17) { // "Drop of Light: Waiting for Shadow Insect Creation! SW=%d\n" OS_REPORT("光の雫：闇虫生成待ち！SW=%d\n", getYmSwbit()); diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 0c92f80583..3387a97f3d 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -11,7 +11,7 @@ #include "d/d_debug_viewer.h" #include "d/d_procname.h" -#ifdef DEBUG +#if DEBUG daObjFallObj_HIO_c::daObjFallObj_HIO_c() { mMovementShake = 0; @@ -120,7 +120,7 @@ int daObjFallObj_c::create1st() { return phase; } - #ifdef DEBUG + #if DEBUG // Falling obj l_HIO.entryHIO("落下ＯＢＪ"); #endif @@ -363,7 +363,7 @@ int daObjFallObj_c::Draw() { mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); - #ifdef DEBUG + #if DEBUG if (l_HIO.mCheckDisplay) { mpBgW->CalcPlane(); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -381,7 +381,7 @@ int daObjFallObj_c::Delete() { mSoundObj.deleteObject(); dComIfG_resDelete(&mPhaseReq, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index 5e1c59e499..c7ae1b0070 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -13,7 +13,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG class daObjFlag2_Hio_c : public JORReflexible { public: daObjFlag2_Hio_c() { @@ -329,7 +329,7 @@ void daObjFlag2_c::create_init() { initBaseMtx(); initCollision(); - #ifdef DEBUG + #if DEBUG M_hio.ct(); #endif } @@ -449,7 +449,7 @@ int daObjFlag2_c::execute() { return 1; } - #ifdef DEBUG + #if DEBUG mFlagCloth.setSpringRate(attr().mSpringCoeeficient); mFlagCloth.setWindRate(attr().mWindCoefficient); mFlagCloth.setDecayRate(attr().mDecayRate); @@ -485,7 +485,7 @@ static int daObjFlag2_Delete(daObjFlag2_c* i_this) { } daObjFlag2_c::~daObjFlag2_c() { - #ifdef DEBUG + #if DEBUG M_hio.dt(); #endif diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 15bb4dd5d3..8f2683aa3a 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -352,7 +352,7 @@ int daObjFlag3_c::execute() { return 1; } - #ifdef DEBUG + #if DEBUG mFlagCloth.setSpringRate(attr().mSpringCoeeficient); mFlagCloth.setWindRate(attr().mWindCoefficient); mFlagCloth.setDecayRate(attr().mDecayRate); @@ -408,7 +408,7 @@ static int daObjFlag3_Delete(daObjFlag3_c* i_this) { } daObjFlag3_c::~daObjFlag3_c() { - #ifdef DEBUG + #if DEBUG M_hio.dt(); #endif @@ -445,7 +445,7 @@ void daObjFlag3_c::create_init() { mFlagCloth.setTornado(attr().mTornado); initBaseMtx(); - #ifdef DEBUG + #if DEBUG M_hio.ct(); #endif } diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 8caae93b2a..862aaab606 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -18,7 +18,7 @@ daObjGOMIKABE_HIO_c::daObjGOMIKABE_HIO_c() { mId = -1; } -#ifdef DEBUG +#if DEBUG void daObjGOMIKABE_HIO_c::genMessage(JORMContext* ctx) { // Zora Rock ctx->genLabel("ゾーラ岩", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 94ede76333..969073afda 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -125,7 +125,7 @@ int daGpTaru_c::create() { mExplosionRange = 80.0f; field_0x955 = 1; - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("火薬樽"); #endif } @@ -557,7 +557,7 @@ int daGpTaru_c::Delete() { dKyw_pntwind_cut(&mWind); dComIfG_resDelete(&mPhase, "K_ktar00"); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(this); #endif return 1; diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 3c69faf2c8..e4265578d5 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -12,7 +12,7 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/d_com_inf_actor.h" -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" #endif #include "d/d_msg_object.h" @@ -1468,7 +1468,7 @@ int daObj_GrA_c::talk(void* param_1) { } if (mMsgFlow.doFlow(this, NULL, 0) != 0) { - #ifdef DEBUG + #if DEBUG char* cVar1; int choiceNo = mMsgFlow.getChoiceNo(); if (choiceNo != 0) { diff --git a/src/d/actor/d_a_obj_gra2_base.inc b/src/d/actor/d_a_obj_gra2_base.inc index 74dc70b364..e697261016 100644 --- a/src/d/actor/d_a_obj_gra2_base.inc +++ b/src/d/actor/d_a_obj_gra2_base.inc @@ -62,7 +62,7 @@ int daObj_GrA_c::waitDemo(void* param_1) { } } } else { - #ifdef DEBUG + #if DEBUG if (mpHIO->m.field_0x8a) { fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); } else { @@ -79,7 +79,7 @@ int daObj_GrA_c::waitDemo(void* param_1) { break; case 2: - #ifdef DEBUG + #if DEBUG fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); #endif break; diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index 815ff867be..086487c869 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1858,7 +1858,7 @@ void daObj_GrA_c::calcCatchPos(f32 param_1, int param_2) { field_0x91a.y = shape_angle.y; } } else { - #ifdef DEBUG + #if DEBUG dDbVw_Report(100, 100, "pos.y = %f", sp9c.y - player->current.pos.y); #endif diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index e117a6fc2a..40b675c690 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -142,7 +142,7 @@ int daObjIceBlk_c::saveCurrentPos() { int nearest_point_no = 0; for (int i = 0; i < mpPath->m_num; i++) { -#ifdef DEBUG +#if DEBUG f32 dist = current.pos.absXZ(point->m_position); if (dist < nearest_dist) { nearest_point_no = i; @@ -279,7 +279,7 @@ int daObjIceBlk_c::Create() { mColdEffEmitters[i] = dComIfGp_particle_set(l_eff_id[i], ¤t.pos, &home.angle, &scale, 0xFF, NULL, -1, NULL, NULL, NULL); -#ifdef DEBUG +#if DEBUG if (mColdEffEmitters[i] == NULL) { // "Ice Block: Cold Effect set failed\n" OS_REPORT("氷ブロック：冷気エフェクトセット失敗\n"); diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index dbe2b89dfb..e749c6e56d 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -147,13 +147,13 @@ int daObjIkada_c::Execute(Mtx** mtx) { posY = fopAcM_wt_c::getWaterY(); } - #ifdef DEBUG + #if DEBUG field_0x5c4 = field_0x5c4 + (((TREG_S(1) + 0x350) + (HREG_F(1) + 2.0f)) * field_0x5a0 + field_0x5a4 * HREG_F(9)); #else field_0x5c4 = field_0x5c4 + (((HREG_F(1) + 2.0f) * field_0x5a0) + 848.0f) + field_0x5a4 * HREG_F(9); #endif - #ifdef DEBUG + #if DEBUG field_0x5c6 = field_0x5c6 + (((TREG_S(2) + 0x350) + (HREG_F(2) + 2.0f)) * field_0x5a0 + field_0x5a4 * HREG_F(9)); #else field_0x5c6 = field_0x5c6 + (((HREG_F(2) + 2.0f) * field_0x5a0) + 848.0f) + field_0x5a4 * HREG_F(9); diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index d5d4e019eb..234c330232 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -50,7 +50,7 @@ daObj_ItaMato_HIOParam const daObj_ItaMato_Param_c::m = { 20.0f, }; -#ifdef DEBUG +#if DEBUG daObj_ItaMato_HIO_c::daObj_ItaMato_HIO_c() { mAttr = daObj_ItaMato_Param_c::m; } @@ -117,7 +117,7 @@ static char* l_resName = "H_ItaMato"; daObj_ItaMato_c::~daObj_ItaMato_c() { OS_REPORT("|%06d:%x|daObj_ItaMato_c -> デストラクト\n", g_Counter.mCounter0, this); - #ifdef DEBUG + #if DEBUG if (mHIO != NULL) { mHIO->removeHIO(); } @@ -152,7 +152,7 @@ cPhs__Step daObj_ItaMato_c::create() { fopAcM_SetMtx(this, mpModels[health]->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -50.0f, -200.0f, 200.0f, 200.0f, 200.0f); - #ifdef DEBUG + #if DEBUG mHIO = &l_HIO; mHIO->entryHIO("板的"); #endif diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 7288d4985e..2f690791e4 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -245,7 +245,7 @@ int daItem_c::_daItem_create() { m_itemNo = daItem_prm::getItemNo(this); BOOL flag = dItem_data::chkFlag(m_itemNo, 2); -#ifdef DEBUG +#if DEBUG if (dItem_data::getFieldArc(m_itemNo) == NULL) { // "Item Num<%d>: No Resource Archive specified!!\n" OS_REPORT_ERROR("アイテム番号<%d>:リソースのアーカイブ指定がありません！！\n", m_itemNo); diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index c740bbd636..386514e0e5 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -524,7 +524,7 @@ void daObjKAM_c::Z_BufferChk() { } else { cameraHeight = 0.0f; } -#ifdef DEBUG +#if DEBUG #define Z_BUFFERCHK_X_MAX FB_WIDTH #define Z_BUFFERCHK_Y_MAX FB_HEIGHT #else @@ -779,7 +779,7 @@ int daObjKAM_c::create() { mDraw = true; } -#ifdef DEBUG +#if DEBUG #define DAOBJKAM_C_CREATE_DIST_INDEX fopAc_attn_ETC_e #else #define DAOBJKAM_C_CREATE_DIST_INDEX fopAc_attn_CARRY_e diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 5651ca72a8..31ec1836ea 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -39,7 +39,7 @@ static dCcD_SrcCyl l_ccDCyl = { static daObj_KBacket_Param_c l_HIO; static inline const daObj_KBacket_HIOParam* get_params(daObj_KBacket_c* i_this) { -#ifdef DEBUG +#if DEBUG return &i_this->mHIO->param; #else return &daObj_KBacket_Param_c::m; @@ -48,7 +48,7 @@ static inline const daObj_KBacket_HIOParam* get_params(daObj_KBacket_c* i_this) daObj_KBacket_c::~daObj_KBacket_c() { OS_REPORT("|%06d:%x|daObj_KBacket_c -> デストラクト\n", g_Counter.mCounter0, this); -#ifdef DEBUG +#if DEBUG if (mHIO != NULL) { mHIO->removeHIO(); } @@ -340,7 +340,7 @@ int daObj_KBacket_c::Execute() { field_0xa4a = 1; } else { if (mObjAcch.ChkGroundHit() != 0) { -#ifndef DEBUG +#if !DEBUG fopAcM_seStart(this, Z2SE_OBJ_WOODSTICK_BOUND, 0); #endif if (field_0x9d4.y < -30.0f) { @@ -359,7 +359,7 @@ int daObj_KBacket_c::Execute() { } else { if (field_0xa4a != 0) { if (mObjAcch.ChkGroundHit() != 0) { -#ifndef DEBUG +#if !DEBUG fopAcM_seStart(this, Z2SE_OBJ_WOODSTICK_BOUND, 0); #endif if (this->field_0x9d4.y < -30.0f) { @@ -376,7 +376,7 @@ int daObj_KBacket_c::Execute() { } } else { if (field_0xa49 != 0) { -#ifndef DEBUG +#if !DEBUG fopAcM_seStart(this, Z2SE_OBJ_WOODSTICK_PUT, 0); #endif } else { diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index ab857d9a14..05e30dd828 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -15,7 +15,7 @@ daObj_Kbox_HIO_c::daObj_Kbox_HIO_c() { mWidth = 2.0f; } -#ifdef DEBUG +#if DEBUG void daObj_Kbox_HIO_c::genMessage(JORMContext* ctx) { // Skull fish wooden box ctx->genLabel("　スカル魚木箱　", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 9f1de606f2..1af514b6ee 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -259,9 +259,7 @@ int daObjKGate_c::Create() { l_cull_box.max.y, l_cull_box.max.z); if (dComIfG_Bgsp().Regist(mpBgW, this)) { -#ifdef DEBUG - OSReport_Error("キコルの門：ＢＧ登録失敗しました\n"); -#endif + OS_REPORT_ERROR("キコルの門：ＢＧ登録失敗しました\n"); return 0; } @@ -336,7 +334,7 @@ int daObjKGate_c::create1st() { phase_state = MoveBGCreate(l_arcName[mNameArg], l_gateDzbIdx[mNameArg], NULL, heap_size, NULL); if (phase_state == cPhs_ERROR_e) { -#ifdef DEBUG +#if DEBUG OSReport("KGATE PARAM:%x\n", fopAcM_GetParam(this)); #endif return phase_state; @@ -956,9 +954,7 @@ int daObjKGate_c::Draw() { int daObjKGate_c::Delete() { if (mpBgW != NULL && mpBgW->ChkUsed()) { if (dComIfG_Bgsp().Release(mpBgW)) { -#ifdef DEBUG - OSReport("Release Error\n"); -#endif + OS_REPORT("Release Error\n"); } } diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 1a2dc43615..7c52cd9edd 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -18,7 +18,7 @@ daObj_Kita_HIO_c::daObj_Kita_HIO_c() { mSwingRange = 0.6f; } -#ifdef DEBUG +#if DEBUG void daObj_Kita_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel("　 風で動く連続板", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); // Model Size X diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index ab92c2a56d..8476751b42 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -27,7 +27,7 @@ struct daObjKLift00_HIO_c : public mDoHIO_entry_c { /* 0x1C */ f32 field_0x1C; }; -#ifdef DEBUG +#if DEBUG static daObjKLift00_HIO_c l_HIO; daObjKLift00_HIO_c::daObjKLift00_HIO_c() { @@ -102,7 +102,7 @@ static dCcD_SrcCyl l_cc_cyl_src = { } // mCyl }; -#ifdef DEBUG +#if DEBUG static const int l_dzbidx[] = {9}; #endif @@ -128,7 +128,7 @@ cPhs__Step daObjKLift00_c::create1st() { } // "Foothold(Lv3)" - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("足場(Lv3)"); #endif @@ -328,7 +328,7 @@ int daObjKLift00_c::Execute(Mtx** i_mtx) { // Check if player hit chains, and play sfx & move the chains accordingly bool playedHitSfx = false; - #ifdef DEBUG + #if DEBUG for(int i = 0; i < 8; i++) { const s32 currentChainIdx = (mNumChains - 1) - (i * 2); if(currentChainIdx >= 0 && mChainSphereColliders[i].ChkTgHit() ) { @@ -461,7 +461,7 @@ int daObjKLift00_c::Draw() { int daObjKLift00_c::Delete() { dComIfG_resDelete(this, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index 7d2230c1ea..1bd2b6711f 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -270,7 +270,7 @@ int daObjKshtr_c::CreateHeap() { } } - #ifdef DEBUG + #if DEBUG if (checkKey() != 0) { mIsCheckKey = true; } @@ -320,7 +320,7 @@ cPhs__Step daObjKshtr_c::phase_0() { mType = getType() + 1; mSwNo = getSwNo(); - #ifdef DEBUG + #if DEBUG if (mSwNo == 0xFF) { OS_REPORT_ERROR("鍵付き壁ドア：スイッチ指定がありません\n"); // Locked wall door: No switch specification return cPhs_ERROR_e; @@ -329,7 +329,7 @@ cPhs__Step daObjKshtr_c::phase_0() { initKey(); #endif - #ifdef DEBUG + #if DEBUG if (mType >= 6) { OS_REPORT_ERROR("鍵付き壁ドア：引数０のタイプ指定が不正値です\n"); // Locked wall door: The type specification for argument 0 is invalid @@ -835,7 +835,7 @@ void daObjKshtr_c::anmInit() { JUT_ASSERT(1278, anm != NULL); - #ifdef DEBUG + #if DEBUG if (!mpBckAnm->init(anm, 1, 0, 1.0f, 0, -1, true)) { JUT_ASSERT(1281, FALSE); diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index a0eed328d5..7512f46ad1 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -17,7 +17,7 @@ static int daObjKWheel00_MoveBGDelete(daObjKWheel00_c*); static int daObjKWheel00_MoveBGExecute(daObjKWheel00_c*); static int daObjKWheel00_MoveBGDraw(daObjKWheel00_c*); -#ifdef DEBUG +#if DEBUG static daObjKWheel00_HIO_c l_HIO; daObjKWheel00_HIO_c::daObjKWheel00_HIO_c() { @@ -54,7 +54,7 @@ int daObjKWheel00_c::create1st() { if(phase == cPhs_ERROR_e) return phase; - #ifdef DEBUG + #if DEBUG // "Water wheel(Lv3)" l_HIO.entryHIO("水車(Lv3)"); #endif @@ -135,7 +135,7 @@ int daObjKWheel00_c::Create() { mZAngularVelocity = 0; if(getSwNo() != 0xFF && fopAcM_isSwitch(this, getSwNo())) { - #ifdef DEBUG + #if DEBUG if(getArg0()) mZAngularVelocity = l_HIO.mTargetZAngularSpeed; else @@ -192,7 +192,7 @@ int daObjKWheel00_c::Execute(Mtx** i_mtx) { // Only draw particles and play SFX if gear is moving if(mZAngularVelocity != 0) { // Increase angular velocity via an arithmetic sequence with a ratio of 2 - #ifdef DEBUG + #if DEBUG if(mZAngularVelocity > 0) { if(mZAngularVelocity < l_HIO.mTargetZAngularSpeed) mZAngularVelocity += l_HIO.mZAngularAcceleration; @@ -324,7 +324,7 @@ int daObjKWheel00_c::Draw() { int daObjKWheel00_c::Delete() { dComIfG_resDelete(this, l_arcName[m_type]); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index da0700171a..a786bb5312 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -28,7 +28,7 @@ static const char* l_arcName = "K_Wheel01"; // Likely to have been a macro; matches for loop at beginning of create1st for both debug and retail, despite retail only calling getArg4567() #define CHECK_KLIFT_EXISTS(kLiftNum) (!((1 << kLiftNum) & getArg4567())) -#ifdef DEBUG +#if DEBUG static daObjKWheel01_HIO_c l_HIO; daObjKWheel01_HIO_c::daObjKWheel01_HIO_c() { @@ -94,7 +94,7 @@ cPhs__Step daObjKWheel01_c::create1st() { } } - #ifdef DEBUG + #if DEBUG // "Pulley(Lv3)" l_HIO.entryHIO("滑車(Lv3)"); #endif @@ -163,7 +163,7 @@ int daObjKWheel01_c::Create() { fopAcM_SetMtx(this, mTransformMtx); if(getSwNo() != 0xFF && fopAcM_isSwitch(this, getSwNo())) { - #ifdef DEBUG + #if DEBUG if(getArg0()) { mYAngularVelocity = l_HIO.mTargetYAngularSpeed; } @@ -208,7 +208,7 @@ int daObjKWheel01_c::Execute(Mtx** i_mtx) { shape_angle.y = current.angle.y; if(current.angle.y != old.angle.y) { - #ifdef DEBUG + #if DEBUG mYAngularVelocity = l_HIO.mTargetYAngularSpeed; #else mYAngularVelocity = 64; @@ -230,7 +230,7 @@ int daObjKWheel01_c::Execute(Mtx** i_mtx) { } if(mYAngularVelocity != 0) { - #ifdef DEBUG + #if DEBUG if(mYAngularVelocity > 0) { if(mYAngularVelocity < l_HIO.mTargetYAngularSpeed) mYAngularVelocity += l_HIO.mYAngularAcceleration; @@ -299,7 +299,7 @@ int daObjKWheel01_c::Draw() { int daObjKWheel01_c::Delete() { dComIfG_resDelete(this, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif @@ -312,7 +312,7 @@ int daObjKWheel01_c::Delete() { } bool daObjKWheel01_c::eventStart() { - #ifdef DEBUG + #if DEBUG if(getArg0()) mYAngularVelocity = l_HIO.mYAngularAcceleration; else diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index dc3847cc74..35a2ca0ef3 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -32,7 +32,7 @@ daLv3Water2_HIO_c::daLv3Water2_HIO_c() { mLevelControlWaitFrames = 0; } -#ifdef DEBUG +#if DEBUG void daLv3Water2_HIO_c::genMessage(JORMContext* ctx) { ctx->genSlider("wait time", &mLevelControlWaitFrames, 0, 255, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); } @@ -120,7 +120,7 @@ cPhs__Step daLv3Water2_c::create() { mMode = WAIT; // "LV3 Water surface (2SW)" - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("ＬＶ３水面(2SW)"); #endif } @@ -237,7 +237,7 @@ int daLv3Water2_c::Draw() { int daLv3Water2_c::Delete() { dComIfG_resDelete(&mPhase, l_resNameIdx[mResourceIndex]); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index 7a7f692324..a4cc3b7526 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -12,7 +12,7 @@ #include "d/d_cc_d.h" #include "d/d_cc_uty.h" -#ifdef DEBUG +#if DEBUG class daObjLv4Chan_HIO_c : public mDoHIO_entry_c { public: daObjLv4Chan_HIO_c(); @@ -70,7 +70,7 @@ int daObjLv4Chan_c::create1st() { return rv; } - #ifdef DEBUG + #if DEBUG // “Chandelier (Lv4)” l_HIO.entryHIO("シャンデリア(Lv4)"); #endif diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index d01616f31f..e846622e57 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -107,7 +107,7 @@ void daObjL4DigSand_c::mode_init_dig() { if (gnd_y != -G_CM3D_F_INF) { mGroundY = gnd_y; } else { -#ifdef DEBUG +#if DEBUG // "No BG below dig-sand!" OS_REPORT_ERROR("掘れる砂の下にＢＧがありません！"); fopAcM_delete(this); diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index 7f600e3300..f048c74f21 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -184,7 +184,7 @@ int daObjL6Bm_c::CreateHeap() { return 0; } - #ifdef DEBUG + #if DEBUG pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOBEAM_OFF); JUT_ASSERT(660, pbtk != NULL); #endif diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index 05763a1495..7711f18f5b 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -201,7 +201,7 @@ int daObjLv6Bm_c::Create() { } } - #ifdef DEBUG + #if DEBUG if (mEyeMaterial == NULL) { OS_REPORT("Lv6ビーモス：目のマテリアル<%s>がありません\n", l_eye_matName); // Lv6 Beamos: Eye material <%s> is not available. return 0; @@ -248,7 +248,7 @@ int daObjLv6Bm_c::CreateHeap() { return 0; } - #ifdef DEBUG + #if DEBUG pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, BRK_BM6_TURN); JUT_ASSERT(644, pbrk != NULL); #endif @@ -275,7 +275,7 @@ int daObjLv6Bm_c::CreateHeap() { } mpBtkAnm->setFrame(mpBtkAnm->getEndFrame()); - #ifdef DEBUG + #if DEBUG pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOL6_ON); JUT_ASSERT(693, pbtk != NULL); #endif diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index af4fe5615a..92484685f7 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -99,7 +99,7 @@ int daObjLv6SwTurn_c::CreateHeap() { return TRUE; } -#ifdef DEBUG +#if DEBUG static daObjLv6SwTurn_HIO_c l_HIO; #endif diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index 8c75554859..a4f09b2d49 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_magLiftRot.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -#ifdef DEBUG +#if DEBUG #include "m_Do/m_Do_hostIO.h" #endif #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index bfff9235e6..69baaea558 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -37,7 +37,7 @@ dCcD_SrcCps l_cps_src = { } // mCpsAttr }; -#ifdef DEBUG +#if DEBUG static daObjMHole_HIO_c l_HIO; daObjMHole_HIO_c::daObjMHole_HIO_c() { @@ -86,7 +86,7 @@ void daObjMHole_c::initBaseMtx() { } void daObjMHole_c::setBaseMtx() { -#ifdef DEBUG +#if DEBUG if (l_HIO.scale_adjust_on != 0) { scale = l_HIO.scale; } @@ -198,8 +198,8 @@ int daObjMHole_c::create() { if (Create() == 0) { return cPhs_ERROR_e; } -#ifdef DEBUG - OSReport("MHole Param<%x> arc<%s>\n", fopAcM_GetParam(this), l_arcName[mKind]); + OS_REPORT("MHole Param<%x> arc<%s>\n", fopAcM_GetParam(this), l_arcName[mKind]); +#if DEBUG l_HIO.entryHIO("マグネホール"); #endif } @@ -333,7 +333,7 @@ int daObjMHole_c::draw() { mDoExt_brkAnmRemove(mpModel->getModelData()); mDoExt_btkAnmRemove(mpModel->getModelData()); -#ifdef DEBUG +#if DEBUG if (l_HIO.collision_display != 0) { GXColor color = {0xFF, 0x0, 0x0, 0xFF}; if (mCps.GetAtVecP() != NULL) { @@ -349,7 +349,7 @@ int daObjMHole_c::_delete() { effectEnd(); mSound.deleteObject(); dComIfG_resDelete(&mPhase, l_arcName[mKind]); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index 2258318bc6..2ed126eb06 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -44,7 +44,7 @@ static dCcD_SrcCyl l_ccDCyl = { } // mCyl }; -#ifdef DEBUG +#if DEBUG void daObj_Mie_HIO_c::genMessage(JORMContext* ctx) { ctx->genSlider("注目オフセット ", &mParams.focus_offset, 0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index 809495fa19..0163bbe96d 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -22,7 +22,7 @@ daObj_Msima_HIO_c::daObj_Msima_HIO_c() { mBasicPosition = 800.0f; } -#ifdef DEBUG +#if DEBUG void daObj_Msima_HIO_c::genMessage(JORMContext* context) { // Magma Island context->genLabel("　マグネ島　", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index cc7b57f1e5..085b1e6fcf 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -17,7 +17,7 @@ enum J_Necktie_RES_File_ID { /* 0x7 */ BTK_J_NECKTIE = 0x7, }; -#ifdef DEBUG +#if DEBUG class daObjOnCloth_Hio_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index 5c89dd88e2..25a1094276 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -45,7 +45,7 @@ daPoFire_HIO_c::daPoFire_HIO_c() { mPickupRange = 150.0f; mFireWaitTime = 20; } -#ifdef DEBUG +#if DEBUG /* daPoFire_HIO_c::genMessage (JORMContext *) */ void daPoFire_HIO_c::genMessage(JORMContext* mctx) { mctx->genSlider("捕まえ範囲", &mPickupRange, 0.0f, 1000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); @@ -106,7 +106,7 @@ int daPoFire_c::create() { init_modeOnFire(); } -#ifdef DEBUG +#if DEBUG l_HIO.entryHIO("ポウ炎"); #endif @@ -407,7 +407,7 @@ int daPoFire_c::Draw() { int daPoFire_c::Delete() { dComIfG_resDelete(&mPhase, "poFire"); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 2349c84a6d..2194493de3 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -239,9 +239,7 @@ int daObjRgate_c::Create() { l_cull_box.max.y, l_cull_box.max.z); if (dComIfG_Bgsp().Regist(mpBgW, this)) { -#ifdef DEBUG - OSReport_Error("キコルの門：ＢＧ登録失敗しました\n"); -#endif + OS_REPORT_ERROR("キコルの門：ＢＧ登録失敗しました\n"); return 0; } else { for (u16 i = 0; i < mpGateModel->getModelData()->getJointNum(); i++) { @@ -847,9 +845,7 @@ int daObjRgate_c::Draw() { int daObjRgate_c::Delete() { if (mpBgW != NULL && mpBgW->ChkUsed()) { if (dComIfG_Bgsp().Release(mpBgW)) { -#ifdef DEBUG - OSReport("Release Error\n"); -#endif + OS_REPORT("Release Error\n"); } } diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index b56deef764..05a8cfbf91 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -9,7 +9,7 @@ #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG class daObjSakuita_Hio_c : public JORReflexible { public: void genMessage(JORMContext* ctx); @@ -78,7 +78,7 @@ void daObjSakuita_c::create_init() { } field_0x74c = 1; - #ifdef DEBUG + #if DEBUG M_hio.ct(); #endif } @@ -156,7 +156,7 @@ static int daObjSakuita_Draw(daObjSakuita_c* i_this) { } inline int daObjSakuita_c::execute() { - #ifdef DEBUG + #if DEBUG gravity = attr().mGravity; #endif current.pos.y += attr().mHangingPosition; @@ -181,7 +181,7 @@ static int daObjSakuita_Delete(daObjSakuita_c* i_this) { } daObjSakuita_c::~daObjSakuita_c() { - #ifdef DEBUG + #if DEBUG M_hio.dt(); #endif diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index c0cef88f63..66585092e2 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_path.h" -#ifdef DEBUG +#if DEBUG #include "d/d_a_obj.h" class daObjItaRope_Hio_c : public JORReflexible { @@ -139,12 +139,12 @@ void Sakuita_c::calcAngle() { static char* l_arcName = "A_Sakuita"; -#ifdef DEBUG +#if DEBUG daObjItaRope_Hio_c M_hio; #endif inline daObjItaRope_c::~daObjItaRope_c() { -#ifdef DEBUG +#if DEBUG M_hio.dt(); #endif delete [] mRopes; @@ -207,7 +207,7 @@ void daObjItaRope_c::create_init() { pSakuita->create(pPos, sVar12, fopAcM_GetRoomNo(this)); } - #ifdef DEBUG + #if DEBUG M_hio.ct(); #endif } diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index fd392f1bfa..67fa3adac3 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -353,7 +353,7 @@ void daSCannon_c::middleExe() { void daSCannon_c::orderEvtInit() { eventInfo.setArchiveName(l_arcName_Zev); mEvtIdx = dComIfGp_getEventManager().getEventIdx(this, l_eventName[mDemoType], 0xFF); -#ifdef DEBUG +#if DEBUG if (mEvtIdx == -1) { // "××××××××××××× Sky Cannon d_a_obj_scannon.cpp: Failed to get event\n" OS_REPORT("×××××××××××××天空砲台 d_a_obj_scannon.cpp：イベント取得失敗\n"); @@ -603,7 +603,7 @@ void daSCannon_c::demoExeFire() { } void daSCannon_c::demoInitFinish() { -#ifdef DEBUG +#if DEBUG if (dComIfG_play_c::getLayerNo(0) == 3 || dComIfG_play_c::getLayerNo(0) == 10) { J3DJoint* joint_p = mpModels[mIsRepaired]->getModelData()->getJointNodePointer(mHeadJointNo); if (joint_p == NULL) { diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index bbd08bcc79..773d07b055 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -160,7 +160,7 @@ void daObjSCannonTen_c::exeModeWait() { if (aREG_F(0) == 0.0f && fopAcM_checkHookCarryNow(this) && dComIfGp_checkPlayerStatus1(0, 0x10)) { eventInfo.setArchiveName(l_arcName); mEvtIdx = dComIfGp_getEventManager().getEventIdx(this, l_eventName, 0xFF); -#ifdef DEBUG +#if DEBUG if (mEvtIdx == -1) { // "××××××××××××× Sky Cannon (City in the Sky) d_a_obj_scannon_ten.cpp: Failed to get event\n" OS_REPORT("×××××××××天空砲台(天空都市） d_a_obj_scannon_ten.cpp：イベント取得失敗\n"); @@ -316,7 +316,7 @@ void daObjSCannonTen_c::demoExeFireEnd() { } void daObjSCannonTen_c::demoInitFinish() { -#ifdef DEBUG +#if DEBUG J3DJoint* joint_p = mpModel->getModelData()->getJointNodePointer(mHeadJointNo); if (joint_p == NULL) { // "××××××Sky Cannon—The head joint is missing!!!! ××××××" diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index 91d78bf6c0..88cc4b30ac 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -10,7 +10,7 @@ #include "d/d_meter2_info.h" #include "d/d_s_play.h" -#ifdef DEBUG +#if DEBUG class daObjSmgDoor_HIO_c : public mDoHIO_entry_c { public: daObjSmgDoor_HIO_c(); @@ -133,7 +133,7 @@ int daObjSmgDoor_c::create1st() { } } -#ifdef DEBUG +#if DEBUG // Present or Past Door l_HIO.entryHIO("現在or過去の扉"); #endif @@ -385,7 +385,7 @@ int daObjSmgDoor_c::Draw() { mDoExt_modelUpdateDL(mpModel[1]); dComIfGd_setList(); -#ifdef DEBUG +#if DEBUG if (l_HIO.field_0x6 != 0) { mpBgW->CalcPlane(); } @@ -396,7 +396,7 @@ int daObjSmgDoor_c::Draw() { int daObjSmgDoor_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName[mType]); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index dddb1517c5..4e2f3120c9 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -12,7 +12,7 @@ public: daSpinLift_HIO_c(); ~daSpinLift_HIO_c() {}; -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -29,7 +29,7 @@ daSpinLift_HIO_c::daSpinLift_HIO_c() { mVibration = 4; } -#ifdef DEBUG +#if DEBUG void daSpinLift_HIO_c::genMessage(JORMContext* ctx) { // === Ascent === ctx->genLabel("\n=== 上昇 ===", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); @@ -106,7 +106,7 @@ int daSpinLift_c::create() { } setBaseMtx(); -#ifdef DEBUG +#if DEBUG // Spin Lift l_HIO.entryHIO("スピンリフト"); #endif @@ -247,7 +247,7 @@ int daSpinLift_c::Draw() { int daSpinLift_c::Delete() { dComIfG_resDelete(&mPhase, l_resNameIdx[mModelType]); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index 9ea78dfd7e..899d8c92d5 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -305,7 +305,7 @@ void daObj_SSDrink_c::setParam() { gravity = -5.0f; -#ifdef DEBUG +#if DEBUG bool bVar1 = false; bool bVar2 = false; #endif @@ -409,7 +409,7 @@ int daObj_SSDrink_c::orderEvent() { } int daObj_SSDrink_c::wait(void* param_0) { -#ifdef DEBUG +#if DEBUG switch (field_0xb08) { case 0: case 2: diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 445b577131..025314b0bb 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -9,7 +9,7 @@ #include "d/d_cc_d.h" #include "d/d_s_play.h" -#ifdef DEBUG +#if DEBUG class daObjSwLight_HIO_c : public mDoHIO_entry_c { public: /* 811CF8C0 */ daObjSwLight_HIO_c(); @@ -108,7 +108,7 @@ static dCcD_SrcCyl l_cyl_src = { int daObjSwLight_c::Create() { if (fopAcM_isSwitch(this, getSwbit())) { init_modeSwOffWait(); -#ifdef DEBUG +#if DEBUG field_0xadc = l_HIO.mLightMaxRadius; #else field_0xadc = 500.0f; @@ -143,7 +143,7 @@ int daObjSwLight_c::Create() { } } -#ifdef DEBUG +#if DEBUG if (field_0xae8 == 0xffff) { // Light Candlestick Switch: Material "cc_LB_v" is missing. OSReport_Error("光燭台スイッチ：マテリアル\"cc_LB_v\"がありません\n"); @@ -178,7 +178,7 @@ int daObjSwLight_c::create1st() { if (phase == cPhs_ERROR_e) { return phase; } -#ifdef DEBUG +#if DEBUG // Light Candlestick Switch l_HIO.entryHIO("光燭台スイッチ"); #endif @@ -222,7 +222,7 @@ void daObjSwLight_c::action() { mTgSph[i].SetC(cStack_48); dComIfG_Ccsp()->Set(&mTgSph[i]); } -#ifdef DEBUG +#if DEBUG u8 a = 1; u8 light_hit = l_HIO.mNoLightHit == 0; #endif @@ -240,7 +240,7 @@ void daObjSwLight_c::action() { } } -#ifdef DEBUG +#if DEBUG u8 tmp = field_0xadc / l_HIO.mLightMaxRadius * 255.0f; #else u8 tmp = field_0xadc / 500.0f * 255.0f; @@ -276,13 +276,13 @@ void daObjSwLight_c::modeSwOnWait() { if (field_0xae1 < 5) { field_0xadc = 0.0f; } else if (field_0xae1 == 5) { -#ifdef DEBUG +#if DEBUG field_0xadc = l_HIO.mLightMaxRadius * 0.25f; #else field_0xadc = 500.0f * 0.25f; #endif } else if (field_0xae1 < 50) { -#ifdef DEBUG +#if DEBUG field_0xadc = l_HIO.mLightMaxRadius * ((field_0xae1 - 5) * 0.25f / 45.0f + 0.25f); #else @@ -290,7 +290,7 @@ void daObjSwLight_c::modeSwOnWait() { #endif } else if (field_0xae1 == 50) { -#ifdef DEBUG +#if DEBUG field_0xadc = l_HIO.mLightMaxRadius; #else field_0xadc = 500.0f; @@ -309,7 +309,7 @@ void daObjSwLight_c::init_modeOnLight() { } void daObjSwLight_c::modeOnLight() { -#ifdef DEBUG +#if DEBUG if (cLib_chaseF(&field_0xadc, l_HIO.mLightMaxRadius, l_HIO.mLightMaxRadius * 0.05f)) { init_modeSwOffWait(); } @@ -341,7 +341,7 @@ void daObjSwLight_c::modeSwOffWait() { if (field_0xae3 != 0) { if (!fopAcM_isSwitch(this, getSwbit2())) { -#ifdef DEBUG +#if DEBUG if (cLib_chaseF(&field_0xadc, 0.0f, l_HIO.mLightMaxRadius * 0.05f)) { #else if (cLib_chaseF(&field_0xadc, 0.0f, 500.0f * 0.05f)) { @@ -349,7 +349,7 @@ void daObjSwLight_c::modeSwOffWait() { init_modeSwOnWait(); } } else { -#ifdef DEBUG +#if DEBUG cLib_chaseF(&field_0xadc, l_HIO.mLightMaxRadius, l_HIO.mLightMaxRadius * 0.05f); #else cLib_chaseF(&field_0xadc, 500.0f, 500.0f * 0.05); @@ -359,7 +359,7 @@ void daObjSwLight_c::modeSwOffWait() { } else { if (!cLib_checkBit(field_0xae6, (u8)1) && !cLib_checkBit(field_0xae6, 2) && !cLib_calcTimer(&field_0xae4) && -#ifdef DEBUG +#if DEBUG cLib_chaseF(&field_0xadc, 0.0f, l_HIO.mLightMaxRadius * 0.05f)) { #else @@ -420,7 +420,7 @@ int daObjSwLight_c::Draw() { J3DMaterial* material = modelData->getMaterialNodePointer(field_0xae8); J3DGXColor* color = material->getTevKColor(0); -#ifdef DEBUG +#if DEBUG u8 fVar1 = field_0xadc / l_HIO.mLightMaxRadius * 255.0f; #else u8 fVar1 = field_0xadc / 500.0f * 255.0f; @@ -433,7 +433,7 @@ int daObjSwLight_c::Draw() { mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); -#ifdef DEBUG +#if DEBUG if (l_HIO.mCheckRendering) { mpBgW->CalcPlane(); } @@ -445,7 +445,7 @@ int daObjSwLight_c::Draw() { int daObjSwLight_c::Delete() { mSound.deleteObject(); dComIfG_resDelete(&mPhase, l_arcName); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index 05e9599880..49d6576b35 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -5,14 +5,14 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" #endif #include "d/actor/d_a_obj_swchain.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" -#ifdef DEBUG +#if DEBUG class daObjSwChain_HIO_c : public mDoHIO_entry_c { public: /* 811C8DE0 */ daObjSwChain_HIO_c(); @@ -256,7 +256,7 @@ int daObjSwChain_c::create1st() { mOutNum = getOutNum(); mChainID = getChainID(); -#ifdef DEBUG +#if DEBUG if (mChainID != 0 && mChainID != 1 && mChainID != 2 && mChainID != 3) { // Chain Switch: Chain ID value is abnormal <%d> OS_REPORT_ERROR("チェーンスイッチ：鎖の番号が異常値です<%d>\n", mChainID); @@ -264,7 +264,7 @@ int daObjSwChain_c::create1st() { } #endif -#ifdef DEBUG +#if DEBUG if (mOutNum > mChainNum) { // Chain Switch: Argument 2 > Argument 1 ! OS_REPORT_ERROR("チェーンスイッチ：引数２＞引数１になっています！\n"); @@ -272,7 +272,7 @@ int daObjSwChain_c::create1st() { } #endif -#ifdef DEBUG +#if DEBUG if (mHookShotLength > mChainNum) { // Chain Switch: Argument 3 > Argument 1 ! OS_REPORT_ERROR("チェーンスイッチ：引数３＞引数１になっています！\n"); @@ -292,7 +292,7 @@ int daObjSwChain_c::create1st() { if (!Create()) { return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG // Chain Switch l_HIO.entryHIO("チェーンスイッチ"); #endif @@ -302,7 +302,7 @@ int daObjSwChain_c::create1st() { } int daObjSwChain_c::execute() { -#ifdef DEBUG +#if DEBUG if (l_HIO.mProcessStop) { return 1; } @@ -350,7 +350,7 @@ int daObjSwChain_c::execute() { cXyz cStack_68(mChains[getTopChainNo()].field_0x34); cXyz cStack_74(mChains[mChainNum].field_0x34); f32 fVar15 = cStack_74.abs(cStack_68); -#ifdef DEBUG +#if DEBUG if (fVar15 < (l_HIO.field_0xc * (mOutNum - 2)) || mCarry == 0) #else if (fVar15 < (35.0f * (mOutNum - 2)) || mCarry == 0) @@ -365,7 +365,7 @@ int daObjSwChain_c::execute() { case 4: case 6: if (mOutNum > field_0xa69) { -#ifdef DEBUG +#if DEBUG chains_p->field_0x34 += cStack_8c * l_HIO.mReturnSpeedHigh; #else chains_p->field_0x34 += cStack_8c * 30.0f; @@ -374,7 +374,7 @@ int daObjSwChain_c::execute() { field_0xa6b = 1; field_0xa6b = 1; } else { -#ifdef DEBUG +#if DEBUG chains_p->field_0x34 += cStack_8c * l_HIO.mReturnSpeedLow; #else chains_p->field_0x34 += cStack_8c * 15.0f; @@ -382,7 +382,7 @@ int daObjSwChain_c::execute() { } break; default: -#ifdef DEBUG +#if DEBUG chains_p->field_0x34 += cStack_8c * l_HIO.mReturnSpeed; #else chains_p->field_0x34 += cStack_8c * 2.0f; @@ -393,7 +393,7 @@ int daObjSwChain_c::execute() { if (field_0xa6c == 0) { cXyz pos = (daPy_getPlayerActorClass()->current.pos - home.pos); s16 abs_tmp = pos.atan2sX_Z() - shape_angle.y; -#ifdef DEBUG +#if DEBUG if (abs(abs_tmp) < l_HIO.mReactionAngle) { #else if (abs(abs_tmp) < 0xe74) { @@ -427,7 +427,7 @@ int daObjSwChain_c::execute() { } field_0xa9d = mCarry; -#ifdef DEBUG +#if DEBUG if (l_HIO.field_0x42 != 0) { if (l_HIO.field_0x44 == getChainID()) { dDbVw_Report(0x28, 200, "Num<%d>Len<%.2f>", getCurrentChainNum(), @@ -458,7 +458,7 @@ void daObjSwChain_c::chain_control() { cXyz* pcVar1 = &chains_p1->field_0x34; pcVar2 = pcVar1; f32 fVar2 = - #ifdef DEBUG + #if DEBUG l_HIO.mGravity; #else -6.0f; @@ -470,7 +470,7 @@ void daObjSwChain_c::chain_control() { fVar2 *= KREG_F(2) + 0.099999994f; } else { fVar2 = - #ifdef DEBUG + #if DEBUG l_HIO.mGravity; #else -6.0f; @@ -480,7 +480,7 @@ void daObjSwChain_c::chain_control() { fVar2 *= KREG_F(2) + 0.099999994f; } else { fVar2 = - #ifdef DEBUG + #if DEBUG l_HIO.mGravity; #else -6.0f; @@ -534,7 +534,7 @@ void daObjSwChain_c::chain_control() { sp94.normalizeZP(); f32 fVar3 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc; #else 35.0f; @@ -542,7 +542,7 @@ void daObjSwChain_c::chain_control() { if (topChainNo == mChainNum - 1) { fVar3 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0x10; #else 35.0f; @@ -550,7 +550,7 @@ void daObjSwChain_c::chain_control() { } if (fVar1 <= fVar3 - - #ifdef DEBUG + #if DEBUG l_HIO.field_0x14 #else 8.0f @@ -558,7 +558,7 @@ void daObjSwChain_c::chain_control() { ) { fVar1 = fVar3 - - #ifdef DEBUG + #if DEBUG l_HIO.field_0x14; #else 8.0f; @@ -604,7 +604,7 @@ void daObjSwChain_c::chain_control2() { mDoMtx_stack_c::get()[2][3] = 0.0f; mDoMtx_stack_c::multVec(&sp90, &sp90); sp78 += sp90; - #ifdef DEBUG + #if DEBUG field_0xac0 = sp78; #endif @@ -631,7 +631,7 @@ void daObjSwChain_c::chain_control2() { mDoMtx_stack_c::XrotM(-field_0xa6e); mDoMtx_stack_c::multVec(&sp78, &sp84); sp84 += field_0xa78; - #ifdef DEBUG + #if DEBUG field_0xac0 = sp84; #endif *pcVar1 = sp84; @@ -648,7 +648,7 @@ void daObjSwChain_c::chain_control2() { spb4.z = 0.0f; spb4.x = 0.0f; spb4.y *= - #ifdef DEBUG + #if DEBUG l_HIO.field_0x18; #else 0.0f; @@ -684,7 +684,7 @@ void daObjSwChain_c::chain_control2() { spcc.normalizeZP(); f32 fVar3 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc; #else 35.0f; @@ -692,7 +692,7 @@ void daObjSwChain_c::chain_control2() { if (i == mChainNum - 1) { fVar3 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0x10; #else 35.0f; @@ -700,7 +700,7 @@ void daObjSwChain_c::chain_control2() { } if (fVar1 <= fVar3 - - #ifdef DEBUG + #if DEBUG l_HIO.field_0x14 #else 8.0f @@ -708,7 +708,7 @@ void daObjSwChain_c::chain_control2() { ) { fVar1 = fVar3 - - #ifdef DEBUG + #if DEBUG l_HIO.field_0x14; #else 8.0f; @@ -805,7 +805,7 @@ void daObjSwChain_c::chain_count_control() { int roomNo = fopAcM_GetRoomNo(this); f32 fVar1 = sp60.abs(chains_p->field_0x34); f32 fVar2 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc #else 35.0f @@ -819,7 +819,7 @@ void daObjSwChain_c::chain_count_control() { if (roomNo != 4 && roomNo != 6) { for (fVar1 -= fVar2; fVar1 > 0.0f;) { fVar1 -= - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc; #else 35.0f; @@ -850,7 +850,7 @@ void daObjSwChain_c::chain_count_control() { chains_p2->field_0x34.z = (chains_p->field_0x34.z + sp60.z) * 0.5f; } } else if (fVar1 < - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc #else 35.0f @@ -883,13 +883,13 @@ void daObjSwChain_c::chain_count_control() { topChain_p->field_0x34 = mChains->field_0x34; if ( (!bVar1 && pow > - #ifdef DEBUG + #if DEBUG l_HIO.mSwitchOnTension #else 10.0f #endif ) || (bVar1 && pow > - #ifdef DEBUG + #if DEBUG l_HIO.field_0x2c #else 1.5f @@ -916,13 +916,13 @@ void daObjSwChain_c::chain_count_control() { topChain_p->field_0x34 = mChains->field_0x34; if ( (!daPy_getPlayerActorClass()->checkBootsOrArmorHeavy() && pow > - #ifdef DEBUG + #if DEBUG l_HIO.mSwitchOnTension #else 10.0f #endif ) || (daPy_getPlayerActorClass()->checkBootsOrArmorHeavy() && pow > - #ifdef DEBUG + #if DEBUG l_HIO.field_0x2c #else 1.5f @@ -933,7 +933,7 @@ void daObjSwChain_c::chain_count_control() { if (getSwbit() != 0xFF) { if (!fopAcM_isSwitch(this, getSwbit()) && field_0xa68 > - #ifdef DEBUG + #if DEBUG l_HIO.mSwitchOnTime #else 0 @@ -992,7 +992,7 @@ void daObjSwChain_c::setTension() { f32 len = spc8.abs(spbc); f32 max = - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc #else 35.0f @@ -1001,7 +1001,7 @@ void daObjSwChain_c::setTension() { if (roomNo == 4 || roomNo == 6) { max = (field_0xa67 + AREG_S(0) + -1) * - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc; #else 35.0f; @@ -1032,7 +1032,7 @@ void daObjSwChain_c::setTension() { cXyz spe0(mChains->field_0x34 - mChains[mChainNum].field_0x34); player->setOutPower(pow, cM_atan2s(spe0.x, spe0.z), 0); - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x41 != 0) { dDbVw_Report(40, 260, "len<%.2f>max<%.2f>pow<%.2f>pl_spd<%.2f>", len, max, pow, player->getSpeedF()); } @@ -1050,7 +1050,7 @@ void daObjSwChain_c::setTension() { if (daPy_py_c::checkNowWolf()) { fVar1 = - #ifdef DEBUG + #if DEBUG l_HIO.mTensionWolf; #else 13.0f; @@ -1059,14 +1059,14 @@ void daObjSwChain_c::setTension() { f32 fVar7; if (daPy_getPlayerActorClass()->checkBootsOrArmorHeavy()) { fVar7 = - #ifdef DEBUG + #if DEBUG l_HIO.mTensionBootsEquipped; #else 2.1f; #endif } else { fVar7 = - #ifdef DEBUG + #if DEBUG l_HIO.mTension; #else 15.0f; @@ -1115,7 +1115,7 @@ int daObjSwChain_c::draw() { g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x41 != 0) { cXyz sp2c; mDoMtx_stack_c::YrotS(shape_angle.y); @@ -1165,7 +1165,7 @@ int daObjSwChain_c::draw() { int daObjSwChain_c::_delete() { dComIfG_resDelete(&mPhase, l_arcName); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index fbceaee644..d7a82cc7e3 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -347,7 +347,7 @@ void daObjSwpush::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) cXyz spa8; int vtxnum = i_this->mpBgW->GetVtxNum(); - #ifdef DEBUG + #if DEBUG for (int i = 0; i < 4; i++) { JUT_ASSERT(859, M_op_vtx[i] < vtxnum); } diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index c181ec45be..868bdce1fa 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG daObjThDoor_HIO_c::daObjThDoor_HIO_c() { } @@ -127,10 +127,10 @@ int daObjThDoor_c::create1st() { return rv; } - #ifdef DEBUG // Telma's door OS_REPORT("テルマの家のドア：sw<%d>msg<%d>\n", getSwbit(), getMsg()); + #if DEBUG // Telma's door l_HIO.entryHIO("テルマの家のドア"); #endif @@ -329,7 +329,7 @@ int daObjThDoor_c::Draw() { int daObjThDoor_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index efda2a889a..620671511f 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" #endif @@ -79,7 +79,7 @@ static int daObj_Toby_Draw(obj_toby_class* i_this) { } } - #ifdef DEBUG + #if DEBUG if (mDoCPd_c::getHoldY(PAD_2)) { GXColor local_104; local_104.r = 100; diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index f196f24419..da5fc97992 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -13,7 +13,7 @@ #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" -#ifdef DEBUG +#if DEBUG daObjTobyHouse_HIO_c l_HIO; daObjTobyHouse_HIO_c::daObjTobyHouse_HIO_c() { @@ -153,7 +153,7 @@ int daObjTobyHouse_c::Create() { for (int i = 0; i < 2; i++) { mEventIds[i] = (s16)dComIfGp_getEventManager().getEventIdx(this, l_event_name[i], 0xff); - #ifdef DEBUG + #if DEBUG if (mEventIds[i] == -1) { // Cannon shed - failure to obtain event OS_REPORT_ERROR("大砲小屋：イベント取得失敗\n"); @@ -236,7 +236,7 @@ int daObjTobyHouse_c::create1st() { return rv; } - #ifdef DEBUG + #if DEBUG // Toby's Cannon Shack l_HIO.entryHIO("トビーの大砲小屋"); #endif @@ -519,7 +519,7 @@ int daObjTobyHouse_c::Draw() { mDoExt_bckAnmRemove(mModel->getModelData()); } - #ifdef DEBUG + #if DEBUG if (l_HIO.mDrawCollision) { mpBgW->CalcPlane(); } @@ -572,7 +572,7 @@ int daObjTobyHouse_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName[mType]); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index 0c12d3f554..335ce5b8a3 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -95,7 +95,7 @@ int daTogeTrap_c::create() { init_modeWait(); setBaseMtx(); - #ifdef DEBUG + #if DEBUG // Spike traps l_HIO.entryHIO("トゲトラップ"); #endif @@ -268,7 +268,7 @@ int daTogeTrap_c::Draw() { int daTogeTrap_c::Delete() { dComIfG_resDelete(&mPhase, "P_Toge"); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(this); #endif diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 8c45cd2a45..617ae6ee6d 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -19,7 +19,7 @@ public: daObj_TomHIO_c(); virtual ~daObj_TomHIO_c() {} - #ifdef DEBUG + #if DEBUG void genMessage(JORMContext* context) { // Golden dragonfly context->genLabel("黄金蟲(トンボ)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index 465d355bbe..de87cf879b 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -88,7 +88,7 @@ int daTreeSh_c::create1st() { return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG l_HIO.entryHIO("針葉樹"); #endif } @@ -128,7 +128,7 @@ int daTreeSh_c::Draw() { int daTreeSh_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 05cee13772..4df7a162a7 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -28,7 +28,7 @@ daTwGate_HIO_c::daTwGate_HIO_c() { mRange = 1900.0f; } -#ifdef DEBUG +#if DEBUG void daTwGate_HIO_c::genMessage(JORMContext* ctx) { // Range ctx->genSlider("範囲", &mRange, 0.0f, 500000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); @@ -139,7 +139,7 @@ int daTwGate_c::create() { mLine.SetStartEnd(l_cheeckPos0[mGateType], l_cheeckPos1[mGateType]); mBrk.setPlaySpeed(-1.0f); - #ifdef DEBUG + #if DEBUG // Twilight Gate l_HIO.entryHIO("トワイライトゲート"); #endif @@ -186,7 +186,7 @@ int daTwGate_c::Draw() { int daTwGate_c::Delete() { dComIfG_resDelete(&mPhase, l_resNameIdx[mGateType]); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(this); #endif diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 935311f4cc..78bdcb22d7 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -15,7 +15,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" -#ifdef DEBUG +#if DEBUG daObjVolcBom_HIO_c::daObjVolcBom_HIO_c() { } @@ -118,7 +118,7 @@ int daObjVolcBom_c::Create() { } } - #ifdef DEBUG + #if DEBUG if (mEffectJntNo != 0xffff) { mBtk1->entry(mModel1->getModelData()); mModel1->calcMaterial(); @@ -211,7 +211,7 @@ int daObjVolcBom_c::create1st() { return rv; } - #ifdef DEBUG + #if DEBUG // The Great Lava Bombs l_HIO.entryHIO("大溶岩弾"); #endif @@ -227,7 +227,7 @@ int daObjVolcBom_c::Execute(Mtx** i_mtx) { mBtk1->play(); mBrk1->play(); - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x14 != 0) { switch (mMode) { case MODE_WAIT_APPEAR: @@ -260,7 +260,7 @@ void daObjVolcBom_c::mode_proc_call() { cXyz scale(mBaseScale, mBaseScale, mBaseScale); mModel1->setBaseScale(scale); - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x15 != 0) { fopAc_ac_c* player = dComIfGp_getPlayer(0); current.pos.x = player->current.pos.x; @@ -800,7 +800,7 @@ int daObjVolcBom_c::Draw() { mModel1->calc(); } - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x34 != 0) { cXyz cStack_24; @@ -835,7 +835,7 @@ int daObjVolcBom_c::Draw() { } int daObjVolcBom_c::Delete() { - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x04 != 0) { fopAcM_offSwitch(this, getSwbit()); } @@ -850,7 +850,7 @@ int daObjVolcBom_c::Delete() { endBindEffect(); dComIfG_resDelete(&mPhase, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 8c66522d24..5cc6be037f 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -127,7 +127,7 @@ int daObjWarpKBrg_c::Create() { } } - #ifdef DEBUG + #if DEBUG if (mEffJointNo == 0xFFFF) { // "Kakariko Bridge: joint effect_p not found" OSReport_Error("カカリコ橋；ジョイント effect_p が見つかりませんでした\n"); diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index aefe9d1e19..83731e4b54 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -23,7 +23,7 @@ daWtGate_HIO_c::daWtGate_HIO_c() { field_0x9 = 4; } -#ifdef DEBUG +#if DEBUG void daWtGate_HIO_c::genMessage(JORMContext* ctx) { // "Maximum speed" ctx->genSlider("最大速度", &mMaxSpeed, 0.1, 500.0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); @@ -82,7 +82,7 @@ cPhs__Step daWtGate_c::create() { // "Sluice gate(Lv3)" - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("水門(Lv3)"); #endif } @@ -180,7 +180,7 @@ int daWtGate_c::Draw() { int daWtGate_c::Delete() { dComIfG_resDelete(&mPhase, "S_Zsuimon"); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index b541439e4b..0a13402949 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -12,7 +12,7 @@ #include "d/d_item_data.h" #include "d/d_s_play.h" -#ifdef DEBUG +#if DEBUG class daObjWStatue_HIO_c : public fOpAcm_HIO_entry_c { public: @@ -125,7 +125,7 @@ int daObjWStatue_c::Create() { eventInfo.setArchiveName(l_arcName); mEventIdx = (s16)dComIfGp_getEventManager().getEventIdx(this, l_eventName, 0xff); - #ifdef DEBUG + #if DEBUG if (mEventIdx == -1) { // Wooden statue: Event acquisition failure OS_REPORT_ERROR("木彫りの像：イベント取得失敗\n"); @@ -159,7 +159,7 @@ int daObjWStatue_c::create() { return cPhs_ERROR_e; } - #ifdef DEBUG + #if DEBUG // Wooden statue l_HIO.entryHIO("木彫りの像"); #endif @@ -279,7 +279,7 @@ int daObjWStatue_c::actionSwOnWait() { switch (field_0x93a) { case 0: if (iVar2 == NULL) { - #ifdef DEBUG + #if DEBUG mRespawnTimer = l_HIO.mRespawnTimer; #else mRespawnTimer = 30; @@ -438,7 +438,7 @@ void daObjWStatue_c::setListStart() {} int daObjWStatue_c::_delete() { DeleteBase(dItem_data::getFieldArc(m_itemNo)); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(this); #endif diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index 2218b10a10..fc7836276b 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -572,7 +572,7 @@ void daPasserMng_c::create_init() { ind++; } } - #ifdef DEBUG + #if DEBUG OS_REPORT("初期ばらまき位置 Path=%d ", getPathID()); for (int i = 0; i < max; i++) { OS_REPORT("%d, ", arr[i]); diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 96c53a8ee5..89d319ae89 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -55,7 +55,7 @@ static BOOL hitCheck(daSwc00_c* i_swc) { return FALSE; } -#ifdef DEBUG +#if DEBUG int daSwc00_Draw(daSwc00_c* i_this) { fopAc_ac_c* a_this = i_this; @@ -329,7 +329,7 @@ static actor_method_class l_daSwc00_Method = { (process_method_func)daSwc00_Delete, (process_method_func)daSwc00_Execute, (process_method_func)daSwc00_IsDelete, - #ifdef DEBUG + #if DEBUG (process_method_func)daSwc00_Draw, #else NULL diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index a16c01d993..be9557c131 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -27,25 +27,19 @@ int daTag_ShopItem_c::create() { if (getGroupID() == 15) { mCreateTimer = 150; -#ifdef DEBUG // "Event Item\n" - OSReport("イベントアイテム\n"); -#endif + OS_REPORT("イベントアイテム\n"); if (getSwitchBit1() != 0xFF) { if (!dComIfGs_isSaveSwitch(getSwitchBit1())) { dComIfGs_onSaveSwitch(getSwitchBit2()); field_0x572 = true; mCreateTimer = 0; -#ifdef DEBUG // "Before Talk\n" - OSReport("会話前\n"); -#endif + OS_REPORT("会話前\n"); } else { -#ifdef DEBUG // "After Talk\n" - OSReport("会話後\n"); -#endif + OS_REPORT("会話後\n"); } } } else { @@ -54,20 +48,16 @@ int daTag_ShopItem_c::create() { if (getSwitchBit1() != 0xFF) { if (dComIfGs_isSaveSwitch(getSwitchBit1())) { mCreateTimer = 150; -#ifdef DEBUG // "Already Sold\n" - OSReport("もう売れたよ\n"); -#endif + OS_REPORT("もう売れたよ\n"); } } if (getSwitchBit2() != 0xFF) { if (!dComIfGs_isSaveSwitch(getSwitchBit2())) { mCreateTimer = 150; -#ifdef DEBUG // "Not sold yet\n" - OSReport("まだ売れない\n"); -#endif + OS_REPORT("まだ売れない\n"); } } } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 34b5811972..fcbdbd8c25 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1299,7 +1299,7 @@ u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) { } } -#ifdef DEBUG +#if DEBUG // "====Bomb Bag count is %d====\n" OS_REPORT("====バクダン袋の数は %d 個です====\n", bag_count); for (int i = 0; i < 3; i++) { diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 550fe2c21a..346ce45c97 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -107,7 +107,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { var_f31 = dStage_FileList_dt_SeaLevel(filelist_p); } -#ifdef DEBUG +#if DEBUG if (g_kankyoHIO.vrbox.field_0x14 != 0) { var_f31 = g_kankyoHIO.vrbox.m_horizonHeight; } else { @@ -139,7 +139,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { cXyz sp14; sp14 = sun_p->mPos[0]; -#ifndef DEBUG +#if !DEBUG cXyz sp8; if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0) { dKyr_get_vectle_calc(&camera_p->lookat.eye, &g_env_light.sun_pos, &sp8); diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index 3a021961b8..ea16657ddd 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -53,15 +53,11 @@ static int daWarpBug_Draw(daWarpBug_c* i_this) { } int daWarpBug_c::draw() { -#ifdef DEBUG +#if DEBUG daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); if (!player_p->checkMidnaWarp()) { -#endif - field_0x57c = 0; return 1; - -#ifdef DEBUG } cLib_chaseS(&field_0x57c, 255, 25); @@ -94,20 +90,22 @@ int daWarpBug_c::draw() { mpBtk->entry(modelData); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); +#else + field_0x57c = 0; +#endif return 1; -#endif } int daWarpBug_c::execute() { -#ifdef DEBUG +#if DEBUG daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); #endif mDoMtx_stack_c::copy(mpModel->getBaseTRMtx()); mDoMtx_stack_c::multVecZero(¤t.pos); -#ifdef DEBUG +#if DEBUG if (player_p->checkMidnaWarp()) { mpBrk->play(); mpBtk->play(); diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 9a33c16168..208d44d0d7 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -29,7 +29,7 @@ struct daYkgr_HIO_c : public mDoHIO_entry_c { /* 0x24 */ f32 field_0x24; }; -#ifdef DEBUG +#if DEBUG void daYkgr_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel("竜の山陽炎HIO", 0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); ctx->genSlider("アルファ速度", &field_0xc, 0, 255, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); @@ -155,7 +155,7 @@ inline int daYkgr_c::_create() { field_0x5a8 = 0.0f; stop(); } -#ifdef DEBUG +#if DEBUG l_HIO.entryHIO("竜の山陽炎"); #endif } else { @@ -177,7 +177,7 @@ static int daYkgrCreate(void* i_this) { } inline int daYkgr_c::_delete() { -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; @@ -250,13 +250,10 @@ inline int daYkgr_c::_draw() { set_mtx(); if (m_emitter != NULL) { m_emitter->setGlobalRTMatrix(field_0x570); -#ifdef DEBUG - if (l_HIO.field_0x4 != 0) { + if (DEBUG && l_HIO.field_0x4 != 0) { m_emitter->setGlobalAlpha(l_HIO.field_0x8); YkgrCB.setParam(l_HIO.field_0x10); - } else -#endif - { + } else { m_emitter->setGlobalAlpha(m_alpha); } } diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc index f798a78a3e..de57e158ee 100644 --- a/src/d/actor/d_flower.inc +++ b/src/d/actor/d_flower.inc @@ -569,19 +569,15 @@ void dFlower_packet_c::draw() { dKy_setLight_nowroom_grass(sp50->room_no, 1.0f); for (dFlower_data_c* sp44 = sp5C->getData(); sp44 != NULL; sp44 = sp44->mp_next) { -#if DEBUG - if (g_kankyoHIO.navy.grass_adjust_ON != 0) { + if (DEBUG && g_kankyoHIO.navy.grass_adjust_ON != 0) { sp64.r = g_kankyoHIO.navy.grass_ambcol.r * 2; sp64.g = g_kankyoHIO.navy.grass_ambcol.g * 2; sp64.b = g_kankyoHIO.navy.grass_ambcol.b * 2; } else { -#endif sp64.r = (sp44->field_0x04 & 0x1F) * 2; sp64.g = ((sp44->field_0x04 >> 5) & 0x1F) * 2; sp64.b = ((sp44->field_0x04 >> 0xA) & 0x1F) * 2; -#if DEBUG } -#endif if (daPy_py_c::checkNowWolfPowerUp()) { f32 var_f31 = g_env_light.bg_amb_col[0].r / 255.0f; diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index e5f470b74a..759bbe0f09 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -642,13 +642,11 @@ void dGrass_packet_c::draw() { GXColor sp38; -#if DEBUG - if (g_kankyoHIO.navy.grass_adjust_ON) { + if (DEBUG && g_kankyoHIO.navy.grass_adjust_ON) { sp38.r = g_kankyoHIO.navy.grass_ambcol.r * 2; sp38.g = g_kankyoHIO.navy.grass_ambcol.g * 2; sp38.b = g_kankyoHIO.navy.grass_ambcol.b * 2; } else { -#endif sp38.r = (var_r29->m_addCol & 0x1F) * 2; sp38.g = ((var_r29->m_addCol >> 5) & 0x1F) * 2; sp38.b = ((var_r29->m_addCol >> 0xA) & 0x1F) * 2; @@ -693,9 +691,7 @@ void dGrass_packet_c::draw() { } else { sp38.b = sp38.b * var_f28; } -#ifdef DEBUG } -#endif GXSetChanAmbColor(GX_COLOR0A0, sp38); diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index bfc7628675..d41cef2b19 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -1196,11 +1196,9 @@ void dAttention_c::judgementStatus4Hold() { } } -#if DEBUG if (var_r29 != mAttnStatus) { OS_REPORT("%06d: attention: status %d, %d -> %d (%d)\n", g_Counter.mCounter0, mLockonCount, var_r29, mAttnStatus, var_r30); } -#endif } void dAttention_c::judgementStatus4Switch() { @@ -1320,11 +1318,9 @@ void dAttention_c::judgementStatus4Switch() { } } -#if DEBUG if (var_r29 != mAttnStatus) { OS_REPORT("%06d: attention: status %d, %d -> %d (%d)\n", g_Counter.mCounter0, mLockonCount, var_r29, mAttnStatus, var_r30); } -#endif } int dAttention_c::Run() { diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index f08202e857..b618cc0b6a 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -1004,7 +1004,7 @@ struct wcs_data { static wcs_data l_wcsbuf[84]; -#ifdef DEBUG +#if DEBUG static u8 lit_5300[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -1168,7 +1168,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) { sp_e8 = &l_wcsbuf[wcsIndex_e4]; wcsIndex_e4++; } else { - #ifdef DEBUG + #if DEBUG lit_5300[0] = 1; #endif } @@ -1182,7 +1182,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) { // local_118->_0 = l_wcsbuf[local_11c]._0; wcsIndex_e4++; } else { - #ifdef DEBUG + #if DEBUG lit_5300[0] = 1; #endif } @@ -1197,7 +1197,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) { sp_a8->next = &l_wcsbuf[wcsIndex_e4]; wcsIndex_e4++; } else { - #ifdef DEBUG + #if DEBUG lit_5300[0] = 1; #endif } @@ -1217,7 +1217,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) { sp_a8->next = &l_wcsbuf[wcsIndex_e4]; wcsIndex_e4++; } else { - #ifdef DEBUG + #if DEBUG lit_5300[0] = 1; #endif } diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 5bc923bbf3..d99996c45c 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1783,7 +1783,7 @@ void dComIfGs_gameStart() { dComIfGp_setNextStage(name, point, roomNo, -1, 0.0f, 0, 1, 0, 0, 0, 0); } -#ifdef DEBUG +#if DEBUG void dComIfG_playerStatusD() { dComIfGs_setDataNum(0); dComIfGs_setMaxLife(50); diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 29c15637e5..f199a7a3b9 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -28,7 +28,7 @@ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData break; } default: -#ifdef DEBUG +#if DEBUG JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "unknown data-type : " << iType << "\n demo-object : " << adaptor_getID_string(); int x = 0; @@ -96,7 +96,7 @@ dDemo_actor_c::~dDemo_actor_c() { mBtkId = -1; mBrkId = -1; - #ifdef DEBUG + #if DEBUG if(dComIfGp_event_getMode() == 0) { g_dComIfG_gameInfo.play.getEvent().setDebugStb(0); } diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 3d73e1ef2e..6494dacb34 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -512,7 +512,7 @@ bool dCamera_c::fixedFrameEvCamera() { fframe_p->field_0x0 = getEvIntData(&fframe_p->mTimer, "Timer", -1); getEvStringData(fframe_p->mRelUseMask, "RelUseMask", "oo"); -#ifdef DEBUG +#if DEBUG if (strlen(fframe_p->mRelUseMask) != 2) { OSReport("camera: event: bad length -> xx\n"); strcpy(fframe_p->mRelUseMask, "xx"); @@ -1892,7 +1892,7 @@ bool dCamera_c::maptoolIdEvCamera() { if (mEventData.field_0xc != 0xFF) { s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[mIsWolf][0]; -#ifdef DEBUG +#if DEBUG if (mCurCamStyleTimer == 0) { OSReport("type %d mode %d style %d\n", mEventData.field_0xc, 0, style); } @@ -2541,7 +2541,7 @@ bool dCamera_c::tactEvCamera() { } } -#ifdef DEBUG +#if DEBUG if (mCamSetup.CheckFlag(0x8000)) { dDbVw_Report(20, 250, " %d", tact_p->field_0x0); } @@ -2647,7 +2647,7 @@ bool dCamera_c::loadEvCamera() { dComIfGp_loadCameraPosition(0, &load->field_0x28, &load->field_0x34, &load->field_0x48, &local_b0); load->field_0x42 = cSAngle(local_b0); } else { -#ifdef DEBUG +#if DEBUG if (mSavedViewStack[load->mSlot].field_0x1e == 0 || load->mSlot >= 2) { OS_REPORT("camera: event: LOAD: warning!! slot %d not saved\n", load->mSlot); } @@ -3417,7 +3417,7 @@ bool dCamera_c::fixedFramesEvCamera() { fframes_p->field_0x0 = getEvIntData(&fframes_p->mTimer, "Timer", const_1_val); getEvStringData(&fframes_p->mRelUseMask, "RelUseMask", "oo"); -#ifdef DEBUG +#if DEBUG if (strlen(&fframes_p->mRelUseMask) != 2) { OSReport("camera: event: bad length -> xx\n"); strcpy(&fframes_p->mRelUseMask, "xx"); @@ -3959,7 +3959,7 @@ bool dCamera_c::bspTransEvCamera() { bspTrans->mSplinePath1.Step(); getEvStringData(use1, "Use1", "ooxxxx"); -#ifdef DEBUG +#if DEBUG if (strlen(use1) != 6) { OSReport("camera: event: bad length -> xxxxxx\n"); strcpy(use1, "xxxxxx"); @@ -3979,7 +3979,7 @@ bool dCamera_c::bspTransEvCamera() { bspTrans->mSplinePath2.Step(); getEvStringData(use2, "Use2", "xxooox"); -#ifdef DEBUG +#if DEBUG if (strlen(use2) != 6) { OSReport_Error("camera: event: bad length -> xxxxxx\n"); strcpy(use2, "xxxxxx"); @@ -3994,7 +3994,7 @@ bool dCamera_c::bspTransEvCamera() { if (bspTrans->mRelActor) { getEvStringData(&bspTrans->mRelUseMask, "RelUseMask", "oo"); -#ifdef DEBUG +#if DEBUG if (strlen(&bspTrans->mRelUseMask) != 2) { OSReport_Error("camera: event: bad length -> xx\n"); strcpy(&bspTrans->mRelUseMask, "xx"); diff --git a/src/d/d_event_debug.cpp b/src/d/d_event_debug.cpp index 10fecd3cf4..91aa103807 100644 --- a/src/d/d_event_debug.cpp +++ b/src/d/d_event_debug.cpp @@ -1,4 +1,3 @@ -#ifdef DEBUG #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event_debug.h" @@ -447,5 +446,3 @@ char* dEvDb_flag_base_c::searchDirNameReg(int bit) { return NULL; } - -#endif diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index ef7a0572ae..f6efd6d107 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -641,14 +641,12 @@ void dEvent_manager_c::Sequencer() { break; } - if ( + if ((dStage_MapEvent_dt_c_getEventSCutSW(mapdata) != 0 #if DEBUG - (dStage_MapEvent_dt_c_getEventSCutSW(mapdata) != 0 || l_HIO.m_enable_skip) && - #else - dStage_MapEvent_dt_c_getEventSCutSW(mapdata) != 0 && + || l_HIO.m_enable_skip #endif - !evtControl.chkFlag2(2) - ) { + ) && + !evtControl.chkFlag2(2)) { int scut_type = dStage_MapEvent_dt_c_getEventSCutType(mapdata); if (scut_type == 2) { evtControl.onSkipFade(); diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 013995e0c1..5c9deff6ed 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -517,30 +517,32 @@ void dKy_twi_wolflight_set(int light_id) { if (g_kankyoHIO.navy.room_light_type != 0) { size = g_kankyoHIO.navy.room_light_type - 1; } - - if (!g_kankyoHIO.navy.camera_light_adjust_ON) { #endif - switch (size) { - case LIGHT_SIZE_S: - kankyo->field_0x0c18[light_id].mPos.y += 1500.0f; - break; - case LIGHT_SIZE_M: - kankyo->field_0x0c18[light_id].mPos.y += 500.0f; - break; - case LIGHT_SIZE_L: - kankyo->field_0x0c18[light_id].mPos.y += 1000.0f; - break; - case LIGHT_SIZE_LL: - kankyo->field_0x0c18[light_id].mPos.y += 1500.0f; - break; - default: - kankyo->field_0x0c18[light_id].mPos.y += 500.0f; - break; - } - #if DEBUG - } else { + if (!g_kankyoHIO.navy.camera_light_adjust_ON) + #endif + { + switch (size) { + case LIGHT_SIZE_S: + kankyo->field_0x0c18[light_id].mPos.y += 1500.0f; + break; + case LIGHT_SIZE_M: + kankyo->field_0x0c18[light_id].mPos.y += 500.0f; + break; + case LIGHT_SIZE_L: + kankyo->field_0x0c18[light_id].mPos.y += 1000.0f; + break; + case LIGHT_SIZE_LL: + kankyo->field_0x0c18[light_id].mPos.y += 1500.0f; + break; + default: + kankyo->field_0x0c18[light_id].mPos.y += 500.0f; + break; + } + } + #if DEBUG + else { kankyo->field_0x0c18[light_id].mPos.y += g_kankyoHIO.navy.camera_light_y_shift; } #endif @@ -1072,10 +1074,8 @@ static void plight_set() { dKy_plight_set(&g_env_light.mLightInfluence[plight_no]); plight_no++; } else { -#ifdef DEBUG // "\nToo many Point Lights set!!!" - OSReport_Warning("\nポイントライトマップ配置が多すぎます！！！"); -#endif + OS_WARNING("\nポイントライトマップ配置が多すぎます！！！"); } } } @@ -1460,10 +1460,7 @@ static void envcolor_init() { } #endif - #if DEBUG - if (g_env_light.time_change_rate < 1000.0f) - #endif - { + if (!DEBUG || g_env_light.time_change_rate < 1000.0f) { stage_stag_info_class* stageinfo = dComIfGp_getStage()->getStagInfo(); int stage_time = dStage_stagInfo_GetTimeH(stageinfo); if ((s8)stage_time >= 0) { @@ -1471,14 +1468,11 @@ static void envcolor_init() { } } - #if DEBUG - if (g_env_light.time_change_rate >= 2000.0f) { + if (DEBUG && g_env_light.time_change_rate >= 2000.0f) { g_env_light.time_change_rate = 0.03f; - } else if (g_env_light.time_change_rate >= 1000.0f) { + } else if (DEBUG && g_env_light.time_change_rate >= 1000.0f) { g_env_light.time_change_rate = 0.0f; - } else - #endif - { + } else { g_env_light.time_change_rate = 0.012f; } diff --git a/src/d/d_kankyo_data.cpp b/src/d/d_kankyo_data.cpp index 0bb6db6d57..c572533fde 100644 --- a/src/d/d_kankyo_data.cpp +++ b/src/d/d_kankyo_data.cpp @@ -773,10 +773,7 @@ static GXFogAdjTable S_xfog_table_data[2] = { }; void dKyd_xfog_table_set(u8 tblIdx) { - #if DEBUG - if (g_kankyoHIO.light.field_0x5 != 1) - #endif - { + if (!(DEBUG && g_kankyoHIO.light.field_0x5 == 1)) { for (int i = 0; i < 10; i++) { g_env_light.mXFogTbl.r[i] = S_xfog_table_data[tblIdx].r[i]; } diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index e030ea5553..0676ae8ec2 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -1859,7 +1859,7 @@ void vrkumo_move() { if (filelist != NULL) { sp2C = dStage_FileList_dt_SeaLevel(filelist); - #ifdef DEBUG + #if DEBUG if (g_kankyoHIO.vrbox.field_0x14) { sp2C = g_kankyoHIO.vrbox.m_horizonHeight; } else { @@ -4624,7 +4624,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { sp70 = dStage_FileList_dt_SeaLevel(filelist); } -#ifdef DEBUG +#if DEBUG if (g_kankyoHIO.vrbox.field_0x14) { sp70 = g_kankyoHIO.vrbox.m_horizonHeight; } else { @@ -4714,7 +4714,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { static f32 howa_loop_cnt = 0.0f; -#ifdef DEBUG +#if DEBUG spAC = g_kankyoHIO.navy.cloud_sunny_size; spA8 = g_kankyoHIO.navy.cloud_cloudy_size; #else diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 0970a754c1..498d0c6356 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -801,7 +801,7 @@ void dMeter_drawLightDropHIO_c::genMessage(JORMContext* mctx) { #endif dMeter_drawHIO_c::dMeter_drawHIO_c() { - #ifdef DEBUG + #if DEBUG field_0x8_debug = 0; #endif mLifeTopPosX = 40.0f; diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index 11320c468c..5e3443e72e 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1971,7 +1971,7 @@ void jmessage_tSequenceProcessor::do_end() { bool jmessage_tSequenceProcessor::do_isReady() { jmessage_tReference* pReference = (jmessage_tReference*)getReference(); - #ifdef DEBUG + #if DEBUG if (pReference->getRevoMessageID() != 0) { return 0; } diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index a2cd304fd7..3201873387 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -68,7 +68,7 @@ void dMsgFlow_c::init(fopAc_ac_c* i_partner, int i_flowID, int param_2, fopAc_ac setNodeIndex(nodeIdx, i_talkPartners); } -#ifdef DEBUG +#if DEBUG dbgPrint(); #endif dMsgObject_setSelectWordFlag(0); @@ -457,7 +457,7 @@ int dMsgFlow_c::setSelectMsg(mesg_flow_node* i_flowNode_p, mesg_flow_node* param // "Message Set (Select)" OS_REPORT("\x1B[44;37mメッセ−ジセット（選択）　　　　　　\x1B[m|:"); -#ifdef DEBUG +#if DEBUG if (i_speaker_p != NULL) { const char* speaker_name = fopAcM_getProcNameString(i_speaker_p); OS_REPORT("flow:%d, msg:%d(%d), speaker:%s\n", mFlow, msg_no, temp_r25, speaker_name); @@ -501,7 +501,7 @@ int dMsgFlow_c::setNormalMsg(mesg_flow_node* i_flowNode_p, fopAc_ac_c* i_speaker // "Message Set" OS_REPORT("\x1B[44;37mメッセ−ジセット　　　　　　　　　　\x1B[m|:"); -#ifdef DEBUG +#if DEBUG if (i_speaker_p != NULL) { const char* speaker_name = fopAcM_getProcNameString(i_speaker_p); OS_REPORT("flow:%d, msg:%d, speaker:%s\n", mFlow, msg_no, speaker_name); @@ -761,7 +761,7 @@ queryFunc dMsgFlow_c::mQueryList[53] = { &dMsgFlow_c::query053, }; -#ifdef DEBUG +#if DEBUG void dMsgFlow_c::dbgPrint() {} #endif diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index 4e16e8afd3..02943d326c 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -34,7 +34,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { int iVar6 = dMsgObject_getMessageID(); bool bVar5 = false; - #ifdef DEBUG + #if DEBUG if (dMsgObject_getMessageID() >= 0x10cc && dMsgObject_getMessageID() < 0x11cc) { mItemIndex = dMsgObject_getMessageID() - 0x10cc; bVar5 = true; @@ -122,7 +122,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { dMeter2Info_setItemColor( mItemIndex, mpItemPane[0], mpItemPane[1], mpItemPane[2], NULL); - #ifdef DEBUG + #if DEBUG if (mItemIndex == 0x81 || mItemIndex == 0x23) { field_0x19e = true; } diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 5fb9236417..bebfec7a0c 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -294,7 +294,7 @@ void dMsgUnit_c::setTag(int i_type, int i_value, char* o_buffer, bool param_4) { // This section is weird. The debug seems like entriesStr is outside the condition // but the normal build doesn't really work with that. Same for pInfoBlock->entries. -#ifdef DEBUG +#if DEBUG dMsgUnit_inf1_entry* entriesInf = &pInfoBlock->entries[i_type]; u32 dat1EntryOffset = entriesInf->dat1EntryOffset; const char* uVar5; @@ -322,13 +322,13 @@ void dMsgUnit_c::setTag(int i_type, int i_value, char* o_buffer, bool param_4) { #else if (i_value == 1) { #endif -#ifdef DEBUG +#if DEBUG uVar5 = entriesStr->str + vals[0]; #else uVar5 = pStrAttributeBlock->entries->str + vals[0]; #endif } else { -#ifdef DEBUG +#if DEBUG uVar5 = entriesStr->str + vals[1]; #else uVar5 = pStrAttributeBlock->entries->str + vals[1]; diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 7e4f306339..62e457b9d0 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -344,7 +344,7 @@ int dRes_info_c::loadResource() { JKRExpHeap* parentHeap = (JKRExpHeap*)JKRHeap::findFromRoot(JKRHeap::getCurrentHeap()); JUT_ASSERT(0x308, parentHeap != NULL && (parentHeap == mDoExt_getGameHeap() || parentHeap == mDoExt_getArchiveHeap())); -#ifdef DEBUG +#if DEBUG char* heapName; if (parentHeap == mDoExt_getGameHeap()) { heapName = "GameHeap"; @@ -401,7 +401,7 @@ int dRes_info_c::loadResource() { } modelData = (J3DModelData*)result; -#ifdef DEBUG +#if DEBUG J3DMaterial* materialp = modelData->getMaterialNodePointer(0); if (materialp->isDrawModeOpaTexEdge()) { // "BMDG:Translucent model can't be drawn!!\n" @@ -733,7 +733,7 @@ int dRes_control_c::syncRes(char const* i_arcName, dRes_info_c* i_resInfo, int i dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum); if (resInfo == NULL) { -#ifdef DEBUG +#if DEBUG if (i_arcName[0] == 'R' || (i_arcName[0] == 'S' && i_arcName[1] == 't' && i_arcName[2] == 'g' && i_arcName[3] == '_' && i_arcName[4] == '0' && i_arcName[5] == '0') || strncmp(i_arcName, "Pack", 4) == 0) @@ -755,7 +755,7 @@ int dRes_control_c::deleteRes(char const* i_arcName, dRes_info_c* i_resInfo, int dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum); if (resInfo == NULL) { -#ifdef DEBUG +#if DEBUG if (strcmp(i_arcName, "Xtg_00") == 0) { // "<%s.arc> deleteRes: res nothing !!\n(Detected deleting an unregistered resource! Please fix.)\n" OS_REPORT_ERROR("<%s.arc> deleteRes: res nothing !!\n(未登録のリソースを削除してるのを発見しました！修正してください。)\n", i_arcName); @@ -799,7 +799,7 @@ dRes_info_c* dRes_control_c::getResInfoLoaded(char const* i_arcName, dRes_info_c dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum); if (resInfo == NULL) { -#ifdef DEBUG +#if DEBUG if (stricmp(i_arcName, "Xtg_00") == 0) { OS_REPORT("\x1b[35m<%s.arc> getRes: res nothing !!\n\x1b[m", i_arcName); } @@ -879,7 +879,7 @@ int dRes_control_c::setObjectRes(char const* i_arcName, void* i_archiveRes, u32 JKRHeap* i_heap) { JUT_ASSERT(0x7A3, i_archiveRes != NULL); -#ifdef DEBUG +#if DEBUG dRes_info_c* nowInfo = getResInfo(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo)); JUT_ASSERT(0x7A6, nowInfo == NULL); #endif diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 21a8bfb349..7b7934f473 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -21,7 +21,7 @@ #include -#ifdef DEBUG +#if DEBUG extern "C" int atoi(const char* str); void dScnMenu_setItem(int i_slotNo, u8 i_itemNo); diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 2e9979d20e..7187d0229d 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -566,7 +566,7 @@ dScnPly_reg_HIO_c g_regHIO; dScnPly_env_HIO_c g_envHIO; -#ifdef DEBUG +#if DEBUG dScnPly_preset_HIO_c g_presetHIO; #endif diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index f1da8b4daa..2e92baef02 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -1856,7 +1856,7 @@ int dSv_info_c::initdata_to_card(char* i_cardPtr, int i_dataNum) { return 0; } -#ifdef DEBUG +#if DEBUG flagFile_c::flagFile_c() { m_no = mDoHIO_CREATE_CHILD("フラグファイル", this); m_flags = FLAG_ALL_e; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index e055c19bb6..df4ca3fb0f 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1071,7 +1071,7 @@ static dStage_objectNameInf l_objectName[] = { OBJNAME("d_act30", PROC_DEMO00, 0x1E), OBJNAME("d_act31", PROC_DEMO00, 0x1F), OBJNAME("TLogo", PROC_TITLE, 0xFF), -#ifdef DEBUG +#if DEBUG OBJNAME("unitC00", PROC_Obj_TestCube, 0xFF), OBJNAME("unitS00", PROC_Obj_TestCube, 0xFF), OBJNAME("unitCy0", PROC_Obj_TestCube, 0xFF), @@ -1093,7 +1093,7 @@ static dStage_objectNameInf l_objectName[] = { OBJNAME("mvbg_a", PROC_BG_OBJ, 0xFF), OBJNAME("burnBox", PROC_Obj_BurnBox, 0xFF), OBJNAME("stnMark", PROC_Obj_StoneMark, 0xFF), -#ifndef DEBUG +#if !DEBUG OBJNAME("Passer", PROC_NPC_PASSER, 0xFF), #endif OBJNAME("Passer2", PROC_NPC_PASSER2, 0xFF), @@ -1398,7 +1398,7 @@ void dStage_stageDt_c::init() { mElst = NULL; mWorldRollAngleX = 0; mWorldRollDirAngleY = 0; -#ifdef DEBUG +#if DEBUG mPaletteNumInfo = 0; mPselectNumInfo = 0; mVrboxNumInfo = 0; @@ -1432,7 +1432,7 @@ void dStage_roomDt_c::init() { mDrTg = NULL; mDoor = NULL; mFloorInfo = NULL; -#ifdef DEBUG +#if DEBUG field_0x60 = 0; #endif } diff --git a/src/dolphin/ai/ai.c b/src/dolphin/ai/ai.c index c9c38ee265..7039004fb3 100644 --- a/src/dolphin/ai/ai.c +++ b/src/dolphin/ai/ai.c @@ -5,7 +5,7 @@ #include "__gx.h" -#ifdef DEBUG +#if DEBUG const char* __AIVersion = "<< Dolphin SDK - AI\tdebug build: Apr 5 2004 03:56:18 (0x2301) >>"; #else const char* __AIVersion = "<< Dolphin SDK - AI\trelease build: Apr 5 2004 04:15:02 (0x2301) >>"; diff --git a/src/dolphin/am/am.c b/src/dolphin/am/am.c index 56350a9c3a..ba3fd2e4b7 100644 --- a/src/dolphin/am/am.c +++ b/src/dolphin/am/am.c @@ -130,7 +130,7 @@ u32 AMPush(char* path) { OSFree(buffer); return ret_val; } else { -#ifdef DEBUG +#if DEBUG OSReport("AMPush(): WARNING: File has zero length.\n"); #endif return 0; @@ -234,13 +234,13 @@ u32 __AMPushBuffered(char* path, void* buffer, u32 buffer_size, AMCallback callb } } } else { -#ifdef DEBUG +#if DEBUG OSReport("AMPushBuffered(): WARNING: Not enough space in ARAM.\n"); #endif return 0; } } else { -#ifdef DEBUG +#if DEBUG OSReport("AMPushBuffered(): WARNING: Stack table is full.\n"); #endif return 0; diff --git a/src/dolphin/ar/ar.c b/src/dolphin/ar/ar.c index d431eebbc1..a7c9400fc5 100644 --- a/src/dolphin/ar/ar.c +++ b/src/dolphin/ar/ar.c @@ -4,7 +4,7 @@ #include "__ar.h" -#ifdef DEBUG +#if DEBUG const char* __ARVersion = "<< Dolphin SDK - AR\tdebug build: Apr 5 2004 03:56:19 (0x2301) >>"; #else const char* __ARVersion = "<< Dolphin SDK - AR\trelease build: Apr 5 2004 04:15:03 (0x2301) >>"; @@ -134,7 +134,7 @@ void ARReset(void) { } void ARSetSize(void) { -#ifdef DEBUG +#if DEBUG OSReport("ARSetSize(): I don't do anything anymore!\n"); #endif } @@ -405,7 +405,7 @@ static void __ARChecksize(void) { } } -#ifdef DEBUG +#if DEBUG OSReport("__ARChecksize(): ARAM Expansion present.\n"); #endif __DSPRegs[9] = (u16)((__DSPRegs[9] & ~(0x07 | 0x38)) | ARAM_mode); diff --git a/src/dolphin/ar/arq.c b/src/dolphin/ar/arq.c index 1adf24bbba..baf3acead4 100644 --- a/src/dolphin/ar/arq.c +++ b/src/dolphin/ar/arq.c @@ -3,7 +3,7 @@ #include "__ar.h" -#ifdef DEBUG +#if DEBUG const char* __ARQVersion = "<< Dolphin SDK - ARQ\tdebug build: Apr 5 2004 03:56:20 (0x2301) >>"; #else const char* __ARQVersion = "<< Dolphin SDK - ARQ\trelease build: Apr 5 2004 04:15:04 (0x2301) >>"; diff --git a/src/dolphin/ax/AX.c b/src/dolphin/ax/AX.c index bc579464d5..eb06c5906d 100644 --- a/src/dolphin/ax/AX.c +++ b/src/dolphin/ax/AX.c @@ -3,7 +3,7 @@ #include "__ax.h" -#ifdef DEBUG +#if DEBUG const char* __AXVersion = "<< Dolphin SDK - AX\tdebug build: Apr 5 2004 03:56:21 (0x2301) >>"; #else const char* __AXVersion = "<< Dolphin SDK - AX\trelease build: Apr 5 2004 04:15:05 (0x2301) >>"; @@ -14,7 +14,7 @@ void AXInit(void) { } void AXInitEx(u32 outputBufferMode) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AX\n"); #endif OSRegisterVersion(__AXVersion); @@ -28,7 +28,7 @@ void AXInitEx(u32 outputBufferMode) { } void AXQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AX\n"); #endif __AXAllocQuit(); diff --git a/src/dolphin/ax/AXAlloc.c b/src/dolphin/ax/AXAlloc.c index 66b3f0331e..3fcd6278c1 100644 --- a/src/dolphin/ax/AXAlloc.c +++ b/src/dolphin/ax/AXAlloc.c @@ -59,14 +59,14 @@ void __AXInitVoiceStacks(void) { } void __AXAllocInit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXAlloc code module\n"); #endif __AXInitVoiceStacks(); } void __AXAllocQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXAlloc code module\n"); #endif __AXInitVoiceStacks(); diff --git a/src/dolphin/ax/AXAux.c b/src/dolphin/ax/AXAux.c index 094dac46a9..7c3294d1a6 100644 --- a/src/dolphin/ax/AXAux.c +++ b/src/dolphin/ax/AXAux.c @@ -25,7 +25,7 @@ void __AXAuxInit(void) { s32* pA; s32* pB; -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXAux code module\n"); #endif __AXCallbackAuxA = NULL; @@ -48,7 +48,7 @@ void __AXAuxInit(void) { } void __AXAuxQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXAux code module\n"); #endif __AXCallbackAuxA = NULL; diff --git a/src/dolphin/ax/AXCL.c b/src/dolphin/ax/AXCL.c index 05107a5f75..e51eb3d311 100644 --- a/src/dolphin/ax/AXCL.c +++ b/src/dolphin/ax/AXCL.c @@ -144,7 +144,7 @@ void __AXNextFrame(void* sbuffer, void* buffer) { } void __AXClInit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXCL code module\n"); #endif ASSERTLINE(338, ((u32)&__AXCommandList[0][0] & 0x1F) == 0); @@ -156,7 +156,7 @@ void __AXClInit(void) { } void __AXClQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXCL code module\n"); #endif } diff --git a/src/dolphin/ax/AXOut.c b/src/dolphin/ax/AXOut.c index e0649ba3b8..b7402c4966 100644 --- a/src/dolphin/ax/AXOut.c +++ b/src/dolphin/ax/AXOut.c @@ -170,7 +170,7 @@ void __AXOutInitDSP(void) { } void __AXOutInit(u32 outputBufferMode) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXOut code module\n"); #endif ASSERTLINE(404, ((u32)&__AXOutBuffer[0][0] & 0x1F) == 0); @@ -214,7 +214,7 @@ void __AXOutInit(u32 outputBufferMode) { void __AXOutQuit(void) { BOOL old; -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXOut code module\n"); #endif old = OSDisableInterrupts(); diff --git a/src/dolphin/ax/AXSPB.c b/src/dolphin/ax/AXSPB.c index 3ff765d1d5..829c8ef35a 100644 --- a/src/dolphin/ax/AXSPB.c +++ b/src/dolphin/ax/AXSPB.c @@ -58,7 +58,7 @@ void __AXPrintStudio(void) { } void __AXSPBInit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXSPB code module\n"); #endif __AXSpbAL = @@ -73,7 +73,7 @@ void __AXSPBInit(void) { } void __AXSPBQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXSPB code module\n"); #endif } diff --git a/src/dolphin/ax/AXVPB.c b/src/dolphin/ax/AXVPB.c index eba17fd686..bd6ffe02aa 100644 --- a/src/dolphin/ax/AXVPB.c +++ b/src/dolphin/ax/AXVPB.c @@ -472,7 +472,7 @@ void __AXVPBInit(void) { AXVPB* pvpb; u32* p; -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXVPB code module\n"); #endif __AXMaxDspCycles = OS_BUS_CLOCK / 400; @@ -536,7 +536,7 @@ void __AXVPBInit(void) { } void __AXVPBQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXVPB code module\n"); #endif } diff --git a/src/dolphin/axart/axartsound.c b/src/dolphin/axart/axartsound.c index 732171dbb0..3537849197 100644 --- a/src/dolphin/axart/axartsound.c +++ b/src/dolphin/axart/axartsound.c @@ -94,7 +94,7 @@ void AXARTServiceSound(AXART_SOUND* sound) { AXARTLpf((AXART_LPF*)articulator, sound->axvpb); break; default: -#ifdef DEBUG +#if DEBUG OSPanic(__FILE__, 196, "unknown articulator type!\n"); #endif break; diff --git a/src/dolphin/dsp/dsp.c b/src/dolphin/dsp/dsp.c index d5570b1f77..3c4177a7b7 100644 --- a/src/dolphin/dsp/dsp.c +++ b/src/dolphin/dsp/dsp.c @@ -11,7 +11,7 @@ #define BUILD_TIME "04:15:32" #endif -#ifdef DEBUG +#if DEBUG const char* __DSPVersion = "<< Dolphin SDK - DSP\tdebug build: Apr 5 2004 03:56:49 (0x2301) >>"; #else const char* __DSPVersion = "<< Dolphin SDK - DSP\trelease build: Apr 5 2004 04:15:32 (0x2301) >>"; diff --git a/src/dolphin/dvd/dvd.c b/src/dolphin/dvd/dvd.c index 3b7e9704a3..003be19cf6 100644 --- a/src/dolphin/dvd/dvd.c +++ b/src/dolphin/dvd/dvd.c @@ -10,7 +10,7 @@ extern void __DVDPrintFatalMessage(); extern int DVDCompareDiskID(const struct DVDDiskID * id1 /* r29 */, const struct DVDDiskID * id2 /* r30 */); extern int __DVDLowTestAlarm(const OSAlarm * alarm /* r3 */); -#ifdef DEBUG +#if DEBUG const char* __DVDVersion = "<< Dolphin SDK - DVD\tdebug build: Apr 5 2004 03:56:07 (0x2301) >>"; #else const char* __DVDVersion = "<< Dolphin SDK - DVD\trelease build: Apr 5 2004 04:14:51 (0x2301) >>"; diff --git a/src/dolphin/dvd/dvdidutils.c b/src/dolphin/dvd/dvdidutils.c index a702a657fe..64e533ea43 100644 --- a/src/dolphin/dvd/dvdidutils.c +++ b/src/dolphin/dvd/dvdidutils.c @@ -16,7 +16,7 @@ static u32 strnlen(const char* str, u32 maxlen) { } int DVDCompareDiskID(const DVDDiskID* id1, const DVDDiskID* id2) { -#ifdef DEBUG +#if DEBUG const char* game1; const char* game2; const char* company1; diff --git a/src/dolphin/dvd/dvdlow.c b/src/dolphin/dvd/dvdlow.c index 79dca99cb4..9e2c834f37 100644 --- a/src/dolphin/dvd/dvdlow.c +++ b/src/dolphin/dvd/dvdlow.c @@ -414,7 +414,7 @@ BOOL DVDLowRequestAudioStatus(u32 subcmd, DVDLowCallback callback) { } BOOL DVDLowAudioBufferConfig(BOOL enable, u32 size, DVDLowCallback callback) { -#ifdef DEBUG +#if DEBUG u32 bufSize; u32 trigger; #endif @@ -422,7 +422,7 @@ BOOL DVDLowAudioBufferConfig(BOOL enable, u32 size, DVDLowCallback callback) { Callback = callback; StopAtNextInt = FALSE; -#ifdef DEBUG +#if DEBUG bufSize = size & 0xF; trigger = (size >> 4) & 0xF; ASSERTLINE(1242, bufSize < 16); diff --git a/src/dolphin/gx/GXAttr.c b/src/dolphin/gx/GXAttr.c index 136661d6df..00ad9e34fb 100644 --- a/src/dolphin/gx/GXAttr.c +++ b/src/dolphin/gx/GXAttr.c @@ -23,7 +23,7 @@ static void __GXXfVtxSpecs(void) { nNrm = __GXData->hasBiNrms ? 2 : __GXData->hasNrms ? 1 : 0; -#ifdef DEBUG +#if DEBUG nCols = GET_REG_FIELD(__GXData->vcdLo, 2, 13) ? 1 : 0; nCols += GET_REG_FIELD(__GXData->vcdLo, 2, 15) ? 1 : 0; #else @@ -31,7 +31,7 @@ static void __GXXfVtxSpecs(void) { nCols /= 2; #endif -#ifdef DEBUG +#if DEBUG nTex = 0; nTex += GET_REG_FIELD(__GXData->vcdHi, 2, 0) ? 1 : 0; nTex += GET_REG_FIELD(__GXData->vcdHi, 2, 2) ? 1 : 0; @@ -332,7 +332,7 @@ void GXSetVtxAttrFmt(GXVtxFmt vtxfmt, GXAttr attr, GXCompCnt cnt, GXCompType typ vc = &__GXData->vatC[vtxfmt]; SETVAT(va, vb, vc, attr, cnt, type, frac); -#ifdef DEBUG +#if DEBUG __GXVerifyVATImm(attr, cnt, type, frac); #endif @@ -357,7 +357,7 @@ void GXSetVtxAttrFmtv(GXVtxFmt vtxfmt, const GXVtxAttrFmtList* list) { CHECK_ATTRNAME4(725, list->attr); CHECK_FRAC(726, list->frac); SETVAT(va, vb, vc, list->attr, list->cnt, list->type, list->frac); -#ifdef DEBUG +#if DEBUG __GXVerifyVATImm(list->attr, list->cnt, list->type, list->frac); #endif list++; diff --git a/src/dolphin/gx/GXDisplayList.c b/src/dolphin/gx/GXDisplayList.c index ff53e8a8f2..667b31df40 100644 --- a/src/dolphin/gx/GXDisplayList.c +++ b/src/dolphin/gx/GXDisplayList.c @@ -40,7 +40,7 @@ void GXBeginDisplayList(void* list, u32 size) { u32 GXEndDisplayList(void) { u32 ov; -#ifdef DEBUG +#if DEBUG u32 reg; #endif BOOL enabled; @@ -49,7 +49,7 @@ u32 GXEndDisplayList(void) { CHECK_GXBEGIN(195, "GXEndDisplayList"); ASSERTMSGLINE(196, __GXData->inDispList == TRUE, "GXEndDisplayList: no display list in progress"); GXFlush(); -#ifdef DEBUG +#if DEBUG reg = GX_GET_PI_REG(5); ov = (reg >> 26) & 1; #else diff --git a/src/dolphin/gx/GXInit.c b/src/dolphin/gx/GXInit.c index 681952d13f..53f7f0cc1a 100644 --- a/src/dolphin/gx/GXInit.c +++ b/src/dolphin/gx/GXInit.c @@ -17,7 +17,7 @@ #define RBUILD_TIME "06:27:12" #endif -#ifdef DEBUG +#if DEBUG const char* __GXVersion = "<< Dolphin SDK - GX\tdebug build: "BUILD_DATE" "DBUILD_TIME" (0x2301) >>"; #else const char* __GXVersion = "<< Dolphin SDK - GX\trelease build: "BUILD_DATE" "RBUILD_TIME" (0x2301) >>"; diff --git a/src/dolphin/gx/__gx.h b/src/dolphin/gx/__gx.h index 20a85d2cc3..ab852bb66b 100644 --- a/src/dolphin/gx/__gx.h +++ b/src/dolphin/gx/__gx.h @@ -121,7 +121,7 @@ do { \ VERIF_RAS_REG(value); \ } while (0) -#ifdef DEBUG +#if DEBUG #define GX_WRITE_SOME_REG2(a, b, c, addr) \ do { \ long regAddr; \ @@ -142,7 +142,7 @@ do { \ } while (0) #endif -#ifdef DEBUG +#if DEBUG #define GX_WRITE_SOME_REG3(a, b, c, addr) \ do { \ long regAddr; \ diff --git a/src/dolphin/hio/hio.c b/src/dolphin/hio/hio.c index aa146d5c90..177fff505d 100644 --- a/src/dolphin/hio/hio.c +++ b/src/dolphin/hio/hio.c @@ -6,7 +6,7 @@ static u32 Dev; #define HIO_DEV Dev -#ifdef DEBUG +#if DEBUG const char* __HIOVersion = "<< Dolphin SDK - HIO\tdebug build: Apr 5 2004 03:57:05 (0x2301) >>"; #else const char* __HIOVersion = "<< Dolphin SDK - HIO\trelease build: Apr 5 2004 04:15:47 (0x2301) >>"; @@ -14,7 +14,7 @@ const char* __HIOVersion = "<< Dolphin SDK - HIO\trelease build: Apr 5 2004 04: static char __HIODigest1[71] = "\"HIO library - Copyright (C) 2000-2002 Nintendo. All rights reserved.\""; -#ifdef DEBUG +#if DEBUG static char __HIODigest2[34] = "\"HIO built: Apr 5 2004 03:57:05\""; #else static char __HIODigest2[34] = "\"HIO built: Apr 5 2004 04:15:47\""; diff --git a/src/dolphin/mcc/fio.c b/src/dolphin/mcc/fio.c index dca9488d74..5d60ead423 100644 --- a/src/dolphin/mcc/fio.c +++ b/src/dolphin/mcc/fio.c @@ -1,7 +1,7 @@ #include #include -#ifdef DEBUG +#if DEBUG const char* __FIOVersion = "<< Dolphin SDK - FIO\tdebug build: Apr 5 2004 03:57:07 (0x2301) >>"; #else const char* __FIOVersion = "<< Dolphin SDK - FIO\trelease build: Apr 5 2004 04:15:50 (0x2301) >>"; diff --git a/src/dolphin/mcc/mcc.c b/src/dolphin/mcc/mcc.c index bed12b501c..e0f3014fcc 100644 --- a/src/dolphin/mcc/mcc.c +++ b/src/dolphin/mcc/mcc.c @@ -1,7 +1,7 @@ #include #include -#ifdef DEBUG +#if DEBUG const char* __MCCVersion = "<< Dolphin SDK - MCC\tdebug build: Apr 5 2004 03:57:07 (0x2301) >>"; #else const char* __MCCVersion = "<< Dolphin SDK - MCC\trelease build: Apr 5 2004 04:15:49 (0x2301) >>"; @@ -303,7 +303,7 @@ static int AsyncResourceIsBusy(void) { static int LoadChannelInfo(MCC_ChannelInfo* info) { volatile int result = 0; u8 count; -#ifndef DEBUG +#if !DEBUG int unused; // this is fake, but i cant seem to find whats messing with the stack. #endif @@ -453,7 +453,7 @@ static int NotifyCompulsorily(MCC_CHANNEL chID, u32 notify, u32 timeout) { volatile u32 tickStart; volatile u32 tickCur; volatile u32 tickSec; -#ifndef DEBUG +#if !DEBUG int unused; // fake but blah #endif @@ -500,7 +500,7 @@ static int NotifyInitDone(void) { } static int NotifyChannelEvent(MCC_CHANNEL chID, u32 notify) { -#ifndef DEBUG +#if !DEBUG int unused[2]; // fake but blah #endif @@ -539,7 +539,7 @@ static void MailboxCheck(void) { u8 chID; u32 value; BOOL bDoCall; -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -643,7 +643,7 @@ static void MCCRxCallback(void) { static int mccInitializeCheck(u8 timeout) { int dmyFlag; int i; -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -699,7 +699,7 @@ int MCCInit(MCC_EXI exiChannel, u8 timeout, MCC_CBSysEvent callbackSysEvent) { u32 mailbox; u32 status; int i; -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -796,7 +796,7 @@ int MCCEnumDevices(MCC_CBEnumDevices callbackEnumDevices) { } u8 MCCGetFreeBlocks(MCC_MODE mode) { -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -824,7 +824,7 @@ u8 MCCGetLastError(void) { } int MCCGetChannelInfo(MCC_CHANNEL chID, MCC_Info* info) { -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -852,7 +852,7 @@ int MCCGetChannelInfo(MCC_CHANNEL chID, MCC_Info* info) { int MCCGetConnectionStatus(MCC_CHANNEL chID, MCC_CONNECT* connect) { MCC_Info info; -#ifndef DEBUG +#if !DEBUG int unused[2]; // fake but blah #endif @@ -886,7 +886,7 @@ int MCCGetConnectionStatus(MCC_CHANNEL chID, MCC_CONNECT* connect) { int MCCNotify(MCC_CHANNEL chID, u32 notify) { MCC_CONNECT connect; -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -916,7 +916,7 @@ int MCCNotify(MCC_CHANNEL chID, u32 notify) { u32 MCCSetChannelEventMask(MCC_CHANNEL chID, u32 event) { u32 oldMask; -#ifndef DEBUG +#if !DEBUG int unused[2]; // fake but blah #endif @@ -942,11 +942,11 @@ u32 MCCSetChannelEventMask(MCC_CHANNEL chID, u32 event) { int MCCOpen(MCC_CHANNEL chID, u8 blockSize, MCC_CBEvent callbackEvent) { u8 connectSide; u8 blockIndex; -#ifndef DEBUG +#if !DEBUG int unused2[2]; #endif u8 freeBlocks; -#ifndef DEBUG +#if !DEBUG int unused[6]; // fake but blah #endif @@ -1038,7 +1038,7 @@ exit:; int MCCClose(MCC_CHANNEL chID) { u8 connectSide; -#ifndef DEBUG +#if !DEBUG int unused[4]; // fake but blah #endif @@ -1093,7 +1093,7 @@ exit:; } int MCCLock(MCC_CHANNEL chID) { -#ifndef DEBUG +#if !DEBUG int unused[7]; // fake but blah #endif @@ -1146,7 +1146,7 @@ exit:; } int MCCUnlock(MCC_CHANNEL chID) { -#ifndef DEBUG +#if !DEBUG int unused[7]; // fake but blah #endif @@ -1199,7 +1199,7 @@ exit: } int MCCRead(MCC_CHANNEL chID, u32 offset, void* data, s32 size, MCC_SYNC_STATE async) { -#ifndef DEBUG +#if !DEBUG int unused[11]; // fake but blah #endif @@ -1285,7 +1285,7 @@ exit:; } int MCCWrite(MCC_CHANNEL chID, u32 offset, void* data, s32 size, MCC_SYNC_STATE async) { -#ifndef DEBUG +#if !DEBUG int unused[11]; // fake but blah #endif mccDebugPrint("MCCWrite\n"); @@ -1379,7 +1379,7 @@ int MCCCheckAsyncDone() { u16 stat; u16 mode; u8 chID; -#ifndef DEBUG +#if !DEBUG int unused[5]; // fake but blah #endif diff --git a/src/dolphin/mcc/tty.c b/src/dolphin/mcc/tty.c index 1c230e4757..bb8aa31818 100644 --- a/src/dolphin/mcc/tty.c +++ b/src/dolphin/mcc/tty.c @@ -1,7 +1,7 @@ #include #include -#ifdef DEBUG +#if DEBUG const char* __TTYVersion = "<< Dolphin SDK - TTY\tdebug build: Apr 5 2004 03:57:08 (0x2301) >>"; #else const char* __TTYVersion = "<< Dolphin SDK - TTY\trelease build: Apr 5 2004 04:15:50 (0x2301) >>"; diff --git a/src/dolphin/mtx/quat.c b/src/dolphin/mtx/quat.c index 9af3c3cd56..d0d1ce508c 100644 --- a/src/dolphin/mtx/quat.c +++ b/src/dolphin/mtx/quat.c @@ -305,7 +305,7 @@ void C_QUATLogN(const Quaternion* q, Quaternion* r) { scale = (q->x * q->x) + (q->y * q->y) + (q->z * q->z); -#ifdef DEBUG +#if DEBUG mag = scale + (q->z * q->z); if (mag < 1.0f - 0.00001f || mag > 1.0f + 0.00001f || mag > 1.00001f) {} #endif diff --git a/src/dolphin/os/OS.c b/src/dolphin/os/OS.c index 67fe5457b9..f8ff6aecbd 100644 --- a/src/dolphin/os/OS.c +++ b/src/dolphin/os/OS.c @@ -32,7 +32,7 @@ extern void __OSInitMemoryProtection(void); #define RBUILD_TIME "06:26:41" #endif -#ifdef DEBUG +#if DEBUG const char* __OSVersion = "<< Dolphin SDK - OS\tdebug build: "BUILD_DATE" "DBUILD_TIME" (0x2301) >>"; #else const char* __OSVersion = "<< Dolphin SDK - OS\trelease build: "BUILD_DATE" "RBUILD_TIME" (0x2301) >>"; diff --git a/src/dolphin/os/OSAlloc.c b/src/dolphin/os/OSAlloc.c index 2ad58e3b4d..b45ba83aef 100644 --- a/src/dolphin/os/OSAlloc.c +++ b/src/dolphin/os/OSAlloc.c @@ -9,7 +9,7 @@ #define HEADERSIZE 32u #define MINOBJSIZE 64u -#ifdef DEBUG +#if DEBUG #define ENABLE_HEAPDESC #endif diff --git a/src/dolphin/os/OSFont.c b/src/dolphin/os/OSFont.c index 4e6738bf7e..6cab5a1a52 100644 --- a/src/dolphin/os/OSFont.c +++ b/src/dolphin/os/OSFont.c @@ -376,7 +376,7 @@ static void ReadROM(void* buf, int length, int offset) { static u32 ReadFont(void* img, u16 encode, void* fontData) { u32 size; -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif diff --git a/src/dolphin/os/OSMemory.c b/src/dolphin/os/OSMemory.c index defbad9901..654cfa2467 100644 --- a/src/dolphin/os/OSMemory.c +++ b/src/dolphin/os/OSMemory.c @@ -191,7 +191,7 @@ static asm void RealMode(register u32 addr) { #endif void __OSInitMemoryProtection(void) { -#ifndef DEBUG +#if !DEBUG u32 padding[9]; u32 temp; #endif @@ -213,7 +213,7 @@ void __OSInitMemoryProtection(void) { __OSSetInterruptHandler(__OS_INTERRUPT_MEM_ADDRESS, MEMIntrruptHandler); OSRegisterResetFunction(&ResetFunctionInfo); -#ifdef DEBUG +#if DEBUG if (OSGetConsoleSimulatedMemSize() < OSGetPhysicalMemSize() && OSGetConsoleSimulatedMemSize() == 0x1800000) #else temp = OSGetConsoleSimulatedMemSize(); // not sure how else to get the order right on retail diff --git a/src/dolphin/os/OSRtc.c b/src/dolphin/os/OSRtc.c index 7b37b4cae0..ee55fcc0e4 100644 --- a/src/dolphin/os/OSRtc.c +++ b/src/dolphin/os/OSRtc.c @@ -331,7 +331,7 @@ u32 OSGetProgressiveMode(void) { } void OSSetProgressiveMode(u32 on) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSram* sram; @@ -439,7 +439,7 @@ u32 OSGetEuRgb60Mode(void) { } void OSSetEuRgb60Mode(u32 on) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSram* sram; @@ -492,7 +492,7 @@ u16 OSGetGbsMode(void) { } void OSSetGbsMode(u16 mode) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSramEx* sram; diff --git a/src/dolphin/os/OSThread.c b/src/dolphin/os/OSThread.c index e4f2362c90..3abf127352 100644 --- a/src/dolphin/os/OSThread.c +++ b/src/dolphin/os/OSThread.c @@ -131,7 +131,7 @@ void __OSThreadInit() { thread->mutex = 0; OSInitThreadQueue(&thread->queueJoin); -#ifdef DEBUG +#if DEBUG OSInitMutexQueue(&thread->queueMutex); #else thread->queueMutex.head = thread->queueMutex.tail = 0; // it got inlined? cant reproduce the inline... @@ -430,7 +430,7 @@ int OSCreateThread(OSThread* thread, void* (*func)(void*), void* param, void* st thread->val = (void*)-1; thread->mutex = 0; OSInitThreadQueue(&thread->queueJoin); -#ifdef DEBUG +#if DEBUG OSInitMutexQueue(&thread->queueMutex); #else OSInitThreadQueue((void*)&thread->queueMutex); // why @@ -492,7 +492,7 @@ void OSExitThread(void* val) { __OSUnlockAllMutex(currentThread); OSWakeupThread(¤tThread->queueJoin); RunQueueHint = 1; -#ifdef DEBUG +#if DEBUG __OSReschedule(); #else if (RunQueueHint != 0) { diff --git a/src/dolphin/perf/perf.c b/src/dolphin/perf/perf.c index 08442222a1..fc86eebd67 100644 --- a/src/dolphin/perf/perf.c +++ b/src/dolphin/perf/perf.c @@ -50,7 +50,7 @@ static void PERFTimerCallback(OSAlarm* alarm, OSContext* context); void PERFStartAutoSampling(f32 msInterval); void PERFStopAutoSampling(void); -#ifndef DEBUG +#if !DEBUG inline s32 PERFGetNewSample(void) { if (PERFCurrSample >= (PERFNumSamples - 1)) { PERFCurrSample = PERFNumSamples - 1; diff --git a/src/dolphin/perf/perfdraw.c b/src/dolphin/perf/perfdraw.c index 621d1815e2..8bd961af0c 100644 --- a/src/dolphin/perf/perfdraw.c +++ b/src/dolphin/perf/perfdraw.c @@ -107,7 +107,7 @@ static f32 GPPts[4] = { void (*GameDrawInit)(); Mtx mID; -#ifndef DEBUG +#if !DEBUG inline f32 HEIGHT(u32 a, f32 f) { return 140.0f * ((f32) a / ((f32) MaxBusTransactions * f)); } diff --git a/src/dolphin/si/SIBios.c b/src/dolphin/si/SIBios.c index cc7164e8d2..39c2acb9bd 100644 --- a/src/dolphin/si/SIBios.c +++ b/src/dolphin/si/SIBios.c @@ -5,7 +5,7 @@ #define ROUND(n, a) (((u32)(n) + (a)-1) & ~((a)-1)) -#ifdef DEBUG +#if DEBUG const char* __SIVersion = "<< Dolphin SDK - SI\tdebug build: Apr 5 2004 03:55:31 (0x2301) >>"; #else const char* __SIVersion = "<< Dolphin SDK - SI\trelease build: Apr 5 2004 04:14:16 (0x2301) >>"; diff --git a/src/dolphin/si/SISteering.c b/src/dolphin/si/SISteering.c index c0d6c66b55..ceae68b131 100644 --- a/src/dolphin/si/SISteering.c +++ b/src/dolphin/si/SISteering.c @@ -80,7 +80,7 @@ s32 SIResetSteering(s32 chan) { SISteeringControl* sc; s32 ret; -#ifndef DEBUG +#if !DEBUG u32 padding; #endif diff --git a/src/dolphin/vi/vi.c b/src/dolphin/vi/vi.c index c28ed1c907..b35685ad5d 100644 --- a/src/dolphin/vi/vi.c +++ b/src/dolphin/vi/vi.c @@ -8,7 +8,7 @@ #include "__os.h" #include "__vi.h" -#ifdef DEBUG +#if DEBUG const char* __VIVersion = "<< Dolphin SDK - VI\tdebug build: Apr 7 2004 03:55:59 (0x2301) >>"; #else const char* __VIVersion = "<< Dolphin SDK - VI\trelease build: Apr 7 2004 04:13:59 (0x2301) >>"; @@ -773,7 +773,7 @@ void VIConfigure(const GXRenderModeObj* rm) { "VIConfigure(): Odd number(%d) is specified to viHeight\n", rm->viHeight); -#ifdef DEBUG +#if DEBUG if (rm->xFBmode == VI_XFBMODE_DF || newNonInter == VI_TVMODE_NTSC_PROG || newNonInter == 3) { ASSERTMSGLINEV(1933, rm->xfbHeight == rm->viHeight, "VIConfigure(): xfbHeight(%d) is not equal to viHeight(%d) when DF XFB mode or progressive mode is specified\n", diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index eb5aac665b..59efc4d817 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -705,7 +705,7 @@ static cull_box l_cullSizeBox[] = { {-60.0f, -20.0f, -60.0f}, {60.0f, 160.0f, 60.0f}, }, -#ifdef DEBUG +#if DEBUG { {-200.0f, 0.0f, -200.0f}, {200.0f, 400.0f, 200.0f}, @@ -746,7 +746,7 @@ static cull_sphere l_cullSizeSphere[] = { {0.0f, 0.0f, 0.0f}, 400.0f, }, -#ifdef DEBUG +#if DEBUG { {0.0f, 0.0f, 0.0f}, 400.0f, @@ -1140,7 +1140,7 @@ u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo) { return i_tableNo; } -#ifdef DEBUG +#if DEBUG if (tableList->mTableNum - 1 < i_tableNo) { // "Table Num<%d>, Specified Table<%d>, over table num!\n" OSReport_Error("テーブル数<%d>、指定テーブル番号<%d>で、テーブル数オーバーしています！\n", @@ -1231,7 +1231,7 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_itemNo, int i_ite return fpcM_ERROR_PROCESS_ID_e; } -#ifdef DEBUG +#if DEBUG if (tableList->mTableNum - 1 < i_itemNo) { // "Table Num<%d>, Specified Table<%d>, over table num!\n" OSReport_Error("テーブル数<%d>、指定テーブル番号<%d>で、テーブル数オーバーしています！\n", @@ -1335,7 +1335,7 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i switch (i_itemNo) { case fpcNm_ITEM_RECOVERY_FAILY: return fopAcM_create(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); -#ifdef DEBUG +#if DEBUG case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); @@ -1391,7 +1391,7 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi case fpcNm_ITEM_RECOVERY_FAILY: return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); -#ifdef DEBUG +#if DEBUG case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); @@ -1449,7 +1449,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, case fpcNm_ITEM_RECOVERY_FAILY: return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); -#ifdef DEBUG +#if DEBUG case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index e10cd007e0..49406aee04 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -44,7 +44,7 @@ int fpcBs_MakeOfId() { int fpcBs_Execute(base_process_class* i_proc) { int result = 1; -#ifdef DEBUG +#if DEBUG if (!fpcBs_Is_JustOfType(g_fpcBs_type, i_proc->type)) { if (g_fpcDbSv_service[10] != NULL) { g_fpcDbSv_service[10](i_proc); diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp index 9e4c14a57f..36fbcf9604 100644 --- a/src/f_pc/f_pc_create_req.cpp +++ b/src/f_pc/f_pc_create_req.cpp @@ -100,7 +100,7 @@ BOOL fpcCtRq_Do(create_request* i_request) { } case cPhs_UNK3_e: case cPhs_ERROR_e: -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[2] != NULL) { g_fpcDbSv_service[2](i_request->process); } @@ -112,7 +112,7 @@ BOOL fpcCtRq_Do(create_request* i_request) { } int fpcCtRq_Handler() { -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[3] != NULL) { g_fpcDbSv_service[3](&g_fpcCtTg_Queue.mSize); } diff --git a/src/f_pc/f_pc_debug_sv.cpp b/src/f_pc/f_pc_debug_sv.cpp index ee78360f14..5d78ea3e22 100644 --- a/src/f_pc/f_pc_debug_sv.cpp +++ b/src/f_pc/f_pc_debug_sv.cpp @@ -1,4 +1,4 @@ -#ifdef DEBUG +#if DEBUG #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_debug_sv.h" diff --git a/src/f_pc/f_pc_delete_tag.cpp b/src/f_pc/f_pc_delete_tag.cpp index cb5e4c026c..2dc2b5a4c3 100644 --- a/src/f_pc/f_pc_delete_tag.cpp +++ b/src/f_pc/f_pc_delete_tag.cpp @@ -32,7 +32,7 @@ s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) { if (i_func(i_deleteTag->base.mpTagData) == 0) { fpcDtTg_ToDeleteQ(i_deleteTag); -#ifdef DEBUG +#if DEBUG if (i_deleteTag->unk_0x1c-- <= 0) { i_deleteTag->unk_0x1c = 0; if (g_fpcDbSv_service[4] != NULL) { diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp index 36612f8f0c..23b061652c 100644 --- a/src/f_pc/f_pc_deletor.cpp +++ b/src/f_pc/f_pc_deletor.cpp @@ -34,7 +34,7 @@ s32 fpcDt_deleteMethod(base_process_class* i_proc) { } void fpcDt_Handler() { -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[6] != NULL) { g_fpcDbSv_service[6](&g_fpcDtTg_Queue.mSize); } @@ -105,7 +105,7 @@ s32 fpcDt_Delete(void* i_proc) { base_process_class* proc = (base_process_class*)i_proc; if (proc != NULL) { -#ifdef DEBUG +#if DEBUG if (!fpcBs_Is_JustOfType(g_fpcBs_type, proc->type)) { if (g_fpcDbSv_service[12] != NULL) { g_fpcDbSv_service[12](proc); @@ -121,7 +121,7 @@ s32 fpcDt_Delete(void* i_proc) { return 0; int ret = fpcDt_ToDeleteQ(proc); -#ifdef DEBUG +#if DEBUG if (ret == 0) { if (g_fpcDbSv_service[5] != NULL) { g_fpcDbSv_service[5](proc); diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp index 86ee24a1aa..de6b0c6b66 100644 --- a/src/f_pc/f_pc_executor.cpp +++ b/src/f_pc/f_pc_executor.cpp @@ -45,7 +45,7 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) { return 0; } -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[1] != NULL) { g_fpcDbSv_service[1](i_proc); } diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index 9a6ce532d8..4a1664e43d 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -22,7 +22,7 @@ s32 fpcLf_Draw(leafdraw_class* i_leaf) { } s32 fpcLf_Execute(leafdraw_class* i_leaf) { -#ifdef DEBUG +#if DEBUG if (fpcBs_Is_JustOfType(g_fpcLf_type, i_leaf->base.subtype) == 0) { if (g_fpcDbSv_service[12] != NULL) { g_fpcDbSv_service[12](i_leaf); diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index 0982b64a94..d3c387d484 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -29,7 +29,7 @@ s32 fpcNd_Execute(process_node_class* i_procNode) { s32 ret = 0; layer_class* save_layer = fpcLy_CurrentLayer(); -#ifdef DEBUG +#if DEBUG if (fpcBs_Is_JustOfType(g_fpcNd_type, i_procNode->base.subtype) == 0) { if (g_fpcDbSv_service[11] != NULL) { g_fpcDbSv_service[11](i_procNode); diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 6c15f5180c..dbb8640f0b 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -29,7 +29,7 @@ void fpcNdRq_ToRequestQ(node_create_request* i_request) { s32 fpcNdRq_phase_IsCreated(node_create_request* i_request) { if (fpcCtRq_IsCreatingByID(i_request->creating_id) == TRUE) { -#ifdef DEBUG +#if DEBUG if (i_request->unk_0x64-- <= 0) { i_request->unk_0x64 = 0; if (g_fpcDbSv_service[8] != NULL) { @@ -64,7 +64,7 @@ s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request) { s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request) { if (fpcDt_IsComplete() == FALSE) { -#ifdef DEBUG +#if DEBUG if (i_request->unk_0x68-- <= 0) { i_request->unk_0x68 = 0; if (g_fpcDbSv_service[7] != NULL) { @@ -140,7 +140,7 @@ s32 fpcNdRq_Cancel(node_create_request* i_request) { s32 fpcNdRq_Handler() { node_class* node = l_fpcNdRq_Queue.mpHead; -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[9] != NULL) { g_fpcDbSv_service[9](&l_fpcNdRq_Queue.mSize); } @@ -218,7 +218,7 @@ node_create_request* fpcNdRq_Create(u32 i_requestSize) { cTg_Create(&req->create_tag, req); fpcMtdTg_Init(&req->method_tag, (process_method_tag_func)fpcNdRq_Cancel, req); req->request_id = request_id++; -#ifdef DEBUG +#if DEBUG req->unk_0x64 = 60; req->unk_0x68 = 60; #endif diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index de1d54cde4..b445e994bc 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -44,7 +44,7 @@ s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) { fpcLy_SetCurrentLayer(i_request->base.layer); int ret = fpcBs_SubCreate(i_request->base.process); -#ifdef DEBUG +#if DEBUG if (ret == 0 && i_request->unk_0x60-- <= 0) { i_request->unk_0x60 = 0; if (g_fpcDbSv_service[0] != NULL) { @@ -139,7 +139,7 @@ fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc request->create_post_method = i_createFunc; request->unk_0x5C = param_4; request->process_append = i_append; -#ifdef DEBUG +#if DEBUG request->unk_0x60 = 60; #endif diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index e7ca3efa65..4c4f85c785 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -717,7 +717,7 @@ JKRExpHeap* mDoExt_getHostIOHeap() { return HostIOHeap; } -#ifdef DEBUG +#if DEBUG extern u8 lbl_8074C3B9[1]; #endif @@ -728,7 +728,7 @@ static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_a JKRSolidHeap* createdHeap; if (i_size == 0 || i_size == -1) { - #ifdef DEBUG + #if DEBUG if (lbl_8074C3B9[0] != 0) { OS_REPORT("\x1b[44mmDoExt_createSolidHeap サイズ未設定\n\x1b[m"); OS_REPORT("最大空き容量確保します %08x\n\x1b[m", i_heap->getFreeSize()); @@ -748,7 +748,7 @@ static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_a if (createdHeap != NULL) { JKRSetErrorFlag(createdHeap, true); - #ifdef DEBUG + #if DEBUG if (lbl_8074C3B9[0] != 0) { u32 heapSize = createdHeap->getHeapSize(); OS_REPORT( @@ -761,7 +761,7 @@ static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_a #endif } -#ifdef DEBUG +#if DEBUG if (createdHeap == NULL) { OS_WARNING( "mDoExt_createMaxSolidHeap : ソリッドヒープ%fKの確保に失敗 連続空き容量=%fK 残り空き容量=%f\n", @@ -2807,7 +2807,7 @@ void mDoExt_3DlineMatSortPacket::draw() { J3DShape::resetVcdVatCache(); } -#ifdef DEBUG +#if DEBUG mDoExt_cube8pPacket::mDoExt_cube8pPacket(cXyz* i_points, const GXColor& i_color) { cXyz* pnt_array = mPoints; diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 2765a65c99..5b80b40201 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -767,8 +767,9 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ if (daPy_getLinkPlayerActorClass() != NULL) { u8 sp8 = 1; #if DEBUG - if (g_envHIO.mOther.mDepthOfField) { + if (g_envHIO.mOther.mDepthOfField) #endif + { if (mDoGph_gInf_c::isAutoForcus()) { f32 sp4C[7]; f32 sp34[6]; @@ -998,9 +999,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ GXSetTevSwapModeTable(GX_TEV_SWAP3, GX_CH_BLUE, GX_CH_BLUE, GX_CH_BLUE, GX_CH_ALPHA); GXSetTevSwapMode(GX_TEVSTAGE0, GX_TEV_SWAP0, GX_TEV_SWAP0); GXSetProjection(param_0->projMtx, GX_PERSPECTIVE); - #if DEBUG } - #endif } } @@ -1537,17 +1536,11 @@ int mDoGph_Painter() { dComIfGd_drawOpaListDarkBG(); dComIfGd_drawOpaListMiddle(); - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawFogPri0_B(&draw_info); } - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawNormalPri0_B(&draw_info); } @@ -1569,14 +1562,11 @@ int mDoGph_Painter() { dComIfGd_drawOpaList(); - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d) { + if (DEBUG && g_kankyoHIO.navy.field_0x30d) { if (dKy_darkworld_check() != TRUE) { dComIfGd_drawOpaListDark(); } - } else - #endif - { + } else { dComIfGd_drawOpaListDark(); } @@ -1592,10 +1582,7 @@ int mDoGph_Painter() { dComIfGd_drawXluListBG(); dComIfGd_drawXluListDarkBG(); - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawFogPri0_A(&draw_info); dComIfGp_particle_drawNormalPri0_A(&draw_info); } @@ -1609,14 +1596,11 @@ int mDoGph_Painter() { dComIfGd_drawXluList(); - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d) { + if (DEBUG && g_kankyoHIO.navy.field_0x30d) { if (dKy_darkworld_check() != TRUE) { dComIfGd_drawXluListDark(); } - } else - #endif - { + } else { dComIfGd_drawXluListDark(); } @@ -1653,10 +1637,8 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d == 0 || dKy_darkworld_check() != TRUE) - #endif - { + if (!(DEBUG && g_kankyoHIO.navy.field_0x30d != 0 && + dKy_darkworld_check() == TRUE)) { if (g_env_light.is_blure == 0) { dComIfGd_drawOpaListInvisible(); dComIfGd_drawXluListInvisible(); @@ -1671,10 +1653,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawFogPri4(&draw_info); dComIfGp_particle_drawProjection(&draw_info); } @@ -1697,14 +1676,11 @@ int mDoGph_Painter() { GXSetClipMode(GX_CLIP_ENABLE); - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d) { + if (DEBUG && g_kankyoHIO.navy.field_0x30d) { if (dKy_darkworld_check() != TRUE) { dComIfGd_drawOpaListFilter(); } - } else - #endif - { + } else { dComIfGd_drawOpaListFilter(); } @@ -1717,10 +1693,7 @@ int mDoGph_Painter() { GXSetClipMode(GX_CLIP_ENABLE); - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawFogPri1(&draw_info); dComIfGp_particle_draw(&draw_info); dComIfGp_particle_drawFogPri2(&draw_info); @@ -1748,20 +1721,15 @@ int mDoGph_Painter() { GXSetClipMode(GX_CLIP_ENABLE); - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d == 0 || dKy_darkworld_check() != TRUE) - #endif - { + if (!(DEBUG && g_kankyoHIO.navy.field_0x30d != 0 && + dKy_darkworld_check() == TRUE)) { if (g_env_light.is_blure == 1) { dComIfGd_drawOpaListInvisible(); dComIfGd_drawXluListInvisible(); } } - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawScreen(&draw_info); } @@ -1848,10 +1816,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { #if WIDESCREEN_SUPPORT if (mDoGph_gInf_c::isWideZoom()) { ortho.setOrtho(0.0f, 0.0f, 608.0f, 448.0f, 100000.0f, -100000.0f); @@ -1947,10 +1912,7 @@ int mDoGph_Painter() { captureScreenSetPort(); #endif - #if DEBUG - if (fapGmHIO_get2Ddraw()) - #endif - { + if (fapGmHIO_get2Ddraw()) { Mtx m4; cMtx_copy(j3dSys.getViewMtx(), m4); diff --git a/src/m_Do/m_Do_hostIO.cpp b/src/m_Do/m_Do_hostIO.cpp index 1f2cc6c1f1..3183dc76e7 100644 --- a/src/m_Do/m_Do_hostIO.cpp +++ b/src/m_Do/m_Do_hostIO.cpp @@ -1,7 +1,7 @@ #include "m_Do/m_Do_hostIO.h" #include -#ifdef DEBUG +#if DEBUG mDoHIO_root_c mDoHIO_root; diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 54caefa88e..fed3d8c4d3 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -219,7 +219,7 @@ GXRenderModeObj g_ntscZeldaProg = { }; #endif -#ifdef DEBUG +#if DEBUG static void myGXVerifyCallback(GXWarningLevel, u32, const char*); GXRenderModeObj g_palZeldaProg60 = { @@ -601,14 +601,14 @@ int mDoMch_Create() { } JKRHeap::setDefaultDebugFill(mDoMch::mDebugFill); - #ifdef DEBUG + #if DEBUG JKRSetDebugFillNotuse(mDoMch::mDebugFillNotUse); JKRSetDebugFillNew(mDoMch::mDebugFillNew); JKRSetDebugFillDelete(mDoMch::mDebugFillDelete); #endif JFWSystem::setMaxStdHeap(1); - #ifndef DEBUG + #if !DEBUG uintptr_t arenaHi = (uintptr_t)OSGetArenaHi(); uintptr_t arenaLo = (uintptr_t)OSGetArenaLo(); @@ -654,7 +654,7 @@ int mDoMch_Create() { gameHeapSize += 0x100000; dynamicLinkHeapSize = 0x180000; - #ifndef DEBUG + #if !DEBUG // Fakematch because the heap sizes differ between debug and retail. // Maybe the actual calculations above use sizeof or constants and that's why it's different? archiveHeapSize -= 0x641800; @@ -666,7 +666,7 @@ int mDoMch_Create() { gameHeapSize += 0xC800; #endif - #ifdef DEBUG + #if DEBUG if (mDoMain::archiveHeapSize != -1) { OSReport_Error("アーカイブヒープサイズ指定！\n"); archiveHeapSize = mDoMain::archiveHeapSize; @@ -685,7 +685,7 @@ int mDoMch_Create() { arenaSize -= (dbPrintHeapSize + 0x10); arenaSize -= 0x120; - #ifndef DEBUG + #if !DEBUG arenaSize -= 0xDAB400; #endif #if VERSION == VERSION_GCN_JPN @@ -700,14 +700,14 @@ int mDoMch_Create() { } JFWSystem::setFifoBufSize(0xA0000); - #ifdef DEBUG + #if DEBUG JFWSystem::setAramAudioBufSize(0xB00000); #else JFWSystem::setAramAudioBufSize(0xA00000); #endif JFWSystem::setAramGraphBufSize(-1); - #ifdef DEBUG + #if DEBUG VIInit(); if (VIGetDTVStatus() != 0 && mDoMch_IsProgressiveMode()) { mDoMch_render_c::setProgressiveMode(); @@ -752,7 +752,7 @@ int mDoMch_Create() { JKRSetErrorFlag(JFWSystem::getSystemHeap(), true); JKRHeap* rootHeap = (JKRHeap*)JKRGetRootHeap(); - #ifdef DEBUG + #if DEBUG JKRHeap* rootHeap2 = JKRGetRootHeap2(); #else JKRHeap* rootHeap2 = rootHeap; @@ -762,7 +762,7 @@ int mDoMch_Create() { heap = mDoExt_createCommandHeap(commandHeapSize, rootHeap); my_SysPrintHeap("コマンドヒープ", heap, commandHeapSize); - #ifdef DEBUG + #if DEBUG heap = DynamicModuleControlBase::createHeap(dynamicLinkHeapSize, rootHeap); my_SysPrintHeap("ダイナミックリンクヒープ", heap, dynamicLinkHeapSize); #endif @@ -779,7 +779,7 @@ int mDoMch_Create() { heap = mDoExt_createGameHeap(gameHeapSize, rootHeap); my_SysPrintHeap("ゲームヒープ", heap, gameHeapSize); - #ifdef DEBUG + #if DEBUG JKRHeap* sp28 = rootHeap2; u32 hostIOHeapSize = 0x71450; hostIOHeapSize += 0x32000; @@ -795,7 +795,7 @@ int mDoMch_Create() { my_SysPrintHeap("ゼルダヒープ", zeldaHeap, size); JKRSetCurrentHeap(zeldaHeap); - #ifdef DEBUG + #if DEBUG my_PrintHeap("システムヒープ", JKRGetSystemHeap()->getTotalFreeSize()); my_PrintHeap("ルートヒープ", JKRGetRootHeap()->getTotalFreeSize()); my_PrintHeap("ルートヒープ2", JKRGetRootHeap2()->getTotalFreeSize()); @@ -811,7 +811,7 @@ int mDoMch_Create() { sysConsole->setOutput(JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT); sysConsole->setPosition(16, 42); -#ifdef DEBUG +#if DEBUG JUTException::setMapFile("/map/RVL/Debug/RframeworkD.map"); #else JUTException::appendMapFile("/map/Final/Release/frameworkF.map"); @@ -821,7 +821,7 @@ int mDoMch_Create() { cMl::init(mDoExt_getZeldaHeap()); cM_initRnd(100, 100, 100); - #ifdef DEBUG + #if DEBUG GXSetVerifyLevel((GXWarningLevel)mDoMch::GXWarningLevel); GXSetVerifyCallback((GXVerifyCallback)&myGXVerifyCallback); #endif diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index d7b36128cc..9885fbc48b 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -176,14 +176,14 @@ int mDoMain::argument = -1; s8 mDoMain::developmentMode = -1; -#ifdef DEBUG +#if DEBUG u32 mDoMain::gameHeapSize = 0xFFFFFFFF; u32 mDoMain::archiveHeapSize = 0xFFFFFFFF; #endif u32 mDoMain::memMargin = 0xFFFFFFFF; -#ifdef DEBUG +#if DEBUG int mDoMain::e3menu_no = -1; #endif diff --git a/src/revolution/os/OSAlloc.c b/src/revolution/os/OSAlloc.c index e1294521c9..15d46404a9 100644 --- a/src/revolution/os/OSAlloc.c +++ b/src/revolution/os/OSAlloc.c @@ -9,7 +9,7 @@ #define HEADERSIZE 32u #define MINOBJSIZE 64u -#ifdef DEBUG +#if DEBUG #define ENABLE_HEAPDESC #endif diff --git a/src/revolution/os/OSFont.c b/src/revolution/os/OSFont.c index 29e1a8192b..d345fdd2c6 100644 --- a/src/revolution/os/OSFont.c +++ b/src/revolution/os/OSFont.c @@ -373,7 +373,7 @@ static void ReadROM(void* buf, int length, int offset) { static u32 ReadFont(void* img, u16 encode, void* fontData) { u32 size; -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif diff --git a/src/revolution/os/OSMemory.c b/src/revolution/os/OSMemory.c index 76309cffc8..052b2740f4 100644 --- a/src/revolution/os/OSMemory.c +++ b/src/revolution/os/OSMemory.c @@ -648,7 +648,7 @@ void __OSRestoreCodeExecOnMEM1(u32 param_0) { void __OSInitMemoryProtection(void) { static BOOL initialized = FALSE; -#ifndef DEBUG +#if !DEBUG u32 padding[9]; u32 temp; #endif diff --git a/src/revolution/os/OSRtc.c b/src/revolution/os/OSRtc.c index 67a5d90527..11fa04e05d 100644 --- a/src/revolution/os/OSRtc.c +++ b/src/revolution/os/OSRtc.c @@ -331,7 +331,7 @@ u32 OSGetProgressiveMode(void) { } void OSSetProgressiveMode(u32 on) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSram* sram; @@ -439,7 +439,7 @@ u32 OSGetEuRgb60Mode(void) { } void OSSetEuRgb60Mode(u32 on) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSram* sram; @@ -492,7 +492,7 @@ u16 OSGetGbsMode(void) { } void OSSetGbsMode(u16 mode) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSramEx* sram; diff --git a/src/revolution/os/OSThread.c b/src/revolution/os/OSThread.c index a9d12f7a5b..91b21aa561 100644 --- a/src/revolution/os/OSThread.c +++ b/src/revolution/os/OSThread.c @@ -122,7 +122,7 @@ void __OSThreadInit() { thread->mutex = 0; OSInitThreadQueue(&thread->queueJoin); -#ifdef DEBUG +#if DEBUG OSInitMutexQueue(&thread->queueMutex); #else thread->queueMutex.head = thread->queueMutex.tail = 0; // it got inlined? cant reproduce the inline... @@ -425,7 +425,7 @@ int OSCreateThread(OSThread* thread, void* (*func)(void*), void* param, void* st thread->val = (void*)-1; thread->mutex = 0; OSInitThreadQueue(&thread->queueJoin); -#ifdef DEBUG +#if DEBUG OSInitMutexQueue(&thread->queueMutex); #else OSInitThreadQueue((void*)&thread->queueMutex); // why @@ -487,7 +487,7 @@ void OSExitThread(void* val) { __OSUnlockAllMutex(currentThread); OSWakeupThread(¤tThread->queueJoin); RunQueueHint = 1; -#ifdef DEBUG +#if DEBUG __OSReschedule(); #else if (RunQueueHint != 0) {