mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-31 17:01:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TakaRikka
2025-12-06 21:12:18 -08:00
parent 1a8fa20fe7 ecb4b69c42
commit 214a78acdb
377 changed files with 6145 additions and 3086 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/ShieldD/symbols.txt
+1 -1
View File
@@ -64547,7 +64547,7 @@ dShopSystem_item_count = .sbss:0x8074C95C; // type:object size:0x4 scope:global
lbl_8074C960 = .sbss:0x8074C960; // type:object size:0x8 data:byte hash:0x0F86F830
dShopSystem_cameraActor = .sbss:0x8074C968; // type:object size:0x8 scope:global data:4byte hash:0x2A77C5ED
dShopSystem_camera_count = .sbss:0x8074C970; // type:object size:0x4 scope:global data:4byte hash:0xACB709DA
lbl_8074C978 = .sbss:0x8074C978; // type:object size:0x1 data:byte hash:0x98067E38 dhash:0x4ED1802D
@LOCAL@setDaytime__18dScnKy_env_light_cFv@data_8074c978 = .sbss:0x8074C978; // type:object size:0x1 data:byte hash:0x98067E38 dhash:0x4ED1802D
@LOCAL@setLight__18dScnKy_env_light_cFv@S_fuwan_sin = .sbss:0x8074C97A; // type:object size:0x2 scope:local data:2byte hash:0x51289156 dhash:0xA18EAC9A
lbl_8074C97C = .sbss:0x8074C97C; // type:object size:0x1 data:byte hash:0x1F86B096 dhash:0x69B2C747
lbl_8074C97D = .sbss:0x8074C97D; // type:object size:0x1 data:byte hash:0x3752C2F1 dhash:0x0B5EF1FA
configure.py
+7 -7
View File
@@ -285,9 +285,9 @@ if config.version in USE_REVOLUTION_SDK_VERSIONS:
# Debug flags
if args.debug:
# Or -sym dwarf-2 for Wii compilers
cflags_base.extend(["-sym on", "-DDEBUG=1"])
cflags_base.extend(["-sym on", "-DDEBUG=1", "-DDEBUG_DEFINED=1", "-DNDEBUG_DEFINED=0"])
else:
cflags_base.append("-DNDEBUG=1")
cflags_base.extend(["-DNDEBUG=1", "-DNDEBUG_DEFINED=1", "-DDEBUG_DEFINED=0"])
# Warning flags
if args.warn == "all":
@@ -691,7 +691,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "d/d_a_horse_static.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_demo.cpp"),
Object(MatchingFor(ALL_GCN, "Shield"), "d/d_door_param2.cpp"), # debug weak func order
Object(NonMatching, "d/d_resorce.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_resorce.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_map_path.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_map_path_fmap.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_map_path_dmap.cpp"),
@@ -1103,10 +1103,10 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SeMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SeqMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2StatusMgr.cpp"),
Object(NonMatching, "Z2AudioLib/Z2SceneMgr.cpp"),
Object(Equivalent, "Z2AudioLib/Z2SceneMgr.cpp"), # weak func order
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2FxLineMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundInfo.cpp"),
Object(Equivalent, "Z2AudioLib/Z2Audience.cpp"),
Object(Equivalent, "Z2AudioLib/Z2Audience.cpp"), # weak func order
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundObject.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SoundObjMgr.cpp"),
Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2Creature.cpp"),
@@ -1209,7 +1209,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DOrthoGraph.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DTevs.cpp"),
Object(Equivalent, "JSystem/J2DGraph/J2DMaterial.cpp"), # weak func order
Object(NonMatching, "JSystem/J2DGraph/J2DMatBlock.cpp"), # weak func order (J3DTevBlock)
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DMatBlock.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DMaterialFactory.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DPrint.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DPane.cpp"),
@@ -1238,7 +1238,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/J3DGraphBase/J3DShapeDraw.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphBase/J3DShape.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphBase/J3DMaterial.cpp"),
Object(Equivalent, "JSystem/J3DGraphBase/J3DMatBlock.cpp"), # virtual function order
Object(Equivalent, "JSystem/J3DGraphBase/J3DMatBlock.cpp"), # weak func order (J3DTevBlock)
Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphBase/J3DTevs.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphBase/J3DDrawBuffer.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphBase/J3DStruct.cpp"),
include/JSystem/J2DGraph/J2DAnimation.h
+19 -19
View File
@@ -479,26 +479,26 @@ inline f32 J2DHermiteInterpolation<f32>(f32 f1, f32* f2, f32* f3, f32* f4, f32*
}
template <>
inline f32 J2DHermiteInterpolation<s16>(register f32 pp1, register s16* pp2, register s16* pp3,
register s16* pp4, register s16* pp5, register s16* pp6,
register s16* pp7) {
inline f32 J2DHermiteInterpolation<s16>(__REGISTER f32 pp1, __REGISTER s16* pp2, __REGISTER s16* pp3,
__REGISTER s16* pp4, __REGISTER s16* pp5, __REGISTER s16* pp6,
__REGISTER s16* pp7) {
#ifdef __MWERKS__
register f32 p1 = pp1;
register f32 ff8;
register f32 ff7;
register f32 ff6;
register f32 ff5;
register f32 ff4;
register f32 ff3;
register f32 ff2;
register f32 ff0;
register f32 fout;
register s16* p2 = pp2;
register s16* p3 = pp3;
register s16* p4 = pp4;
register s16* p5 = pp5;
register s16* p6 = pp6;
register s16* p7 = pp7;
__REGISTER f32 p1 = pp1;
__REGISTER f32 ff8;
__REGISTER f32 ff7;
__REGISTER f32 ff6;
__REGISTER f32 ff5;
__REGISTER f32 ff4;
__REGISTER f32 ff3;
__REGISTER f32 ff2;
__REGISTER f32 ff0;
__REGISTER f32 fout;
__REGISTER s16* p2 = pp2;
__REGISTER s16* p3 = pp3;
__REGISTER s16* p4 = pp4;
__REGISTER s16* p5 = pp5;
__REGISTER s16* p6 = pp6;
__REGISTER s16* p7 = pp7;
// clang-format off
asm {
psq_l ff2, 0(p2), 0x1, 5
include/JSystem/J2DGraph/J2DTevs.h
+47 -6
View File
@@ -3,6 +3,7 @@
#include <dolphin/gx.h>
#include "dolphin/mtx.h"
#include "global.h"
/**
* @ingroup jsystem-j2d
@@ -213,6 +214,19 @@ struct J2DIndTevStageInfo {
/* 0x9 */ u8 field_0x9;
/* 0xa */ u8 field_0xa;
/* 0xb */ u8 field_0xb;
J2DIndTevStageInfo& operator=(const J2DIndTevStageInfo& other) {
mIndStage = other.mIndStage;
mIndFormat = other.mIndFormat;
mBiasSel = other.mBiasSel;
mMtxSel = other.mMtxSel;
mWrapS = other.mWrapS;
mWrapT = other.mWrapT;
mPrev = other.mPrev;
mLod = other.mLod;
mAlphaSel = other.mAlphaSel;
return *this;
}
};
inline u32 J2DCalcIndTevStage(J2DIndTevStageInfo info) {
@@ -264,9 +278,9 @@ struct J2DTexCoordInfo {
u8 padding; // ?
J2DTexCoordInfo& operator=(const J2DTexCoordInfo& other) {
this->mTexGenType = other.mTexGenType;
this->mTexGenSrc = other.mTexGenSrc;
this->mTexGenMtx = other.mTexGenMtx;
mTexGenType = other.mTexGenType;
mTexGenSrc = other.mTexGenSrc;
mTexGenMtx = other.mTexGenMtx;
return *this;
}
};
@@ -386,9 +400,20 @@ extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode;
*/
class J2DTevStage {
public:
J2DTevStage(J2DTevStageInfo const&);
J2DTevStage();
void setTevStageInfo(J2DTevStageInfo const&);
J2DTevStage(J2DTevStageInfo const& param_0) {
setTevStageInfo(param_0);
setTevSwapModeInfo(j2dDefaultTevSwapMode);
}
J2DTevStage() {
setTevStageInfo(j2dDefaultTevStageInfo);
setTevSwapModeInfo(j2dDefaultTevSwapMode);
}
void setTevStageInfo(J2DTevStageInfo const& info) {
setColorABCD(info.mColorA, info.mColorB, info.mColorC, info.mColorD);
setTevColorOp(info.mCOp, info.mCBias, info.mCScale, info.mCClamp, info.mCReg);
setAlphaABCD(info.mAlphaA, info.mAlphaB, info.mAlphaC, info.mAlphaD);
setTevAlphaOp(info.mAOp, info.mABias, info.mAScale, info.mAClamp, info.mAReg);
}
void setStageNo(u32 param_0) {
field_0x0 = (param_0 << 1) + 0xc0;
@@ -522,6 +547,14 @@ struct J2DTevSwapModeTableInfo {
/* 0x1 */ u8 field_0x1;
/* 0x2 */ u8 field_0x2;
/* 0x3 */ u8 field_0x3;
J2DTevSwapModeTableInfo& operator=(const J2DTevSwapModeTableInfo& other) {
field_0x0 = other.field_0x0;
field_0x1 = other.field_0x1;
field_0x2 = other.field_0x2;
field_0x3 = other.field_0x3;
return *this;
}
};
inline u8 J2DCalcTevSwapTable(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
@@ -564,6 +597,14 @@ struct J2DColorChanInfo {
/* 0x0 */ u8 field_0x1;
/* 0x0 */ u8 field_0x2;
/* 0x0 */ u8 field_0x3;
J2DColorChanInfo& operator=(const J2DColorChanInfo& other) {
field_0x0 = other.field_0x0;
field_0x1 = other.field_0x1;
field_0x2 = other.field_0x2;
field_0x3 = other.field_0x3;
return *this;
}
};
inline u16 J2DCalcColorChanID(u8 param_0) { return param_0; }
include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+6 -6
View File
@@ -4,13 +4,13 @@
#include "JSystem/J3DGraphBase/J3DSys.h"
// matches debug
inline f32 J3DCalcZValue(register MtxP m, register Vec v) {
inline f32 J3DCalcZValue(__REGISTER MtxP m, __REGISTER Vec v) {
#ifdef __MWERKS__
register f32 temp_f4;
register f32 out;
register f32 temp_f0;
register f32 temp_f2;
register f32 temp_f1 = 1.0f;
__REGISTER f32 temp_f4;
__REGISTER f32 out;
__REGISTER f32 temp_f0;
__REGISTER f32 temp_f2;
__REGISTER f32 temp_f1 = 1.0f;
// clang-format off
asm {
include/JSystem/J3DGraphBase/J3DMatBlock.h
+9
View File
@@ -1543,6 +1543,15 @@ struct J3DAlphaCompInfo {
/* 0x5 */ u8 field_0x5;
/* 0x6 */ u8 field_0x6;
/* 0x7 */ u8 field_0x7;
J3DAlphaCompInfo& operator=(const J3DAlphaCompInfo& other) {
mComp0 = other.mComp0;
mRef0 = other.mRef0;
mOp = other.mOp;
mComp1 = other.mComp1;
mRef1 = other.mRef1;
return *this;
}
};
extern const u16 j3dDefaultAlphaCmpID;
include/JSystem/J3DGraphBase/J3DStruct.h
+4 -4
View File
@@ -31,7 +31,7 @@ public:
J3DLightObj() { mInfo = j3dDefaultLightInfo; }
void load(u32) const;
J3DLightInfo& getLightInfo() { return mInfo; }
J3DLightInfo* getLightInfo() { return &mInfo; }
J3DLightObj& operator=(J3DLightObj const& other) {
mInfo = other.mInfo;
return *this;
@@ -54,9 +54,9 @@ struct J3DTextureSRTInfo {
inline void operator=(J3DTextureSRTInfo const& other) {
#ifdef __MWERKS__
register const f32* src = &other.mScaleX;
register f32* dst = &mScaleX;
register f32 xy;
__REGISTER const f32* src = &other.mScaleX;
__REGISTER f32* dst = &mScaleX;
__REGISTER f32 xy;
asm {
psq_l xy, 0(src), 0, 0
psq_st xy, 0(dst), 0, 0
include/JSystem/J3DGraphBase/J3DTexture.h
+10 -1
View File
@@ -4,6 +4,7 @@
#include "JSystem/J3DGraphBase/J3DStruct.h"
#include "JSystem/J3DAssert.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "global.h"
#include <stdint.h>
/**
@@ -79,6 +80,14 @@ struct J3DTexCoordInfo {
/* 0x1 */ u8 mTexGenSrc;
/* 0x2 */ u8 mTexGenMtx;
/* 0x3 */ u8 pad;
J3DTexCoordInfo& operator=(const J3DTexCoordInfo& other) {
mTexGenType = other.mTexGenType;
mTexGenSrc = other.mTexGenSrc;
mTexGenMtx = other.mTexGenMtx;
pad = other.pad;
return *this;
}
};
extern J3DTexCoordInfo const j3dDefaultTexCoordInfo[8];
@@ -108,7 +117,7 @@ struct J3DTexCoord : public J3DTexCoordInfo {
void setTexMtxReg(u16 reg) { mTexMtxReg = reg; }
J3DTexCoord& operator=(const J3DTexCoord& other) {
// Fake match (__memcpy or = doesn't match)
*(uintptr_t*)this = *(uintptr_t*)&other;
*(u32*)this = *(u32*)&other;
return *this;
}
include/JSystem/JAudio2/JAISound.h
+2 -2
View File
@@ -20,8 +20,8 @@ public:
JAISoundID() {}
bool isAnonymous() const { return id_.composite_ == 0xFFFFFFFF; }
void setAnonymous() { id_.composite_ = 0xFFFFFFFF; }
bool isAnonymous() const { return id_.composite_ == -1; }
void setAnonymous() { id_.composite_ = -1; }
union {
u32 composite_;
include/JSystem/JAudio2/JASDSPInterface.h
+1 -1
View File
@@ -119,7 +119,7 @@ namespace JASDsp {
extern FxBuf* FX_BUF;
extern f32 sDSPVolume;
#ifdef DEBUG
#if DEBUG
extern s32 dspMutex;
#endif
};
include/JSystem/JGadget/define.h
+1 -1
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);
include/JSystem/JHostIO/JORReflexible.h
+2 -2
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();
include/JSystem/JKernel/JKRHeap.h
+1 -1
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; }
include/JSystem/JStudio/JStudio/functionvalue.h
+12 -11
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_;
include/JSystem/JStudio/JStudio/jstudio-object.h
+1 -1
View File
@@ -47,7 +47,7 @@ struct TVariableValue {
}
void setValue_none() {
#ifdef DEBUG
#if DEBUG
field_0xc.fv = NULL;
#endif
field_0x8 = NULL;
include/JSystem/JUtility/JUTAssert.h
+1 -1
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) \
include/SSystem/SComponent/c_cc_s.h
+2 -2
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;
include/Z2AudioLib/Z2SeqMgr.h
+1 -1
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
include/d/actor/d_a_alink.h
+180 -180
View File
File diff suppressed because it is too large Load Diff
include/d/actor/d_a_demo00.h
+1 -1
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
include/d/actor/d_a_e_yr.h
+1 -1
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;
include/d/actor/d_a_npc_aru.h
-2
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,
include/d/actor/d_a_npc_cd.h
+3 -3
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
include/d/actor/d_a_npc_cdn3.h
+1 -1
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
include/d/actor/d_a_npc_doc.h
+1 -3
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; }
include/d/actor/d_a_npc_fairy.h
-2
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();
include/d/actor/d_a_npc_grmc.h
+8 -7
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;
include/d/actor/d_a_npc_grr.h
+1 -1
View File
@@ -17,7 +17,7 @@ struct daNpc_grR_HIOParam {
};
class daNpc_grR_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{
include/d/actor/d_a_npc_hoz.h
-2
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; }
include/d/actor/d_a_npc_kasi_kyu.h
+1 -1
View File
@@ -20,7 +20,7 @@ struct daNpcKasiKyu_HIOParam {
};
class daNpcKasiKyu_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{
include/d/actor/d_a_npc_kasi_mich.h
+1 -1
View File
@@ -20,7 +20,7 @@ struct daNpcKasiMich_HIOParam {
};
class daNpcKasiMich_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{
include/d/actor/d_a_npc_kolin.h
-2
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,
include/d/actor/d_a_npc_kolinb.h
-2
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,
include/d/actor/d_a_npc_pachi_besu.h
-2
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);
include/d/actor/d_a_npc_saru.h
+2 -2
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];
include/d/actor/d_a_npc_seic.h
+2 -2
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
include/d/actor/d_a_npc_seid.h
+2 -2
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
include/d/actor/d_a_npc_taro.h
+1 -1
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
{
include/d/actor/d_a_npc_tks.h
+1 -1
View File
@@ -28,7 +28,7 @@ struct daNpcTks_HIOParam {
};
class daNpcTks_HIO_c
#ifdef DEBUG
#if DEBUG
: public mDoHIO_entry_c
#endif
{
include/d/actor/d_a_npc_toby.h
-2
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,
include/d/actor/d_a_npc_ykm.h
-2
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,
include/d/actor/d_a_npc_ykw.h
-2
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,
include/d/actor/d_a_npc_zelRo.h
-2
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,
include/d/actor/d_a_obj_bemos.h
+1 -1
View File
@@ -123,7 +123,7 @@ public:
void initActionDead();
void actionDead();
int Draw();
#ifdef DEBUG
#if DEBUG
/* 0x000000 */ void debugDraw();
#endif
int Delete();
include/d/actor/d_a_obj_damCps.h
+1 -1
View File
@@ -14,7 +14,7 @@
*
*/
class daObjDamCps_c : public fopAc_ac_c {
#ifdef DEBUG
#if DEBUG
public:
daObjDamCps_c() {};
void initBaseMtx();
include/d/actor/d_a_obj_fallobj.h
+1 -1
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();
include/d/actor/d_a_obj_kbacket.h
+2 -2
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;
include/d/actor/d_a_obj_laundry_rope.h
+1 -1
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;
};
include/d/actor/d_a_obj_lv6swturn.h
+1 -1
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();
include/d/actor/d_a_obj_mie.h
+1 -1
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
{
include/d/actor/d_a_obj_swchain.h
+1 -1
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
};
include/d/actor/d_a_obj_thdoor.h
+1 -1
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();
include/d/actor/d_a_obj_tobyhouse.h
+1 -1
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:
include/d/actor/d_a_obj_togeTrap.h
+1 -1
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);
include/d/actor/d_a_obj_volcbom.h
+1 -1
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();
include/d/d_attention.h
+3 -3
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);
}
include/d/d_bg_s.h
+4 -4
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
include/d/d_bg_s_acch.h
+2 -2
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;
include/d/d_cc_s.h
+1 -1
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
include/d/d_event.h
+1 -1
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; }
include/d/d_event_debug.h
-3
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 */
include/d/d_kankyo.h
+11 -17
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
@@ -784,20 +784,14 @@ public:
/* 0x29C */ u8 field_0x29c;
/* 0x29D */ u8 field_0x29d;
/* 0x29E */ u8 field_0x29e;
/* 0x29F */ u8 field_0x29f;
/* 0x2A0 */ u8 field_0x2a0;
/* 0x2A1 */ u8 field_0x2a1;
/* 0x2A2 */ u8 field_0x2a2;
/* 0x2A3 */ u8 field_0x2a3;
/* 0x2A4 */ u8 field_0x2a4;
/* 0x2A5 */ u8 field_0x2a5;
/* 0x2A6 */ u8 field_0x2a6;
/* 0x2A7 */ u8 field_0x2a7;
/* 0x2A8 */ u8 field_0x2a8;
/* 0x2A9 */ u8 field_0x2a9;
/* 0x2AA */ u8 field_0x2aa;
/* 0x29F */ color_RGB_class unk_color_1;
/* 0x2A2 */ u8 unk_alpha_1;
/* 0x2A3 */ color_RGB_class unk_color_2;
/* 0x2A6 */ u8 unk_alpha_2;
/* 0x2A7 */ color_RGB_class unk_color_3;
/* 0x2AA */ u8 unk_alpha_3;
/* 0x2AB */ color_RGB_class camera_light_col;
/* 0x2AE */ u8 field_0x2ae;
/* 0x2AE */ u8 camera_light_alpha;
/* 0x2B0 */ f32 camera_light_y_shift;
/* 0x2B4 */ f32 camera_light_power;
/* 0x2B8 */ f32 camera_light_cutoff;
@@ -842,7 +836,7 @@ public:
/* 0x30E */ u8 twilight_sense_saturation_mode;
/* 0x30F */ u8 twilight_sense_pat;
/* 0x310 */ u8 twilight_sense_pat_tv_display_ON;
/* 0x311 */ u8 field_0x311;
/* 0x311 */ u8 use_debug;
/* 0x312 */ u8 field_0x312;
/* 0x313 */ u8 camera_light_adjust_ON;
/* 0x314 */ f32 field_0x314;
@@ -850,11 +844,11 @@ public:
/* 0x31C */ f32 influence_multiplier;
/* 0x320 */ f32 cutoff_multiplier;
/* 0x324 */ color_RGB_class possessed_zelda_light_col;
/* 0x327 */ u8 field_0x327;
/* 0x327 */ u8 possessed_zelda_light_alpha;
/* 0x328 */ f32 possessed_zelda_light_height;
/* 0x32C */ f32 possessed_zelda_light_power;
/* 0x330 */ color_RGB_class beast_ganon_light_col;
/* 0x333 */ u8 field_0x333;
/* 0x333 */ u8 beast_ganon_light_alpha;
/* 0x334 */ f32 beast_ganon_light_height;
/* 0x338 */ f32 beast_ganon_light_power;
/* 0x33C */ color_RGB_class water_in_light_col;
include/d/d_kankyo_static.h
+2 -2
View File
@@ -12,7 +12,7 @@
*/
static void dKankyo_DayProc() {
dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[91]);
dComIfGs_offTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[91]);
}
#endif /* D_KANKYO_STATIC_H */
#endif /* D_KANKYO_STATIC_H */
include/d/d_meter_HIO.h
+3 -3
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();
include/d/d_msg_flow.h
+1 -1
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
include/d/d_resorce.h
+1 -1
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
include/d/d_s_menu.h
+1 -1
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)
include/d/d_s_play.h
+3 -3
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]
include/d/d_s_play_env.h
+3 -3
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;
include/d/d_stage.h
+2 -2
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;
include/d/d_vibration.h
+1 -1
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
include/dolphin/mtx.h
+6 -6
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
include/dolphin/os.h
+2 -2
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))
include/dolphin/types.h
+6
View File
@@ -82,6 +82,12 @@ typedef unsigned int uint;
#endif
#endif
#ifdef __MWERKS__
#define __REGISTER register
#else
#define __REGISTER
#endif
#include <stddef.h>
#endif
include/f_ap/f_ap_game.h
+8
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
include/f_op/f_op_actor.h
+2 -2
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,
include/f_op/f_op_actor_mng.h
+3 -3
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
include/f_pc/f_pc_debug_sv.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <dolphin.h>
#ifdef DEBUG
#if DEBUG
char* fpcDbSv_getNameString(s16 i_name);
include/f_pc/f_pc_node_req.h
+1 -1
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
include/f_pc/f_pc_stdcreate_req.h
+1 -1
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;
include/global.h
+5
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]))
include/m_Do/m_Do_hostIO.h
+2 -2
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
include/m_Do/m_Do_main.h
+1 -1
View File
@@ -62,7 +62,7 @@ private:
};
struct mDoMain {
#ifdef DEBUG
#if DEBUG
static int argument;
static int e3menu_no;
static u32 archiveHeapSize;
include/revolution/mtx.h
+6 -6
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
include/revolution/os.h
+4 -4
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))
@@ -306,7 +306,7 @@ extern BOOL __OSInReboot;
#define ASSERT(cond) ASSERTLINE(__LINE__, cond)
inline s16 __OSf32tos16(register f32 inF) {
inline s16 __OSf32tos16(__REGISTER f32 inF) {
#ifdef __MWERKS__
register s16 out;
u32 tmp;
@@ -327,7 +327,7 @@ inline void OSf32tos16(f32* f, s16* out) {
*out = __OSf32tos16(*f);
}
inline u8 __OSf32tou8(register f32 inF) {
inline u8 __OSf32tou8(__REGISTER f32 inF) {
#ifdef __MWERKS__
register u8 out;
u32 tmp;
include/revolution/types.h
+6
View File
@@ -73,6 +73,12 @@ typedef unsigned int uint;
#endif
#endif
#ifdef __MWERKS__
#define __REGISTER register
#else
#define __REGISTER
#endif
#include <stddef.h>
#endif
src/JSystem/J2DGraph/J2DMatBlock.cpp
-16
View File
@@ -7,7 +7,6 @@
#include "JSystem/JUtility/JUTTexture.h"
#include "dolphin/gx.h"
// NONMATCHING - instruction order. matches if const is removed from j2dDefaultColorChanInfo, but then it's in the wrong section
void J2DColorBlock::initialize() {
for (int i = 0; i < 2; i++) {
mMatColor[i] = JUtility::TColor(j2dDefaultColInfo);
@@ -848,7 +847,6 @@ J2DTevBlock4::~J2DTevBlock4() {
}
}
// NONMATCHING - inlines
void J2DTevBlock4::initialize() {
for (int i = 0; i < 4; i++) {
mTexNo[i] = -1;
@@ -1292,7 +1290,6 @@ J2DTevBlock8::~J2DTevBlock8() {
}
}
// NONMATCHING - inlines
void J2DTevBlock8::initialize() {
for (int i = 0; i < 8; i++) {
mTexNo[i] = 0xffff;
@@ -1732,7 +1729,6 @@ J2DTevBlock16::~J2DTevBlock16() {
}
}
// NONMATCHING - inlines
void J2DTevBlock16::initialize() {
for (int i = 0; i < 8; i++) {
mTexNo[i] = 0xffff;
@@ -2187,15 +2183,3 @@ void J2DPEBlock::setGX() {
GXSetBlendMode(GXBlendMode(mBlend.getType()), GXBlendFactor(mBlend.getSrcFactor()), GXBlendFactor(mBlend.getDstFactor()), GXLogicOp(mBlend.getOp()));
GXSetDither(mDither);
}
J2DTevStage::J2DTevStage() {
setTevStageInfo(j2dDefaultTevStageInfo);
setTevSwapModeInfo(j2dDefaultTevSwapMode);
}
void J2DTevStage::setTevStageInfo(J2DTevStageInfo const& info) {
setColorABCD(info.mColorA, info.mColorB, info.mColorC, info.mColorD);
setTevColorOp(info.mCOp, info.mCBias, info.mCScale, info.mCClamp, info.mCReg);
setAlphaABCD(info.mAlphaA, info.mAlphaB, info.mAlphaC, info.mAlphaD);
setTevAlphaOp(info.mAOp, info.mABias, info.mAScale, info.mAClamp, info.mAReg);
}
src/JSystem/J2DGraph/J2DMaterialFactory.cpp
-5
View File
@@ -396,8 +396,3 @@ u8 J2DMaterialFactory::newDither(int param_0) const {
}
return 0;
}
J2DTevStage::J2DTevStage(J2DTevStageInfo const& param_0) {
setTevStageInfo(param_0);
setTevSwapModeInfo(j2dDefaultTevSwapMode);
}
src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+4 -4
View File
@@ -507,10 +507,10 @@ inline f32 J3DHermiteInterpolation(f32 p1, f32 const* p2, f32 const* p3, f32 con
return JMAHermiteInterpolation(p1, *p2, *p3, *p4, *p5, *p6, *p7);
}
inline f32 J3DHermiteInterpolation(register f32 pp1, register s16 const* pp2,
register s16 const* pp3, register s16 const* pp4,
register s16 const* pp5, register s16 const* pp6,
register s16 const* pp7) {
inline f32 J3DHermiteInterpolation(__REGISTER f32 pp1, __REGISTER s16 const* pp2,
__REGISTER s16 const* pp3, __REGISTER s16 const* pp4,
__REGISTER s16 const* pp5, __REGISTER s16 const* pp6,
__REGISTER s16 const* pp7) {
#ifdef __MWERKS__
register f32 p1 = pp1;
register f32 ff8;
src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
+26 -26
View File
@@ -237,10 +237,10 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) {
static f32 J3DUnit01[] = { 0.0f, 1.0f };
void J3DMtxBuffer::calcWeightEnvelopeMtx() {
register MtxP weightAnmMtx;
register Mtx* worldMtx;
register Mtx* invMtx;
register f32 weight;
__REGISTER MtxP weightAnmMtx;
__REGISTER Mtx* worldMtx;
__REGISTER Mtx* invMtx;
__REGISTER f32 weight;
int idx;
int j;
int mixNum;
@@ -251,27 +251,27 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
u8* pScale;
#if DEBUG || !__MWERKS__
register Mtx mtx;
__REGISTER Mtx mtx;
#else
register f32 var_f1;
register f32 var_f2;
register f32 var_f3;
register f32 var_f4;
register f32 var_f5;
register f32 var_f6;
register f32 var_f7;
register f32 var_f8;
register f32 var_f9;
register f32 var_f10;
register f32 var_f11;
register f32 var_f12;
register f32 var_f13;
register f32 var_f31;
register f32 var_f30;
register f32 var_f29;
register f32 var_f28;
register f32 var_f27;
register f32* var_r7 = J3DUnit01;
__REGISTER f32 var_f1;
__REGISTER f32 var_f2;
__REGISTER f32 var_f3;
__REGISTER f32 var_f4;
__REGISTER f32 var_f5;
__REGISTER f32 var_f6;
__REGISTER f32 var_f7;
__REGISTER f32 var_f8;
__REGISTER f32 var_f9;
__REGISTER f32 var_f10;
__REGISTER f32 var_f11;
__REGISTER f32 var_f12;
__REGISTER f32 var_f13;
__REGISTER f32 var_f31;
__REGISTER f32 var_f30;
__REGISTER f32 var_f29;
__REGISTER f32 var_f28;
__REGISTER f32 var_f27;
__REGISTER f32* var_r7 = J3DUnit01;
#endif
i = -1;
@@ -316,8 +316,8 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
MTXConcat(*worldMtx, *invMtx, mtx);
#else
// Fakematch? Doesn't match if worldMtx and invMtx are used directly.
register void* var_r5 = worldMtx;
register void* var_r6 = invMtx;
__REGISTER void* var_r5 = worldMtx;
__REGISTER void* var_r6 = invMtx;
asm {
psq_l var_f2, 0x0(var_r6), 0, 0 /* qr0 */
psq_l var_f1, 0x0(var_r5), 0, 0 /* qr0 */
src/JSystem/J3DGraphBase/J3DTransform.cpp
+9 -9
View File
@@ -5,7 +5,7 @@
#include "JSystem/JMath/JMATrigonometric.h"
#include "JSystem/JMath/JMath.h"
void __MTGQR7(register u32 v) {
void __MTGQR7(__REGISTER u32 v) {
#ifdef __MWERKS__
// clang-format off
asm {
@@ -23,8 +23,8 @@ void J3DGQRSetup7(u32 r0, u32 r1, u32 r2, u32 r3) {
// this uses a non-standard sqrtf, not sure why or how its supposed to be setup
#if !PLATFORM_SHIELD
inline f32 J3D_sqrtf(register f32 x) {
register f32 recip;
inline f32 J3D_sqrtf(__REGISTER f32 x) {
__REGISTER f32 recip;
if (x > 0.0f) {
#ifdef __MWERKS__ // clang-format off
@@ -38,7 +38,7 @@ inline f32 J3D_sqrtf(register f32 x) {
#define J3D_sqrtf sqrtf
#endif
void J3DCalcBBoardMtx(register Mtx mtx) {
void J3DCalcBBoardMtx(__REGISTER Mtx mtx) {
f32 x = (mtx[0][0] * mtx[0][0]) + (mtx[1][0] * mtx[1][0]) + (mtx[2][0] * mtx[2][0]);
f32 y = (mtx[0][1] * mtx[0][1]) + (mtx[1][1] * mtx[1][1]) + (mtx[2][1] * mtx[2][1]);
f32 z = (mtx[0][2] * mtx[0][2]) + (mtx[1][2] * mtx[1][2]) + (mtx[2][2] * mtx[2][2]);
@@ -53,7 +53,7 @@ void J3DCalcBBoardMtx(register Mtx mtx) {
z = J3D_sqrtf(z);
}
register f32 zero = 0.0f;
__REGISTER f32 zero = 0.0f;
// zero out gaps of zeroes
#ifdef __MWERKS__ // clang-format off
asm {
@@ -101,7 +101,7 @@ void J3DCalcYBBoardMtx(Mtx mtx) {
mtx[2][2] = vec.z * z;
}
asm void J3DPSCalcInverseTranspose(register Mtx src, register Mtx33 dst) {
asm void J3DPSCalcInverseTranspose(__REGISTER Mtx src, __REGISTER Mtx33 dst) {
#ifdef __MWERKS__ // clang-format off
psq_l f0, 0(src), 1, 0
psq_l f1, 4(src), 0, 0
@@ -290,7 +290,7 @@ void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) {
dst[2][2] = 1.0f;
}
asm void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
asm void J3DScaleNrmMtx(__REGISTER Mtx mtx, const __REGISTER Vec& scl) {
#ifdef __MWERKS__ // clang-format off
nofralloc;
@@ -326,7 +326,7 @@ asm void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
#endif // clang-format on
}
asm void J3DScaleNrmMtx33(register Mtx33 mtx, const register Vec& scale) {
asm void J3DScaleNrmMtx33(__REGISTER Mtx33 mtx, const __REGISTER Vec& scale) {
#ifdef __MWERKS__ // clang-format off
psq_l f0, 0(mtx), 0, 0
psq_l f6, 0(scale), 0, 0
@@ -352,7 +352,7 @@ asm void J3DScaleNrmMtx33(register Mtx33 mtx, const register Vec& scale) {
#endif // clang-format on
}
asm void J3DMtxProjConcat(register Mtx mtx1, register Mtx mtx2, register Mtx dst) {
asm void J3DMtxProjConcat(__REGISTER Mtx mtx1, __REGISTER Mtx mtx2, __REGISTER Mtx dst) {
#ifdef __MWERKS__ // clang-format off
psq_l f2, 0(mtx1), 0, 0
psq_l f3, 8(mtx1), 0, 0
src/JSystem/JAudio2/JAISeq.cpp
+2 -3
View File
@@ -97,15 +97,14 @@ void JAISeq::releaseChildTracks_() {
}
bool JAISeq::prepare_getSeqData_() {
JAISoundID id(soundID_); // fakematch, should be using getID but it messes up stack
if (id.isAnonymous()) {
if (getID().isAnonymous()) {
return true;
}
JAISeqDataMgr* seqDataMgr = inner_.seqMgr->getSeqDataMgr();
JUT_ASSERT(162, seqDataMgr);
switch (seqDataMgr->getSeqData(id, &inner_.mSeqData)) {
switch (seqDataMgr->getSeqData(getID(), &inner_.mSeqData)) {
case 0:
OS_REPORT("Failed In Loading Sequence Data:SEQ(0x%08x)\n", getID());
status_.state.unk = 2;
src/JSystem/JAudio2/JASAiCtrl.cpp
+4 -4
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
src/JSystem/JAudio2/JASDSPInterface.cpp
+1 -1
View File
@@ -659,6 +659,6 @@ u16 DSP_CreateMap2(u32 param_0) {
u32 JASWaveInfo::one = 1;
#ifdef DEBUG
#if DEBUG
s32 dspMutex = 1;
#endif
src/JSystem/JAudio2/JASHeapCtrl.cpp
+2 -6
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);
src/JSystem/JKernel/JKRAramArchive.cpp
+1 -3
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;
}
src/JSystem/JKernel/JKRCompArchive.cpp
+2 -4
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;
}
src/JSystem/JKernel/JKRDvdArchive.cpp
+1 -3
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;
}
src/JSystem/JKernel/JKRHeap.cpp
+2 -4
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");
}
src/JSystem/JKernel/JKRMemArchive.cpp
+1 -1
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);
}

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