mirror
/
tp
mirror of https://github.com/zeldaret/tp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various debug conditional compilation cleanup (#2915) 

* Global: Define DEBUG as 0 if not already defined

* Clean up DEBUG-guarded code
This commit is contained in:
Max Roncace 2025-12-06 16:34:47 -05:00 committed by GitHub
parent 9f1a648851
commit a30e617e5a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
316 changed files with 1133 additions and 1267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/JSystem/JAudio2/JASDSPInterface.h
View File

@ -119,7 +119,7 @@ namespace JASDsp {
extern FxBuf* FX_BUF;
extern f32 sDSPVolume;
#ifdef DEBUG
#if DEBUG
extern s32 dspMutex;
#endif
};

2
include/JSystem/JGadget/define.h
View File

@ -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);

4
include/JSystem/JHostIO/JORReflexible.h
View File

@ -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();

2
include/JSystem/JKernel/JKRHeap.h
View File

@ -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; }

23
include/JSystem/JStudio/JStudio/functionvalue.h
View File

@ -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_;

2
include/JSystem/JStudio/JStudio/jstudio-object.h
View File

@ -47,7 +47,7 @@ struct TVariableValue {
}
void setValue_none() {
#ifdef DEBUG
#if DEBUG
field_0xc.fv = NULL;
#endif
field_0x8 = NULL;

2
include/JSystem/JUtility/JUTAssert.h
View File

@ -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) \

4
include/SSystem/SComponent/c_cc_s.h
View File

@ -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;

2
include/Z2AudioLib/Z2SeqMgr.h
View File

@ -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

360
include/d/actor/d_a_alink.h
View File

File diff suppressed because it is too large Load Diff

2
include/d/actor/d_a_demo00.h
View File

@ -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

2
include/d/actor/d_a_e_yr.h
View File

@ -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;

2
include/d/actor/d_a_npc_aru.h
View File

@ -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,

6
include/d/actor/d_a_npc_cd.h
View File

@ -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

2
include/d/actor/d_a_npc_cdn3.h
View File

@ -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

4
include/d/actor/d_a_npc_doc.h
View File

@ -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; }

2
include/d/actor/d_a_npc_fairy.h
View File

@ -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();

15
include/d/actor/d_a_npc_grmc.h
View File

@ -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;

2
include/d/actor/d_a_npc_grr.h
View File

@ -17,7 +17,7 @@ struct daNpc_grR_HIOParam {
};
class daNpc_grR_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{

2
include/d/actor/d_a_npc_hoz.h
View File

@ -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; }

2
include/d/actor/d_a_npc_kasi_kyu.h
View File

@ -20,7 +20,7 @@ struct daNpcKasiKyu_HIOParam {
};
class daNpcKasiKyu_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{

2
include/d/actor/d_a_npc_kasi_mich.h
View File

@ -20,7 +20,7 @@ struct daNpcKasiMich_HIOParam {
};
class daNpcKasiMich_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{

2
include/d/actor/d_a_npc_kolin.h
View File

@ -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,

2
include/d/actor/d_a_npc_kolinb.h
View File

@ -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,

2
include/d/actor/d_a_npc_pachi_besu.h
View File

@ -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);

4
include/d/actor/d_a_npc_saru.h
View File

@ -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];

4
include/d/actor/d_a_npc_seic.h
View File

@ -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

4
include/d/actor/d_a_npc_seid.h
View File

@ -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

2
include/d/actor/d_a_npc_taro.h
View File

@ -55,7 +55,7 @@ class daNpc_Taro_Param_c {
};
class daNpc_Taro_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{

2
include/d/actor/d_a_npc_tks.h
View File

@ -28,7 +28,7 @@ struct daNpcTks_HIOParam {
};
class daNpcTks_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{

2
include/d/actor/d_a_npc_toby.h
View File

@ -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,

2
include/d/actor/d_a_npc_ykm.h
View File

@ -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,

2
include/d/actor/d_a_npc_ykw.h
View File

@ -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,

2
include/d/actor/d_a_npc_zelRo.h
View File

@ -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,

2
include/d/actor/d_a_obj_bemos.h
View File

@ -123,7 +123,7 @@ public:
void initActionDead();
void actionDead();
int Draw();
#ifdef DEBUG
#if DEBUG
/* 0x000000 */ void debugDraw();
#endif
int Delete();

2
include/d/actor/d_a_obj_damCps.h
View File

@ -14,7 +14,7 @@
*
*/
class daObjDamCps_c : public fopAc_ac_c {
#ifdef DEBUG
#if DEBUG
public:
daObjDamCps_c() {};
void initBaseMtx();

2
include/d/actor/d_a_obj_fallobj.h
View File

@ -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();

4
include/d/actor/d_a_obj_kbacket.h
View File

@ -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;

2
include/d/actor/d_a_obj_laundry_rope.h
View File

@ -45,7 +45,7 @@ public:
inline float getStartRate(cXyz* param_1);
#ifdef DEBUG
#if DEBUG
const daObjLndRope_Hio_c* attr() const {
return &M_Hio;
};

2
include/d/actor/d_a_obj_lv6swturn.h
View File

@ -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();

2
include/d/actor/d_a_obj_mie.h
View File

@ -26,7 +26,7 @@ struct daObj_Mie_Param_c {
};
class daObj_Mie_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{

2
include/d/actor/d_a_obj_swchain.h
View File

@ -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
};

2
include/d/actor/d_a_obj_thdoor.h
View File

@ -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();

2
include/d/actor/d_a_obj_tobyhouse.h
View File

@ -79,7 +79,7 @@ public:
STATIC_ASSERT(sizeof(daObjTobyHouse_c) == 0x600);
#ifdef DEBUG
#if DEBUG
class daObjTobyHouse_HIO_c : public mDoHIO_entry_c {
public:

2
include/d/actor/d_a_obj_togeTrap.h
View File

@ -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);

2
include/d/actor/d_a_obj_volcbom.h
View File

@ -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();

6
include/d/d_attention.h
View File

@ -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);
}

8
include/d/d_bg_s.h
View File

@ -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

4
include/d/d_bg_s_acch.h
View File

@ -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;

2
include/d/d_cc_s.h
View File

@ -65,7 +65,7 @@ public:
// /* 0x0000 */ cCcS mCCcS;
/* 0x284C */ dCcMassS_Mng mMass_Mng;
#ifdef DEBUG
#if DEBUG
/* 0x2AD0 */ u8 field_0x2ad0;
#endif
}; // Size = 0x2AC4

2
include/d/d_event.h
View File

@ -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; }

3
include/d/d_event_debug.h
View File

@ -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 */

2
include/d/d_kankyo.h
View File

@ -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

6
include/d/d_meter_HIO.h
View File

@ -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();

2
include/d/d_msg_flow.h
View File

@ -173,7 +173,7 @@ public:
void initWord(fopAc_ac_c*, const char*, u8, int, fopAc_ac_c**);
#ifdef DEBUG
#if DEBUG
void dbgPrint();
#endif

2
include/d/d_resorce.h
View File

@ -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

2
include/d/d_s_menu.h
View File

@ -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)

6
include/d/d_s_play.h
View File

@ -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]

6
include/d/d_s_play_env.h
View File

@ -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;

4
include/d/d_stage.h
View File

@ -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;

2
include/d/d_vibration.h
View File

@ -88,7 +88,7 @@ public:
static const vib_pattern CQ_patt[VIBMODE_Q_MAX];
private:
#ifdef DEBUG
#if DEBUG
/* 0x00 */ dVibTest_c mVibTest;
#endif

12
include/dolphin/mtx.h
View File

@ -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

4
include/dolphin/os.h
View File

@ -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))

8
include/f_ap/f_ap_game.h
View File

@ -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

4
include/f_op/f_op_actor.h
View File

@ -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,

6
include/f_op/f_op_actor_mng.h
View File

@ -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

2
include/f_pc/f_pc_debug_sv.h
View File

@ -4,7 +4,7 @@
#include <dolphin.h>
#ifdef DEBUG
#if DEBUG
char* fpcDbSv_getNameString(s16 i_name);

2
include/f_pc/f_pc_node_req.h
View File

@ -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

2
include/f_pc/f_pc_stdcreate_req.h
View File

@ -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;

5
include/global.h
View File

@ -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]))

4
include/m_Do/m_Do_hostIO.h
View File

@ -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

2
include/m_Do/m_Do_main.h
View File

@ -62,7 +62,7 @@ private:
};
struct mDoMain {
#ifdef DEBUG
#if DEBUG
static int argument;
static int e3menu_no;
static u32 archiveHeapSize;

12
include/revolution/mtx.h
View File

@ -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

4
include/revolution/os.h
View File

@ -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))

8
src/JSystem/JAudio2/JASAiCtrl.cpp
View File

@ -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

2
src/JSystem/JAudio2/JASDSPInterface.cpp
View File

@ -659,6 +659,6 @@ u16 DSP_CreateMap2(u32 param_0) {
u32 JASWaveInfo::one = 1;
#ifdef DEBUG
#if DEBUG
s32 dspMutex = 1;
#endif

8
src/JSystem/JAudio2/JASHeapCtrl.cpp
View File

@ -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);

4
src/JSystem/JKernel/JKRAramArchive.cpp
View File

@ -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;
}

6
src/JSystem/JKernel/JKRCompArchive.cpp
View File

@ -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;
}

4
src/JSystem/JKernel/JKRDvdArchive.cpp
View File

@ -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;
}

6
src/JSystem/JKernel/JKRHeap.cpp
View File

@ -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");
}

2
src/JSystem/JKernel/JKRMemArchive.cpp
View File

@ -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);
}

4
src/JSystem/JKernel/JKRSolidHeap.cpp
View File

@ -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
}

14
src/JSystem/JKernel/JKRThread.cpp
View File

@ -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);

2
src/JSystem/JMessage/resource.cpp
View File

@ -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);

2
src/JSystem/JStudio/JStudio/functionvalue.cpp
View File

@ -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
}

2
src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
View File

@ -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);

2
src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h
View File

@ -156,7 +156,7 @@ struct __copy_backward<T, true>
{
static T* copy_backward(T* first, T* last, T* result)
{
#ifdef DEBUG
#if DEBUG
size_t n = static_cast<size_t>(last - first);
result -= n;
memmove(result, first, n*sizeof(T));

2
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h
View File

@ -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

6
src/Z2AudioLib/Z2EnvSeMgr.cpp
View File

@ -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

2
src/Z2AudioLib/Z2SeqMgr.cpp
View File

@ -106,7 +106,7 @@ Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance<Z2SeqMgr>(true) {
mAllBgmMaster.forceIn();
field_0xa4.forceIn();
#ifdef DEBUG
#if DEBUG
field_0x00_debug = 1.0f;
field_0x04_debug = 0;
#endif

8
src/d/actor/d_a_alink.cpp
View File

@ -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
)

2
src/d/actor/d_a_alink_HIO.inc
View File

@ -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) {

4
src/d/actor/d_a_alink_demo.inc
View File

@ -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)
{

21
src/d/actor/d_a_andsw.cpp
View File

@ -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;

11
src/d/actor/d_a_b_bh.cpp
View File

@ -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;

2
src/d/actor/d_a_b_bq.cpp
View File

@ -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;

16
src/d/actor/d_a_b_dr.cpp
View File

@ -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]);

7
src/d/actor/d_a_b_gm.cpp
View File

@ -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;

2
src/d/actor/d_a_b_gnd.cpp
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More