diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index 805aa17aae..2dc9770c4d 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -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 diff --git a/configure.py b/configure.py index 0c08a075b9..11712533c1 100755 --- a/configure.py +++ b/configure.py @@ -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"), diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index 35010e62fb..380e9c93de 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -479,26 +479,26 @@ inline f32 J2DHermiteInterpolation(f32 f1, f32* f2, f32* f3, f32* f4, f32* } template <> -inline f32 J2DHermiteInterpolation(register f32 pp1, register s16* pp2, register s16* pp3, - register s16* pp4, register s16* pp5, register s16* pp6, - register s16* pp7) { +inline f32 J2DHermiteInterpolation(__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 diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h index 68cf967eb4..62c9c4c548 100644 --- a/include/JSystem/J2DGraph/J2DTevs.h +++ b/include/JSystem/J2DGraph/J2DTevs.h @@ -3,6 +3,7 @@ #include #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; } diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h index bb6cbef2dc..4208d5d598 100644 --- a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h +++ b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h @@ -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 { diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index a911251c58..9b515bca6c 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -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; diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index 152cb4d152..24fdb5c265 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -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 diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 63e4f8351e..33848d1744 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -4,6 +4,7 @@ #include "JSystem/J3DGraphBase/J3DStruct.h" #include "JSystem/J3DAssert.h" #include "JSystem/JUtility/JUTTexture.h" +#include "global.h" #include /** @@ -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; } diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 171215323f..2a7fc1c0f9 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -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_; diff --git a/include/JSystem/JAudio2/JASDSPInterface.h b/include/JSystem/JAudio2/JASDSPInterface.h index c3f843a074..3081075486 100644 --- a/include/JSystem/JAudio2/JASDSPInterface.h +++ b/include/JSystem/JAudio2/JASDSPInterface.h @@ -119,7 +119,7 @@ namespace JASDsp { extern FxBuf* FX_BUF; extern f32 sDSPVolume; - #ifdef DEBUG + #if DEBUG extern s32 dspMutex; #endif }; diff --git a/include/JSystem/JGadget/define.h b/include/JSystem/JGadget/define.h index c964acc996..00e8a67226 100644 --- a/include/JSystem/JGadget/define.h +++ b/include/JSystem/JGadget/define.h @@ -33,7 +33,7 @@ private: int mLine; }; -#ifdef DEBUG +#if DEBUG #define JGADGET_ASSERTWARN(line, COND) \ ((COND)) || (JGadget_outMessage(JGadget_outMessage::warning, __FILE__, line) << #COND, false); diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h index 04c8f54a37..0f7a7a4db7 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/include/JSystem/JHostIO/JORReflexible.h @@ -35,14 +35,14 @@ struct JORServer; class JOREventListener { public: -#ifdef DEBUG +#if DEBUG virtual void listenPropertyEvent(const JORPropertyEvent*) = 0; #endif }; class JORReflexible : public JOREventListener { public: -#ifdef DEBUG +#if DEBUG JORReflexible(); static JORServer* getJORServer(); diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index afea773716..0284012f49 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -266,7 +266,7 @@ inline JKRHeap* JKRGetRootHeap2() { } #endif -#ifdef DEBUG +#if DEBUG inline void JKRSetDebugFillNotuse(u8 status) { data_804508B1 = status; } inline void JKRSetDebugFillNew(u8 status) { data_804508B2 = status; } inline void JKRSetDebugFillDelete(u8 status) { data_804508B3 = status; } diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index a8724f5496..0e409a879a 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -313,7 +313,7 @@ public: > { TIterator_data_(const TFunctionValue_list_parameter& rParent, const f32* value) { -#ifdef DEBUG +#if DEBUG pOwn_ = &rParent; #endif pf_ = value; @@ -323,7 +323,7 @@ public: void set(const f32* value) { pf_ = value; } friend bool operator==(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -333,9 +333,10 @@ public: } f32 operator*() { -#ifdef DEBUG + // this guard is required - removing it breaks float regalloc in std::upper_bound + #if DEBUG JUT_ASSERT(947, pf_!=NULL); -#endif + #endif return *pf_; } @@ -357,7 +358,7 @@ public: } friend s32 operator-(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -366,7 +367,7 @@ public: return (r1.pf_ - r2.pf_) / suData_size; } -#ifdef DEBUG +#if DEBUG /* 0x00 */ const TFunctionValue_list_parameter* pOwn_; /* 0x04 */ const f32* pf_; #else @@ -421,7 +422,7 @@ public: > { TIterator_data_(const TFunctionValue_hermite& rParent, const f32* value) { -#ifdef DEBUG +#if DEBUG pOwn_ = &rParent; #endif pf_ = value; @@ -435,7 +436,7 @@ public: } friend bool operator==(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -445,7 +446,7 @@ public: } f32 operator*() { -#ifdef DEBUG +#if DEBUG JUT_ASSERT(1098, pf_!=NULL); #endif return *pf_; @@ -469,7 +470,7 @@ public: } friend s32 operator-(const TIterator_data_& r1, const TIterator_data_& r2) { -#ifdef DEBUG +#if DEBUG if (!(r1.pOwn_==r2.pOwn_)) { JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "r1.pOwn_==r2.pOwn_"; @@ -483,7 +484,7 @@ public: return (r1.pf_ - r2.pf_) / r1.uSize_; } -#ifdef DEBUG +#if DEBUG /* 0x00 */ const TFunctionValue_hermite* pOwn_; /* 0x04 */ const f32* pf_; /* 0x08 */ u32 uSize_; diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 090d71a3ff..3f42a456b5 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -47,7 +47,7 @@ struct TVariableValue { } void setValue_none() { -#ifdef DEBUG +#if DEBUG field_0xc.fv = NULL; #endif field_0x8 = NULL; diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 503a2a73e7..0aba36b476 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -3,7 +3,7 @@ #include "dolphin/os.h" -#ifdef DEBUG +#if DEBUG #define JUT_SHOW_ASSERT(LINE, COND) JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND) #define JUT_ASSERT(LINE, COND) \ diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index 471f2c169a..b82cd29a33 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -15,14 +15,14 @@ public: /* 0x0400 */ cCcD_Obj* mpObjTg[0x300]; /* 0x1000 */ cCcD_Obj* mpObjCo[0x100]; /* 0x1400 */ cCcD_Obj* mpObj[0x500]; -#ifdef DEBUG +#if DEBUG /* 0x2800 */ int m_debug_code; #endif /* 0x2800 */ u16 mObjAtCount; /* 0x2802 */ u16 mObjTgCount; /* 0x2804 */ u16 mObjCoCount; /* 0x2806 */ u16 mObjCount; -#ifdef DEBUG +#if DEBUG /* 0x280C */ u16 field_0x280c; /* 0x280E */ u16 field_0x280e; /* 0x2810 */ u16 field_0x2810; diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index c200fdd73b..eadb0e0675 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -198,7 +198,7 @@ public: JAISoundHandle* getMainBgmHandle() { return &mMainBgmHandle; } JAISoundHandle* getSubBgmHandle() { return &mSubBgmHandle; } - #ifdef DEBUG + #if DEBUG f32 field_0x00_debug; u8 field_0x04_debug; #endif diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index a010fcca58..84eb80f610 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -211,7 +211,7 @@ struct daAlink_WlAnmData { class daAlinkHIO_data_c : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_data_c(); ~daAlinkHIO_data_c(); @@ -220,13 +220,13 @@ public: void baseCopy(); void update(); -#ifdef DEBUG +#if DEBUG virtual void listenPropertyEvent(const JORPropertyEvent* event); #endif #endif public: -#ifdef DEBUG +#if DEBUG /* 0x04 */ int m_anm_num; /* 0x08 */ int m_u8_num; /* 0x0C */ int m_s16_num; @@ -278,7 +278,7 @@ public: class daAlinkHIO_basic_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_basic_c(); ~daAlinkHIO_basic_c() {} @@ -286,7 +286,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_basic_c1 m; #endif }; @@ -329,7 +329,7 @@ public: class daAlinkHIO_move_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_move_c(); ~daAlinkHIO_move_c() {} @@ -337,7 +337,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_move_c1 m; #endif }; @@ -375,7 +375,7 @@ public: class daAlinkHIO_noActAtnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_noActAtnMove_c(); ~daAlinkHIO_noActAtnMove_c() {} @@ -383,7 +383,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_noActAtnMove_c1 m; #endif }; @@ -417,7 +417,7 @@ public: class daAlinkHIO_frontRoll_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_frontRoll_c(); ~daAlinkHIO_frontRoll_c() {} @@ -425,7 +425,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_frontRoll_c1 m; #endif }; @@ -447,7 +447,7 @@ public: class daAlinkHIO_backJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_backJump_c(); ~daAlinkHIO_backJump_c() {} @@ -455,7 +455,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_backJump_c1 m; #endif }; @@ -481,7 +481,7 @@ public: class daAlinkHIO_sideStep_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_sideStep_c(); ~daAlinkHIO_sideStep_c() {} @@ -489,7 +489,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_sideStep_c1 m; #endif }; @@ -519,7 +519,7 @@ public: class daAlinkHIO_slide_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_slide_c(); ~daAlinkHIO_slide_c() {} @@ -527,7 +527,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_slide_c1 m; #endif }; @@ -565,7 +565,7 @@ public: class daAlinkHIO_atnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_atnMove_c(); ~daAlinkHIO_atnMove_c(); @@ -573,7 +573,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_atnMove_c1 m; #endif }; @@ -613,7 +613,7 @@ public: class daAlinkHIO_cutNormal_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutNormal_c(int, float); ~daAlinkHIO_cutNormal_c(); @@ -669,7 +669,7 @@ public: class daAlinkHIO_cutFinish_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutFinish_c(int, float); ~daAlinkHIO_cutFinish_c(); @@ -706,7 +706,7 @@ public: class daAlinkHIO_cutFnJU_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutFnJU_c(); ~daAlinkHIO_cutFnJU_c(); @@ -714,7 +714,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutFnJU_c1 m; #endif }; // Size: 0x88 @@ -743,7 +743,7 @@ public: class daAlinkHIO_cutDash_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutDash_c(int, float); ~daAlinkHIO_cutDash_c(); @@ -775,7 +775,7 @@ public: class daAlinkHIO_cutJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutJump_c(); ~daAlinkHIO_cutJump_c(); @@ -783,7 +783,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutJump_c1 m; #endif }; // Size: 0x78 @@ -826,7 +826,7 @@ public: class daAlinkHIO_cutTurn_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutTurn_c(); ~daAlinkHIO_cutTurn_c(); @@ -834,7 +834,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutTurn_c1 m; #endif }; // Size: 0xCC @@ -869,7 +869,7 @@ public: class daAlinkHIO_hoCut_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_hoCut_c(int, float); ~daAlinkHIO_hoCut_c(); @@ -902,7 +902,7 @@ public: class daAlinkHIO_hoCutCharge_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_hoCutCharge_c(); ~daAlinkHIO_hoCutCharge_c(); @@ -910,7 +910,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_hoCutCharge_c1 m; #endif }; // Size: 0x88 @@ -936,7 +936,7 @@ public: class daAlinkHIO_cutDown_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutDown_c(); ~daAlinkHIO_cutDown_c(); @@ -944,7 +944,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutDown_c1 m; #endif }; // Size: 0xA8 @@ -972,7 +972,7 @@ public: class daAlinkHIO_cutHead_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutHead_c(); ~daAlinkHIO_cutHead_c(); @@ -980,7 +980,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutHead_c1 m; #endif }; // Size: 0x94 @@ -1009,7 +1009,7 @@ public: class daAlinkHIO_cutLargeJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cutLargeJump_c(); ~daAlinkHIO_cutLargeJump_c(); @@ -1017,7 +1017,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_cutLargeJump_c1 m; #endif }; // Size: 0xA8 @@ -1086,7 +1086,7 @@ public: class daAlinkHIO_cut_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_cut_c(); ~daAlinkHIO_cut_c(); @@ -1096,7 +1096,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x034 */ daAlinkHIO_cutNormal_c mCutVertical; /* 0x08C */ daAlinkHIO_cutNormal_c mCutLeft; /* 0x0E4 */ daAlinkHIO_cutNormal_c mCutRight; @@ -1147,7 +1147,7 @@ public: class daAlinkHIO_guardAttack_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_guardAttack_c(int, float); ~daAlinkHIO_guardAttack_c(); @@ -1179,7 +1179,7 @@ public: class daAlinkHIO_turnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_turnMove_c(); ~daAlinkHIO_turnMove_c(); @@ -1187,7 +1187,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_turnMove_c1 m; #endif }; @@ -1224,7 +1224,7 @@ public: class daAlinkHIO_guard_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_guard_c(); ~daAlinkHIO_guard_c(); @@ -1232,7 +1232,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x034 */ daAlinkHIO_guardAttack_c mAtPush; /* 0x090 */ daAlinkHIO_guardAttack_c mAtKick; /* 0x0EC */ daAlinkHIO_turnMove_c mTurnMove; @@ -1263,7 +1263,7 @@ public: class daAlinkHIO_crouch_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_crouch_c(); ~daAlinkHIO_crouch_c(); @@ -1271,7 +1271,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_crouch_c1 m; #endif }; @@ -1318,7 +1318,7 @@ public: class daAlinkHIO_autoJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_autoJump_c(); ~daAlinkHIO_autoJump_c(); @@ -1326,7 +1326,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_autoJump_c1 m; #endif }; @@ -1348,7 +1348,7 @@ public: class daAlinkHIO_smallJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_smallJump_c(); ~daAlinkHIO_smallJump_c(); @@ -1356,7 +1356,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_smallJump_c1 m; #endif }; @@ -1377,7 +1377,7 @@ public: class daAlinkHIO_wallCatch_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallCatch_c(); ~daAlinkHIO_wallCatch_c(); @@ -1385,7 +1385,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallCatch_c1 m; #endif }; @@ -1403,7 +1403,7 @@ public: class daAlinkHIO_wallFall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallFall_c(); ~daAlinkHIO_wallFall_c(); @@ -1411,7 +1411,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallFall_c1 m; #endif }; @@ -1432,7 +1432,7 @@ public: class daAlinkHIO_wallMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallMove_c(); ~daAlinkHIO_wallMove_c(); @@ -1440,7 +1440,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallMove_c1 m; #endif }; @@ -1468,7 +1468,7 @@ public: class daAlinkHIO_wallHang_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wallHang_c(); ~daAlinkHIO_wallHang_c(); @@ -1476,7 +1476,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_smallJump_c mSmallJump; /* 0x00 */ daAlinkHIO_wallCatch_c mWallCatch; /* 0x00 */ daAlinkHIO_wallFall_c mWallFall; @@ -1515,7 +1515,7 @@ public: class daAlinkHIO_pushpull_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_pushpull_c(); ~daAlinkHIO_pushpull_c(); @@ -1523,7 +1523,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_pushpull_c1 m; #endif }; @@ -1549,7 +1549,7 @@ public: class daAlinkHIO_damNormal_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damNormal_c(); ~daAlinkHIO_damNormal_c(); @@ -1557,7 +1557,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damNormal_c1 m; #endif }; @@ -1593,7 +1593,7 @@ public: class daAlinkHIO_damLaHu_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damLaHu_c(int); ~daAlinkHIO_damLaHu_c(); @@ -1601,7 +1601,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damLaHu_c1 m; #endif }; @@ -1621,7 +1621,7 @@ public: class daAlinkHIO_damHorse_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damHorse_c(); ~daAlinkHIO_damHorse_c(); @@ -1629,7 +1629,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damHorse_c1 m; #endif }; @@ -1656,7 +1656,7 @@ public: class daAlinkHIO_damFall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damFall_c(); ~daAlinkHIO_damFall_c(); @@ -1664,7 +1664,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damFall_c1 m; #endif }; @@ -1686,7 +1686,7 @@ public: class daAlinkHIO_damCaught_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damCaught_c(); ~daAlinkHIO_damCaught_c(); @@ -1694,7 +1694,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damCaught_c1 m; #endif }; @@ -1722,7 +1722,7 @@ public: class daAlinkHIO_damSwim_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damSwim_c(); ~daAlinkHIO_damSwim_c(); @@ -1730,7 +1730,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_damSwim_c1 m; #endif }; @@ -1776,7 +1776,7 @@ public: class daAlinkHIO_damage_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_damage_c(); ~daAlinkHIO_damage_c(); @@ -1784,7 +1784,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_damage_c1 m; /* 0x34 */ daAlinkHIO_damNormal_c mDamNormal; /* 0x00 */ daAlinkHIO_damLaHu_c mDamLarge; @@ -1821,7 +1821,7 @@ public: class daAlinkHIO_horse_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_horse_c(); ~daAlinkHIO_horse_c(); @@ -1829,7 +1829,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_horse_c1 m; #endif }; @@ -1860,7 +1860,7 @@ public: class daAlinkHIO_canoe_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_canoe_c(); ~daAlinkHIO_canoe_c(); @@ -1868,7 +1868,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_canoe_c1 m; #endif }; @@ -1905,7 +1905,7 @@ public: class daAlinkHIO_bow_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_bow_c(); ~daAlinkHIO_bow_c(); @@ -1913,7 +1913,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bow_c1 m; #endif }; @@ -1941,7 +1941,7 @@ public: class daAlinkHIO_boom_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_boom_c(); ~daAlinkHIO_boom_c(); @@ -1949,7 +1949,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_boom_c1 m; #endif }; @@ -1985,7 +1985,7 @@ public: class daAlinkHIO_bomb_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_bomb_c(); ~daAlinkHIO_bomb_c(); @@ -1993,7 +1993,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bomb_c1 m; #endif }; @@ -2058,7 +2058,7 @@ public: class daAlinkHIO_light_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_light_c(int); ~daAlinkHIO_light_c(); @@ -2066,7 +2066,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_huLight_c1 m; #endif }; @@ -2094,7 +2094,7 @@ public: class daAlinkHIO_kandelaar_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_kandelaar_c(); ~daAlinkHIO_kandelaar_c(); @@ -2102,7 +2102,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_kandelaar_c1 m; #endif }; @@ -2133,7 +2133,7 @@ public: class daAlinkHIO_magneBoots_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_magneBoots_c(); ~daAlinkHIO_magneBoots_c(); @@ -2141,7 +2141,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_magneBoots_c1 m; #endif }; @@ -2159,7 +2159,7 @@ public: class daAlinkHIO_fmChain_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_fmChain_c(); ~daAlinkHIO_fmChain_c(); @@ -2167,7 +2167,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_fmChain_c1 m; #endif }; @@ -2199,7 +2199,7 @@ public: class daAlinkHIO_hookshot_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_hookshot_c(); ~daAlinkHIO_hookshot_c(); @@ -2207,7 +2207,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_hookshot_c1 m; #endif }; @@ -2237,7 +2237,7 @@ public: class daAlinkHIO_spinner_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_spinner_c(); ~daAlinkHIO_spinner_c(); @@ -2245,7 +2245,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_spinner_c1 m; #endif }; @@ -2293,7 +2293,7 @@ public: class daAlinkHIO_ironBall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_ironBall_c(); ~daAlinkHIO_ironBall_c(); @@ -2301,7 +2301,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_ironBall_c1 m; #endif }; @@ -2323,7 +2323,7 @@ public: class daAlinkHIO_copyRod_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_copyRod_c(); ~daAlinkHIO_copyRod_c(); @@ -2331,7 +2331,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_copyRod_c1 m; #endif }; @@ -2351,7 +2351,7 @@ public: class daAlinkHIO_pickUp_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_pickUp_c(); ~daAlinkHIO_pickUp_c(); @@ -2359,7 +2359,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_pickUp_c1 m; #endif }; @@ -2398,7 +2398,7 @@ public: class daAlinkHIO_board_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_board_c(); ~daAlinkHIO_board_c(); @@ -2406,7 +2406,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_board_c1 m; #endif }; @@ -2431,7 +2431,7 @@ public: class daAlinkHIO_bottle_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_bottle_c(); ~daAlinkHIO_bottle_c(); @@ -2439,7 +2439,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bottle_c1 m; #endif }; @@ -2479,7 +2479,7 @@ public: class daAlinkHIO_item_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_item_c(); ~daAlinkHIO_item_c(); @@ -2487,7 +2487,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_bow_c mBow; /* 0x00 */ daAlinkHIO_boom_c mBoomerang; /* 0x00 */ daAlinkHIO_bomb_c mBomb; @@ -2538,7 +2538,7 @@ public: class daAlinkHIO_ladder_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_ladder_c(); ~daAlinkHIO_ladder_c(); @@ -2546,7 +2546,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_ladder_c1 m; #endif }; @@ -2578,7 +2578,7 @@ public: class daAlinkHIO_roofHang_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_roofHang_c(); ~daAlinkHIO_roofHang_c(); @@ -2586,7 +2586,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_roofHang_c1 m; #endif }; @@ -2616,7 +2616,7 @@ public: class daAlinkHIO_grab_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_grab_c(); ~daAlinkHIO_grab_c(); @@ -2624,7 +2624,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_grab_c1 m; #endif }; @@ -2691,7 +2691,7 @@ public: class daAlinkHIO_swim_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_swim_c(); ~daAlinkHIO_swim_c(); @@ -2699,7 +2699,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_swim_c1 m; #endif }; @@ -2767,7 +2767,7 @@ public: class daAlinkHIO_wlMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlMove_c(); ~daAlinkHIO_wlMove_c(); @@ -2775,7 +2775,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlMove_c1 m; #endif }; @@ -2810,7 +2810,7 @@ public: class daAlinkHIO_wlMoveNoP_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlMoveNoP_c(); ~daAlinkHIO_wlMoveNoP_c(); @@ -2818,7 +2818,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlMoveNoP_c1 m; #endif }; @@ -2849,7 +2849,7 @@ public: class daAlinkHIO_wlAtnMove_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtnMove_c(); ~daAlinkHIO_wlAtnMove_c(); @@ -2857,7 +2857,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlAtnMove_c1 m; #endif }; @@ -2881,7 +2881,7 @@ public: class daAlinkHIO_wlHowl_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlHowl_c(); ~daAlinkHIO_wlHowl_c(); @@ -2889,7 +2889,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlHowl_c1 m; #endif }; @@ -2915,7 +2915,7 @@ public: class daAlinkHIO_wlSideStep_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlSideStep_c(); ~daAlinkHIO_wlSideStep_c(); @@ -2923,7 +2923,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlSideStep_c1 m; #endif }; @@ -2945,7 +2945,7 @@ public: class daAlinkHIO_wlBackJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlBackJump_c(); ~daAlinkHIO_wlBackJump_c(); @@ -2953,7 +2953,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlBackJump_c1 m; #endif }; @@ -2990,7 +2990,7 @@ public: class daAlinkHIO_wlAutoJump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAutoJump_c(); ~daAlinkHIO_wlAutoJump_c(); @@ -2998,7 +2998,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlAutoJump_c1 m; #endif }; @@ -3019,7 +3019,7 @@ public: class daAlinkHIO_wlPush_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlPush_c(); ~daAlinkHIO_wlPush_c(); @@ -3027,7 +3027,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlPush_c1 m; #endif }; @@ -3055,7 +3055,7 @@ public: class daAlinkHIO_wlLie_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlLie_c(); ~daAlinkHIO_wlLie_c(); @@ -3063,7 +3063,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlLie_c1 m; #endif }; @@ -3094,7 +3094,7 @@ public: class daAlinkHIO_wlWallHang_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlWallHang_c(); ~daAlinkHIO_wlWallHang_c(); @@ -3102,7 +3102,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlWallHang_c1 m; #endif }; @@ -3126,7 +3126,7 @@ public: class daAlinkHIO_wlDamNormal_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamNormal_c(); ~daAlinkHIO_wlDamNormal_c(); @@ -3134,7 +3134,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamNormal_c1 m; #endif }; @@ -3166,7 +3166,7 @@ public: class daAlinkHIO_wlDamLaHu_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamLaHu_c(int); ~daAlinkHIO_wlDamLaHu_c(); @@ -3174,7 +3174,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamLaHu_c1 m; #endif }; @@ -3195,7 +3195,7 @@ public: class daAlinkHIO_wlDamCaught_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamCaught_c(); ~daAlinkHIO_wlDamCaught_c(); @@ -3203,7 +3203,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamCaught_c1 m; #endif }; @@ -3228,7 +3228,7 @@ public: class daAlinkHIO_wlDamFall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamFall_c(); ~daAlinkHIO_wlDamFall_c(); @@ -3236,7 +3236,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlDamFall_c1 m; #endif }; @@ -3260,7 +3260,7 @@ public: class daAlinkHIO_wlDamage_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlDamage_c(); ~daAlinkHIO_wlDamage_c(); @@ -3268,7 +3268,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlDamage_c1 m; #endif /* 0x00 */ daAlinkHIO_wlDamNormal_c mNormal; @@ -3305,7 +3305,7 @@ public: class daAlinkHIO_wlSlide_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlSlide_c(); ~daAlinkHIO_wlSlide_c(); @@ -3313,7 +3313,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlSlide_c1 m; #endif }; @@ -3340,7 +3340,7 @@ public: class daAlinkHIO_wlRope_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlRope_c(); ~daAlinkHIO_wlRope_c(); @@ -3348,7 +3348,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlRope_c1 m; #endif }; @@ -3386,7 +3386,7 @@ public: class daAlinkHIO_wlAtWait_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtWait_c(int, float); ~daAlinkHIO_wlAtWait_c(); @@ -3413,7 +3413,7 @@ public: class daAlinkHIO_wlAtRoll_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtRoll_c(); ~daAlinkHIO_wlAtRoll_c(); @@ -3421,7 +3421,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtRoll_c1 m; #endif }; // Size: 0x54 @@ -3448,7 +3448,7 @@ public: class daAlinkHIO_wlAtNjump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtNjump_c(); ~daAlinkHIO_wlAtNjump_c(); @@ -3456,7 +3456,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtNjump_c1 m; #endif }; // Size: 0x70 @@ -3489,7 +3489,7 @@ public: class daAlinkHIO_wlAtCjump_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtCjump_c(); ~daAlinkHIO_wlAtCjump_c(); @@ -3497,7 +3497,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtCjump_c1 m; #endif }; // Size: 0x98 @@ -3517,7 +3517,7 @@ public: class daAlinkHIO_wlAtLand_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtLand_c(); ~daAlinkHIO_wlAtLand_c(); @@ -3525,7 +3525,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtLand_c1 m; #endif }; // Size: 0x74 @@ -3553,7 +3553,7 @@ public: class daAlinkHIO_wlAtDown_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtDown_c(); ~daAlinkHIO_wlAtDown_c(); @@ -3561,7 +3561,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtDown_c1 m; #endif }; // Size: 0xD0 @@ -3590,7 +3590,7 @@ public: class daAlinkHIO_wlAtLock_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtLock_c(); ~daAlinkHIO_wlAtLock_c(); @@ -3598,7 +3598,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtLock_c1 m; #endif }; // Size: 0x88 @@ -3630,7 +3630,7 @@ public: class daAlinkHIO_wlAtBite_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAtBite_c(); ~daAlinkHIO_wlAtBite_c(); @@ -3638,7 +3638,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlAtBite_c1 m; #endif }; // Size: 0x90 @@ -3675,7 +3675,7 @@ public: class daAlinkHIO_wlAttack_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlAttack_c(); ~daAlinkHIO_wlAttack_c(); @@ -3722,7 +3722,7 @@ public: class daAlinkHIO_wlPoint_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlPoint_c(); ~daAlinkHIO_wlPoint_c(); @@ -3730,7 +3730,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlPoint_c1 m; #endif }; @@ -3758,7 +3758,7 @@ public: class daAlinkHIO_wlChain_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlChain_c(); ~daAlinkHIO_wlChain_c(); @@ -3766,7 +3766,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlChain_c1 m; #endif }; @@ -3815,7 +3815,7 @@ public: class daAlinkHIO_wlSwim_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlSwim_c(); ~daAlinkHIO_wlSwim_c(); @@ -3823,7 +3823,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlSwim_c1 m; #endif }; @@ -3844,7 +3844,7 @@ public: class daAlinkHIO_wlGrab_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlGrab_c(); ~daAlinkHIO_wlGrab_c(); @@ -3852,7 +3852,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlGrab_c1 m; #endif }; @@ -3874,7 +3874,7 @@ public: class daAlinkHIO_wlBall_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wlBall_c(); ~daAlinkHIO_wlBall_c(); @@ -3882,7 +3882,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x00 */ daAlinkHIO_wlBall_c1 m; #endif }; @@ -3929,7 +3929,7 @@ public: class daAlinkHIO_wolf_c : public daAlinkHIO_data_c { public: -#ifdef DEBUG +#if DEBUG daAlinkHIO_wolf_c(); ~daAlinkHIO_wolf_c(); @@ -3939,7 +3939,7 @@ public: #endif public: -#ifdef DEBUG +#if DEBUG /* 0x34 */ daAlinkHIO_wlMove_c mWlMove; /* 0x00 */ daAlinkHIO_wlMoveNoP_c mWlMoveNoP; /* 0x00 */ daAlinkHIO_wlAtnMove_c mWlAtnMove; @@ -3965,7 +3965,7 @@ public: }; class daAlinkHIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { @@ -3975,7 +3975,7 @@ public: void jumpStateUpdate(const cXyz*, const cXyz*, f32); void genMessage(JORMContext*); -#ifdef DEBUG +#if DEBUG void readFileData(char*); size_t makeFileOutData(char*, char*); void listenPropertyEvent(const JORPropertyEvent*); diff --git a/include/d/actor/d_a_demo00.h b/include/d/actor/d_a_demo00.h index 4bb1cf8a4a..57a574d0cf 100644 --- a/include/d/actor/d_a_demo00.h +++ b/include/d/actor/d_a_demo00.h @@ -87,7 +87,7 @@ public: /* 0x0568 */ cXyz field_0x568; /* 0x0574 */ csXyz field_0x574; - #ifdef DEBUG + #if DEBUG cXyz debug_field_0x570; csXyz debug_field_0x57c; #endif diff --git a/include/d/actor/d_a_e_yr.h b/include/d/actor/d_a_e_yr.h index 36a9e29c60..cf1c173f7a 100644 --- a/include/d/actor/d_a_e_yr.h +++ b/include/d/actor/d_a_e_yr.h @@ -77,7 +77,7 @@ public: /* 0x70C */ dBgS_AcchCir mAcchCir; /* 0x74C */ dBgS_ObjAcch mAcch; /* 0x924 */ u8 field_0x924; -#ifndef DEBUG +#if !DEBUG /* 0x928 */ f32 field_0x928; #endif /* 0x92C */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_npc_aru.h b/include/d/actor/d_a_npc_aru.h index b48a714e9e..7cdba1eff9 100644 --- a/include/d/actor/d_a_npc_aru.h +++ b/include/d/actor/d_a_npc_aru.h @@ -131,9 +131,7 @@ public: int bullRunning(void*); int skipFence(void*); int talk(void*); - #ifdef DEBUG int test(void*); - #endif daNpc_Aru_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_cd.h b/include/d/actor/d_a_npc_cd.h index fc1e19ef1c..918a29e88a 100644 --- a/include/d/actor/d_a_npc_cd.h +++ b/include/d/actor/d_a_npc_cd.h @@ -54,7 +54,7 @@ struct daNpcCd_HIO_Jnt_c : public JORReflexible { virtual ~daNpcCd_HIO_Jnt_c() {} daNpcCd_HIO_Jnt_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -66,7 +66,7 @@ struct daNpcCd_HIO_Child_c : public JORReflexible { virtual ~daNpcCd_HIO_Child_c() {} daNpcCd_HIO_Child_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -91,7 +91,7 @@ public: daNpcCd_HIO_c(); virtual ~daNpcCd_HIO_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index 88e859acd5..c5ef9f9283 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -274,7 +274,7 @@ public: } void setCollision() { - #ifdef DEBUG + #if DEBUG mCyl.SetR(Cd2_HIO_cylR(m_type)); mCyl.SetH(Cd2_HIO_cylH(m_type)); #endif diff --git a/include/d/actor/d_a_npc_doc.h b/include/d/actor/d_a_npc_doc.h index 114bd9f749..286405d074 100644 --- a/include/d/actor/d_a_npc_doc.h +++ b/include/d/actor/d_a_npc_doc.h @@ -74,10 +74,8 @@ public: OS_REPORT("|%06d:%x|daNpc_Doc_c -> コンストラクト\n", g_Counter.mCounter0, this); } - #if DEBUG int test(void*); - #endif - + BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 4; } BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 8; } s32 getBackboneJointNo() { return 1; } diff --git a/include/d/actor/d_a_npc_fairy.h b/include/d/actor/d_a_npc_fairy.h index 51b1434113..09bed565c5 100644 --- a/include/d/actor/d_a_npc_fairy.h +++ b/include/d/actor/d_a_npc_fairy.h @@ -196,9 +196,7 @@ public: BOOL setAction(actionFunc, int); int wait(int); int talk(int); - #if DEBUG int test(int); - #endif void AppearDemoCall(); void ReturnDemoCall(); void PresentDemoCall(); diff --git a/include/d/actor/d_a_npc_grmc.h b/include/d/actor/d_a_npc_grmc.h index 0bfcd52016..b0ffb6f6f7 100644 --- a/include/d/actor/d_a_npc_grmc.h +++ b/include/d/actor/d_a_npc_grmc.h @@ -13,13 +13,19 @@ * */ +#if DEBUG +#define NPC_GRMC_HIO_CLASS daNpc_grMC_HIO_c +#else +#define NPC_GRMC_HIO_CLASS daNpc_grMC_Param_c +#endif + struct daNpc_grMC_HIOParam { /* 0x0 */ daNpcT_HIOParam common; }; class daNpc_grMC_HIO_c : public mDoHIO_entry_c { public: - /* 0x8 */ daNpc_grMC_HIOParam param; + /* 0x8 */ daNpc_grMC_HIOParam m; }; class daNpc_grMC_Param_c { @@ -92,9 +98,7 @@ public: int tend(void*); int talk(void*); int shop(void*); - #ifdef DEBUG int test(void*); - #endif daNpc_grMC_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, @@ -118,10 +122,7 @@ public: static cutFunc mCutList[1]; private: - #ifdef DEBUG - /* 0xFCC */ daNpc_grMC_HIO_c* mHIO; - #endif - /* 0x0F7C */ u8 field_0xf7c[0xf80 - 0xf7c]; + /* 0x0F7C */ NPC_GRMC_HIO_CLASS* mHIO; /* 0x0F80 */ dCcD_Cyl mCyl; /* 0x10BC */ u8 mType; /* 0x10C0 */ actionFunc mNextAction; diff --git a/include/d/actor/d_a_npc_grr.h b/include/d/actor/d_a_npc_grr.h index fd2384e358..642073e295 100644 --- a/include/d/actor/d_a_npc_grr.h +++ b/include/d/actor/d_a_npc_grr.h @@ -17,7 +17,7 @@ struct daNpc_grR_HIOParam { }; class daNpc_grR_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h index 6122606a61..5234e1bdc2 100644 --- a/include/d/actor/d_a_npc_hoz.h +++ b/include/d/actor/d_a_npc_hoz.h @@ -91,9 +91,7 @@ public: virtual void evtOrder(); virtual int drawDbgInfo(); - #if DEBUG int test(void*); - #endif bool getGameStartFlag() { return mGameStartFlag; } void setPotBreakFlag() { mPotBreakFlag = true; } diff --git a/include/d/actor/d_a_npc_kasi_kyu.h b/include/d/actor/d_a_npc_kasi_kyu.h index 9f611831aa..45fb2d4359 100644 --- a/include/d/actor/d_a_npc_kasi_kyu.h +++ b/include/d/actor/d_a_npc_kasi_kyu.h @@ -20,7 +20,7 @@ struct daNpcKasiKyu_HIOParam { }; class daNpcKasiKyu_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_kasi_mich.h b/include/d/actor/d_a_npc_kasi_mich.h index 1374717fc5..fbda43e3c6 100644 --- a/include/d/actor/d_a_npc_kasi_mich.h +++ b/include/d/actor/d_a_npc_kasi_mich.h @@ -20,7 +20,7 @@ struct daNpcKasiMich_HIOParam { }; class daNpcKasiMich_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h index dede4e1b6c..1c6b9f2e4b 100644 --- a/include/d/actor/d_a_npc_kolin.h +++ b/include/d/actor/d_a_npc_kolin.h @@ -67,9 +67,7 @@ public: int follow(void*); int clothWait(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_Kolin_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_kolinb.h b/include/d/actor/d_a_npc_kolinb.h index dcf4d4744c..6cc9823437 100644 --- a/include/d/actor/d_a_npc_kolinb.h +++ b/include/d/actor/d_a_npc_kolinb.h @@ -115,9 +115,7 @@ public: int cutThankYou(int); int wait(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_Kolinb_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_pachi_besu.h b/include/d/actor/d_a_npc_pachi_besu.h index 0c6bfad3a7..fad0bdc9ab 100644 --- a/include/d/actor/d_a_npc_pachi_besu.h +++ b/include/d/actor/d_a_npc_pachi_besu.h @@ -61,9 +61,7 @@ public: BOOL setAction(actionFunc); BOOL wait(void*); BOOL talk(void*); - #ifdef DEBUG BOOL test(void*); - #endif BOOL _turn_to_link(s16); BOOL _turn_pos(cXyz const&); BOOL _turn_pos(cXyz const&, s16); diff --git a/include/d/actor/d_a_npc_saru.h b/include/d/actor/d_a_npc_saru.h index 21a12d85a7..f4e64d918f 100644 --- a/include/d/actor/d_a_npc_saru.h +++ b/include/d/actor/d_a_npc_saru.h @@ -22,7 +22,7 @@ class daNpc_Saru_Param_c : public JORReflexible { public: virtual ~daNpc_Saru_Param_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -129,7 +129,7 @@ public: static char* mCutNameList[4]; static cutFunc mCutList[4]; private: - #ifdef DEBUG + #if DEBUG /* 0xE90 */ daNpc_Saru_HIO_c* field_0xe90; #endif /* 0xE40 */ u8 field_0xe40[0xe44 - 0xe40]; diff --git a/include/d/actor/d_a_npc_seic.h b/include/d/actor/d_a_npc_seic.h index e08641bf22..3c6f5f3fe8 100644 --- a/include/d/actor/d_a_npc_seic.h +++ b/include/d/actor/d_a_npc_seic.h @@ -60,14 +60,14 @@ class daNpc_seiC_Param_c { }; class daNpc_seiC_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { public: void genMessage(JORMContext*); - #ifdef DEBUG + #if DEBUG /* 0x08 */ daNpc_seiC_HIOParam field_0x8; /* 0x94 */ f32 field_0x94; // "強制会話距離" "Forced conversation distance" | Slider /* 0x98 */ f32 field_0x98; // "会話距離" "Conversation distance" | Slider diff --git a/include/d/actor/d_a_npc_seid.h b/include/d/actor/d_a_npc_seid.h index f3fc27ff27..43abdd2356 100644 --- a/include/d/actor/d_a_npc_seid.h +++ b/include/d/actor/d_a_npc_seid.h @@ -60,14 +60,14 @@ class daNpc_seiD_Param_c { }; class daNpc_seiD_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { public: void genMessage(JORMContext*); - #ifdef DEBUG + #if DEBUG /* 0x08 */ daNpc_seiD_HIOParam field_0x8; // /* 0x94 */ f32 field_0x94; // "強制会話距離" "Forced conversation distance" | Slider // /* 0x98 */ f32 field_0x98; // "会話距離" "Conversation distance" | Slider diff --git a/include/d/actor/d_a_npc_taro.h b/include/d/actor/d_a_npc_taro.h index d2865ca686..cbbb9d44eb 100644 --- a/include/d/actor/d_a_npc_taro.h +++ b/include/d/actor/d_a_npc_taro.h @@ -55,7 +55,7 @@ class daNpc_Taro_Param_c { }; class daNpc_Taro_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_tks.h b/include/d/actor/d_a_npc_tks.h index 75d3933b1d..ed8ee3f54f 100644 --- a/include/d/actor/d_a_npc_tks.h +++ b/include/d/actor/d_a_npc_tks.h @@ -28,7 +28,7 @@ struct daNpcTks_HIOParam { }; class daNpcTks_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_npc_toby.h b/include/d/actor/d_a_npc_toby.h index 607b2fb649..835767d6c2 100644 --- a/include/d/actor/d_a_npc_toby.h +++ b/include/d/actor/d_a_npc_toby.h @@ -90,9 +90,7 @@ public: int walk(void*); int play(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_Toby_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_ykm.h b/include/d/actor/d_a_npc_ykm.h index ae91298e31..558e21402d 100644 --- a/include/d/actor/d_a_npc_ykm.h +++ b/include/d/actor/d_a_npc_ykm.h @@ -249,9 +249,7 @@ public: BOOL cook(void*); BOOL race(void*); BOOL talk(void*); - #ifdef DEBUG BOOL test(void*); - #endif daNpc_ykM_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_npc_ykw.h b/include/d/actor/d_a_npc_ykw.h index cc53c2a0dc..770d452af2 100644 --- a/include/d/actor/d_a_npc_ykw.h +++ b/include/d/actor/d_a_npc_ykw.h @@ -75,9 +75,7 @@ public: int walk(void*); int race(void*); int talk(void*); -#if DEBUG int test(void*); -#endif daNpc_ykW_c(const daNpcT_faceMotionAnmData_c * param_0, const daNpcT_motionAnmData_c* param_1, const daNpcT_MotionSeqMngr_c::sequenceStepData_c* param_2, diff --git a/include/d/actor/d_a_npc_zelRo.h b/include/d/actor/d_a_npc_zelRo.h index 3fa60a9ad2..ebac8e8929 100644 --- a/include/d/actor/d_a_npc_zelRo.h +++ b/include/d/actor/d_a_npc_zelRo.h @@ -115,9 +115,7 @@ public: BOOL setAction(actionFunc); int wait(void*); int talk(void*); - #ifdef DEBUG int test(void*); - #endif daNpc_ZelRo_c( daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h index 7b3be1c0e9..51d5f3029f 100644 --- a/include/d/actor/d_a_obj_bemos.h +++ b/include/d/actor/d_a_obj_bemos.h @@ -123,7 +123,7 @@ public: void initActionDead(); void actionDead(); int Draw(); -#ifdef DEBUG +#if DEBUG /* 0x000000 */ void debugDraw(); #endif int Delete(); diff --git a/include/d/actor/d_a_obj_damCps.h b/include/d/actor/d_a_obj_damCps.h index 1ec3bcfca8..1ce75cc663 100644 --- a/include/d/actor/d_a_obj_damCps.h +++ b/include/d/actor/d_a_obj_damCps.h @@ -14,7 +14,7 @@ * */ class daObjDamCps_c : public fopAc_ac_c { -#ifdef DEBUG +#if DEBUG public: daObjDamCps_c() {}; void initBaseMtx(); diff --git a/include/d/actor/d_a_obj_fallobj.h b/include/d/actor/d_a_obj_fallobj.h index 2116d2eac4..52270b2bba 100644 --- a/include/d/actor/d_a_obj_fallobj.h +++ b/include/d/actor/d_a_obj_fallobj.h @@ -68,7 +68,7 @@ private: STATIC_ASSERT(sizeof(daObjFallObj_c) == 0x614); -#ifdef DEBUG +#if DEBUG class daObjFallObj_HIO_c : public mDoHIO_entry_c { public: daObjFallObj_HIO_c(); diff --git a/include/d/actor/d_a_obj_kbacket.h b/include/d/actor/d_a_obj_kbacket.h index 7ffce33504..4c4932d21e 100644 --- a/include/d/actor/d_a_obj_kbacket.h +++ b/include/d/actor/d_a_obj_kbacket.h @@ -22,12 +22,12 @@ struct daObj_KBacket_HIOParam }; class daObj_KBacket_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { public: -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); daObj_KBacket_HIOParam param; diff --git a/include/d/actor/d_a_obj_laundry_rope.h b/include/d/actor/d_a_obj_laundry_rope.h index deede25609..4dba2250dc 100644 --- a/include/d/actor/d_a_obj_laundry_rope.h +++ b/include/d/actor/d_a_obj_laundry_rope.h @@ -45,7 +45,7 @@ public: inline float getStartRate(cXyz* param_1); - #ifdef DEBUG + #if DEBUG const daObjLndRope_Hio_c* attr() const { return &M_Hio; }; diff --git a/include/d/actor/d_a_obj_lv6swturn.h b/include/d/actor/d_a_obj_lv6swturn.h index 3b6e6abac7..cf263b53bf 100644 --- a/include/d/actor/d_a_obj_lv6swturn.h +++ b/include/d/actor/d_a_obj_lv6swturn.h @@ -51,7 +51,7 @@ public: STATIC_ASSERT(sizeof(daObjLv6SwTurn_c) == 0x5cc); -#ifdef DEBUG +#if DEBUG class daObjLv6SwTurn_HIO_c : public mDoHIO_entry_c { public: daObjLv6SwTurn_HIO_c(); diff --git a/include/d/actor/d_a_obj_mie.h b/include/d/actor/d_a_obj_mie.h index 080c68f76d..a07ff24452 100644 --- a/include/d/actor/d_a_obj_mie.h +++ b/include/d/actor/d_a_obj_mie.h @@ -26,7 +26,7 @@ struct daObj_Mie_Param_c { }; class daObj_Mie_HIO_c -#ifdef DEBUG +#if DEBUG : public mDoHIO_entry_c #endif { diff --git a/include/d/actor/d_a_obj_swchain.h b/include/d/actor/d_a_obj_swchain.h index 028b827129..270fb8f5ab 100644 --- a/include/d/actor/d_a_obj_swchain.h +++ b/include/d/actor/d_a_obj_swchain.h @@ -117,7 +117,7 @@ private: /* 0xA9C */ u8 field_0xa9c; /* 0xA9D */ u8 field_0xa9d; /* 0xA9E */ u8 field_0xa9e; -#ifdef DEBUG +#if DEBUG /* 0xAA0 */ cXyz field_0xac0; #endif }; diff --git a/include/d/actor/d_a_obj_thdoor.h b/include/d/actor/d_a_obj_thdoor.h index b20f4a3a71..508b13573f 100644 --- a/include/d/actor/d_a_obj_thdoor.h +++ b/include/d/actor/d_a_obj_thdoor.h @@ -67,7 +67,7 @@ public: STATIC_ASSERT(sizeof(daObjThDoor_c) == 0x8c0); -#ifdef DEBUG +#if DEBUG class daObjThDoor_HIO_c : public mDoHIO_entry_c { public: daObjThDoor_HIO_c(); diff --git a/include/d/actor/d_a_obj_tobyhouse.h b/include/d/actor/d_a_obj_tobyhouse.h index 7df268b925..420a8ca278 100644 --- a/include/d/actor/d_a_obj_tobyhouse.h +++ b/include/d/actor/d_a_obj_tobyhouse.h @@ -79,7 +79,7 @@ public: STATIC_ASSERT(sizeof(daObjTobyHouse_c) == 0x600); -#ifdef DEBUG +#if DEBUG class daObjTobyHouse_HIO_c : public mDoHIO_entry_c { public: diff --git a/include/d/actor/d_a_obj_togeTrap.h b/include/d/actor/d_a_obj_togeTrap.h index 159afb645e..622d8226ca 100644 --- a/include/d/actor/d_a_obj_togeTrap.h +++ b/include/d/actor/d_a_obj_togeTrap.h @@ -68,7 +68,7 @@ public: daTogeTrap_HIO_c(); ~daTogeTrap_HIO_c() {} - #ifdef DEBUG + #if DEBUG void genMessage(JORMContext* ctx) { // Speed ctx->genLabel("--- 速 出現時---", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/include/d/actor/d_a_obj_volcbom.h b/include/d/actor/d_a_obj_volcbom.h index 1aae1c0269..17f9db911d 100644 --- a/include/d/actor/d_a_obj_volcbom.h +++ b/include/d/actor/d_a_obj_volcbom.h @@ -131,7 +131,7 @@ private: STATIC_ASSERT(sizeof(daObjVolcBom_c) == 0xa1c); -#ifdef DEBUG +#if DEBUG class daObjVolcBom_HIO_c : public mDoHIO_entry_c { public: daObjVolcBom_HIO_c(); diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 7c32803f68..5766b0b4df 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -45,7 +45,7 @@ private: class dAttParam_c : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG /* 0x04 */ s8 mHIOChildNo; #endif @@ -66,7 +66,7 @@ public: /* 0x35 */ u8 mAttnCursorDisappearFrames; /* 0x38 */ f32 field_0x38; /* 0x3C */ f32 field_0x3c; -#ifdef DEBUG +#if DEBUG /* 0x44 */ s32 mDebugDispPosX; /* 0x48 */ s32 mDebugDispPosY; #endif @@ -75,7 +75,7 @@ public: dAttParam_c() {} dAttParam_c(s32); -#ifdef DEBUG +#if DEBUG void connectHIO(char* i_name) { mHIOChildNo = mDoHIO_CREATE_CHILD(i_name, this); } diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h index d300226e3d..082723a828 100644 --- a/include/d/d_bg_s.h +++ b/include/d/d_bg_s.h @@ -66,7 +66,7 @@ u8 dKy_pol_sound_get(cBgS_PolyInfo const* param_0); class dBgS_HIO : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG dBgS_HIO() { field_0x6 = 0; field_0x8 = 0; @@ -152,7 +152,7 @@ public: void DebugDrawPoly(dBgW_Base *param_1) {} fopAc_ac_c* GetActorPointer(cBgS_PolyInfo const& param_0) const { return cBgS::GetActorPointer(param_0); } bool LineCross(cBgS_LinChk* i_linChk) { - #ifdef DEBUG + #if DEBUG if (m_hio.ChkLineOff()) { return false; } @@ -173,7 +173,7 @@ public: #endif } f32 GroundCross(cBgS_GndChk* i_gndChk) { - #ifdef DEBUG + #if DEBUG if (m_hio.ChkCheckCounter()) { g_ground_counter++; } @@ -193,7 +193,7 @@ public: void ChkDeleteActorRegist(fopAc_ac_c*); -#ifdef DEBUG +#if DEBUG /* 0x1404 */ u8 field_0x1404[0x1408 - 0x1404]; /* 0x1408 */ dBgS_HIO m_hio; #endif diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index 208d838668..f5d7579c97 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -199,7 +199,7 @@ public: /* 0x02C */ u32 m_flags; /* 0x030 */ cXyz* pm_pos; /* 0x034 */ cXyz* pm_old_pos; -#ifdef DEBUG +#if DEBUG /* 0x038 */ cXyz unk_0x38; #endif /* 0x038 */ cXyz* pm_speed; @@ -227,7 +227,7 @@ public: /* 0x0CC */ f32 field_0xcc; /* 0x0D0 */ f32 m_wtr_chk_offset; /* 0x0D4 */ cBgS_PolyInfo* pm_out_poly_info; -#ifdef DEBUG +#if DEBUG /* 0x0E4 */ cXyz unk_0xe4; #endif /* 0x0D8 */ f32 field_0xd8; diff --git a/include/d/d_cc_s.h b/include/d/d_cc_s.h index 977a8ebc8e..2f9b475f70 100644 --- a/include/d/d_cc_s.h +++ b/include/d/d_cc_s.h @@ -65,7 +65,7 @@ public: // /* 0x0000 */ cCcS mCCcS; /* 0x284C */ dCcMassS_Mng mMass_Mng; -#ifdef DEBUG +#if DEBUG /* 0x2AD0 */ u8 field_0x2ad0; #endif }; // Size = 0x2AC4 diff --git a/include/d/d_event.h b/include/d/d_event.h index 2d364fe004..adc09de53d 100644 --- a/include/d/d_event.h +++ b/include/d/d_event.h @@ -128,7 +128,7 @@ public: u8 getMode() const { return mMode; } void onHindFlag(u16 flag) { mHindFlag |= flag; } - #ifdef DEBUG + #if DEBUG void offHindFlag(u16 flag) { mHindFlag &= (u16)~flag; } #else void offHindFlag(u16 flag) { mHindFlag &= ~flag; } diff --git a/include/d/d_event_debug.h b/include/d/d_event_debug.h index 41b679b321..45aab2267c 100644 --- a/include/d/d_event_debug.h +++ b/include/d/d_event_debug.h @@ -1,7 +1,6 @@ #ifndef D_EVENT_D_EVENT_DEBUG_H #define D_EVENT_D_EVENT_DEBUG_H -#ifdef DEBUG #include "JSystem/JHostIO/JORMContext.h" #include "d/d_event.h" @@ -171,6 +170,4 @@ struct dEvM_HIO_c : public JORReflexible { }; }; -#endif /* DEBUG */ - #endif /* D_EVENT_D_EVENT_DEBUG_H */ diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h index db066bd583..277e6d6dbc 100644 --- a/include/d/d_kankyo.h +++ b/include/d/d_kankyo.h @@ -259,7 +259,7 @@ public: /* 0x09B8 */ DUNGEON_LIGHT dungeonlight[8]; /* 0x0C18 */ BOSS_LIGHT field_0x0c18[8]; /* 0x0D58 */ BOSS_LIGHT field_0x0d58[6]; -#ifdef DEBUG +#if DEBUG /* 0x0E48 */ NAVYCHAN navy; /* 0x0E58 */ u8 field_0xe58[0xE68 - 0xE58]; // part of NAVYCHAN? #endif @@ -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; diff --git a/include/d/d_kankyo_static.h b/include/d/d_kankyo_static.h index 74e915b139..0dd5bb92fa 100644 --- a/include/d/d_kankyo_static.h +++ b/include/d/d_kankyo_static.h @@ -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 */ \ No newline at end of file +#endif /* D_KANKYO_STATIC_H */ diff --git a/include/d/d_meter_HIO.h b/include/d/d_meter_HIO.h index a03302b0b6..8c0802c31b 100644 --- a/include/d/d_meter_HIO.h +++ b/include/d/d_meter_HIO.h @@ -587,7 +587,7 @@ public: #endif } - #ifdef DEBUG + #if DEBUG virtual void listenPropertyEvent(const JORPropertyEvent*); virtual void genMessage(JORMContext*); @@ -601,7 +601,7 @@ public: /* 0x000 */ // vtable /* 0x004 */ s8 field_0x4; - #ifdef DEBUG + #if DEBUG int field_0x8_debug; #endif /* 0x008 */ f32 mLifeTopPosX; @@ -1185,7 +1185,7 @@ public: }; // Size: 0x28 dMeter_fmapHIO_c(); -#ifdef DEBUG +#if DEBUG void update(); void createEvtCallBackObject(); void deleteEvtCallBackObject(); diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h index 2807f4b877..edfce0ea8a 100644 --- a/include/d/d_msg_flow.h +++ b/include/d/d_msg_flow.h @@ -173,7 +173,7 @@ public: void initWord(fopAc_ac_c*, const char*, u8, int, fopAc_ac_c**); -#ifdef DEBUG +#if DEBUG void dbgPrint(); #endif diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 3d00f861e6..db8efde952 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -52,7 +52,7 @@ private: /* 0x18 */ JKRHeap* heap; /* 0x1C */ JKRSolidHeap* mDataHeap; /* 0x20 */ void** mRes; -#ifdef DEBUG +#if DEBUG /* 0x24 */ void* unk_0x24; #endif }; // Size: 0x24 diff --git a/include/d/d_s_menu.h b/include/d/d_s_menu.h index 751ab970e0..a544c65576 100644 --- a/include/d/d_s_menu.h +++ b/include/d/d_s_menu.h @@ -6,7 +6,7 @@ class mDoDvdThd_toMainRam_c; -#ifdef DEBUG +#if DEBUG class myFontClass : public JUTResFont { public: myFontClass(const ResFONT* i_font, JKRHeap* i_heap) diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index d78fa1b5b3..d0137bcb2c 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -19,7 +19,7 @@ class dScnPly_reg_HIO_c : public JORReflexible { public: virtual ~dScnPly_reg_HIO_c() {} -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); /* 0x4 */ s8 id; @@ -83,7 +83,7 @@ public: extern dScnPly_env_HIO_c g_envHIO; extern dScnPly_reg_HIO_c g_regHIO; -#ifdef DEBUG +#if DEBUG extern dScnPly_preset_HIO_c g_presetHIO; #endif @@ -95,7 +95,7 @@ extern dScnPly_preset_HIO_c g_presetHIO; * Float Reg(25-29) ... -1.0 - +1.0 */ -#ifdef DEBUG +#if DEBUG // Morita #define TREG_F(i) g_regHIO.mChildReg[0].mFloatReg[i] #define TREG_S(i) g_regHIO.mChildReg[0].mShortReg[i] diff --git a/include/d/d_s_play_env.h b/include/d/d_s_play_env.h index 2f0a28642e..f14e1f6ef3 100644 --- a/include/d/d_s_play_env.h +++ b/include/d/d_s_play_env.h @@ -8,13 +8,13 @@ public: virtual ~dScnPly_env_otherHIO_c() {} void genMessage(JORMContext*); - #ifdef DEBUG + #if DEBUG /* 0x04 */ s8 field_0x04; #endif /* 0x08 */ f32 mShadowDensity; - #ifdef DEBUG + #if DEBUG /* 0x0C */ f32 mCullFarValue; /* 0x10 */ f32 mRailSize; /* 0x14 */ s16 mRailColorR; @@ -28,7 +28,7 @@ public: /* 0x45 */ u8 field_0x45; /* 0x46 */ u8 mDisplayTransparentCyl; - #ifdef DEBUG + #if DEBUG /* 0x47 */ u8 mDisplayShadows; /* 0x48 */ u8 mDisplayShadowImage; /* 0x49 */ u8 mDisplayShadowPoly; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index a6bd3e9d9f..43e3f7e3ad 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1011,7 +1011,7 @@ public: /* 0x54 */ stage_tgsc_class* mDrTg; /* 0x58 */ stage_tgsc_class* mDoor; /* 0x5C */ dStage_FloorInfo_c* mFloorInfo; -#ifdef DEBUG +#if DEBUG /* 0x60 */ int field_0x60; #endif /* 0x60 */ u16 mPlayerNum; @@ -1092,7 +1092,7 @@ public: static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; } static void setZoneNo(int, int); static dBgp_c* getBgp(int i_roomNo) { -#ifdef DEBUG +#if DEBUG // NONMATCHING #else return NULL; diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index 8443abf1d7..204f6e759c 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -88,7 +88,7 @@ public: static const vib_pattern CQ_patt[VIBMODE_Q_MAX]; private: -#ifdef DEBUG +#if DEBUG /* 0x00 */ dVibTest_c mVibTest; #endif diff --git a/include/dolphin/mtx.h b/include/dolphin/mtx.h index c818376fa3..da308658ab 100644 --- a/include/dolphin/mtx.h +++ b/include/dolphin/mtx.h @@ -85,7 +85,7 @@ void PSMTXScaleApply(const Mtx src, Mtx dst, f32 xS, f32 yS, f32 zS); void PSMTXQuat(Mtx m, const Quaternion* q); void PSMTXReflect(Mtx m, const Vec* p, const Vec* n); -#ifdef DEBUG +#if DEBUG #define MTXIdentity C_MTXIdentity #define MTXCopy C_MTXCopy #define MTXConcat C_MTXConcat @@ -145,7 +145,7 @@ void PSMTXMultVecArray(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count) void PSMTXMultVecSR(const Mtx m, const Vec* src, Vec* dst); void PSMTXMultVecArraySR(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTXMultVec C_MTXMultVec #define MTXMultVecArray C_MTXMultVecArray #define MTXMultVecSR C_MTXMultVecSR @@ -184,7 +184,7 @@ void PSMTX44RotRad(Mtx44 m, char axis, f32 rad); void PSMTX44RotTrig(Mtx44 m, char axis, f32 sinA, f32 cosA); void PSMTX44RotAxisRad(Mtx44 m, const Vec* axis, f32 rad); -#ifdef DEBUG +#if DEBUG #define MTX44Identity C_MTX44Identity #define MTX44Copy C_MTX44Copy #define MTX44Concat C_MTX44Concat @@ -234,7 +234,7 @@ void PSMTX44MultVecArray(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 co void PSMTX44MultVecSR(const Mtx44 m, const Vec* src, Vec* dst); void PSMTX44MultVecArraySR(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTX44MultVec C_MTX44MultVec #define MTX44MultVecArray C_MTX44MultVecArray #define MTX44MultVecSR C_MTX44MultVecSR @@ -287,7 +287,7 @@ void PSVECCrossProduct(const Vec* a, const Vec* b, Vec* axb); f32 PSVECSquareDistance(const Vec* a, const Vec* b); f32 PSVECDistance(const Vec* a, const Vec* b); -#ifdef DEBUG +#if DEBUG #define VECAdd C_VECAdd #define VECSubtract C_VECSubtract #define VECScale C_VECScale @@ -338,7 +338,7 @@ void PSQUATNormalize(const Quaternion* src, Quaternion* unit); void PSQUATInverse(const Quaternion* src, Quaternion* inv); void PSQUATDivide(const Quaternion* p, const Quaternion* q, Quaternion* r); -#ifdef DEBUG +#if DEBUG #define QUATAdd C_QUATAdd #define QUATSubtract C_QUATSubtract #define QUATMultiply C_QUATMultiply diff --git a/include/dolphin/os.h b/include/dolphin/os.h index 1063800e89..989324d7fc 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -208,7 +208,7 @@ DECL_WEAK void OSReportForceEnableOff(void); DECL_WEAK void OSReportForceEnableOn(void); DECL_WEAK void OSVReport(const char* format, va_list list); -#ifdef DEBUG +#if DEBUG #define OS_REPORT(...) OSReport(__VA_ARGS__) #define OS_WARNING(...) OSReport_Warning(__VA_ARGS__) #define OS_REPORT_ERROR(...) OSReport_Error(__VA_ARGS__) @@ -261,7 +261,7 @@ extern int __OSInIPL; #define LINE(l0, l1, l2) (l2) #endif -#ifdef DEBUG +#if DEBUG #define ASSERTLINE(line, cond) \ ((cond) || (OSPanic(__FILE__, line, "Failed assertion " #cond), 0)) diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 2520cf508c..02f151b131 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -82,6 +82,12 @@ typedef unsigned int uint; #endif #endif +#ifdef __MWERKS__ +#define __REGISTER register +#else +#define __REGISTER +#endif + #include #endif diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 0d3c80ed88..618caed84f 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -139,7 +139,11 @@ inline void fapGmHIO_set2Ddraw(u8 param_0) { } inline u8 fapGmHIO_get2Ddraw() { + #if DEBUG return g_HIO.mDisplay2D; + #else + return TRUE; + #endif } inline void fapGmHIO_offPrint() { @@ -151,7 +155,11 @@ inline void fapGmHIO_onPrint() { } inline u8 fapGmHIO_getParticle() { + #if DEBUG return g_HIO.mDisplayParticle; + #else + return TRUE; + #endif } #if PLATFORM_WII || PLATFORM_SHIELD diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 8122b42fb7..648196b870 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -64,7 +64,7 @@ enum fopAc_Cull_e { fopAc_CULLBOX_11_e, fopAc_CULLBOX_12_e, fopAc_CULLBOX_13_e, -#ifdef DEBUG +#if DEBUG fopAc_CULLBOX_14_e, #endif fopAc_CULLBOX_CUSTOM_e, @@ -76,7 +76,7 @@ enum fopAc_Cull_e { fopAc_CULLSPHERE_5_e, fopAc_CULLSPHERE_6_e, fopAc_CULLSPHERE_7_e, -#ifdef DEBUG +#if DEBUG fopAc_CULLSPHERE_8_e, #endif fopAc_CULLSPHERE_CUSTOM_e, diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index b71590829e..955da52ad1 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -83,7 +83,7 @@ struct fopAcM_search_prm { struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { virtual ~fOpAcm_HIO_entry_c() {} - #ifdef DEBUG + #if DEBUG void removeHIO(const fopAc_ac_c* i_this) { removeHIO(*i_this); } void removeHIO(const fopAc_ac_c& i_this) { removeHIO(i_this.base); } void removeHIO(const leafdraw_class& i_this) { removeHIO(i_this.base); } @@ -816,7 +816,7 @@ inline void fopAcM_effSmokeSet2(u32* param_0, u32* param_1, cXyz const* param_2, inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_filename, int i_line, const char* i_msg, ...) { -#ifdef DEBUG +#if DEBUG /* va_list args; va_start(args, i_msg); @@ -834,7 +834,7 @@ void fopAcM_showAssert_f(const fopAc_ac_c*, const char*, int, const char*, ...); #define fopAcM_assert(line, actor, COND, msg) \ (COND) ? (void)0 : (fopAcM_showAssert_f(actor, __FILE__, line, msg)); -#ifdef DEBUG +#if DEBUG #define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg) \ fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg) #else diff --git a/include/f_pc/f_pc_debug_sv.h b/include/f_pc/f_pc_debug_sv.h index d7c942faa5..78a1d98b3e 100644 --- a/include/f_pc/f_pc_debug_sv.h +++ b/include/f_pc/f_pc_debug_sv.h @@ -4,7 +4,7 @@ #include -#ifdef DEBUG +#if DEBUG char* fpcDbSv_getNameString(s16 i_name); diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h index c2058fbe8d..bc446b4c6e 100644 --- a/include/f_pc/f_pc_node_req.h +++ b/include/f_pc/f_pc_node_req.h @@ -36,7 +36,7 @@ typedef struct node_create_request { /* 0x58 */ s16 name; /* 0x5C */ void* data; /* 0x60 */ s16 unk_0x60; -#ifdef DEBUG +#if DEBUG /* 0x64 */ int unk_0x64; /* 0x68 */ int unk_0x68; #endif diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index d393afafcb..94d30ba83d 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -14,7 +14,7 @@ typedef struct standard_create_request_class { /* 0x54 */ void* process_append; /* 0x58 */ stdCreateFunc create_post_method; /* 0x5C */ void* unk_0x5C; -#ifdef DEBUG +#if DEBUG /* 0x60 */ int unk_0x60; #endif } standard_create_request_class; diff --git a/include/global.h b/include/global.h index dbd2d613bf..42990950e1 100644 --- a/include/global.h +++ b/include/global.h @@ -27,6 +27,11 @@ #define REGION_KOR (VERSION == VERSION_WII_KOR) #define REGION_CHN (VERSION == VERSION_SHIELD || VERSION == VERSION_SHIELD_PROD || VERSION == VERSION_SHIELD_DEBUG) +// define DEBUG if it isn't already so it can be used in conditions +#ifndef DEBUG +#define DEBUG 0 +#endif + #define ARRAY_SIZE(o) (s32)(sizeof(o) / sizeof(o[0])) #define ARRAY_SIZEU(o) (sizeof(o) / sizeof(o[0])) diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index f8b9519db4..7eecfbb87e 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -26,7 +26,7 @@ public: class mDoHIO_entry_c : public JORReflexible { public: -#ifdef DEBUG +#if DEBUG mDoHIO_entry_c(); void entryHIO(const char* i_name); void removeHIO(); @@ -73,7 +73,7 @@ void mDoHIO_updateChild(s8 i_no); void mDoHIO_deleteChild(s8 i_no); s8 mDoHIO_createChild(const char*, JORReflexible*); -#ifdef DEBUG +#if DEBUG #define mDoHIO_CREATE_CHILD(i_name, i_node) mDoHIO_createChild(i_name, i_node) #define mDoHIO_DELETE_CHILD(i_no) mDoHIO_deleteChild(i_no) #else diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index f005c5c9d7..1229687094 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -62,7 +62,7 @@ private: }; struct mDoMain { -#ifdef DEBUG +#if DEBUG static int argument; static int e3menu_no; static u32 archiveHeapSize; diff --git a/include/revolution/mtx.h b/include/revolution/mtx.h index bb1051f696..b6687e0c52 100644 --- a/include/revolution/mtx.h +++ b/include/revolution/mtx.h @@ -82,7 +82,7 @@ void PSMTXScaleApply(const Mtx src, Mtx dst, f32 xS, f32 yS, f32 zS); void PSMTXQuat(Mtx m, const Quaternion* q); void PSMTXReflect(Mtx m, const Vec* p, const Vec* n); -#ifdef DEBUG +#if DEBUG #define MTXIdentity C_MTXIdentity #define MTXCopy C_MTXCopy #define MTXConcat C_MTXConcat @@ -142,7 +142,7 @@ void PSMTXMultVecArray(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count) void PSMTXMultVecSR(const Mtx m, const Vec* src, Vec* dst); void PSMTXMultVecArraySR(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTXMultVec C_MTXMultVec #define MTXMultVecArray C_MTXMultVecArray #define MTXMultVecSR C_MTXMultVecSR @@ -181,7 +181,7 @@ void PSMTX44RotRad(Mtx44 m, char axis, f32 rad); void PSMTX44RotTrig(Mtx44 m, char axis, f32 sinA, f32 cosA); void PSMTX44RotAxisRad(Mtx44 m, const Vec* axis, f32 rad); -#ifdef DEBUG +#if DEBUG #define MTX44Identity C_MTX44Identity #define MTX44Copy C_MTX44Copy #define MTX44Concat C_MTX44Concat @@ -231,7 +231,7 @@ void PSMTX44MultVecArray(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 co void PSMTX44MultVecSR(const Mtx44 m, const Vec* src, Vec* dst); void PSMTX44MultVecArraySR(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 count); -#ifdef DEBUG +#if DEBUG #define MTX44MultVec C_MTX44MultVec #define MTX44MultVecArray C_MTX44MultVecArray #define MTX44MultVecSR C_MTX44MultVecSR @@ -284,7 +284,7 @@ void PSVECCrossProduct(const Vec* a, const Vec* b, Vec* axb); f32 PSVECSquareDistance(const Vec* a, const Vec* b); f32 PSVECDistance(const Vec* a, const Vec* b); -#ifdef DEBUG +#if DEBUG #define VECAdd C_VECAdd #define VECSubtract C_VECSubtract #define VECScale C_VECScale @@ -335,7 +335,7 @@ void PSQUATNormalize(const Quaternion* src, Quaternion* unit); void PSQUATInverse(const Quaternion* src, Quaternion* inv); void PSQUATDivide(const Quaternion* p, const Quaternion* q, Quaternion* r); -#ifdef DEBUG +#if DEBUG #define QUATAdd C_QUATAdd #define QUATSubtract C_QUATSubtract #define QUATMultiply C_QUATMultiply diff --git a/include/revolution/os.h b/include/revolution/os.h index 626c85d2f9..2ae31d5c5c 100644 --- a/include/revolution/os.h +++ b/include/revolution/os.h @@ -231,7 +231,7 @@ DECL_WEAK void OSVReport(const char* format, va_list list); DECL_WEAK void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); -#ifdef DEBUG +#if DEBUG #define OS_REPORT(...) OSReport(__VA_ARGS__) #define OS_WARNING(...) OSReport_Warning(__VA_ARGS__) #define OS_REPORT_ERROR(...) OSReport_Error(__VA_ARGS__) @@ -279,7 +279,7 @@ extern OSTime __OSStartTime; extern int __OSInIPL; extern BOOL __OSInReboot; -#ifdef DEBUG +#if DEBUG #define ASSERTLINE(line, cond) \ ((cond) || (OSPanic(__FILE__, line, "Failed assertion " #cond), 0)) @@ -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; diff --git a/include/revolution/types.h b/include/revolution/types.h index c077f05412..fc9c6f4315 100644 --- a/include/revolution/types.h +++ b/include/revolution/types.h @@ -73,6 +73,12 @@ typedef unsigned int uint; #endif #endif +#ifdef __MWERKS__ +#define __REGISTER register +#else +#define __REGISTER +#endif + #include #endif diff --git a/src/JSystem/J2DGraph/J2DMatBlock.cpp b/src/JSystem/J2DGraph/J2DMatBlock.cpp index 44a46bda16..b7e34c8338 100644 --- a/src/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/src/JSystem/J2DGraph/J2DMatBlock.cpp @@ -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); -} diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index 28fc413e69..8e430601b9 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -396,8 +396,3 @@ u8 J2DMaterialFactory::newDither(int param_0) const { } return 0; } - -J2DTevStage::J2DTevStage(J2DTevStageInfo const& param_0) { - setTevStageInfo(param_0); - setTevSwapModeInfo(j2dDefaultTevSwapMode); -} diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp index 870871a88a..8cfa46ff23 100644 --- a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -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; diff --git a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp index 8aeab2520f..4acd201eb0 100644 --- a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp @@ -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 */ diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/src/JSystem/J3DGraphBase/J3DTransform.cpp index 2e5473ebb8..890d40dee5 100644 --- a/src/JSystem/J3DGraphBase/J3DTransform.cpp +++ b/src/JSystem/J3DGraphBase/J3DTransform.cpp @@ -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 diff --git a/src/JSystem/JAudio2/JAISeq.cpp b/src/JSystem/JAudio2/JAISeq.cpp index bcde6d8734..cd42f1d70a 100644 --- a/src/JSystem/JAudio2/JAISeq.cpp +++ b/src/JSystem/JAudio2/JAISeq.cpp @@ -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; diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp index dee52c17d5..0f8f3ff12f 100644 --- a/src/JSystem/JAudio2/JASAiCtrl.cpp +++ b/src/JSystem/JAudio2/JASAiCtrl.cpp @@ -145,7 +145,7 @@ void JASDriver::updateDSP() { JASProbe::start(3, "SFR-UPDATE"); JASDsp::invalChannelAll(); - #ifdef DEBUG + #if DEBUG JASDsp::dspMutex = 1; #endif @@ -160,7 +160,7 @@ void JASDriver::updateDSP() { JUT_ASSERT(254, subFrame <= 10); history[subFrame - r26] = r27; if (subFrame != r26 && f32(history[0]) / r27 < 1.1f) { - #ifdef DEBUG + #if DEBUG static int killCounter; JASReport("kill DSP channel", killCounter); JASDSPChannel::killActiveChannel(); @@ -173,7 +173,7 @@ void JASDriver::updateDSP() { JASChannel::receiveBankDisposeMsg(); JASDSPChannel::updateAll(); - #ifdef DEBUG + #if DEBUG JASDsp::dspMutex = 0; #endif @@ -198,7 +198,7 @@ void JASDriver::readDspBuffer(s16* param_0, u32 param_1) { for (int i = param_1; i < param_1 * 2; i++) { sDspDacBuffer[sDspDacReadBuffer][i] = (s16)r24; } -#ifdef DEBUG +#if DEBUG JASReport("readDspBuffer nbuf:%d sWBuf:%d BCount:%d stat:%d", nbuf, sDspDacWriteBuffer, data_804507A8, sDspStatus); #endif diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp index 0f1efea56a..4d1a2f1d8b 100644 --- a/src/JSystem/JAudio2/JASDSPInterface.cpp +++ b/src/JSystem/JAudio2/JASDSPInterface.cpp @@ -659,6 +659,6 @@ u16 DSP_CreateMap2(u32 param_0) { u32 JASWaveInfo::one = 1; -#ifdef DEBUG +#if DEBUG s32 dspMutex = 1; #endif diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp index f0121ccefe..d244adb0c2 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp @@ -27,9 +27,7 @@ bool JASHeap::alloc(JASHeap* mother, u32 param_1) { JUT_ASSERT(120, mother != NULL); JASMutexLock lock(&mMutex); if (isAllocated()) { -#ifdef DEBUG - OSReport("[JASHeap::alloc] すでにヒープは確保されています。初期化してからにしてください。\n"); -#endif + OS_REPORT("[JASHeap::alloc] すでにヒープは確保されています。初期化してからにしてください。\n"); return 0; } if (!mother->isAllocated()) { @@ -71,9 +69,7 @@ bool JASHeap::alloc(JASHeap* mother, u32 param_1) { } } if (!local_43) { -#ifdef DEBUG - OSReport("[JASHeap::alloc] マザーメモリが足りないので確保できません。\n"); -#endif + OS_REPORT("[JASHeap::alloc] マザーメモリが足りないので確保できません。\n"); return 0; } mother->insertChild(this, local_30, local_34, param_1, false); diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 8af54f234b..08652656b0 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -143,9 +143,7 @@ cleanup: JKRFreeToSysHeap(mem); } if (mMountMode == 0) { -#ifdef DEBUG - OSReport(":::[%s: %d] Cannot alloc memory\n", __FILE__, 415); -#endif + OS_REPORT(":::[%s: %d] Cannot alloc memory\n", __FILE__, 415); if (mDvdFile != NULL) { delete mDvdFile; } diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 6f419b1a52..4c02d4ed8b 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -206,10 +206,8 @@ bool JKRCompArchive::open(s32 entryNum) { { JKRFreeToSysHeap(arcHeader); } - if(mMountMode == 0) { -#ifdef DEBUG - OSReport(":::[%s: %d] Cannot alloc memory in mounting CompArchive\n", __FILE__, 567); -#endif + if (mMountMode == 0) { + OS_REPORT(":::[%s: %d] Cannot alloc memory in mounting CompArchive\n", __FILE__, 567); if(mDvdFile != NULL) { delete mDvdFile; } diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index 03761ac322..de013a2834 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -127,9 +127,7 @@ cleanup: } if (mMountMode == UNKNOWN_MOUNT_MODE) { -#ifdef DEBUG - OSReport(":::Cannot alloc memory [%s][%d]\n", __FILE__, 397); -#endif + OS_REPORT(":::Cannot alloc memory [%s][%d]\n", __FILE__, 397); if (mDvdFile) { delete mDvdFile; } diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index 0f9404edc0..cabbbb3179 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -12,7 +12,7 @@ bool data_804508B0 = 1; -#ifdef DEBUG +#if DEBUG u8 data_804508B1; u8 data_804508B2; u8 data_804508B3; @@ -355,10 +355,8 @@ void JKRHeap::copyMemory(void* dst, void* src, u32 size) { } void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment) { -#ifdef DEBUG - OSReport("Error: Cannot allocate memory %d(0x%x)byte in %d byte alignment from %08x\n", size, + OS_REPORT("Error: Cannot allocate memory %d(0x%x)byte in %d byte alignment from %08x\n", size, size, alignment, heap); -#endif JUTException::panic(__FILE__, 831, "abort\n"); } diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 682e0ff283..4f75164161 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -94,7 +94,7 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio mIsOpen = true; } -#ifdef DEBUG +#if DEBUG if (mMountMode == 0) { OSReport(":::Cannot alloc memory [%s][%d]\n", __FILE__, 460); } diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index c2e159a8d7..a2424c9ca8 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/src/JSystem/JKernel/JKRSolidHeap.cpp @@ -73,7 +73,7 @@ s32 JKRSolidHeap::adjustSize(void) { } void* JKRSolidHeap::do_alloc(u32 size, int alignment) { -#ifdef DEBUG +#if DEBUG // TODO(Julgodis): JUTAssertion::setConfirmMessage /* if (alignment != 0) { int u = abs(alignment); @@ -179,7 +179,7 @@ void JKRSolidHeap::do_freeTail(void) { } void JKRSolidHeap::do_fillFreeArea() { -#ifdef DEBUG +#if DEBUG // fillMemory(mSolidHead, mEnd - mSolidHead, (uint)DAT_8074a8ba); #endif } diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index 2fe3104dcb..a884fcf615 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -185,10 +185,10 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) { next_heap = JKRHeap::getCurrentHeap(); } else if (JKRHeap::getRootHeap()->isSubHeap(next_heap)) { continue; -#ifdef DEBUG + #if PLATFORM_WII || PLATFORM_SHIELD } else if (!JKRHeap::getRootHeap2()->isSubHeap(next_heap)) { continue; -#endif + #endif } else { switch (thread->getCurrentHeapError()) { case 0: @@ -224,10 +224,8 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console const char* print_1 = " -------------------------------------\n"; if (!console) { -#ifdef DEBUG - OSReport(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); - OSReport(print_1); -#endif + OS_REPORT(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); + OS_REPORT(print_1); } else { console->clear(); console->print_f(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); @@ -264,10 +262,8 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console u32 cost_int = (u32)(cost_per_0x18 * 100.0f); u32 cost_float = (u32)(cost_per_0x18 * 1000.0f) % 10; if (!console) { -#ifdef DEBUG - OSReport(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, + OS_REPORT(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, cost_int, cost_float); -#endif } else { console->print_f(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, cost_int, cost_float); diff --git a/src/JSystem/JMath/JMath.cpp b/src/JSystem/JMath/JMath.cpp index ec60a65305..fe9a5c9cfd 100644 --- a/src/JSystem/JMath/JMath.cpp +++ b/src/JSystem/JMath/JMath.cpp @@ -19,10 +19,10 @@ void JMAEulerToQuat(s16 x, s16 y, s16 z, Quaternion* quat) { quat->z = sinZ * (cosX * cosY) - cosZ * (sinX * sinY); } -void JMAQuatLerp(register const Quaternion* p, register const Quaternion* q, f32 t, +void JMAQuatLerp(__REGISTER const Quaternion* p, __REGISTER const Quaternion* q, f32 t, Quaternion* dst) { - register f32 pxy, pzw, qxy, qzw; - register f32 dp; + __REGISTER f32 pxy, pzw, qxy, qzw; + __REGISTER f32 dp; #ifdef __MWERKS__ // clang-format off // compute dot product @@ -52,8 +52,8 @@ void JMAQuatLerp(register const Quaternion* p, register const Quaternion* q, f32 } } -void JMAFastVECNormalize(register const Vec* src, register Vec* dst) { - register f32 vxy, rxy, vz, length; +void JMAFastVECNormalize(__REGISTER const Vec* src, __REGISTER Vec* dst) { + __REGISTER f32 vxy, rxy, vz, length; #ifdef __MWERKS__ // clang-format off asm { psq_l vxy, 0(src), 0, 0 @@ -70,11 +70,11 @@ void JMAFastVECNormalize(register const Vec* src, register Vec* dst) { #endif // clang-format on } -void JMAVECScaleAdd(register const Vec* vec1, register const Vec* vec2, register Vec* dst, - register f32 scale) { - register f32 v1xy; - register f32 v2xy = scale; - register f32 rxy, v1z, v2z, rz; +void JMAVECScaleAdd(__REGISTER const Vec* vec1, __REGISTER const Vec* vec2, __REGISTER Vec* dst, + __REGISTER f32 scale) { + __REGISTER f32 v1xy; + __REGISTER f32 v2xy = scale; + __REGISTER f32 rxy, v1z, v2z, rz; #ifdef __MWERKS__ // clang-format off asm { psq_l v1xy, 0(vec1), 0, 0 @@ -90,11 +90,11 @@ void JMAVECScaleAdd(register const Vec* vec1, register const Vec* vec2, register #endif // clang-format on } -void JMAMTXApplyScale(register const Mtx src, register Mtx dst, register f32 xScale, - register f32 yScale, register f32 zScale) { - register f32 scale = yScale; - register f32 x, y, z; - register f32 normal = 1.0f; +void JMAMTXApplyScale(__REGISTER const Mtx src, __REGISTER Mtx dst, __REGISTER f32 xScale, + __REGISTER f32 yScale, __REGISTER f32 zScale) { + __REGISTER f32 scale = yScale; + __REGISTER f32 x, y, z; + __REGISTER f32 normal = 1.0f; #ifdef __MWERKS__ // clang-format off asm { // scale first 2 components diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp index ba8916e9a0..ff7500fdf2 100644 --- a/src/JSystem/JMessage/resource.cpp +++ b/src/JSystem/JMessage/resource.cpp @@ -243,7 +243,7 @@ bool JMessage::TParse::parseBlock_next(const void** ppData_inout, u32* puData_ou } } } else { - #ifdef DEBUG + #if DEBUG JMessage::TResource* pResource = rcResource.Get_groupID(u16GroupID); if (pResource != pResource_) { JGADGET_WARNMSG1(444, "group-ID already exist : ", u16GroupID); diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index c84ee0f76c..bb09bdb5f6 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -678,7 +678,7 @@ void TFunctionValue_list_parameter::data_set(const f32* pf, u32 u) { dat1.set(pfData_); dat2.set(&pfData_[uData_ * 2]); dat3 = dat1; -#ifdef DEBUG +#if DEBUG pfnUpdate_ = NULL; #endif } diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp index 6fde196a91..435c06e2aa 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -36,7 +36,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_prepare() { void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() { adaptor_object_begin_(); const JStage::TActor* pActor = get_pJSG_(); -#ifdef DEBUG +#if DEBUG { // This block is needed to match the stack in debug const JStudio::TObject* pObject = adaptor_getObject(); JUT_ASSERT(72, pObject!=NULL); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h index ea42bc41c9..bd4c0713a8 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h @@ -156,7 +156,7 @@ struct __copy_backward { static T* copy_backward(T* first, T* last, T* result) { -#ifdef DEBUG +#if DEBUG size_t n = static_cast(last - first); result -= n; memmove(result, first, n*sizeof(T)); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h index e03f7ee617..a72e809c18 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h @@ -89,7 +89,7 @@ int __fpclassifyl(long double __value); #define FLT_MAX_EXP 128 #define FLT_MAX_10_EXP 38 -#ifdef DEBUG +#if DEBUG #define FLT_MAX 3.4028235e38f #define FLT_EPSILON 1.1920929e-7f #else diff --git a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c b/src/PowerPC_EABI_Support/Runtime/Src/runtime.c index b8cebbc67d..639b69630c 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c +++ b/src/PowerPC_EABI_Support/Runtime/Src/runtime.c @@ -106,7 +106,7 @@ static const u32 __constants[] = { 0x00000000, 0x00000000, 0x41F00000, 0x00000000, 0x41E00000, 0x00000000, }; -asm u32 __cvt_fp2unsigned(register f64 d) +asm u32 __cvt_fp2unsigned(__REGISTER f64 d) { #ifdef __MWERKS__ // clang-format off nofralloc diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c index a589d74be3..63fc445363 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c @@ -90,10 +90,10 @@ DSError TRKInitializeTarget() { #define __dcbi(a, b) asm { dcbi a, b } #define __dcbfASM(a, b) asm { dcbf a, b } -void TRK__read_aram(register int c, register u32 p2, void* p3) { +void TRK__read_aram(__REGISTER int c, __REGISTER u32 p2, void* p3) { u32 err; int i; - register int counter; + __REGISTER int counter; u16 r; u32 g; u32 x; @@ -131,16 +131,16 @@ void TRK__read_aram(register int c, register u32 p2, void* p3) { } } -void TRK__write_aram(register int c, register u32 p2, void* p3) { +void TRK__write_aram(__REGISTER int c, __REGISTER u32 p2, void* p3) { u8 buff[32] ATTRIBUTE_ALIGN(32); u32 err; - register int count = c; - register u32 bf; + __REGISTER int count = c; + __REGISTER u32 bf; u32 uVar1; u32 size; u16 r; - register u32 g; - register int counter; + __REGISTER u32 g; + __REGISTER int counter; u32 i; if ((size_t)p2 < 0x4000 || p2 + *(u32*)p3 > 0x8000000) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c index 0a749db364..5c7afeaced 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c @@ -71,12 +71,12 @@ DSError TRKPPCAccessFPRegister(void* srcDestPtr, u32 fpr, BOOL read); DSError TRKPPCAccessSpecialReg(void* value, u32* access_func, BOOL read); static void TRKExceptionHandler(u16); void TRKInterruptHandlerEnableInterrupts(void); -void WriteFPSCR(register f64*); -void ReadFPSCR(register f64*); -void __TRK_set_MSR(register u32 msr); +void WriteFPSCR(__REGISTER f64*); +void ReadFPSCR(__REGISTER f64*); +void __TRK_set_MSR(__REGISTER u32 msr); u32 __TRK_get_MSR(); -void TRK_ppc_memcpy(register void* dest, register const void* src, register int n, - register u32 param_4, register u32 param_5); +void TRK_ppc_memcpy(__REGISTER void* dest, __REGISTER const void* src, __REGISTER int n, + __REGISTER u32 param_4, __REGISTER u32 param_5); void TRKRestoreExtended1Block(); void TRKUARTInterruptHandler(); @@ -827,7 +827,7 @@ asm u32 __TRK_get_MSR() { // clang-format on } -asm void __TRK_set_MSR(register u32) { +asm void __TRK_set_MSR(__REGISTER u32) { // clang-format off nofralloc mtmsr r3 @@ -835,8 +835,8 @@ asm void __TRK_set_MSR(register u32) { // clang-format on } -static asm void TRK_ppc_memcpy(register void* dest, register const void* src, register int n, - register u32 param_4, register u32 param_5) { +static asm void TRK_ppc_memcpy(__REGISTER void* dest, __REGISTER const void* src, __REGISTER int n, + __REGISTER u32 param_4, __REGISTER u32 param_5) { // clang-format off #define msr r8 #define byte r9 @@ -1113,7 +1113,7 @@ asm void TRKInterruptHandlerEnableInterrupts(void) { // clang-format on } -asm void ReadFPSCR(register f64*) { +asm void ReadFPSCR(__REGISTER f64*) { // clang-format off nofralloc stwu r1, -0x40(r1) @@ -1128,7 +1128,7 @@ asm void ReadFPSCR(register f64*) { // clang-format on } -asm void WriteFPSCR(register f64*) { +asm void WriteFPSCR(__REGISTER f64*) { // clang-format off nofralloc stwu r1, -0x40(r1) diff --git a/src/Z2AudioLib/Z2EnvSeMgr.cpp b/src/Z2AudioLib/Z2EnvSeMgr.cpp index 7bd284d543..0c6884b9a2 100644 --- a/src/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/src/Z2AudioLib/Z2EnvSeMgr.cpp @@ -4,7 +4,7 @@ #include "d/d_save.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG static const char* sSpotName[] = { "F_SP00", "F_SP103", @@ -1039,7 +1039,7 @@ void Z2EnvSeMgr::setHyrulSewerOpen(bool isSewerOpen) { } bool Z2EnvSeMgr::startRiverSe(s8 param_1) { - #ifdef DEBUG + #if DEBUG const char** spotName = sSpotName; #endif @@ -1271,7 +1271,7 @@ void Z2EnvSeMgr::registEtcSePos(Vec* posPtr) { } bool Z2EnvSeMgr::startEtcSe(s8 reverb) { - #ifdef DEBUG + #if DEBUG const char** spotName = sSpotName; #endif diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp index 91189b4fa3..6c1a917716 100644 --- a/src/Z2AudioLib/Z2SceneMgr.cpp +++ b/src/Z2AudioLib/Z2SceneMgr.cpp @@ -182,7 +182,6 @@ void Z2SceneMgr::setFadeInStart(u8 fadeType) { inGame = true; } -// NONMATCHING JSULink::getNext() inlining void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) { OS_REPORT("[Z2SceneMgr::setSceneName] spot = %s, room = %d, layer = %d\n", spot, room, layer); JAISoundID bgm_id = -1; @@ -1927,7 +1926,6 @@ void Z2SceneMgr::load2ndDynamicWave() { } } -// NONMATCHING - extra BGM_ID load void Z2SceneMgr::sceneBgmStart() { OS_REPORT("[Z2SceneMgr::sceneBgmStart] %08x\n", *(u32*)&BGM_ID); inGame = true; diff --git a/src/Z2AudioLib/Z2SeqMgr.cpp b/src/Z2AudioLib/Z2SeqMgr.cpp index 66848bcefd..390d6aa0b1 100644 --- a/src/Z2AudioLib/Z2SeqMgr.cpp +++ b/src/Z2AudioLib/Z2SeqMgr.cpp @@ -106,7 +106,7 @@ Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance(true) { mAllBgmMaster.forceIn(); field_0xa4.forceIn(); - #ifdef DEBUG + #if DEBUG field_0x00_debug = 1.0f; field_0x04_debug = 0; #endif diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 55ee845a30..fe0f981f1c 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -1690,7 +1690,7 @@ daAlinkHIO_c::daAlinkHIO_c() {} daAlinkHIO_wolf_c::~daAlinkHIO_wolf_c() {} -#ifdef DEBUG +#if DEBUG daAlinkHIO_swim_c::~daAlinkHIO_swim_c() {} daAlinkHIO_grab_c::~daAlinkHIO_grab_c() {} @@ -6573,10 +6573,10 @@ void daAlink_c::commonDoubleAnime(J3DAnmTransform* param_0, J3DAnmTransform* par int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB, daAlink_c::daAlink_ANM i_anmA, daAlink_c::daAlink_ANM i_anmB, int param_5, f32 i_morf) { -#ifdef DEBUG +#if DEBUG if (checkWolf()) { // "Player is Wolf, but setting Link animation\n" - OSReport("狼なのにリンクアニメ設定\n"); + OS_REPORT("狼なのにリンクアニメ設定\n"); JUT_ASSERT(8591, FALSE); } #endif @@ -10883,7 +10883,7 @@ int daAlink_c::orderZTalk() { dMeter2Info_onUseButton(0x800); if (midnaTalkTrigger() -#ifdef DEBUG +#if DEBUG && (!mDoCPd_c::getHoldL(PAD_1) || !mDoCPd_c::getHoldR(PAD_1)) #endif ) diff --git a/src/d/actor/d_a_alink_HIO.inc b/src/d/actor/d_a_alink_HIO.inc index 45a476364e..5174833128 100644 --- a/src/d/actor/d_a_alink_HIO.inc +++ b/src/d/actor/d_a_alink_HIO.inc @@ -7,7 +7,7 @@ #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG static void daAlinkHIO_setAnmGenMessage(daAlinkHIO_anm_c* i_anmP, JORMContext* ctx, char* param_3, f32 param_4, int param_5) { diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index 8892cf5fd8..f524aada1d 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -2145,7 +2145,7 @@ int daAlink_c::procCoGetItem() { } daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this); -#ifdef DEBUG +#if DEBUG if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM && fopAcM_GetName(item_partner_p) != PROC_Demo_Item) { @@ -3603,7 +3603,7 @@ int daAlink_c::procNotUseItem() { if (mProcVar3.field_0x300e != 0) { daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this); -#ifdef DEBUG +#if DEBUG if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM && fopAcM_GetName(item_partner_p) != PROC_Demo_Item) { diff --git a/src/d/actor/d_a_alink_hang.inc b/src/d/actor/d_a_alink_hang.inc index 6633b830f7..3c15747f8c 100644 --- a/src/d/actor/d_a_alink_hang.inc +++ b/src/d/actor/d_a_alink_hang.inc @@ -2533,9 +2533,9 @@ void daAlink_c::setRoofHangHandOnSE(cBgS_PolyInfo* unused) { int daAlink_c::checkRoofHangMovePos() { static const s16 offsetAngle[] = { 0x0000, - 0x8000, + -0x8000, 0x4000, - 0xC000, + -0x4000, }; if (field_0x2f98 >= 4) { diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 50bdb3455a..12d93d0b62 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_andsw.h" #include "d/d_procname.h" -#ifdef DEBUG +#if DEBUG daAndsw_HIO_c l_HIO; daAndsw_HIO_c::daAndsw_HIO_c() { @@ -42,7 +42,7 @@ int daAndsw_c::create() { return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG l_HIO.entryHIO("ＳＷ監視"); #endif @@ -58,7 +58,7 @@ int daAndsw_c::execute() { if (mTimer == 0) { fopAcM_offSwitch(this,mSwNo); -#ifdef DEBUG +#if DEBUG if (l_HIO.field_0x6 != 0) { OS_REPORT("-- ＳＷ監視状態出力 --\n"); OS_REPORT("sw<%d>ＯＦＦしました\n", mSwNo); @@ -70,19 +70,20 @@ int daAndsw_c::execute() { OS_REPORT("ＳＷ監視：ＳＷＯＦＦしたので処理終わりますSW<%d>\n", mSwNo); } } - } -#ifdef DEBUG - else if (l_HIO.field_0x6 != 0) { - OS_REPORT("sw2<%d>を待っています\n", mSwNo2); - l_HIO.field_0x6 = 0; - } + } else { +#if DEBUG + if (l_HIO.field_0x6 != 0) { + OS_REPORT("sw2<%d>を待っています\n", mSwNo2); + l_HIO.field_0x6 = 0; + } #endif + } return 1; } int daAndsw_c::_delete() { -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index 9a21a5755b..bc67ac8799 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -53,7 +53,7 @@ daB_BH_HIO_c::daB_BH_HIO_c() { down_revive_time = 250; } -#ifdef DEBUG +#if DEBUG void daB_BH_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel(" ボスデグババ手", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("本体サイズ", &model_size, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); @@ -962,17 +962,12 @@ static void damage_check(b_bh_class* i_this) { if (i_this->field_0xa24 != 0) { i_this->mCcSph.OffCoSetBit(); - if (fpcM_Search(s_b_sub, i_this) -#ifdef DEBUG - || mDoCPd_c::getTrigA(PAD_3) -#endif - ) - { + if (fpcM_Search(s_b_sub, i_this) || (DEBUG && mDoCPd_c::getTrigA(PAD_3))) { if (i_this->field_0xa25 != 0) { i_this->mAction = ACTION_B_BOMB_EAT; dComIfGs_onOneZoneSwitch(14, -1); } else { -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigA(PAD_3)) { b_bq_class* var_r25 = (b_bq_class*)fopAcM_SearchByID(a_this->parentActorID); var_r25->field_0x6fd = 1; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index f8737b9570..50ec729841 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -564,7 +564,7 @@ static void b_bq_wait(b_bq_class* i_this) { i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_WAIT, -1); } -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigRight(PAD_1)) { i_this->mAction = ACTION_END; i_this->mMode = 0; diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index b5dad17e5e..0a46a17e15 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -360,7 +360,7 @@ int daB_DR_c::draw() { return 1; } -#ifdef DEBUG +#if DEBUG if (WREG_S(0) != 0 || l_HIO.display_range) { cXyz sp24; cXyz sp18; @@ -1247,7 +1247,7 @@ void daB_DR_c::executeWait() { cXyz sp20; cXyz sp14; -#ifdef DEBUG +#if DEBUG dDbVw_Report(30, 100, "wait tyuu No Attack Timer:%d ", mTimer[2]); #endif @@ -1311,7 +1311,7 @@ void daB_DR_c::executeFlyWait() { fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz sp8; -#ifdef DEBUG +#if DEBUG if (mMoveMode > 1) { if (mTimer[2] != 0) { dDbVw_Report(30, 100, "wait tyuu No Attack Timer:%d ", mTimer[2]); @@ -1383,7 +1383,7 @@ void daB_DR_c::executeTailHit() { cXyz mae; cXyz ato; -#ifdef DEBUG +#if DEBUG if (mTimer[0] != 0) { if (mMoveMode < 13) { dDbVw_Report(30, 100, "Tail Hit chance Timer:%d ", mTimer[0]); @@ -1734,7 +1734,7 @@ void daB_DR_c::executeWeekHit() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz sp50; -#ifdef DEBUG +#if DEBUG if (mTimer[2] != 0) { dDbVw_Report(30, 100, "week HIT chance Timer:%d ", mTimer[2]); } @@ -2133,7 +2133,7 @@ void daB_DR_c::executeBreathAttack() { s16 spA = 0; bool sp8 = false; -#ifdef DEBUG +#if DEBUG if (mTimer[3] != 0) { if (mMoveMode < 100) { dDbVw_Report(30, 100, "Breath tyuu No Attack Timer:%d ", mTimer[3]); @@ -2366,7 +2366,7 @@ void daB_DR_c::executeWindAttack() { bool sp8 = 0; -#ifdef DEBUG +#if DEBUG dDbVw_Report(30, 100, "normal Timer:%d center Timer:%d ", mTimer[1], mTimer[2]); #endif @@ -2900,7 +2900,7 @@ void daB_DR_c::executePillarSearch() { } void daB_DR_c::executePillarWait() { -#ifdef DEBUG +#if DEBUG dDbVw_Report(30, 100, "Pole wait tyuu Timer:%d ", mTimer[0]); if (mTimer[1] != 0) { dDbVw_Report(30, 100, "sukosi zensin :%d ", mTimer[1]); diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 274b17c1c5..c7b21c7e9e 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -171,8 +171,7 @@ static daB_GM_HIO_c l_HIO; static int daB_GM_Draw(b_gm_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - #ifdef DEBUG - # else + #if !DEBUG g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr); #endif @@ -187,7 +186,7 @@ static int daB_GM_Draw(b_gm_class* i_this) { } J3DModel* model = i_this->mpModelMorf->getModel(); - #ifdef DEBUG + #if DEBUG g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr); #endif g_env_light.setLightTevColorType_MAJI(model, &a_this->tevStr); @@ -1618,7 +1617,7 @@ static int daB_GM_Execute(b_gm_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz spD4, spC8; - #ifdef DEBUG + #if DEBUG if (mDoCPd_c::getTrigA(2) && i_this->mDemoMode == 0 && !i_this->mIsDisappear) { i_this->mAction = 0xB; i_this->mMode = 0x14; diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 819bd88b85..0ada4dd212 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -2525,7 +2525,7 @@ static void action(b_gnd_class* i_this) { i_this->field_0xc7d = 0; } -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigR(PAD_2)) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); kankyo->wether = 1; diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 4c104b494d..32220b7988 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -416,7 +416,7 @@ static void core_start(b_ob_class* i_this) { } break; case 1: -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigY(PAD_2)) { i_this->mMode = 2; i_this->mDemoAction = 30; diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 430ddc32a4..92ad841bb3 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -68,7 +68,7 @@ daBd_HIO_c::daBd_HIO_c() { field_0x1E = 0; } -#ifdef DEBUG +#if DEBUG /* daBd_HIO_c::genMessage (JORMContext *) */ void daBd_HIO_c::genMessage(JORMContext* mctx) { mctx->genLabel("小鳥", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 2df6dde570..d69d589785 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -399,7 +399,7 @@ int daBg_c::draw() { break; } -#ifdef DEBUG +#if DEBUG sp50.a = 0xFF; if (g_kankyoHIO.navy.fish_pond_colreg_adjust_ON) { sp50 = g_kankyoHIO.navy.fish_pond_colreg_c0; diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index 2847607a5d..93e8359fdb 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -15,7 +15,7 @@ #include "JSystem/JAudio2/JAUSectionHeap.h" #include "Z2AudioLib/Z2Instances.h" -#ifdef DEBUG +#if DEBUG static BOOL l_debugMode; #endif @@ -616,7 +616,7 @@ int daCanoe_c::execute() { mOldFrontPos = mFrontPos; mOldBackPos = mBackPos; -#ifdef DEBUG +#if DEBUG if (player->checkCanoeRideOwn(this) && daAlink_c::checkDebugMoveInput()) { if (l_debugMode) { l_debugMode = FALSE; diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index c6ca933a7c..2cf5d224a0 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -156,7 +156,7 @@ int daCoach2D_c::create() { return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG l_HOSTIO.entryHIO("馬車アイコン"); #endif } @@ -166,7 +166,7 @@ int daCoach2D_c::create() { int daCoach2D_c::destroy() { dComIfG_resDelete(this, l_arcName); -#ifdef DEBUG +#if DEBUG l_HOSTIO.removeHIO(); #endif @@ -186,7 +186,7 @@ int daCoach2D_c::draw() { } int daCoach2D_c::execute() { -#ifdef DEBUG +#if DEBUG s32 freeSize = mDoExt_getCurrentHeap()->getTotalFreeSize(); #endif diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index f5cab16b26..3b611f5bba 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -18,7 +18,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "m_Do/m_Do_lib.h" #include "d/actor/d_a_movie_player.h" -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" #endif @@ -40,7 +40,7 @@ static UnknownLightData l_lightData = { 0x00000000, }; -#ifndef DEBUG +#if !DEBUG // TODO: what is this? static const u8 lit_3727[0xC] = {}; #endif @@ -113,7 +113,7 @@ void daDemo00_c::setBaseMtx() { if (tevStr.mInitTimer == 1) { field_0x574 = shape_angle; - #ifdef DEBUG + #if DEBUG debug_field_0x570 = current.pos; debug_field_0x57c = shape_angle; #endif @@ -388,7 +388,7 @@ int daDemo00_c::createHeap() { return 0; } - #ifdef DEBUG + #if DEBUG mModel.field_0x5d4->getBaseTRMtx()[0][0] = 1.0f; #endif mModel.field_0x5d4->calc(); @@ -1725,7 +1725,7 @@ int daDemo00_c::draw() { } } - #ifdef DEBUG + #if DEBUG if (field_0x6aa > -1) { dDbVw_Report(0x32, 0x91, "DEMOTOOL ERR : Model ga arunoni hisyakai sindo meirei!!!!"); OSReport_Error("\nDEMOTOOL ERR : Model ga arunoni hisyakai sindo meirei!!!!"); @@ -1754,7 +1754,7 @@ int daDemo00_c::draw() { g_env_light.mDemoAttentionPoint = -1.0f; } - #ifdef DEBUG + #if DEBUG dDbVw_Report(300, 0x19, "DEMO Depth %f", g_env_light.mDemoAttentionPoint); #endif } else { @@ -1769,7 +1769,7 @@ int daDemo00_c::draw() { g_env_light.field_0x1278 = 1.0f; } - #ifdef DEBUG + #if DEBUG dDbVw_Report(10, 0x17C, "\nbloom pat[%d] ratio[%f]", g_env_light.field_0x1278, field_0x6ab); #endif } diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 25807e3dea..4e6b70d020 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -20,7 +20,7 @@ static cXyz l_wolf_offset = cXyz(13.0f, 135.0f, 57.0f); static cXyz l_horse_offset = cXyz(0.0f, 20.0f, 54.0f); -#ifdef DEBUG +#if DEBUG class DitemHIO_c : public mDoHIO_entry_c diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index ea86c9a9ff..b6623e996e 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -23,7 +23,7 @@ public: STATIC_ASSERT(sizeof(daE_DF_HIO_c) == 0xC); -#ifdef DEBUG +#if DEBUG inline void daE_DF_HIO_c::genMessage(JORMContext* i_ctx) { i_ctx->genLabel("デクレシア", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); i_ctx->genSlider("速度", &field_0x8, 0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 382e1dc932..12695a2e6c 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -2581,7 +2581,7 @@ static void action(e_fm_class* i_this) { i_this->mAngleToPlayer = fopAcM_searchPlayerAngleY(actor); -#ifdef DEBUG +#if DEBUG if (mDoCPd_c::getTrigStart(PAD_2) && i_this->mAction != ACTION_DOWN) { i_this->mAction = ACTION_DOWN; i_this->mMode = 0; diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index 3b016fceea..1e1ba54ce3 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -47,7 +47,7 @@ daE_MB_HIO_c::daE_MB_HIO_c() { reappear_time = 70; } -#ifdef DEBUG +#if DEBUG void daE_MB_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel(" ボス戦ブーメラン猿", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("基本サイズ", &base_size, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index d1bc0f0533..123fe49ff4 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -68,7 +68,7 @@ daE_NZ_HIO_c::daE_NZ_HIO_c() { mVanishingAlphaSpeed = 30.0f; } -#ifdef DEBUG +#if DEBUG void daE_NZ_HIO_c::genMessage(JORMContext* ctx) { // Ghost Rat ctx->genLabel(" 幽霊ネズミ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index d8876d0974..0a73eadb50 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -89,7 +89,6 @@ int daE_PZ_c::draw() { } if (arg0 == 10) { -#ifdef DEBUG if (WREG_S(0) != 0) { GXColor color; color.r = 0xFF; @@ -98,7 +97,6 @@ int daE_PZ_c::draw() { color.a = 0xFA; dDbVw_drawCircleXlu(home.pos, 100.0f, color, TRUE, 12); } -#endif return 1; } diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 78d3e7d45a..2d3a5b6045 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -82,7 +82,7 @@ daE_WB_HIO_c::daE_WB_HIO_c() { mNoReins = 0; } -#ifdef DEBUG +#if DEBUG void daE_WB_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel(" イノシシ", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("基本サイズ", &base_size, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 107fcb863f..fb53e66cfa 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -163,7 +163,7 @@ daE_WW_HIO_c::daE_WW_HIO_c() { move_range_debug_display = 0; } -#ifdef DEBUG +#if DEBUG void daE_WW_HIO_c::genMessage(JORMContext* mctx) { mctx->genLabel("ホワイトウルフォス", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); mctx->genSlider("モデルサイズ", &model_size, 0.0f, 10.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); @@ -245,7 +245,7 @@ void daE_WW_c::setHeadAngle() { int daE_WW_c::draw() { if (mAction == ACTION_MASTER) { - #ifdef DEBUG + #if DEBUG if (l_HIO.move_range_debug_display != 0) { cXyz curr_pos = current.pos; curr_pos.y += 100.0f; diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index 8915a350eb..6bf2590e6a 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -942,7 +942,7 @@ static void kuki_ha_set(e_yd_class* i_this) { mDoMtx_stack_c::YrotM(rot->y); mDoMtx_stack_c::XrotM(rot->x); mDoMtx_stack_c::ZrotM(i << 13); -#ifdef DEBUG +#if DEBUG if (i_this->actor.current.pos.x == 1.0f && i_this->actor.current.pos.y == 1.0f && i_this->actor.current.pos.z == 1.0f) { diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 7294aacb8f..a583fb29d7 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -36,7 +36,7 @@ daE_YH_HIO_c::daE_YH_HIO_c() { mAttackFreq = 30; } -#ifdef DEBUG +#if DEBUG void daE_YH_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel(" デグババ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); ctx->genSlider("基本サイズ", &mBasicSize, 0.0f, 5.0f, 0, NULL, 0xffff, 0xffff, 0x200, diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index afab19879f..11e9670cdf 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -57,7 +57,7 @@ static u8 data_80807EF8; static daE_YK_HIO_c l_HIO; -#ifdef DEBUG +#if DEBUG void daE_YK_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel("闇キース", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("基本サイズ", &mModelScale, 0.0f, 3.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x512, 24); diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 4ac0bf2da6..c96dc6865e 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -929,9 +929,7 @@ void daE_YM_c::executeDown() { } else { gravity = 0.0f; } -#if DEBUG - OSReport("YM executeDown %d %f %f \n", gnd_cross, current.pos.z, mMode); -#endif + OS_REPORT("YM executeDown %d %f %f \n", gnd_cross, current.pos.z, mMode); field_0x6cf = 0; switch (mMode) { case 0: @@ -3355,10 +3353,8 @@ int daE_YM_c::create() { field_0x6a3 = (current.angle.x & 0xff00) >> 8; if (mSwitchBit != 0xFF && dComIfGs_isSwitch(mSwitchBit, fopAcM_GetRoomNo(this))) { -#ifdef DEBUG // E_YM won't reset because it's already been defeated. - OSReport("E_YM やられ後なので再セットしません\n"); -#endif + OS_REPORT("E_YM やられ後なので再セットしません\n"); return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 997517f4be..5cb4c8fcea 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -224,7 +224,7 @@ int daE_ZH_c::draw() { return 1; } - #ifdef DEBUG + #if DEBUG mBgc.DrawWall(dComIfG_Bgsp()); #endif @@ -1069,7 +1069,7 @@ void daE_ZH_c::executeOpenStart() { break; } - #ifdef DEBUG + #if DEBUG if (ZREG_S(0) == 0) { break; } diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index 8c62cfbeea..b2024a8620 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -949,12 +949,10 @@ cPhs__Step daE_ZM_c::create() { attention_info.distances[fopAc_attn_BATTLE_e] = 0; fopAcM_SetGroup(this, 0); - #ifdef DEBUG if (NREG_S(0) != 0) { fopAcM_SetMin(this, -20000.0f, -10000.0f, -10000.0f); fopAcM_SetMax(this, 20000.0f, 10000.0f, 10000.0f); } - #endif bitSw = 0xFF; bitSw2 = 0xFF; diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 797f4adfcc..ffca6690cd 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -560,6 +560,8 @@ BOOL daHorse_c::checkEnding() { #if DEBUG int l_debugMode; +#else +#define l_debugMode 0 #endif extern int g_horsePosInit; @@ -610,9 +612,7 @@ int daHorse_c::create() { m_offRideFlg = &daHorse_c::offRideFlgSubstance; if (daAlink_getAlinkActorClass()->checkHorseStart() || checkStateFlg0(FLG0_UNK_8000) || -#if DEBUG - g_horsePosInit || -#endif + (DEBUG && g_horsePosInit) || strcmp(dComIfGs_getHorseRestartStageName(), "") == 0 /* dSv_event_flag_c::M_002 - Cutscene - [cutscene: 2] Met with Ilia (brings horse to spring) */ @@ -4301,6 +4301,7 @@ int daHorse_c::execute() { l_debugMode = 1; } } +#endif if (l_debugMode) { f32 f31 = 50.0f; @@ -4318,140 +4319,136 @@ int daHorse_c::execute() { setMatrix(); m_model->calc(); setBodyPart(); - } else { // unsure of the best way to handle this jump -#endif - - animePlay(); - checkDemoAction(); - - (this->*m_proc)(); - - cXyz old_pos(current.pos); - f32 old_speedF = speedF; - speedF *= cM_scos(shape_angle.x); - - if (m_procID == PROC_JUMP_e) { - fopAcM_posMoveF(this, NULL); } else { - fopAcM_posMoveF(this, m_cc_stts.GetCCMoveP()); - if (m_cc_stts.GetCCMoveP()->abs() > 0.0001f) { - s16 old_shape_y = shape_angle.y; - s16 old_angle_y = current.angle.y; + animePlay(); + checkDemoAction(); - for (int i = 0; i < 8; i++) { - if (checkHorseNoMove(1) == 2) { - current.pos -= *m_cc_stts.GetCCMoveP(); - break; + (this->*m_proc)(); + + cXyz old_pos(current.pos); + f32 old_speedF = speedF; + speedF *= cM_scos(shape_angle.x); + + if (m_procID == PROC_JUMP_e) { + fopAcM_posMoveF(this, NULL); + } else { + fopAcM_posMoveF(this, m_cc_stts.GetCCMoveP()); + if (m_cc_stts.GetCCMoveP()->abs() > 0.0001f) { + s16 old_shape_y = shape_angle.y; + s16 old_angle_y = current.angle.y; + + for (int i = 0; i < 8; i++) { + if (checkHorseNoMove(1) == 2) { + current.pos -= *m_cc_stts.GetCCMoveP(); + break; + } + + shape_angle.y += (s16)0x2000; + current.angle.y = shape_angle.y; } - shape_angle.y += (s16)0x2000; - current.angle.y = shape_angle.y; - } - - shape_angle.y = old_shape_y; - current.angle.y = old_angle_y; - } - } - - speedF = old_speedF; - - m_cc_stts.ClrCcMove(); - f32 old_speed_y = speed.y; - - bgCheck(); - m_acch.CrrPos(dComIfG_Bgsp()); - - if (checkStateFlg0(FLG0_UNK_4000)) { - autoGroundHit(); - } else { - current.pos.y = old_pos.y; - speed.y = 0.0f; - } - - if (m_procID == PROC_TOOL_DEMO_e) { - J3DTransformInfo sp70; - m_mtxcalc->getAnm(0)->getTransform(0, &sp70); - - mDoMtx_stack_c::transS(old_pos); - mDoMtx_stack_c::YrotM(shape_angle.y); - - Vec sp54 = {0.0f, 0.0f, 0.0f}; - sp54.x = sp70.mTranslate.x; - f32 f28 = sp70.mTranslate.z; - sp54.z = f28; - - mDoMtx_stack_c::multVec(&sp54, ¤t.pos); - if (field_0x1730 != 0 && -G_CM3D_F_INF != m_acch.GetGroundH()) { - current.pos.y = m_acch.GetGroundH(); - } - } else if (m_procID == PROC_JUMP_e) { - speed.y = old_speed_y; - } - - if (checkStateFlg0(FLG0_UNK_1) && m_acch.ChkGroundHit() && checkStateFlg0(FLG0_UNK_2)) { - if (!checkStateFlg0(FLG0_UNK_1000)) { - dComIfGp_getVibration().StartQuake(VIBMODE_S_DOKUTT, 1, cXyz(0.0f, 1.0f, 0.0f)); - onStateFlg0(FLG0_UNK_1000); - } - } else if (checkStateFlg0(FLG0_UNK_1000)) { - dComIfGp_getVibration().StopQuake(0x1F); - offStateFlg0(FLG0_UNK_1000); - } - - setRoomInfo(0); - setMatrix(); - footBgCheck(); - setTailAngle(); - - m_model->calc(); - setBodyPart(); - - if (m_procID == PROC_TOOL_DEMO_e) { - cXyz sp48; - mDoMtx_multVec(m_model->getAnmMtx(0), &cXyz::BaseX, &sp48); - field_0x170e = cM_atan2s(-sp48.x, -sp48.z); - } else { - field_0x170e = shape_angle.y; - } - - cXyz sp3C; - cXyz sp30; - mDoMtx_multVecZero(m_model->getAnmMtx(0xB), &sp3C); - mDoMtx_multVecZero(m_model->getAnmMtx(0x14), &sp30); - sp30 -= sp3C; - - field_0x1712 = sp30.atan2sX_Z() - field_0x170e; - if (field_0x1712 > 0x2000) { - field_0x1712 = 0x2000; - } else if (field_0x1712 < -0x2000) { - field_0x1712 = -0x2000; - } - - if (checkResetStateFlg0(RFLG0_UNK_1)) { - mDoMtx_stack_c::transS(m_bodyEyePos.x, m_bodyEyePos.y, m_bodyEyePos.z); - mDoMtx_stack_c::YrotM(field_0x170e - field_0x1710); - mDoMtx_stack_c::transM(-field_0x17b8.x, -field_0x17b8.y, -field_0x17b8.z); - - daHorseRein_c* rein_p = m_rein; - cXyz* var_r26; - for (int i = 0; i < 3; i++, rein_p++) { - var_r26 = rein_p->field_0x0[0]; - for (int j = 0; j < rein_p->field_0x8[1]; j++, var_r26++) { - mDoMtx_stack_c::multVec(var_r26, var_r26); + shape_angle.y = old_shape_y; + current.angle.y = old_angle_y; } } - } - field_0x17b8 = m_bodyEyePos; + speedF = old_speedF; - m_sound.framework(m_poly_sound, m_reverb); + m_cc_stts.ClrCcMove(); + f32 old_speed_y = speed.y; - if (field_0x1144 != NULL) { - m_sound.updateAnime(field_0x1144->getFrame(), field_0x1144->getRate()); + bgCheck(); + m_acch.CrrPos(dComIfG_Bgsp()); + + if (checkStateFlg0(FLG0_UNK_4000)) { + autoGroundHit(); + } else { + current.pos.y = old_pos.y; + speed.y = 0.0f; + } + + if (m_procID == PROC_TOOL_DEMO_e) { + J3DTransformInfo sp70; + m_mtxcalc->getAnm(0)->getTransform(0, &sp70); + + mDoMtx_stack_c::transS(old_pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + + Vec sp54 = {0.0f, 0.0f, 0.0f}; + sp54.x = sp70.mTranslate.x; + f32 f28 = sp70.mTranslate.z; + sp54.z = f28; + + mDoMtx_stack_c::multVec(&sp54, ¤t.pos); + if (field_0x1730 != 0 && -G_CM3D_F_INF != m_acch.GetGroundH()) { + current.pos.y = m_acch.GetGroundH(); + } + } else if (m_procID == PROC_JUMP_e) { + speed.y = old_speed_y; + } + + if (checkStateFlg0(FLG0_UNK_1) && m_acch.ChkGroundHit() && checkStateFlg0(FLG0_UNK_2)) { + if (!checkStateFlg0(FLG0_UNK_1000)) { + dComIfGp_getVibration().StartQuake(VIBMODE_S_DOKUTT, 1, cXyz(0.0f, 1.0f, 0.0f)); + onStateFlg0(FLG0_UNK_1000); + } + } else if (checkStateFlg0(FLG0_UNK_1000)) { + dComIfGp_getVibration().StopQuake(0x1F); + offStateFlg0(FLG0_UNK_1000); + } + + setRoomInfo(0); + setMatrix(); + footBgCheck(); + setTailAngle(); + + m_model->calc(); + setBodyPart(); + + if (m_procID == PROC_TOOL_DEMO_e) { + cXyz sp48; + mDoMtx_multVec(m_model->getAnmMtx(0), &cXyz::BaseX, &sp48); + field_0x170e = cM_atan2s(-sp48.x, -sp48.z); + } else { + field_0x170e = shape_angle.y; + } + + cXyz sp3C; + cXyz sp30; + mDoMtx_multVecZero(m_model->getAnmMtx(0xB), &sp3C); + mDoMtx_multVecZero(m_model->getAnmMtx(0x14), &sp30); + sp30 -= sp3C; + + field_0x1712 = sp30.atan2sX_Z() - field_0x170e; + if (field_0x1712 > 0x2000) { + field_0x1712 = 0x2000; + } else if (field_0x1712 < -0x2000) { + field_0x1712 = -0x2000; + } + + if (checkResetStateFlg0(RFLG0_UNK_1)) { + mDoMtx_stack_c::transS(m_bodyEyePos.x, m_bodyEyePos.y, m_bodyEyePos.z); + mDoMtx_stack_c::YrotM(field_0x170e - field_0x1710); + mDoMtx_stack_c::transM(-field_0x17b8.x, -field_0x17b8.y, -field_0x17b8.z); + + daHorseRein_c* rein_p = m_rein; + cXyz* var_r26; + for (int i = 0; i < 3; i++, rein_p++) { + var_r26 = rein_p->field_0x0[0]; + for (int j = 0; j < rein_p->field_0x8[1]; j++, var_r26++) { + mDoMtx_stack_c::multVec(var_r26, var_r26); + } + } + } + + field_0x17b8 = m_bodyEyePos; + + m_sound.framework(m_poly_sound, m_reverb); + + if (field_0x1144 != NULL) { + m_sound.updateAnime(field_0x1144->getFrame(), field_0x1144->getRate()); + } } -#if DEBUG - } -#endif setEffect(); setCollision(); diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index 8ac983ac5a..a4d63f187f 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -60,7 +60,7 @@ static int daKytag14_Execute(kytag14_class* i_this) { if (event1_set == true && event2_unset == true && switch1_set == true && switch2_unset == true) { - #ifdef DEBUG + #if DEBUG if (!g_kankyoHIO.navy.display_save_location) { dDbVw_Report(20, 16, "TAG SavMem STAGE[%s] Room[%d] Lp[%d]", dComIfGp_getStartStageName(), i_this->mSaveRoomNo, i_this->mSavePoint); if (i_this->mSaveRoomNo == -1) { diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 518ab1fa56..a8a93278c5 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -808,7 +808,7 @@ static void __THPDecompressiMCURow512x448() { __THPInfo->dLC[2] += 0x800; } -static void __THPInverseDCTY8(register THPCoeff* in, register u32 xPos) { +static void __THPInverseDCTY8(__REGISTER THPCoeff* in, __REGISTER u32 xPos) { #ifdef __MWERKS__ register f32 *q, *ws; register f32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8, tmp9; @@ -1120,7 +1120,7 @@ static void __THPInverseDCTY8(register THPCoeff* in, register u32 xPos) { #endif } -static void __THPInverseDCTNoYPos(register THPCoeff* in, register u32 xPos) { +static void __THPInverseDCTNoYPos(__REGISTER THPCoeff* in, __REGISTER u32 xPos) { #ifdef __MWERKS__ register f32 *q, *ws; register f32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8, tmp9; @@ -1558,11 +1558,11 @@ static void __THPDecompressiMCURowNxN() { __THPInfo->dLC[2] += ((sizeof(u8) * 64) * (x / 16)); } -static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) { +static void __THPHuffDecodeDCTCompY(__REGISTER THPFileInfo* info, THPCoeff* block) { { - register s32 t; + __REGISTER s32 t; THPCoeff dc; - register THPCoeff diff; + __REGISTER THPCoeff diff; __dcbz((void*)block, 0); t = __THPHuffDecodeTab(info, Ydchuff); @@ -1572,13 +1572,13 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) if (t) { { - register s32 v; - register u32 cb; - register u32 cnt; - register u32 code; - register u32 tmp; - register u32 cnt1; - register u32 tmp1; + __REGISTER s32 v; + __REGISTER u32 cb; + __REGISTER u32 cnt; + __REGISTER u32 code; + __REGISTER u32 tmp; + __REGISTER u32 cnt1; + __REGISTER u32 tmp1; // clang-format off #ifdef __MWERKS__ asm { @@ -1637,13 +1637,13 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) } { - register s32 k; - register s32 code; - register u32 cnt; - register u32 cb; - register u32 increment; - register s32 tmp; - register THPHuffmanTab* h = Yachuff; + __REGISTER s32 k; + __REGISTER s32 code; + __REGISTER u32 cnt; + __REGISTER u32 cb; + __REGISTER u32 increment; + __REGISTER s32 tmp; + __REGISTER THPHuffmanTab* h = Yachuff; // clang-format off #ifdef __MWERKS__ @@ -1658,8 +1658,8 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) for (k = 1; k < 64; k++) { - register s32 ssss; - register s32 rrrr; + __REGISTER s32 ssss; + __REGISTER s32 rrrr; // clang-format off #ifdef __MWERKS__ @@ -1681,8 +1681,8 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) // clang-format on { - register u32 maxcodebase; - register u32 tmp2; + __REGISTER u32 maxcodebase; + __REGISTER u32 tmp2; _FailedCheckEnoughBits: cnt += 5; @@ -1827,8 +1827,8 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) goto _DoneDecodeTab; _Read4 : { - register u32 maxcodebase = (u32) & (h->maxCode); - register u32 tmp2; + __REGISTER u32 maxcodebase = (u32) & (h->maxCode); + __REGISTER u32 tmp2; // clang-format off #ifdef __MWERKS__ @@ -1860,9 +1860,9 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) _FailedCheckNoBits0: _FailedCheckNoBits1: _REALFAILEDCHECKNOBITS : { - register u32 mask = 0xFFFFFFFF << (33 - cnt); - register u32 tmp2; - register u32 tmp3; + __REGISTER u32 mask = 0xFFFFFFFF << (33 - cnt); + __REGISTER u32 tmp2; + __REGISTER u32 tmp3; code = (s32)(cb & (~mask)); mask = (u32) & (h->maxCode); @@ -1917,9 +1917,9 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) { k += ssss; { - register s32 v; - register u32 cnt1; - register u32 tmp1; + __REGISTER s32 v; + __REGISTER u32 cnt1; + __REGISTER u32 tmp1; // clang-format off #ifdef __MWERKS__ asm @@ -1992,12 +1992,12 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) } } -static s32 __THPHuffDecodeTab(register THPFileInfo* info, register THPHuffmanTab* h) { - register s32 code; - register u32 cnt; - register s32 cb; - register u32 increment; - register s32 tmp; +static s32 __THPHuffDecodeTab(__REGISTER THPFileInfo* info, __REGISTER THPHuffmanTab* h) { + __REGISTER s32 code; + __REGISTER u32 cnt; + __REGISTER s32 cb; + __REGISTER u32 increment; + __REGISTER s32 tmp; // clang-format off #ifdef __MWERKS__ @@ -2024,8 +2024,8 @@ _done: return code; { - register u32 maxcodebase; - register u32 tmp2; + __REGISTER u32 maxcodebase; + __REGISTER u32 tmp2; _FailedCheckEnoughBits: maxcodebase = (u32) & (h->maxCode); @@ -2134,8 +2134,8 @@ _FCEB_Done: return tmp; _Read4 : { - register u32 maxcodebase = (u32) & (h->maxCode); - register u32 tmp2; + __REGISTER u32 maxcodebase = (u32) & (h->maxCode); + __REGISTER u32 tmp2; // clang-format off #ifdef __MWERKS__ @@ -2215,8 +2215,8 @@ _FailedCheckNoBits0: _FailedCheckNoBits1: { - register u32 mask = 0xFFFFFFFF << (33 - cnt); - register u32 tmp2; + __REGISTER u32 mask = 0xFFFFFFFF << (33 - cnt); + __REGISTER u32 tmp2; code = (s32)(cb & (~mask)); mask = (u32) & (h->maxCode); @@ -2262,20 +2262,20 @@ _FailedCheckNoBits1: return (h->Vij[(s32)(code + h->valPtr[cnt])]); } -static void __THPHuffDecodeDCTCompU(register THPFileInfo* info, THPCoeff* block) { - register s32 t; - register THPCoeff diff; +static void __THPHuffDecodeDCTCompU(__REGISTER THPFileInfo* info, THPCoeff* block) { + __REGISTER s32 t; + __REGISTER THPCoeff diff; THPCoeff dc; - register s32 v; - register u32 cb; - register u32 cnt; - register u32 cnt33; - register u32 tmp; - register u32 cnt1; - register u32 tmp1; - register s32 k; - register s32 ssss; - register s32 rrrr; + __REGISTER s32 v; + __REGISTER u32 cb; + __REGISTER u32 cnt; + __REGISTER u32 cnt33; + __REGISTER u32 tmp; + __REGISTER u32 cnt1; + __REGISTER u32 tmp1; + __REGISTER s32 k; + __REGISTER s32 ssss; + __REGISTER s32 rrrr; __dcbz((void*)block, 0); t = __THPHuffDecodeTab(info, Udchuff); @@ -2406,20 +2406,20 @@ static void __THPHuffDecodeDCTCompU(register THPFileInfo* info, THPCoeff* block) } } -static void __THPHuffDecodeDCTCompV(register THPFileInfo* info, THPCoeff* block) { - register s32 t; - register THPCoeff diff; +static void __THPHuffDecodeDCTCompV(__REGISTER THPFileInfo* info, THPCoeff* block) { + __REGISTER s32 t; + __REGISTER THPCoeff diff; THPCoeff dc; - register s32 v; - register u32 cb; - register u32 cnt; - register u32 cnt33; - register u32 tmp; - register u32 cnt1; - register u32 tmp1; - register s32 k; - register s32 ssss; - register s32 rrrr; + __REGISTER s32 v; + __REGISTER u32 cb; + __REGISTER u32 cnt; + __REGISTER u32 cnt33; + __REGISTER u32 tmp; + __REGISTER u32 cnt1; + __REGISTER u32 tmp1; + __REGISTER s32 k; + __REGISTER s32 ssss; + __REGISTER s32 rrrr; __dcbz((void*)block, 0); t = __THPHuffDecodeTab(info, Vdchuff); diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 97cc372903..e3fa84cd84 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -13,7 +13,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_lib.h" -#ifdef DEBUG +#if DEBUG void daNpcT_cmnListenPropertyEvent(char* param_0, int* param_1, daNpcT_HIOParam* param_2) { sprintf(¶m_0[*param_1], "%.3ff,\t// 注目オフセット\n", param_2->attention_offset); *param_1 = strlen(param_0); diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index b7b0e12983..778f0c7efe 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -754,7 +754,7 @@ int daBaseNpc_moveBgActor_c::MoveBGCreate(char const* i_arcName, int i_dzbId, Mo return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG if (mpBgw != NULL && mpBgw->ChkUsed()) { BOOL isConnect = mDoCPd_c::isConnect(PAD_3); if (isConnect) { diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 0c2ee96844..6fea49bde1 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -447,7 +447,7 @@ void daNpcF_Lookat_c::initCalc(fopAc_ac_c* i_actor, Mtx i_baseTransformMtx, cXyz param_3[i].setall(0); param_3[i].x = -cM_atan2s(local_90.y, local_90.absXZ()); - #ifdef DEBUG + #if DEBUG if (i_debug) { f32 var_f31 = fabsf(cM_ssin(param_3[i].x)); OS_REPORT(">>>>>>>%d: sin(%d):%f\n", i, abs(param_3[i].x), var_f31); @@ -1905,9 +1905,9 @@ BOOL daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_actor_p) { if (dComIfGp_getAttention()->LockonTarget(i) == i_actor_p && dComIfGp_getAttention()->getActionBtnB() && (dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_TALK_e -#if DEBUG + #if !PLATFORM_GCN || dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_UNK_4 -#endif + #endif )) { ret = TRUE; diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 14b3341b8f..935dc6db6e 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -423,7 +423,7 @@ int daNpc_Aru_c::Draw() { } draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_Aru_c::test), #else FALSE, @@ -2018,11 +2018,8 @@ int daNpc_Aru_c::talk(void* param_1) { return 0; } -#ifdef DEBUG int daNpc_Aru_c::test(void* param_1) { - } -#endif static int daNpc_Aru_Create(void* a_this) { return static_cast(a_this)->create(); diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index c107a11d65..59e55c1cf9 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -1824,7 +1824,6 @@ int daNpc_Bans_c::shop(void* param_1) { return 0; } -#if DEBUG int daNpc_Bans_c::test(void* param_1) { int rv = 0; @@ -1848,7 +1847,6 @@ int daNpc_Bans_c::test(void* param_1) { return rv; } -#endif static int daNpc_Bans_Create(void* i_this) { return static_cast(i_this)->create(); diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 2e84caf79c..191ac9a8f3 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -279,7 +279,7 @@ enum Event { /* 0xC */ EVENT_CONVERSATION_ABOUT_ZORA, }; -#ifndef DEBUG +#if !DEBUG #endif @@ -538,7 +538,7 @@ daNpc_Besu_c::~daNpc_Besu_c() { mpCupModelMorf->stopZelAnime(); } -// #ifdef DEBUG +// #if DEBUG // if (field_0xe40 != NULL) { // field_0xe40->removeHIO(); // } @@ -631,7 +631,7 @@ int daNpc_Besu_c::create() { fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f); mSound.init(¤t.pos, &eyePos, 3, 1); -// #ifdef DEBUG +// #if DEBUG // field_0xe40 = &l_HIO; // // "Beth": // field_0xe40->entryHIO("ベス"); @@ -1248,14 +1248,14 @@ void daNpc_Besu_c::action() { } if (actor_p != NULL && mType != 5 -#ifndef DEBUG +#if !DEBUG && !chkNurse() #endif ) { mStagger.setParam(this, actor_p, mCurAngle.y); setDamage(0, 0xC, 0x12); // FIXME: Fakematch -#ifdef DEBUG +#if DEBUG mStagger.setPower(0.0f); #else for (int i = 0; i < 2; i++) { @@ -1268,7 +1268,7 @@ void daNpc_Besu_c::action() { if (mStagger.checkRebirth()) { // FIXME: Fakematch -#ifdef DEBUG +#if DEBUG mStagger.initialize(); #else for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 5271a16fc1..0fd2cc3734 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -2700,7 +2700,7 @@ cPhs__Step daNpcChat_c::Create() { mSound.init(¤t.pos, &eyePos, 3, 1); mSound.setMdlType(mType, false, mTwilight & 0xFF); - #ifdef DEBUG + #if DEBUG // mHIO = l_HIO; mHIO->entryHIO("多人数会話NPC"); #endif @@ -3065,7 +3065,7 @@ void daNpcChat_c::setParam() { } } - #ifdef DEBUG + #if DEBUG scale.set(daNpcChat_Param_c::m.common.scale, daNpcChat_Param_c::m.common.scale, daNpcChat_Param_c::m.common.scale); mAcchCir.SetWallR(daNpcChat_Param_c::m.common.width); mAcchCir.SetWallH(daNpcChat_Param_c::m.common.knee_length); diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index ad1c90cf8b..cacfe23527 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -284,7 +284,7 @@ int daNpcChin_c::Create() { mpHIO = &l_HIO; // "W Hook Shot Shop" mpHIO->entryHIO("Wフックショット屋"); -#endif + #endif mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length); diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index 01d043abc6..00c3eb5fdf 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -11,6 +11,12 @@ #include "d/actor/d_a_npc_henna.h" #include "Z2AudioLib/Z2Instances.h" +#if DEBUG +#define NPC_DF_HEAP_SIZE 0x4B000 +#else +#define NPC_DF_HEAP_SIZE 0x3B90 +#endif + static int daNpc_Df_Draw(npc_df_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor; df_s* df_p = i_this->mDfs; @@ -369,13 +375,7 @@ static cPhs__Step daNpc_Df_Create(fopAc_ac_c* i_this) { OS_REPORT("NPC_DF//////////////NPC_DF SET 1 !!\n"); - if ( - #if DEBUG - !fopAcM_entrySolidHeap(i_this, useHeapInit, 0x4B000) - #else - !fopAcM_entrySolidHeap(i_this, useHeapInit, 0x3B90) - #endif - ) { + if (!fopAcM_entrySolidHeap(i_this, useHeapInit, NPC_DF_HEAP_SIZE)) { OS_REPORT("//////////////NPC_DF SET NON !!\n"); return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 063d741c84..0bf2359a43 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -274,11 +274,14 @@ int daNpc_Doc_c::Draw() { mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]); } - #if DEBUG - return draw(chkAction(&daNpc_Doc_c::test), FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE); - #else - return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE); - #endif + return draw( +#if DEBUG + chkAction(&daNpc_Doc_c::test), +#else + FALSE, +#endif + FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE + ); } int daNpc_Doc_c::createHeapCallBack(fopAc_ac_c* i_this) { @@ -827,6 +830,10 @@ int daNpc_Doc_c::talk(void* param_0) { return 0; } +int daNpc_Doc_c::test(void* i_this) { + // DEBUG NONMATCHING +} + static int daNpc_Doc_Create(void* i_this) { return ((daNpc_Doc_c*)i_this)->create(); } diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index aeb2a1c8c8..66d5c726a5 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -834,7 +834,7 @@ void daNpcDoorBoy_c::setAttnPos() { sp28.y = current.pos.y; field_0xc98.SetC(sp28); - #ifdef DEBUG + #if DEBUG field_0xc98.SetH(daNpcDoorBoy_Param_c::m.common.height); field_0xc98.SetR(daNpcDoorBoy_Param_c::m.common.width); #endif diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index 93f40b34e0..be4f8be689 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -1239,7 +1239,6 @@ int daNpc_Fairy_c::talk(int param_1) { return 1; } -#if DEBUG int daNpc_Fairy_c::test(int param_1) { int rv = 0; @@ -1263,7 +1262,6 @@ int daNpc_Fairy_c::test(int param_1) { return rv; } -#endif void daNpc_Fairy_c::AppearDemoCall() { if (mType == TYPE_50F) { diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp index 3c3805dc17..0f58c48228 100644 --- a/src/d/actor/d_a_npc_fguard.cpp +++ b/src/d/actor/d_a_npc_fguard.cpp @@ -147,7 +147,7 @@ void daNpcFgd_c::checkGroundHeight() { } void daNpcFgd_c::setCollision() { - #ifdef DEBUG + #if DEBUG mCyl.SetR(Cd2_HIO_cylR(m_type)); mCyl.SetH(Cd2_HIO_cylH(m_type)); #endif diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index 4b43840afe..621dc26fe3 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -320,7 +320,7 @@ int daNpc_grMC_c::Execute() { int daNpc_grMC_c::Draw() { return draw( - #ifdef DEBUG + #if DEBUG chkAction(&daNpc_grMC_c::test), #else FALSE, @@ -737,7 +737,6 @@ int daNpc_grMC_c::shop(void* param_1) { return 0; } -#ifdef DEBUG int daNpc_grMC_c::test(void* param_1) { int rv = 0; @@ -749,8 +748,8 @@ int daNpc_grMC_c::test(void* param_1) { mMode = 2; // fallthrough case 2: - mFaceMotionSeqMngr.setNo(mHIO->param.common.face_expression, -1.0f, FALSE, 0); - mMotionSeqMngr.setNo(mHIO->param.common.motion, -1.0f, FALSE, 0); + mFaceMotionSeqMngr.setNo(mHIO->m.common.face_expression, -1.0f, FALSE, 0); + mMotionSeqMngr.setNo(mHIO->m.common.motion, -1.0f, FALSE, 0); mJntAnm.lookNone(0); attention_info.flags = 0; break; @@ -761,7 +760,6 @@ int daNpc_grMC_c::test(void* param_1) { return rv; } -#endif static int daNpc_grMC_Create(void* a_this) { return static_cast(a_this)->create(); diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 1e203b485f..c2619aa657 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -215,7 +215,7 @@ daNpc_grR_c::~daNpc_grR_c() { mAnm_p->stopZelAnime(); } - #ifdef DEBUG + #if DEBUG if (mHIO != NULL) { mHIO->removeHIO(); } diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index fbc4aea70a..f8beca273e 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -335,11 +335,7 @@ int daNpc_grS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { void daNpc_grS_c::setParam() { actionFunc oldAction = mpNextActionFn; -#if DEBUG - u32 flags = 0x42; -#else - u32 flags = 0xa; -#endif + u32 flags = fopAc_AttnFlag_TALK_e | fopAc_AttnFlag_SPEAK_e; selectAction(); diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index 1a282ca486..813ca5e215 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -528,7 +528,7 @@ static int daNpcGuard_Execute(void* i_this) { } void daNpcGuard_c::setCollision() { -#ifdef DEBUG +#if DEBUG mCyl.SetR(Cd2_HIO_cylR(m_type)); mCyl.SetH(Cd2_HIO_cylH(m_type)); #endif diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index dd342f124e..dd9cd849b5 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -396,11 +396,14 @@ int daNpc_Hoz_c::Draw() { modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]); } - #if DEBUG - return draw(chkAction(&daNpc_Hoz_c::test), FALSE, daNpc_Hoz_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE); - #else - return draw(FALSE, FALSE, daNpc_Hoz_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE); - #endif + return draw( +#if DEBUG + chkAction(&daNpc_Hoz_c::test), +#else + FALSE, +#endif + FALSE, daNpc_Hoz_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE + ); } int daNpc_Hoz_c::createHeapCallBack(fopAc_ac_c* actor) { @@ -824,6 +827,10 @@ BOOL daNpc_Hoz_c::drawDbgInfo() { return false; } +int daNpc_Hoz_c::test(void* i_this) { + // DEBUG NONMATCHING +} + int daNpc_Hoz_c::selectAction() { field_0xfac = NULL; diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 0757b6cdb9..7aefa40ac8 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -890,7 +890,7 @@ void daNpcKasiHana_c::setAttnPos() { mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; mCyl.SetC(sp28); - #ifdef DEBUG + #if DEBUG mCyl.SetH(mHIO->m.common.height); mCyl.SetR(mHIO->m.common.width); #endif diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 47e87fa936..60c4d24a07 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -417,7 +417,7 @@ void daNpcKasiKyu_c::setAttnPos() { mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; mCyl.SetC(sp28); - #ifdef DEBUG + #if DEBUG mCyl.SetH(daNpcKasiKyu_Param_c::m.common.height); mCyl.SetR(daNpcKasiKyu_Param_c::m.common.width); #endif diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index 365dcc81cb..d217e50df9 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -417,7 +417,7 @@ void daNpcKasiMich_c::setAttnPos() { mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; mCyl.SetC(sp28); - #ifdef DEBUG + #if DEBUG mCyl.SetH(daNpcKasiMich_Param_c::m.common.height); mCyl.SetR(daNpcKasiMich_Param_c::m.common.width); #endif diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index fd077d36ec..15a9b4e71e 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -4980,7 +4980,7 @@ int daNpc_Kn_c::setSlipPrtcl() { mDoMtx_stack_c::multVecZero(&mParticleMngr[0].mPos); mParticleMngr[0].mPos.y -= 20.0f; mParticleMngr[0].mAngle = current.angle; - #ifdef DEBUG + #if DEBUG mParticleMngr[0].mAngle.y -= (s16) 0x8000; #else mParticleMngr[0].mAngle.y -= 0x8000; @@ -4991,7 +4991,7 @@ int daNpc_Kn_c::setSlipPrtcl() { mDoMtx_stack_c::multVecZero(&mParticleMngr[1].mPos); mParticleMngr[1].mPos.y -= 20.0f; mParticleMngr[1].mAngle = current.angle; - #ifdef DEBUG + #if DEBUG mParticleMngr[1].mAngle.y -= (s16) 0x8000; #else mParticleMngr[1].mAngle.y -= 0x8000; diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index b25da3e05c..5a63a56ad8 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -1090,7 +1090,7 @@ void daNpc_Kolin_c::changeBck(int* param_1, int* param_2) { int daNpc_Kolin_c::selectAction() { mNextAction = NULL; -#ifdef DEBUG +#if DEBUG if (daNpc_Kolin_Param_c::m.common.debug_mode_ON) { mNextAction = &daNpc_Kolin_c::test; return 1; diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index 488a1bad91..72a428872a 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -590,7 +590,7 @@ int daNpc_Kolinb_c::drawDbgInfo() { int daNpc_Kolinb_c::selectAction() { mNextAction = NULL; -#ifdef DEBUG +#if DEBUG if (daNpc_Kolinb_Param_c::m.common.debug_mode_ON) { mNextAction = &daNpc_Kolinb_c::test; return 1; diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 7f5f79a424..1a4cf2b58c 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -608,7 +608,7 @@ void daNpc_Len_c::action() { if (mStagger.checkRebirth()) { // FIXME: Fakematch - same issue in npc_besu -#ifdef DEBUG +#if DEBUG mStagger.initialize(); #else for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index ddd7e999e8..13f879df14 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -1847,7 +1847,7 @@ void daNpcMoiR_c::setParam() { } } - #ifdef DEBUG + #if DEBUG scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale); mAcchCir.SetWallR(mpHIO->m.common.width); mAcchCir.SetWallH(mpHIO->m.common.knee_length); diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 385bbdd023..4c78c54d94 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -629,7 +629,7 @@ int daNpc_Pachi_Besu_c::Draw() { } return draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_Pachi_Besu_c::test), #else FALSE, @@ -1088,11 +1088,9 @@ BOOL daNpc_Pachi_Besu_c::talk(void* param_1) { return FALSE; } -#ifdef DEBUG BOOL daNpc_Pachi_Besu_c::test(void* param_1) { // DEBUG NONMATCHING } -#endif BOOL daNpc_Pachi_Besu_c::_turn_to_link(s16 param_1) { cXyz pos(*fopAcM_GetPosition_p(daPy_getPlayerActorClass())); diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index f12acc8ed2..f392fc6717 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -667,7 +667,7 @@ int daNpc_Pachi_Maro_c::Draw() { } return draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_Pachi_Maro_c::test), #else FALSE, diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 3e5d7c2a16..8b7c1cc658 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -917,7 +917,7 @@ int daNpc_Pachi_Taro_c::Draw() { } return draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_Pachi_Taro_c::test), #else FALSE, diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index f6b1269912..014c8d4466 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -311,10 +311,10 @@ int daNpc_Raca_c::Draw() { } draw( -#ifdef DEBUG +#if DEBUG chkAction(mAction), #else - 0, + FALSE, #endif FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE ); diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 49eac2f188..735152b035 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -312,7 +312,7 @@ int daNpc_Saru_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f); mSound.init(¤t.pos, &eyePos, 3, 1); - #ifdef DEBUG + #if DEBUG field_0xe90->entryHIO("サル"); // Monkey #endif reset(); @@ -552,7 +552,7 @@ void daNpc_Saru_c::setParam() { } void daNpc_Saru_c::setAfterTalkMotion() { - #ifdef DEBUG + #if DEBUG mFaceMotionSeqMngr.getNo(); #endif mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, 0, 0); diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index b6f10081f2..6c32627cf8 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -61,7 +61,7 @@ daNpc_seiC_c::~daNpc_seiC_c() { mpMorf[0]->stopZelAnime(); } - #ifdef DEBUG + #if DEBUG if (field_0xe40 != NULL) { field_0xe40->removeHIO(); } @@ -137,7 +137,7 @@ int daNpc_seiC_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); mSound.init(¤t.pos, &eyePos, 3, 1); -#ifdef DEBUG +#if DEBUG //field_0xe40->field_0x8 = &l_HIO; field_0xe40->entryHIO("光の精霊ｃ"); // Spirit of Light c #endif diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index 15cb2ff20e..431cac1c9a 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -61,7 +61,7 @@ daNpc_seiD_c::~daNpc_seiD_c() { mpMorf[0]->stopZelAnime(); } - #ifdef DEBUG + #if DEBUG if (field_0xe40 != NULL) { field_0xe40->removeHIO(); } @@ -137,7 +137,7 @@ int daNpc_seiD_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); mSound.init(¤t.pos, &eyePos, 3, 1); -#ifdef DEBUG +#if DEBUG //field_0xe40->field_0x8 = &l_HIO; field_0xe40->entryHIO("光の精霊ｄ"); // Spirit of Light d #endif diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 3ac9028e85..6d4f42c386 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -245,7 +245,7 @@ daNpc_Taro_c::~daNpc_Taro_c() { mpMorf[0]->stopZelAnime(); } - #ifdef DEBUG + #if DEBUG if (field_0xe40 != NULL) { field_0xe40->removeHIO(); } @@ -300,7 +300,7 @@ int daNpc_Taro_c::create() { mSound.init(¤t.pos, &eyePos, 3, 1); field_0x9c0.init(&mAcch, 0.0f, 0.0f); -#ifdef DEBUG +#if DEBUG // I'm unsure exactly how we're supposed to set + use the param ptr in the debug build... // field_0xe40 = &l_HIO; // field_0xe40->entryHIO("タロ"); @@ -894,7 +894,7 @@ void daNpc_Taro_c::action() { hitActor, mCurAngle.y); setDamage(0, 17, 33); - #ifdef DEBUG + #if DEBUG mStagger.setPower(0.0f); #else for (int i = 0; i < 2; i++) { @@ -906,7 +906,7 @@ void daNpc_Taro_c::action() { mJntAnm.lookNone(1); } if (mStagger.checkRebirth()) { - #ifdef DEBUG + #if DEBUG mStagger.initialize(); #else for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 1821b6a827..cdbfadc75b 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -1099,7 +1099,7 @@ static cPhs__Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) { l_HIO.field_0x4 = -1; } - #ifdef DEBUG + #if DEBUG fopAcM_OnStatus(a_this, 0); #endif diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index 9ce3e37e5a..ce20c8387b 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -2950,7 +2950,7 @@ void daNpcTks_c::setAttnPos() { if (!fopAcM_checkCarryNow(this)) { if (!field_0x138a) { mCyl.SetC(current.pos); - #ifdef DEBUG + #if DEBUG mCyl.SetH(daNpcTks_Param_c::m.common.height); mCyl.SetR(daNpcTks_Param_c::m.common.width); #endif diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 3599d0656e..e8ea58b0be 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -418,9 +418,10 @@ int daNpc_Toby_c::Draw() { #if DEBUG chkAction(&daNpc_Toby_c::test), #else - 0, + FALSE, #endif - 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0); + FALSE, mRealShadowSize, NULL, 100.0f, 0, 0, 0 + ); } int daNpc_Toby_c::createHeapCallBack(fopAc_ac_c* i_this) { @@ -2182,11 +2183,9 @@ int daNpc_Toby_c::talk(void*) { return 0; } -#if DEBUG int daNpc_Toby_c::test(void* param_0) { // TODO } -#endif static int daNpc_Toby_Create(void* i_this) { return static_cast(i_this)->create(); diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index 4c59f1667f..cba5eaa209 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -116,7 +116,7 @@ static void npc_worm_normal(npc_worm_class* i_this) { a_this->eventInfo.onCondition(dEvtCnd_40_e); } - #ifndef DEBUG + #if !DEBUG if (i_this->field_0x5e8[1] == 0) { i_this->field_0x5a6 = 2; i_this->field_0x5a8 = 0; diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 236f0f51e6..fe9655e2c3 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -930,7 +930,7 @@ void daNpcWrestler_c::setAttnPos() { if (chkAction(&daNpcWrestler_c::wait) || chkAction(&daNpcWrestler_c::talk)) { field_0xc90.SetC(sp68); -#ifdef DEBUG +#if DEBUG field_0xc90.SetH(field_0xbdc->field_0x0); field_0xc90.SetR(field_0xbdc->mWallR); #endif @@ -1909,7 +1909,7 @@ bool daNpcWrestler_c::talk(void* param_1) { setAction(&daNpcWrestler_c::gotoArena); } else { int choiceNo = mFlow.getChoiceNo(); -#ifdef DEBUG +#if DEBUG // "Choice %s\n", (choiceNo == 0) ? "Yes" : "No" OS_REPORT("二択分岐 %s\n", (choiceNo == 0) ? "はい" : "いいえ"); #endif @@ -3765,7 +3765,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { fopAcM_effSmokeSet1(&field_0xde8, &field_0xdec, &sp3c, NULL, 0.8f, &tevStr, 1); } -#ifdef DEBUG +#if DEBUG mDemoCam.field_0x18.set(0.0f, 0.0f, -100.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -3791,7 +3791,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { break; case 5: -#ifdef DEBUG +#if DEBUG mDemoCam.field_0x18.set(0.0f, 0.0f, -100.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -3852,7 +3852,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { dComIfGp_getVibration().StartShock(3, 15, cXyz(0.0f, 1.0f, 0.0f)); } -#ifdef DEBUG +#if DEBUG mDoMtx_stack_c::transS(fopAcM_GetPosition(daPy_getPlayerActorClass())); mDoMtx_stack_c::YrotM(fopAcM_GetShapeAngle_p(daPy_getPlayerActorClass())->y); mDoMtx_stack_c::transM(field_0xbd8->field_0xd0); @@ -3878,7 +3878,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { break; case 9: -#ifdef DEBUG +#if DEBUG mDoMtx_stack_c::transS(fopAcM_GetPosition(daPy_getPlayerActorClass())); mDoMtx_stack_c::YrotM(fopAcM_GetShapeAngle_p(daPy_getPlayerActorClass())->y); mDoMtx_stack_c::transM(field_0xbd8->field_0xdc); @@ -4700,7 +4700,7 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry(int i_cutIndex) { case '0009': if (setTalkAngle() && talkProc(NULL, TRUE, NULL)) { int choice_no = mFlow.getChoiceNo(); -#ifdef DEBUG +#if DEBUG // "Two-way split %s\n", (mFlow.getChoiceNo() == 0) ? "Yes" : "No" OS_REPORT("二択分岐 %s\n", (choice_no == 0) ? "はい" : "いいえ"); #endif @@ -4829,7 +4829,7 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry3_4(int i_cutIndex) { case '0001': if (setTalkAngle() && talkProc(NULL, TRUE, NULL)) { s16 choice_no = mFlow.getChoiceNo(); -#ifdef DEBUG +#if DEBUG char* choice; if (choice_no == 0) { choice = "はい"; diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 8b620aaa6a..390c94e71e 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -776,7 +776,7 @@ int daNpc_ykM_c::Draw() { } rv = draw( - #ifdef DEBUG + #if DEBUG chkAction(&daNpc_ykM_c::test), #else FALSE, @@ -3470,9 +3470,7 @@ BOOL daNpc_ykM_c::race(void* param_1) { angleY = cLib_targetAngleY(&field_0x14fc, &daPy_getPlayerActorClass()->current.pos); if (field_0x1560 < 0 || -#if DEBUG - field_0x1558.field_0x0 >= 0 && -#endif + (!DEBUG || field_0x1558.field_0x0 >= 0) && (field_0x14fc.abs2(daPy_getPlayerActorClass()->current.pos) < 640000.0f && (angleY < -0x4000 || angleY > 0x4000))) { field_0x1560 = -1; mGndChk.SetPos(&daPy_getPlayerActorClass()->current.pos); @@ -3695,7 +3693,6 @@ BOOL daNpc_ykM_c::talk(void* param_1) { return FALSE; } -#ifdef DEBUG BOOL daNpc_ykM_c::test(void* param_1) { int rv = FALSE; switch (mMode) { @@ -3718,7 +3715,6 @@ BOOL daNpc_ykM_c::test(void* param_1) { return rv; } -#endif static int daNpc_ykM_Create(void* i_this) { return ((daNpc_ykM_c*)i_this)->create(); diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 5b7bcb9274..db9f8bdb69 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -452,11 +452,14 @@ int daNpc_ykW_c::Draw() { modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]); } + result = draw( #if DEBUG - result = draw(chkAction(NULL), 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0); + chkAction(NULL), #else - result = draw(FALSE, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0); + FALSE, #endif + 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0 + ); if (field_0x1069 != 0) { fopAc_ac_c* actor = mActorMngrs[3].getActorP(); @@ -2982,7 +2985,6 @@ int daNpc_ykW_c::talk(void* param_0) { return 0; } -#if DEBUG int daNpc_ykW_c::test(void* param_0) { int retval = 0; @@ -3008,7 +3010,6 @@ int daNpc_ykW_c::test(void* param_0) { return retval; } -#endif static int daNpc_ykW_Create(void* i_this) { diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index cd1834497d..03285707f5 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -254,11 +254,14 @@ int daNpc_zanB_c::Draw() { mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]); } - #if DEBUG - return draw(chkAction(&daNpc_zanB_c::test), FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE); - #else - return draw(FALSE, FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE); - #endif + return draw( +#if DEBUG + chkAction(&daNpc_zanB_c::test), +#else + FALSE, +#endif + FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE + ); } int daNpc_zanB_c::createHeapCallBack(fopAc_ac_c* i_this) { diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index 90e2d58dd7..a80d0770bb 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -251,7 +251,7 @@ int daNpc_ZelRo_c::Draw() { } return draw( -#ifdef DEBUG +#if DEBUG chkAction(&daNpc_ZelRo_c::test), #else FALSE, @@ -626,12 +626,10 @@ int daNpc_ZelRo_c::talk(void* param_1) { return 0; } -#ifdef DEBUG int daNpc_ZelRo_c::test(void* param_1) { int rt = 0; return rt; } -#endif static int daNpc_ZelRo_Create(void* a_this) { return static_cast(a_this)->create(); diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 79070ef87d..b0f4cab482 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -313,11 +313,14 @@ int daNpc_Zelda_c::Draw() { modelData->getMaterialNodePointer(getEyeballRMaterialNo())->setMaterialAnm(mpMatAnm[1]); } + return draw( #if DEBUG - return draw(chkAction(NULL), TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE); + chkAction(NULL), #else - return draw(NULL, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE); + FALSE, #endif + TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE + ); } int daNpc_Zelda_c::createHeapCallBack(fopAc_ac_c* i_this) { diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index 60ae5611d0..b1fffc09ee 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -163,7 +163,7 @@ int daTurara_c::create() { fopAcM_setCullSizeBox2(this, mpModel[field_0x984]->getModelData()); setBaseMtx(); field_0x994 = 1; - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("つらら"); #endif } diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index 8d81ca3b03..9eed1d4c4b 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -31,7 +31,7 @@ daAmiShutter_HIO_c::daAmiShutter_HIO_c() { mWaitTime = 0; } -#ifdef DEBUG +#if DEBUG void daAmiShutter_HIO_c::genMessage(JORMContext* i_ctx) { i_ctx->genSlider("open速度", &mMaxOpenSpeed, 0.1f, 1000.0f, 0, NULL, 0xffff, 0xffff, 512, 24); @@ -102,7 +102,7 @@ cPhs__Step daAmiShutter_c::create() { init_modeWait(); } setBaseMtx(); - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("アミシャッター"); #endif } @@ -263,7 +263,7 @@ int daAmiShutter_c::Draw() { int daAmiShutter_c::Delete() { dComIfG_resDelete(&mPhaseReq, "S_Zami"); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 5ef55edd9d..910f90ac72 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -51,7 +51,7 @@ static bool l_HIOInit; static daObj_BattaHIO_c l_HIO; -#ifdef DEBUG +#if DEBUG void daObj_BattaHIO_c::genMessage(JORMContext* ctx) { // Golden bugs diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index aa68a2a6a5..af4d0ac41c 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -38,7 +38,7 @@ s16 const daObjBm_c::M_dir_base[4] = { 0xC000, }; -#ifdef DEBUG +#if DEBUG class daObjBm_HIO_c : public mDoHIO_entry_c { public: daObjBm_HIO_c(); @@ -391,7 +391,7 @@ int daObjBm_c::CreateHeap() { } mpBtkAnm->setFrame(mpBtkAnm->getEndFrame()); -#ifdef DEBUG +#if DEBUG pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0x18); JUT_ASSERT(840, pbtk != NULL); #endif @@ -447,8 +447,8 @@ int daObjBm_c::create1st() { return phase_state; } -#ifdef DEBUG OS_REPORT("新ビーモス：0x%x\n", fopAcM_GetParam(this)); +#if DEBUG l_HIO.entryHIO("ビーモス"); #endif } @@ -457,7 +457,7 @@ int daObjBm_c::create1st() { } int daObjBm_c::Execute(Mtx** param_0) { -#ifdef DEBUG +#if DEBUG scale.setall(l_HIO.mBodyScale); mpModel->setBaseScale(scale); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -1727,7 +1727,7 @@ int daObjBm_c::Draw() { return 1; } -#ifdef DEBUG +#if DEBUG void daObjBm_c::debugDraw() { if (l_HIO.mDebugDraw) { GXColor local_4c = { diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 13c8980ac9..a572152de7 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -1286,32 +1286,28 @@ int daObjCarry_c::CreateHeap() { int daObjCarry_c::create() { preInit(); -#ifdef DEBUG - if (prm_chk_type_lightball() && strcmp(dComIfGp_getStartStageName(), "T_ENE02") == 0) { - goto next; - } -#endif + if (!(DEBUG && prm_chk_type_lightball() && + strcmp(dComIfGp_getStartStageName(), "T_ENE02") == 0)) { + int create_phase; + create_phase = cPhs_NEXT_e; - int create_phase; - create_phase = cPhs_NEXT_e; + switch (mType) { + case TYPE_BALL_S: + create_phase = (cPhs__Step)checkCreate_LightBallA(); + break; + case TYPE_BALL_S_2: + create_phase = (cPhs__Step)checkCreate_LightBallB(); + break; + case TYPE_LV8_BALL: + create_phase = (cPhs__Step)checkCreate_Lv8Ball(); + break; + } - switch (mType) { - case TYPE_BALL_S: - create_phase = (cPhs__Step)checkCreate_LightBallA(); - break; - case TYPE_BALL_S_2: - create_phase = (cPhs__Step)checkCreate_LightBallB(); - break; - case TYPE_LV8_BALL: - create_phase = (cPhs__Step)checkCreate_Lv8Ball(); - break; + if (create_phase != cPhs_NEXT_e) { + return create_phase; + } } - if (create_phase != cPhs_NEXT_e) { - return create_phase; - } - -next: int phase_state = dComIfG_resLoad(&mPhaseReq, getArcName()); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, data().m_heapSize)) { @@ -1970,7 +1966,7 @@ int daObjCarry_c::draw() { } void daObjCarry_c::debugDraw() { -#ifdef DEBUG +#if DEBUG if (KREG_S(8) == 10000 && !mRotAxis.isZero()) { cXyz start(current.pos); start.y += 35.0f; diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index 3c8b4cf25c..6e7d602dc2 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -228,7 +228,7 @@ bool daObjCRVFENCE_c::checkViewArea(cXyz* param_1) { bool rv = false; bool bVar1 = false; - #ifdef DEBUG + #if DEBUG if (sp24.x >= 0.0f) { if (sp24.y <= FB_WIDTH) { bVar1 = true; diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index 59f07bf625..2bdbdf644a 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_damCps.h" -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" static daObjDamCps_HIO_c l_HIO; @@ -210,7 +210,7 @@ extern actor_process_profile_definition g_profile_Obj_DamCps = { 0, // mParameters &g_fopAc_Method.base, // sub_method 629, // mPriority -#ifdef DEBUG +#if DEBUG &l_daObjDamCps_Method, // sub_method #else NULL, // sub_method diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index d2b87753d4..318780b5e3 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -110,7 +110,7 @@ void daObjDigSnow_c::mode_init_dig() { if (gnd_height != -G_CM3D_F_INF) { mGroundHeight = gnd_height; } else { -#ifdef DEBUG +#if DEBUG // "No BG under digsnow!" OS_REPORT_ERROR("掘る雪の下にＢＧがありません！"); fopAcM_delete(this); diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index f8bee55fd7..cac20e8ce2 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -19,7 +19,7 @@ #include "d/actor/d_a_e_ymb.h" #include "f_op/f_op_camera_mng.h" -#ifdef DEBUG +#if DEBUG daObjDrop_HIO_c l_HIO; #endif @@ -215,7 +215,7 @@ int daObjDrop_c::modeNoParent() { parentActorID = fopAcM_GetID(pparent); setMode(MODE_PARENT_WAIT_e); } else { -#ifdef DEBUG +#if DEBUG if (!l_HIO.field_0x17) { // "Drop of Light: Waiting for Shadow Insect Creation! SW=%d\n" OS_REPORT("光の雫：闇虫生成待ち！SW=%d\n", getYmSwbit()); diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 0c92f80583..3387a97f3d 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -11,7 +11,7 @@ #include "d/d_debug_viewer.h" #include "d/d_procname.h" -#ifdef DEBUG +#if DEBUG daObjFallObj_HIO_c::daObjFallObj_HIO_c() { mMovementShake = 0; @@ -120,7 +120,7 @@ int daObjFallObj_c::create1st() { return phase; } - #ifdef DEBUG + #if DEBUG // Falling obj l_HIO.entryHIO("落下ＯＢＪ"); #endif @@ -363,7 +363,7 @@ int daObjFallObj_c::Draw() { mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); - #ifdef DEBUG + #if DEBUG if (l_HIO.mCheckDisplay) { mpBgW->CalcPlane(); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -381,7 +381,7 @@ int daObjFallObj_c::Delete() { mSoundObj.deleteObject(); dComIfG_resDelete(&mPhaseReq, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index 5e1c59e499..c7ae1b0070 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -13,7 +13,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG class daObjFlag2_Hio_c : public JORReflexible { public: daObjFlag2_Hio_c() { @@ -329,7 +329,7 @@ void daObjFlag2_c::create_init() { initBaseMtx(); initCollision(); - #ifdef DEBUG + #if DEBUG M_hio.ct(); #endif } @@ -449,7 +449,7 @@ int daObjFlag2_c::execute() { return 1; } - #ifdef DEBUG + #if DEBUG mFlagCloth.setSpringRate(attr().mSpringCoeeficient); mFlagCloth.setWindRate(attr().mWindCoefficient); mFlagCloth.setDecayRate(attr().mDecayRate); @@ -485,7 +485,7 @@ static int daObjFlag2_Delete(daObjFlag2_c* i_this) { } daObjFlag2_c::~daObjFlag2_c() { - #ifdef DEBUG + #if DEBUG M_hio.dt(); #endif diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 15bb4dd5d3..8f2683aa3a 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -352,7 +352,7 @@ int daObjFlag3_c::execute() { return 1; } - #ifdef DEBUG + #if DEBUG mFlagCloth.setSpringRate(attr().mSpringCoeeficient); mFlagCloth.setWindRate(attr().mWindCoefficient); mFlagCloth.setDecayRate(attr().mDecayRate); @@ -408,7 +408,7 @@ static int daObjFlag3_Delete(daObjFlag3_c* i_this) { } daObjFlag3_c::~daObjFlag3_c() { - #ifdef DEBUG + #if DEBUG M_hio.dt(); #endif @@ -445,7 +445,7 @@ void daObjFlag3_c::create_init() { mFlagCloth.setTornado(attr().mTornado); initBaseMtx(); - #ifdef DEBUG + #if DEBUG M_hio.ct(); #endif } diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 8caae93b2a..862aaab606 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -18,7 +18,7 @@ daObjGOMIKABE_HIO_c::daObjGOMIKABE_HIO_c() { mId = -1; } -#ifdef DEBUG +#if DEBUG void daObjGOMIKABE_HIO_c::genMessage(JORMContext* ctx) { // Zora Rock ctx->genLabel("ゾーラ岩", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 94ede76333..969073afda 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -125,7 +125,7 @@ int daGpTaru_c::create() { mExplosionRange = 80.0f; field_0x955 = 1; - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("火薬樽"); #endif } @@ -557,7 +557,7 @@ int daGpTaru_c::Delete() { dKyw_pntwind_cut(&mWind); dComIfG_resDelete(&mPhase, "K_ktar00"); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(this); #endif return 1; diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 3c69faf2c8..e4265578d5 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -12,7 +12,7 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/d_com_inf_actor.h" -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" #endif #include "d/d_msg_object.h" @@ -1468,7 +1468,7 @@ int daObj_GrA_c::talk(void* param_1) { } if (mMsgFlow.doFlow(this, NULL, 0) != 0) { - #ifdef DEBUG + #if DEBUG char* cVar1; int choiceNo = mMsgFlow.getChoiceNo(); if (choiceNo != 0) { diff --git a/src/d/actor/d_a_obj_gra2_base.inc b/src/d/actor/d_a_obj_gra2_base.inc index 74dc70b364..e697261016 100644 --- a/src/d/actor/d_a_obj_gra2_base.inc +++ b/src/d/actor/d_a_obj_gra2_base.inc @@ -62,7 +62,7 @@ int daObj_GrA_c::waitDemo(void* param_1) { } } } else { - #ifdef DEBUG + #if DEBUG if (mpHIO->m.field_0x8a) { fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); } else { @@ -79,7 +79,7 @@ int daObj_GrA_c::waitDemo(void* param_1) { break; case 2: - #ifdef DEBUG + #if DEBUG fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); #endif break; diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index 815ff867be..086487c869 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1858,7 +1858,7 @@ void daObj_GrA_c::calcCatchPos(f32 param_1, int param_2) { field_0x91a.y = shape_angle.y; } } else { - #ifdef DEBUG + #if DEBUG dDbVw_Report(100, 100, "pos.y = %f", sp9c.y - player->current.pos.y); #endif diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index e117a6fc2a..40b675c690 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -142,7 +142,7 @@ int daObjIceBlk_c::saveCurrentPos() { int nearest_point_no = 0; for (int i = 0; i < mpPath->m_num; i++) { -#ifdef DEBUG +#if DEBUG f32 dist = current.pos.absXZ(point->m_position); if (dist < nearest_dist) { nearest_point_no = i; @@ -279,7 +279,7 @@ int daObjIceBlk_c::Create() { mColdEffEmitters[i] = dComIfGp_particle_set(l_eff_id[i], ¤t.pos, &home.angle, &scale, 0xFF, NULL, -1, NULL, NULL, NULL); -#ifdef DEBUG +#if DEBUG if (mColdEffEmitters[i] == NULL) { // "Ice Block: Cold Effect set failed\n" OS_REPORT("氷ブロック：冷気エフェクトセット失敗\n"); diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index dbe2b89dfb..e749c6e56d 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -147,13 +147,13 @@ int daObjIkada_c::Execute(Mtx** mtx) { posY = fopAcM_wt_c::getWaterY(); } - #ifdef DEBUG + #if DEBUG field_0x5c4 = field_0x5c4 + (((TREG_S(1) + 0x350) + (HREG_F(1) + 2.0f)) * field_0x5a0 + field_0x5a4 * HREG_F(9)); #else field_0x5c4 = field_0x5c4 + (((HREG_F(1) + 2.0f) * field_0x5a0) + 848.0f) + field_0x5a4 * HREG_F(9); #endif - #ifdef DEBUG + #if DEBUG field_0x5c6 = field_0x5c6 + (((TREG_S(2) + 0x350) + (HREG_F(2) + 2.0f)) * field_0x5a0 + field_0x5a4 * HREG_F(9)); #else field_0x5c6 = field_0x5c6 + (((HREG_F(2) + 2.0f) * field_0x5a0) + 848.0f) + field_0x5a4 * HREG_F(9); diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index d5d4e019eb..234c330232 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -50,7 +50,7 @@ daObj_ItaMato_HIOParam const daObj_ItaMato_Param_c::m = { 20.0f, }; -#ifdef DEBUG +#if DEBUG daObj_ItaMato_HIO_c::daObj_ItaMato_HIO_c() { mAttr = daObj_ItaMato_Param_c::m; } @@ -117,7 +117,7 @@ static char* l_resName = "H_ItaMato"; daObj_ItaMato_c::~daObj_ItaMato_c() { OS_REPORT("|%06d:%x|daObj_ItaMato_c -> デストラクト\n", g_Counter.mCounter0, this); - #ifdef DEBUG + #if DEBUG if (mHIO != NULL) { mHIO->removeHIO(); } @@ -152,7 +152,7 @@ cPhs__Step daObj_ItaMato_c::create() { fopAcM_SetMtx(this, mpModels[health]->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -50.0f, -200.0f, 200.0f, 200.0f, 200.0f); - #ifdef DEBUG + #if DEBUG mHIO = &l_HIO; mHIO->entryHIO("板的"); #endif diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 7288d4985e..2f690791e4 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -245,7 +245,7 @@ int daItem_c::_daItem_create() { m_itemNo = daItem_prm::getItemNo(this); BOOL flag = dItem_data::chkFlag(m_itemNo, 2); -#ifdef DEBUG +#if DEBUG if (dItem_data::getFieldArc(m_itemNo) == NULL) { // "Item Num<%d>: No Resource Archive specified!!\n" OS_REPORT_ERROR("アイテム番号<%d>:リソースのアーカイブ指定がありません！！\n", m_itemNo); diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index c740bbd636..386514e0e5 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -524,7 +524,7 @@ void daObjKAM_c::Z_BufferChk() { } else { cameraHeight = 0.0f; } -#ifdef DEBUG +#if DEBUG #define Z_BUFFERCHK_X_MAX FB_WIDTH #define Z_BUFFERCHK_Y_MAX FB_HEIGHT #else @@ -779,7 +779,7 @@ int daObjKAM_c::create() { mDraw = true; } -#ifdef DEBUG +#if DEBUG #define DAOBJKAM_C_CREATE_DIST_INDEX fopAc_attn_ETC_e #else #define DAOBJKAM_C_CREATE_DIST_INDEX fopAc_attn_CARRY_e diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 5651ca72a8..31ec1836ea 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -39,7 +39,7 @@ static dCcD_SrcCyl l_ccDCyl = { static daObj_KBacket_Param_c l_HIO; static inline const daObj_KBacket_HIOParam* get_params(daObj_KBacket_c* i_this) { -#ifdef DEBUG +#if DEBUG return &i_this->mHIO->param; #else return &daObj_KBacket_Param_c::m; @@ -48,7 +48,7 @@ static inline const daObj_KBacket_HIOParam* get_params(daObj_KBacket_c* i_this) daObj_KBacket_c::~daObj_KBacket_c() { OS_REPORT("|%06d:%x|daObj_KBacket_c -> デストラクト\n", g_Counter.mCounter0, this); -#ifdef DEBUG +#if DEBUG if (mHIO != NULL) { mHIO->removeHIO(); } @@ -340,7 +340,7 @@ int daObj_KBacket_c::Execute() { field_0xa4a = 1; } else { if (mObjAcch.ChkGroundHit() != 0) { -#ifndef DEBUG +#if !DEBUG fopAcM_seStart(this, Z2SE_OBJ_WOODSTICK_BOUND, 0); #endif if (field_0x9d4.y < -30.0f) { @@ -359,7 +359,7 @@ int daObj_KBacket_c::Execute() { } else { if (field_0xa4a != 0) { if (mObjAcch.ChkGroundHit() != 0) { -#ifndef DEBUG +#if !DEBUG fopAcM_seStart(this, Z2SE_OBJ_WOODSTICK_BOUND, 0); #endif if (this->field_0x9d4.y < -30.0f) { @@ -376,7 +376,7 @@ int daObj_KBacket_c::Execute() { } } else { if (field_0xa49 != 0) { -#ifndef DEBUG +#if !DEBUG fopAcM_seStart(this, Z2SE_OBJ_WOODSTICK_PUT, 0); #endif } else { diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index ab857d9a14..05e30dd828 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -15,7 +15,7 @@ daObj_Kbox_HIO_c::daObj_Kbox_HIO_c() { mWidth = 2.0f; } -#ifdef DEBUG +#if DEBUG void daObj_Kbox_HIO_c::genMessage(JORMContext* ctx) { // Skull fish wooden box ctx->genLabel("　スカル魚木箱　", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 9f1de606f2..1af514b6ee 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -259,9 +259,7 @@ int daObjKGate_c::Create() { l_cull_box.max.y, l_cull_box.max.z); if (dComIfG_Bgsp().Regist(mpBgW, this)) { -#ifdef DEBUG - OSReport_Error("キコルの門：ＢＧ登録失敗しました\n"); -#endif + OS_REPORT_ERROR("キコルの門：ＢＧ登録失敗しました\n"); return 0; } @@ -336,7 +334,7 @@ int daObjKGate_c::create1st() { phase_state = MoveBGCreate(l_arcName[mNameArg], l_gateDzbIdx[mNameArg], NULL, heap_size, NULL); if (phase_state == cPhs_ERROR_e) { -#ifdef DEBUG +#if DEBUG OSReport("KGATE PARAM:%x\n", fopAcM_GetParam(this)); #endif return phase_state; @@ -956,9 +954,7 @@ int daObjKGate_c::Draw() { int daObjKGate_c::Delete() { if (mpBgW != NULL && mpBgW->ChkUsed()) { if (dComIfG_Bgsp().Release(mpBgW)) { -#ifdef DEBUG - OSReport("Release Error\n"); -#endif + OS_REPORT("Release Error\n"); } } diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 1a2dc43615..7c52cd9edd 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -18,7 +18,7 @@ daObj_Kita_HIO_c::daObj_Kita_HIO_c() { mSwingRange = 0.6f; } -#ifdef DEBUG +#if DEBUG void daObj_Kita_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel("　 風で動く連続板", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); // Model Size X diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index ab92c2a56d..8476751b42 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -27,7 +27,7 @@ struct daObjKLift00_HIO_c : public mDoHIO_entry_c { /* 0x1C */ f32 field_0x1C; }; -#ifdef DEBUG +#if DEBUG static daObjKLift00_HIO_c l_HIO; daObjKLift00_HIO_c::daObjKLift00_HIO_c() { @@ -102,7 +102,7 @@ static dCcD_SrcCyl l_cc_cyl_src = { } // mCyl }; -#ifdef DEBUG +#if DEBUG static const int l_dzbidx[] = {9}; #endif @@ -128,7 +128,7 @@ cPhs__Step daObjKLift00_c::create1st() { } // "Foothold(Lv3)" - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("足場(Lv3)"); #endif @@ -328,7 +328,7 @@ int daObjKLift00_c::Execute(Mtx** i_mtx) { // Check if player hit chains, and play sfx & move the chains accordingly bool playedHitSfx = false; - #ifdef DEBUG + #if DEBUG for(int i = 0; i < 8; i++) { const s32 currentChainIdx = (mNumChains - 1) - (i * 2); if(currentChainIdx >= 0 && mChainSphereColliders[i].ChkTgHit() ) { @@ -461,7 +461,7 @@ int daObjKLift00_c::Draw() { int daObjKLift00_c::Delete() { dComIfG_resDelete(this, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index 7d2230c1ea..1bd2b6711f 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -270,7 +270,7 @@ int daObjKshtr_c::CreateHeap() { } } - #ifdef DEBUG + #if DEBUG if (checkKey() != 0) { mIsCheckKey = true; } @@ -320,7 +320,7 @@ cPhs__Step daObjKshtr_c::phase_0() { mType = getType() + 1; mSwNo = getSwNo(); - #ifdef DEBUG + #if DEBUG if (mSwNo == 0xFF) { OS_REPORT_ERROR("鍵付き壁ドア：スイッチ指定がありません\n"); // Locked wall door: No switch specification return cPhs_ERROR_e; @@ -329,7 +329,7 @@ cPhs__Step daObjKshtr_c::phase_0() { initKey(); #endif - #ifdef DEBUG + #if DEBUG if (mType >= 6) { OS_REPORT_ERROR("鍵付き壁ドア：引数０のタイプ指定が不正値です\n"); // Locked wall door: The type specification for argument 0 is invalid @@ -835,7 +835,7 @@ void daObjKshtr_c::anmInit() { JUT_ASSERT(1278, anm != NULL); - #ifdef DEBUG + #if DEBUG if (!mpBckAnm->init(anm, 1, 0, 1.0f, 0, -1, true)) { JUT_ASSERT(1281, FALSE); diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index a0eed328d5..7512f46ad1 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -17,7 +17,7 @@ static int daObjKWheel00_MoveBGDelete(daObjKWheel00_c*); static int daObjKWheel00_MoveBGExecute(daObjKWheel00_c*); static int daObjKWheel00_MoveBGDraw(daObjKWheel00_c*); -#ifdef DEBUG +#if DEBUG static daObjKWheel00_HIO_c l_HIO; daObjKWheel00_HIO_c::daObjKWheel00_HIO_c() { @@ -54,7 +54,7 @@ int daObjKWheel00_c::create1st() { if(phase == cPhs_ERROR_e) return phase; - #ifdef DEBUG + #if DEBUG // "Water wheel(Lv3)" l_HIO.entryHIO("水車(Lv3)"); #endif @@ -135,7 +135,7 @@ int daObjKWheel00_c::Create() { mZAngularVelocity = 0; if(getSwNo() != 0xFF && fopAcM_isSwitch(this, getSwNo())) { - #ifdef DEBUG + #if DEBUG if(getArg0()) mZAngularVelocity = l_HIO.mTargetZAngularSpeed; else @@ -192,7 +192,7 @@ int daObjKWheel00_c::Execute(Mtx** i_mtx) { // Only draw particles and play SFX if gear is moving if(mZAngularVelocity != 0) { // Increase angular velocity via an arithmetic sequence with a ratio of 2 - #ifdef DEBUG + #if DEBUG if(mZAngularVelocity > 0) { if(mZAngularVelocity < l_HIO.mTargetZAngularSpeed) mZAngularVelocity += l_HIO.mZAngularAcceleration; @@ -324,7 +324,7 @@ int daObjKWheel00_c::Draw() { int daObjKWheel00_c::Delete() { dComIfG_resDelete(this, l_arcName[m_type]); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index da0700171a..a786bb5312 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -28,7 +28,7 @@ static const char* l_arcName = "K_Wheel01"; // Likely to have been a macro; matches for loop at beginning of create1st for both debug and retail, despite retail only calling getArg4567() #define CHECK_KLIFT_EXISTS(kLiftNum) (!((1 << kLiftNum) & getArg4567())) -#ifdef DEBUG +#if DEBUG static daObjKWheel01_HIO_c l_HIO; daObjKWheel01_HIO_c::daObjKWheel01_HIO_c() { @@ -94,7 +94,7 @@ cPhs__Step daObjKWheel01_c::create1st() { } } - #ifdef DEBUG + #if DEBUG // "Pulley(Lv3)" l_HIO.entryHIO("滑車(Lv3)"); #endif @@ -163,7 +163,7 @@ int daObjKWheel01_c::Create() { fopAcM_SetMtx(this, mTransformMtx); if(getSwNo() != 0xFF && fopAcM_isSwitch(this, getSwNo())) { - #ifdef DEBUG + #if DEBUG if(getArg0()) { mYAngularVelocity = l_HIO.mTargetYAngularSpeed; } @@ -208,7 +208,7 @@ int daObjKWheel01_c::Execute(Mtx** i_mtx) { shape_angle.y = current.angle.y; if(current.angle.y != old.angle.y) { - #ifdef DEBUG + #if DEBUG mYAngularVelocity = l_HIO.mTargetYAngularSpeed; #else mYAngularVelocity = 64; @@ -230,7 +230,7 @@ int daObjKWheel01_c::Execute(Mtx** i_mtx) { } if(mYAngularVelocity != 0) { - #ifdef DEBUG + #if DEBUG if(mYAngularVelocity > 0) { if(mYAngularVelocity < l_HIO.mTargetYAngularSpeed) mYAngularVelocity += l_HIO.mYAngularAcceleration; @@ -299,7 +299,7 @@ int daObjKWheel01_c::Draw() { int daObjKWheel01_c::Delete() { dComIfG_resDelete(this, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif @@ -312,7 +312,7 @@ int daObjKWheel01_c::Delete() { } bool daObjKWheel01_c::eventStart() { - #ifdef DEBUG + #if DEBUG if(getArg0()) mYAngularVelocity = l_HIO.mYAngularAcceleration; else diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index dc3847cc74..35a2ca0ef3 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -32,7 +32,7 @@ daLv3Water2_HIO_c::daLv3Water2_HIO_c() { mLevelControlWaitFrames = 0; } -#ifdef DEBUG +#if DEBUG void daLv3Water2_HIO_c::genMessage(JORMContext* ctx) { ctx->genSlider("wait time", &mLevelControlWaitFrames, 0, 255, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); } @@ -120,7 +120,7 @@ cPhs__Step daLv3Water2_c::create() { mMode = WAIT; // "LV3 Water surface (2SW)" - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("ＬＶ３水面(2SW)"); #endif } @@ -237,7 +237,7 @@ int daLv3Water2_c::Draw() { int daLv3Water2_c::Delete() { dComIfG_resDelete(&mPhase, l_resNameIdx[mResourceIndex]); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index 7a7f692324..a4cc3b7526 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -12,7 +12,7 @@ #include "d/d_cc_d.h" #include "d/d_cc_uty.h" -#ifdef DEBUG +#if DEBUG class daObjLv4Chan_HIO_c : public mDoHIO_entry_c { public: daObjLv4Chan_HIO_c(); @@ -70,7 +70,7 @@ int daObjLv4Chan_c::create1st() { return rv; } - #ifdef DEBUG + #if DEBUG // “Chandelier (Lv4)” l_HIO.entryHIO("シャンデリア(Lv4)"); #endif diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index d01616f31f..e846622e57 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -107,7 +107,7 @@ void daObjL4DigSand_c::mode_init_dig() { if (gnd_y != -G_CM3D_F_INF) { mGroundY = gnd_y; } else { -#ifdef DEBUG +#if DEBUG // "No BG below dig-sand!" OS_REPORT_ERROR("掘れる砂の下にＢＧがありません！"); fopAcM_delete(this); diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index 7f600e3300..f048c74f21 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -184,7 +184,7 @@ int daObjL6Bm_c::CreateHeap() { return 0; } - #ifdef DEBUG + #if DEBUG pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOBEAM_OFF); JUT_ASSERT(660, pbtk != NULL); #endif diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index 05763a1495..7711f18f5b 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -201,7 +201,7 @@ int daObjLv6Bm_c::Create() { } } - #ifdef DEBUG + #if DEBUG if (mEyeMaterial == NULL) { OS_REPORT("Lv6ビーモス：目のマテリアル<%s>がありません\n", l_eye_matName); // Lv6 Beamos: Eye material <%s> is not available. return 0; @@ -248,7 +248,7 @@ int daObjLv6Bm_c::CreateHeap() { return 0; } - #ifdef DEBUG + #if DEBUG pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, BRK_BM6_TURN); JUT_ASSERT(644, pbrk != NULL); #endif @@ -275,7 +275,7 @@ int daObjLv6Bm_c::CreateHeap() { } mpBtkAnm->setFrame(mpBtkAnm->getEndFrame()); - #ifdef DEBUG + #if DEBUG pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOL6_ON); JUT_ASSERT(693, pbtk != NULL); #endif diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index af4fe5615a..92484685f7 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -99,7 +99,7 @@ int daObjLv6SwTurn_c::CreateHeap() { return TRUE; } -#ifdef DEBUG +#if DEBUG static daObjLv6SwTurn_HIO_c l_HIO; #endif diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index 8c75554859..a4f09b2d49 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_magLiftRot.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -#ifdef DEBUG +#if DEBUG #include "m_Do/m_Do_hostIO.h" #endif #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index bfff9235e6..69baaea558 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -37,7 +37,7 @@ dCcD_SrcCps l_cps_src = { } // mCpsAttr }; -#ifdef DEBUG +#if DEBUG static daObjMHole_HIO_c l_HIO; daObjMHole_HIO_c::daObjMHole_HIO_c() { @@ -86,7 +86,7 @@ void daObjMHole_c::initBaseMtx() { } void daObjMHole_c::setBaseMtx() { -#ifdef DEBUG +#if DEBUG if (l_HIO.scale_adjust_on != 0) { scale = l_HIO.scale; } @@ -198,8 +198,8 @@ int daObjMHole_c::create() { if (Create() == 0) { return cPhs_ERROR_e; } -#ifdef DEBUG - OSReport("MHole Param<%x> arc<%s>\n", fopAcM_GetParam(this), l_arcName[mKind]); + OS_REPORT("MHole Param<%x> arc<%s>\n", fopAcM_GetParam(this), l_arcName[mKind]); +#if DEBUG l_HIO.entryHIO("マグネホール"); #endif } @@ -333,7 +333,7 @@ int daObjMHole_c::draw() { mDoExt_brkAnmRemove(mpModel->getModelData()); mDoExt_btkAnmRemove(mpModel->getModelData()); -#ifdef DEBUG +#if DEBUG if (l_HIO.collision_display != 0) { GXColor color = {0xFF, 0x0, 0x0, 0xFF}; if (mCps.GetAtVecP() != NULL) { @@ -349,7 +349,7 @@ int daObjMHole_c::_delete() { effectEnd(); mSound.deleteObject(); dComIfG_resDelete(&mPhase, l_arcName[mKind]); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index 2258318bc6..2ed126eb06 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -44,7 +44,7 @@ static dCcD_SrcCyl l_ccDCyl = { } // mCyl }; -#ifdef DEBUG +#if DEBUG void daObj_Mie_HIO_c::genMessage(JORMContext* ctx) { ctx->genSlider("注目オフセット ", &mParams.focus_offset, 0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index 809495fa19..0163bbe96d 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -22,7 +22,7 @@ daObj_Msima_HIO_c::daObj_Msima_HIO_c() { mBasicPosition = 800.0f; } -#ifdef DEBUG +#if DEBUG void daObj_Msima_HIO_c::genMessage(JORMContext* context) { // Magma Island context->genLabel("　マグネ島　", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index cc7b57f1e5..085b1e6fcf 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -17,7 +17,7 @@ enum J_Necktie_RES_File_ID { /* 0x7 */ BTK_J_NECKTIE = 0x7, }; -#ifdef DEBUG +#if DEBUG class daObjOnCloth_Hio_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index 5c89dd88e2..25a1094276 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -45,7 +45,7 @@ daPoFire_HIO_c::daPoFire_HIO_c() { mPickupRange = 150.0f; mFireWaitTime = 20; } -#ifdef DEBUG +#if DEBUG /* daPoFire_HIO_c::genMessage (JORMContext *) */ void daPoFire_HIO_c::genMessage(JORMContext* mctx) { mctx->genSlider("捕まえ範囲", &mPickupRange, 0.0f, 1000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); @@ -106,7 +106,7 @@ int daPoFire_c::create() { init_modeOnFire(); } -#ifdef DEBUG +#if DEBUG l_HIO.entryHIO("ポウ炎"); #endif @@ -407,7 +407,7 @@ int daPoFire_c::Draw() { int daPoFire_c::Delete() { dComIfG_resDelete(&mPhase, "poFire"); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 2349c84a6d..2194493de3 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -239,9 +239,7 @@ int daObjRgate_c::Create() { l_cull_box.max.y, l_cull_box.max.z); if (dComIfG_Bgsp().Regist(mpBgW, this)) { -#ifdef DEBUG - OSReport_Error("キコルの門：ＢＧ登録失敗しました\n"); -#endif + OS_REPORT_ERROR("キコルの門：ＢＧ登録失敗しました\n"); return 0; } else { for (u16 i = 0; i < mpGateModel->getModelData()->getJointNum(); i++) { @@ -847,9 +845,7 @@ int daObjRgate_c::Draw() { int daObjRgate_c::Delete() { if (mpBgW != NULL && mpBgW->ChkUsed()) { if (dComIfG_Bgsp().Release(mpBgW)) { -#ifdef DEBUG - OSReport("Release Error\n"); -#endif + OS_REPORT("Release Error\n"); } } diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index b56deef764..05a8cfbf91 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -9,7 +9,7 @@ #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG class daObjSakuita_Hio_c : public JORReflexible { public: void genMessage(JORMContext* ctx); @@ -78,7 +78,7 @@ void daObjSakuita_c::create_init() { } field_0x74c = 1; - #ifdef DEBUG + #if DEBUG M_hio.ct(); #endif } @@ -156,7 +156,7 @@ static int daObjSakuita_Draw(daObjSakuita_c* i_this) { } inline int daObjSakuita_c::execute() { - #ifdef DEBUG + #if DEBUG gravity = attr().mGravity; #endif current.pos.y += attr().mHangingPosition; @@ -181,7 +181,7 @@ static int daObjSakuita_Delete(daObjSakuita_c* i_this) { } daObjSakuita_c::~daObjSakuita_c() { - #ifdef DEBUG + #if DEBUG M_hio.dt(); #endif diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index c0cef88f63..66585092e2 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_path.h" -#ifdef DEBUG +#if DEBUG #include "d/d_a_obj.h" class daObjItaRope_Hio_c : public JORReflexible { @@ -139,12 +139,12 @@ void Sakuita_c::calcAngle() { static char* l_arcName = "A_Sakuita"; -#ifdef DEBUG +#if DEBUG daObjItaRope_Hio_c M_hio; #endif inline daObjItaRope_c::~daObjItaRope_c() { -#ifdef DEBUG +#if DEBUG M_hio.dt(); #endif delete [] mRopes; @@ -207,7 +207,7 @@ void daObjItaRope_c::create_init() { pSakuita->create(pPos, sVar12, fopAcM_GetRoomNo(this)); } - #ifdef DEBUG + #if DEBUG M_hio.ct(); #endif } diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index fd392f1bfa..67fa3adac3 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -353,7 +353,7 @@ void daSCannon_c::middleExe() { void daSCannon_c::orderEvtInit() { eventInfo.setArchiveName(l_arcName_Zev); mEvtIdx = dComIfGp_getEventManager().getEventIdx(this, l_eventName[mDemoType], 0xFF); -#ifdef DEBUG +#if DEBUG if (mEvtIdx == -1) { // "××××××××××××× Sky Cannon d_a_obj_scannon.cpp: Failed to get event\n" OS_REPORT("×××××××××××××天空砲台 d_a_obj_scannon.cpp：イベント取得失敗\n"); @@ -603,7 +603,7 @@ void daSCannon_c::demoExeFire() { } void daSCannon_c::demoInitFinish() { -#ifdef DEBUG +#if DEBUG if (dComIfG_play_c::getLayerNo(0) == 3 || dComIfG_play_c::getLayerNo(0) == 10) { J3DJoint* joint_p = mpModels[mIsRepaired]->getModelData()->getJointNodePointer(mHeadJointNo); if (joint_p == NULL) { diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index bbd08bcc79..773d07b055 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -160,7 +160,7 @@ void daObjSCannonTen_c::exeModeWait() { if (aREG_F(0) == 0.0f && fopAcM_checkHookCarryNow(this) && dComIfGp_checkPlayerStatus1(0, 0x10)) { eventInfo.setArchiveName(l_arcName); mEvtIdx = dComIfGp_getEventManager().getEventIdx(this, l_eventName, 0xFF); -#ifdef DEBUG +#if DEBUG if (mEvtIdx == -1) { // "××××××××××××× Sky Cannon (City in the Sky) d_a_obj_scannon_ten.cpp: Failed to get event\n" OS_REPORT("×××××××××天空砲台(天空都市） d_a_obj_scannon_ten.cpp：イベント取得失敗\n"); @@ -316,7 +316,7 @@ void daObjSCannonTen_c::demoExeFireEnd() { } void daObjSCannonTen_c::demoInitFinish() { -#ifdef DEBUG +#if DEBUG J3DJoint* joint_p = mpModel->getModelData()->getJointNodePointer(mHeadJointNo); if (joint_p == NULL) { // "××××××Sky Cannon—The head joint is missing!!!! ××××××" diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index 91d78bf6c0..88cc4b30ac 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -10,7 +10,7 @@ #include "d/d_meter2_info.h" #include "d/d_s_play.h" -#ifdef DEBUG +#if DEBUG class daObjSmgDoor_HIO_c : public mDoHIO_entry_c { public: daObjSmgDoor_HIO_c(); @@ -133,7 +133,7 @@ int daObjSmgDoor_c::create1st() { } } -#ifdef DEBUG +#if DEBUG // Present or Past Door l_HIO.entryHIO("現在or過去の扉"); #endif @@ -385,7 +385,7 @@ int daObjSmgDoor_c::Draw() { mDoExt_modelUpdateDL(mpModel[1]); dComIfGd_setList(); -#ifdef DEBUG +#if DEBUG if (l_HIO.field_0x6 != 0) { mpBgW->CalcPlane(); } @@ -396,7 +396,7 @@ int daObjSmgDoor_c::Draw() { int daObjSmgDoor_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName[mType]); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index dddb1517c5..4e2f3120c9 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -12,7 +12,7 @@ public: daSpinLift_HIO_c(); ~daSpinLift_HIO_c() {}; -#ifdef DEBUG +#if DEBUG void genMessage(JORMContext*); #endif @@ -29,7 +29,7 @@ daSpinLift_HIO_c::daSpinLift_HIO_c() { mVibration = 4; } -#ifdef DEBUG +#if DEBUG void daSpinLift_HIO_c::genMessage(JORMContext* ctx) { // === Ascent === ctx->genLabel("\n=== 上昇 ===", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); @@ -106,7 +106,7 @@ int daSpinLift_c::create() { } setBaseMtx(); -#ifdef DEBUG +#if DEBUG // Spin Lift l_HIO.entryHIO("スピンリフト"); #endif @@ -247,7 +247,7 @@ int daSpinLift_c::Draw() { int daSpinLift_c::Delete() { dComIfG_resDelete(&mPhase, l_resNameIdx[mModelType]); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index 9ea78dfd7e..899d8c92d5 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -305,7 +305,7 @@ void daObj_SSDrink_c::setParam() { gravity = -5.0f; -#ifdef DEBUG +#if DEBUG bool bVar1 = false; bool bVar2 = false; #endif @@ -409,7 +409,7 @@ int daObj_SSDrink_c::orderEvent() { } int daObj_SSDrink_c::wait(void* param_0) { -#ifdef DEBUG +#if DEBUG switch (field_0xb08) { case 0: case 2: diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 445b577131..025314b0bb 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -9,7 +9,7 @@ #include "d/d_cc_d.h" #include "d/d_s_play.h" -#ifdef DEBUG +#if DEBUG class daObjSwLight_HIO_c : public mDoHIO_entry_c { public: /* 811CF8C0 */ daObjSwLight_HIO_c(); @@ -108,7 +108,7 @@ static dCcD_SrcCyl l_cyl_src = { int daObjSwLight_c::Create() { if (fopAcM_isSwitch(this, getSwbit())) { init_modeSwOffWait(); -#ifdef DEBUG +#if DEBUG field_0xadc = l_HIO.mLightMaxRadius; #else field_0xadc = 500.0f; @@ -143,7 +143,7 @@ int daObjSwLight_c::Create() { } } -#ifdef DEBUG +#if DEBUG if (field_0xae8 == 0xffff) { // Light Candlestick Switch: Material "cc_LB_v" is missing. OSReport_Error("光燭台スイッチ：マテリアル\"cc_LB_v\"がありません\n"); @@ -178,7 +178,7 @@ int daObjSwLight_c::create1st() { if (phase == cPhs_ERROR_e) { return phase; } -#ifdef DEBUG +#if DEBUG // Light Candlestick Switch l_HIO.entryHIO("光燭台スイッチ"); #endif @@ -222,7 +222,7 @@ void daObjSwLight_c::action() { mTgSph[i].SetC(cStack_48); dComIfG_Ccsp()->Set(&mTgSph[i]); } -#ifdef DEBUG +#if DEBUG u8 a = 1; u8 light_hit = l_HIO.mNoLightHit == 0; #endif @@ -240,7 +240,7 @@ void daObjSwLight_c::action() { } } -#ifdef DEBUG +#if DEBUG u8 tmp = field_0xadc / l_HIO.mLightMaxRadius * 255.0f; #else u8 tmp = field_0xadc / 500.0f * 255.0f; @@ -276,13 +276,13 @@ void daObjSwLight_c::modeSwOnWait() { if (field_0xae1 < 5) { field_0xadc = 0.0f; } else if (field_0xae1 == 5) { -#ifdef DEBUG +#if DEBUG field_0xadc = l_HIO.mLightMaxRadius * 0.25f; #else field_0xadc = 500.0f * 0.25f; #endif } else if (field_0xae1 < 50) { -#ifdef DEBUG +#if DEBUG field_0xadc = l_HIO.mLightMaxRadius * ((field_0xae1 - 5) * 0.25f / 45.0f + 0.25f); #else @@ -290,7 +290,7 @@ void daObjSwLight_c::modeSwOnWait() { #endif } else if (field_0xae1 == 50) { -#ifdef DEBUG +#if DEBUG field_0xadc = l_HIO.mLightMaxRadius; #else field_0xadc = 500.0f; @@ -309,7 +309,7 @@ void daObjSwLight_c::init_modeOnLight() { } void daObjSwLight_c::modeOnLight() { -#ifdef DEBUG +#if DEBUG if (cLib_chaseF(&field_0xadc, l_HIO.mLightMaxRadius, l_HIO.mLightMaxRadius * 0.05f)) { init_modeSwOffWait(); } @@ -341,7 +341,7 @@ void daObjSwLight_c::modeSwOffWait() { if (field_0xae3 != 0) { if (!fopAcM_isSwitch(this, getSwbit2())) { -#ifdef DEBUG +#if DEBUG if (cLib_chaseF(&field_0xadc, 0.0f, l_HIO.mLightMaxRadius * 0.05f)) { #else if (cLib_chaseF(&field_0xadc, 0.0f, 500.0f * 0.05f)) { @@ -349,7 +349,7 @@ void daObjSwLight_c::modeSwOffWait() { init_modeSwOnWait(); } } else { -#ifdef DEBUG +#if DEBUG cLib_chaseF(&field_0xadc, l_HIO.mLightMaxRadius, l_HIO.mLightMaxRadius * 0.05f); #else cLib_chaseF(&field_0xadc, 500.0f, 500.0f * 0.05); @@ -359,7 +359,7 @@ void daObjSwLight_c::modeSwOffWait() { } else { if (!cLib_checkBit(field_0xae6, (u8)1) && !cLib_checkBit(field_0xae6, 2) && !cLib_calcTimer(&field_0xae4) && -#ifdef DEBUG +#if DEBUG cLib_chaseF(&field_0xadc, 0.0f, l_HIO.mLightMaxRadius * 0.05f)) { #else @@ -420,7 +420,7 @@ int daObjSwLight_c::Draw() { J3DMaterial* material = modelData->getMaterialNodePointer(field_0xae8); J3DGXColor* color = material->getTevKColor(0); -#ifdef DEBUG +#if DEBUG u8 fVar1 = field_0xadc / l_HIO.mLightMaxRadius * 255.0f; #else u8 fVar1 = field_0xadc / 500.0f * 255.0f; @@ -433,7 +433,7 @@ int daObjSwLight_c::Draw() { mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); -#ifdef DEBUG +#if DEBUG if (l_HIO.mCheckRendering) { mpBgW->CalcPlane(); } @@ -445,7 +445,7 @@ int daObjSwLight_c::Draw() { int daObjSwLight_c::Delete() { mSound.deleteObject(); dComIfG_resDelete(&mPhase, l_arcName); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index 05e9599880..49d6576b35 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -5,14 +5,14 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" #endif #include "d/actor/d_a_obj_swchain.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" -#ifdef DEBUG +#if DEBUG class daObjSwChain_HIO_c : public mDoHIO_entry_c { public: /* 811C8DE0 */ daObjSwChain_HIO_c(); @@ -256,7 +256,7 @@ int daObjSwChain_c::create1st() { mOutNum = getOutNum(); mChainID = getChainID(); -#ifdef DEBUG +#if DEBUG if (mChainID != 0 && mChainID != 1 && mChainID != 2 && mChainID != 3) { // Chain Switch: Chain ID value is abnormal <%d> OS_REPORT_ERROR("チェーンスイッチ：鎖の番号が異常値です<%d>\n", mChainID); @@ -264,7 +264,7 @@ int daObjSwChain_c::create1st() { } #endif -#ifdef DEBUG +#if DEBUG if (mOutNum > mChainNum) { // Chain Switch: Argument 2 > Argument 1 ! OS_REPORT_ERROR("チェーンスイッチ：引数２＞引数１になっています！\n"); @@ -272,7 +272,7 @@ int daObjSwChain_c::create1st() { } #endif -#ifdef DEBUG +#if DEBUG if (mHookShotLength > mChainNum) { // Chain Switch: Argument 3 > Argument 1 ! OS_REPORT_ERROR("チェーンスイッチ：引数３＞引数１になっています！\n"); @@ -292,7 +292,7 @@ int daObjSwChain_c::create1st() { if (!Create()) { return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG // Chain Switch l_HIO.entryHIO("チェーンスイッチ"); #endif @@ -302,7 +302,7 @@ int daObjSwChain_c::create1st() { } int daObjSwChain_c::execute() { -#ifdef DEBUG +#if DEBUG if (l_HIO.mProcessStop) { return 1; } @@ -350,7 +350,7 @@ int daObjSwChain_c::execute() { cXyz cStack_68(mChains[getTopChainNo()].field_0x34); cXyz cStack_74(mChains[mChainNum].field_0x34); f32 fVar15 = cStack_74.abs(cStack_68); -#ifdef DEBUG +#if DEBUG if (fVar15 < (l_HIO.field_0xc * (mOutNum - 2)) || mCarry == 0) #else if (fVar15 < (35.0f * (mOutNum - 2)) || mCarry == 0) @@ -365,7 +365,7 @@ int daObjSwChain_c::execute() { case 4: case 6: if (mOutNum > field_0xa69) { -#ifdef DEBUG +#if DEBUG chains_p->field_0x34 += cStack_8c * l_HIO.mReturnSpeedHigh; #else chains_p->field_0x34 += cStack_8c * 30.0f; @@ -374,7 +374,7 @@ int daObjSwChain_c::execute() { field_0xa6b = 1; field_0xa6b = 1; } else { -#ifdef DEBUG +#if DEBUG chains_p->field_0x34 += cStack_8c * l_HIO.mReturnSpeedLow; #else chains_p->field_0x34 += cStack_8c * 15.0f; @@ -382,7 +382,7 @@ int daObjSwChain_c::execute() { } break; default: -#ifdef DEBUG +#if DEBUG chains_p->field_0x34 += cStack_8c * l_HIO.mReturnSpeed; #else chains_p->field_0x34 += cStack_8c * 2.0f; @@ -393,7 +393,7 @@ int daObjSwChain_c::execute() { if (field_0xa6c == 0) { cXyz pos = (daPy_getPlayerActorClass()->current.pos - home.pos); s16 abs_tmp = pos.atan2sX_Z() - shape_angle.y; -#ifdef DEBUG +#if DEBUG if (abs(abs_tmp) < l_HIO.mReactionAngle) { #else if (abs(abs_tmp) < 0xe74) { @@ -427,7 +427,7 @@ int daObjSwChain_c::execute() { } field_0xa9d = mCarry; -#ifdef DEBUG +#if DEBUG if (l_HIO.field_0x42 != 0) { if (l_HIO.field_0x44 == getChainID()) { dDbVw_Report(0x28, 200, "Num<%d>Len<%.2f>", getCurrentChainNum(), @@ -458,7 +458,7 @@ void daObjSwChain_c::chain_control() { cXyz* pcVar1 = &chains_p1->field_0x34; pcVar2 = pcVar1; f32 fVar2 = - #ifdef DEBUG + #if DEBUG l_HIO.mGravity; #else -6.0f; @@ -470,7 +470,7 @@ void daObjSwChain_c::chain_control() { fVar2 *= KREG_F(2) + 0.099999994f; } else { fVar2 = - #ifdef DEBUG + #if DEBUG l_HIO.mGravity; #else -6.0f; @@ -480,7 +480,7 @@ void daObjSwChain_c::chain_control() { fVar2 *= KREG_F(2) + 0.099999994f; } else { fVar2 = - #ifdef DEBUG + #if DEBUG l_HIO.mGravity; #else -6.0f; @@ -534,7 +534,7 @@ void daObjSwChain_c::chain_control() { sp94.normalizeZP(); f32 fVar3 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc; #else 35.0f; @@ -542,7 +542,7 @@ void daObjSwChain_c::chain_control() { if (topChainNo == mChainNum - 1) { fVar3 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0x10; #else 35.0f; @@ -550,7 +550,7 @@ void daObjSwChain_c::chain_control() { } if (fVar1 <= fVar3 - - #ifdef DEBUG + #if DEBUG l_HIO.field_0x14 #else 8.0f @@ -558,7 +558,7 @@ void daObjSwChain_c::chain_control() { ) { fVar1 = fVar3 - - #ifdef DEBUG + #if DEBUG l_HIO.field_0x14; #else 8.0f; @@ -604,7 +604,7 @@ void daObjSwChain_c::chain_control2() { mDoMtx_stack_c::get()[2][3] = 0.0f; mDoMtx_stack_c::multVec(&sp90, &sp90); sp78 += sp90; - #ifdef DEBUG + #if DEBUG field_0xac0 = sp78; #endif @@ -631,7 +631,7 @@ void daObjSwChain_c::chain_control2() { mDoMtx_stack_c::XrotM(-field_0xa6e); mDoMtx_stack_c::multVec(&sp78, &sp84); sp84 += field_0xa78; - #ifdef DEBUG + #if DEBUG field_0xac0 = sp84; #endif *pcVar1 = sp84; @@ -648,7 +648,7 @@ void daObjSwChain_c::chain_control2() { spb4.z = 0.0f; spb4.x = 0.0f; spb4.y *= - #ifdef DEBUG + #if DEBUG l_HIO.field_0x18; #else 0.0f; @@ -684,7 +684,7 @@ void daObjSwChain_c::chain_control2() { spcc.normalizeZP(); f32 fVar3 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc; #else 35.0f; @@ -692,7 +692,7 @@ void daObjSwChain_c::chain_control2() { if (i == mChainNum - 1) { fVar3 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0x10; #else 35.0f; @@ -700,7 +700,7 @@ void daObjSwChain_c::chain_control2() { } if (fVar1 <= fVar3 - - #ifdef DEBUG + #if DEBUG l_HIO.field_0x14 #else 8.0f @@ -708,7 +708,7 @@ void daObjSwChain_c::chain_control2() { ) { fVar1 = fVar3 - - #ifdef DEBUG + #if DEBUG l_HIO.field_0x14; #else 8.0f; @@ -805,7 +805,7 @@ void daObjSwChain_c::chain_count_control() { int roomNo = fopAcM_GetRoomNo(this); f32 fVar1 = sp60.abs(chains_p->field_0x34); f32 fVar2 = - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc #else 35.0f @@ -819,7 +819,7 @@ void daObjSwChain_c::chain_count_control() { if (roomNo != 4 && roomNo != 6) { for (fVar1 -= fVar2; fVar1 > 0.0f;) { fVar1 -= - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc; #else 35.0f; @@ -850,7 +850,7 @@ void daObjSwChain_c::chain_count_control() { chains_p2->field_0x34.z = (chains_p->field_0x34.z + sp60.z) * 0.5f; } } else if (fVar1 < - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc #else 35.0f @@ -883,13 +883,13 @@ void daObjSwChain_c::chain_count_control() { topChain_p->field_0x34 = mChains->field_0x34; if ( (!bVar1 && pow > - #ifdef DEBUG + #if DEBUG l_HIO.mSwitchOnTension #else 10.0f #endif ) || (bVar1 && pow > - #ifdef DEBUG + #if DEBUG l_HIO.field_0x2c #else 1.5f @@ -916,13 +916,13 @@ void daObjSwChain_c::chain_count_control() { topChain_p->field_0x34 = mChains->field_0x34; if ( (!daPy_getPlayerActorClass()->checkBootsOrArmorHeavy() && pow > - #ifdef DEBUG + #if DEBUG l_HIO.mSwitchOnTension #else 10.0f #endif ) || (daPy_getPlayerActorClass()->checkBootsOrArmorHeavy() && pow > - #ifdef DEBUG + #if DEBUG l_HIO.field_0x2c #else 1.5f @@ -933,7 +933,7 @@ void daObjSwChain_c::chain_count_control() { if (getSwbit() != 0xFF) { if (!fopAcM_isSwitch(this, getSwbit()) && field_0xa68 > - #ifdef DEBUG + #if DEBUG l_HIO.mSwitchOnTime #else 0 @@ -992,7 +992,7 @@ void daObjSwChain_c::setTension() { f32 len = spc8.abs(spbc); f32 max = - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc #else 35.0f @@ -1001,7 +1001,7 @@ void daObjSwChain_c::setTension() { if (roomNo == 4 || roomNo == 6) { max = (field_0xa67 + AREG_S(0) + -1) * - #ifdef DEBUG + #if DEBUG l_HIO.field_0xc; #else 35.0f; @@ -1032,7 +1032,7 @@ void daObjSwChain_c::setTension() { cXyz spe0(mChains->field_0x34 - mChains[mChainNum].field_0x34); player->setOutPower(pow, cM_atan2s(spe0.x, spe0.z), 0); - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x41 != 0) { dDbVw_Report(40, 260, "len<%.2f>max<%.2f>pow<%.2f>pl_spd<%.2f>", len, max, pow, player->getSpeedF()); } @@ -1050,7 +1050,7 @@ void daObjSwChain_c::setTension() { if (daPy_py_c::checkNowWolf()) { fVar1 = - #ifdef DEBUG + #if DEBUG l_HIO.mTensionWolf; #else 13.0f; @@ -1059,14 +1059,14 @@ void daObjSwChain_c::setTension() { f32 fVar7; if (daPy_getPlayerActorClass()->checkBootsOrArmorHeavy()) { fVar7 = - #ifdef DEBUG + #if DEBUG l_HIO.mTensionBootsEquipped; #else 2.1f; #endif } else { fVar7 = - #ifdef DEBUG + #if DEBUG l_HIO.mTension; #else 15.0f; @@ -1115,7 +1115,7 @@ int daObjSwChain_c::draw() { g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x41 != 0) { cXyz sp2c; mDoMtx_stack_c::YrotS(shape_angle.y); @@ -1165,7 +1165,7 @@ int daObjSwChain_c::draw() { int daObjSwChain_c::_delete() { dComIfG_resDelete(&mPhase, l_arcName); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index fbceaee644..d7a82cc7e3 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -347,7 +347,7 @@ void daObjSwpush::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) cXyz spa8; int vtxnum = i_this->mpBgW->GetVtxNum(); - #ifdef DEBUG + #if DEBUG for (int i = 0; i < 4; i++) { JUT_ASSERT(859, M_op_vtx[i] < vtxnum); } diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index c181ec45be..868bdce1fa 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#ifdef DEBUG +#if DEBUG daObjThDoor_HIO_c::daObjThDoor_HIO_c() { } @@ -127,10 +127,10 @@ int daObjThDoor_c::create1st() { return rv; } - #ifdef DEBUG // Telma's door OS_REPORT("テルマの家のドア：sw<%d>msg<%d>\n", getSwbit(), getMsg()); + #if DEBUG // Telma's door l_HIO.entryHIO("テルマの家のドア"); #endif @@ -329,7 +329,7 @@ int daObjThDoor_c::Draw() { int daObjThDoor_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index efda2a889a..620671511f 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" -#ifdef DEBUG +#if DEBUG #include "d/d_debug_viewer.h" #endif @@ -79,7 +79,7 @@ static int daObj_Toby_Draw(obj_toby_class* i_this) { } } - #ifdef DEBUG + #if DEBUG if (mDoCPd_c::getHoldY(PAD_2)) { GXColor local_104; local_104.r = 100; diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index f196f24419..da5fc97992 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -13,7 +13,7 @@ #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" -#ifdef DEBUG +#if DEBUG daObjTobyHouse_HIO_c l_HIO; daObjTobyHouse_HIO_c::daObjTobyHouse_HIO_c() { @@ -153,7 +153,7 @@ int daObjTobyHouse_c::Create() { for (int i = 0; i < 2; i++) { mEventIds[i] = (s16)dComIfGp_getEventManager().getEventIdx(this, l_event_name[i], 0xff); - #ifdef DEBUG + #if DEBUG if (mEventIds[i] == -1) { // Cannon shed - failure to obtain event OS_REPORT_ERROR("大砲小屋：イベント取得失敗\n"); @@ -236,7 +236,7 @@ int daObjTobyHouse_c::create1st() { return rv; } - #ifdef DEBUG + #if DEBUG // Toby's Cannon Shack l_HIO.entryHIO("トビーの大砲小屋"); #endif @@ -519,7 +519,7 @@ int daObjTobyHouse_c::Draw() { mDoExt_bckAnmRemove(mModel->getModelData()); } - #ifdef DEBUG + #if DEBUG if (l_HIO.mDrawCollision) { mpBgW->CalcPlane(); } @@ -572,7 +572,7 @@ int daObjTobyHouse_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName[mType]); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index 0c12d3f554..335ce5b8a3 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -95,7 +95,7 @@ int daTogeTrap_c::create() { init_modeWait(); setBaseMtx(); - #ifdef DEBUG + #if DEBUG // Spike traps l_HIO.entryHIO("トゲトラップ"); #endif @@ -268,7 +268,7 @@ int daTogeTrap_c::Draw() { int daTogeTrap_c::Delete() { dComIfG_resDelete(&mPhase, "P_Toge"); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(this); #endif diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 8c45cd2a45..617ae6ee6d 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -19,7 +19,7 @@ public: daObj_TomHIO_c(); virtual ~daObj_TomHIO_c() {} - #ifdef DEBUG + #if DEBUG void genMessage(JORMContext* context) { // Golden dragonfly context->genLabel("黄金蟲(トンボ)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index 465d355bbe..de87cf879b 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -88,7 +88,7 @@ int daTreeSh_c::create1st() { return cPhs_ERROR_e; } -#ifdef DEBUG +#if DEBUG l_HIO.entryHIO("針葉樹"); #endif } @@ -128,7 +128,7 @@ int daTreeSh_c::Draw() { int daTreeSh_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 05cee13772..4df7a162a7 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -28,7 +28,7 @@ daTwGate_HIO_c::daTwGate_HIO_c() { mRange = 1900.0f; } -#ifdef DEBUG +#if DEBUG void daTwGate_HIO_c::genMessage(JORMContext* ctx) { // Range ctx->genSlider("範囲", &mRange, 0.0f, 500000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); @@ -139,7 +139,7 @@ int daTwGate_c::create() { mLine.SetStartEnd(l_cheeckPos0[mGateType], l_cheeckPos1[mGateType]); mBrk.setPlaySpeed(-1.0f); - #ifdef DEBUG + #if DEBUG // Twilight Gate l_HIO.entryHIO("トワイライトゲート"); #endif @@ -186,7 +186,7 @@ int daTwGate_c::Draw() { int daTwGate_c::Delete() { dComIfG_resDelete(&mPhase, l_resNameIdx[mGateType]); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(this); #endif diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 935311f4cc..78bdcb22d7 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -15,7 +15,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" -#ifdef DEBUG +#if DEBUG daObjVolcBom_HIO_c::daObjVolcBom_HIO_c() { } @@ -118,7 +118,7 @@ int daObjVolcBom_c::Create() { } } - #ifdef DEBUG + #if DEBUG if (mEffectJntNo != 0xffff) { mBtk1->entry(mModel1->getModelData()); mModel1->calcMaterial(); @@ -211,7 +211,7 @@ int daObjVolcBom_c::create1st() { return rv; } - #ifdef DEBUG + #if DEBUG // The Great Lava Bombs l_HIO.entryHIO("大溶岩弾"); #endif @@ -227,7 +227,7 @@ int daObjVolcBom_c::Execute(Mtx** i_mtx) { mBtk1->play(); mBrk1->play(); - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x14 != 0) { switch (mMode) { case MODE_WAIT_APPEAR: @@ -260,7 +260,7 @@ void daObjVolcBom_c::mode_proc_call() { cXyz scale(mBaseScale, mBaseScale, mBaseScale); mModel1->setBaseScale(scale); - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x15 != 0) { fopAc_ac_c* player = dComIfGp_getPlayer(0); current.pos.x = player->current.pos.x; @@ -800,7 +800,7 @@ int daObjVolcBom_c::Draw() { mModel1->calc(); } - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x34 != 0) { cXyz cStack_24; @@ -835,7 +835,7 @@ int daObjVolcBom_c::Draw() { } int daObjVolcBom_c::Delete() { - #ifdef DEBUG + #if DEBUG if (l_HIO.field_0x04 != 0) { fopAcM_offSwitch(this, getSwbit()); } @@ -850,7 +850,7 @@ int daObjVolcBom_c::Delete() { endBindEffect(); dComIfG_resDelete(&mPhase, l_arcName); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 8c66522d24..5cc6be037f 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -127,7 +127,7 @@ int daObjWarpKBrg_c::Create() { } } - #ifdef DEBUG + #if DEBUG if (mEffJointNo == 0xFFFF) { // "Kakariko Bridge: joint effect_p not found" OSReport_Error("カカリコ橋；ジョイント effect_p が見つかりませんでした\n"); diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index aefe9d1e19..83731e4b54 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -23,7 +23,7 @@ daWtGate_HIO_c::daWtGate_HIO_c() { field_0x9 = 4; } -#ifdef DEBUG +#if DEBUG void daWtGate_HIO_c::genMessage(JORMContext* ctx) { // "Maximum speed" ctx->genSlider("最大速度", &mMaxSpeed, 0.1, 500.0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); @@ -82,7 +82,7 @@ cPhs__Step daWtGate_c::create() { // "Sluice gate(Lv3)" - #ifdef DEBUG + #if DEBUG l_HIO.entryHIO("水門(Lv3)"); #endif } @@ -180,7 +180,7 @@ int daWtGate_c::Draw() { int daWtGate_c::Delete() { dComIfG_resDelete(&mPhase, "S_Zsuimon"); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(); #endif diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index b541439e4b..0a13402949 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -12,7 +12,7 @@ #include "d/d_item_data.h" #include "d/d_s_play.h" -#ifdef DEBUG +#if DEBUG class daObjWStatue_HIO_c : public fOpAcm_HIO_entry_c { public: @@ -125,7 +125,7 @@ int daObjWStatue_c::Create() { eventInfo.setArchiveName(l_arcName); mEventIdx = (s16)dComIfGp_getEventManager().getEventIdx(this, l_eventName, 0xff); - #ifdef DEBUG + #if DEBUG if (mEventIdx == -1) { // Wooden statue: Event acquisition failure OS_REPORT_ERROR("木彫りの像：イベント取得失敗\n"); @@ -159,7 +159,7 @@ int daObjWStatue_c::create() { return cPhs_ERROR_e; } - #ifdef DEBUG + #if DEBUG // Wooden statue l_HIO.entryHIO("木彫りの像"); #endif @@ -279,7 +279,7 @@ int daObjWStatue_c::actionSwOnWait() { switch (field_0x93a) { case 0: if (iVar2 == NULL) { - #ifdef DEBUG + #if DEBUG mRespawnTimer = l_HIO.mRespawnTimer; #else mRespawnTimer = 30; @@ -438,7 +438,7 @@ void daObjWStatue_c::setListStart() {} int daObjWStatue_c::_delete() { DeleteBase(dItem_data::getFieldArc(m_itemNo)); - #ifdef DEBUG + #if DEBUG l_HIO.removeHIO(this); #endif diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index 2218b10a10..fc7836276b 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -572,7 +572,7 @@ void daPasserMng_c::create_init() { ind++; } } - #ifdef DEBUG + #if DEBUG OS_REPORT("初期ばらまき位置 Path=%d ", getPathID()); for (int i = 0; i < max; i++) { OS_REPORT("%d, ", arr[i]); diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 96c53a8ee5..89d319ae89 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -55,7 +55,7 @@ static BOOL hitCheck(daSwc00_c* i_swc) { return FALSE; } -#ifdef DEBUG +#if DEBUG int daSwc00_Draw(daSwc00_c* i_this) { fopAc_ac_c* a_this = i_this; @@ -329,7 +329,7 @@ static actor_method_class l_daSwc00_Method = { (process_method_func)daSwc00_Delete, (process_method_func)daSwc00_Execute, (process_method_func)daSwc00_IsDelete, - #ifdef DEBUG + #if DEBUG (process_method_func)daSwc00_Draw, #else NULL diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index a16c01d993..be9557c131 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -27,25 +27,19 @@ int daTag_ShopItem_c::create() { if (getGroupID() == 15) { mCreateTimer = 150; -#ifdef DEBUG // "Event Item\n" - OSReport("イベントアイテム\n"); -#endif + OS_REPORT("イベントアイテム\n"); if (getSwitchBit1() != 0xFF) { if (!dComIfGs_isSaveSwitch(getSwitchBit1())) { dComIfGs_onSaveSwitch(getSwitchBit2()); field_0x572 = true; mCreateTimer = 0; -#ifdef DEBUG // "Before Talk\n" - OSReport("会話前\n"); -#endif + OS_REPORT("会話前\n"); } else { -#ifdef DEBUG // "After Talk\n" - OSReport("会話後\n"); -#endif + OS_REPORT("会話後\n"); } } } else { @@ -54,20 +48,16 @@ int daTag_ShopItem_c::create() { if (getSwitchBit1() != 0xFF) { if (dComIfGs_isSaveSwitch(getSwitchBit1())) { mCreateTimer = 150; -#ifdef DEBUG // "Already Sold\n" - OSReport("もう売れたよ\n"); -#endif + OS_REPORT("もう売れたよ\n"); } } if (getSwitchBit2() != 0xFF) { if (!dComIfGs_isSaveSwitch(getSwitchBit2())) { mCreateTimer = 150; -#ifdef DEBUG // "Not sold yet\n" - OSReport("まだ売れない\n"); -#endif + OS_REPORT("まだ売れない\n"); } } } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 34b5811972..fcbdbd8c25 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1299,7 +1299,7 @@ u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) { } } -#ifdef DEBUG +#if DEBUG // "====Bomb Bag count is %d====\n" OS_REPORT("====バクダン袋の数は %d 個です====\n", bag_count); for (int i = 0; i < 3; i++) { diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 550fe2c21a..346ce45c97 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -107,7 +107,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { var_f31 = dStage_FileList_dt_SeaLevel(filelist_p); } -#ifdef DEBUG +#if DEBUG if (g_kankyoHIO.vrbox.field_0x14 != 0) { var_f31 = g_kankyoHIO.vrbox.m_horizonHeight; } else { @@ -139,7 +139,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { cXyz sp14; sp14 = sun_p->mPos[0]; -#ifndef DEBUG +#if !DEBUG cXyz sp8; if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0) { dKyr_get_vectle_calc(&camera_p->lookat.eye, &g_env_light.sun_pos, &sp8); diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index 3a021961b8..ea16657ddd 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -53,15 +53,11 @@ static int daWarpBug_Draw(daWarpBug_c* i_this) { } int daWarpBug_c::draw() { -#ifdef DEBUG +#if DEBUG daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); if (!player_p->checkMidnaWarp()) { -#endif - field_0x57c = 0; return 1; - -#ifdef DEBUG } cLib_chaseS(&field_0x57c, 255, 25); @@ -94,20 +90,22 @@ int daWarpBug_c::draw() { mpBtk->entry(modelData); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); +#else + field_0x57c = 0; +#endif return 1; -#endif } int daWarpBug_c::execute() { -#ifdef DEBUG +#if DEBUG daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); #endif mDoMtx_stack_c::copy(mpModel->getBaseTRMtx()); mDoMtx_stack_c::multVecZero(¤t.pos); -#ifdef DEBUG +#if DEBUG if (player_p->checkMidnaWarp()) { mpBrk->play(); mpBtk->play(); diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 9a33c16168..208d44d0d7 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -29,7 +29,7 @@ struct daYkgr_HIO_c : public mDoHIO_entry_c { /* 0x24 */ f32 field_0x24; }; -#ifdef DEBUG +#if DEBUG void daYkgr_HIO_c::genMessage(JORMContext* ctx) { ctx->genLabel("竜の山陽炎HIO", 0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); ctx->genSlider("アルファ速度", &field_0xc, 0, 255, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); @@ -155,7 +155,7 @@ inline int daYkgr_c::_create() { field_0x5a8 = 0.0f; stop(); } -#ifdef DEBUG +#if DEBUG l_HIO.entryHIO("竜の山陽炎"); #endif } else { @@ -177,7 +177,7 @@ static int daYkgrCreate(void* i_this) { } inline int daYkgr_c::_delete() { -#ifdef DEBUG +#if DEBUG l_HIO.removeHIO(); #endif return 1; @@ -250,13 +250,10 @@ inline int daYkgr_c::_draw() { set_mtx(); if (m_emitter != NULL) { m_emitter->setGlobalRTMatrix(field_0x570); -#ifdef DEBUG - if (l_HIO.field_0x4 != 0) { + if (DEBUG && l_HIO.field_0x4 != 0) { m_emitter->setGlobalAlpha(l_HIO.field_0x8); YkgrCB.setParam(l_HIO.field_0x10); - } else -#endif - { + } else { m_emitter->setGlobalAlpha(m_alpha); } } diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc index f798a78a3e..de57e158ee 100644 --- a/src/d/actor/d_flower.inc +++ b/src/d/actor/d_flower.inc @@ -569,19 +569,15 @@ void dFlower_packet_c::draw() { dKy_setLight_nowroom_grass(sp50->room_no, 1.0f); for (dFlower_data_c* sp44 = sp5C->getData(); sp44 != NULL; sp44 = sp44->mp_next) { -#if DEBUG - if (g_kankyoHIO.navy.grass_adjust_ON != 0) { + if (DEBUG && g_kankyoHIO.navy.grass_adjust_ON != 0) { sp64.r = g_kankyoHIO.navy.grass_ambcol.r * 2; sp64.g = g_kankyoHIO.navy.grass_ambcol.g * 2; sp64.b = g_kankyoHIO.navy.grass_ambcol.b * 2; } else { -#endif sp64.r = (sp44->field_0x04 & 0x1F) * 2; sp64.g = ((sp44->field_0x04 >> 5) & 0x1F) * 2; sp64.b = ((sp44->field_0x04 >> 0xA) & 0x1F) * 2; -#if DEBUG } -#endif if (daPy_py_c::checkNowWolfPowerUp()) { f32 var_f31 = g_env_light.bg_amb_col[0].r / 255.0f; diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index e5f470b74a..7f4bcda32c 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -556,10 +556,10 @@ void dGrass_packet_c::draw() { f32 sp58 = 1.0f - temp_f27; temp_f27 += 0.5f * sp58; - J3DLightInfo& sp40 = sp44->mLights[0].getLightInfo(); - sp98.r = sp40.mColor.r * temp_f27; - sp98.g = sp40.mColor.g * temp_f27; - sp98.b = sp40.mColor.b * temp_f27; + J3DLightInfo* sp40 = sp44->mLights[0].getLightInfo(); + sp98.r = sp40->mColor.r * temp_f27; + sp98.g = sp40->mColor.g * temp_f27; + sp98.b = sp40->mColor.b * temp_f27; sp98.a = var_f29; if (memcmp(dComIfGp_getStartStageName(), "D_MN01", 6) == 0) { @@ -642,13 +642,11 @@ void dGrass_packet_c::draw() { GXColor sp38; -#if DEBUG - if (g_kankyoHIO.navy.grass_adjust_ON) { + if (DEBUG && g_kankyoHIO.navy.grass_adjust_ON) { sp38.r = g_kankyoHIO.navy.grass_ambcol.r * 2; sp38.g = g_kankyoHIO.navy.grass_ambcol.g * 2; sp38.b = g_kankyoHIO.navy.grass_ambcol.b * 2; } else { -#endif sp38.r = (var_r29->m_addCol & 0x1F) * 2; sp38.g = ((var_r29->m_addCol >> 5) & 0x1F) * 2; sp38.b = ((var_r29->m_addCol >> 0xA) & 0x1F) * 2; @@ -693,9 +691,7 @@ void dGrass_packet_c::draw() { } else { sp38.b = sp38.b * var_f28; } -#ifdef DEBUG } -#endif GXSetChanAmbColor(GX_COLOR0A0, sp38); diff --git a/src/d/d_a_shop_item_static.cpp b/src/d/d_a_shop_item_static.cpp index a10a053e28..6314dd41c1 100644 --- a/src/d/d_a_shop_item_static.cpp +++ b/src/d/d_a_shop_item_static.cpp @@ -16,7 +16,7 @@ cXyz* daShopItem_c::getPosP() { } ResourceData const daShopItem_c::mData[23] = { - {"B_mD_sold", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0x8000, 0}, 0, 0, 0, 0, -1, -1}, + {"B_mD_sold", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, -0x8000, 0}, 0, 0, 0, 0, -1, -1}, {"B_mD_oil", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, {"O_mD_red", 3, -1, -1, -1, -1, -1, -11, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, {"B_mD_milk", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1}, diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index bfc7628675..d41cef2b19 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -1196,11 +1196,9 @@ void dAttention_c::judgementStatus4Hold() { } } -#if DEBUG if (var_r29 != mAttnStatus) { OS_REPORT("%06d: attention: status %d, %d -> %d (%d)\n", g_Counter.mCounter0, mLockonCount, var_r29, mAttnStatus, var_r30); } -#endif } void dAttention_c::judgementStatus4Switch() { @@ -1320,11 +1318,9 @@ void dAttention_c::judgementStatus4Switch() { } } -#if DEBUG if (var_r29 != mAttnStatus) { OS_REPORT("%06d: attention: status %d, %d -> %d (%d)\n", g_Counter.mCounter0, mLockonCount, var_r29, mAttnStatus, var_r30); } -#endif } int dAttention_c::Run() { diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index f08202e857..b618cc0b6a 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -1004,7 +1004,7 @@ struct wcs_data { static wcs_data l_wcsbuf[84]; -#ifdef DEBUG +#if DEBUG static u8 lit_5300[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -1168,7 +1168,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) { sp_e8 = &l_wcsbuf[wcsIndex_e4]; wcsIndex_e4++; } else { - #ifdef DEBUG + #if DEBUG lit_5300[0] = 1; #endif } @@ -1182,7 +1182,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) { // local_118->_0 = l_wcsbuf[local_11c]._0; wcsIndex_e4++; } else { - #ifdef DEBUG + #if DEBUG lit_5300[0] = 1; #endif } @@ -1197,7 +1197,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) { sp_a8->next = &l_wcsbuf[wcsIndex_e4]; wcsIndex_e4++; } else { - #ifdef DEBUG + #if DEBUG lit_5300[0] = 1; #endif } @@ -1217,7 +1217,7 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) { sp_a8->next = &l_wcsbuf[wcsIndex_e4]; wcsIndex_e4++; } else { - #ifdef DEBUG + #if DEBUG lit_5300[0] = 1; #endif } diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 1381b17be0..bad3ea79bd 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -4223,7 +4223,7 @@ bool dCamera_c::lockonCamera(s32 param_0) { // this should probably be an ifdef, but we force it to be compiled // to make the function large enough to stop doing inlining - if (!NDEBUG) { + if (!NDEBUG_DEFINED) { if (mCamSetup.CheckFlag(0x8000)) { //char name[28]; fopAcM_getNameString(mpPlayerActor, NULL); diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 5bc923bbf3..d99996c45c 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1783,7 +1783,7 @@ void dComIfGs_gameStart() { dComIfGp_setNextStage(name, point, roomNo, -1, 0.0f, 0, 1, 0, 0, 0, 0); } -#ifdef DEBUG +#if DEBUG void dComIfG_playerStatusD() { dComIfGs_setDataNum(0); dComIfGs_setMaxLife(50); diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 540ea510db..3620b8cf4f 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -272,8 +272,8 @@ const char* daSetBgObj_c::getArcName(fopAc_ac_c* i_this) { s16 const daObjMovebox::Act_c::M_dir_base[4] = { 0x0000, 0x4000, - 0x8000, - 0xC000, + -0x8000, + -0x4000, }; f32 const daDsh_c::OPEN_SIZE = 270.1f; diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 29c15637e5..f199a7a3b9 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -28,7 +28,7 @@ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData break; } default: -#ifdef DEBUG +#if DEBUG JGadget_outMessage msg(JGadget_outMessage::warning, __FILE__, 124); msg << "unknown data-type : " << iType << "\n demo-object : " << adaptor_getID_string(); int x = 0; @@ -96,7 +96,7 @@ dDemo_actor_c::~dDemo_actor_c() { mBtkId = -1; mBrkId = -1; - #ifdef DEBUG + #if DEBUG if(dComIfGp_event_getMode() == 0) { g_dComIfG_gameInfo.play.getEvent().setDebugStb(0); } diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 3d73e1ef2e..32050e09ad 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -512,7 +512,7 @@ bool dCamera_c::fixedFrameEvCamera() { fframe_p->field_0x0 = getEvIntData(&fframe_p->mTimer, "Timer", -1); getEvStringData(fframe_p->mRelUseMask, "RelUseMask", "oo"); -#ifdef DEBUG +#if DEBUG if (strlen(fframe_p->mRelUseMask) != 2) { OSReport("camera: event: bad length -> xx\n"); strcpy(fframe_p->mRelUseMask, "xx"); @@ -995,7 +995,7 @@ bool dCamera_c::transEvCamera(int param_1) { trans->mEye = (*ptr1).mEye; trans->mFovy = (*ptr1).mFovy; trans->field_0x3c = (*ptr1).mBank; - if ((*ptr1).mBank != 0.0f) { + if (float(s16(ptr1->mBank)) != 0.0f) { trans->field_0x68 = true; } } @@ -1011,7 +1011,7 @@ bool dCamera_c::transEvCamera(int param_1) { trans->mStartEye = (*ptr2).mEye; trans->mStartFovy = (*ptr2).mFovy; trans->field_0x1c = (*ptr2).mBank; - if ((*ptr2).mBank != 0.0f) { + if (float(s16(ptr2->mBank)) != 0.0f) { trans->field_0x68 = true; } } @@ -1892,7 +1892,7 @@ bool dCamera_c::maptoolIdEvCamera() { if (mEventData.field_0xc != 0xFF) { s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[mIsWolf][0]; -#ifdef DEBUG +#if DEBUG if (mCurCamStyleTimer == 0) { OSReport("type %d mode %d style %d\n", mEventData.field_0xc, 0, style); } @@ -2541,7 +2541,7 @@ bool dCamera_c::tactEvCamera() { } } -#ifdef DEBUG +#if DEBUG if (mCamSetup.CheckFlag(0x8000)) { dDbVw_Report(20, 250, " %d", tact_p->field_0x0); } @@ -2647,7 +2647,7 @@ bool dCamera_c::loadEvCamera() { dComIfGp_loadCameraPosition(0, &load->field_0x28, &load->field_0x34, &load->field_0x48, &local_b0); load->field_0x42 = cSAngle(local_b0); } else { -#ifdef DEBUG +#if DEBUG if (mSavedViewStack[load->mSlot].field_0x1e == 0 || load->mSlot >= 2) { OS_REPORT("camera: event: LOAD: warning!! slot %d not saved\n", load->mSlot); } @@ -3417,7 +3417,7 @@ bool dCamera_c::fixedFramesEvCamera() { fframes_p->field_0x0 = getEvIntData(&fframes_p->mTimer, "Timer", const_1_val); getEvStringData(&fframes_p->mRelUseMask, "RelUseMask", "oo"); -#ifdef DEBUG +#if DEBUG if (strlen(&fframes_p->mRelUseMask) != 2) { OSReport("camera: event: bad length -> xx\n"); strcpy(&fframes_p->mRelUseMask, "xx"); @@ -3959,7 +3959,7 @@ bool dCamera_c::bspTransEvCamera() { bspTrans->mSplinePath1.Step(); getEvStringData(use1, "Use1", "ooxxxx"); -#ifdef DEBUG +#if DEBUG if (strlen(use1) != 6) { OSReport("camera: event: bad length -> xxxxxx\n"); strcpy(use1, "xxxxxx"); @@ -3979,7 +3979,7 @@ bool dCamera_c::bspTransEvCamera() { bspTrans->mSplinePath2.Step(); getEvStringData(use2, "Use2", "xxooox"); -#ifdef DEBUG +#if DEBUG if (strlen(use2) != 6) { OSReport_Error("camera: event: bad length -> xxxxxx\n"); strcpy(use2, "xxxxxx"); @@ -3994,7 +3994,7 @@ bool dCamera_c::bspTransEvCamera() { if (bspTrans->mRelActor) { getEvStringData(&bspTrans->mRelUseMask, "RelUseMask", "oo"); -#ifdef DEBUG +#if DEBUG if (strlen(&bspTrans->mRelUseMask) != 2) { OSReport_Error("camera: event: bad length -> xx\n"); strcpy(&bspTrans->mRelUseMask, "xx"); diff --git a/src/d/d_event_debug.cpp b/src/d/d_event_debug.cpp index 10fecd3cf4..91aa103807 100644 --- a/src/d/d_event_debug.cpp +++ b/src/d/d_event_debug.cpp @@ -1,4 +1,3 @@ -#ifdef DEBUG #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event_debug.h" @@ -447,5 +446,3 @@ char* dEvDb_flag_base_c::searchDirNameReg(int bit) { return NULL; } - -#endif diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index ef7a0572ae..90c3110e0d 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -329,12 +329,11 @@ int dEvent_manager_c::create() { } bool dEvent_manager_c::setObjectArchive(char* arcname) { - char* rt = NULL; + void* rt = NULL; if (arcname != NULL) { - char* res = (char*)dComIfG_getObjectRes(arcname, DataFileName); - rt = res; - int base_status = mEventList[BASE_ACTOR].init(res, -1); + rt = dComIfG_getObjectRes(arcname, DataFileName); + int base_status = mEventList[BASE_ACTOR].init((char*)rt, -1); #if DEBUG if (base_status) { @@ -641,14 +640,12 @@ void dEvent_manager_c::Sequencer() { break; } - if ( + if ((dStage_MapEvent_dt_c_getEventSCutSW(mapdata) != 0 #if DEBUG - (dStage_MapEvent_dt_c_getEventSCutSW(mapdata) != 0 || l_HIO.m_enable_skip) && - #else - dStage_MapEvent_dt_c_getEventSCutSW(mapdata) != 0 && + || l_HIO.m_enable_skip #endif - !evtControl.chkFlag2(2) - ) { + ) && + !evtControl.chkFlag2(2)) { int scut_type = dStage_MapEvent_dt_c_getEventSCutType(mapdata); if (scut_type == 2) { evtControl.onSkipFade(); @@ -1384,7 +1381,8 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 actorName, BOOL param_1) { shutterActor = fopAcM_Search((fopAcIt_JudgeFunc)findShutterCallBack, &prms); if (shutterActor != NULL && param_1) { cXyz goal(shutterActor->home.pos); - s16 angle = prms.actor->home.angle.y + 0x8000; + s16 angle = prms.actor->home.angle.y; + angle = angle + 0x8000; goal.x += cM_ssin(angle) * 100; goal.z += cM_scos(angle) * 100; diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 9fd7797404..04cd7da9f7 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -485,7 +485,7 @@ void dFile_select_c::dataSelectInAnmSet() { } } - (char*)pSave += 0xa94; + pSave = (dSv_save_c*)((u8*)pSave + 0xa94); if (field_0x025b[i] != 0 || mDataNew[i] != 0) { field_0x0220[i]->setAlpha(0); @@ -2720,7 +2720,7 @@ void dFile_select_c::setSaveData() { mDataNew[i] = res; field_0x025b[i] = 0; } - (char*)pSave += 0xa94; + pSave = (dSv_save_c*)((u8*)pSave + 0xa94); } } @@ -4096,5 +4096,7 @@ void dFile_select3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cXyz* #pragma pop void dFile_select3D_c::calcViewMtx(Mtx param_0) { - cMtx_lookAt(param_0, &cXyz(0.0f, 0.0f, -1000.0f), &cXyz::Zero, &cXyz(0.0f, 1.0f, 0.0f), 0); + cXyz pos1(0.0f, 0.0f, -1000.0f); + cXyz pos2(0.0f, 1.0f, 0.0f); + cMtx_lookAt(param_0, &pos1, &cXyz::Zero, &pos2, 0); } diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 013995e0c1..c2e8e80534 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -4,24 +4,30 @@ #include #include +#include "JSystem/JHostIO/JORFile.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" +#include "c/c_damagereaction.h" #include "d/actor/d_a_kytag08.h" #include "d/actor/d_a_player.h" #include "d/d_bg_s_gnd_chk.h" -#include "d/d_debug_viewer.h" #include "d/d_debug_pad.h" +#include "d/d_debug_viewer.h" +#include "d/d_kankyo_debug.h" #include "d/d_kankyo_rain.h" #include "d/d_kankyo_static.h" -#include "d/d_kankyo_debug.h" #include "d/d_meter2_info.h" #include "d/d_msg_object.h" +#include "f_ap/f_ap_game.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo.h" -#include "f_ap/f_ap_game.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include "c/c_damagereaction.h" + +#if DEBUG +extern "C" int atoi(const char* str); +extern "C" f32 atof(const char* str); +#endif static void GxXFog_set(); @@ -517,30 +523,32 @@ void dKy_twi_wolflight_set(int light_id) { if (g_kankyoHIO.navy.room_light_type != 0) { size = g_kankyoHIO.navy.room_light_type - 1; } - - if (!g_kankyoHIO.navy.camera_light_adjust_ON) { #endif - switch (size) { - case LIGHT_SIZE_S: - kankyo->field_0x0c18[light_id].mPos.y += 1500.0f; - break; - case LIGHT_SIZE_M: - kankyo->field_0x0c18[light_id].mPos.y += 500.0f; - break; - case LIGHT_SIZE_L: - kankyo->field_0x0c18[light_id].mPos.y += 1000.0f; - break; - case LIGHT_SIZE_LL: - kankyo->field_0x0c18[light_id].mPos.y += 1500.0f; - break; - default: - kankyo->field_0x0c18[light_id].mPos.y += 500.0f; - break; - } - #if DEBUG - } else { + if (!g_kankyoHIO.navy.camera_light_adjust_ON) + #endif + { + switch (size) { + case LIGHT_SIZE_S: + kankyo->field_0x0c18[light_id].mPos.y += 1500.0f; + break; + case LIGHT_SIZE_M: + kankyo->field_0x0c18[light_id].mPos.y += 500.0f; + break; + case LIGHT_SIZE_L: + kankyo->field_0x0c18[light_id].mPos.y += 1000.0f; + break; + case LIGHT_SIZE_LL: + kankyo->field_0x0c18[light_id].mPos.y += 1500.0f; + break; + default: + kankyo->field_0x0c18[light_id].mPos.y += 500.0f; + break; + } + } + #if DEBUG + else { kankyo->field_0x0c18[light_id].mPos.y += g_kankyoHIO.navy.camera_light_y_shift; } #endif @@ -706,20 +714,20 @@ static s16 kankyo_color_ratio_set(u8 color_a_start, u8 color_a_end, f32 color_ra s16 a = s16_data_ratio_set(color_a_start, color_a_end, color_ratio); s16 b = s16_data_ratio_set(color_b_start, color_b_end, color_ratio); - s16 blend_color = s16_data_ratio_set(a, b, blend_ratio); - blend_color += add_color; + s16 color = s16_data_ratio_set(a, b, blend_ratio); + color = color + add_color; - s16 calc_color = kankyo->now_allcol_ratio * scale * blend_color; + color = kankyo->now_allcol_ratio * scale * color; - if (calc_color < 0) { - calc_color = 0; + if (color < 0) { + color = 0; } - if (calc_color > 255) { - calc_color = 255; + if (color > 255) { + color = 255; } - return calc_color; + return color; } static f32 fl_data_ratio_set(f32 start, f32 end, f32 ratio) { @@ -877,14 +885,13 @@ int dKy_light_influence_id(cXyz position, int param_1) { int sp8 = 0; int j; int var_r25 = -1; - int i; f32 var_f30 = 800.0f; if (strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0) { var_f30 = 250.0f; } - for (i = 0; i <= param_1; i++) { + for (int i = 0; i <= param_1; i++) { for (j = 0; j < 100; j++) { if (g_env_light.pointlight[j] != NULL && (i == 0 || j != closest_plight_no) && g_env_light.pointlight[j]->mPow > 0.01f) @@ -957,9 +964,9 @@ int dKy_eflight_influence_id(cXyz position, int param_1) { int var_r27 = -1; int var_r26; int sp8 = 0; - int j, i; + int j; - for (i = 0; i <= param_1; i++) { + for (int i = 0; i <= param_1; i++) { for (j = 0; j < 5; j++) { if (g_env_light.efplight[j] != NULL && (i == 0 || j != var_r28)) { if (var_f31 > position.abs(g_env_light.efplight[j]->mPosition) && @@ -1072,10 +1079,8 @@ static void plight_set() { dKy_plight_set(&g_env_light.mLightInfluence[plight_no]); plight_no++; } else { -#ifdef DEBUG // "\nToo many Point Lights set!!!" - OSReport_Warning("\nポイントライトマップ配置が多すぎます！！！"); -#endif + OS_WARNING("\nポイントライトマップ配置が多すぎます！！！"); } } } @@ -1409,14 +1414,14 @@ static void envcolor_init() { g_kankyoHIO.navy.camera_light_col.r = 25; g_kankyoHIO.navy.camera_light_col.g = 90; g_kankyoHIO.navy.camera_light_col.b = 183; - g_kankyoHIO.navy.field_0x2ae = 0xFF; + g_kankyoHIO.navy.camera_light_alpha = 0xFF; g_kankyoHIO.navy.camera_light_y_shift = 1500.0f; g_kankyoHIO.navy.camera_light_power = 1.25f; g_kankyoHIO.navy.camera_light_cutoff = 90.0f; g_kankyoHIO.navy.camera_light_sp = 2; g_kankyoHIO.navy.camera_light_da = 3; g_kankyoHIO.navy.room_light_type = 0; - g_kankyoHIO.navy.field_0x311 = 0; + g_kankyoHIO.navy.use_debug = 0; g_kankyoHIO.navy.field_0x312 = 0; g_kankyoHIO.navy.field_0x314 = 0.0f; g_kankyoHIO.navy.terrain_height_crr = 200.0f; @@ -1460,10 +1465,7 @@ static void envcolor_init() { } #endif - #if DEBUG - if (g_env_light.time_change_rate < 1000.0f) - #endif - { + if (!DEBUG || g_env_light.time_change_rate < 1000.0f) { stage_stag_info_class* stageinfo = dComIfGp_getStage()->getStagInfo(); int stage_time = dStage_stagInfo_GetTimeH(stageinfo); if ((s8)stage_time >= 0) { @@ -1471,14 +1473,11 @@ static void envcolor_init() { } } - #if DEBUG - if (g_env_light.time_change_rate >= 2000.0f) { + if (DEBUG && g_env_light.time_change_rate >= 2000.0f) { g_env_light.time_change_rate = 0.03f; - } else if (g_env_light.time_change_rate >= 1000.0f) { + } else if (DEBUG && g_env_light.time_change_rate >= 1000.0f) { g_env_light.time_change_rate = 0.0f; - } else - #endif - { + } else { g_env_light.time_change_rate = 0.012f; } @@ -2252,7 +2251,23 @@ void dKy_calc_color_set(GXColorS10* out_color_p, color_RGB_class* color_a_start_ } void dScnKy_env_light_c::setLight() { + f32 color_ratio; + + stage_palette_info_class* prev_pal_start_p; + stage_palette_info_class* prev_pal_end_p; + stage_palette_info_class* next_pal_start_p; + stage_palette_info_class* next_pal_end_p; + + stage_vrboxcol_info_class* prev_vrboxcol_start_p; + stage_vrboxcol_info_class* prev_vrboxcol_end_p; + stage_vrboxcol_info_class* next_vrboxcol_start_p; + stage_vrboxcol_info_class* next_vrboxcol_end_p; + + int start_pat_pal_id; + int end_pat_pal_id; u8* init_timer = &g_env_light.light_init_timer; + int i; + f32 sp8C; camera_class* camera_p = dComIfGp_getCamera(0); GXColorS10 add_col; @@ -2297,9 +2312,6 @@ void dScnKy_env_light_c::setLight() { u8 next_pal_start_id; u8 prev_pal_end_id; u8 next_pal_end_id; - f32 color_ratio; - int start_pat_pal_id; - int end_pat_pal_id; setLight_palno_get(&g_env_light.PrevCol, &g_env_light.UseCol, &g_env_light.wether_pat0, &g_env_light.wether_pat1, &prev_pal_start_id, &prev_pal_end_id, &next_pal_start_id, &next_pal_end_id, &color_ratio, &start_pat_pal_id, @@ -2310,17 +2322,17 @@ void dScnKy_env_light_c::setLight() { actor_amb_col.g = 0; actor_amb_col.b = 0; - for (int i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) { bg_amb_col[i].r = 255; bg_amb_col[i].g = 0; bg_amb_col[i].b = 0; bg_amb_col[i].a = 0; } } else { - stage_palette_info_class* prev_pal_start_p = &g_env_light.stage_palette_info[prev_pal_start_id]; - stage_palette_info_class* prev_pal_end_p = &g_env_light.stage_palette_info[prev_pal_end_id]; - stage_palette_info_class* next_pal_start_p = &g_env_light.stage_palette_info[next_pal_start_id]; - stage_palette_info_class* next_pal_end_p = &g_env_light.stage_palette_info[next_pal_end_id]; + prev_pal_start_p = &g_env_light.stage_palette_info[prev_pal_start_id]; + prev_pal_end_p = &g_env_light.stage_palette_info[prev_pal_end_id]; + next_pal_start_p = &g_env_light.stage_palette_info[next_pal_start_id]; + next_pal_end_p = &g_env_light.stage_palette_info[next_pal_end_id]; #if DEBUG if (!g_kankyoHIO.light.m_HOSTIO_setting && !g_kankyoHIO.vrbox.m_VrboxSetting) @@ -2333,7 +2345,7 @@ void dScnKy_env_light_c::setLight() { add_col, g_env_light.field_0x1210 * (g_env_light.now_actcol_ratio * g_env_light.now_actcol_ratio)); - for (int i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) { if (i != 3 || (strcmp(dComIfGp_getStartStageName(), "R_SP127") != 0 && strcmp(dComIfGp_getStartStageName(), "F_SP127") != 0)) { @@ -2380,7 +2392,7 @@ void dScnKy_env_light_c::setLight() { mFogDensity = -1; } - for (int i = 0; i < 6; i++) { + for (i = 0; i < 6; i++) { dKy_calc_color_set(&dungeonlight_col[i], &prev_pal_start_p->plight_col[i], &next_pal_start_p->plight_col[i], &prev_pal_end_p->plight_col[i], &next_pal_end_p->plight_col[i], color_ratio, @@ -2417,6 +2429,11 @@ void dScnKy_env_light_c::setLight() { } } + u8 sp2B; + u8 sp2A; + u8 sp29; + u8 sp28; + u8 prev_bloom_start_id = prev_pal_start_p->bloom_tbl_id; u8 next_bloom_start_id = next_pal_start_p->bloom_tbl_id; u8 prev_bloom_end_id = prev_pal_end_p->bloom_tbl_id; @@ -2438,17 +2455,18 @@ void dScnKy_env_light_c::setLight() { prev_bloom_start_id = next_bloom_start_id = prev_bloom_end_id = next_bloom_end_id = 3; } - f32 temp_f31; if (g_env_light.field_0x12fc >= 0) { prev_bloom_end_id = g_env_light.field_0x12fc; next_bloom_end_id = g_env_light.field_0x12fc; - temp_f31 = color_ratio; + sp8C = color_ratio; color_ratio = g_env_light.field_0x1278; } + GXColor bloom_blend_col; + dKydata_BloomInfo_c* bloomInf0_p; - dKydata_BloomInfo_c* bloomInf1_p; dKydata_BloomInfo_c* bloomInf2_p; + dKydata_BloomInfo_c* bloomInf1_p; dKydata_BloomInfo_c* bloomInf3_p; bloomInf0_p = dKyd_BloomInf_tbl_getp(prev_bloom_start_id); @@ -2471,6 +2489,8 @@ void dScnKy_env_light_c::setLight() { bloomInf0_p->info.mBlurAmount, bloomInf1_p->info.mBlurAmount, color_ratio, bloomInf2_p->info.mBlurAmount, bloomInf3_p->info.mBlurAmount, g_env_light.pat_ratio, 0, 1.0f); + GXColor bloom_mono_col; + if (dKy_darkworld_check()) { static s16 S_fuwan_sin; @@ -2486,7 +2506,6 @@ void dScnKy_env_light_c::setLight() { bloomInf3_p->info.mDensity, g_env_light.pat_ratio, 0, 1.0f); mDoGph_gInf_c::getBloom()->setBlureRatio(sp21); - GXColor bloom_blend_col; bloom_blend_col.r = kankyo_color_ratio_set( bloomInf0_p->info.mColorR, bloomInf1_p->info.mColorR, color_ratio, bloomInf2_p->info.mColorR, bloomInf3_p->info.mColorR, g_env_light.pat_ratio, 0, 1.0f); @@ -2503,10 +2522,9 @@ void dScnKy_env_light_c::setLight() { mDoGph_gInf_c::getBloom()->setBlendColor(bloom_blend_col); if (g_env_light.field_0x12fc >= 0) { - color_ratio = temp_f31; + color_ratio = sp8C; } - GXColor bloom_mono_col; bloom_mono_col.r = kankyo_color_ratio_set( bloomInf0_p->info.mSaturateSubtractR, bloomInf1_p->info.mSaturateSubtractR, color_ratio, bloomInf2_p->info.mSaturateSubtractR, bloomInf3_p->info.mSaturateSubtractR, @@ -2607,20 +2625,20 @@ void dScnKy_env_light_c::setLight() { if (!g_kankyoHIO.light.m_HOSTIO_setting && !g_kankyoHIO.vrbox.m_VrboxSetting) #endif { - - u8 sp2B = prev_pal_start_p->vrboxcol_id; - u8 sp2A = prev_pal_end_p->vrboxcol_id; - u8 sp29 = next_pal_start_p->vrboxcol_id; - u8 sp28 = next_pal_end_p->vrboxcol_id; + + sp2B = prev_pal_start_p->vrboxcol_id; + sp2A = prev_pal_end_p->vrboxcol_id; + sp29 = next_pal_start_p->vrboxcol_id; + sp28 = next_pal_end_p->vrboxcol_id; #if DEBUG dKydb_HIO_vrbox_debug(&sp2B, &sp2A, &sp29, &sp28); #endif - stage_vrboxcol_info_class* prev_vrboxcol_start_p = &g_env_light.stage_vrboxcol_info[sp2B]; - stage_vrboxcol_info_class* prev_vrboxcol_end_p = &g_env_light.stage_vrboxcol_info[sp2A]; - stage_vrboxcol_info_class* next_vrboxcol_start_p = &g_env_light.stage_vrboxcol_info[sp29]; - stage_vrboxcol_info_class* next_vrboxcol_end_p = &g_env_light.stage_vrboxcol_info[sp28]; + prev_vrboxcol_start_p = &g_env_light.stage_vrboxcol_info[sp2B]; + prev_vrboxcol_end_p = &g_env_light.stage_vrboxcol_info[sp2A]; + next_vrboxcol_start_p = &g_env_light.stage_vrboxcol_info[sp29]; + next_vrboxcol_end_p = &g_env_light.stage_vrboxcol_info[sp28]; vrbox_sky_col.r = kankyo_color_ratio_set( prev_vrboxcol_start_p->sky_col.r, prev_vrboxcol_end_p->sky_col.r, color_ratio, @@ -2834,7 +2852,7 @@ void dScnKy_env_light_c::setLight_bg(dKy_tevstr_c* tevstr_p, GXColorS10* bg_col_ plight_colors[i].b = 0; } - J3DLightInfo& light_info = tevstr_p->mLights[i].getLightInfo(); + J3DLightInfo& light_info = *tevstr_p->mLights[i].getLightInfo(); GXColor light_color; light_color.r = plight_colors[i].r; @@ -2930,7 +2948,7 @@ void dScnKy_env_light_c::setLight_actor(dKy_tevstr_c* tevstr_p, GXColorS10* fog_ GXColorS10 plight_col[6]; for (i = 0; i < 6; i++) { - J3DLightInfo* light_info = &tevstr_p->mLights[i].getLightInfo(); + J3DLightInfo* light_info = tevstr_p->mLights[i].getLightInfo(); if (i == 0) { if (tevstr_p->Type == 10 || tevstr_p->Type == 9 || tevstr_p->Material_id != 0) { @@ -2946,7 +2964,7 @@ void dScnKy_env_light_c::setLight_actor(dKy_tevstr_c* tevstr_p, GXColorS10* fog_ plight_col[i].b = 0; } - light_info = &tevstr_p->mLights[i].getLightInfo(); + light_info = tevstr_p->mLights[i].getLightInfo(); GXColor light_col; light_col.r = plight_col[i].r; @@ -3177,6 +3195,7 @@ static void cLib_addCalcU8(u8* i_value, u8 i_target, s16 i_scale, s16 i_maxStep) void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr_c* tevstr_p, GXColorS10 param_2, GXColorS10 param_3, u8 init_timer) { + (void)param_3; dScnKy_env_light_c* kankyo = dKy_getEnvlight(); cXyz light_pos; Vec spDC; @@ -3184,6 +3203,7 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr f32 light_dist; f32 light_power; f32 light_yuragi; + BOOL sp44; int sp40 = 0; int sp3C = 0; int light_inf_id; @@ -3192,11 +3212,11 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr daPy_py_c* player = daPy_getPlayerActorClass(); if (pos_p != NULL) { - J3DLightInfo* light_info = &tevstr_p->mLightObj.getLightInfo(); + J3DLightInfo* light_info = tevstr_p->mLightObj.getLightInfo(); light_info->mColor.a = 0xFF; light_inf_id = dKy_light_influence_id(*pos_p, 0); - BOOL sp44 = 0; + sp44 = 0; if (tevstr_p->Type == 7 || tevstr_p->Type == 1 || ((tevstr_p->Type == 2 || tevstr_p->Type == 6 || tevstr_p->Type == 3) && @@ -3241,7 +3261,7 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr { cXyz camfwd; camera_class* camera = (camera_class*)dComIfGp_getCamera(0); - J3DLightInfo* light0_info = &tevstr_p->mLights[0].getLightInfo(); + J3DLightInfo* light0_info = tevstr_p->mLights[0].getLightInfo(); sp9 = 1; dKyr_get_vectle_calc(&camera->lookat.center, &camera->lookat.eye, &camfwd); @@ -3287,9 +3307,9 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr #endif } } else if (dComIfG_play_c::getLayerNo(0) == 1 && tevstr_p->Type == 0) { - field_0x10f8.r = 0x3C; - field_0x10f8.g = 0x5F; - field_0x10f8.b = 0x64; + field_0x10f8.r = 60; + field_0x10f8.g = 95; + field_0x10f8.b = 100; light_pos.y += -800.0f; light_power = 150.0f; @@ -3368,7 +3388,7 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr } break; case 7: { - f32 sp34 = tevstr_p->TevColor.a / 255.0f; + sp34 = tevstr_p->TevColor.a / 255.0f; field_0x10f8.r = 180; field_0x10f8.g = 180; field_0x10f8.b = 180; @@ -3399,15 +3419,15 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr } break; } - } - #if DEBUG - if (tevstr_p->Type >= 1 && tevstr_p->Type <= 9 && g_kankyoHIO.navy.adjust_light_mode == 2) { - field_0x10f8.r = (s16)g_kankyoHIO.navy.adjust_light_dif0_col_R; - field_0x10f8.g = (s16)g_kankyoHIO.navy.adjust_light_dif0_col_G; - field_0x10f8.b = (s16)g_kankyoHIO.navy.adjust_light_dif0_col_B; + #if DEBUG + if (tevstr_p->Type >= 1 && tevstr_p->Type <= 9 && g_kankyoHIO.navy.adjust_light_mode == 2) { + field_0x10f8.r = (s16)g_kankyoHIO.navy.adjust_light_dif0_col_R; + field_0x10f8.g = (s16)g_kankyoHIO.navy.adjust_light_dif0_col_G; + field_0x10f8.b = (s16)g_kankyoHIO.navy.adjust_light_dif0_col_B; + } + #endif } - #endif } } else { light_pos = dKy_light_influence_pos(light_inf_id); @@ -3480,6 +3500,7 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr if (init_timer != 0 || sp40 != 0 || tevstr_p->field_0x384 != 0) { tevstr_p->field_0x32c = light_pos; } else { + f32 sp1C; f32 sp18 = pos_p->abs(tevstr_p->field_0x32c); f32 sp14 = sp18 / 10000.0f; if (sp14 > 1.0f) { @@ -3495,7 +3516,7 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr var_f28 = 1.0f - var_f28; var_f28 *= var_f28 * var_f28; - f32 sp1C = 10.0f + (10000.0f * sp14) + (100.0f * var_f28); + sp1C = 10.0f + (10000.0f * sp14) + (100.0f * var_f28); cLib_addCalc(&tevstr_p->field_0x32c.x, light_pos.x, 0.5f, sp1C, 0.001f); cLib_addCalc(&tevstr_p->field_0x32c.y, light_pos.y, 0.5f, sp1C, 0.001f); cLib_addCalc(&tevstr_p->field_0x32c.z, light_pos.z, 0.5f, sp1C, 0.001f); @@ -3618,6 +3639,9 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevstr_c* tevstr_p) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); fopAc_ac_c* player = dComIfGp_getPlayer(0); + + f32 fog_near; + f32 fog_far; int sp58 = 0; int sp54 = -1; @@ -3627,9 +3651,6 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst GXColorS10 amb_col; GXColorS10 fog_tev_col; - f32 fog_near; - f32 fog_far; - cXyz pos; if (tevstr_p->room_no < 0) { tevstr_p->room_no = dComIfGp_roomControl_getStayNo(); @@ -3704,7 +3725,7 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst dKyr_get_vectle_calc(&pos, &camera_p->lookat.eye, &calc_pos); for (int i = 0; i < 6; i++) { - J3DLightInfo& light_info = tevstr_p->mLights[i].getLightInfo(); + J3DLightInfo& light_info = *tevstr_p->mLights[i].getLightInfo(); if (i == 0) { if (!dKy_darkworld_check()) { @@ -3785,6 +3806,7 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst light_info.mLightDirection.z = -light_info.mLightDirection.z; } + J3DLightInfo* light_info; MtxP view_mtx = j3dSys.getViewMtx(); Vec sp8C; Vec sp80; @@ -3793,25 +3815,25 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst sp80.y = camera_p->lookat.eye.y; sp80.z = camera_p->lookat.eye.z; - J3DLightInfo& light_info = tevstr_p->mLightObj.getLightInfo(); + light_info = tevstr_p->mLightObj.getLightInfo(); cMtx_multVec(view_mtx, &sp80, &sp8C); - light_info.mLightPosition = sp8C; + light_info->mLightPosition = sp8C; tevstr_p->field_0x32c = sp80; tevstr_p->mLightPosWorld = sp80; - light_info.mLightDirection = g_env_light.field_0x1064; + light_info->mLightDirection = g_env_light.field_0x1064; - light_info.mColor.r = 0; - light_info.mColor.g = 0; - light_info.mColor.b = 0; + light_info->mColor.r = 0; + light_info->mColor.g = 0; + light_info->mColor.b = 0; - light_info.mCosAtten.x = 1.0f; - light_info.mCosAtten.y = 0.0f; - light_info.mCosAtten.z = 0.0f; + light_info->mCosAtten.x = 1.0f; + light_info->mCosAtten.y = 0.0f; + light_info->mCosAtten.z = 0.0f; - light_info.mDistAtten.x = 1.0f; - light_info.mDistAtten.y = 0.0f; - light_info.mDistAtten.z = 0.0f; + light_info->mDistAtten.x = 1.0f; + light_info->mDistAtten.y = 0.0f; + light_info->mDistAtten.z = 0.0f; } else if (tevstrType == 12 || tevstrType == 13) { MtxP sp3C = j3dSys.getViewMtx(); camera_class* camera_p = (camera_class*)dComIfGp_getCamera(0); @@ -3864,7 +3886,7 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst for (int i = 0; i < 6; i++) { camera_class* sp30 = dComIfGp_getCamera(0); - J3DLightInfo& temp_r31 = tevstr_p->mLights[i].getLightInfo(); + J3DLightInfo& temp_r31 = *tevstr_p->mLights[i].getLightInfo(); if (i == 0) { if (tevstrType == 12) { @@ -3936,6 +3958,7 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst temp_r31.mLightDirection.z = -temp_r31.mLightDirection.z; } + J3DLightInfo* light_info; MtxP view_mtx = j3dSys.getViewMtx(); Vec sp74; Vec sp68; @@ -3944,28 +3967,28 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst sp68.y = camera_p->lookat.eye.y; sp68.z = camera_p->lookat.eye.z; - J3DLightInfo& light_info = tevstr_p->mLightObj.getLightInfo(); + light_info = tevstr_p->mLightObj.getLightInfo(); cMtx_multVec(view_mtx, &sp68, &sp74); - light_info.mLightPosition = sp74; + light_info->mLightPosition = sp74; if (tevstrType == 13) { tevstr_p->field_0x32c = sp68; tevstr_p->mLightPosWorld = sp68; } - light_info.mLightDirection = g_env_light.field_0x1064; + light_info->mLightDirection = g_env_light.field_0x1064; - light_info.mColor.r = 0; - light_info.mColor.g = 0; - light_info.mColor.b = 0; + light_info->mColor.r = 0; + light_info->mColor.g = 0; + light_info->mColor.b = 0; - light_info.mCosAtten.x = 1.0f; - light_info.mCosAtten.y = 0.0f; - light_info.mCosAtten.z = 0.0f; + light_info->mCosAtten.x = 1.0f; + light_info->mCosAtten.y = 0.0f; + light_info->mCosAtten.z = 0.0f; - light_info.mDistAtten.x = 1.0f; - light_info.mDistAtten.y = 0.0f; - light_info.mDistAtten.z = 0.0f; + light_info->mDistAtten.x = 1.0f; + light_info->mDistAtten.y = 0.0f; + light_info->mDistAtten.z = 0.0f; } else if (!(tevstrType & 0xF0)) { tevstr_p->mLightMode = 1; @@ -4082,6 +4105,7 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst sp54 = tevstrType & 3; field_0x10f0 = BG_col[sp54]; + J3DLightInfo* light_info; MtxP view_mtx = j3dSys.getViewMtx(); Vec sp5C; cXyz pos; @@ -4095,43 +4119,44 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst if (var_r25_3 == 1) { pos = g_env_light.pointlight[light_inf_id]->mPosition; - J3DLightInfo& light_info = tevstr_p->mLightObj.getLightInfo(); + light_info = tevstr_p->mLightObj.getLightInfo(); cMtx_multVec(view_mtx, &pos, &sp5C); - light_info.mLightPosition = sp5C; + light_info->mLightPosition = sp5C; tevstr_p->field_0x32c = pos; - light_info.mLightDirection = g_env_light.field_0x1064; + light_info->mLightDirection = g_env_light.field_0x1064; - light_info.mColor.a = g_env_light.pointlight[light_inf_id]->mColor.a; - light_info.mColor.r = g_env_light.pointlight[light_inf_id]->mColor.r; - light_info.mColor.g = g_env_light.pointlight[light_inf_id]->mColor.g; - light_info.mColor.b = g_env_light.pointlight[light_inf_id]->mColor.b; - dKy_GXInitLightSpot(&light_info, 90.0f, GX_SP_OFF); - dKy_GXInitLightDistAttn(&light_info, + light_info->mColor.a = g_env_light.pointlight[light_inf_id]->mColor.a; + light_info->mColor.r = g_env_light.pointlight[light_inf_id]->mColor.r; + light_info->mColor.g = g_env_light.pointlight[light_inf_id]->mColor.g; + light_info->mColor.b = g_env_light.pointlight[light_inf_id]->mColor.b; + dKy_GXInitLightSpot(light_info, 90.0f, GX_SP_OFF); + dKy_GXInitLightDistAttn(light_info, g_env_light.pointlight[light_inf_id]->mPow * 0.001f, 0.99999f, GX_DA_STEEP); } else { + J3DLightInfo* light_info; MtxP view_mtx = j3dSys.getViewMtx(); - J3DLightInfo& light_info = tevstr_p->mLightObj.getLightInfo(); + light_info = tevstr_p->mLightObj.getLightInfo(); Vec sp44; cMtx_multVec(view_mtx, &lightStatusData[0].position, &sp44); - light_info.mLightPosition = sp44; + light_info->mLightPosition = sp44; tevstr_p->field_0x32c = lightStatusData[0].position; - light_info.mLightDirection = g_env_light.field_0x1064; + light_info->mLightDirection = g_env_light.field_0x1064; - light_info.mColor.r = 0; - light_info.mColor.g = 0; - light_info.mColor.b = 0; + light_info->mColor.r = 0; + light_info->mColor.g = 0; + light_info->mColor.b = 0; - light_info.mCosAtten.x = 0.0f; - light_info.mCosAtten.y = 0.0f; - light_info.mCosAtten.z = 0.0f; + light_info->mCosAtten.x = 0.0f; + light_info->mCosAtten.y = 0.0f; + light_info->mCosAtten.z = 0.0f; - light_info.mDistAtten.x = 0.0f; - light_info.mDistAtten.y = 0.0f; - light_info.mDistAtten.z = 0.0f; + light_info->mDistAtten.x = 0.0f; + light_info->mDistAtten.y = 0.0f; + light_info->mDistAtten.z = 0.0f; } tevstr_p->mLightPosWorld = kankyo->base_light.mPosition; @@ -4168,11 +4193,12 @@ static void setLightTevColorType_MAJI_sub(J3DMaterial* material_p, dKy_tevstr_c* int lightType) { int i; dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + J3DLightInfo* sp20; MtxP view_mtx = j3dSys.getViewMtx(); + GXColor amb_col; camera_class* camera = (camera_class*)dComIfGp_getCamera(0); if (tevstr_p != NULL) { - GXColor amb_col; amb_col.r = tevstr_p->AmbCol.r; amb_col.g = tevstr_p->AmbCol.g; amb_col.b = tevstr_p->AmbCol.b; @@ -4242,7 +4268,7 @@ static void setLightTevColorType_MAJI_sub(J3DMaterial* material_p, dKy_tevstr_c* MtxP sp10 = j3dSys.getViewMtx(); if (sp10 != NULL) { Vec sp28; - J3DLightInfo* sp20 = &tevstr_p->mLightObj.getLightInfo(); + sp20 = tevstr_p->mLightObj.getLightInfo(); cMtx_multVec(sp10, &tevstr_p->field_0x32c, &sp28); sp20->mLightPosition = sp28; } @@ -4304,11 +4330,11 @@ static void setLightTevColorType_MAJI_sub(J3DMaterial* material_p, dKy_tevstr_c* kankyo->global_maple_col_change[i].light_obj = tevstr_p->mLights[i]; J3DLightInfo* sp8 = - &kankyo->global_maple_col_change[1].light_obj.getLightInfo(); - var_r28 = &kankyo->global_maple_col_change[i].light_obj.getLightInfo(); + kankyo->global_maple_col_change[1].light_obj.getLightInfo(); + var_r28 = kankyo->global_maple_col_change[i].light_obj.getLightInfo(); sp8->mColor = var_r28->mColor; } else { - var_r28 = &kankyo->global_maple_col_change[i].light_obj.getLightInfo(); + var_r28 = kankyo->global_maple_col_change[i].light_obj.getLightInfo(); } maple_color.r = @@ -4478,7 +4504,7 @@ void dScnKy_env_light_c::setLightTevColorType_MAJI(J3DModelData* modelData_p, tevstr_p->Material_use_fg); } #endif - + if (tevstr_p->Material_use_fg != 123) { dKy_tevstr_init(tevstr_p, dComIfGp_roomControl_getStayNo(), 0xFF); } @@ -4893,14 +4919,14 @@ void dKankyo_lightHIO_c::genMessage(JORMContext* mctx) { // ● Adjustment of kantera, wolf lights, and underwater lights. mctx->genLabel("●カンテラ・狼ライト・水中ライトの調整", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genCheckBox("調整開始", &g_kankyoHIO.navy.field_0x311, 1, 0, NULL, 0xFFFF, + mctx->genCheckBox("調整開始", &g_kankyoHIO.navy.use_debug, 1, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider("地形のみ高さ補正", &g_kankyoHIO.navy.terrain_height_crr, -5000.0, - 5000.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider("影響力　倍率", &g_kankyoHIO.navy.influence_multiplier, 0.0, - 100.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider("cutoff　倍率", &g_kankyoHIO.navy.cutoff_multiplier, 0.01, - 10.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + mctx->genSlider("地形のみ高さ補正", &g_kankyoHIO.navy.terrain_height_crr, -5000.0f, + 5000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + mctx->genSlider("影響力　倍率", &g_kankyoHIO.navy.influence_multiplier, 0.0f, + 100.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + mctx->genSlider("cutoff　倍率", &g_kankyoHIO.navy.cutoff_multiplier, 0.01f, + 10.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genLabel("● 部屋ライトタイプのＳｍＬLL切り替え（調整用）", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->startComboBox("選択", &g_kankyoHIO.navy.room_light_type, 0, NULL, 0xFFFF, @@ -4953,8 +4979,8 @@ void dKankyo_lightHIO_c::genMessage(JORMContext* mctx) { 0xFFFF, 0x200, 0x18); mctx->genLabel("● カラーパレットごとに入っている設定値", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider("地形ライト影響率 ", &g_env_light.bg_light_influence, 0.0, - 2.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + mctx->genSlider("地形ライト影響率 ", &g_env_light.bg_light_influence, 0.0f, + 2.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider("雲影の濃さ ", &g_env_light.mFogDensity, 0, 0xff, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); @@ -5131,9 +5157,9 @@ void dKankyo_lightHIO_c::genMessage(JORMContext* mctx) { mctx->genButton("RGB同時加算 -100", 0x40000033, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genLabel("", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider(" near", &g_env_light.mFogNear, -2500000.0, 2500000.0, 0, + mctx->genSlider(" near", &g_env_light.mFogNear, -2500000.0f, 2500000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider(" far", &g_env_light.mFogFar, -2500000.0, 2500000.0, 0, + mctx->genSlider(" far", &g_env_light.mFogFar, -2500000.0f, 2500000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genLabel("", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); @@ -5361,13 +5387,13 @@ void dKankyo_lightHIO_c::genMessage(JORMContext* mctx) { mctx->genLabel("", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider("位置Ｘ", &g_env_light.dungeonlight[i].mPosition.x, - -300000.0, 300000.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + -300000.0f, 300000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider(" Ｙ", &g_env_light.dungeonlight[i].mPosition.y, - -300000.0, 300000.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + -300000.0f, 300000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider(" Ｚ", &g_env_light.dungeonlight[i].mPosition.z, - -300000.0, 300000.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + -300000.0f, 300000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider("ref_distance", - &g_env_light.dungeonlight[i].mRefDistance, 0.01, 10000.0, + &g_env_light.dungeonlight[i].mRefDistance, 0.01, 10000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->startComboBox("距離減衰　○推奨", &g_env_light.dungeonlight[i].mDistAttenuation, 0, NULL, @@ -5391,12 +5417,12 @@ void dKankyo_lightHIO_c::genMessage(JORMContext* mctx) { mctx->genLabel("角度減衰をポイント以外に設定したらスポットライトなので以下も設定を！", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider("カットオフ角度", - &g_env_light.dungeonlight[i].mCutoffAngle, 0.001, 90.0, + &g_env_light.dungeonlight[i].mCutoffAngle, 0.001, 90.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider("Ｘ角度(紫軸)", &g_env_light.dungeonlight[i].mAngleX, - -360.0, 360.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + -360.0f, 360.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider("Ｙ角度(緑軸)", &g_env_light.dungeonlight[i].mAngleY, - -360.0, 360.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + -360.0f, 360.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genLabel("", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); } @@ -5407,19 +5433,19 @@ void dKankyo_lightHIO_c::genMessage(JORMContext* mctx) { 0xFFFF, 0x200, 0x18); mctx->genLabel("調整した値をマップツールで「地形反映えせライト」のパラメータへ指定して下さい", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider("位置Ｘ", &g_kankyoHIO.light.m_BG_fakelight_pos.x, -300000.0, - 300000.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider(" Ｙ", &g_kankyoHIO.light.m_BG_fakelight_pos.y, -300000.0, - 300000.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider(" Ｚ", &g_kankyoHIO.light.m_BG_fakelight_pos.z, -300000.0, - 300000.0, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + mctx->genSlider("位置Ｘ", &g_kankyoHIO.light.m_BG_fakelight_pos.x, -300000.0f, + 300000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + mctx->genSlider(" Ｙ", &g_kankyoHIO.light.m_BG_fakelight_pos.y, -300000.0f, + 300000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); + mctx->genSlider(" Ｚ", &g_kankyoHIO.light.m_BG_fakelight_pos.z, -300000.0f, + 300000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider("Color R", &g_kankyoHIO.light.m_BG_fakelight_R, 0, 0xff, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider(" G", &g_kankyoHIO.light.m_BG_fakelight_G, 0, 0xff, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genSlider(" B", &g_kankyoHIO.light.m_BG_fakelight_B, 0, 0xff, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); - mctx->genSlider("Power ", &g_kankyoHIO.light.m_BG_fakelight_power, 0.0, 1000.0, + mctx->genSlider("Power ", &g_kankyoHIO.light.m_BG_fakelight_power, 0.0f, 1000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); mctx->genLabel("", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18); @@ -5578,7 +5604,608 @@ void dKankyo_lightHIO_c::dKankyo_lightHIOInfoUpDateF() { } void dKankyo_lightHIO_c::listenPropertyEvent(const JORPropertyEvent* property) { - // DEBUG NONMATCHING + char colorPaletteInBuf[1000]; + char lightDirInBuf[5000]; + char colorPaletteOutBuf[5000]; + char lightDirOutBuf[5000]; + char colorPaletteScratchBuf[100]; + char lightDirScratchBuf[100]; + + JORReflexible::listenPropertyEvent(property); + JORFile file; + int i; + switch ((uintptr_t)property->id) { + case 0x40000001: { + if (file.open(1, "カラーパレット(*.csv)\0*.csv\0", "csv", "NULL", "_P.csv")) { + int cursor = 0; + + memset(colorPaletteInBuf, 0x20, 1000); + file.readData(colorPaletteInBuf, 0); + cursor += 243; + cursor -= 1; + cursor += 5; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_kankyoHIO.bloom.m_saturationPattern = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.actor_amb_col.r = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.actor_amb_col.g = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.actor_amb_col.b = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + for (i = 0; i < 4; i++) { + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.bg_amb_col[i].r = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.bg_amb_col[i].g = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.bg_amb_col[i].b = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + if (i == 1) { + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.bg_amb_col[1].a = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.bg_amb_col[2].a = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + } else if (i == 3) { + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.bg_amb_col[3].a = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + } + } + + for (i = 0; i < 6; i++) { + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.dungeonlight[i].mColor.r = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.dungeonlight[i].mColor.g = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.dungeonlight[i].mColor.b = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + } + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.fog_col.r = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.fog_col.g = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.fog_col.b = (u8)atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 0x10); + g_env_light.mFogNear = (f64)atof(colorPaletteScratchBuf); + cursor += 17; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 0x10); + g_env_light.mFogFar = (f64)atof(colorPaletteScratchBuf); + cursor += 17; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.mFogDensity = atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 3); + g_env_light.field_0x12f9 = atoi(colorPaletteScratchBuf); + cursor += 4; + + memset(colorPaletteScratchBuf, 0, 100); + memcpy(colorPaletteScratchBuf, colorPaletteInBuf + cursor, 4); + g_env_light.bg_light_influence = (f64)atof(colorPaletteScratchBuf); + cursor += 4; + + file.close(); + + g_kankyoHIO.light.field_0x52 = 0; + } else { + OS_REPORT("!!!!!!! read error\n"); + } + + break; + } + case 0x41000001: { + // "Light direction file" + if (file.open(1, "ライト方向ファイル(*.csv)\0*.csv\0", "csv", "NULL", "_L.csv")) { + int cursor = 0; + memset(lightDirInBuf, 0x20, 5000); + + file.readData(lightDirInBuf, 0); + + cursor += 136; + cursor -= 1; + + g_kankyoHIO.dungeonLight.usedLights = 6; + int i; + for (i = 0; i < 7; i++) { + cursor += 7; + + OS_REPORT("\n[%s]", lightDirInBuf + cursor); + + if (memcmp(lightDirInBuf + cursor, ",,部屋毎のライト,", 0x11)) { + g_kankyoHIO.dungeonLight.usedLights = i; + break; + } + + cursor += 18; + cursor -= 1; + + memset(lightDirScratchBuf, 0, 100); + memcpy(lightDirScratchBuf, lightDirInBuf + cursor, 0x10); + g_env_light.dungeonlight[i].mPosition.x = (f64)atof(lightDirScratchBuf); + cursor += 17; + + memset(lightDirScratchBuf, 0, 100); + memcpy(lightDirScratchBuf, lightDirInBuf + cursor, 0x10); + g_env_light.dungeonlight[i].mPosition.y = (f64)atof(lightDirScratchBuf); + cursor += 17; + + memset(lightDirScratchBuf, 0, 100); + memcpy(lightDirScratchBuf, lightDirInBuf + cursor, 0x10); + g_env_light.dungeonlight[i].mPosition.z = (f64)atof(lightDirScratchBuf); + cursor += 17; + + memset(lightDirScratchBuf, 0, 100); + memcpy(lightDirScratchBuf, lightDirInBuf + cursor, 0x10); + g_env_light.dungeonlight[i].mRefDistance = (f64)atof(lightDirScratchBuf); + cursor += 17; + + memset(lightDirScratchBuf, 0, 100); + memcpy(lightDirScratchBuf, lightDirInBuf + cursor, 0x10); + g_env_light.dungeonlight[i].mAngleX = (f64)atof(lightDirScratchBuf); + cursor += 17; + + memset(lightDirScratchBuf, 0, 100); + memcpy(lightDirScratchBuf, lightDirInBuf + cursor, 0x10); + g_env_light.dungeonlight[i].mAngleY = (f64)atof(lightDirScratchBuf); + cursor += 17; + + memset(lightDirScratchBuf, 0, 100); + memcpy(lightDirScratchBuf, lightDirInBuf + cursor, 0x10); + g_env_light.dungeonlight[i].mCutoffAngle = (f64)atof(lightDirScratchBuf); + cursor += 17; + + if (memcmp(lightDirInBuf + cursor, "ポイント,", 9) == 0) { + cursor += 9; + g_env_light.dungeonlight[i].mAngleAttenuation = 0; + } else if (memcmp(lightDirInBuf + cursor, "直角,", 5) == 0) { + cursor += 5; + g_env_light.dungeonlight[i].mAngleAttenuation = 1; + } else if (memcmp(lightDirInBuf + cursor, "COS曲線,", 8) == 0) { + cursor += 8; + g_env_light.dungeonlight[i].mAngleAttenuation = 2; + } else if (memcmp(lightDirInBuf + cursor, "COS2曲線,", 9) == 0) { + cursor += 9; + g_env_light.dungeonlight[i].mAngleAttenuation = 3; + } else if (memcmp(lightDirInBuf + cursor, "シャープ,", 9) == 0) { + cursor += 9; + g_env_light.dungeonlight[i].mAngleAttenuation = 4; + } else if (memcmp(lightDirInBuf + cursor, "リング状,", 9) == 0) { + cursor += 9; + g_env_light.dungeonlight[i].mAngleAttenuation = 5; + } else if (memcmp(lightDirInBuf + cursor, "リング状2,", 10) == 0) { + cursor += 10; + g_env_light.dungeonlight[i].mAngleAttenuation = 6; + } + + if (memcmp(lightDirInBuf + cursor, "減衰なし,", 9) == 0) { + cursor += 9; + g_env_light.dungeonlight[i].mDistAttenuation = 0; + } else if (memcmp(lightDirInBuf + cursor, "おだやか,", 9) == 0) { + cursor += 9; + g_env_light.dungeonlight[i].mDistAttenuation = 1; + } else if (memcmp(lightDirInBuf + cursor, "中間,", 5) == 0) { + cursor += 5; + g_env_light.dungeonlight[i].mDistAttenuation = 2; + } else if (memcmp(lightDirInBuf + cursor, "険しい,", 7) == 0) { + cursor += 7; + g_env_light.dungeonlight[i].mDistAttenuation = 3; + } + + cursor += 6; + cursor -= 1; + } + + file.close(); + + g_kankyoHIO.light.field_0x52 = 0; + } else { + OS_REPORT("read2 error\n"); + } + + break; + } + case 0x40000002: { + // "Color palette" + if (file.open(6, "カラーパレット(*.csv)\0*.csv\0", "csv", "NULL", "_P.csv")) { + int cursor = 0; + + memset(colorPaletteOutBuf, 0x20, 5000); + memcpy(colorPaletteOutBuf, + "no,l_no,LayerName,comment,VRBOXNO,SAF_NUM,A_AMCOL," + "BG0_AMCOL,BG1_AMCOL,BG1_AM_A,BG1_AM_A2,BG2_AMCOL,BG3_AMCOL,BG3_AM_A," + "LIGHT0_COL,LIGHT1_COL,LIGHT2_COL,LIGHT3_COL,LIGHT4_COL,LIGHT5_COL," + "FOG_COL,FOGNEAR,FOGFAR,CLOUD_SHADOW,MONO_FILTER,LIGHT_INF\n", + 243); + + cursor += 243; + cursor -= 1; + + memcpy(colorPaletteOutBuf + cursor, ",,,,,", 5); + cursor += 5; + + sprintf(colorPaletteOutBuf + cursor, "%03d,", g_kankyoHIO.bloom.m_saturationPattern); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%03d/", g_env_light.actor_amb_col.r); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%03d/", g_env_light.actor_amb_col.g); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%03d,", g_env_light.actor_amb_col.b); + cursor += 4; + + for (i = 0; i < 4; i++) { + sprintf(colorPaletteOutBuf + cursor, "%03d/", g_env_light.bg_amb_col[i].r); + cursor += 4; + sprintf(colorPaletteOutBuf + cursor, "%03d/", g_env_light.bg_amb_col[i].g); + cursor += 4; + sprintf(colorPaletteOutBuf + cursor, "%03d,", g_env_light.bg_amb_col[i].b); + cursor += 4; + + if (i == 1) { + sprintf(colorPaletteOutBuf + cursor, "%03d,", g_env_light.bg_amb_col[1].a); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%03d,", g_env_light.bg_amb_col[2].a); + cursor += 4; + } else if (i == 3) { + sprintf(colorPaletteOutBuf + cursor, "%03d,", g_env_light.bg_amb_col[3].a); + cursor += 4; + } + } + + for (i = 0; i < 6; i++) { + sprintf(colorPaletteOutBuf + cursor, "%03d/", + g_env_light.dungeonlight[i].mColor.r); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%03d/", + g_env_light.dungeonlight[i].mColor.g); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%03d,", + g_env_light.dungeonlight[i].mColor.b); + cursor += 4; + } + + sprintf(colorPaletteOutBuf + cursor, "%03d/", g_env_light.fog_col.r); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%03d/", g_env_light.fog_col.g); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%03d,", g_env_light.fog_col.b); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%16f,", g_env_light.mFogNear); + cursor += 17; + + sprintf(colorPaletteOutBuf + cursor, "%16f,", g_env_light.mFogFar); + cursor += 17; + + sprintf(colorPaletteOutBuf + cursor, "%03d,", g_env_light.mFogDensity); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%03d,", g_env_light.field_0x12f9); + cursor += 4; + + sprintf(colorPaletteOutBuf + cursor, "%-1.2f", g_env_light.bg_light_influence); + cursor += 4; + + file.writeData(colorPaletteOutBuf, cursor); + file.close(); + + OS_REPORT("write append success %d\n", 0x1330); + } else { + OS_REPORT("write append error\n"); + } + + break; + } + case 0x40000004: + g_kankyoHIO.dungeonLight.field_0x8 = 0x1; + break; + case 0x40000005: + g_kankyoHIO.dungeonLight.field_0x8 = 0x2; + break; + case 0x40000006: + g_kankyoHIO.dungeonLight.field_0x8 = 0x3; + break; + case 0x40000007: + g_kankyoHIO.dungeonLight.field_0x8 = 0x4; + break; + case 0x40000008: + g_kankyoHIO.dungeonLight.field_0x8 = 0x5; + break; + case 0x40000009: + g_kankyoHIO.dungeonLight.field_0x8 = 0x6; + break; + case 0x400000a0: + g_kankyoHIO.dungeonLight.field_0x8 = 0xa0; + break; + case 0x400000a1: + g_kankyoHIO.dungeonLight.field_0x8 = 0xa1; + break; + case 0x400000a2: + g_kankyoHIO.dungeonLight.field_0x8 = 0xa2; + break; + case 0x400000a3: + g_kankyoHIO.dungeonLight.field_0x8 = 0xa3; + break; + case 0x400000a4: + g_kankyoHIO.dungeonLight.field_0x8 = 0xa4; + break; + case 0x400000a5: + g_kankyoHIO.dungeonLight.field_0x8 = 0xa5; + break; + case 0x4000000a: + g_kankyoHIO.dungeonLight.field_0x8 = 0xa; + break; + case 0x4000000b: + g_kankyoHIO.dungeonLight.field_0x8 = 0xb; + break; + case 0x4000000c: + g_kankyoHIO.dungeonLight.field_0x8 = 0xc; + break; + case 0x4000000d: + g_kankyoHIO.dungeonLight.field_0x8 = 0xd; + break; + case 0x4000000e: + g_kankyoHIO.dungeonLight.field_0x8 = 0xe; + break; + case 0x4000000f: + g_kankyoHIO.dungeonLight.field_0x8 = 0xf; + break; + case 0x40000010: + case 0x40000011: + case 0x40000012: + case 0x40000013: + case 0x40000014: + case 0x40000015: + field_0x60 = (uintptr_t)property->id - 0x4000000f; + break; + case 0x40000016: + case 0x40000017: + case 0x40000018: + case 0x40000019: + case 0x4000001a: + case 0x4000001b: + field_0x61 = (uintptr_t)property->id - 0x40000015; + break; + case 0x4000001c: + case 0x4000001d: + case 0x4000001e: + case 0x4000001f: + case 0x40000020: + case 0x40000021: + field_0x62 = (uintptr_t)property->id - 0x4000001b; + break; + case 0x40000022: + case 0x40000023: + case 0x40000024: + case 0x40000025: + case 0x40000026: + case 0x40000027: + field_0x63 = (uintptr_t)property->id - 0x40000021; + break; + case 0x40000028: + case 0x40000029: + case 0x4000002a: + case 0x4000002b: + case 0x4000002c: + case 0x4000002d: + field_0x64 = (uintptr_t)property->id - 0x40000027; + break; + case 0x4000002e: + case 0x4000002f: + case 0x40000030: + case 0x40000031: + case 0x40000032: + case 0x40000033: + field_0x65 = (uintptr_t)property->id - 0x4000002d; + break; + case 0x40000034: + case 0x40000035: + case 0x40000036: + case 0x40000037: + case 0x40000038: + case 0x40000039: + field_0x66 = (uintptr_t)property->id - 0x40000033; + break; + case 0x4000003a: + case 0x4000003b: + case 0x4000003c: + case 0x4000003d: + case 0x4000003e: + case 0x4000003f: + field_0x67 = (uintptr_t)property->id - 0x40000039; + break; + case 0x40000040: + case 0x40000041: + case 0x40000042: + case 0x40000043: + case 0x40000044: + case 0x40000045: + field_0x68 = (uintptr_t)property->id - 0x4000003f; + break; + case 0x40000046: + case 0x40000047: + case 0x40000048: + case 0x40000049: + case 0x4000004a: + case 0x4000004b: + field_0x69 = (uintptr_t)property->id - 0x40000045; + break; + case 0x4000004c: + case 0x4000004d: + case 0x4000004e: + case 0x4000004f: + case 0x40000050: + case 0x40000051: + field_0x6a = (uintptr_t)property->id - 0x4000004b; + break; + case 0x40000052: + case 0x40000053: + case 0x40000054: + case 0x40000055: + case 0x40000056: + case 0x40000057: + field_0x6b = (uintptr_t)property->id - 0x40000051; + break; + case 0x40000003: { + // "light direction file" + if (file.open(6, "ライト方向ファイル(*.csv)\0*.csv\0", "csv", "NULL", "_L.csv")) { + int cursor = 0; + memset(lightDirOutBuf, 0x20, 5000); + memcpy(lightDirOutBuf, + "no,MultiFileName,LayerName,name,pos_x,pos_y,pos_z,ref_distance,angX,angY," + "cutoff,spot_func,dist_func,action_type,SW_KIND,BitSW,SW_LIGHT\n", + 0x88); + cursor += 0x88; + cursor -= 1; + for (int i = 0; i < g_kankyoHIO.dungeonLight.usedLights; i++) + { + sprintf(lightDirOutBuf + cursor, " %01x,", i); + cursor += 7; + // "lights per room" + memcpy(lightDirOutBuf + cursor, ",,部屋毎のライト,", 0x12); + cursor += 18; + cursor -= 1; + sprintf(lightDirOutBuf + cursor, "%16f,", + g_env_light.dungeonlight[i].mPosition.x); + cursor += 17; + sprintf(lightDirOutBuf + cursor, "%16f,", + g_env_light.dungeonlight[i].mPosition.y); + cursor += 17; + sprintf(lightDirOutBuf + cursor, "%16f,", + g_env_light.dungeonlight[i].mPosition.z); + cursor += 17; + sprintf(lightDirOutBuf + cursor, "%16f,", + g_env_light.dungeonlight[i].mRefDistance); + cursor += 17; + sprintf(lightDirOutBuf + cursor, "%16f,", + g_env_light.dungeonlight[i].mAngleX); + cursor += 17; + sprintf(lightDirOutBuf + cursor, "%16f,", g_env_light.dungeonlight[i].mAngleY); + cursor += 17; + sprintf(lightDirOutBuf + cursor, "%16f,", + g_env_light.dungeonlight[i].mCutoffAngle); + cursor += 17; + + switch (g_env_light.dungeonlight[i].mAngleAttenuation) { + case 0: + memcpy(lightDirOutBuf + cursor, "ポイント,", 10); + cursor += 9; + break; + case 1: + memcpy(lightDirOutBuf + cursor, "直角,", 6); + cursor += 5; + break; + case 2: + memcpy(lightDirOutBuf + cursor, "COS曲線,", 9); + cursor += 8; + break; + case 3: + memcpy(lightDirOutBuf + cursor, "COS2曲線,", 10); + cursor += 9; + break; + case 4: + memcpy(lightDirOutBuf + cursor, "シャープ,", 10); + cursor += 9; + break; + case 5: + memcpy(lightDirOutBuf + cursor, "リング状,", 10); + cursor += 9; + break; + case 6: + memcpy(lightDirOutBuf + cursor, "リング状2,", 11); + cursor += 10; + } + + switch (g_env_light.dungeonlight[i].mDistAttenuation) { + case GX_DA_OFF: + memcpy(lightDirOutBuf + cursor, "減衰なし,", 10); + cursor += 9; + break; + case GX_DA_GENTLE: + memcpy(lightDirOutBuf + cursor, "おだやか,", 10); + cursor += 9; + break; + case GX_DA_MEDIUM: + memcpy(lightDirOutBuf + cursor, "中間,", 6); + cursor += 5; + break; + case GX_DA_STEEP: + memcpy(lightDirOutBuf + cursor, "険しい,", 8); + cursor += 7; + break; + } + + memcpy(lightDirOutBuf + cursor, "0,,,\n", 6); + cursor += 6; + cursor -= 1; + } + + file.writeData(lightDirOutBuf, cursor); + file.close(); + } else { + OS_REPORT("write append error\n"); + } + + break; + } + } } dKankyo_vrboxHIO_c::dKankyo_vrboxHIO_c() { @@ -5602,15 +6229,532 @@ dKankyo_vrboxHIO_c::dKankyo_vrboxHIO_c() { } void dKankyo_vrboxHIO_c::genMessage(JORMContext* mctx) { - // DEBUG NONMATCHING + // "VR-BOX color setting TV screen confirmation display" + mctx->genCheckBox("VR-BOXカラー設定ＴＶ画面確認表示", &m_displayVrboxTVColorSettings, 1, 0, NULL, + 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + // “Set the elevation (horizon) *Entered in the room settings in the map tool” + mctx->genCheckBox("海抜（地平線）の設定 ※マップツールの部屋設定に入力", &field_0x14, 1, 0, NULL, + 0xffff, 0xffff, 0x200, 0x18); + // "Height above sea level" + mctx->genSlider("海抜の高さ", &m_horizonHeight, -100000.0f, 100000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + // "VRBOX settings" + mctx->startComboBox("■VRBOX設定", &m_VrboxSetting, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + // "Do not" + mctx->genComboBoxItem("しない", 0); + // HOSTIO settings + mctx->genComboBoxItem("ＨＯＳＴＩＯ設定！", 1); + mctx->endComboBox(); + + // "The moment you select the HOSTIO setting, the current data will be entered!" + mctx->genLabel("ＨＯＳＴＩＯ設定を選択した瞬間、現在データが入ります！", 0x80000001, 0, NULL, + 0xffff, 0xffff, 0x200, 0x18); + // "●Export VR-BOX information to a CSV file" + mctx->genLabel("●VR-BOX情報のCSVファイル書き出し", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genButton("FILE WRITE", 0x40000002, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "●Loading CSV file of VR-BOX information (for confirmation)" + mctx->genLabel("●VR-BOX情報のCSVファイル読み込み（確認用）", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genButton("FILE READ", 0x40000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("------------------------------------------------------", 0x80000001, 0, NULL, + 0xffff, 0xffff, 0x200, 0x18); + // "Forced VRBOX specification" + mctx->startComboBox("強制VRBOX指定", &field_0x7, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + // "Do not" + mctx->genComboBoxItem("しない", 0); + // "Using pattern 0" + mctx->genComboBoxItem("パターン０使用", 1); + // "Using pattern 1" + mctx->genComboBoxItem("パターン１使用", 2); + // "Using pattern 2" + mctx->genComboBoxItem("パターン２使用", 3); + // "Using pattern 3" + mctx->genComboBoxItem("パターン３使用", 4); + // "Using pattern 4" + mctx->genComboBoxItem("パターン４使用", 5); + // "Using pattern 5" + mctx->genComboBoxItem("パターン５使用", 6); + // "Using pattern 6" + mctx->genComboBoxItem("パターン６使用", 7); + // "Using pattern 7" + mctx->genComboBoxItem("パターン７使用", 8); + // "Using pattern 8" + mctx->genComboBoxItem("パターン８使用", 9); + // "Using pattern 9" + mctx->genComboBoxItem("パターン９使用", 10); + // "Using pattern 10" + mctx->genComboBoxItem("パターン１０使用", 11); + // "Using pattern 11" + mctx->genComboBoxItem("パターン１１使用", 12); + // "Using pattern 12" + mctx->genComboBoxItem("パターン１２使用", 13); + // "Using pattern 13" + mctx->genComboBoxItem("パターン１３使用", 14); + // "Using pattern 14" + mctx->genComboBoxItem("パターン１４使用", 15); + // "Using pattern 15" + mctx->genComboBoxItem("パターン１５使用", 16); + mctx->endComboBox(); + + mctx->genLabel("------------------------------------------------------", 0x80000001, 0, NULL, + 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + // "● Sky color" + mctx->genLabel("● 空の色", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Set fog color" + mctx->genButton("fog色をセット", 0x40000004, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Color R" + mctx->genSlider("色 Ｒ", &g_env_light.vrbox_sky_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" Ｇ", &g_env_light.vrbox_sky_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" Ｂ", &g_env_light.vrbox_sky_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + // "RGB simultaneous addition +100" + mctx->genButton("RGB同時加算 +100", 0x40000005, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 10" + mctx->genButton("RGB同時加算 + 10", 0x40000006, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 1" + mctx->genButton("RGB同時加算 + 1", 0x40000007, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 1" + mctx->genButton("RGB同時加算 - 1", 0x40000008, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 10" + mctx->genButton("RGB同時加算 - 10", 0x40000009, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition -100" + mctx->genButton("RGB同時加算 -100", 0x4000000a, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "● Upper cloud color" + mctx->genLabel("● 上雲カラー", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Set fog color" + mctx->genButton("fog色をセット", 0x4000000b, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Color R" + mctx->genSlider("色 Ｒ", &g_env_light.vrbox_kumo_top_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider(" Ｇ", &g_env_light.vrbox_kumo_top_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider(" Ｂ", &g_env_light.vrbox_kumo_top_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + // "RGB simultaneous addition +100" + mctx->genButton("RGB同時加算 +100", 0x4000000c, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 10" + mctx->genButton("RGB同時加算 + 10", 0x4000000d, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 1" + mctx->genButton("RGB同時加算 + 1", 0x4000000e, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 1" + mctx->genButton("RGB同時加算 - 1", 0x4000000f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 10" + mctx->genButton("RGB同時加算 - 10", 0x40000010, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition -100" + mctx->genButton("RGB同時加算 -100", 0x40000011, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "Lower cloud color" + mctx->genLabel("● 下雲カラー", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Set fog color" + mctx->genButton("fog色をセット", 0x40000012, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Color R" + mctx->genSlider("色 Ｒ", &g_env_light.vrbox_kumo_bottom_col.r, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｇ", &g_env_light.vrbox_kumo_bottom_col.g, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｂ", &g_env_light.vrbox_kumo_bottom_col.b, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "RGB simultaneous addition +100" + mctx->genButton("RGB同時加算 +100", 0x40000013, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 10" + mctx->genButton("RGB同時加算 + 10", 0x40000014, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 1" + mctx->genButton("RGB同時加算 + 1", 0x40000015, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 1" + mctx->genButton("RGB同時加算 - 1", 0x40000016, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 10" + mctx->genButton("RGB同時加算 - 10", 0x40000017, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition -100" + mctx->genButton("RGB同時加算 -100", 0x40000018, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "● Lower cloud shadow color" + mctx->genLabel("● 下雲影カラー", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Set fog color" + mctx->genButton("fog色をセット", 0x40000019, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Color R" + mctx->genSlider("色 Ｒ", &g_env_light.vrbox_kumo_shadow_col.r, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｇ", &g_env_light.vrbox_kumo_shadow_col.g, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｂ", &g_env_light.vrbox_kumo_shadow_col.b, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" α", &g_env_light.vrbox_kumo_top_col.a, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + // "RGB simultaneous addition +100" + mctx->genButton("RGB同時加算 +100", 0x4000001a, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 10" + mctx->genButton("RGB同時加算 + 10", 0x4000001b, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 1" + mctx->genButton("RGB同時加算 + 1", 0x4000001c, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 1" + mctx->genButton("RGB同時加算 - 1", 0x4000001d, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 10" + mctx->genButton("RGB同時加算 - 10", 0x4000001e, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition -100" + mctx->genButton("RGB同時加算 -100", 0x4000001f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "● Near kasumi" + mctx->genLabel("● 前かすみ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Set fog color" + mctx->genButton("fog色をセット", 0x40000020, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Color R" + mctx->genSlider("色 Ｒ", &g_env_light.vrbox_kasumi_outer_col.r, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｇ", &g_env_light.vrbox_kasumi_outer_col.g, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｂ", &g_env_light.vrbox_kasumi_outer_col.b, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" α", &g_env_light.vrbox_kasumi_outer_col.a, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "RGB simultaneous addition +100" + mctx->genButton("RGB同時加算 +100", 0x40000021, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 10" + mctx->genButton("RGB同時加算 + 10", 0x40000022, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 1" + mctx->genButton("RGB同時加算 + 1", 0x40000023, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 1" + mctx->genButton("RGB同時加算 - 1", 0x40000024, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 10" + mctx->genButton("RGB同時加算 - 10", 0x40000025, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition -100" + mctx->genButton("RGB同時加算 -100", 0x40000026, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "● Inner kasumi" + mctx->genLabel("● 奥かすみ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Set fog color" + mctx->genButton("fog色をセット", 0x40000027, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Color R" + mctx->genSlider("色 Ｒ", &g_env_light.vrbox_kasumi_inner_col.r, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｇ", &g_env_light.vrbox_kasumi_inner_col.g, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｂ", &g_env_light.vrbox_kasumi_inner_col.b, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" α", &g_env_light.vrbox_kasumi_inner_col.a, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "RGB simultaneous addition +100" + mctx->genButton("RGB同時加算 +100", 0x40000028, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 10" + mctx->genButton("RGB同時加算 + 10", 0x40000029, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition + 1" + mctx->genButton("RGB同時加算 + 1", 0x4000002a, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 1" + mctx->genButton("RGB同時加算 - 1", 0x4000002b, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition - 10" + mctx->genButton("RGB同時加算 - 10", 0x4000002c, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "RGB simultaneous addition -100" + mctx->genButton("RGB同時加算 -100", 0x4000002d, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); } void dKankyo_vrboxHIO_c::dKankyo_vrboxHIOInfoUpDateF() { - // DEBUG NONMATCHING + JORMContext* ctx = attachJORMContext(8); + ctx->startUpdateNode(&g_kankyoHIO.vrbox); + ctx->updateSlider(2, &g_env_light.vrbox_sky_col.r, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_sky_col.g, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_sky_col.b, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_top_col.r, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_top_col.g, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_top_col.b, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_top_col.a, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_bottom_col.r, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_bottom_col.g, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_bottom_col.b, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_bottom_col.a, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_shadow_col.r, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_shadow_col.g, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_shadow_col.b, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kumo_shadow_col.a, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kasumi_outer_col.r, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kasumi_outer_col.g, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kasumi_outer_col.b, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kasumi_outer_col.a, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kasumi_inner_col.r, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kasumi_inner_col.g, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kasumi_inner_col.b, 0, 0, 0); + ctx->updateSlider(2, &g_env_light.vrbox_kasumi_inner_col.a, 0, 0, 0); + releaseJORMContext(ctx); } void dKankyo_vrboxHIO_c::listenPropertyEvent(const JORPropertyEvent* property) { - // DEBUG NONMATCHING + char inBuf[1000]; + char outBuf[1000]; + + JORReflexible::listenPropertyEvent(property); + JORFile file; + char scratchBuf[0x68]; + switch ((uintptr_t)property->id) { + case 0x40000001: { + if (file.open(1, "ＶＲＢＯＸファイル(*.csv)\0*.csv\0", "csv", "NULL", "_V.csv")) { + int off = 0; + + memset(inBuf, 0x20, 1000); + file.readData(inBuf, 0); + file.close(); + + off += 91; + off += 2; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_sky_col.r = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_sky_col.g = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_sky_col.b = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_top_col.r = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_top_col.g = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_top_col.b = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_bottom_col.r = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_bottom_col.g = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_bottom_col.b = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_shadow_col.r = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_shadow_col.g = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_shadow_col.b = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kumo_top_col.a = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kasumi_outer_col.r = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kasumi_outer_col.g = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kasumi_outer_col.b = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kasumi_outer_col.a = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kasumi_inner_col.r = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kasumi_inner_col.g = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kasumi_inner_col.b = (u8)atoi(scratchBuf); + off += 4; + + memset(scratchBuf, 0, 100); + memcpy(scratchBuf, inBuf + off, 3); + g_env_light.vrbox_kasumi_inner_col.a = (u8)atoi(scratchBuf); + off += 5; + + g_kankyoHIO.vrbox.field_0x5 = 0; + + OS_REPORT("read append success %d\n", 0x1330); + } else { + OS_REPORT("write append error\n"); + } + + break; + case 0x40000002: { + // "VRBOX file" + if (file.open(6, "ＶＲＢＯＸファイル(*.csv)\0*.csv\0", "csv", "NULL", "_V.csv")) { + int off = 0; + + memset(outBuf, 0x20, 1000); + memcpy(outBuf, + "*dummy,No,空色,上雲色,下雲色,下雲影色,下雲α,霞手前色,霞手前α,霞奥色," + "霞奥α,備考,レイヤー\n\n", + 93); + off += 91; + + memcpy(outBuf + off, ",,", 2); + off += 2; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_sky_col.r); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_sky_col.g); + off += 4; + sprintf(outBuf + off, "%03d,", g_env_light.vrbox_sky_col.b); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kumo_top_col.r); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kumo_top_col.g); + off += 4; + sprintf(outBuf + off, "%03d,", g_env_light.vrbox_kumo_top_col.b); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kumo_bottom_col.r); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kumo_bottom_col.g); + off += 4; + sprintf(outBuf + off, "%03d,", g_env_light.vrbox_kumo_bottom_col.b); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kumo_shadow_col.r); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kumo_shadow_col.g); + off += 4; + sprintf(outBuf + off, "%03d,", g_env_light.vrbox_kumo_shadow_col.b); + off += 4; + sprintf(outBuf + off, "%03d,", g_env_light.vrbox_kumo_top_col.a); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kasumi_outer_col.r); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kasumi_outer_col.g); + off += 4; + sprintf(outBuf + off, "%03d,", g_env_light.vrbox_kasumi_outer_col.b); + off += 4; + sprintf(outBuf + off, "%03d,", g_env_light.vrbox_kasumi_outer_col.a); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kasumi_inner_col.r); + off += 4; + sprintf(outBuf + off, "%03d/", g_env_light.vrbox_kasumi_inner_col.g); + off += 4; + sprintf(outBuf + off, "%03d,", g_env_light.vrbox_kasumi_inner_col.b); + off += 4; + sprintf(outBuf + off, "%03d,,", g_env_light.vrbox_kasumi_inner_col.a); + off += 5; + + file.writeData(outBuf, off); + file.close(); + OS_REPORT("write append success %d\n", 0x1330); + } else { + OS_REPORT("write append error\n"); + } + + break; + } + case 0x40000004: + case 0x40000005: + case 0x40000006: + case 0x40000007: + case 0x40000008: + case 0x40000009: + case 0x4000000a: + field_0xe = (uintptr_t)property->id - 0x40000004; + break; + break; + case 0x4000000b: + case 0x4000000c: + case 0x4000000d: + case 0x4000000e: + case 0x4000000f: + case 0x40000010: + case 0x40000011: + field_0xf = (uintptr_t)property->id - 0x4000000b; + break; + case 0x40000012: + case 0x40000013: + case 0x40000014: + case 0x40000015: + case 0x40000016: + case 0x40000017: + case 0x40000018: + field_0x10 = (uintptr_t)property->id - 0x40000012; + break; + case 0x40000019: + case 0x4000001a: + case 0x4000001b: + case 0x4000001c: + case 0x4000001d: + case 0x4000001e: + case 0x4000001f: + field_0x11 = (uintptr_t)property->id - 0x40000019; + break; + case 0x40000020: + case 0x40000021: + case 0x40000022: + case 0x40000023: + case 0x40000024: + case 0x40000025: + case 0x40000026: + field_0x12 = (uintptr_t)property->id - 0x40000020; + break; + case 0x40000027: + case 0x40000028: + case 0x40000029: + case 0x4000002a: + case 0x4000002b: + case 0x4000002c: + case 0x4000002d: + field_0x13 = (uintptr_t)property->id - 0x40000027; + break; + } + } } dKankyo_bloomHIO_c::dKankyo_bloomHIO_c() { @@ -5625,63 +6769,1546 @@ dKankyo_bloomHIO_c::dKankyo_bloomHIO_c() { } void dKankyo_bloomHIO_c::listenPropertyEvent(const JORPropertyEvent* property) { - // DEBUG NONMATCHING + char outBuf[0x1390]; + + JORReflexible::listenPropertyEvent(property); + + JORFile file; + switch ((uintptr_t)property->id) { + case 0x40000002: { + // "Bloom file" + if (file.open(6, "飽和加算ファイル(*.csv)\0*.csv\0", "csv", "NULL", "_bloom.csv")) { + int off = 0; + + memset(outBuf, 0x20, 5000); + memcpy(outBuf, + "/*======================================================================*/\n", + 76); + off += 76; + off -= 1; + + memcpy(outBuf + off, + "static dKydata_BloomInfo_c l_kydata_BloomInf_tbl[BLOOMINFO_MAX] ={\n", 0x44); + off += 68; + off -= 1; + + for (int i = 0; i < ARRAY_SIZE(bloom_info); i++) { + sprintf( + outBuf + off, + "{ %01d, %3d, %3d, %3d, %3d, %3d, %3d, %3d, %3d, %3d, %3d, %3d }, /* %02d */\n", + bloom_info[i].mType, bloom_info[i].mThreshold, bloom_info[i].mBlurAmount, + bloom_info[i].mDensity, bloom_info[i].mColorR, bloom_info[i].mColorG, + bloom_info[i].mColorB, bloom_info[i].mOrigDensity, + bloom_info[i].mSaturateSubtractR, bloom_info[i].mSaturateSubtractG, + bloom_info[i].mSaturateSubtractB, bloom_info[i].mSaturateSubtractA, i); + off += 71; + } + + memcpy(outBuf + off, "};\n", 4); + off += 4; + off -= 1; + + file.writeData(outBuf, off); + file.close(); + } else { + OS_REPORT("write append error\n"); + } + } + } } void dKankyo_bloomHIO_c::genMessage(JORMContext* mctx) { - // DEBUG NONMATCHING + int i; + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "Bloom settings" + mctx->genLabel("　飽 和 加 算 設 定", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "Options that seem useful for adjustment" + mctx->genLabel("□調整用に便利そうな項目", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Screen display" + mctx->genCheckBox("画面表示", &field_0x5, '\x01', 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Time speed" + mctx->genSlider("■時刻速度", &g_env_light.time_change_rate, 0.0f, 10.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Time change" + mctx->startComboBox("■時刻切替", &g_kankyoHIO.time_change, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + // "Normal time" + mctx->genComboBoxItem("通常時間", 0); + // "Fixed at midnight" + mctx->genComboBoxItem("朝0時間に固定", 1); + // "Fixed at 1 AM" + mctx->genComboBoxItem("朝1時間に固定", 2); + // "Fixed at daytime" + mctx->genComboBoxItem("昼時間に固定", 3); + // "Fixed at noon" + mctx->genComboBoxItem("夕0時間に固定", 4); + // "Fixed at 1 PM" + mctx->genComboBoxItem("夕1時間に固定", 5); + // "Fixed at nighttime" + mctx->genComboBoxItem("夜時間に固定", 6); + // "Map settings ignored" + mctx->genComboBoxItem("マップ設定無視経過", 7); + mctx->endComboBox(); + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "Bloom adjustment" + mctx->startComboBox("■飽和値調整を", &field_0x4, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + // "Do not" + mctx->genComboBoxItem("しない", 0); + // "Set with HOSTIO!" + mctx->genComboBoxItem("ＨＯＳＴＩＯで設定！", 1); + mctx->endComboBox(); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "File output" + mctx->genButton("ファイル出力", 0x40000002, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "If you make any changes, please send this file to Sasaki at SRD!" + mctx->genLabel("変更した場合はこのファイルをＳＲＤささきまで！", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + // "Of course, it's okay to just tell me the values of the places you changed or added!" + mctx->genLabel("※もちろん、変更・追加した場所の数値のみ伝えてもらってもＯＫです！", 0x80000001, + 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + for (int i = 1; i < ARRAY_SIZE(bloom_info); i++) { + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + if (true) { + switch (i) { + case 1: + // "○ 1 Twilight (ku)" + mctx->genLabel("○ １ トワイライト(く)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 2: + // "○ 2 Twilight_weak (ku)" + mctx->genLabel("○ ２ トワイライト_弱(く)", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + break; + case 3: + // "○ 3 Sense" + mctx->genLabel("○ ３ センス", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 4: + // "○ 4 Field standard (morning 0)" + mctx->genLabel("○ ４ フィールド基準（朝０）", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + break; + case 5: + // "○ 5 Field standard (morning 1)" + mctx->genLabel("○ ５ フィールド基準（朝１）", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + break; + case 6: + // "○ 6 Field standard (noon)" + mctx->genLabel("○ ６ フィールド基準（昼）", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + break; + case 7: + // "○ 7 Field standard (evening 0)" + mctx->genLabel("○ ７ フィールド基準（夕０）", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + break; + case 8: + // "○ 8 Field standard (evening 1)" + mctx->genLabel("○ ８ フィールド基準（夕１）", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + break; + case 9: + // "○ 9 Field standard (night)" + mctx->genLabel("○ ９ フィールド基準（夜）", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + break; + case 10: + // "○ 10 Caravan fire" + mctx->genLabel("○ 10 キャラバン火事", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 11: + // "○ 11 LV8 Dark Palace" + mctx->genLabel("○ 11 LV8闇の宮殿", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 12: + // "○ 12 demo28_03" + mctx->genLabel("○ 12 demo28_03", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 13: + // "○ 13 Insect glow" + mctx->genLabel("○ 13 虫が光る", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 14: + // "○ 14 Sea of Clouds (hero's chamber)" + mctx->genLabel("○ 14 雲海(勇者の間)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 15: + // "○ 15 Zora's Domain waterfall TW" + mctx->genLabel("○ 15 ゾーラの里 滝TW", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 16: + // "○ 16 Zora's Domain throne TW" + mctx->genLabel("○ 16 ゾーラの里 玉座TW", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 17: + // "○ 17 Pseudo-sense" + mctx->genLabel("○ 17 センスもどき", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 18: + // "○ 18 Switch between present and past" + mctx->genLabel("○ 18 現在過去切替", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 19: + // "○ 19 Miyagi's sewer" (E3 demo?) + mctx->genLabel("○ 19 宮城さん下水道", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x14: + // "○ 20 Flashback scene" + mctx->genLabel("○ 20 回想シーン", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x15: + // "○ 21 Twilight gate" + mctx->genLabel("○ 21 トワイライトゲート", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x16: + // "○ 22 Underwater (standard)" + mctx->genLabel("○ 22 水中（基準）", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x17: + // "● 23 Vacant" + mctx->genLabel("● 23 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x18: + // "○ 24 Vacant" + mctx->genLabel("● 24 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x19: + // "○ 25 Dungeon standard_weak" + mctx->genLabel("○ 25 ダンジョン基準_弱", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x1a: + // "○ 26 Dungeon standard_strong" + mctx->genLabel("○ 26 ダンジョン基準_強", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x1b: + // "○ 27 Lava (ku)" + mctx->genLabel("○ 27 溶岩(く)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x1c: + // "○ Other than Lava_Lv2 (ku)" + mctx->genLabel("○ 28 ダ溶岩以外_Lv2(く)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x1d: + // "○ 29 Past" + mctx->genLabel("○ 29 過去", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x1e: + // "○ 30 City walls" + mctx->genLabel("○ 30 城壁", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x1f: + // "● 31 Vacant" + mctx->genLabel("● 31 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x20: + // "● 32 Vacant" + mctx->genLabel("● 32 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x21: + // "● 33 Vacant" + mctx->genLabel("● 33 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x22: + // "● 34 Vacant" + mctx->genLabel("● 34 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x23: + // "● 35 Vacant" + mctx->genLabel("● 35 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x24: + // "● 36 Vacant" + mctx->genLabel("● 36 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x25: + // "● 37 Vacant" + mctx->genLabel("● 37 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x26: + // "● 38 Vacant" + mctx->genLabel("● 38 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x27: + // "● 39 Vacant" + mctx->genLabel("● 39 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x28: + // "○ 40 Demo: Flashback" + mctx->genLabel("○ 40 デモ：回想シーン", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x29: + // "○ 41 Demo: Fake TW" + mctx->genLabel("○ 41 デモ：にせＴＷ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x2a: + // "○ 42 Demo: for demo32_03" + mctx->genLabel("○ 42 デモ：demo32_03用", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x2b: + // "○ 43 Demo: TW flashback scene" + mctx->genLabel("○ 43 デモ：ＴＷ回想シーン", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x2c: + // "○ 44 Demo: for demo31_20" + mctx->genLabel("○ 44 デモ：demo31_20用", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + break; + case 0x2d: + // "○ 45 Demo: Lava W" + mctx->genLabel("○ 45 デモ：溶岩Ｗ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x2e: + // "● 46 Vacant" + mctx->genLabel("● 46 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x2f: + // "● 47 Vacant" + mctx->genLabel("● 47 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x30: + // "● 48 Vacant" + mctx->genLabel("● 48 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x31: + // "● 49 Vacant" + mctx->genLabel("● 49 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x32: + // "● 50 Vacant" + mctx->genLabel("● 50 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x33: + // "● 51 Vacant" + mctx->genLabel("● 51 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x34: + // "● 52 Vacant" + mctx->genLabel("● 52 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x35: + // "● 53 Vacant" + mctx->genLabel("● 53 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x36: + // "● 54 Vacant" + mctx->genLabel("● 54 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x37: + // "● 55 Vacant" + mctx->genLabel("● 55 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x38: + // "● 56 Vacant" + mctx->genLabel("● 56 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x39: + // "● 57 Vacant" + mctx->genLabel("● 57 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x3a: + // "● 58 Vacant" + mctx->genLabel("● 58 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x3b: + // "● 59 Vacant" + mctx->genLabel("● 59 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x3c: + // "● 60 Vacant" + mctx->genLabel("● 60 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x3d: + // "● 61 Vacant" + mctx->genLabel("● 61 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x3e: + // "● 62 Vacant" + mctx->genLabel("● 62 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + break; + case 0x3f: + // "● 63 Vacant" + mctx->genLabel("● 63 空き", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + } + } + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->startComboBox("タイプ", &bloom_info[i].mType, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("くっきり(0)", 0); + mctx->genComboBoxItem("やわらか(1)", 1); + mctx->endComboBox(); + mctx->genSlider("しきい値", &bloom_info[i].mThreshold, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("ぼやけ幅", &bloom_info[i].mBlurAmount, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("ぼやけ濃さ", &bloom_info[i].mDensity, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("濃さ R", &bloom_info[i].mColorR, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &bloom_info[i].mColorG, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider(" B", &bloom_info[i].mColorB, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("元濃さ", &bloom_info[i].mOrigDensity, 0, 0xff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("彩度減算 R", &bloom_info[i].mSaturateSubtractR, 0, 0xff, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &bloom_info[i].mSaturateSubtractG, 0, 0xff, 0, NULL, + 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" B", &bloom_info[i].mSaturateSubtractB, 0, 0xff, 0, NULL, + 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" A", &bloom_info[i].mSaturateSubtractA, 0, 0xff, 0, NULL, + 0xffff, 0xffff, 0x200, 0x18); + } } -void dKankyo_dungeonlightHIO_c::listenPropertyEvent(const JORPropertyEvent* property) {} +void dKankyo_dungeonlightHIO_c::listenPropertyEvent(const JORPropertyEvent* property) { + // empty function +} dKankyo_navyHIO_c::dKankyo_navyHIO_c() { - // DEBUG NONMATCHING + field_0x5 = 0; + field_0x6 = 0; + field_0x8 = 12; + cloud_sunny_wind_influence_rate = 10.0f; + cloud_sunny_bottom_height = 2500.0f; + cloud_sunny_top_height = 2500.0f; + cloud_sunny_size = 0.6f; + cloud_sunny_height_shrink_rate = 0.9999f; + cloud_sunny_alpha = 1.0f; + cloud_cloudy_wind_influence_rate = 25.0f; + cloud_cloudy_bottom_height = 1200.0f; + cloud_cloudy_top_height = 1200.0f; + cloud_cloudy_size = 0.84f; + cloud_cloudy_height_shrink_rate = 0.96f; + cloud_cloudy_alpha = 1.0f; + field_0x3c = 4000.0f; + field_0x40 = 2000.0f; + field_0x44 = 2500.0f; + field_0x48 = 80.0f; + field_0x4c = 0.18f; + field_0x68 = 1; + field_0x69 = 3; + field_0x50 = 255.0f; + field_0x58 = 800.0f; + field_0x5c = 250.0f; + field_0x54 = 1.0f; + field_0x60 = 1000.0f; + field_0x64 = 0.2f; + housi_max_number = 300; + housi_max_alpha = 120.0f; + housi_max_scale = 9.0f; + field_0x74 = 45; + field_0x75 = 136; + field_0x76 = 170; + field_0x78 = 109; + field_0x79 = 60; + field_0x7a = 205; + field_0x7c = 120.0f; + field_0x80 = 100.0f; + field_0x84 = 0.2f; + field_0x8a = 0; + field_0x88 = 0; + field_0x80 = 0.0f; + moon_col.r = 0; + moon_col.g = 0; + moon_col.b = 0; + moon_col.a = 255; + moon_scale = 8000.0f; + field_0xb0.x = 16.5f; + field_0xb0.y = -2.0f; + field_0xb0.z = 30.0f; + field_0xbc = 160.0f; + field_0xc0 = 0.06f; + field_0xc4 = 200; + field_0xc8 = 3.0f; + field_0xcc = 60.0f; + field_0xd0 = 69; + field_0xd1 = 60; + field_0xd2 = 39; + field_0xd4 = 124; + field_0xd5 = 124; + field_0xd6 = 104; + field_0xd3 = 255; + field_0xd8 = 255; + field_0xd9 = 0; + field_0xda = 0; + field_0xdc = 255; + field_0xdd = 255; + field_0xde = 0; + field_0xe0 = 500; + field_0xe4 = 0.4f; + sun_col.r = 255; + sun_col.g = 255; + sun_col.b = 241; + sun_col2.r = 255; + sun_col2.g = 145; + sun_col2.b = 73; + sun_adjust_ON = 0; + smell_adjust_ON = 0; + smell_col.r = 255; + smell_col.g = 255; + smell_col.b = 115; + smell_col2.r = 80; + smell_col2.g = 50; + smell_col2.b = 0; + smell_alpha = 1.0f; + field_0xf0 = 190; + field_0xf1 = 120; + field_0xf2 = 120; + field_0x108 = 60; + field_0x109 = 0; + field_0x10a = 0; + field_0xf4 = 60; + field_0xf5 = 150; + field_0xf6 = 230; + field_0x10c = 50; + field_0x10d = 65; + field_0x10e = 80; + field_0xf8 = 80; + field_0xf9 = 80; + field_0xfa = 20; + field_0x110 = 30; + field_0x111 = 30; + field_0x112 = 10; + field_0xfc = 33; + field_0xfd = 255; + field_0xfe = 125; + field_0x114 = 33; + field_0x115 = 255; + field_0x116 = 125; + field_0x120 = 0.1f; + field_0x124 = 1.0f; + constellation_maker_ON = 0; + constellation_maker_pos[0].x = 5900.0f; + constellation_maker_pos[0].y = 14000.0f; + constellation_maker_pos[0].z = -16000.0f; + constellation_maker_pos[1].x = 7500.0f; + constellation_maker_pos[1].y = 14000.0f; + constellation_maker_pos[1].z = -14700.0f; + constellation_maker_pos[2].x = 8700.0f; + constellation_maker_pos[2].y = 13920.0f; + constellation_maker_pos[2].z = -14700.0f; + constellation_maker_pos[3].x = 10200.0f; + constellation_maker_pos[3].y = 14320.0f; + constellation_maker_pos[3].z = -15000.0f; + constellation_maker_pos[4].x = 12300.0f; + constellation_maker_pos[4].y = 15400.0f; + constellation_maker_pos[4].z = -18400.0f; + constellation_maker_pos[5].x = 13000.0f; + constellation_maker_pos[5].y = 13500.0f; + constellation_maker_pos[5].z = -15000.0f; + constellation_maker_pos[6].x = 13000.0f; + constellation_maker_pos[6].y = 15400.0f; + constellation_maker_pos[6].z = -14500.0f; + constellation_maker_pos[7].x = 13000.0f; + constellation_maker_pos[7].y = 15400.0f; + constellation_maker_pos[7].z = -14500.0f; + constellation_maker_pos[8].x = 13000.0f; + constellation_maker_pos[8].y = 15400.0f; + constellation_maker_pos[8].z = -14500.0f; + constellation_maker_pos[9].x = 13000.0f; + constellation_maker_pos[9].y = 15400.0f; + constellation_maker_pos[9].z = -14500.0f; + lightning_scale_x_min = 14.0f; + lightning_scale_x_max = 20.0f; + lightning_scale_y_min = 14.0f; + lightning_scale_y_max = 20.0f; + lightning_tilt_angle = 2000; + field_0x1b6 = 3; + lightning_debug_mode = 0; + collect_light_reflect_pos.x = 60000.0f; + collect_light_reflect_pos.y = -5000.0f; + collect_light_reflect_pos.z = 0.0f; + moya_alpha = 0.12f; + field_0x1c5 = 0; + thunder_col.r = 75; + thunder_col.g = 130; + thunder_col.b = 150; + thunder_height = 2000.0f; + thunder_blacken_rate = 0.75f; + water_in_col_ratio_R = 0.0f; + water_in_col_ratio_G = 0.4f; + water_in_col_ratio_B = 0.5f; + field_0x1e8 = -10.0f; + field_0x1ec = 40.0f; + field_0x1f0 = 50.0f; + field_0x1f4 = 200.0f; + field_0x1f8 = 0.0f; + field_0x1e4 = 80; + field_0x1e5 = 80; + field_0x1e6 = 80; + field_0x1fd = 2; + field_0x1fe = 3; + field_0x1ff = 0; + field_0x200 = 0; + mist_tag_fog_near = -2000.0f; + mist_tag_fog_far = 200.0f; + wipe_test_ON = 0xff; + field_0x210 = 0.0f; + fade_test_speed = 0; + field_0x215 = 1; + smell_railtag_space = 0.0f; + field_0x22a = 0; + field_0x22c = 0; + field_0x22d = 0; + light_adjust_ON = 0; + adjust_light_ambcol.r = 24; + adjust_light_ambcol.g = 24; + adjust_light_ambcol.b = 24; + adjust_light_dif0_col_R = 126; + adjust_light_dif0_col_G = 110; + adjust_light_dif0_col_B = 89; + adjust_light_dif1_col.r = 24; + adjust_light_dif1_col.g = 41; + adjust_light_dif1_col.b = 50; + adjust_light_main_pos.x = 500.0f; + adjust_light_main_pos.y = 500.0f; + adjust_light_main_pos.z = 500.0f; + mist_twilight_c1_col.r = 182; + mist_twilight_c1_col.g = 88; + mist_twilight_c1_col.b = 50; + mist_twilight_c1_col.a = 150; + mist_twilight_c2_col.r = 117; + mist_twilight_c2_col.g = 69; + mist_twilight_c2_col.b = 50; + mist_twilight_c2_col.a = 255; + field_0x264.r = 124; + field_0x264.g = 60; + field_0x264.b = 50; + field_0x267 = 255; + field_0x268 = 150; + adjust_custom_R = 70; + adjust_custom_G = 70; + adjust_custom_B = 70; + adjust_light_mode = 1; + adjust_height = 0.0f; + field_0x278 = 120.0f; + shadow_adjust_ON = 0; + shadow_normal_alpha = 0.4f; + shadow_max_alpha = 0.65f; + field_0x29c = 0; + field_0x27c = 70.0f; + field_0x280 = 0.05f; + field_0x284 = 1.5f; + field_0x288 = 0.00025f; + field_0x28c = 0.001f; + unk_color_1.r = 255; + unk_color_1.g = 255; + unk_color_1.b = 255; + unk_alpha_1 = 255; + unk_color_2.r = 0; + unk_color_2.g = 0; + unk_color_2.b = 0; + unk_alpha_2 = 255; + unk_color_3.r = 60; + unk_color_3.g = 30; + unk_color_3.b = 0; + unk_alpha_3 = 255; + field_0x29d = 1; + camera_light_col.r = 25; + camera_light_col.g = 90; + camera_light_col.b = 183; + camera_light_alpha = 255; + camera_light_y_shift = 1500.0f; + camera_light_power = 1.25f; + camera_light_cutoff = 90.0f; + camera_light_sp = 2; + camera_light_da = 3; + demo_adjust_SW = 0; + demo_focus_pos = 30; + demo_focus_offset_x = 0.0025f; + demo_focus_offset_y = 0.0025f; + grass_ambcol.r = 0; + grass_ambcol.g = 0; + grass_ambcol.b = 0; + grass_adjust_ON = 0; + grass_shine_value = 0.0f; + stars_max_number = 0xffff; + display_save_location = 0; + unk_light_influence_ratio = 100; + door_light_influence_ratio = 255; + fish_pond_colreg_adjust_ON = 0; + fish_pond_colreg_c0.r = 0; + fish_pond_colreg_c0.g = 0; + fish_pond_colreg_c0.b = 0; + water_mud_adjust_ON = 0; + field_0x2ea = 0; + field_0x2ec = 0; + fish_pond_tree_adjust_ON = 0; + fish_pond_tree_ambcol.r = 0; + fish_pond_tree_ambcol.g = 0; + fish_pond_tree_ambcol.b = 0; + fish_pond_tree_dif0_col.r = 0; + fish_pond_tree_dif0_col.g = 0; + fish_pond_tree_dif0_col.b = 0; + fish_pond_tree_dif1_col.r = 0; + fish_pond_tree_dif1_col.g = 0; + fish_pond_tree_dif1_col.b = 0; + rainbow_adjust_ON = 0; + rainbow_separation_dist = 4500; + rainbow_max_alpha = 175; + field_0x2ff = 0; + grass_light_influence_ratio = 100; + grass_light_debug = 0; + field_0x302 = 2000; + field_0x304 = 0.6f; + field_0x308 = 0; + moya_col.r = 255; + moya_col.g = 255; + moya_col.b = 255; + field_0x30d = 0; + twilight_sense_saturation_mode = 0; + twilight_sense_pat = 0; + twilight_sense_pat_tv_display_ON = 0; + camera_light_adjust_ON = 0; + possessed_zelda_light_col.r = 30; + possessed_zelda_light_col.g = 55; + possessed_zelda_light_col.b = 110; + possessed_zelda_light_alpha = 255; + possessed_zelda_light_height = -800.0f; + possessed_zelda_light_power = 250.0f; + beast_ganon_light_col.r = 60; + beast_ganon_light_col.g = 95; + beast_ganon_light_col.b = 100; + beast_ganon_light_alpha = 255; + beast_ganon_light_height = -800.0f; + beast_ganon_light_power = 150.0f; + water_in_light_col.r = 138; + water_in_light_col.g = 192; + water_in_light_col.b = 188; } void dKankyo_navyHIO_c::genMessage(JORMContext* mctx) { - // DEBUG NONMATCHING + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + + mctx->genLabel("■ 水中ライト　色", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("col R", &water_in_light_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &water_in_light_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" B", &water_in_light_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + + mctx->genLabel("■ カメライトの設定", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("現在の設定", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel(" S Y:1500.0f power:1.25f cutoff 90.0f", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genLabel(" M Y:500.0f power:2.0f cutoff 70.0f", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genLabel(" L Y:2000.0f power:3.0f cutoff 70.0f", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genLabel("LL Y:1500.0f power:4.0f cutoff 65.0f", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genCheckBox("調整開始", &camera_light_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("Ｙずらし", &camera_light_y_shift, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("色 R", &camera_light_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &camera_light_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &camera_light_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("power", &camera_light_power, 0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("cutoff", &camera_light_cutoff, 0.001f, 90.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->startComboBox("距離減衰", &camera_light_da, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("減衰なし [GX_DA_OFF]", 0); + mctx->genComboBoxItem("おだやか [GX_DA_GENTLE]", 1); + mctx->genComboBoxItem("中間 [GX_DA_MEDIUM]", 2); + mctx->genComboBoxItem("険しい [GX_DA_STEEP]", 3); + mctx->endComboBox(); + mctx->startComboBox("角度減衰", &camera_light_sp, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("ポイント [GX_SP_OFF]", 0); + mctx->genComboBoxItem("直角 [GX_SP_FLAT]", 1); + mctx->genComboBoxItem("COS曲線 [GX_SP_COS]", 2); + mctx->genComboBoxItem("COS2曲線 [GX_SP_COS2]", 3); + mctx->genComboBoxItem("シャープ [GX_SP_SHARP]", 4); + mctx->genComboBoxItem("リング状 [GX_SP_RING1]", 5); + mctx->genComboBoxItem("リング状2[GX_SP_RING2]", 6); + mctx->endComboBox(); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ トワイライト　センスパターン", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genCheckBox("ＴＶ画面に表示", &twilight_sense_pat_tv_display_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->startComboBox("パターン", &twilight_sense_pat, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("未使用", 0); + mctx->genComboBoxItem("１：フィールド基本", 1); + mctx->genComboBoxItem("２：ハイリア湖専用", 2); + mctx->genComboBoxItem("３：ゾーラ川専用", 3); + mctx->genComboBoxItem("４：雪山専用", 4); + mctx->genComboBoxItem("５：ダンジョン基本", 5); + mctx->genComboBoxItem("６：Ｌｖ４専用", 6); + mctx->genComboBoxItem("７：Ｌｖ５専用", 7); + mctx->genComboBoxItem("８：Ｌｖ６・７・９専用", 8); + mctx->genComboBoxItem("９：Ｌｖ８専用　D_MN08", 9); + mctx->genComboBoxItem("１０：サブダンジョン系", 10); + mctx->genComboBoxItem("１１：室内（広め）", 11); + mctx->genComboBoxItem("１２：室内（狭め）", 12); + mctx->genComboBoxItem("１３：デモなど広め", 13); + mctx->endComboBox(); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ トワイライト　センス専用飽和実験", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("　 ・センス仕様で飽和加算のパターンを変えてみる", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->startComboBox("モード", &twilight_sense_saturation_mode, 0, NULL, 0xffff, 0xffff, 0x100, + 0x1a); + mctx->genComboBoxItem("ゲームまかせ", 0); + mctx->genComboBoxItem("トワイライト（暗）", 32); + mctx->genComboBoxItem("トワイライト（明）", 33); + mctx->genComboBoxItem("光世界（低彩度）", 34); + mctx->genComboBoxItem("影響なし", 35); + mctx->endComboBox(); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 憑依ゼルダ　女優ライト調整", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genSlider("col R", &possessed_zelda_light_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &possessed_zelda_light_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &possessed_zelda_light_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("takasa", &possessed_zelda_light_height, -5000.0f, 5000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider("power", &possessed_zelda_light_power, 0.0f, 2000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 豚ガノン 女優ライト調整", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genSlider("col R", &beast_ganon_light_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &beast_ganon_light_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &beast_ganon_light_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("takasa", &beast_ganon_light_height, -5000.0f, 5000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("power", &beast_ganon_light_power, 0.0f, 2000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ MA09水面てらてら具合", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("てらてら率", &g_env_light.mWaterSurfaceShineRate, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 虹の調整", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("調整開始", &rainbow_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("離れ距離", &rainbow_separation_dist, 0, 0x7fff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("最大α", &rainbow_max_alpha, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 釣堀　木の色調整", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("調整開始", &fish_pond_tree_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("amb R", &fish_pond_tree_ambcol.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &fish_pond_tree_ambcol.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &fish_pond_tree_ambcol.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("dif0 R", &fish_pond_tree_dif0_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &fish_pond_tree_dif0_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &fish_pond_tree_dif0_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("dif1 R", &fish_pond_tree_dif1_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &fish_pond_tree_dif1_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &fish_pond_tree_dif1_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("○現在設定値　はる amb (r 101) (g 94) (b 105)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel(" dif0 (r 86) (g 75) (b 57)", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel(" dif1 (r 82) (g 65) (b 102)", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel(" なつ amb (r 14) (g 35) (b 11)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel(" dif0 (r 55) (g 40) (b 30)", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel(" dif1 (r 25) (g 15) (b 0)", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel(" あき amb (r 40) (g 20) (b 5)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel(" dif0 (r 110) (g 50) (b 15)", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel(" dif1 (r 70) (g 0) (b 15)", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 釣堀　colreg 色変化", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("調整開始", &this->fish_pond_colreg_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("c0 R", &fish_pond_colreg_c0.r, -0xff, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &fish_pond_colreg_c0.g, -0xff, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &fish_pond_colreg_c0.b, -0xff, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("○現在設定値　はる (r 0) (g 0) (b 0)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel(" なつ (r -3) (g 0) (b -4)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel(" あき (r 0) (g -10) (b -13)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel(" ふゆ (r 14) (g 15) (b 22)", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 強引　水面にごり変更", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("調整開始", &water_mud_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("全体", &field_0x2ea, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("手前", &field_0x2ec, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ コレクト＆装備　ライティング", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("調整開始", &light_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("AMB R", &adjust_light_ambcol.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &adjust_light_ambcol.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" B", &adjust_light_ambcol.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("○メイン", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("Pos X", &adjust_light_main_pos.x, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Y", &adjust_light_main_pos.y, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Z", &adjust_light_main_pos.z, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider("Dif0 R", &adjust_light_dif0_col_R, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &adjust_light_dif0_col_G, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &adjust_light_dif0_col_B, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("○反射", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("Pos X", &collect_light_reflect_pos.x, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Y", &collect_light_reflect_pos.y, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Z", &collect_light_reflect_pos.z, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider("Dif1 R", &adjust_light_dif1_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &adjust_light_dif1_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &adjust_light_dif1_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 現在セーブ再開位置", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("常に表示", &this->display_save_location, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 星", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("最大数", &this->stars_max_number, -1, 2800, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 草てかり調整", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("てかり値", &this->grass_shine_value, 0.0f, 255.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("草ライト影響率 ", &g_env_light.grass_light_inf_rate, 0.0, 2.0, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 霧沼　トワイライト時　色設定", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("調整開始", &light_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("c1 R", &mist_twilight_c1_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &mist_twilight_c1_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" B", &mist_twilight_c1_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" a", &mist_twilight_c1_col.a, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("c2 R", &mist_twilight_c2_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &mist_twilight_c2_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" B", &mist_twilight_c2_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" A", &mist_twilight_c2_col.a, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ トワイライトＮＰＣ ライト設定", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("■ 闇ライト一つ設定キャラ設定", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->startComboBox("モード", &adjust_light_mode, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("ゲームまかせ", 0); + mctx->genComboBoxItem("ゲームまかせ", 1); + mctx->genComboBoxItem("カスタム調整", 2); + mctx->endComboBox(); + mctx->genSlider("AMB R", &adjust_light_ambcol.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &adjust_light_ambcol.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" B", &adjust_light_ambcol.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("LIGHT0 R", &adjust_light_dif0_col_R, 0, 500, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &adjust_light_dif0_col_G, 0, 500, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &adjust_light_dif0_col_B, 0, 500, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ デモ用？　遠目対応　被写界深度", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("-1:奥にピント 1:手前にピント", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("注目点", &g_env_light.mDemoAttentionPoint, -1.0f, 1.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genCheckBox("調整ＳＷ", &demo_adjust_SW, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("ピント位置", &demo_focus_pos, -0xfe, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("ずらし幅X", &demo_focus_offset_x, -1.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("ずらし幅Y", &demo_focus_offset_y, -1.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 影の濃さ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("調整開始", &shadow_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("通常α", &shadow_normal_alpha, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("接近ＭＡＸα", &shadow_max_alpha, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ アイテムゲット ライト設定", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->startComboBox("モード", &adjust_light_mode, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("ゲームまかせ", 0); + mctx->genComboBoxItem("ゲームまかせ", 1); + mctx->genComboBoxItem("カスタム調整", 2); + mctx->endComboBox(); + mctx->genSlider("AMB R", &adjust_light_ambcol.r, '\0', 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &adjust_light_ambcol.g, '\0', 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &adjust_light_ambcol.b, '\0', 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("Dif0 R", &adjust_light_dif0_col_R, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &adjust_light_dif0_col_G, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &adjust_light_dif0_col_B, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("Dif1 R", &adjust_light_dif1_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" G", &adjust_light_dif1_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &adjust_light_dif1_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("Pos X", &adjust_light_main_pos.x, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Y", &adjust_light_main_pos.y, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider(" Z", &adjust_light_main_pos.z, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + + mctx->genLabel("■ 女優さんライト", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->startComboBox("種類", &adjust_light_mode, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("ありのままで勝負", 0); + mctx->genComboBoxItem("レフ板", 1); + mctx->genComboBoxItem("カスタム調整", 2); + mctx->endComboBox(); + + mctx->genSlider("カスタム時 R", &adjust_custom_R, 0, 2000, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &adjust_custom_G, 0, 2000, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &adjust_custom_B, 0, 2000, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("高さ調整", &adjust_height, -5000.0f, 5000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 沼", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("調整開始", &light_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("水面R", &mist_twilight_c1_col.r, -0xff, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &mist_twilight_c1_col.g, -0xff, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &mist_twilight_c1_col.b, -0xff, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("補佐α", &mist_twilight_c1_col.a, -0xff, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Overall α" (alpha) + mctx->genSlider("全体α", &field_0x268, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("泥１R", &mist_twilight_c2_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &mist_twilight_c2_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" B", &mist_twilight_c2_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider(" a", &mist_twilight_c2_col.a, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + // "Mud 2 R" + mctx->genSlider("泥２R", &field_0x264.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &field_0x264.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" B", &field_0x264.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ においもやの調整パラメータ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("色設定開始", &smell_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色　Ｒ", &smell_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　 Ｇ", &smell_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　Ｂ", &smell_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色　Ｒ", &smell_col2.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　 Ｇ", &smell_col2.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　Ｂ", &smell_col2.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("アルファ", &smell_alpha, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("■ においレールタグ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("間隔", &smell_railtag_space, -1000.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 太陽フレア　加算に切替", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // "Change to addition!!" + mctx->genCheckBox("加算にチェンジ！！", &field_0x215, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ ワイプタイプをテスト", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->startComboBox("ワイプテスト", &wipe_test_ON, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("フェード黒", 0); + mctx->genComboBoxItem("フェード白", 1); + mctx->genComboBoxItem("回転", 2); + mctx->genComboBoxItem("時間ごまかし実験", 3); + mctx->genComboBoxItem("ぼモザイク", 4); + mctx->genComboBoxItem("無し", 5); + mctx->genComboBoxItem("無し-無し", 6); + mctx->genComboBoxItem("無し-ホワイト", 7); + mctx->genComboBoxItem("フェード２黒", 8); + mctx->genComboBoxItem("フェード２白", 9); + mctx->genComboBoxItem("無し-fade黒", 10); + mctx->genComboBoxItem("無し-fade白", 11); + mctx->genComboBoxItem("表裏", 12); + mctx->genComboBoxItem("13", 13); + mctx->genComboBoxItem("霧色フェード", 14); + mctx->genComboBoxItem("15", 15); + mctx->genComboBoxItem("ポ切 黒→黒", 16); + mctx->genComboBoxItem("ポ切 白→白", 17); + mctx->genComboBoxItem("ポ切 黒→黒n", 18); + mctx->genComboBoxItem("ポ切 白→白n", 19); + mctx->genComboBoxItem("ポ切 霧色", 20); + mctx->genComboBoxItem("白のまま", 21); + mctx->genComboBoxItem("黒のまま", 22); + mctx->genComboBoxItem("通常動作", 255); + mctx->endComboBox(); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("・フェード時間テスト用　０以外で有効になります", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("フェード速度指定", &fade_test_speed, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 霧壁タグ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("フォグ near", &mist_tag_fog_near, -100000.0f, 100000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("フォグ far", &mist_tag_fog_far, -100000.0f, 100000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 水中カラー割合　現在カラーに乗算します", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("Ｒ", &water_in_col_ratio_R, 0.0f, 2.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("Ｇ", &water_in_col_ratio_G, 0.0f, 2.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("Ｂ", &water_in_col_ratio_B, 0.0f, 2.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ もや　", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("基本色 R", &moya_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &moya_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" B", &moya_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("アルファ", &moya_alpha, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 雷の調整パラメータ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色　Ｒ", &thunder_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　 Ｇ", &thunder_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　Ｂ", &thunder_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("高さ", &thunder_height, -50000.0, 50000.0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("黒くする率", &thunder_blacken_rate, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 稲妻", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("デバッグ常時出現", &lightning_debug_mode, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("Xスケールmin", &lightning_scale_x_min, 0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("Xスケールmax", &lightning_scale_x_max, 0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("Yスケールmin", &lightning_scale_y_min, 0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("Yスケールmax", &lightning_scale_y_max, 0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("最大傾き角度", &lightning_tilt_angle, -0x8000, 0x7fff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("表示d範囲幅 XZ", &collect_light_reflect_pos.x, 0.0f, 1000000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("表示範囲幅 Y", &collect_light_reflect_pos.y, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 月の調整パラメータ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("設定開始", &rainbow_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色　Ｒ", &moon_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　 Ｇ", &moon_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　Ｂ", &moon_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　α", &moon_col.a, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("スケール", &moon_scale, 0.0f, 100000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 太陽の調整パラメータ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("色設定開始", &sun_adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色　Ｒ", &sun_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　 Ｇ", &sun_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　Ｂ", &sun_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色　Ｒ", &sun_col2.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　 Ｇ", &sun_col2.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　Ｂ", &sun_col2.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 胞子の調整パラメータ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("最大数", &housi_max_number, 0, 1000, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("最大アルファ", &housi_max_alpha, 0.0f, 255.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("最大スケール", &housi_max_scale, 0.0f, 100.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 雲の調整パラメータ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("晴れ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("風の影響率", &cloud_sunny_wind_influence_rate, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("高さ　端", &cloud_sunny_bottom_height, 0.0f, 50000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("高さ　てっぺん", &cloud_sunny_top_height, 0.0f, 50000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("大きさ", &cloud_sunny_size, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("高さ縮小率", &cloud_sunny_height_shrink_rate, 0.0f, 10.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("アルファ", &cloud_sunny_alpha, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("曇り", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("風の影響率", &cloud_cloudy_wind_influence_rate, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("高さ　端", &cloud_cloudy_bottom_height, 0.0f, 50000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("高さ　てっぺん", &cloud_cloudy_top_height, 0.0f, 50000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("大きさ", &cloud_cloudy_size, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("高さ縮小率", &cloud_cloudy_height_shrink_rate, 0.0f, 10.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("アルファ", &cloud_cloudy_alpha, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("――――――――――――――――――――――――――――――――――――――――――", 0x80000001, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("■ 星座作成くん", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("設定開始！", &constellation_maker_ON, '\x01', 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + for (int i = 0; i < 10; i++) { + mctx->genSlider("X", &constellation_maker_pos[i].x, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider("y", &constellation_maker_pos[i].y, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genSlider("z", &constellation_maker_pos[i].z, -100000.0f, 100000.0f, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + } } dKankyo_efflightHIO_c::dKankyo_efflightHIO_c() { - // DEBUG NONMATCHING + adjust_ON = 0; + power = 80.0f; + fluctuation = 100.0f; + + step1.start_frame = 1; + step1.r = 191; + step1.g = 150; + step1.b = 45; + + step2.start_frame = 4; + step2.r = 180; + step2.g = 60; + step2.b = 0; + + step3.start_frame = 8; + step3.r = 75; + step3.g = 15; + step3.b = 0; + + step4.start_frame = 15; + step4.r = 0; + step4.g = 0; + step4.b = 0; } void dKankyo_efflightHIO_c::genMessage(JORMContext* mctx) { - // DEBUG NONMATCHING + mctx->genLabel("エフェクトライトカラー", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("設定開始", &adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("第１段階", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("frame", &step1.start_frame, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色 Ｒ", &step1.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｇ", &step1.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｂ", &step1.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("第２段階", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("frame", &step2.start_frame, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色 Ｒ", &step2.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｇ", &step2.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｂ", &step2.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("第３段階", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("frame", &step3.start_frame, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色 Ｒ", &step3.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｇ", &step3.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｂ", &step3.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("第４段階", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("frame", &step4.start_frame, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("色 Ｒ", &step4.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｇ", &step4.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" Ｂ", &step4.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("影響範囲", &power, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("ゆらぎ", &fluctuation, 0.0f, 255.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); } dKankyo_windHIO_c::dKankyo_windHIO_c() { - // DEBUG NONMATCHING + display_wind_dir = 0; + use_HOSTIO_adjustment = 0; + field_0x8 = -1; + global_x_angle = 0; + global_y_angle = 0; + global_wind_power = 0.3f; + field_0x14 = 0.0; + field_0x18 = 35.0f; + field_0x1c = 6.0f; + display_wind_trajectory = 0; + lightsword_x_angle = 1800; + lightsword_init_scale = 500.0f; + lightsword_end_scale = 300.0f; + influence = 1.0f; + lightsword_move_speed = 150.0f; + influence_attenuation = 0.3f; + wind_change_speed = 0.05f; + minigame_no_wind_duration = 90; + minigame_low_wind_duration = 60; + minigame_high_wind_duration = 90; } dKankyo_demolightHIO_c::dKankyo_demolightHIO_c() { - // DEBUG NONMATCHING + adjust_ON = 0; + light.mPosition.x = 0.0f; + light.mPosition.y = 0.0f; + light.mPosition.z = 0.0f; + light.mColor.r = 255; + light.mColor.g = 255; + light.mColor.b = 255; + light.mPow = 1000.0f; + light.mFluctuation = 0.0f; } void dKankyo_demolightHIO_c::genMessage(JORMContext* mctx) { - // DEBUG NONMATCHING + mctx->genLabel("デモ用ポイントライト", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("設定開始", &adjust_ON, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("color R", &light.mColor.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &light.mColor.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" B", &light.mColor.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("影響範囲", &light.mPow, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("ゆらぎ", &light.mFluctuation, 0.0f, 255.0f, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); } void dKankyo_windHIO_c::genMessage(JORMContext* mctx) { - // DEBUG NONMATCHING + mctx->genLabel("○グローバル風の設定", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("風向き確認表示", &display_wind_dir, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("風変化補完速度", &wind_change_speed, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + + mctx->genLabel("===============================================================", 0x80000001, 0, + NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("HOSTIOでの調整", &use_HOSTIO_adjustment, 1, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("画面中心のバーが設定した向きで", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("Ｘアングル", &global_x_angle, -0x8000, 0x7fff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("Ｙアングル", &global_y_angle, -0x8000, 0x7fff, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("風力", &global_wind_power, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genLabel("===============================================================", 0x80000001, 0, + NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("○光の剣実験パラメータ", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("実験風軌道表示", &display_wind_trajectory, 1, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("Ｘアングル", &lightsword_x_angle, -0x7fff, 0x7fff, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("開始スケール", &lightsword_init_scale, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("終了スケール", &lightsword_end_scale, 0.0f, 10000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("影響力", &influence, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("影響力減衰値", &influence_attenuation, 0.0f, 1.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("移動速度", &lightsword_move_speed, 0.0f, 1000.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + + mctx->genLabel("===============================================================", 0x80000001, 0, + NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("○風避けゲーム強風タイマー調整", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, + 0x18); + mctx->genSlider("無風継続時間", &minigame_no_wind_duration, 0, 1000, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("弱風継続時間", &minigame_low_wind_duration, 0, 1000, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genSlider("強風継続時間", &minigame_high_wind_duration, 0, 1000, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); } dKankyo_dungeonlightHIO_c::dKankyo_dungeonlightHIO_c() { - // DEBUG NONMATCHING + field_0x5 = 0; + usedLights = 0; + displayDebugSphere = 0; + field_0x8 = 0; + field_0x9 = 0; } -void dKankyo_dungeonlightHIO_c::genMessage(JORMContext* mctx) {} +void dKankyo_dungeonlightHIO_c::genMessage(JORMContext* mctx) { + // empty function +} dKankyo_ParticlelightHIO_c::dKankyo_ParticlelightHIO_c() { - // DEBUG NONMATCHING + field_0x5 = 0; + prim_col.r = 255; + prim_col.g = 255; + prim_col.b = 255; + prim_col.a = 255; + env_col.r = 255; + env_col.g = 255; + env_col.b = 255; + env_col.a = 255; + blend_ratio = 0.5f; + field_0x14 = 0; + type = 0; + field_0x19 = 1; + field_0x1a = 0; } void dKankyo_ParticlelightHIO_c::genMessage(JORMContext* mctx) { - // DEBUG NONMATCHING + mctx->genLabel("パーティクル色　設定", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("五感発動時のみに見えるパーティクルの実験", 0x80000001, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genLabel("下をＯＮにしてからテストパーティクルを出してみて下さい", 0x80000001, 0, NULL, + 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("←五感発動時にしか見えなくなります！", &field_0x1a, 1, 0, NULL, 0xffff, + 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("インダイレクトより後に移動！", &field_0x19, 1, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->startComboBox("タイプ", &type, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("TESTSMOKE_A01", 0); + mctx->genComboBoxItem("DASHSMOKE_A", 1); + mctx->genComboBoxItem("DOWNSMOKE_A", 2); + mctx->genComboBoxItem("TESTSMOKE_A02", 3); + mctx->genComboBoxItem("SCREENKAGEROU01", 4); + mctx->genComboBoxItem("ZENKAISCREEN2_A", 5); + mctx->genComboBoxItem("ZENKAISCREEN2_B", 6); + mctx->genComboBoxItem("TESTSMOKE_B01", 7); + mctx->genComboBoxItem("TESTSMOKE_B02", 8); + mctx->genComboBoxItem("TESTSMOKE_C01", 9); + mctx->genComboBoxItem("TESTSMOKE_C02", 10); + mctx->endComboBox(); + mctx->genSlider("Prim　R", &prim_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &prim_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　B", &prim_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("Env 　R", &env_col.r, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" G", &env_col.g, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider(" 　B", &env_col.b, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("基本α", &prim_col.a, 0, 0xff, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genSlider("ブレンド率", &blend_ratio, 0.001f, 1.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genButton("プレイヤー位置に発生！", 0x40000004, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); } void dKankyo_ParticlelightHIO_c::listenPropertyEvent(const JORPropertyEvent* property) { - // DEBUG NONMATCHING + JORReflexible::listenPropertyEvent(property); + + switch ((uintptr_t)property->id) { + case 0x40000004: + field_0x14 = 1; + break; + } } dKankyo_HIO_c::dKankyo_HIO_c() { @@ -5690,7 +8317,141 @@ dKankyo_HIO_c::dKankyo_HIO_c() { } void dKankyo_HIO_c::genMessage(JORMContext* mctx) { - // DEBUG NONMATCHING + mctx->genSlider("時刻速度", &g_env_light.time_change_rate, 0.0f, 10.0f, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + + mctx->startComboBox("時刻切替", &time_change, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("通常時間", 0); + mctx->genComboBoxItem("朝0時間に固定", 1); + mctx->genComboBoxItem("朝1時間に固定", 2); + mctx->genComboBoxItem("昼時間に固定", 3); + mctx->genComboBoxItem("夕0時間に固定", 4); + mctx->genComboBoxItem("夕1時間に固定", 5); + mctx->genComboBoxItem("夜時間に固定", 6); + mctx->genComboBoxItem("マップ設定無視経過", 7); + mctx->endComboBox(); + + mctx->startComboBox("天候エフェクト", &wether_effect, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("なし", 0); + mctx->genComboBoxItem("雨", 1); + mctx->genComboBoxItem("雪", 2); + mctx->genComboBoxItem("星", 3); + mctx->genComboBoxItem("胞子", 4); + mctx->genComboBoxItem("もや", 0x10); + mctx->genComboBoxItem("匂い", 6); + mctx->genComboBoxItem("水泥", 7); + mctx->genComboBoxItem("海雪", 8); + mctx->genComboBoxItem("全消去", 0x99); + mctx->endComboBox(); + + mctx->startComboBox("天候パレット", &wether_palette, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("通常", 0); + mctx->genComboBoxItem("晴に変更", 0x40); + mctx->genComboBoxItem("雨に変更", 1); + mctx->genComboBoxItem("雪に変更", 2); + mctx->genComboBoxItem("他に変更", 3); + mctx->genComboBoxItem("松明０に変更", 4); + mctx->genComboBoxItem("松明１に変更", 5); + mctx->genComboBoxItem("松明２に変更", 6); + mctx->genComboBoxItem("宝箱に変更", 7); + mctx->genComboBoxItem("08に変更", 8); + mctx->genComboBoxItem("09に変更", 9); + mctx->genComboBoxItem("10に変更", 10); + mctx->genComboBoxItem("11に変更", 11); + mctx->genComboBoxItem("12に変更", 12); + mctx->genComboBoxItem("13に変更", 13); + mctx->genComboBoxItem("14に変更", 14); + mctx->genComboBoxItem("15に変更", 15); + mctx->genComboBoxItem("16に変更", 16); + mctx->genComboBoxItem("17に変更", 17); + mctx->genComboBoxItem("18に変更", 18); + mctx->genComboBoxItem("19に変更", 19); + mctx->genComboBoxItem("20に変更", 20); + mctx->genComboBoxItem("21に変更", 21); + mctx->genComboBoxItem("22に変更", 22); + mctx->genComboBoxItem("23に変更", 23); + mctx->genComboBoxItem("24に変更", 24); + mctx->genComboBoxItem("25に変更", 25); + mctx->genComboBoxItem("26に変更", 26); + mctx->genComboBoxItem("27に変更", 27); + mctx->genComboBoxItem("28に変更", 28); + mctx->genComboBoxItem("29に変更", 29); + mctx->genComboBoxItem("30に変更", 30); + mctx->genComboBoxItem("31に変更", 31); + mctx->genComboBoxItem("32に変更", 32); + mctx->genComboBoxItem("33に変更", 33); + mctx->genComboBoxItem("34に変更", 34); + mctx->genComboBoxItem("35に変更", 35); + mctx->genComboBoxItem("36に変更", 36); + mctx->genComboBoxItem("37に変更", 37); + mctx->genComboBoxItem("38に変更", 38); + mctx->genComboBoxItem("39に変更", 39); + mctx->genComboBoxItem("40に変更", 40); + mctx->genComboBoxItem("41に変更", 41); + mctx->genComboBoxItem("42に変更", 42); + mctx->genComboBoxItem("43に変更", 43); + mctx->genComboBoxItem("44に変更", 44); + mctx->genComboBoxItem("45に変更", 43); // possible bug? + mctx->genComboBoxItem("46に変更", 46); + mctx->genComboBoxItem("47に変更", 47); + mctx->genComboBoxItem("48に変更", 48); + mctx->genComboBoxItem("49に変更", 49); + mctx->genComboBoxItem("50に変更", 50); + mctx->genComboBoxItem("51に変更", 51); + mctx->genComboBoxItem("52に変更", 52); + mctx->genComboBoxItem("53に変更", 53); + mctx->genComboBoxItem("54に変更", 54); + mctx->genComboBoxItem("55に変更", 55); + mctx->genComboBoxItem("56に変更", 56); + mctx->genComboBoxItem("57に変更", 57); + mctx->genComboBoxItem("58に変更", 58); + mctx->genComboBoxItem("59に変更", 59); + mctx->genComboBoxItem("60に変更", 60); + mctx->genComboBoxItem("61に変更", 61); + mctx->genComboBoxItem("62に変更", 62); + mctx->genComboBoxItem("63に変更", 63); + mctx->endComboBox(); + + mctx->genCheckBox("環境タグデバッグ表示", &display_env_tag_debug, 1, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genCheckBox("天気予報表デバッグ表示", &display_wether_debug, 1, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genCheckBox("スケジュールビット表示", &display_schedule_bit, 1, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + + mctx->startComboBox("雨を降らせる", &start_rain, 0, NULL, 0xffff, 0xffff, 0x100, 0x1a); + mctx->genComboBoxItem("無し", 0); + mctx->genComboBoxItem("小雨", 1); + mctx->genComboBoxItem("大雨", 2); + mctx->genComboBoxItem("曇る", 3); + mctx->genComboBoxItem("晴れに戻す", 4); + mctx->genComboBoxItem("カミナリ", 5); + mctx->genComboBoxItem("カミナリ&大雨", 6); + mctx->endComboBox(); + + mctx->genCheckBox("エフェクトライトモニタ", &effect_light_monitor, 1, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + + mctx->startComboBox("ポイントライトモニタ", &point_light_monitor, 0, NULL, 0xffff, 0xffff, + 0x100, 0x1a); + mctx->genComboBoxItem("しない", 0); + mctx->genComboBoxItem("ID一覧", 1); + mctx->genComboBoxItem("位置も表示", 2); + mctx->endComboBox(); + + mctx->genLabel("", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + mctx->genCheckBox("settingTevStructをしない", &no_setting_tevstr, 1, 0, NULL, 0xffff, 0xffff, + 0x200, 0x18); + mctx->genCheckBox("colortypeをしない", &no_color_type, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + + mctx->genNode("ライト設定", &light, 0, 0); + mctx->genNode("ＶＲボックス", &vrbox, 0, 0); + mctx->genNode("飽和加算設定", &bloom, 0, 0); + mctx->genNode("環境エフェクト色々", &navy, 0, 0); + mctx->genNode("エフェクトライト", &effLight, 0, 0); + mctx->genNode("風", &wind, 0, 0); + mctx->genNode("デモライト", &demoLight, 0, 0); + mctx->genNode("パーティクル設定", &particleLight, 0, 0); } #endif @@ -5838,7 +8599,7 @@ static int dKy_Delete(sub_kankyo__class* i_this) { } static int dKy_Create(void* i_this) { - (void)i_this; + kankyo_class* kankyo = (kankyo_class*)i_this; BOOL next_time_set = false; stage_envr_info_class* stage_envr_p = dComIfGp_getStageEnvrInfo(); @@ -5850,7 +8611,7 @@ static int dKy_Create(void* i_this) { #if DEBUG OS_REPORT("\n-----------------------------------"); OS_REPORT("\n飽和加算用にＲＡＭを確保しました！ "); - OS_REPORT("\n-----------------------------------"); + OS_REPORT("\n-----------------------------------\n"); #endif } } @@ -5916,6 +8677,31 @@ static int dKy_Create(void* i_this) { return cPhs_COMPLEATE_e; } +static leafdraw_method_class l_dKy_Method = { + (process_method_func)dKy_Create, (process_method_func)dKy_Delete, + (process_method_func)dKy_Execute, (process_method_func)dKy_IsDelete, + (process_method_func)dKy_Draw, +}; + +extern kankyo_process_profile_definition g_profile_KANKYO = { + fpcLy_CURRENT_e, + 1, + fpcPi_CURRENT_e, + PROC_KANKYO, + &g_fpcLf_Method.base, + sizeof(sub_kankyo__class), + 0, + 0, + &g_fopKy_Method, + 2, + &l_dKy_Method, +}; + +static void dummy_str_0x40a0() { + char* str1 = "ステージが変わったときかなぁ～？？？"; + char* str2 = "POINTLIGHT RECALL![%f][%f][%f]"; +} + void dKy_setLight_init() { for (int i = 0; i < 8; i++) { lightStatusData[i] = lightStatusBase; @@ -5976,13 +8762,16 @@ BOOL dKy_lightswitch_check(stage_pure_lightvec_info_class* stage_light_info_p, c void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); camera_class* camera = (camera_class*)dComIfGp_getCamera(0); - fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); + fopAc_ac_c* player = dComIfGp_getPlayer(0); MtxP view_mtx = j3dSys.getViewMtx(); dKy_tevstr_c* room_tevstr = dComIfGp_roomControl_getTevStr(room_no); if (dComIfGp_roomControl_getStatusRoomDt(room_no) != NULL) { - stage_pure_lightvec_info_class* room_light_info = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); - int room_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum(); + int room_light_info_num; + int eflight_id; + stage_pure_lightvec_info_class* room_light_info = + dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); + room_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum(); if (room_light_info_num > 6) { room_light_info_num = 6; } @@ -6018,7 +8807,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { } if (camera != 0) { - int eflight_id = dKy_eflight_influence_id(camera->lookat.eye, 0); + eflight_id = dKy_eflight_influence_id(camera->lookat.eye, 0); if (eflight_id >= 0) { dKy_bgparts_activelight_set(g_env_light.efplight[eflight_id], 1); if (dKy_Indoor_check() == TRUE) { @@ -6061,84 +8850,128 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { } for (int i = 0; i < 6; i++) { - if (room_light_info != 0) { - if (i < room_light_info_num) { - lightStatusPt[i + 2].position.x = room_light_info[i].position.x; - lightStatusPt[i + 2].position.y = room_light_info[i].position.y; - lightStatusPt[i + 2].position.z = room_light_info[i].position.z; + #if DEBUG + if (!g_kankyoHIO.light.m_HOSTIO_setting) + #endif + { + #if DEBUG + if (dComIfGp_roomControl_getStayNo() == room_no) { + g_kankyoHIO.dungeonLight.usedLights = room_light_info_num; + } + #endif - if (dKy_lightswitch_check(&room_light_info[i], room_no) == TRUE) { - lightStatusPt[i + 2].mRefDist = room_light_info[i].radius; + if (room_light_info != 0) { + if (i < room_light_info_num) { + (lightStatusPt + 2)[i].position.x = room_light_info[i].position.x; + (lightStatusPt + 2)[i].position.y = room_light_info[i].position.y; + (lightStatusPt + 2)[i].position.z = room_light_info[i].position.z; + + if (dKy_lightswitch_check(&room_light_info[i], room_no) == TRUE) { + (lightStatusPt + 2)[i].mRefDist = room_light_info[i].radius; + } else { + (lightStatusPt + 2)[i].mRefDist = 0.000001f; + } + + (lightStatusPt + 2)[i].mRefBrightness = 0.99999f; + (lightStatusPt + 2)[i].field_0x1c = 0; + (lightStatusPt + 2)[i].mSpotFn = (GXSpotFn)room_light_info[i].spot_type; + (lightStatusPt + 2)[i].mDistFn = (GXDistAttnFn)room_light_info[i].dist_atten_type; + (lightStatusPt + 2)[i].mCutoff = room_light_info[i].spotCutoff; + dKy_lightdir_set(room_light_info[i].directionX, room_light_info[i].directionY, + &(lightStatusPt + 2)[i].mLightDir); } else { - lightStatusPt[i + 2].mRefDist = 0.000001f; + (lightStatusPt + 2)[i].mRefDist = 0.0f; + (lightStatusPt + 2)[i].mRefBrightness = 0.99999f; + (lightStatusPt + 2)[i].field_0x1c = 0; + (lightStatusPt + 2)[i].mDistFn = GX_DA_OFF; + (lightStatusPt + 2)[i].mSpotFn = GX_SP_OFF; + (lightStatusPt + 2)[i].mCutoff = 90.0f; + } + } + + if (dKy_SunMoon_Light_Check() == TRUE && i <= 1) { + lightMask |= lightMaskData[2]; + lightMask |= lightMaskData[3]; + + if (i == 0) { + (lightStatusPt + 2)[i].position = kankyo->sun_pos; + } else if (camera != 0) { + (lightStatusPt + 2)[i].position = camera->lookat.eye + kankyo->moon_pos; + } else { + (lightStatusPt + 2)[i].position = kankyo->moon_pos; } - lightStatusPt[i + 2].mRefBrightness = 0.99999f; - lightStatusPt[i + 2].field_0x1c = 0; - lightStatusPt[i + 2].mSpotFn = (GXSpotFn)room_light_info[i].spot_type; - lightStatusPt[i + 2].mDistFn = (GXDistAttnFn)room_light_info[i].dist_atten_type; - lightStatusPt[i + 2].mCutoff = room_light_info[i].spotCutoff; - dKy_lightdir_set(room_light_info[i].directionX, room_light_info[i].directionY, - &((&lightStatusPt[i] + 2))->mLightDir); + (lightStatusPt + 2)[i].mRefDist = 10000.0f; + (lightStatusPt + 2)[i].mRefBrightness = 0.99999f; + (lightStatusPt + 2)[i].field_0x1c = 1; + (lightStatusPt + 2)[i].mDistFn = GX_DA_STEEP; + (lightStatusPt + 2)[i].mSpotFn = GX_SP_OFF; + } + + if (lightMask & lightMaskData[i + 2]) { + if (room_tevstr == NULL) { + JUT_ASSERT(12633, FALSE); + } + + J3DLightInfo* room_light = room_tevstr->mLights[i].getLightInfo(); + if (room_light != NULL) { + (lightStatusPt + 2)[i].color = + dKy_light_influence_col(&room_light->mColor, light_ratio); + } else { + (lightStatusPt + 2)[i].color = + dKy_light_influence_col(&g_env_light.dungeonlight[i].mColor, light_ratio); + } + + #if DEBUG + if (!g_kankyoHIO.light.m_HOSTIO_setting) + #endif + { + if (room_no == dComIfGp_roomControl_getStayNo() && room_light_info != NULL && + i < room_light_info_num) + { + g_env_light.dungeonlight[i].mPosition = (lightStatusPt + 2)[i].position; + g_env_light.dungeonlight[i].mRefDistance = (lightStatusPt + 2)[i].mRefDist; + g_env_light.dungeonlight[i].mCutoffAngle = (lightStatusPt + 2)[i].mCutoff; + g_env_light.dungeonlight[i].mAngleAttenuation = (lightStatusPt + 2)[i].mSpotFn; + g_env_light.dungeonlight[i].mDistAttenuation = (lightStatusPt + 2)[i].mDistFn; + g_env_light.dungeonlight[i].mAngleX = room_light_info[i].directionX; + g_env_light.dungeonlight[i].mAngleY = room_light_info[i].directionY; + } + } } else { - lightStatusPt[i + 2].mRefDist = 0.0f; - lightStatusPt[i + 2].mRefBrightness = 0.99999f; - lightStatusPt[i + 2].field_0x1c = 0; - lightStatusPt[i + 2].mDistFn = GX_DA_OFF; - lightStatusPt[i + 2].mSpotFn = GX_SP_OFF; - lightStatusPt[i + 2].mCutoff = 90.0f; + (lightStatusPt + 2)[i].color.r = 0; + (lightStatusPt + 2)[i].color.g = 0; + (lightStatusPt + 2)[i].color.b = 0; } } - - if (dKy_SunMoon_Light_Check() == TRUE && i <= 1) { - lightMask |= lightMaskData[2]; - lightMask |= lightMaskData[3]; - - if (i == 0) { - ((&lightStatusPt[i] + 2))->position = kankyo->sun_pos; - } else if (camera != 0) { - ((&lightStatusPt[i] + 2))->position = camera->lookat.eye + kankyo->moon_pos; + #if DEBUG + else { + (lightStatusPt + 2)[i].position = g_env_light.dungeonlight[i].mPosition; + (lightStatusPt + 2)[i].mRefDist = g_env_light.dungeonlight[i].mRefDistance; + #if DEBUG + (lightStatusPt + 2)[i].mRefBrightness = 0.99999f; + #else + (lightStatusPt + 2)[i].mRefBrightness = g_env_light.dungeonlight[i].mRefDistance; + #endif + (lightStatusPt + 2)[i].field_0x1c = 0; + (lightStatusPt + 2)[i].mSpotFn = (GXSpotFn)g_env_light.dungeonlight[i].mAngleAttenuation; + (lightStatusPt + 2)[i].mDistFn = (GXDistAttnFn)g_env_light.dungeonlight[i].mDistAttenuation; + (lightStatusPt + 2)[i].mCutoff = g_env_light.dungeonlight[i].mCutoffAngle; + dKy_lightdir_set(g_env_light.dungeonlight[i].mAngleX, + g_env_light.dungeonlight[i].mAngleY, + &(lightStatusPt + 2)[i].position); + if (g_kankyoHIO.dungeonLight.usedLights < i) { + lightMask |= lightMaskData[i + 2]; + (lightStatusPt + 2)[i].color = dKy_light_influence_col( + &g_env_light.dungeonlight[i].mColor, + g_env_light.bg_light_influence * light_ratio); } else { - ((&lightStatusPt[i] + 2))->position = kankyo->moon_pos; + (lightStatusPt + 2)[i].color.r = 0; + (lightStatusPt + 2)[i].color.g = 0; + (lightStatusPt + 2)[i].color.b = 0; } - - lightStatusPt[i + 2].mRefDist = 10000.0f; - lightStatusPt[i + 2].mRefBrightness = 0.99999f; - lightStatusPt[i + 2].field_0x1c = 1; - lightStatusPt[i + 2].mDistFn = GX_DA_STEEP; - lightStatusPt[i + 2].mSpotFn = GX_SP_OFF; - } - - if (lightMask & lightMaskData[i + 2]) { - if (room_tevstr == NULL) { - JUT_ASSERT(12633, FALSE); - } - - J3DLightInfo* room_light = &room_tevstr->mLights[i].getLightInfo(); - if (room_light != NULL) { - ((&lightStatusPt[i] + 2))->color = - dKy_light_influence_col(&room_light->mColor, light_ratio); - } else { - ((&lightStatusPt[i] + 2))->color = - dKy_light_influence_col(&g_env_light.dungeonlight[i].mColor, light_ratio); - } - - if (room_no == dComIfGp_roomControl_getStayNo() && room_light_info != NULL && - i < room_light_info_num) - { - g_env_light.dungeonlight[i].mPosition = ((&lightStatusPt[i] + 2))->position; - g_env_light.dungeonlight[i].mRefDistance = lightStatusPt[i + 2].mRefDist; - g_env_light.dungeonlight[i].mCutoffAngle = lightStatusPt[i + 2].mCutoff; - g_env_light.dungeonlight[i].mAngleAttenuation = lightStatusPt[i + 2].mSpotFn; - g_env_light.dungeonlight[i].mDistAttenuation = lightStatusPt[i + 2].mDistFn; - g_env_light.dungeonlight[i].mAngleX = room_light_info[i].directionX; - g_env_light.dungeonlight[i].mAngleY = room_light_info[i].directionY; - } - } else { - lightStatusPt[i + 2].color.r = 0; - lightStatusPt[i + 2].color.g = 0; - lightStatusPt[i + 2].color.b = 0; } + #endif } for (int i = 0; i < 6; i++) { @@ -6154,32 +8987,32 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { } if (room_tevstr->Type < 16) { - lightStatusPt[j + 2].position.x = kankyo->field_0x0c18[i].mPos.x; - lightStatusPt[j + 2].position.y = kankyo->field_0x0c18[i].mPos.y; - lightStatusPt[j + 2].position.z = kankyo->field_0x0c18[i].mPos.z; + (lightStatusPt + 2)[j].position.x = kankyo->field_0x0c18[i].mPos.x; + (lightStatusPt + 2)[j].position.y = kankyo->field_0x0c18[i].mPos.y; + (lightStatusPt + 2)[j].position.z = kankyo->field_0x0c18[i].mPos.z; } else { - lightStatusPt[j + 2].position.x = kankyo->field_0x0c18[i].mPos.x; + (lightStatusPt + 2)[j].position.x = kankyo->field_0x0c18[i].mPos.x; if (i == 0) { - lightStatusPt[j + 2].position.y = + (lightStatusPt + 2)[j].position.y = kankyo->field_0x0c18[i].mPos.y + g_env_light.field_0x127c; } else { - lightStatusPt[j + 2].position.y = + (lightStatusPt + 2)[j].position.y = 200.0f + kankyo->field_0x0c18[i].mPos.y; } - lightStatusPt[j + 2].position.z = kankyo->field_0x0c18[i].mPos.z; + (lightStatusPt + 2)[j].position.z = kankyo->field_0x0c18[i].mPos.z; } - ((&lightStatusPt[j] + 2))->color = dKy_light_influence_col(&kankyo->field_0x0c18[i].mColor, light_ratio); - lightStatusPt[j + 2].mRefDist = kankyo->field_0x0c18[i].mRefDistance; - lightStatusPt[j + 2].mRefBrightness = 0.99999f; - lightStatusPt[j + 2].field_0x1c = 1; - lightStatusPt[j + 2].mSpotFn = (GXSpotFn)kankyo->field_0x0c18[i].mAngleAttenuation; - lightStatusPt[j + 2].mDistFn = (GXDistAttnFn)kankyo->field_0x0c18[i].mDistAttenuation; - lightStatusPt[j + 2].mCutoff = kankyo->field_0x0c18[i].mCutoffAngle; + (lightStatusPt + 2)[j].color = dKy_light_influence_col(&kankyo->field_0x0c18[i].mColor, light_ratio); + (lightStatusPt + 2)[j].mRefDist = kankyo->field_0x0c18[i].mRefDistance; + (lightStatusPt + 2)[j].mRefBrightness = 0.99999f; + (lightStatusPt + 2)[j].field_0x1c = 1; + (lightStatusPt + 2)[j].mSpotFn = (GXSpotFn)kankyo->field_0x0c18[i].mAngleAttenuation; + (lightStatusPt + 2)[j].mDistFn = (GXDistAttnFn)kankyo->field_0x0c18[i].mDistAttenuation; + (lightStatusPt + 2)[j].mCutoff = kankyo->field_0x0c18[i].mCutoffAngle; dKy_lightdir_set(kankyo->field_0x0c18[i].mAngleX, kankyo->field_0x0c18[i].mAngleY, - &((&lightStatusPt[j] + 2))->mLightDir); + &(lightStatusPt + 2)[j].mLightDir); break; } } @@ -6289,7 +9122,8 @@ void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) { if (dComIfGp_roomControl_getStatusRoomDt(room_no) != NULL) { J3DLightInfo* light; - stage_pure_lightvec_info_class* room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); + stage_pure_lightvec_info_class* room_lights = + dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); int room_light_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum(); if (room_light_num > 6) { room_light_num = 6; @@ -6312,128 +9146,210 @@ void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) { room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); + f32 var_f30; + f32 var_f29; for (int i = 0; i < 6; i++) { - light = &tevstr_p->mLights[i].getLightInfo(); - if (view_mtx != NULL) { - if (room_lights != 0 && i < room_light_num) { - sp3C.x = room_lights[i].position.x; - sp3C.y = room_lights[i].position.y; - sp3C.z = room_lights[i].position.z; + light = tevstr_p->mLights[i].getLightInfo(); + if ( + #if DEBUG + !g_kankyoHIO.light.m_HOSTIO_setting && !g_kankyoHIO.vrbox.m_VrboxSetting + #else + true + #endif + ) { + if (view_mtx != NULL) { + if (room_lights != 0 && i < room_light_num) { + sp3C.x = room_lights[i].position.x; + sp3C.y = room_lights[i].position.y; + sp3C.z = room_lights[i].position.z; - dKy_GXInitLightSpot(light, room_lights[i].spotCutoff, room_lights[i].spot_type); + dKy_GXInitLightSpot(light, room_lights[i].spotCutoff, room_lights[i].spot_type); - f32 var_f29; - if (dKy_lightswitch_check(&room_lights[i], room_no) == TRUE) { - var_f29 = light_ratio * room_lights[i].radius; - } else { - var_f29 = 0.000001f; + if (dKy_lightswitch_check(&room_lights[i], room_no) == TRUE) { + var_f29 = light_ratio * room_lights[i].radius; + } else { + var_f29 = 0.000001f; + } + + dKy_GXInitLightDistAttn(light, var_f29, 0.99999f, + room_lights[i].dist_atten_type); + dKy_lightdir_set(room_lights[i].directionX, room_lights[i].directionY, + &light->mLightDirection); + light->mLightDirection.x = -light->mLightDirection.x; + light->mLightDirection.y = -light->mLightDirection.y; + light->mLightDirection.z = -light->mLightDirection.z; } - dKy_GXInitLightDistAttn(light, var_f29, 0.99999f, - room_lights[i].dist_atten_type); - dKy_lightdir_set(room_lights[i].directionX, room_lights[i].directionY, - &light->mLightDirection); - light->mLightDirection.x = -light->mLightDirection.x; - light->mLightDirection.y = -light->mLightDirection.y; - light->mLightDirection.z = -light->mLightDirection.z; - } + if (dKy_SunMoon_Light_Check() == TRUE && i <= 1) { + lightMask |= lightMaskData[2]; + lightMask |= lightMaskData[3]; - if (dKy_SunMoon_Light_Check() == TRUE && i <= 1) { - lightMask |= lightMaskData[2]; - lightMask |= lightMaskData[3]; + if (i == 0) { + sp3C.x = kankyo->sun_pos.x; + sp3C.y = kankyo->sun_pos.y; + sp3C.z = kankyo->sun_pos.z; + } else if (camera != NULL) { + sp3C.x = camera->lookat.eye.x + kankyo->moon_pos.x; + sp3C.y = camera->lookat.eye.y + kankyo->moon_pos.y; + sp3C.z = camera->lookat.eye.z + kankyo->moon_pos.z; + } else { + sp3C.x = kankyo->moon_pos.x; + sp3C.y = kankyo->moon_pos.y; + sp3C.z = kankyo->moon_pos.z; + } - if (i == 0) { - sp3C.x = kankyo->sun_pos.x; - sp3C.y = kankyo->sun_pos.y; - sp3C.z = kankyo->sun_pos.z; - } else if (camera != NULL) { - sp3C.x = camera->lookat.eye.x + kankyo->moon_pos.x; - sp3C.y = camera->lookat.eye.y + kankyo->moon_pos.y; - sp3C.z = camera->lookat.eye.z + kankyo->moon_pos.z; - } else { - sp3C.x = kankyo->moon_pos.x; - sp3C.y = kankyo->moon_pos.y; - sp3C.z = kankyo->moon_pos.z; + dKy_GXInitLightSpot(light, 90.0f, GX_SP_OFF); + var_f29 = 10000.0f; + dKy_GXInitLightDistAttn(light, var_f29, 0.99999f, GX_DA_STEEP); } - dKy_GXInitLightSpot(light, 90.0f, GX_SP_OFF); - dKy_GXInitLightDistAttn(light, 10000.0f, 0.99999f, GX_DA_STEEP); + cMtx_multVec(view_mtx, &sp3C, &light_pos); + light->mLightPosition = light_pos; + + if (1.0f != light_ratio) { + light->mColor.r *= light_ratio; + light->mColor.g *= light_ratio; + light->mColor.b *= light_ratio; + } } - cMtx_multVec(view_mtx, &sp3C, &light_pos); - light->mLightPosition = light_pos; + if (!(lightMask & lightMaskData[i + 2])) { + light->mColor.r = 0; + light->mColor.g = 0; + light->mColor.b = 0; + } + #if DEBUG + if ((tevstr_p->Type == 10 || tevstr_p->Type == 9) && + dComIfGp_roomControl_getStayNo() == room_no) { + if (room_lights != NULL) { + if (i < room_light_num) { + g_env_light.dungeonlight[i].mPosition = sp3C; + if (dKy_SunMoon_Light_Check() == TRUE) { + if (i <= 1) { + g_env_light.dungeonlight[i].mRefDistance = 10000.0f; + } else { + g_env_light.dungeonlight[i].mRefDistance = + room_lights[i].radius; + } + } + } + } else { + if (dKy_SunMoon_Light_Check() == TRUE) { + if (i <= 1) { + g_kankyoHIO.dungeonLight.usedLights = 2; + g_env_light.dungeonlight[i].mPosition = sp3C; + if (dKy_SunMoon_Light_Check() == TRUE) { + if (i <= 1) { + g_env_light.dungeonlight[i].mRefDistance = 10000.0f; + } + } + } + } + } + } + #endif + + light = tevstr_p->mLightObj.getLightInfo(); if (1.0f != light_ratio) { light->mColor.r *= light_ratio; light->mColor.g *= light_ratio; light->mColor.b *= light_ratio; } - } + } else { + if (view_mtx != NULL) { + sp3C.x = g_env_light.dungeonlight[i].mPosition.x; + sp3C.y = g_env_light.dungeonlight[i].mPosition.y; + sp3C.z = g_env_light.dungeonlight[i].mPosition.z; - if (!(lightMask & lightMaskData[i + 2])) { - light->mColor.r = 0; - light->mColor.g = 0; - light->mColor.b = 0; - } + cMtx_multVec(view_mtx, &sp3C, &light_pos); + light->mLightPosition = light_pos; + light->mLightPosition.x = light_pos.x; + light->mLightPosition.y = light_pos.y; + light->mLightPosition.z = light_pos.z; - light = &tevstr_p->mLightObj.getLightInfo(); - if (1.0f != light_ratio) { - light->mColor.r *= light_ratio; - light->mColor.g *= light_ratio; - light->mColor.b *= light_ratio; + dKy_GXInitLightSpot(light, g_env_light.dungeonlight[i].mCutoffAngle, + g_env_light.dungeonlight[i].mAngleAttenuation); + + var_f30 = g_env_light.dungeonlight[i].mRefDistance; + if (var_f30 <= 0.0f) { + var_f30 = 0.000001f; + } + dKy_GXInitLightDistAttn(light, var_f30, 0.99999f, + g_env_light.dungeonlight[i].mDistAttenuation); + + dKy_lightdir_set(g_env_light.dungeonlight[i].mAngleX, + g_env_light.dungeonlight[i].mAngleY, + &light->mLightDirection); + + light->mLightDirection.x = -light->mLightDirection.x; + light->mLightDirection.y = -light->mLightDirection.y; + light->mLightDirection.z = -light->mLightDirection.z; + } + + if (i < g_kankyoHIO.dungeonLight.usedLights) { + lightMask |= lightMaskData[i + 2]; + + light->mColor = dKy_light_influence_col( + &g_env_light.dungeonlight[i].mColor, tevstr_p->field_0x374); + } else { + light->mColor.r = 0; + light->mColor.g = 0; + light->mColor.b = 0; + } } } - for (int i = 0; i < 6; i++) { - if (kankyo->field_0x0c18[i].field_0x26 == 1 && view_mtx != NULL) { - for (int j = 0; j < 6; j++) { - if (!(lightMask & lightMaskData[j + 2])) { - lightMask |= lightMaskData[j + 2]; + for (int i_sp30 = 0; i_sp30 < 6; i_sp30++) { + if (kankyo->field_0x0c18[i_sp30].field_0x26 == 1 && view_mtx != NULL) { + for (int j_sp14 = 0; j_sp14 < 6; j_sp14++) { + if (!(lightMask & lightMaskData[j_sp14 + 2])) { + lightMask |= lightMaskData[j_sp14 + 2]; - light = &tevstr_p->mLights[j].getLightInfo(); - if (kankyo->field_0x0c18[i].mColor.a == 254 || - kankyo->field_0x0c18[i].mColor.a == 253) + light = tevstr_p->mLights[j_sp14].getLightInfo(); + if (kankyo->field_0x0c18[i_sp30].mColor.a == 254 || + kankyo->field_0x0c18[i_sp30].mColor.a == 253) { - dKy_twi_wolflight_set(i); + dKy_twi_wolflight_set(i_sp30); } - light->mColor = dKy_light_influence_col(&kankyo->field_0x0c18[i].mColor, + light->mColor = dKy_light_influence_col(&kankyo->field_0x0c18[i_sp30].mColor, tevstr_p->field_0x374); if (tevstr_p->Type < 16) { - sp3C.x = kankyo->field_0x0c18[i].mPos.x; - sp3C.y = kankyo->field_0x0c18[i].mPos.y; - sp3C.z = kankyo->field_0x0c18[i].mPos.z; + sp3C.x = kankyo->field_0x0c18[i_sp30].mPos.x; + sp3C.y = kankyo->field_0x0c18[i_sp30].mPos.y; + sp3C.z = kankyo->field_0x0c18[i_sp30].mPos.z; - if (kankyo->field_0x0c18[i].mColor.a == 253) { + if (kankyo->field_0x0c18[i_sp30].mColor.a == 253) { light->mColor.r = light->mColor.r * 0.65f; light->mColor.g = light->mColor.g * 0.65f; light->mColor.b = light->mColor.b * 0.65f; } } else { - sp3C.x = kankyo->field_0x0c18[i].mPos.x; - if (i == 0) { - sp3C.y = kankyo->field_0x0c18[i].mPos.y + g_env_light.field_0x127c; + sp3C.x = kankyo->field_0x0c18[i_sp30].mPos.x; + if (i_sp30 == 0) { + sp3C.y = kankyo->field_0x0c18[i_sp30].mPos.y + g_env_light.field_0x127c; } else { - sp3C.y = 200.0f + kankyo->field_0x0c18[i].mPos.y; + sp3C.y = 200.0f + kankyo->field_0x0c18[i_sp30].mPos.y; } - sp3C.z = kankyo->field_0x0c18[i].mPos.z; + sp3C.z = kankyo->field_0x0c18[i_sp30].mPos.z; } - dKy_GXInitLightSpot(light, kankyo->field_0x0c18[i].mCutoffAngle, - kankyo->field_0x0c18[i].mAngleAttenuation); - f32 var_f30 = kankyo->field_0x0c18[i].mRefDistance * light_ratio; + dKy_GXInitLightSpot(light, kankyo->field_0x0c18[i_sp30].mCutoffAngle, + kankyo->field_0x0c18[i_sp30].mAngleAttenuation); + var_f30 = kankyo->field_0x0c18[i_sp30].mRefDistance * light_ratio; if (var_f30 <= 0.0f) { var_f30 = 0.000001f; } dKy_GXInitLightDistAttn(light, var_f30, 0.99999f, - kankyo->field_0x0c18[i].mDistAttenuation); + kankyo->field_0x0c18[i_sp30].mDistAttenuation); cMtx_multVec(view_mtx, &sp3C, &light_pos); light->mLightPosition = light_pos; - dKy_lightdir_set(kankyo->field_0x0c18[i].mAngleX, - kankyo->field_0x0c18[i].mAngleY, &light->mLightDirection); + dKy_lightdir_set(kankyo->field_0x0c18[i_sp30].mAngleX, + kankyo->field_0x0c18[i_sp30].mAngleY, &light->mLightDirection); light->mLightDirection.x = -light->mLightDirection.x; light->mLightDirection.y = -light->mLightDirection.y; light->mLightDirection.z = -light->mLightDirection.z; @@ -6529,7 +9445,9 @@ void dKy_plight_set(LIGHT_INFLUENCE* light_inf_p) { var_r30 = 1; g_env_light.pointlight[i] = light_inf_p; g_env_light.pointlight[i]->mIndex = i + 1; + #if !DEBUG break; + #endif } } @@ -6729,6 +9647,16 @@ void dKy_Itemgetcol_chg_on() { } } +// unused and stripped, existence is inferred from string in .data +void dKy_Itemgetcol_chg_off() { + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + OS_REPORT("\ndKy_Itemgetcol_chg_off[%d]", kankyo->Itemgetcol_chg); + + if (kankyo->Itemgetcol_chg == 1 || kankyo->Itemgetcol_chg == 6) { + kankyo->Itemgetcol_chg = 0; + } +} + void dKy_Sound_init() { g_env_light.sound_influence.position.x = 999999.9f; g_env_light.sound_influence.position.y = 999999.9f; @@ -6857,7 +9785,7 @@ void dKy_GfFog_tevstr_set(dKy_tevstr_c* tevstr_p) { static void GxXFog_set() { dKyd_xfog_table_set(g_env_light.mFogAdjTableType); - GXSetFogRangeAdj(g_env_light.mFogAdjEnable, g_env_light.mFogAdjCenter, &g_env_light.mXFogTbl); + GXSetFogRangeAdj(g_env_light.mFogAdjEnable, (u16)g_env_light.mFogAdjCenter, &g_env_light.mXFogTbl); } void dKy_change_colpat(u8 colpat) { @@ -6889,7 +9817,7 @@ void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend) { void dKy_setLight_mine(dKy_tevstr_c* tevstr_p) { GXLightObj light; - J3DLightInfo& info = tevstr_p->mLightObj.getLightInfo(); + J3DLightInfo& info = *tevstr_p->mLightObj.getLightInfo(); GXInitLightPos(&light, info.mLightPosition.x, info.mLightPosition.y, info.mLightPosition.z); GXInitLightDir(&light, info.mLightDirection.x, info.mLightDirection.y, info.mLightDirection.z); @@ -6922,7 +9850,7 @@ void dKy_tevstr_init(dKy_tevstr_c* tevstr_p, s8 room_no, u8 floorCol) { tevstr_p->field_0x374 = 1.0f; tevstr_p->field_0x384 = 0; - light_info = &tevstr_p->mLightObj.getLightInfo(); + light_info = tevstr_p->mLightObj.getLightInfo(); light_info->mColor.g = 0; light_info->mColor.b = 0; light_info->mColor.a = 255; @@ -6935,7 +9863,7 @@ void dKy_tevstr_init(dKy_tevstr_c* tevstr_p, s8 room_no, u8 floorCol) { int i; for (i = 0; i < 6; i++) { - light_info = &tevstr_p->mLights[i].getLightInfo(); + light_info = tevstr_p->mLights[i].getLightInfo(); light_info->mLightPosition = lightStatusData[i].position; light_info->mColor = lightStatusData[i].color; @@ -7080,26 +10008,6 @@ static GXColor NewAmbColGet(GXColorS10* in_col_p) { return amb_col; } -static leafdraw_method_class l_dKy_Method = { - (process_method_func)dKy_Create, (process_method_func)dKy_Delete, - (process_method_func)dKy_Execute, (process_method_func)dKy_IsDelete, - (process_method_func)dKy_Draw, -}; - -extern kankyo_process_profile_definition g_profile_KANKYO = { - fpcLy_CURRENT_e, - 1, - fpcPi_CURRENT_e, - PROC_KANKYO, - &g_fpcLf_Method.base, - sizeof(sub_kankyo__class), - 0, - 0, - &g_fopKy_Method, - 2, - &l_dKy_Method, -}; - // fixes float literal order static f32 dummy() { return 50.0f; @@ -7114,6 +10022,7 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p u8 spD = 0; s8 room_no; + GXColorS10 sp50; GXColorS10 sp48; J3DLightInfo* sp44; GXColor sp40; @@ -7124,7 +10033,7 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p for (i = 0; i < 6; i++) { if (param_1 != NULL) { - sp44 = ¶m_1->mLights[i].getLightInfo(); + sp44 = param_1->mLights[i].getLightInfo(); sp40 = sp44->mColor; } else { sp38 = dComIfGp_roomControl_getStayNo(); @@ -7144,6 +10053,24 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p } } + #if DEBUG + if (g_kankyoHIO.light.m_HOSTIO_setting || g_kankyoHIO.vrbox.m_VrboxSetting) { + int stayNo = dComIfGp_roomControl_getStayNo(); + if (dComIfGp_roomControl_getStatusRoomDt(stayNo) != NULL) { + stage_pure_lightvec_info_class* sp28 = + dComIfGp_roomControl_getStatusRoomDt(stayNo)->getLightVecInfo(); + int sp24 = dComIfGp_roomControl_getStatusRoomDt(stayNo)->getLightVecInfoNum(); + if (i < sp24) { + sp40 = g_env_light.dungeonlight[i].mColor; + } else { + sp40.r = 0; + sp40.g = 0; + sp40.b = 0; + } + } + } + #endif + f32 var_f31; if (dKy_SunMoon_Light_Check() == TRUE && i <= 1) { if (g_env_light.daytime >= 90.0f && g_env_light.daytime <= 285.0f) { @@ -7203,10 +10130,10 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p var_f27 = 0.0f; } } else { - sp64.x = lightStatusPt[i + 2].position.x; - sp64.y = lightStatusPt[i + 2].position.y; - sp64.z = lightStatusPt[i + 2].position.z; - var_f27 = 190.0f * lightStatusPt[i + 2].mRefDist; + sp64.x = (lightStatusPt + 2)[i].position.x; + sp64.y = (lightStatusPt + 2)[i].position.y; + sp64.z = (lightStatusPt + 2)[i].position.z; + var_f27 = 190.0f * (lightStatusPt + 2)[i].mRefDist; } } else { sp64.x = 100000000.0f; @@ -7257,7 +10184,7 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p sp48.g = 0; sp48.b = 0; - for (int i = 0; i < 3; i++) { + for (i = 0; i < 3; i++) { if (sp58[i] < 100000000.0f) { spD++; } @@ -7270,16 +10197,17 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p {0.6f, 0.3f, 0.1f}, }; + f32 temp_f28; if (sp58[0] < 100000000.0f) { - f32 temp_f28 = parcent_tabel[spD][0]; + temp_f28 = parcent_tabel[spD][0]; sp48.r = sp70[0].r * temp_f28; sp48.g = sp70[0].g * temp_f28; sp48.b = sp70[0].b * temp_f28; } - for (int i = 1; i < 3; i++) { + for (i = 1; i < 3; i++) { if (sp58[i] < 100000000.0f) { - f32 temp_f28 = parcent_tabel[spD][i]; + temp_f28 = parcent_tabel[spD][i]; sp48.r += (s16)(sp70[i].r * temp_f28); sp48.g += (s16)(sp70[i].g * temp_f28); sp48.b += (s16)(sp70[i].b * temp_f28); @@ -7292,31 +10220,31 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p sp48.g = (0.8f * param_2->g) + (1.2f * param_3->g); sp48.b = (0.8f * param_2->b) + (1.2f * param_3->b); + f32 temp_f30; if (sp48.r > 0xFF) { - f32 temp_f30 = 255.0f / sp48.r; + temp_f30 = 255.0f / sp48.r; sp48.r *= temp_f30; sp48.g *= temp_f30; sp48.b *= temp_f30; } if (sp48.g > 0xFF) { - f32 temp_f30 = 255.0f / sp48.g; + temp_f30 = 255.0f / sp48.g; sp48.r *= temp_f30; sp48.g *= temp_f30; sp48.b *= temp_f30; } if (sp48.b > 0xFF) { - f32 temp_f30 = 255.0f / sp48.b; + temp_f30 = 255.0f / sp48.b; sp48.r *= temp_f30; sp48.g *= temp_f30; sp48.b *= temp_f30; } - GXColorS10 sp50; - sp50.r = sp48.r & 0xFF; - sp50.g = sp48.g & 0xFF; - sp50.b = sp48.b & 0xFF; + sp50.r = (u8)sp48.r; + sp50.g = (u8)sp48.g; + sp50.b = (u8)sp48.b; f32 sp20 = param_4->r / 255.0f; f32 sp1C = param_4->g / 255.0f; @@ -7404,6 +10332,9 @@ int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) { boss_light_p[i].mColor.b = color_p->b; boss_light_p[i].mColor.a = 0xFF; boss_light_p[i].mRefDistance = ref_dist; + if (boss_light_p[i].mRefDistance <= 0.0f && boss_light_p[i].mRefDistance < 0.000001f) { + // empty + } boss_light_p[i].field_0x14 = 0.99f; boss_light_p[i].mCutoffAngle = 90.0f; boss_light_p[i].mAngleX = 0.0f; @@ -7452,6 +10383,9 @@ int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) { boss_light_p[i].mColor.b = color_p->b; boss_light_p[i].mColor.a = 0xFF; boss_light_p[i].mRefDistance = ref_dist; + if (boss_light_p[i].mRefDistance <= 0.0f && boss_light_p[i].mRefDistance < 0.000001f) { + // empty + } boss_light_p[i].field_0x14 = 0.99f; boss_light_p[i].mCutoffAngle = 90.0f; boss_light_p[i].mAngleX = 0.0f; @@ -7483,6 +10417,10 @@ int dKy_BossSpotLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXC kankyo->field_0x0c18[i].mColor.b = color_p->b; kankyo->field_0x0c18[i].mColor.a = 0xFF; kankyo->field_0x0c18[i].mRefDistance = ref_dist; + if (kankyo->field_0x0c18[i].mRefDistance <= 0.0f && + kankyo->field_0x0c18[i].mRefDistance < 0.000001f) { + // empty + } kankyo->field_0x0c18[i].field_0x14 = 0.99f; kankyo->field_0x0c18[i].mCutoffAngle = cutoff; kankyo->field_0x0c18[i].mAngleX = angle_x; @@ -7516,6 +10454,10 @@ int dKy_BossSpotLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXC kankyo->field_0x0c18[i].mColor.b = color_p->b; kankyo->field_0x0c18[i].mColor.a = 0xFF; kankyo->field_0x0c18[i].mRefDistance = ref_dist; + if (kankyo->field_0x0c18[i].mRefDistance <= 0.0f && + kankyo->field_0x0c18[i].mRefDistance < 0.000001f) { + // empty + } kankyo->field_0x0c18[i].field_0x14 = 0.99f; kankyo->field_0x0c18[i].mCutoffAngle = cutoff; kankyo->field_0x0c18[i].mAngleX = angle_x; @@ -7534,26 +10476,48 @@ int dKy_BossSpotLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXC int dKy_WolfEyeLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXColor* color_p, f32 ref_dist, u8 spot_type, u8 distattn_type) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); + camera_class* camera = (camera_class*)dComIfGp_getCamera(0); - kankyo->field_0x0c18[0].mPos = *pos_p; + int sp28 = 0; + int sp24 = 0; + f32 var_f28 = -100000000.0f; + f32 var_f27 = 0.0f; + int var_r29 = 0; - kankyo->field_0x0c18[0].mColor.r = color_p->r; - kankyo->field_0x0c18[0].mColor.g = color_p->g; - kankyo->field_0x0c18[0].mColor.b = color_p->b; - kankyo->field_0x0c18[0].mColor.a = 255; + kankyo->field_0x0c18[var_r29].mPos = *pos_p; - kankyo->field_0x0c18[0].mRefDistance = ref_dist; - kankyo->field_0x0c18[0].field_0x14 = 0.99f; - kankyo->field_0x0c18[0].mCutoffAngle = cutoff; - kankyo->field_0x0c18[0].mAngleX = angle_x; - kankyo->field_0x0c18[0].mAngleY = angle_y + 90.0f; - kankyo->field_0x0c18[0].mAngleAttenuation = spot_type; - kankyo->field_0x0c18[0].mDistAttenuation = distattn_type; + kankyo->field_0x0c18[var_r29].mColor.r = color_p->r; + kankyo->field_0x0c18[var_r29].mColor.g = color_p->g; + kankyo->field_0x0c18[var_r29].mColor.b = color_p->b; + kankyo->field_0x0c18[var_r29].mColor.a = 255; + + kankyo->field_0x0c18[var_r29].mRefDistance = ref_dist; + + if (kankyo->field_0x0c18[var_r29].mRefDistance <= 0 && + kankyo->field_0x0c18[var_r29].mRefDistance < 0.000001f) { + // empty + } + + kankyo->field_0x0c18[var_r29].field_0x14 = 0.99f; + kankyo->field_0x0c18[var_r29].mCutoffAngle = cutoff; + kankyo->field_0x0c18[var_r29].mAngleX = angle_x; + kankyo->field_0x0c18[var_r29].mAngleY = angle_y + 90.0f; + kankyo->field_0x0c18[var_r29].mAngleAttenuation = spot_type; + kankyo->field_0x0c18[var_r29].mDistAttenuation = distattn_type; + + int light_size = g_env_light.light_size; +#if DEBUG + if (g_kankyoHIO.navy.room_light_type != 0) { + int dummy; /// dummy declaration to force debug to use r31 for stack pointer + light_size = g_kankyoHIO.navy.room_light_type - 1; + } +#endif f32 var_f31; f32 var_f30; f32 var_f29; - switch (kankyo->light_size) { + switch (light_size) { case LIGHT_SIZE_S: var_f31 = 50.0f; var_f30 = 1.0f; @@ -7576,18 +10540,56 @@ int dKy_WolfEyeLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXCo var_f29 = 1.5f; } - kankyo->field_0x127c = var_f31; - kankyo->field_0x0c18[0].mRefDistance *= var_f30; - kankyo->field_0x0c18[0].mCutoffAngle *= var_f29; - kankyo->field_0x0c18[0].field_0x26 = 1; - return 1; +#if DEBUG + if (!g_kankyoHIO.navy.use_debug) +#endif + { + kankyo->field_0x127c = var_f31; + +#if DEBUG + kankyo->field_0x0c18[var_r29].mRefDistance *= var_f30; + kankyo->field_0x0c18[var_r29].mCutoffAngle *= var_f29; +#endif + } + +#if DEBUG + static int S_mLighSize_pat_old = 0x63; + if (S_mLighSize_pat_old != g_kankyoHIO.navy.room_light_type) { + S_mLighSize_pat_old = g_kankyoHIO.navy.room_light_type; + + g_kankyoHIO.navy.terrain_height_crr = var_f31; + g_kankyoHIO.navy.influence_multiplier = var_f30; + g_kankyoHIO.navy.cutoff_multiplier = var_f29; + + g_kankyoHIO.light.dKankyo_lightHIOInfoUpDateF(); + } + + if (g_kankyoHIO.navy.use_debug) { + kankyo->field_0x127c = g_kankyoHIO.navy.terrain_height_crr; + kankyo->field_0x0c18[var_r29].mRefDistance *= g_kankyoHIO.navy.influence_multiplier; + kankyo->field_0x0c18[var_r29].mCutoffAngle *= g_kankyoHIO.navy.cutoff_multiplier; + } +#else + kankyo->field_0x0c18[var_r29].mRefDistance *= var_f30; + kankyo->field_0x0c18[var_r29].mCutoffAngle *= var_f29; +#endif + + kankyo->field_0x0c18[var_r29].field_0x26 = 1; + + sp28 = 1; + return sp28; } void dKy_twilight_camelight_set() { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); fopAc_ac_c* player_p = dComIfGp_getPlayer(0); camera_class* camera_p = (camera_class*)dComIfGp_getCamera(0); - u8 sp8 = 0; + + f32 var_f31; + f32 var_f30; + int i; + int sp8 = 0; + f32 var_f29 = -100000000.0f; if (strcmp(dComIfGp_getStartStageName(), "R_SP107") != 0 || dComIfGp_roomControl_getStayNo() != 3 || dComIfGp_getStartStageLayer() != 12) @@ -7597,15 +10599,15 @@ void dKy_twilight_camelight_set() { } if (!daPy_py_c::checkNowWolfPowerUp()) { - for (int i = 0; i < 6; i++) { + for (i = 0; i < 6; i++) { if (kankyo->field_0x0c18[i].field_0x26 != 1) { dKy_twi_wolflight_set(i); kankyo->field_0x0c18[i].field_0x14 = 0.99f; kankyo->field_0x0c18[i].mColor.a = 254; - f32 var_f31 = 0.0f; + var_f31 = 0.0f; if (player_p != NULL) { - f32 var_f30 = camera_p->lookat.eye.y - player_p->current.pos.y; + var_f30 = camera_p->lookat.eye.y - player_p->current.pos.y; if (var_f30 < 0.0f) { var_f30 = 0.0f; } @@ -7650,9 +10652,60 @@ void dKy_twilight_camelight_set() { break; } + #if DEBUG + + switch (g_kankyoHIO.navy.room_light_type) { + case 0: + break; + case 1: + cLib_addCalc(&kankyo->field_0x0c18[i].mRefDistance, + 0.75f * var_f31 + 1.0625f, 0.5f, 100.0f, 0.0001f); + kankyo->field_0x0c18[i].mCutoffAngle = 90.0f; + break; + case 2: + cLib_addCalc(&kankyo->field_0x0c18[i].mRefDistance, + 0.75f * var_f31 + 1.7f, 0.5f, 100.0f, 0.0001f); + kankyo->field_0x0c18[i].mCutoffAngle = 70.0f; + break; + case 3: + cLib_addCalc(&kankyo->field_0x0c18[i].mRefDistance, + 0.75f * var_f31 + 2.5500002f, 0.5f, 100.0f, 0.0001f); + kankyo->field_0x0c18[i].mCutoffAngle = 70.0f; + break; + case 4: + cLib_addCalc(&kankyo->field_0x0c18[i].mRefDistance, + 0.75f * var_f31 + 3.4f, 0.5f, 100.0f, 0.0001f); + kankyo->field_0x0c18[i].mCutoffAngle = 65.0f; + break; + } + + if (g_kankyoHIO.navy.camera_light_adjust_ON) { + kankyo->field_0x0c18[i].mColor.r = g_kankyoHIO.navy.camera_light_col.r; + kankyo->field_0x0c18[i].mColor.g = g_kankyoHIO.navy.camera_light_col.g; + kankyo->field_0x0c18[i].mColor.b = g_kankyoHIO.navy.camera_light_col.b; + + kankyo->field_0x0c18[i].mRefDistance = + g_kankyoHIO.navy.camera_light_power * 0.85f + var_f31 * 0.75f; + kankyo->field_0x0c18[i].mCutoffAngle = g_kankyoHIO.navy.camera_light_cutoff; + } + + if (kankyo->field_0x0c18[i].mRefDistance <= 0 && + kankyo->field_0x0c18[i].mRefDistance < 0.000001f) { + // empty + } + + kankyo->field_0x0c18[i].mAngleAttenuation = g_kankyoHIO.navy.camera_light_sp; + kankyo->field_0x0c18[i].mDistAttenuation = g_kankyoHIO.navy.camera_light_da; + kankyo->field_0x0c18[i].field_0x26 = 1; + + #else + kankyo->field_0x0c18[i].mAngleAttenuation = GX_SP_COS; kankyo->field_0x0c18[i].mDistAttenuation = GX_DA_STEEP; kankyo->field_0x0c18[i].field_0x26 = 1; + + #endif + break; } } @@ -7660,7 +10713,6 @@ void dKy_twilight_camelight_set() { } } -// NONMATCHING - direct g_env_light member loads instead of storing to temps. matches debug, not retail void dKy_WaterIn_Light_set() { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); fopAc_ac_c* player_p = dComIfGp_getPlayer(0); @@ -7769,7 +10821,7 @@ void dKy_WaterIn_Light_set() { } #if DEBUG - if (g_kankyoHIO.navy.field_0x311 == 0) { + if (g_kankyoHIO.navy.use_debug == 0) { #endif kankyo->field_0x127c = var_f29; kankyo->field_0x0c18[i].mRefDistance *= var_f28; @@ -7787,7 +10839,7 @@ void dKy_WaterIn_Light_set() { g_kankyoHIO.light.dKankyo_lightHIOInfoUpDateF(); } - if (g_kankyoHIO.navy.field_0x311 != 0) { + if (g_kankyoHIO.navy.use_debug != 0) { kankyo->field_0x127c = g_kankyoHIO.navy.terrain_height_crr; kankyo->field_0x0c18[i].mRefDistance *= g_kankyoHIO.navy.influence_multiplier; kankyo->field_0x0c18[i].mCutoffAngle *= g_kankyoHIO.navy.cutoff_multiplier; @@ -7803,11 +10855,13 @@ void dKy_WaterIn_Light_set() { } void dKy_camera_water_in_status_set(u8 status) { - g_env_light.camera_water_in_status = status; + dScnKy_env_light_c* envlight = dKy_getEnvlight(); + envlight->camera_water_in_status = status; } BOOL dKy_camera_water_in_status_check() { - return g_env_light.camera_water_in_status; + dScnKy_env_light_c* envlight = dKy_getEnvlight(); + return envlight->camera_water_in_status; } u8 dKy_pol_efftype_get(const cBgS_PolyInfo* polyinfo_p) { @@ -7892,6 +10946,9 @@ u8 dKy_pol_sound_get(const cBgS_PolyInfo* polyinfo_p) { } if (sound == 0xFF) { + #if DEBUG + dDbVw_Report(20, 100, "err code.csv sound z0[%d]z1[%d]", z0, z1); + #endif sound = 0; } @@ -7899,7 +10956,7 @@ u8 dKy_pol_sound_get(const cBgS_PolyInfo* polyinfo_p) { } u8 dKy_pol_argument_get(const cBgS_PolyInfo* polyinfo_p) { - dScnKy_env_light_c* kankyo = &g_env_light; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) { return 0; } @@ -7912,15 +10969,19 @@ u8 dKy_pol_argument_get(const cBgS_PolyInfo* polyinfo_p) { } int z1 = dComIfG_Bgsp().GetPolyAtt1(*polyinfo_p); + u8 retval; if (kankyo->pol_arg != NULL) { - return kankyo->pol_arg[z0].data[z1]; + retval = kankyo->pol_arg[z0].data[z1]; + } else { + retval = 0; } - return 0; + return retval; } u8 dKy_pol_eff_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { - dScnKy_env_light_c* kankyo = &g_env_light; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + u8 eff_id = 0; if (polyinfo_p == NULL || out_color_p == NULL || &dComIfG_Bgsp() == NULL) { return 0xFF; } @@ -7939,7 +11000,6 @@ u8 dKy_pol_eff_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { } int z1 = dComIfG_Bgsp().GetPolyAtt1(*polyinfo_p); - u8 eff_id; if (kankyo->pol_effcol != NULL) { eff_id = kankyo->pol_effcol[z0].data[z1]; } else { @@ -7957,7 +11017,8 @@ u8 dKy_pol_eff_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { } u8 dKy_pol_eff_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { - dScnKy_env_light_c* kankyo = &g_env_light; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + u8 eff_id = 0; if (polyinfo_p == NULL || out_color_p == NULL || &dComIfG_Bgsp() == NULL) { return 0xFF; } @@ -7976,7 +11037,6 @@ u8 dKy_pol_eff_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { } int z1 = dComIfG_Bgsp().GetPolyAtt1(*polyinfo_p); - u8 eff_id; if (kankyo->pol_effcol != NULL) { eff_id = kankyo->pol_effcol[z0].data[z1]; } else { @@ -7994,7 +11054,8 @@ u8 dKy_pol_eff_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { } u8 dKy_pol_eff2_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { - dScnKy_env_light_c* kankyo = &g_env_light; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + u8 eff_id = 0; if (polyinfo_p == NULL || out_color_p == NULL || &dComIfG_Bgsp() == NULL) { return 0xFF; } @@ -8013,7 +11074,6 @@ u8 dKy_pol_eff2_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) } int z1 = dComIfG_Bgsp().GetPolyAtt1(*polyinfo_p); - u8 eff_id; if (kankyo->pol_effcol2 != NULL) { eff_id = kankyo->pol_effcol2[z0].data[z1]; } else { @@ -8031,7 +11091,8 @@ u8 dKy_pol_eff2_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) } u8 dKy_pol_eff2_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { - dScnKy_env_light_c* kankyo = &g_env_light; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + u8 eff_id = 0; if (polyinfo_p == NULL || out_color_p == NULL || &dComIfG_Bgsp() == NULL) { return 0xFF; } @@ -8050,7 +11111,6 @@ u8 dKy_pol_eff2_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { } int z1 = dComIfG_Bgsp().GetPolyAtt1(*polyinfo_p); - u8 eff_id; if (kankyo->pol_effcol2 != NULL) { eff_id = kankyo->pol_effcol2[z0].data[z1]; } else { @@ -8068,12 +11128,14 @@ u8 dKy_pol_eff2_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) { } u8 dKy_pol_eff_alpha_get(const cBgS_PolyInfo* polyinfo_p) { - dScnKy_env_light_c* kankyo = &g_env_light; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + int z0; + u8 eff_id = 0; if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) { return 0xFF; } - int z0 = dComIfG_Bgsp().GetPolyAtt0(*polyinfo_p); + z0 = dComIfG_Bgsp().GetPolyAtt0(*polyinfo_p); if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0 && g_env_light.fishing_hole_season == 4) { @@ -8087,7 +11149,6 @@ u8 dKy_pol_eff_alpha_get(const cBgS_PolyInfo* polyinfo_p) { } int z1 = dComIfG_Bgsp().GetPolyAtt1(*polyinfo_p); - u8 eff_id; if (kankyo->pol_effcol != NULL) { eff_id = kankyo->pol_effcol[z0].data[z1]; } else { @@ -8103,7 +11164,8 @@ u8 dKy_pol_eff_alpha_get(const cBgS_PolyInfo* polyinfo_p) { } f32 dKy_pol_eff_ratio_get(const cBgS_PolyInfo* polyinfo_p) { - dScnKy_env_light_c* kankyo = &g_env_light; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + u8 eff_id; f32 ratio = 0.0f; if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) { @@ -8124,7 +11186,6 @@ f32 dKy_pol_eff_ratio_get(const cBgS_PolyInfo* polyinfo_p) { } int z1 = dComIfG_Bgsp().GetPolyAtt1(*polyinfo_p); - u8 eff_id; if (kankyo->pol_effcol != NULL) { eff_id = kankyo->pol_effcol[z0].data[z1]; } else { @@ -8141,12 +11202,14 @@ f32 dKy_pol_eff_ratio_get(const cBgS_PolyInfo* polyinfo_p) { } u8 dKy_pol_eff2_alpha_get(const cBgS_PolyInfo* polyinfo_p) { - dScnKy_env_light_c* kankyo = &g_env_light; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + int z0; + u8 retval = 0; if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) { return 0xFF; } - int z0 = dComIfG_Bgsp().GetPolyAtt0(*polyinfo_p); + z0 = dComIfG_Bgsp().GetPolyAtt0(*polyinfo_p); if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0 && g_env_light.fishing_hole_season == 4) { @@ -8160,23 +11223,22 @@ u8 dKy_pol_eff2_alpha_get(const cBgS_PolyInfo* polyinfo_p) { } int z1 = dComIfG_Bgsp().GetPolyAtt1(*polyinfo_p); - u8 var_r30; if (kankyo->pol_effcol2 != NULL) { - var_r30 = kankyo->pol_effcol2[z0].data[z1]; + retval = kankyo->pol_effcol2[z0].data[z1]; } else { return 0xFF; } - if (var_r30 >= 100) { + if (retval >= 100) { return 0xFF; } - var_r30 = kankyo->colordata_tbl[var_r30].data[6]; - return var_r30; + retval = kankyo->colordata_tbl[retval].data[6]; + return retval; } f32 dKy_pol_eff2_ratio_get(const cBgS_PolyInfo* polyinfo_p) { - dScnKy_env_light_c* kankyo = &g_env_light; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); f32 ratio = 0.0f; if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) { @@ -8214,11 +11276,17 @@ f32 dKy_pol_eff2_ratio_get(const cBgS_PolyInfo* polyinfo_p) { } BOOL dKy_TeachWind_existence_chk() { - if (g_env_light.TeachWind_existence == 0xFF) { + dScnKy_env_light_c* envlight = dKy_getEnvlight(); + + if (envlight->TeachWind_existence == 0xFF) { return -1; } - return g_env_light.TeachWind_existence ? TRUE : FALSE; + if (envlight->TeachWind_existence) { + return TRUE; + } else { + return FALSE; + } } BOOL dKy_SunMoon_Light_Check() { @@ -8284,7 +11352,13 @@ void dKy_depth_dist_set(void* process_p) { if (var_f31 < 2000.0f && var_f31 < kankyo->field_0x1268) { mDoLib_project(&actor_p->eyePos, &sp30); - if ((sp30.x >= 0.0f && sp30.x < FB_WIDTH) && (sp30.y >= 0.0f && sp30.y < 600.0f)) { + if ((sp30.x >= 0.0f && sp30.x < FB_WIDTH) && (sp30.y >= 0.0f && + #if DEBUG + sp30.y < 608.0f + #else + sp30.y < 600.0f + #endif + )) { cXyz sp18; cXyz spC; dKyr_get_vectle_calc(&camera_p->lookat.eye, &camera_p->lookat.center, &sp18); @@ -8293,7 +11367,8 @@ void dKy_depth_dist_set(void* process_p) { s16 temp_r27 = cM_atan2s(sp18.x, sp18.z); s16 temp_r26 = cM_atan2s(spC.x, spC.z); - if ((s16)fabsf((f32)temp_r26 - (f32)temp_r27) > 0) { + temp_r27 = fabsf((f32)temp_r26 - (f32)temp_r27); + if (temp_r27 > 0) { kankyo->field_0x1268 = var_f31; } } @@ -8406,15 +11481,17 @@ u8 dKy_darkworld_stage_check(char const* stageName, int roomNo) { if (!strcmp(stageName, darkworldTbl[i].stageName)) { if (darkworldTbl[i].darkLv != KY_DARKLV_ALWAYS) { int fsp121CheckResult = dKy_F_SP121Check(stageName, roomNo, darkLv, i); - if (fsp121CheckResult >= 0) { - if (fsp121CheckResult == 0) { - *darkLv = darkworldTbl[i].darkLv; - } - if (!dComIfGs_isDarkClearLV(*darkLv)) { - result = TRUE; - } - break; + if (fsp121CheckResult < 0) { + continue; } + + if (fsp121CheckResult == 0) { + *darkLv = darkworldTbl[i].darkLv; + } + if (!dComIfGs_isDarkClearLV(*darkLv)) { + result = TRUE; + } + break; } else { // KY_DARKLV_ALWAYS is used to force twilight (likely for testing). This will // never normally run since it is not present in l_darkworld_tbl. @@ -8500,6 +11577,13 @@ void dKy_murky_set(J3DMaterial* material_p) { tev_col.a = (u8)(g_env_light.field_0x1302 * var_f29); } + #if DEBUG + if (g_kankyoHIO.navy.water_mud_adjust_ON) { + tev_kcol.a = (u8)(f32)g_kankyoHIO.navy.field_0x2ea; + tev_col.a = (u8)(f32)g_kankyoHIO.navy.field_0x2ec; + } + #endif + if (lenz_packet != NULL && sun_packet->mVisibility > 0.000001f) { tev_col.a = (u8)(tev_col.a * (1.0f - (sun_packet->mVisibility * @@ -8509,7 +11593,8 @@ void dKy_murky_set(J3DMaterial* material_p) { // Diababa room handling if (strcmp(dComIfGp_getStartStageName(), "D_MN05A") == 0) { dScnKy_env_light_c* var_r26 = dKy_getEnvlight(); - dKankyo_mud_Packet* var_r27 = var_r26->mpMudPacket; + u8* sp08 = &var_r26->mMudInitialized; + dKankyo_mud_Packet* var_r27 = g_env_light.mpMudPacket; f32 var_f31; if (var_r27 != NULL) { @@ -8520,12 +11605,12 @@ void dKy_murky_set(J3DMaterial* material_p) { tev_col.g = 6; tev_col.b = 15; - tev_col.r = (u8)(tev_col.r + (s16)(-(f32)tev_col.r * var_f31)); - tev_col.g = (u8)(tev_col.g + (s16)((36.0f - tev_col.g) * var_f31)); - tev_col.b = (u8)(tev_col.b + (s16)((29.0f - tev_col.b) * var_f31)); + tev_col.r = (u8)((s16)tev_col.r + (s16)(-(f32)tev_col.r * var_f31)); + tev_col.g = (u8)((s16)tev_col.g + (s16)((36.0f - tev_col.g) * var_f31)); + tev_col.b = (u8)((s16)tev_col.b + (s16)((29.0f - tev_col.b) * var_f31)); if (camera_p != NULL && camera_p->lookat.eye.z < 1800.0f) { - f32 var_f30; + f32 var_f30 = 1.0f; if (camera_p->lookat.eye.z < 1550.0f) { var_f30 = 1.0f; } else { @@ -8536,10 +11621,10 @@ void dKy_murky_set(J3DMaterial* material_p) { tev_col.a = 0; } - tev_col.a = (u8)(tev_col.a + (s16)(-(f32)tev_col.a * var_f31)); + tev_col.a = (u8)((s16)tev_col.a + (s16)(-(f32)tev_col.a * var_f31)); tev_kcol.a = 0xFF; - tev_kcol.a = (u8)(tev_kcol.a + (s16)((140.0f - tev_kcol.a) * var_f31)); + tev_kcol.a = (u8)((s16)tev_kcol.a + (s16)((140.0f - tev_kcol.a) * var_f31)); } tev_kcol.r = 0; @@ -8567,26 +11652,27 @@ static J3DZModeInfo l_zmodeUpEnable = {1, 3, 1}; static J3DZModeInfo l_zmodeUpDisable = {1, 3, 0}; static J3DAlphaCompInfo l_alphaCompInfoOPA = { - 0x07, 0x00, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x07, 0x00, 0x01, 0x07, 0x00, }; static J3DAlphaCompInfo l_alphaCompInfo = { - 0x04, 0x80, 0x00, 0x03, 0xFF, 0x00, 0x00, 0x00, + 0x04, 0x80, 0x00, 0x03, 0xFF, }; void dKy_bg_MAxx_proc(void* bg_model_p) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); J3DModel* model_p = (J3DModel*)bg_model_p; + J3DModelData* modelData; + J3DTexMtxInfo* tex_mtx_inf; + GXColor sp5C; dDlst_window_c* window = dComIfGp_getWindow(0); camera_class* camera_p = (camera_class*)dComIfGp_getCamera(window->getCameraID()); fopAc_ac_c* player_p = dComIfGp_getPlayer(0); if (model_p != NULL && player_p != NULL) { - J3DModelData* modelData = model_p->getModelData(); + modelData = model_p->getModelData(); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { - J3DGXColor sp5C; - J3DMaterial* mat_p = modelData->getMaterialNodePointer(i); JUTNameTab* mat_nametbl = modelData->getMaterialName(); const char* mat_name = mat_nametbl->getName(i); @@ -8657,7 +11743,7 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { dComIfGd_setListInvisisble(); if (mat_p->getTexGenBlock()->getTexMtx(0) != NULL) { - J3DTexMtxInfo* tex_mtx_inf = + tex_mtx_inf = &mat_p->getTexGenBlock()->getTexMtx(0)->getTexMtxInfo(); if (tex_mtx_inf != NULL) { cXyz* sp34 = dKyw_get_wind_vec(); @@ -8672,8 +11758,11 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { camera_p->aspect, 0.49f, -0.49f, 0.5f, 0.5f); } + #if !PLATFORM_GCN + mDoGph_gInf_c::setWideZoomLightProjection(sp1D8); + #endif tex_mtx_inf->setEffectMtx(sp1D8); - modelData->simpleCalcMaterial(0, (MtxP)j3dDefaultMtx); + modelData->simpleCalcMaterial((MtxP)j3dDefaultMtx); } } } @@ -8681,7 +11770,7 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { if (memcmp(&mat_name[3], "MA00", 4) == 0 || memcmp(&mat_name[3], "MA01", 4) == 0 || memcmp(&mat_name[3], "MA04", 4) == 0 || memcmp(&mat_name[3], "MA16", 4) == 0) { - sp5C.r = g_env_light.mFogDensity; + sp5C.r = (u8)g_env_light.mFogDensity; sp5C.g = 0; sp5C.b = 0; if (mat_name[6] == '1') { @@ -8701,11 +11790,11 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { sp5C.a = 0; } - mat_p->setTevKColor(1, &sp5C); + mat_p->setTevKColor(1, (J3DGXColor*)&sp5C); } if (memcmp(&mat_name[3], "MA11", 4) == 0) { - J3DGXColorS10 sp90; + GXColorS10 sp90; if (dKy_darkworld_check()) { dComIfGd_setListDarkBG(); @@ -8713,13 +11802,29 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { sp90.g = 160; sp90.b = 255; sp90.a = 255; - mat_p->setTevColor(1, &sp90); + mat_p->setTevColor(1, (J3DGXColorS10*)&sp90); sp90.r = 50; sp90.g = 20; sp90.b = 90; sp90.a = 255; - mat_p->setTevColor(2, &sp90); + mat_p->setTevColor(2, (J3DGXColorS10*)&sp90); + +#if DEBUG + if (g_kankyoHIO.navy.light_adjust_ON) { + sp90.r = g_kankyoHIO.navy.mist_twilight_c1_col.r; + sp90.g = g_kankyoHIO.navy.mist_twilight_c1_col.g; + sp90.b = g_kankyoHIO.navy.mist_twilight_c1_col.b; + sp90.a = g_kankyoHIO.navy.mist_twilight_c1_col.a; + mat_p->setTevColor(1, (J3DGXColorS10*)&sp90); + + sp90.r = g_kankyoHIO.navy.mist_twilight_c2_col.r; + sp90.g = g_kankyoHIO.navy.mist_twilight_c2_col.g; + sp90.b = g_kankyoHIO.navy.mist_twilight_c2_col.b; + sp90.a = g_kankyoHIO.navy.mist_twilight_c2_col.a; + mat_p->setTevColor(2, (J3DGXColorS10*)&sp90); + } +#endif } else { cXyz spFC; cXyz spF0; @@ -8733,24 +11838,42 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { sp90.a = 0; } - mat_p->setTevColor(1, &sp90); + mat_p->setTevColor(1, (J3DGXColorS10*)&sp90); sp90.r = 40; sp90.g = 30; sp90.b = 65; sp90.a = 255; - mat_p->setTevColor(2, &sp90); + mat_p->setTevColor(2, (J3DGXColorS10*)&sp90); + +#if DEBUG + if (g_kankyoHIO.navy.light_adjust_ON) { + sp90.r = g_kankyoHIO.navy.mist_twilight_c1_col.r; + sp90.g = g_kankyoHIO.navy.mist_twilight_c1_col.g; + sp90.b = g_kankyoHIO.navy.mist_twilight_c1_col.b; + sp90.a = g_kankyoHIO.navy.mist_twilight_c1_col.a; + mat_p->setTevColor(1, (J3DGXColorS10*)&sp90); + + sp90.r = g_kankyoHIO.navy.mist_twilight_c2_col.r; + sp90.g = g_kankyoHIO.navy.mist_twilight_c2_col.g; + sp90.b = g_kankyoHIO.navy.mist_twilight_c2_col.b; + sp90.a = g_kankyoHIO.navy.mist_twilight_c2_col.a; + mat_p->setTevColor(2, (J3DGXColorS10*)&sp90); + } +#endif if (kankyo->fog_avoid_tag != NULL) { - spF0 = kankyo->fog_avoid_tag->mAvoidPos; + J3DTexMtxInfo* tex_mtx_inf; + kytag08_class* sp28 = kankyo->fog_avoid_tag; + spF0 = sp28->mAvoidPos; f32 var_f28 = - kankyo->fog_avoid_tag->mSize.x * kankyo->fog_avoid_tag->mSizeScale; + sp28->mSize.x * sp28->mSizeScale; if (var_f28 < 0.1f) { var_f28 = 0.1f; } if (mat_p->getTexGenBlock()->getTexMtx(0) != NULL) { - J3DTexMtxInfo* tex_mtx_inf = + tex_mtx_inf = &mat_p->getTexGenBlock()->getTexMtx(0)->getTexMtxInfo(); if (tex_mtx_inf != NULL) { @@ -8758,12 +11881,15 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { Mtx sp178; C_MTXLightPerspective(sp1A8, var_f28 * 2.8f, 1.0f, 0.5f, 0.5f, 0.0f, 0.0f); + #if !PLATFORM_GCN + mDoGph_gInf_c::setWideZoomLightProjection(sp1A8); + #endif spFC.x = spF0.x; spFC.y = 100.0f; spFC.z = spF0.z; - cXyz spE4(spF0.x, -1000.0f, spF0.z); - mDoMtx_lookAt(sp178, &spE4, &spFC, 0); + cXyz spE4(spFC.x, -1000.0f, spFC.z); + cMtx_lookAt(sp178, &spE4, &spFC, 0); cMtx_concat(sp1A8, sp178, sp178); tex_mtx_inf->setEffectMtx(sp178); } @@ -8779,13 +11905,13 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { fog_inf->mType = 7; } - J3DGXColorS10 sp88; + GXColorS10 sp88; sp88.r = g_env_light.bg_amb_col[3].r; sp88.g = g_env_light.bg_amb_col[3].g; sp88.b = g_env_light.bg_amb_col[3].b; sp88.a = 255; - mat_p->setTevColor(1, &sp88); + mat_p->setTevColor(1, (J3DGXColorS10*)&sp88); if (mat_p->getTexGenBlock()->getTexMtx(2) != NULL) { J3DTexMtxInfo* tex_mtx_inf = @@ -8795,13 +11921,16 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { Mtx sp148; Mtx sp118; C_MTXLightPerspective(sp148, 170.0f, 1.0f, 1.5f, 1.5f, 0.0f, 0.0f); + #if !PLATFORM_GCN + mDoGph_gInf_c::setWideZoomLightProjection(sp148); + #endif spD8.x = player_p->current.pos.x; spD8.y = -14770.0f; spD8.z = player_p->current.pos.z; cXyz spC0(player_p->current.pos.x, -14570.0f, player_p->current.pos.z); - mDoMtx_lookAt(sp118, &spC0, &spD8, 0); + cMtx_lookAt(sp118, &spC0, &spD8, 0); cMtx_concat(sp148, sp118, sp118); tex_mtx_inf->setEffectMtx(sp118); } @@ -8842,10 +11971,9 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { } if (memcmp(&mat_name[3], "Rainbow", 7) == 0) { + f32 time = g_env_light.getDaytime(); f32 temp_f29; f32 temp_f31; - - f32 time = g_env_light.getDaytime(); cXyz spB4; camera_class* camera_p = dComIfGp_getCamera(0); J3DGXColor sp10; @@ -8857,13 +11985,23 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { temp_f31 = spA8.abs(camera_p->lookat.eye); temp_f31 = -0.2f + (temp_f31 / 4500.0f); + +#if DEBUG + if (g_kankyoHIO.navy.rainbow_adjust_ON) { + temp_f31 = spA8.abs(camera_p->lookat.eye); + temp_f31 = temp_f31 / g_kankyoHIO.navy.rainbow_separation_dist + -0.2f; + } +#endif + if (temp_f31 > 1.0f) { temp_f31 = 1.0f; } else if (temp_f31 < 0.0f) { temp_f31 = 0.0f; } - sp10.b = sp10.g = sp10.r = 255; + sp10.r = 255; + sp10.g = 255; + sp10.b = 255; sp10.a = 255; temp_f29 = 0.0f; @@ -8883,9 +12021,7 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { temp_f29 = 0.0f; } - sp10.b = 255; - sp10.g = 255; - sp10.r = 255; + sp10.r = sp10.g = sp10.b = 255; f32 temp_f25 = 1.0f; @@ -8904,6 +12040,12 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { temp_f26 = (temp_f27 - 0.2f) / 0.4f; } sp10.a = temp_f25 * (temp_f31 * (115.0f * temp_f26 * temp_f29)); + +#if DEBUG + if (g_kankyoHIO.navy.rainbow_adjust_ON) { + sp10.a = temp_f25 * (temp_f31 * (g_kankyoHIO.navy.rainbow_max_alpha * temp_f26 * temp_f29)); + } +#endif } mat_p->setTevKColor(3, &sp10); diff --git a/src/d/d_kankyo_data.cpp b/src/d/d_kankyo_data.cpp index 0bb6db6d57..c572533fde 100644 --- a/src/d/d_kankyo_data.cpp +++ b/src/d/d_kankyo_data.cpp @@ -773,10 +773,7 @@ static GXFogAdjTable S_xfog_table_data[2] = { }; void dKyd_xfog_table_set(u8 tblIdx) { - #if DEBUG - if (g_kankyoHIO.light.field_0x5 != 1) - #endif - { + if (!(DEBUG && g_kankyoHIO.light.field_0x5 == 1)) { for (int i = 0; i < 10; i++) { g_env_light.mXFogTbl.r[i] = S_xfog_table_data[tblIdx].r[i]; } diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index e030ea5553..0676ae8ec2 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -1859,7 +1859,7 @@ void vrkumo_move() { if (filelist != NULL) { sp2C = dStage_FileList_dt_SeaLevel(filelist); - #ifdef DEBUG + #if DEBUG if (g_kankyoHIO.vrbox.field_0x14) { sp2C = g_kankyoHIO.vrbox.m_horizonHeight; } else { @@ -4624,7 +4624,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { sp70 = dStage_FileList_dt_SeaLevel(filelist); } -#ifdef DEBUG +#if DEBUG if (g_kankyoHIO.vrbox.field_0x14) { sp70 = g_kankyoHIO.vrbox.m_horizonHeight; } else { @@ -4714,7 +4714,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { static f32 howa_loop_cnt = 0.0f; -#ifdef DEBUG +#if DEBUG spAC = g_kankyoHIO.navy.cloud_sunny_size; spA8 = g_kankyoHIO.navy.cloud_cloudy_size; #else diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index f7e4a7e221..400a00544f 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -2579,7 +2579,9 @@ void dMenu_Collect3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cXyz* #pragma pop void dMenu_Collect3D_c::calcViewMtx(Mtx param_0) { - mDoMtx_lookAt(param_0, &cXyz(0.0f, 0.0f, -1000.0f), &cXyz::Zero, &cXyz(0.0f, 1.0f, 0.0f), 0); + cXyz pos1(0.0f, 0.0f, -1000.0f); + cXyz pos2(0.0f, 1.0f, 0.0f); + mDoMtx_lookAt(param_0, &pos1, &cXyz::Zero, &pos2, 0); } diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 5cec2cdb6d..1c282afedd 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -3088,9 +3088,9 @@ static leafdraw_method_class l_dMeter2_Method = { }; extern msg_process_profile_definition g_profile_METER2 = { - -3, + fpcLy_CURRENT_e, 12, - -3, + fpcPi_CURRENT_e, PROC_METER2, (process_method_class*)&g_fpcLf_Method, sizeof(dMeter2_c), diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 0970a754c1..498d0c6356 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -801,7 +801,7 @@ void dMeter_drawLightDropHIO_c::genMessage(JORMContext* mctx) { #endif dMeter_drawHIO_c::dMeter_drawHIO_c() { - #ifdef DEBUG + #if DEBUG field_0x8_debug = 0; #endif mLifeTopPosX = 40.0f; diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index 11320c468c..5e3443e72e 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1971,7 +1971,7 @@ void jmessage_tSequenceProcessor::do_end() { bool jmessage_tSequenceProcessor::do_isReady() { jmessage_tReference* pReference = (jmessage_tReference*)getReference(); - #ifdef DEBUG + #if DEBUG if (pReference->getRevoMessageID() != 0) { return 0; } diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index a2cd304fd7..3201873387 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -68,7 +68,7 @@ void dMsgFlow_c::init(fopAc_ac_c* i_partner, int i_flowID, int param_2, fopAc_ac setNodeIndex(nodeIdx, i_talkPartners); } -#ifdef DEBUG +#if DEBUG dbgPrint(); #endif dMsgObject_setSelectWordFlag(0); @@ -457,7 +457,7 @@ int dMsgFlow_c::setSelectMsg(mesg_flow_node* i_flowNode_p, mesg_flow_node* param // "Message Set (Select)" OS_REPORT("\x1B[44;37mメッセ−ジセット（選択）　　　　　　\x1B[m|:"); -#ifdef DEBUG +#if DEBUG if (i_speaker_p != NULL) { const char* speaker_name = fopAcM_getProcNameString(i_speaker_p); OS_REPORT("flow:%d, msg:%d(%d), speaker:%s\n", mFlow, msg_no, temp_r25, speaker_name); @@ -501,7 +501,7 @@ int dMsgFlow_c::setNormalMsg(mesg_flow_node* i_flowNode_p, fopAc_ac_c* i_speaker // "Message Set" OS_REPORT("\x1B[44;37mメッセ−ジセット　　　　　　　　　　\x1B[m|:"); -#ifdef DEBUG +#if DEBUG if (i_speaker_p != NULL) { const char* speaker_name = fopAcM_getProcNameString(i_speaker_p); OS_REPORT("flow:%d, msg:%d, speaker:%s\n", mFlow, msg_no, speaker_name); @@ -761,7 +761,7 @@ queryFunc dMsgFlow_c::mQueryList[53] = { &dMsgFlow_c::query053, }; -#ifdef DEBUG +#if DEBUG void dMsgFlow_c::dbgPrint() {} #endif diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index 4e16e8afd3..02943d326c 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -34,7 +34,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { int iVar6 = dMsgObject_getMessageID(); bool bVar5 = false; - #ifdef DEBUG + #if DEBUG if (dMsgObject_getMessageID() >= 0x10cc && dMsgObject_getMessageID() < 0x11cc) { mItemIndex = dMsgObject_getMessageID() - 0x10cc; bVar5 = true; @@ -122,7 +122,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { dMeter2Info_setItemColor( mItemIndex, mpItemPane[0], mpItemPane[1], mpItemPane[2], NULL); - #ifdef DEBUG + #if DEBUG if (mItemIndex == 0x81 || mItemIndex == 0x23) { field_0x19e = true; } diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 5fb9236417..bebfec7a0c 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -294,7 +294,7 @@ void dMsgUnit_c::setTag(int i_type, int i_value, char* o_buffer, bool param_4) { // This section is weird. The debug seems like entriesStr is outside the condition // but the normal build doesn't really work with that. Same for pInfoBlock->entries. -#ifdef DEBUG +#if DEBUG dMsgUnit_inf1_entry* entriesInf = &pInfoBlock->entries[i_type]; u32 dat1EntryOffset = entriesInf->dat1EntryOffset; const char* uVar5; @@ -322,13 +322,13 @@ void dMsgUnit_c::setTag(int i_type, int i_value, char* o_buffer, bool param_4) { #else if (i_value == 1) { #endif -#ifdef DEBUG +#if DEBUG uVar5 = entriesStr->str + vals[0]; #else uVar5 = pStrAttributeBlock->entries->str + vals[0]; #endif } else { -#ifdef DEBUG +#if DEBUG uVar5 = entriesStr->str + vals[1]; #else uVar5 = pStrAttributeBlock->entries->str + vals[1]; diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 7e4f306339..3ee2226a11 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -116,8 +116,6 @@ static const J3DTexMtxInfo l_texMtxInfo = { }, }; -// NONMATCHING l_alphaCompInfo needs to be placed in .sdata2, but the function breaks if it is declared const -// Also see J3DAlphaComp::setAlphaCompInfo in J3DMatBlock.h static void addWarpMaterial(J3DModelData* i_modelData) { static J3DTevStageInfo const l_tevStageInfo = { 0x05, 0x0F, 0x08, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x01, 0x00, @@ -125,6 +123,7 @@ static void addWarpMaterial(J3DModelData* i_modelData) { }; static J3DTexCoordInfo l_texCoordInfo = {0x00, 0x00, 0x27}; static J3DTevOrderInfo l_tevOrderInfo = {0x00, 0x03, 0xFF, 0x00}; + static J3DAlphaCompInfo const l_alphaCompInfo = {0x04, 0x80, 0x00, 0x03, 0xFF}; ResTIMG* resTimg = (ResTIMG*)dComIfG_getObjectRes("Always", 0x5d); JUT_ASSERT(279, resTimg != NULL); @@ -166,7 +165,6 @@ static void addWarpMaterial(J3DModelData* i_modelData) { J3DPEBlock* peBlock = material->getPEBlock(); J3DAlphaComp* alphaComp = peBlock->getAlphaComp(); - static J3DAlphaCompInfo l_alphaCompInfo = {0x04, 0x80, 0x00, 0x03, 0xFF, 0, 0, 0}; alphaComp->setAlphaCompInfo(l_alphaCompInfo); peBlock->setZCompLoc((u8)0); } @@ -344,7 +342,7 @@ int dRes_info_c::loadResource() { JKRExpHeap* parentHeap = (JKRExpHeap*)JKRHeap::findFromRoot(JKRHeap::getCurrentHeap()); JUT_ASSERT(0x308, parentHeap != NULL && (parentHeap == mDoExt_getGameHeap() || parentHeap == mDoExt_getArchiveHeap())); -#ifdef DEBUG +#if DEBUG char* heapName; if (parentHeap == mDoExt_getGameHeap()) { heapName = "GameHeap"; @@ -401,7 +399,7 @@ int dRes_info_c::loadResource() { } modelData = (J3DModelData*)result; -#ifdef DEBUG +#if DEBUG J3DMaterial* materialp = modelData->getMaterialNodePointer(0); if (materialp->isDrawModeOpaTexEdge()) { // "BMDG:Translucent model can't be drawn!!\n" @@ -733,7 +731,7 @@ int dRes_control_c::syncRes(char const* i_arcName, dRes_info_c* i_resInfo, int i dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum); if (resInfo == NULL) { -#ifdef DEBUG +#if DEBUG if (i_arcName[0] == 'R' || (i_arcName[0] == 'S' && i_arcName[1] == 't' && i_arcName[2] == 'g' && i_arcName[3] == '_' && i_arcName[4] == '0' && i_arcName[5] == '0') || strncmp(i_arcName, "Pack", 4) == 0) @@ -755,7 +753,7 @@ int dRes_control_c::deleteRes(char const* i_arcName, dRes_info_c* i_resInfo, int dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum); if (resInfo == NULL) { -#ifdef DEBUG +#if DEBUG if (strcmp(i_arcName, "Xtg_00") == 0) { // "<%s.arc> deleteRes: res nothing !!\n(Detected deleting an unregistered resource! Please fix.)\n" OS_REPORT_ERROR("<%s.arc> deleteRes: res nothing !!\n(未登録のリソースを削除してるのを発見しました！修正してください。)\n", i_arcName); @@ -799,7 +797,7 @@ dRes_info_c* dRes_control_c::getResInfoLoaded(char const* i_arcName, dRes_info_c dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum); if (resInfo == NULL) { -#ifdef DEBUG +#if DEBUG if (stricmp(i_arcName, "Xtg_00") == 0) { OS_REPORT("\x1b[35m<%s.arc> getRes: res nothing !!\n\x1b[m", i_arcName); } @@ -879,7 +877,7 @@ int dRes_control_c::setObjectRes(char const* i_arcName, void* i_archiveRes, u32 JKRHeap* i_heap) { JUT_ASSERT(0x7A3, i_archiveRes != NULL); -#ifdef DEBUG +#if DEBUG dRes_info_c* nowInfo = getResInfo(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo)); JUT_ASSERT(0x7A6, nowInfo == NULL); #endif diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 21a8bfb349..7b7934f473 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -21,7 +21,7 @@ #include -#ifdef DEBUG +#if DEBUG extern "C" int atoi(const char* str); void dScnMenu_setItem(int i_slotNo, u8 i_itemNo); diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 2e9979d20e..7187d0229d 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -566,7 +566,7 @@ dScnPly_reg_HIO_c g_regHIO; dScnPly_env_HIO_c g_envHIO; -#ifdef DEBUG +#if DEBUG dScnPly_preset_HIO_c g_presetHIO; #endif diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index f1da8b4daa..2e92baef02 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -1856,7 +1856,7 @@ int dSv_info_c::initdata_to_card(char* i_cardPtr, int i_dataNum) { return 0; } -#ifdef DEBUG +#if DEBUG flagFile_c::flagFile_c() { m_no = mDoHIO_CREATE_CHILD("フラグファイル", this); m_flags = FLAG_ALL_e; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index e055c19bb6..5bae4ade2b 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -188,132 +188,132 @@ dStage_roomDt_c* dStage_roomControl_c::getStatusRoomDt(int i_statusIdx) { { name, proc, sub } static dStage_objectNameInf l_objectName[] = { - OBJNAME("Grass", PROC_GRASS, 0xFF), - OBJNAME("kusax1", PROC_GRASS, 0xFF), - OBJNAME("kusax7", PROC_GRASS, 0xFF), - OBJNAME("kusax21", PROC_GRASS, 0xFF), - OBJNAME("flower", PROC_GRASS, 0xFF), - OBJNAME("flwr7", PROC_GRASS, 0xFF), - OBJNAME("flwr17", PROC_GRASS, 0xFF), - OBJNAME("pflower", PROC_GRASS, 0xFF), - OBJNAME("pflwrx7", PROC_GRASS, 0xFF), - OBJNAME("door", PROC_DOOR20, 0xFF), - OBJNAME("kdoor", PROC_KNOB20, 0xFF), - OBJNAME("ddoor", PROC_DBDOOR, 0xFF), - OBJNAME("bdoor", PROC_BOSS_DOOR, 0xFF), - OBJNAME("ndoor", PROC_DOOR20, 0xFF), - OBJNAME("tadoor", PROC_DOOR20, 0xFF), - OBJNAME("yodoor", PROC_DOOR20, 0xFF), - OBJNAME("nadoor", PROC_DOOR20, 0xFF), - OBJNAME("l9door", PROC_DOOR20, 0xFF), - OBJNAME("l7door", PROC_DOOR20, 0xFF), - OBJNAME("pdoor", PROC_PushDoor, 0xFF), - OBJNAME("bigdoor", PROC_DOOR20, 0xFF), - OBJNAME("kshtr00", PROC_Obj_Kshutter, 0xFF), - OBJNAME("vshuter", PROC_Obj_Kshutter, 0xFF), - OBJNAME("IzmGate", PROC_Izumi_Gate, 0xFF), - OBJNAME("NoneCam", PROC_CAMERA, 0xFF), - OBJNAME("NormCam", PROC_CAMERA, 0xFF), - OBJNAME("Link", PROC_ALINK, 0xFF), - OBJNAME("carry00", PROC_Obj_Carry, 0xFF), - OBJNAME("carry01", PROC_Obj_Carry, 0xFF), - OBJNAME("carry02", PROC_Obj_Carry, 0xFF), - OBJNAME("carry04", PROC_Obj_Carry, 0xFF), - OBJNAME("carry05", PROC_Obj_Carry, 0xFF), - OBJNAME("carry06", PROC_Obj_Carry, 0xFF), - OBJNAME("carry07", PROC_Obj_Carry, 0xFF), - OBJNAME("carry08", PROC_Obj_Carry, 0xFF), - OBJNAME("carry09", PROC_Obj_Carry, 0xFF), - OBJNAME("ball1", PROC_Obj_Carry, 0xFF), - OBJNAME("ball2", PROC_Obj_Carry, 0xFF), - OBJNAME("ball3", PROC_Obj_Carry, 0xFF), - OBJNAME("carry12", PROC_Obj_Carry, 0xFF), - OBJNAME("carry13", PROC_Obj_Carry, 0xFF), - OBJNAME("TagLite", PROC_Tag_LightBall, 0xFF), - OBJNAME("InoBone", PROC_Obj_InoBone, 0xFF), + OBJNAME("Grass", PROC_GRASS, -1), + OBJNAME("kusax1", PROC_GRASS, -1), + OBJNAME("kusax7", PROC_GRASS, -1), + OBJNAME("kusax21", PROC_GRASS, -1), + OBJNAME("flower", PROC_GRASS, -1), + OBJNAME("flwr7", PROC_GRASS, -1), + OBJNAME("flwr17", PROC_GRASS, -1), + OBJNAME("pflower", PROC_GRASS, -1), + OBJNAME("pflwrx7", PROC_GRASS, -1), + OBJNAME("door", PROC_DOOR20, -1), + OBJNAME("kdoor", PROC_KNOB20, -1), + OBJNAME("ddoor", PROC_DBDOOR, -1), + OBJNAME("bdoor", PROC_BOSS_DOOR, -1), + OBJNAME("ndoor", PROC_DOOR20, -1), + OBJNAME("tadoor", PROC_DOOR20, -1), + OBJNAME("yodoor", PROC_DOOR20, -1), + OBJNAME("nadoor", PROC_DOOR20, -1), + OBJNAME("l9door", PROC_DOOR20, -1), + OBJNAME("l7door", PROC_DOOR20, -1), + OBJNAME("pdoor", PROC_PushDoor, -1), + OBJNAME("bigdoor", PROC_DOOR20, -1), + OBJNAME("kshtr00", PROC_Obj_Kshutter, -1), + OBJNAME("vshuter", PROC_Obj_Kshutter, -1), + OBJNAME("IzmGate", PROC_Izumi_Gate, -1), + OBJNAME("NoneCam", PROC_CAMERA, -1), + OBJNAME("NormCam", PROC_CAMERA, -1), + OBJNAME("Link", PROC_ALINK, -1), + OBJNAME("carry00", PROC_Obj_Carry, -1), + OBJNAME("carry01", PROC_Obj_Carry, -1), + OBJNAME("carry02", PROC_Obj_Carry, -1), + OBJNAME("carry04", PROC_Obj_Carry, -1), + OBJNAME("carry05", PROC_Obj_Carry, -1), + OBJNAME("carry06", PROC_Obj_Carry, -1), + OBJNAME("carry07", PROC_Obj_Carry, -1), + OBJNAME("carry08", PROC_Obj_Carry, -1), + OBJNAME("carry09", PROC_Obj_Carry, -1), + OBJNAME("ball1", PROC_Obj_Carry, -1), + OBJNAME("ball2", PROC_Obj_Carry, -1), + OBJNAME("ball3", PROC_Obj_Carry, -1), + OBJNAME("carry12", PROC_Obj_Carry, -1), + OBJNAME("carry13", PROC_Obj_Carry, -1), + OBJNAME("TagLite", PROC_Tag_LightBall, -1), + OBJNAME("InoBone", PROC_Obj_InoBone, -1), OBJNAME("osiBLK0", PROC_Obj_Movebox, 0x00), OBJNAME("dmblk", PROC_Obj_Movebox, 0x00), OBJNAME("Kkiba", PROC_Obj_Movebox, 0x02), OBJNAME("smblk", PROC_Obj_Movebox, 0x02), - OBJNAME("Lv4blk", PROC_Obj_Movebox, 0xFF), - OBJNAME("Lv4blk2", PROC_Obj_Movebox, 0xFF), - OBJNAME("gstone", PROC_Obj_Movebox, 0xFF), - OBJNAME("TagAtt", PROC_Tag_Attp, 0xFF), - OBJNAME("mmvbg", PROC_SET_BG_OBJ, 0xFF), - OBJNAME("Drop", PROC_Obj_Drop, 0xFF), - OBJNAME("BkLeaf", PROC_Obj_BkLeaf, 0xFF), - OBJNAME("cylwind", PROC_Obj_Tornado, 0xFF), - OBJNAME("TagTrnd", PROC_Obj_Tornado2, 0xFF), - OBJNAME("mvstair", PROC_Obj_MvStair, 0xFF), - OBJNAME("UHDoor", PROC_Obj_Cowdoor, 0xFF), - OBJNAME("SwBoom", PROC_Obj_Swpropeller, 0xFF), - OBJNAME("Swboom", PROC_Obj_Swpropeller, 0xFF), - OBJNAME("BoomSht", PROC_Obj_BoomShutter, 0xFF), - OBJNAME("haihai", PROC_Obj_Hfuta, 0xFF), - OBJNAME("stopper", PROC_Obj_Stopper, 0xFF), - OBJNAME("dstop", PROC_Obj_Stopper2, 0xFF), - OBJNAME("mhole", PROC_Obj_MHole, 0xFF), - OBJNAME("mhole2", PROC_Obj_MHole, 0xFF), - OBJNAME("TagMag", PROC_Tag_Magne, 0xFF), - OBJNAME("P_Warp", PROC_Obj_BossWarp, 0xFF), - OBJNAME("fpillar", PROC_Obj_FirePillar, 0xFF), - OBJNAME("yfire", PROC_Obj_FirePillar2, 0xFF), - OBJNAME("pfire", PROC_Obj_FirePillar2, 0xFF), - OBJNAME("Huriko1", PROC_Obj_WoodPendulum, 0xFF), - OBJNAME("VolBall", PROC_Obj_VolcanicBall, 0xFF), - OBJNAME("VolBom", PROC_Obj_VolcanicBall, 0xFF), - OBJNAME("BigVolc", PROC_Obj_VolcanicBomb, 0xFF), - OBJNAME("geyser", PROC_Obj_Geyser, 0xFF), - OBJNAME("Cwall", PROC_Obj_ChainWall, 0xFF), - OBJNAME("Tansu", PROC_Obj_Chest, 0xFF), - OBJNAME("Onsen", PROC_Obj_Onsen, 0xFF), - OBJNAME("Obj_bm", PROC_Obj_Bemos, 0xFF), - OBJNAME("lv6bm", PROC_Obj_Lv6bemos, 0xFF), - OBJNAME("E_bm6", PROC_Obj_Lv6bemos2, 0xFF), - OBJNAME("stone", PROC_Obj_Stone, 0xFF), - OBJNAME("stoneB", PROC_Obj_Stone, 0xFF), - OBJNAME("TagSpin", PROC_Tag_Spinner, 0xFF), - OBJNAME("L_RopeS", PROC_Obj_RopeBridge, 0xFF), - OBJNAME("L_RopeB", PROC_Obj_RopeBridge, 0xFF), - OBJNAME("wcover", PROC_Obj_WellCover, 0xFF), - OBJNAME("rstair", PROC_Obj_RotStair, 0xFF), - OBJNAME("marm", PROC_Obj_MagneArm, 0xFF), - OBJNAME("turnSw", PROC_Obj_SwTurn, 0xFF), - OBJNAME("chainSw", PROC_Obj_SwChain, 0xFF), - OBJNAME("wsword", PROC_Obj_WoodenSword, 0xFF), - OBJNAME("iceblk", PROC_Obj_IceBlock, 0xFF), - OBJNAME("KkrSmk", PROC_Obj_Smoke, 0xFF), - OBJNAME("dmele", PROC_Obj_Elevator, 0xFF), - OBJNAME("wfall", PROC_Obj_WaterFall, 0xFF), - OBJNAME("izora", PROC_Obj_ZoraCloth, 0xFF), - OBJNAME("smgdoor", PROC_Obj_SmgDoor, 0xFF), - OBJNAME("smkdoor", PROC_Obj_SmgDoor, 0xFF), - OBJNAME("Obj_ava", PROC_Obj_Avalanche, 0xFF), - OBJNAME("thdoor", PROC_Obj_TDoor, 0xFF), - OBJNAME("mstrsrd", PROC_Obj_MasterSword, 0xFF), - OBJNAME("wimage", PROC_Obj_WoodStatue, 0xFF), - OBJNAME("sword", PROC_Obj_Sword, 0xFF), - OBJNAME("spring", PROC_Tag_Spring, 0xFF), - OBJNAME("BkDoorL", PROC_Obj_BkDoor, 0xFF), - OBJNAME("BkDoorR", PROC_Obj_BkDoor, 0xFF), - OBJNAME("IGateL", PROC_Obj_MGate, 0xFF), - OBJNAME("IGateR", PROC_Obj_MGate, 0xFF), - OBJNAME("HGateL", PROC_Obj_MGate, 0xFF), - OBJNAME("HGateR", PROC_Obj_MGate, 0xFF), - OBJNAME("K_Gate", PROC_Obj_KkrGate, 0xFF), - OBJNAME("R_Gate", PROC_Obj_RiderGate, 0xFF), - OBJNAME("kkanban", PROC_Obj_KKanban, 0xFF), + OBJNAME("Lv4blk", PROC_Obj_Movebox, -1), + OBJNAME("Lv4blk2", PROC_Obj_Movebox, -1), + OBJNAME("gstone", PROC_Obj_Movebox, -1), + OBJNAME("TagAtt", PROC_Tag_Attp, -1), + OBJNAME("mmvbg", PROC_SET_BG_OBJ, -1), + OBJNAME("Drop", PROC_Obj_Drop, -1), + OBJNAME("BkLeaf", PROC_Obj_BkLeaf, -1), + OBJNAME("cylwind", PROC_Obj_Tornado, -1), + OBJNAME("TagTrnd", PROC_Obj_Tornado2, -1), + OBJNAME("mvstair", PROC_Obj_MvStair, -1), + OBJNAME("UHDoor", PROC_Obj_Cowdoor, -1), + OBJNAME("SwBoom", PROC_Obj_Swpropeller, -1), + OBJNAME("Swboom", PROC_Obj_Swpropeller, -1), + OBJNAME("BoomSht", PROC_Obj_BoomShutter, -1), + OBJNAME("haihai", PROC_Obj_Hfuta, -1), + OBJNAME("stopper", PROC_Obj_Stopper, -1), + OBJNAME("dstop", PROC_Obj_Stopper2, -1), + OBJNAME("mhole", PROC_Obj_MHole, -1), + OBJNAME("mhole2", PROC_Obj_MHole, -1), + OBJNAME("TagMag", PROC_Tag_Magne, -1), + OBJNAME("P_Warp", PROC_Obj_BossWarp, -1), + OBJNAME("fpillar", PROC_Obj_FirePillar, -1), + OBJNAME("yfire", PROC_Obj_FirePillar2, -1), + OBJNAME("pfire", PROC_Obj_FirePillar2, -1), + OBJNAME("Huriko1", PROC_Obj_WoodPendulum, -1), + OBJNAME("VolBall", PROC_Obj_VolcanicBall, -1), + OBJNAME("VolBom", PROC_Obj_VolcanicBall, -1), + OBJNAME("BigVolc", PROC_Obj_VolcanicBomb, -1), + OBJNAME("geyser", PROC_Obj_Geyser, -1), + OBJNAME("Cwall", PROC_Obj_ChainWall, -1), + OBJNAME("Tansu", PROC_Obj_Chest, -1), + OBJNAME("Onsen", PROC_Obj_Onsen, -1), + OBJNAME("Obj_bm", PROC_Obj_Bemos, -1), + OBJNAME("lv6bm", PROC_Obj_Lv6bemos, -1), + OBJNAME("E_bm6", PROC_Obj_Lv6bemos2, -1), + OBJNAME("stone", PROC_Obj_Stone, -1), + OBJNAME("stoneB", PROC_Obj_Stone, -1), + OBJNAME("TagSpin", PROC_Tag_Spinner, -1), + OBJNAME("L_RopeS", PROC_Obj_RopeBridge, -1), + OBJNAME("L_RopeB", PROC_Obj_RopeBridge, -1), + OBJNAME("wcover", PROC_Obj_WellCover, -1), + OBJNAME("rstair", PROC_Obj_RotStair, -1), + OBJNAME("marm", PROC_Obj_MagneArm, -1), + OBJNAME("turnSw", PROC_Obj_SwTurn, -1), + OBJNAME("chainSw", PROC_Obj_SwChain, -1), + OBJNAME("wsword", PROC_Obj_WoodenSword, -1), + OBJNAME("iceblk", PROC_Obj_IceBlock, -1), + OBJNAME("KkrSmk", PROC_Obj_Smoke, -1), + OBJNAME("dmele", PROC_Obj_Elevator, -1), + OBJNAME("wfall", PROC_Obj_WaterFall, -1), + OBJNAME("izora", PROC_Obj_ZoraCloth, -1), + OBJNAME("smgdoor", PROC_Obj_SmgDoor, -1), + OBJNAME("smkdoor", PROC_Obj_SmgDoor, -1), + OBJNAME("Obj_ava", PROC_Obj_Avalanche, -1), + OBJNAME("thdoor", PROC_Obj_TDoor, -1), + OBJNAME("mstrsrd", PROC_Obj_MasterSword, -1), + OBJNAME("wimage", PROC_Obj_WoodStatue, -1), + OBJNAME("sword", PROC_Obj_Sword, -1), + OBJNAME("spring", PROC_Tag_Spring, -1), + OBJNAME("BkDoorL", PROC_Obj_BkDoor, -1), + OBJNAME("BkDoorR", PROC_Obj_BkDoor, -1), + OBJNAME("IGateL", PROC_Obj_MGate, -1), + OBJNAME("IGateR", PROC_Obj_MGate, -1), + OBJNAME("HGateL", PROC_Obj_MGate, -1), + OBJNAME("HGateR", PROC_Obj_MGate, -1), + OBJNAME("K_Gate", PROC_Obj_KkrGate, -1), + OBJNAME("R_Gate", PROC_Obj_RiderGate, -1), + OBJNAME("kkanban", PROC_Obj_KKanban, -1), OBJNAME("Mhsg6", PROC_Obj_Ladder, 0x00), OBJNAME("Mhsg9", PROC_Obj_Ladder, 0x01), OBJNAME("Mhsg12", PROC_Obj_Ladder, 0x02), OBJNAME("Mhsg15", PROC_Obj_Ladder, 0x03), OBJNAME("Mhsg4h", PROC_Obj_Ladder, 0x04), OBJNAME("Mhsg3", PROC_Obj_Ladder, 0x05), - OBJNAME("bonbori", PROC_EP, 0xFF), - OBJNAME("Cow", PROC_COW, 0xFF), - OBJNAME("Peru", PROC_PERU, 0xFF), - OBJNAME("Kago", PROC_KAGO, 0xFF), - OBJNAME("TagFall", PROC_Tag_WaterFall, 0xFF), + OBJNAME("bonbori", PROC_EP, -1), + OBJNAME("Cow", PROC_COW, -1), + OBJNAME("Peru", PROC_PERU, -1), + OBJNAME("Kago", PROC_KAGO, -1), + OBJNAME("TagFall", PROC_Tag_WaterFall, -1), OBJNAME("Kbota_A", PROC_Obj_Swpush, 0x00), OBJNAME("Kbota_B", PROC_Obj_Swpush, 0x01), OBJNAME("KbotaC", PROC_Obj_Swpush, 0x02), @@ -335,115 +335,115 @@ static dStage_objectNameInf l_objectName[] = { OBJNAME("iceleaf", PROC_Obj_IceLeaf, 0x00), OBJNAME("swHit", PROC_SWHIT0, 0x00), OBJNAME("swHit2", PROC_SWHIT0, 0x01), - OBJNAME("ObjTime", PROC_Obj_Timer, 0xFF), - OBJNAME("AND_SW", PROC_ANDSW, 0xFF), - OBJNAME("AND_SW2", PROC_ANDSW2, 0xFF), - OBJNAME("ALLdie", PROC_ALLDIE, 0xFF), - OBJNAME("rvback", PROC_Tag_RiverBack, 0xFF), - OBJNAME("kagoFal", PROC_Tag_KagoFall, 0xFF), - OBJNAME("CrvGate", PROC_Obj_CRVGATE, 0xFF), - OBJNAME("CrvSaku", PROC_Obj_CRVFENCE, 0xFF), - OBJNAME("CrvWood", PROC_Obj_CRVHAHEN, 0xFF), - OBJNAME("CrvStel", PROC_Obj_CRVSTEEL, 0xFF), - OBJNAME("CrvLH", PROC_Obj_CRVLH_DW, 0xFF), - OBJNAME("RvRock", PROC_Obj_RIVERROCK, 0xFF), + OBJNAME("ObjTime", PROC_Obj_Timer, -1), + OBJNAME("AND_SW", PROC_ANDSW, -1), + OBJNAME("AND_SW2", PROC_ANDSW2, -1), + OBJNAME("ALLdie", PROC_ALLDIE, -1), + OBJNAME("rvback", PROC_Tag_RiverBack, -1), + OBJNAME("kagoFal", PROC_Tag_KagoFall, -1), + OBJNAME("CrvGate", PROC_Obj_CRVGATE, -1), + OBJNAME("CrvSaku", PROC_Obj_CRVFENCE, -1), + OBJNAME("CrvWood", PROC_Obj_CRVHAHEN, -1), + OBJNAME("CrvStel", PROC_Obj_CRVSTEEL, -1), + OBJNAME("CrvLH", PROC_Obj_CRVLH_DW, -1), + OBJNAME("RvRock", PROC_Obj_RIVERROCK, -1), OBJNAME("P2a", PROC_NPC_P2, 0x00), OBJNAME("P2b", PROC_NPC_P2, 0x01), OBJNAME("P2c", PROC_NPC_P2, 0x02), - OBJNAME("Gnd", PROC_NPC_GND, 0xFF), - OBJNAME("grA", PROC_NPC_GRA, 0xFF), - OBJNAME("Obj_grA", PROC_OBJ_GRA, 0xFF), - OBJNAME("Tag_grA", PROC_TAG_GRA, 0xFF), - OBJNAME("TagYami", PROC_TAG_YAMI, 0xFF), - OBJNAME("grC", PROC_NPC_GRC, 0xFF), - OBJNAME("grM", PROC_NPC_GRM, 0xFF), - OBJNAME("grMC", PROC_NPC_GRMC, 0xFF), - OBJNAME("grS", PROC_NPC_GRS, 0xFF), - OBJNAME("grD1", PROC_NPC_GRD, 0xFF), + OBJNAME("Gnd", PROC_NPC_GND, -1), + OBJNAME("grA", PROC_NPC_GRA, -1), + OBJNAME("Obj_grA", PROC_OBJ_GRA, -1), + OBJNAME("Tag_grA", PROC_TAG_GRA, -1), + OBJNAME("TagYami", PROC_TAG_YAMI, -1), + OBJNAME("grC", PROC_NPC_GRC, -1), + OBJNAME("grM", PROC_NPC_GRM, -1), + OBJNAME("grMC", PROC_NPC_GRMC, -1), + OBJNAME("grS", PROC_NPC_GRS, -1), + OBJNAME("grD1", PROC_NPC_GRD, -1), OBJNAME("grD", PROC_NPC_WRESTLER, 0x01), - OBJNAME("grR", PROC_NPC_GRR, 0xFF), - OBJNAME("grO", PROC_NPC_GRO, 0xFF), - OBJNAME("grZ", PROC_NPC_GRZ, 0xFF), - OBJNAME("grARock", PROC_Obj_GraRock, 0xFF), - OBJNAME("grZRock", PROC_Obj_GrzRock, 0xFF), - OBJNAME("osnFire", PROC_OBJ_ONSEN_FIRE, 0xFF), - OBJNAME("yamiD", PROC_NPC_YAMID, 0xFF), - OBJNAME("yamiT", PROC_NPC_YAMIT, 0xFF), - OBJNAME("yamiS", PROC_NPC_YAMIS, 0xFF), - OBJNAME("Blue_NS", PROC_NPC_BLUENS, 0xFF), + OBJNAME("grR", PROC_NPC_GRR, -1), + OBJNAME("grO", PROC_NPC_GRO, -1), + OBJNAME("grZ", PROC_NPC_GRZ, -1), + OBJNAME("grARock", PROC_Obj_GraRock, -1), + OBJNAME("grZRock", PROC_Obj_GrzRock, -1), + OBJNAME("osnFire", PROC_OBJ_ONSEN_FIRE, -1), + OBJNAME("yamiD", PROC_NPC_YAMID, -1), + OBJNAME("yamiT", PROC_NPC_YAMIT, -1), + OBJNAME("yamiS", PROC_NPC_YAMIS, -1), + OBJNAME("Blue_NS", PROC_NPC_BLUENS, -1), OBJNAME("Kakashi", PROC_NPC_KAKASHI, 0x00), - OBJNAME("Kdk", PROC_NPC_KDK, 0xFF), - OBJNAME("Aru", PROC_NPC_ARU, 0xFF), - OBJNAME("Bans", PROC_NPC_BANS, 0xFF), - OBJNAME("Besu", PROC_NPC_BESU, 0xFF), - OBJNAME("Bou", PROC_NPC_BOU, 0xFF), + OBJNAME("Kdk", PROC_NPC_KDK, -1), + OBJNAME("Aru", PROC_NPC_ARU, -1), + OBJNAME("Bans", PROC_NPC_BANS, -1), + OBJNAME("Besu", PROC_NPC_BESU, -1), + OBJNAME("Bou", PROC_NPC_BOU, -1), OBJNAME("BouS", PROC_NPC_BOU_S, 0x00), OBJNAME("clerkA", PROC_NPC_CLERKA, 0x00), OBJNAME("clerkB", PROC_NPC_CLERKB, 0x00), OBJNAME("clerkT", PROC_NPC_CLERKT, 0x00), - OBJNAME("Ash", PROC_NPC_ASH, 0xFF), - OBJNAME("AshB", PROC_NPC_ASHB, 0xFF), - OBJNAME("Shad", PROC_NPC_SHAD, 0xFF), - OBJNAME("Rafrel", PROC_NPC_RAFREL, 0xFF), - OBJNAME("MoiR", PROC_NPC_MOIR, 0xFF), - OBJNAME("impal", PROC_NPC_IMPAL, 0xFF), - OBJNAME("Coach", PROC_NPC_COACH, 0xFF), - OBJNAME("TheB", PROC_NPC_THEB, 0xFF), - OBJNAME("TgArena", PROC_Tag_Arena, 0xFF), - OBJNAME("TagInst", PROC_Tag_Instruction, 0xFF), - OBJNAME("GWolf", PROC_NPC_GWOLF, 0xFF), - OBJNAME("Len", PROC_NPC_LEN, 0xFF), - OBJNAME("Lud", PROC_NPC_LUD, 0xFF), - OBJNAME("Doc", PROC_NPC_DOC, 0xFF), - OBJNAME("FSeirei", PROC_NPC_FAIRY_SEIREI, 0xFF), - OBJNAME("Fairy", PROC_NPC_FAIRY, 0xFF), - OBJNAME("Hanjo", PROC_NPC_HANJO, 0xFF), - OBJNAME("Hoz", PROC_NPC_HOZ, 0xFF), - OBJNAME("Jagar", PROC_NPC_JAGAR, 0xFF), - OBJNAME("Kkri", PROC_NPC_KKRI, 0xFF), - OBJNAME("Kn", PROC_NPC_KN, 0xFF), - OBJNAME("KnBlt", PROC_KN_BULLET, 0xFF), - OBJNAME("Knj", PROC_NPC_KNJ, 0xFF), - OBJNAME("Kolin", PROC_NPC_KOLIN, 0xFF), - OBJNAME("Kolinb", PROC_NPC_KOLINB, 0xFF), - OBJNAME("Kyury", PROC_NPC_KYURY, 0xFF), - OBJNAME("Maro", PROC_NPC_MARO, 0xFF), - OBJNAME("midP", PROC_NPC_MIDP, 0xFF), - OBJNAME("Moi", PROC_NPC_MOI, 0xFF), - OBJNAME("Raca", PROC_NPC_RACA, 0xFF), - OBJNAME("Post", PROC_NPC_POST, 0xFF), - OBJNAME("Pouya", PROC_NPC_POUYA, 0xFF), - OBJNAME("Saru", PROC_NPC_SARU, 0xFF), - OBJNAME("seiB", PROC_NPC_SEIB, 0xFF), - OBJNAME("seiC", PROC_NPC_SEIC, 0xFF), - OBJNAME("seiD", PROC_NPC_SEID, 0xFF), - OBJNAME("Seira", PROC_NPC_SEIRA, 0xFF), - OBJNAME("Seira2", PROC_NPC_SERA2, 0xFF), - OBJNAME("Seirei", PROC_NPC_SEIREI, 0xFF), - OBJNAME("Sha", PROC_NPC_SHAMAN, 0xFF), - OBJNAME("sMaro", PROC_NPC_SMARO, 0xFF), - OBJNAME("solA", PROC_NPC_SOLA, 0xFF), - OBJNAME("Taro", PROC_NPC_TARO, 0xFF), - OBJNAME("PA_Besu", PROC_NPC_PACHI_BESU, 0xFF), - OBJNAME("PA_Taro", PROC_NPC_PACHI_TARO, 0xFF), - OBJNAME("PA_Maro", PROC_NPC_PACHI_MARO, 0xFF), - OBJNAME("TagPati", PROC_TAG_PATI, 0xFF), - OBJNAME("The", PROC_NPC_THE, 0xFF), - OBJNAME("Tkj", PROC_NPC_TKJ, 0xFF), - OBJNAME("Tks", PROC_NPC_TKS, 0xFF), - OBJNAME("ObjTks", PROC_OBJ_TKS, 0xFF), - OBJNAME("Tkc", PROC_NPC_TKC, 0xFF), - OBJNAME("Tkj2", PROC_NPC_TKJ2, 0xFF), - OBJNAME("Toby", PROC_NPC_TOBY, 0xFF), - OBJNAME("Uri", PROC_NPC_URI, 0xFF), - OBJNAME("Yelia", PROC_NPC_YELIA, 0xFF), - OBJNAME("ykM", PROC_NPC_YKM, 0xFF), - OBJNAME("ykW", PROC_NPC_YKW, 0xFF), - OBJNAME("zanB", PROC_NPC_ZANB, 0xFF), - OBJNAME("Zant", PROC_NPC_ZANT, 0xFF), - OBJNAME("Zelda", PROC_NPC_ZELDA, 0xFF), - OBJNAME("ZelR", PROC_NPC_ZELR, 0xFF), - OBJNAME("ZelRo", PROC_NPC_ZELRO, 0xFF), + OBJNAME("Ash", PROC_NPC_ASH, -1), + OBJNAME("AshB", PROC_NPC_ASHB, -1), + OBJNAME("Shad", PROC_NPC_SHAD, -1), + OBJNAME("Rafrel", PROC_NPC_RAFREL, -1), + OBJNAME("MoiR", PROC_NPC_MOIR, -1), + OBJNAME("impal", PROC_NPC_IMPAL, -1), + OBJNAME("Coach", PROC_NPC_COACH, -1), + OBJNAME("TheB", PROC_NPC_THEB, -1), + OBJNAME("TgArena", PROC_Tag_Arena, -1), + OBJNAME("TagInst", PROC_Tag_Instruction, -1), + OBJNAME("GWolf", PROC_NPC_GWOLF, -1), + OBJNAME("Len", PROC_NPC_LEN, -1), + OBJNAME("Lud", PROC_NPC_LUD, -1), + OBJNAME("Doc", PROC_NPC_DOC, -1), + OBJNAME("FSeirei", PROC_NPC_FAIRY_SEIREI, -1), + OBJNAME("Fairy", PROC_NPC_FAIRY, -1), + OBJNAME("Hanjo", PROC_NPC_HANJO, -1), + OBJNAME("Hoz", PROC_NPC_HOZ, -1), + OBJNAME("Jagar", PROC_NPC_JAGAR, -1), + OBJNAME("Kkri", PROC_NPC_KKRI, -1), + OBJNAME("Kn", PROC_NPC_KN, -1), + OBJNAME("KnBlt", PROC_KN_BULLET, -1), + OBJNAME("Knj", PROC_NPC_KNJ, -1), + OBJNAME("Kolin", PROC_NPC_KOLIN, -1), + OBJNAME("Kolinb", PROC_NPC_KOLINB, -1), + OBJNAME("Kyury", PROC_NPC_KYURY, -1), + OBJNAME("Maro", PROC_NPC_MARO, -1), + OBJNAME("midP", PROC_NPC_MIDP, -1), + OBJNAME("Moi", PROC_NPC_MOI, -1), + OBJNAME("Raca", PROC_NPC_RACA, -1), + OBJNAME("Post", PROC_NPC_POST, -1), + OBJNAME("Pouya", PROC_NPC_POUYA, -1), + OBJNAME("Saru", PROC_NPC_SARU, -1), + OBJNAME("seiB", PROC_NPC_SEIB, -1), + OBJNAME("seiC", PROC_NPC_SEIC, -1), + OBJNAME("seiD", PROC_NPC_SEID, -1), + OBJNAME("Seira", PROC_NPC_SEIRA, -1), + OBJNAME("Seira2", PROC_NPC_SERA2, -1), + OBJNAME("Seirei", PROC_NPC_SEIREI, -1), + OBJNAME("Sha", PROC_NPC_SHAMAN, -1), + OBJNAME("sMaro", PROC_NPC_SMARO, -1), + OBJNAME("solA", PROC_NPC_SOLA, -1), + OBJNAME("Taro", PROC_NPC_TARO, -1), + OBJNAME("PA_Besu", PROC_NPC_PACHI_BESU, -1), + OBJNAME("PA_Taro", PROC_NPC_PACHI_TARO, -1), + OBJNAME("PA_Maro", PROC_NPC_PACHI_MARO, -1), + OBJNAME("TagPati", PROC_TAG_PATI, -1), + OBJNAME("The", PROC_NPC_THE, -1), + OBJNAME("Tkj", PROC_NPC_TKJ, -1), + OBJNAME("Tks", PROC_NPC_TKS, -1), + OBJNAME("ObjTks", PROC_OBJ_TKS, -1), + OBJNAME("Tkc", PROC_NPC_TKC, -1), + OBJNAME("Tkj2", PROC_NPC_TKJ2, -1), + OBJNAME("Toby", PROC_NPC_TOBY, -1), + OBJNAME("Uri", PROC_NPC_URI, -1), + OBJNAME("Yelia", PROC_NPC_YELIA, -1), + OBJNAME("ykM", PROC_NPC_YKM, -1), + OBJNAME("ykW", PROC_NPC_YKW, -1), + OBJNAME("zanB", PROC_NPC_ZANB, -1), + OBJNAME("Zant", PROC_NPC_ZANT, -1), + OBJNAME("Zelda", PROC_NPC_ZELDA, -1), + OBJNAME("ZelR", PROC_NPC_ZELR, -1), + OBJNAME("ZelRo", PROC_NPC_ZELRO, -1), OBJNAME("zrA", PROC_NPC_ZRA, 0x00), OBJNAME("zrS", PROC_NPC_ZRA, 0x01), OBJNAME("zrWF", PROC_NPC_ZRA, 0x02), @@ -454,14 +454,14 @@ static dStage_objectNameInf l_objectName[] = { OBJNAME("zrF", PROC_OBJ_ZRAFREEZE, 0x00), OBJNAME("zrF2", PROC_OBJ_ZRAFREEZE, 0x01), OBJNAME("zrF3", PROC_OBJ_ZRAFREEZE, 0x02), - OBJNAME("zrC", PROC_NPC_ZRC, 0xFF), - OBJNAME("zrZ", PROC_NPC_ZRZ, 0xFF), - OBJNAME("GrvStn", PROC_Obj_GraveStone, 0xFF), - OBJNAME("zrARock", PROC_Obj_ZraRock, 0xFF), - OBJNAME("StAndGl", PROC_START_AND_GOAL, 0xFF), - OBJNAME("zrAMark", PROC_ZRA_MARK, 0xFF), - OBJNAME("myna2", PROC_MYNA2, 0xFF), - OBJNAME("myn2tag", PROC_TAG_MYNA2, 0xFF), + OBJNAME("zrC", PROC_NPC_ZRC, -1), + OBJNAME("zrZ", PROC_NPC_ZRZ, -1), + OBJNAME("GrvStn", PROC_Obj_GraveStone, -1), + OBJNAME("zrARock", PROC_Obj_ZraRock, -1), + OBJNAME("StAndGl", PROC_START_AND_GOAL, -1), + OBJNAME("zrAMark", PROC_ZRA_MARK, -1), + OBJNAME("myna2", PROC_MYNA2, -1), + OBJNAME("myn2tag", PROC_TAG_MYNA2, -1), OBJNAME("MAN_a", PROC_NPC_CD3, 0x00), OBJNAME("MAD_a", PROC_NPC_CD3, 0x01), OBJNAME("MCN_a", PROC_NPC_CD3, 0x02), @@ -492,293 +492,293 @@ static dStage_objectNameInf l_objectName[] = { OBJNAME("WON_a2", PROC_NPC_CD3, 0x1B), OBJNAME("WGN_a2", PROC_NPC_CD3, 0x1C), OBJNAME("WAN_b2", PROC_NPC_CD3, 0x1D), - OBJNAME("shoe", PROC_NPC_SHOE, 0xFF), - OBJNAME("DoorBoy", PROC_NPC_DOORBOY, 0xFF), - OBJNAME("prayer", PROC_NPC_PRAYER, 0xFF), - OBJNAME("km_Hana", PROC_NPC_KASIHANA, 0xFF), - OBJNAME("km_Kyu", PROC_NPC_KASIKYU, 0xFF), - OBJNAME("km_Mich", PROC_NPC_KASIMICH, 0xFF), - OBJNAME("NpcChat", PROC_NPC_CHAT, 0xFF), - OBJNAME("chtSolA", PROC_NPC_SOLDIERa, 0xFF), - OBJNAME("chtSolB", PROC_NPC_SOLDIERb, 0xFF), + OBJNAME("shoe", PROC_NPC_SHOE, -1), + OBJNAME("DoorBoy", PROC_NPC_DOORBOY, -1), + OBJNAME("prayer", PROC_NPC_PRAYER, -1), + OBJNAME("km_Hana", PROC_NPC_KASIHANA, -1), + OBJNAME("km_Kyu", PROC_NPC_KASIKYU, -1), + OBJNAME("km_Mich", PROC_NPC_KASIMICH, -1), + OBJNAME("NpcChat", PROC_NPC_CHAT, -1), + OBJNAME("chtSolA", PROC_NPC_SOLDIERa, -1), + OBJNAME("chtSolB", PROC_NPC_SOLDIERb, -1), OBJNAME("DrSol1", PROC_NPC_DRSOL, 0x00), OBJNAME("DrSol2", PROC_NPC_DRSOL, 0x01), - OBJNAME("chin", PROC_NPC_CHIN, 0xFF), - OBJNAME("ins", PROC_NPC_INS, 0xFF), - OBJNAME("Shop0", PROC_NPC_SHOP0, 0xFF), - OBJNAME("TagSch", PROC_Tag_Schedule, 0xFF), - OBJNAME("TagEsc", PROC_Tag_Escape, 0xFF), + OBJNAME("chin", PROC_NPC_CHIN, -1), + OBJNAME("ins", PROC_NPC_INS, -1), + OBJNAME("Shop0", PROC_NPC_SHOP0, -1), + OBJNAME("TagSch", PROC_Tag_Schedule, -1), + OBJNAME("TagEsc", PROC_Tag_Escape, -1), OBJNAME("passer", PROC_PASSER_MNG, 0x00), OBJNAME("passerL", PROC_PASSER_MNG, 0x01), OBJNAME("fmtion", PROC_FORMATION_MNG, 0x00), OBJNAME("fmtionL", PROC_FORMATION_MNG, 0x01), - OBJNAME("guard", PROC_GUARD_MNG, 0xFF), - OBJNAME("TgGuard", PROC_TAG_GUARD, 0xFF), - OBJNAME("Mk", PROC_NPC_MK, 0xFF), + OBJNAME("guard", PROC_GUARD_MNG, -1), + OBJNAME("TgGuard", PROC_TAG_GUARD, -1), + OBJNAME("Mk", PROC_NPC_MK, -1), OBJNAME("Obj_Tbi", PROC_Obj_Yobikusa, 0x00), OBJNAME("Obj_Uma", PROC_Obj_Yobikusa, 0x01), - OBJNAME("Obj_knk", PROC_Obj_KazeNeko, 0xFF), - OBJNAME("Obj_nmp", PROC_Obj_NamePlate, 0xFF), - OBJNAME("Obj_Tie", PROC_Obj_OnCloth, 0xFF), - OBJNAME("Obj_Lrp", PROC_Obj_LndRope, 0xFF), - OBJNAME("Obj_Sit", PROC_Obj_ItaRope, 0xFF), - OBJNAME("Ikada", PROC_Obj_Ikada, 0xFF), - OBJNAME("Dust", PROC_Obj_DUST, 0xFF), - OBJNAME("Obj_Ita", PROC_Obj_ITA, 0xFF), - OBJNAME("Ice_l", PROC_Obj_Ice_l, 0xFF), - OBJNAME("Ice_s", PROC_Obj_Ice_s, 0xFF), - OBJNAME("E_Make", PROC_Obj_E_CREATE, 0xFF), - OBJNAME("Bhhashi", PROC_Obj_Bhbridge, 0xFF), - OBJNAME("Yousei", PROC_Obj_Yousei, 0xFF), - OBJNAME("G_Kabe", PROC_Obj_GOMIKABE, 0xFF), - OBJNAME("B_ling", PROC_Obj_Mato, 0xFF), - OBJNAME("kab_o", PROC_Obj_Kabuto, 0xFF), - OBJNAME("I_Cho", PROC_Obj_Cho, 0xFF), - OBJNAME("I_Kuw", PROC_Obj_Kuw, 0xFF), - OBJNAME("I_Nan", PROC_Obj_Nan, 0xFF), - OBJNAME("I_Dan", PROC_Obj_Dan, 0xFF), - OBJNAME("I_Kam", PROC_Obj_Kam, 0xFF), - OBJNAME("I_Ten", PROC_Obj_Ten, 0xFF), - OBJNAME("I_Ari", PROC_Obj_Ari, 0xFF), - OBJNAME("I_Kag", PROC_Obj_Kag, 0xFF), - OBJNAME("I_Tom", PROC_Obj_Tombo, 0xFF), - OBJNAME("I_Bat", PROC_Obj_Batta, 0xFF), - OBJNAME("I_Kat", PROC_Obj_Kat, 0xFF), - OBJNAME("H_Saku", PROC_Obj_H_Saku, 0xFF), - OBJNAME("sm_door", PROC_Obj_SM_DOOR, 0xFF), - OBJNAME("Kaisou", PROC_Obj_Kaisou, 0xFF), - OBJNAME("Ni", PROC_NI, 0xFF), - OBJNAME("Fr", PROC_FR, 0xFF), - OBJNAME("Sq", PROC_SQ, 0xFF), - OBJNAME("Bd", PROC_BD, 0xFF), - OBJNAME("Obj_ki", PROC_OBJ_KI, 0xFF), - OBJNAME("Do", PROC_DO, 0xFF), + OBJNAME("Obj_knk", PROC_Obj_KazeNeko, -1), + OBJNAME("Obj_nmp", PROC_Obj_NamePlate, -1), + OBJNAME("Obj_Tie", PROC_Obj_OnCloth, -1), + OBJNAME("Obj_Lrp", PROC_Obj_LndRope, -1), + OBJNAME("Obj_Sit", PROC_Obj_ItaRope, -1), + OBJNAME("Ikada", PROC_Obj_Ikada, -1), + OBJNAME("Dust", PROC_Obj_DUST, -1), + OBJNAME("Obj_Ita", PROC_Obj_ITA, -1), + OBJNAME("Ice_l", PROC_Obj_Ice_l, -1), + OBJNAME("Ice_s", PROC_Obj_Ice_s, -1), + OBJNAME("E_Make", PROC_Obj_E_CREATE, -1), + OBJNAME("Bhhashi", PROC_Obj_Bhbridge, -1), + OBJNAME("Yousei", PROC_Obj_Yousei, -1), + OBJNAME("G_Kabe", PROC_Obj_GOMIKABE, -1), + OBJNAME("B_ling", PROC_Obj_Mato, -1), + OBJNAME("kab_o", PROC_Obj_Kabuto, -1), + OBJNAME("I_Cho", PROC_Obj_Cho, -1), + OBJNAME("I_Kuw", PROC_Obj_Kuw, -1), + OBJNAME("I_Nan", PROC_Obj_Nan, -1), + OBJNAME("I_Dan", PROC_Obj_Dan, -1), + OBJNAME("I_Kam", PROC_Obj_Kam, -1), + OBJNAME("I_Ten", PROC_Obj_Ten, -1), + OBJNAME("I_Ari", PROC_Obj_Ari, -1), + OBJNAME("I_Kag", PROC_Obj_Kag, -1), + OBJNAME("I_Tom", PROC_Obj_Tombo, -1), + OBJNAME("I_Bat", PROC_Obj_Batta, -1), + OBJNAME("I_Kat", PROC_Obj_Kat, -1), + OBJNAME("H_Saku", PROC_Obj_H_Saku, -1), + OBJNAME("sm_door", PROC_Obj_SM_DOOR, -1), + OBJNAME("Kaisou", PROC_Obj_Kaisou, -1), + OBJNAME("Ni", PROC_NI, -1), + OBJNAME("Fr", PROC_FR, -1), + OBJNAME("Sq", PROC_SQ, -1), + OBJNAME("Bd", PROC_BD, -1), + OBJNAME("Obj_ki", PROC_OBJ_KI, -1), + OBJNAME("Do", PROC_DO, -1), OBJNAME("Lm", PROC_NPC_FISH, 0x00), OBJNAME("Tr", PROC_NPC_FISH, 0x05), - OBJNAME("Npc_tr", PROC_NPC_TR, 0xFF), - OBJNAME("Npc_lf", PROC_NPC_LF, 0xFF), - OBJNAME("Fish", PROC_MG_FISH, 0xFF), - OBJNAME("NPC_TK", PROC_NPC_TK, 0xFF), - OBJNAME("Obj_fd", PROC_OBJ_FOOD, 0xFF), - OBJNAME("MYNA", PROC_MYNA, 0xFF), - OBJNAME("SSITEM", PROC_OBJ_SSITEM, 0xFF), - OBJNAME("SSDRINK", PROC_OBJ_SSDRINK, 0xFF), - OBJNAME("TGDRINK", PROC_TAG_SSDRINK, 0xFF), - OBJNAME("Tag_Btl", PROC_TAG_BTLITM, 0xFF), - OBJNAME("lv5soup", PROC_TAG_LV5SOUP, 0xFF), - OBJNAME("TGMNLIG", PROC_TAG_MNLIGHT, 0xFF), - OBJNAME("TGSPCAM", PROC_TAG_SHOPCAM, 0xFF), - OBJNAME("TGSPITM", PROC_TAG_SHOPITM, 0xFF), - OBJNAME("OilTubo", PROC_OBJ_OILTUBO, 0xFF), - OBJNAME("Roten", PROC_OBJ_ROTEN, 0xFF), - OBJNAME("Pleaf", PROC_OBJ_PLEAF, 0xFF), - OBJNAME("KBacket", PROC_OBJ_KBACKET, 0xFF), - OBJNAME("YBag", PROC_OBJ_YBAG, 0xFF), - OBJNAME("Pumpkin", PROC_OBJ_PUMPKIN, 0xFF), - OBJNAME("Obj_kg", PROC_OBJ_KAGO, 0xFF), + OBJNAME("Npc_tr", PROC_NPC_TR, -1), + OBJNAME("Npc_lf", PROC_NPC_LF, -1), + OBJNAME("Fish", PROC_MG_FISH, -1), + OBJNAME("NPC_TK", PROC_NPC_TK, -1), + OBJNAME("Obj_fd", PROC_OBJ_FOOD, -1), + OBJNAME("MYNA", PROC_MYNA, -1), + OBJNAME("SSITEM", PROC_OBJ_SSITEM, -1), + OBJNAME("SSDRINK", PROC_OBJ_SSDRINK, -1), + OBJNAME("TGDRINK", PROC_TAG_SSDRINK, -1), + OBJNAME("Tag_Btl", PROC_TAG_BTLITM, -1), + OBJNAME("lv5soup", PROC_TAG_LV5SOUP, -1), + OBJNAME("TGMNLIG", PROC_TAG_MNLIGHT, -1), + OBJNAME("TGSPCAM", PROC_TAG_SHOPCAM, -1), + OBJNAME("TGSPITM", PROC_TAG_SHOPITM, -1), + OBJNAME("OilTubo", PROC_OBJ_OILTUBO, -1), + OBJNAME("Roten", PROC_OBJ_ROTEN, -1), + OBJNAME("Pleaf", PROC_OBJ_PLEAF, -1), + OBJNAME("KBacket", PROC_OBJ_KBACKET, -1), + OBJNAME("YBag", PROC_OBJ_YBAG, -1), + OBJNAME("Pumpkin", PROC_OBJ_PUMPKIN, -1), + OBJNAME("Obj_kg", PROC_OBJ_KAGO, -1), OBJNAME("BbKago", PROC_OBJ_KAGO, 0x00), OBJNAME("OnKago", PROC_OBJ_KAGO, 0x01), - OBJNAME("ObjHasi", PROC_Obj_HHASHI, 0xFF), - OBJNAME("Thashi", PROC_Obj_THASHI, 0xFF), - OBJNAME("B_Hashi", PROC_Obj_BHASHI, 0xFF), - OBJNAME("E_MD", PROC_E_MD, 0xFF), - OBJNAME("E_s1", PROC_E_S1, 0xFF), - OBJNAME("E_wb", PROC_E_WB, 0xFF), - OBJNAME("E_rd", PROC_E_RD, 0xFF), - OBJNAME("E_rdb", PROC_E_RDB, 0xFF), - OBJNAME("E_rdy", PROC_E_RDY, 0xFF), - OBJNAME("E_fm", PROC_E_FM, 0xFF), - OBJNAME("E_dn", PROC_E_DN, 0xFF), - OBJNAME("E_mf", PROC_E_MF, 0xFF), - OBJNAME("TreeSh", PROC_TREESH, 0xFF), - OBJNAME("E_bug", PROC_E_BUG, 0xFF), - OBJNAME("E_bee", PROC_E_BEE, 0xFF), - OBJNAME("E_nest", PROC_E_NEST, 0xFF), - OBJNAME("E_kr", PROC_E_KR, 0xFF), - OBJNAME("E_st", PROC_E_ST, 0xFF), - OBJNAME("E_tk", PROC_E_TK, 0xFF), - OBJNAME("E_tk2", PROC_E_TK2, 0xFF), - OBJNAME("E_th", PROC_E_TH, 0xFF), - OBJNAME("E_cr", PROC_E_CR, 0xFF), - OBJNAME("E_df", PROC_E_DF, 0xFF), - OBJNAME("E_ph", PROC_E_PH, 0xFF), - OBJNAME("E_fs", PROC_E_FS, 0xFF), - OBJNAME("E_SB", PROC_E_SB, 0xFF), - OBJNAME("E_HM", PROC_E_HM, 0xFF), - OBJNAME("E_fk", PROC_E_FK, 0xFF), - OBJNAME("E_pm", PROC_E_PM, 0xFF), - OBJNAME("Npc_ne", PROC_NPC_NE, 0xFF), - OBJNAME("E_db", PROC_E_DB, 0xFF), - OBJNAME("E_kg", PROC_E_KG, 0xFF), - OBJNAME("E_sh", PROC_E_SH, 0xFF), - OBJNAME("E_sf", PROC_E_SF, 0xFF), - OBJNAME("Obj_lb", PROC_OBJ_LBOX, 0xFF), - OBJNAME("Obj_kb", PROC_OBJ_KBOX, 0xFF), - OBJNAME("E_bs", PROC_E_BS, 0xFF), + OBJNAME("ObjHasi", PROC_Obj_HHASHI, -1), + OBJNAME("Thashi", PROC_Obj_THASHI, -1), + OBJNAME("B_Hashi", PROC_Obj_BHASHI, -1), + OBJNAME("E_MD", PROC_E_MD, -1), + OBJNAME("E_s1", PROC_E_S1, -1), + OBJNAME("E_wb", PROC_E_WB, -1), + OBJNAME("E_rd", PROC_E_RD, -1), + OBJNAME("E_rdb", PROC_E_RDB, -1), + OBJNAME("E_rdy", PROC_E_RDY, -1), + OBJNAME("E_fm", PROC_E_FM, -1), + OBJNAME("E_dn", PROC_E_DN, -1), + OBJNAME("E_mf", PROC_E_MF, -1), + OBJNAME("TreeSh", PROC_TREESH, -1), + OBJNAME("E_bug", PROC_E_BUG, -1), + OBJNAME("E_bee", PROC_E_BEE, -1), + OBJNAME("E_nest", PROC_E_NEST, -1), + OBJNAME("E_kr", PROC_E_KR, -1), + OBJNAME("E_st", PROC_E_ST, -1), + OBJNAME("E_tk", PROC_E_TK, -1), + OBJNAME("E_tk2", PROC_E_TK2, -1), + OBJNAME("E_th", PROC_E_TH, -1), + OBJNAME("E_cr", PROC_E_CR, -1), + OBJNAME("E_df", PROC_E_DF, -1), + OBJNAME("E_ph", PROC_E_PH, -1), + OBJNAME("E_fs", PROC_E_FS, -1), + OBJNAME("E_SB", PROC_E_SB, -1), + OBJNAME("E_HM", PROC_E_HM, -1), + OBJNAME("E_fk", PROC_E_FK, -1), + OBJNAME("E_pm", PROC_E_PM, -1), + OBJNAME("Npc_ne", PROC_NPC_NE, -1), + OBJNAME("E_db", PROC_E_DB, -1), + OBJNAME("E_kg", PROC_E_KG, -1), + OBJNAME("E_sh", PROC_E_SH, -1), + OBJNAME("E_sf", PROC_E_SF, -1), + OBJNAME("Obj_lb", PROC_OBJ_LBOX, -1), + OBJNAME("Obj_kb", PROC_OBJ_KBOX, -1), + OBJNAME("E_bs", PROC_E_BS, -1), OBJNAME("Sekizoa", PROC_OBJ_SEKIZOA, 0x00), OBJNAME("Sekizob", PROC_OBJ_SEKIZOA, 0x01), - OBJNAME("E_sm", PROC_E_SM, 0xFF), - OBJNAME("E_sm2", PROC_E_SM2, 0xFF), - OBJNAME("ky_tag0", PROC_KYTAG00, 0xFF), + OBJNAME("E_sm", PROC_E_SM, -1), + OBJNAME("E_sm2", PROC_E_SM2, -1), + OBJNAME("ky_tag0", PROC_KYTAG00, -1), OBJNAME("ky_tag1", PROC_KYTAG01, 0x00), - OBJNAME("ky_tag2", PROC_KYTAG02, 0xFF), + OBJNAME("ky_tag2", PROC_KYTAG02, -1), OBJNAME("ky_tag3", PROC_KYTAG01, 0x01), - OBJNAME("kytag3", PROC_KYTAG03, 0xFF), - OBJNAME("DK_tag", PROC_KYTAG04, 0xFF), - OBJNAME("PPHole", PROC_KYTAG05, 0xFF), - OBJNAME("KY_chg", PROC_KYTAG06, 0xFF), - OBJNAME("Plight", PROC_KYTAG07, 0xFF), - OBJNAME("KY_mk", PROC_KYTAG08, 0xFF), - OBJNAME("Bound", PROC_KYTAG09, 0xFF), + OBJNAME("kytag3", PROC_KYTAG03, -1), + OBJNAME("DK_tag", PROC_KYTAG04, -1), + OBJNAME("PPHole", PROC_KYTAG05, -1), + OBJNAME("KY_chg", PROC_KYTAG06, -1), + OBJNAME("Plight", PROC_KYTAG07, -1), + OBJNAME("KY_mk", PROC_KYTAG08, -1), + OBJNAME("Bound", PROC_KYTAG09, -1), OBJNAME("WC_tag", PROC_KYTAG01, 0x02), - OBJNAME("Sparks", PROC_KYTAG10, 0xFF), - OBJNAME("Tcntrl", PROC_KYTAG11, 0xFF), - OBJNAME("Drkmst", PROC_KYTAG12, 0xFF), - OBJNAME("Blsnow", PROC_KYTAG13, 0xFF), - OBJNAME("Savmem", PROC_KYTAG14, 0xFF), - OBJNAME("Zshake", PROC_KYTAG15, 0xFF), - OBJNAME("Pikari", PROC_KYTAG16, 0xFF), - OBJNAME("Lmask", PROC_KYTAG17, 0xFF), - OBJNAME("E_is", PROC_E_IS, 0xFF), - OBJNAME("E_ai", PROC_E_AI, 0xFF), - OBJNAME("E_ba", PROC_E_BA, 0xFF), - OBJNAME("E_bu", PROC_E_BU, 0xFF), - OBJNAME("E_sw", PROC_E_SW, 0xFF), - OBJNAME("E_ge", PROC_E_GE, 0xFF), - OBJNAME("TagGe", PROC_Tag_WatchGe, 0xFF), - OBJNAME("E_ym", PROC_E_YM, 0xFF), - OBJNAME("E_ymt", PROC_E_YM_TAG, 0xFF), - OBJNAME("E_ymb", PROC_E_YMB, 0xFF), - OBJNAME("Fwall", PROC_Tag_FWall, 0xFF), - OBJNAME("E_hz", PROC_E_HZ, 0xFF), - OBJNAME("E_ws", PROC_E_WS, 0xFF), - OBJNAME("E_oc", PROC_E_OC, 0xFF), - OBJNAME("E_dt", PROC_E_DT, 0xFF), - OBJNAME("E_bg", PROC_E_BG, 0xFF), - OBJNAME("E_octbg", PROC_E_OctBg, 0xFF), - OBJNAME("E_tt", PROC_E_TT, 0xFF), - OBJNAME("E_dk", PROC_E_DK, 0xFF), - OBJNAME("E_vt", PROC_E_VT, 0xFF), - OBJNAME("E_ww", PROC_E_WW, 0xFF), - OBJNAME("E_gi", PROC_E_GI, 0xFF), - OBJNAME("E_mk", PROC_E_MK, 0xFF), - OBJNAME("B_gm", PROC_B_GM, 0xFF), - OBJNAME("E_gm", PROC_E_GM, 0xFF), - OBJNAME("E_gs", PROC_E_GS, 0xFF), - OBJNAME("Npc_ne", PROC_NPC_NE, 0xFF), - OBJNAME("Obj_gm", PROC_OBJ_GM, 0xFF), - OBJNAME("E_mm", PROC_E_MM, 0xFF), + OBJNAME("Sparks", PROC_KYTAG10, -1), + OBJNAME("Tcntrl", PROC_KYTAG11, -1), + OBJNAME("Drkmst", PROC_KYTAG12, -1), + OBJNAME("Blsnow", PROC_KYTAG13, -1), + OBJNAME("Savmem", PROC_KYTAG14, -1), + OBJNAME("Zshake", PROC_KYTAG15, -1), + OBJNAME("Pikari", PROC_KYTAG16, -1), + OBJNAME("Lmask", PROC_KYTAG17, -1), + OBJNAME("E_is", PROC_E_IS, -1), + OBJNAME("E_ai", PROC_E_AI, -1), + OBJNAME("E_ba", PROC_E_BA, -1), + OBJNAME("E_bu", PROC_E_BU, -1), + OBJNAME("E_sw", PROC_E_SW, -1), + OBJNAME("E_ge", PROC_E_GE, -1), + OBJNAME("TagGe", PROC_Tag_WatchGe, -1), + OBJNAME("E_ym", PROC_E_YM, -1), + OBJNAME("E_ymt", PROC_E_YM_TAG, -1), + OBJNAME("E_ymb", PROC_E_YMB, -1), + OBJNAME("Fwall", PROC_Tag_FWall, -1), + OBJNAME("E_hz", PROC_E_HZ, -1), + OBJNAME("E_ws", PROC_E_WS, -1), + OBJNAME("E_oc", PROC_E_OC, -1), + OBJNAME("E_dt", PROC_E_DT, -1), + OBJNAME("E_bg", PROC_E_BG, -1), + OBJNAME("E_octbg", PROC_E_OctBg, -1), + OBJNAME("E_tt", PROC_E_TT, -1), + OBJNAME("E_dk", PROC_E_DK, -1), + OBJNAME("E_vt", PROC_E_VT, -1), + OBJNAME("E_ww", PROC_E_WW, -1), + OBJNAME("E_gi", PROC_E_GI, -1), + OBJNAME("E_mk", PROC_E_MK, -1), + OBJNAME("B_gm", PROC_B_GM, -1), + OBJNAME("E_gm", PROC_E_GM, -1), + OBJNAME("E_gs", PROC_E_GS, -1), + OBJNAME("Npc_ne", PROC_NPC_NE, -1), + OBJNAME("Obj_gm", PROC_OBJ_GM, -1), + OBJNAME("E_mm", PROC_E_MM, -1), OBJNAME("E_mm2", PROC_E_MM, 0x01), - OBJNAME("E_fz", PROC_E_FZ, 0xFF), - OBJNAME("E_fb", PROC_E_FB, 0xFF), - OBJNAME("E_Zs", PROC_E_ZS, 0xFF), - OBJNAME("E_kk", PROC_E_KK, 0xFF), - OBJNAME("E_hp", PROC_E_HP, 0xFF), - OBJNAME("E_zh", PROC_E_ZH, 0xFF), - OBJNAME("E_zm", PROC_E_ZM, 0xFF), + OBJNAME("E_fz", PROC_E_FZ, -1), + OBJNAME("E_fb", PROC_E_FB, -1), + OBJNAME("E_Zs", PROC_E_ZS, -1), + OBJNAME("E_kk", PROC_E_KK, -1), + OBJNAME("E_hp", PROC_E_HP, -1), + OBJNAME("E_zh", PROC_E_ZH, -1), + OBJNAME("E_zm", PROC_E_ZM, -1), OBJNAME("E_zm2", PROC_E_ZM, 0x01), - OBJNAME("E_pz", PROC_E_PZ, 0xFF), - OBJNAME("Kita", PROC_OBJ_KITA, 0xFF), - OBJNAME("E_nz", PROC_E_NZ, 0xFF), - OBJNAME("E_po", PROC_E_PO, 0xFF), - OBJNAME("Obj_w0", PROC_OBJ_WEB0, 0xFF), - OBJNAME("Obj_w1", PROC_OBJ_WEB1, 0xFF), - OBJNAME("Obj_cb", PROC_OBJ_CB, 0xFF), - OBJNAME("Obj_mak", PROC_OBJ_MAKI, 0xFF), - OBJNAME("Obj_brg", PROC_OBJ_BRG, 0xFF), - OBJNAME("E_rb", PROC_E_RB, 0xFF), - OBJNAME("E_sg", PROC_E_SG, 0xFF), - OBJNAME("Obj_tby", PROC_OBJ_TOBY, 0xFF), - OBJNAME("Obj_sw", PROC_OBJ_SW, 0xFF), - OBJNAME("Npc_ks", PROC_NPC_KS, 0xFF), - OBJNAME("Obj_so", PROC_OBJ_SO, 0xFF), - OBJNAME("E_bi", PROC_E_BI, 0xFF), - OBJNAME("Obj_key", PROC_OBJ_KEY, 0xFF), - OBJNAME("E_hb", PROC_E_HB, 0xFF), - OBJNAME("Obj_hb", PROC_OBJ_HB, 0xFF), - OBJNAME("B_bq", PROC_B_BQ, 0xFF), - OBJNAME("B_bh", PROC_B_BH, 0xFF), - OBJNAME("B_go", PROC_B_GO, 0xFF), - OBJNAME("Obj_fw", PROC_OBJ_FW, 0xFF), - OBJNAME("E_ga", PROC_E_GA, 0xFF), - OBJNAME("E_gb", PROC_E_GB, 0xFF), - OBJNAME("E_wap", PROC_E_WAP, 0xFF), - OBJNAME("Obj_sui", PROC_OBJ_SUISYA, 0xFF), - OBJNAME("Obj_bal", PROC_OBJ_BALLOON, 0xFF), - OBJNAME("Obj_lp", PROC_OBJ_LP, 0xFF), - OBJNAME("Obj_nd", PROC_OBJ_NDOOR, 0xFF), - OBJNAME("Obj_ud", PROC_OBJ_UDOOR, 0xFF), - OBJNAME("Obj_us", PROC_OBJ_USAKU, 0xFF), - OBJNAME("Obj_kn2", PROC_OBJ_KANBAN2, 0xFF), - OBJNAME("Obj_kyh", PROC_OBJ_KEYHOLE, 0xFF), - OBJNAME("Bed", PROC_OBJ_BED, 0xFF), - OBJNAME("BouMato", PROC_OBJ_BOUMATO, 0xFF), - OBJNAME("AutoMt", PROC_OBJ_AUTOMATA, 0xFF), - OBJNAME("Gadget", PROC_OBJ_GADGET, 0xFF), - OBJNAME("ItaMato", PROC_OBJ_ITAMATO, 0xFF), - OBJNAME("Nougu", PROC_OBJ_NOUGU, 0xFF), - OBJNAME("Stick", PROC_OBJ_STICK, 0xFF), - OBJNAME("Mie", PROC_OBJ_MIE, 0xFF), - OBJNAME("SkDoor", PROC_OBJ_SEKIDOOR, 0xFF), - OBJNAME("Sekizo", PROC_OBJ_SEKIZO, 0xFF), - OBJNAME("SMTile", PROC_OBJ_SMTILE, 0xFF), - OBJNAME("H_kage", PROC_OBJ_KAGE, 0xFF), - OBJNAME("E_ms", PROC_E_MS, 0xFF), - OBJNAME("Obj_tp", PROC_OBJ_TP, 0xFF), - OBJNAME("Obj_ms", PROC_OBJ_MSIMA, 0xFF), - OBJNAME("E_gob", PROC_E_GOB, 0xFF), - OBJNAME("E_yk", PROC_E_YK, 0xFF), - OBJNAME("E_yr", PROC_E_YR, 0xFF), - OBJNAME("E_yg", PROC_E_YG, 0xFF), - OBJNAME("Obj_fm", PROC_OBJ_FMOBJ, 0xFF), - OBJNAME("B_ob", PROC_B_OB, 0xFF), - OBJNAME("OcHashi", PROC_OCTHASHI, 0xFF), - OBJNAME("E_dd", PROC_E_DD, 0xFF), - OBJNAME("Obj_rw", PROC_OBJ_RW, 0xFF), - OBJNAME("Obj_ih", PROC_OBJ_IHASI, 0xFF), - OBJNAME("E_yc", PROC_E_YC, 0xFF), - OBJNAME("B_ds", PROC_B_DS, 0xFF), - OBJNAME("B_dr", PROC_B_DR, 0xFF), - OBJNAME("B_gg", PROC_B_GG, 0xFF), - OBJNAME("B_yo", PROC_B_YO, 0xFF), - OBJNAME("B_tn", PROC_B_TN, 0xFF), - OBJNAME("B_zant", PROC_B_ZANT, 0xFF), - OBJNAME("B_zntm", PROC_B_ZANTZ, 0xFF), - OBJNAME("B_znts", PROC_B_ZANTS, 0xFF), - OBJNAME("E_yd", PROC_E_YD, 0xFF), - OBJNAME("E_yh", PROC_E_YH, 0xFF), - OBJNAME("Henna", PROC_NPC_HENNA, 0xFF), - OBJNAME("Henna0", PROC_NPC_HENNA0, 0xFF), + OBJNAME("E_pz", PROC_E_PZ, -1), + OBJNAME("Kita", PROC_OBJ_KITA, -1), + OBJNAME("E_nz", PROC_E_NZ, -1), + OBJNAME("E_po", PROC_E_PO, -1), + OBJNAME("Obj_w0", PROC_OBJ_WEB0, -1), + OBJNAME("Obj_w1", PROC_OBJ_WEB1, -1), + OBJNAME("Obj_cb", PROC_OBJ_CB, -1), + OBJNAME("Obj_mak", PROC_OBJ_MAKI, -1), + OBJNAME("Obj_brg", PROC_OBJ_BRG, -1), + OBJNAME("E_rb", PROC_E_RB, -1), + OBJNAME("E_sg", PROC_E_SG, -1), + OBJNAME("Obj_tby", PROC_OBJ_TOBY, -1), + OBJNAME("Obj_sw", PROC_OBJ_SW, -1), + OBJNAME("Npc_ks", PROC_NPC_KS, -1), + OBJNAME("Obj_so", PROC_OBJ_SO, -1), + OBJNAME("E_bi", PROC_E_BI, -1), + OBJNAME("Obj_key", PROC_OBJ_KEY, -1), + OBJNAME("E_hb", PROC_E_HB, -1), + OBJNAME("Obj_hb", PROC_OBJ_HB, -1), + OBJNAME("B_bq", PROC_B_BQ, -1), + OBJNAME("B_bh", PROC_B_BH, -1), + OBJNAME("B_go", PROC_B_GO, -1), + OBJNAME("Obj_fw", PROC_OBJ_FW, -1), + OBJNAME("E_ga", PROC_E_GA, -1), + OBJNAME("E_gb", PROC_E_GB, -1), + OBJNAME("E_wap", PROC_E_WAP, -1), + OBJNAME("Obj_sui", PROC_OBJ_SUISYA, -1), + OBJNAME("Obj_bal", PROC_OBJ_BALLOON, -1), + OBJNAME("Obj_lp", PROC_OBJ_LP, -1), + OBJNAME("Obj_nd", PROC_OBJ_NDOOR, -1), + OBJNAME("Obj_ud", PROC_OBJ_UDOOR, -1), + OBJNAME("Obj_us", PROC_OBJ_USAKU, -1), + OBJNAME("Obj_kn2", PROC_OBJ_KANBAN2, -1), + OBJNAME("Obj_kyh", PROC_OBJ_KEYHOLE, -1), + OBJNAME("Bed", PROC_OBJ_BED, -1), + OBJNAME("BouMato", PROC_OBJ_BOUMATO, -1), + OBJNAME("AutoMt", PROC_OBJ_AUTOMATA, -1), + OBJNAME("Gadget", PROC_OBJ_GADGET, -1), + OBJNAME("ItaMato", PROC_OBJ_ITAMATO, -1), + OBJNAME("Nougu", PROC_OBJ_NOUGU, -1), + OBJNAME("Stick", PROC_OBJ_STICK, -1), + OBJNAME("Mie", PROC_OBJ_MIE, -1), + OBJNAME("SkDoor", PROC_OBJ_SEKIDOOR, -1), + OBJNAME("Sekizo", PROC_OBJ_SEKIZO, -1), + OBJNAME("SMTile", PROC_OBJ_SMTILE, -1), + OBJNAME("H_kage", PROC_OBJ_KAGE, -1), + OBJNAME("E_ms", PROC_E_MS, -1), + OBJNAME("Obj_tp", PROC_OBJ_TP, -1), + OBJNAME("Obj_ms", PROC_OBJ_MSIMA, -1), + OBJNAME("E_gob", PROC_E_GOB, -1), + OBJNAME("E_yk", PROC_E_YK, -1), + OBJNAME("E_yr", PROC_E_YR, -1), + OBJNAME("E_yg", PROC_E_YG, -1), + OBJNAME("Obj_fm", PROC_OBJ_FMOBJ, -1), + OBJNAME("B_ob", PROC_B_OB, -1), + OBJNAME("OcHashi", PROC_OCTHASHI, -1), + OBJNAME("E_dd", PROC_E_DD, -1), + OBJNAME("Obj_rw", PROC_OBJ_RW, -1), + OBJNAME("Obj_ih", PROC_OBJ_IHASI, -1), + OBJNAME("E_yc", PROC_E_YC, -1), + OBJNAME("B_ds", PROC_B_DS, -1), + OBJNAME("B_dr", PROC_B_DR, -1), + OBJNAME("B_gg", PROC_B_GG, -1), + OBJNAME("B_yo", PROC_B_YO, -1), + OBJNAME("B_tn", PROC_B_TN, -1), + OBJNAME("B_zant", PROC_B_ZANT, -1), + OBJNAME("B_zntm", PROC_B_ZANTZ, -1), + OBJNAME("B_znts", PROC_B_ZANTS, -1), + OBJNAME("E_yd", PROC_E_YD, -1), + OBJNAME("E_yh", PROC_E_YH, -1), + OBJNAME("Henna", PROC_NPC_HENNA, -1), + OBJNAME("Henna0", PROC_NPC_HENNA0, -1), OBJNAME("Npc_du", PROC_NPC_DU, 0x00), - OBJNAME("Econt", PROC_ECONT, 0xFF), - OBJNAME("B_mgn", PROC_B_MGN, 0xFF), - OBJNAME("Hzelda", PROC_E_HZELDA, 0xFF), - OBJNAME("Worm", PROC_NPC_WORM, 0xFF), - OBJNAME("B_gnd", PROC_B_GND, 0xFF), - OBJNAME("Obj_gb", PROC_OBJ_GB, 0xFF), - OBJNAME("tboxA0", PROC_TBOX, 0xFF), - OBJNAME("tboxA1", PROC_TBOX, 0xFF), - OBJNAME("tboxA2", PROC_TBOX, 0xFF), - OBJNAME("tboxB0", PROC_TBOX, 0xFF), - OBJNAME("tboxB1", PROC_TBOX, 0xFF), - OBJNAME("tboxB2", PROC_TBOX, 0xFF), - OBJNAME("tboxJ0", PROC_TBOX, 0xFF), - OBJNAME("tboxP0", PROC_TBOX, 0xFF), - OBJNAME("tboxB00", PROC_TBOX, 0xFF), - OBJNAME("tboxB01", PROC_TBOX, 0xFF), - OBJNAME("tboxW0", PROC_TBOX, 0xFF), - OBJNAME("tboxEL0", PROC_TBOX2, 0xFF), - OBJNAME("tboxEL1", PROC_TBOX2, 0xFF), - OBJNAME("l8warp", PROC_Obj_BossWarp, 0xFF), - OBJNAME("L1Bdoor", PROC_L1BOSS_DOOR, 0xFF), - OBJNAME("L2Bdoor", PROC_L1BOSS_DOOR, 0xFF), - OBJNAME("L3Bdoor", PROC_Obj_Kshutter, 0xFF), - OBJNAME("L4Bdoor", PROC_L1BOSS_DOOR, 0xFF), - OBJNAME("L5Bdoor", PROC_L5BOSS_DOOR, 0xFF), - OBJNAME("L6Bdoor", PROC_L1BOSS_DOOR, 0xFF), - OBJNAME("L7Bdoor", PROC_L1BOSS_DOOR, 0xFF), - OBJNAME("L8Bdoor", PROC_L1BOSS_DOOR, 0xFF), - OBJNAME("L9Bdoor", PROC_L1BOSS_DOOR, 0xFF), + OBJNAME("Econt", PROC_ECONT, -1), + OBJNAME("B_mgn", PROC_B_MGN, -1), + OBJNAME("Hzelda", PROC_E_HZELDA, -1), + OBJNAME("Worm", PROC_NPC_WORM, -1), + OBJNAME("B_gnd", PROC_B_GND, -1), + OBJNAME("Obj_gb", PROC_OBJ_GB, -1), + OBJNAME("tboxA0", PROC_TBOX, -1), + OBJNAME("tboxA1", PROC_TBOX, -1), + OBJNAME("tboxA2", PROC_TBOX, -1), + OBJNAME("tboxB0", PROC_TBOX, -1), + OBJNAME("tboxB1", PROC_TBOX, -1), + OBJNAME("tboxB2", PROC_TBOX, -1), + OBJNAME("tboxJ0", PROC_TBOX, -1), + OBJNAME("tboxP0", PROC_TBOX, -1), + OBJNAME("tboxB00", PROC_TBOX, -1), + OBJNAME("tboxB01", PROC_TBOX, -1), + OBJNAME("tboxW0", PROC_TBOX, -1), + OBJNAME("tboxEL0", PROC_TBOX2, -1), + OBJNAME("tboxEL1", PROC_TBOX2, -1), + OBJNAME("l8warp", PROC_Obj_BossWarp, -1), + OBJNAME("L1Bdoor", PROC_L1BOSS_DOOR, -1), + OBJNAME("L2Bdoor", PROC_L1BOSS_DOOR, -1), + OBJNAME("L3Bdoor", PROC_Obj_Kshutter, -1), + OBJNAME("L4Bdoor", PROC_L1BOSS_DOOR, -1), + OBJNAME("L5Bdoor", PROC_L5BOSS_DOOR, -1), + OBJNAME("L6Bdoor", PROC_L1BOSS_DOOR, -1), + OBJNAME("L7Bdoor", PROC_L1BOSS_DOOR, -1), + OBJNAME("L8Bdoor", PROC_L1BOSS_DOOR, -1), + OBJNAME("L9Bdoor", PROC_L1BOSS_DOOR, -1), OBJNAME("L1Mdoor", PROC_L1MBOSS_DOOR, 0x01), OBJNAME("L2Mdoor", PROC_L1MBOSS_DOOR, 0x02), OBJNAME("L3Mdoor", PROC_L1MBOSS_DOOR, 0x03), @@ -789,255 +789,255 @@ static dStage_objectNameInf l_objectName[] = { OBJNAME("L8Mdoor", PROC_L1MBOSS_DOOR, 0x08), OBJNAME("L7door", PROC_L1MBOSS_DOOR, 0x0A), OBJNAME("L5door", PROC_L1MBOSS_DOOR, 0x0B), - OBJNAME("Horse", PROC_HORSE, 0xFF), - OBJNAME("Canoe", PROC_CANOE, 0xFF), - OBJNAME("Crope", PROC_Obj_Crope, 0xFF), - OBJNAME("Cstatue", PROC_CSTATUE, 0xFF), - OBJNAME("CstaF", PROC_CSTAF, 0xFF), - OBJNAME("HoZelda", PROC_HOZELDA, 0xFF), - OBJNAME("Mhint", PROC_Tag_Mhint, 0xFF), - OBJNAME("Mmsg", PROC_Tag_Mmsg, 0xFF), - OBJNAME("Mwait", PROC_Tag_Mwait, 0xFF), - OBJNAME("Mstop", PROC_Tag_Mstop, 0xFF), - OBJNAME("MstopE", PROC_Tag_Mstop, 0xFF), - OBJNAME("Hinit", PROC_Tag_Hinit, 0xFF), - OBJNAME("Hjump", PROC_Tag_Hjump, 0xFF), - OBJNAME("Hstop", PROC_Tag_Hstop, 0xFF), - OBJNAME("AJnot", PROC_Tag_AJnot, 0xFF), - OBJNAME("Wljump", PROC_Tag_Wljump, 0xFF), - OBJNAME("Sppath", PROC_Tag_Sppath, 0xFF), - OBJNAME("Stream", PROC_Tag_Stream, 0xFF), - OBJNAME("Gstart", PROC_Tag_Gstart, 0xFF), - OBJNAME("TgTGate", PROC_Tag_TWGate, 0xFF), - OBJNAME("Lv6Gate", PROC_Tag_Lv6Gate, 0xFF), - OBJNAME("Lv7Gate", PROC_Tag_Lv7Gate, 0xFF), - OBJNAME("Lv8Gate", PROC_Tag_Lv8Gate, 0xFF), - OBJNAME("TgTHint", PROC_Tag_TheBHint, 0xFF), - OBJNAME("TagAsst", PROC_Tag_Assist, 0xFF), - OBJNAME("Dmidna", PROC_DMIDNA, 0xFF), - OBJNAME("Fchain", PROC_Obj_Fchain, 0xFF), - OBJNAME("Wchain", PROC_Obj_Wchain, 0xFF), - OBJNAME("Cdoor", PROC_Obj_Cdoor, 0xFF), - OBJNAME("Cgate", PROC_Obj_Cdoor, 0xFF), - OBJNAME("Water00", PROC_GRDWATER, 0xFF), - OBJNAME("Digpl", PROC_Obj_Digpl, 0xFF), - OBJNAME("Digholl", PROC_Obj_Digholl, 0xFF), - OBJNAME("Bombf", PROC_Obj_Bombf, 0xFF), - OBJNAME("hider", PROC_SUSPEND, 0xFF), - OBJNAME("SwAreaC", PROC_SWC00, 0xFF), - OBJNAME("SwAreaS", PROC_SWC00, 0xFF), - OBJNAME("SwLBall", PROC_SwLBall, 0xFF), - OBJNAME("SwBall", PROC_SwBall, 0xFF), - OBJNAME("thouse", PROC_Obj_TobyHouse, 0xFF), - OBJNAME("ironbox", PROC_Obj_MetalBox, 0xFF), - OBJNAME("l6swtrn", PROC_Obj_Lv6SwTurn, 0xFF), - OBJNAME("l2bmtag", PROC_Tag_Lv2PrChk, 0xFF), - OBJNAME("swspin", PROC_Obj_SwSpinner, 0xFF), - OBJNAME("spnGear", PROC_Obj_Lv4Gear, 0xFF), - OBJNAME("fan", PROC_Obj_Fan, 0xFF), - OBJNAME("tgake", PROC_Obj_Gake, 0xFF), - OBJNAME("tmoon", PROC_Obj_TMoon, 0xFF), - OBJNAME("gwall", PROC_Obj_GanonWall, 0xFF), - OBJNAME("gwall2", PROC_Obj_GanonWall2, 0xFF), - OBJNAME("scnChg", PROC_SCENE_EXIT, 0xFF), - OBJNAME("scnChg2", PROC_SCENE_EXIT2, 0xFF), - OBJNAME("noChgRm", PROC_NO_CHG_ROOM, 0xFF), + OBJNAME("Horse", PROC_HORSE, -1), + OBJNAME("Canoe", PROC_CANOE, -1), + OBJNAME("Crope", PROC_Obj_Crope, -1), + OBJNAME("Cstatue", PROC_CSTATUE, -1), + OBJNAME("CstaF", PROC_CSTAF, -1), + OBJNAME("HoZelda", PROC_HOZELDA, -1), + OBJNAME("Mhint", PROC_Tag_Mhint, -1), + OBJNAME("Mmsg", PROC_Tag_Mmsg, -1), + OBJNAME("Mwait", PROC_Tag_Mwait, -1), + OBJNAME("Mstop", PROC_Tag_Mstop, -1), + OBJNAME("MstopE", PROC_Tag_Mstop, -1), + OBJNAME("Hinit", PROC_Tag_Hinit, -1), + OBJNAME("Hjump", PROC_Tag_Hjump, -1), + OBJNAME("Hstop", PROC_Tag_Hstop, -1), + OBJNAME("AJnot", PROC_Tag_AJnot, -1), + OBJNAME("Wljump", PROC_Tag_Wljump, -1), + OBJNAME("Sppath", PROC_Tag_Sppath, -1), + OBJNAME("Stream", PROC_Tag_Stream, -1), + OBJNAME("Gstart", PROC_Tag_Gstart, -1), + OBJNAME("TgTGate", PROC_Tag_TWGate, -1), + OBJNAME("Lv6Gate", PROC_Tag_Lv6Gate, -1), + OBJNAME("Lv7Gate", PROC_Tag_Lv7Gate, -1), + OBJNAME("Lv8Gate", PROC_Tag_Lv8Gate, -1), + OBJNAME("TgTHint", PROC_Tag_TheBHint, -1), + OBJNAME("TagAsst", PROC_Tag_Assist, -1), + OBJNAME("Dmidna", PROC_DMIDNA, -1), + OBJNAME("Fchain", PROC_Obj_Fchain, -1), + OBJNAME("Wchain", PROC_Obj_Wchain, -1), + OBJNAME("Cdoor", PROC_Obj_Cdoor, -1), + OBJNAME("Cgate", PROC_Obj_Cdoor, -1), + OBJNAME("Water00", PROC_GRDWATER, -1), + OBJNAME("Digpl", PROC_Obj_Digpl, -1), + OBJNAME("Digholl", PROC_Obj_Digholl, -1), + OBJNAME("Bombf", PROC_Obj_Bombf, -1), + OBJNAME("hider", PROC_SUSPEND, -1), + OBJNAME("SwAreaC", PROC_SWC00, -1), + OBJNAME("SwAreaS", PROC_SWC00, -1), + OBJNAME("SwLBall", PROC_SwLBall, -1), + OBJNAME("SwBall", PROC_SwBall, -1), + OBJNAME("thouse", PROC_Obj_TobyHouse, -1), + OBJNAME("ironbox", PROC_Obj_MetalBox, -1), + OBJNAME("l6swtrn", PROC_Obj_Lv6SwTurn, -1), + OBJNAME("l2bmtag", PROC_Tag_Lv2PrChk, -1), + OBJNAME("swspin", PROC_Obj_SwSpinner, -1), + OBJNAME("spnGear", PROC_Obj_Lv4Gear, -1), + OBJNAME("fan", PROC_Obj_Fan, -1), + OBJNAME("tgake", PROC_Obj_Gake, -1), + OBJNAME("tmoon", PROC_Obj_TMoon, -1), + OBJNAME("gwall", PROC_Obj_GanonWall, -1), + OBJNAME("gwall2", PROC_Obj_GanonWall2, -1), + OBJNAME("scnChg", PROC_SCENE_EXIT, -1), + OBJNAME("scnChg2", PROC_SCENE_EXIT2, -1), + OBJNAME("noChgRm", PROC_NO_CHG_ROOM, -1), OBJNAME("readRm", PROC_NO_CHG_ROOM, 0x00), - OBJNAME("Tetd", PROC_DSHUTTER, 0xFF), - OBJNAME("fence", PROC_DSHUTTER, 0xFF), - OBJNAME("lv7saku", PROC_DSHUTTER, 0xFF), - OBJNAME("YkgrON", PROC_Ykgr, 0xFF), - OBJNAME("YkgrOFF", PROC_Ykgr, 0xFF), - OBJNAME("TagEv", PROC_TAG_EVENT, 0xFF), - OBJNAME("TagEvC", PROC_TAG_EVENT, 0xFF), + OBJNAME("Tetd", PROC_DSHUTTER, -1), + OBJNAME("fence", PROC_DSHUTTER, -1), + OBJNAME("lv7saku", PROC_DSHUTTER, -1), + OBJNAME("YkgrON", PROC_Ykgr, -1), + OBJNAME("YkgrOFF", PROC_Ykgr, -1), + OBJNAME("TagEv", PROC_TAG_EVENT, -1), + OBJNAME("TagEvC", PROC_TAG_EVENT, -1), OBJNAME("TagEvt", PROC_TAG_EVT, 0x00), OBJNAME("TagEvt1", PROC_TAG_EVT, 0x01), OBJNAME("TagHowl", PROC_TAG_HOWL, 0x01), OBJNAME("Tag_ms", PROC_TAG_MSG, 0x00), - OBJNAME("LntnTag", PROC_TAG_LANTERN, 0xFF), - OBJNAME("EvtArea", PROC_TAG_EVTAREA, 0xFF), - OBJNAME("AllMato", PROC_TAG_ALLMATO, 0xFF), - OBJNAME("EvtMsg", PROC_TAG_EVTMSG, 0xFF), - OBJNAME("KMsg", PROC_TAG_KMSG, 0xFF), - OBJNAME("Push", PROC_TAG_PUSH, 0xFF), - OBJNAME("Teloper", PROC_TAG_TELOP, 0xFF), - OBJNAME("CamChg", PROC_TAG_CAMERA, 0xFF), - OBJNAME("CamArea", PROC_TAG_CAMERA, 0xFF), - OBJNAME("CamAreC", PROC_TAG_CAMERA, 0xFF), - OBJNAME("ChkPntS", PROC_TAG_CHKPOINT, 0xFF), - OBJNAME("ChkPntC", PROC_TAG_CHKPOINT, 0xFF), - OBJNAME("setball", PROC_Tag_SetBall, 0xFF), - OBJNAME("atkItem", PROC_Tag_AttackItem, 0xFF), - OBJNAME("TagStat", PROC_Tag_Statue, 0xFF), - OBJNAME("zdoor", PROC_Obj_ZDoor, 0xFF), - OBJNAME("rdoor", PROC_Obj_ZDoor, 0xFF), - OBJNAME("STDoa", PROC_Obj_ZDoor, 0xFF), - OBJNAME("hasi00", PROC_Obj_Pillar, 0xFF), - OBJNAME("hasi01", PROC_Obj_Pillar, 0xFF), - OBJNAME("window", PROC_Obj_Window, 0xFF), - OBJNAME("bbox", PROC_Obj_BBox, 0xFF), - OBJNAME("spiralC", PROC_Obj_Lv3R10Saka, 0xFF), - OBJNAME("spiral2", PROC_Obj_Lv3R10Saka, 0xFF), - OBJNAME("digsnow", PROC_Obj_DigSnow, 0xFF), - OBJNAME("digsand", PROC_Obj_Lv4DigSand, 0xFF), - OBJNAME("fallobj", PROC_Obj_FallObj, 0xFF), - OBJNAME("l7brg", PROC_Obj_Lv7Bridge, 0xFF), - OBJNAME("dr", PROC_DR, 0xFF), - OBJNAME("L7lowDr", PROC_L7lowDr, 0xFF), - OBJNAME("swTime", PROC_SwTime, 0xFF), - OBJNAME("pdrobj", PROC_Obj_PushDoor, 0xFF), - OBJNAME("crystal", PROC_Obj_Crystal, 0xFF), - OBJNAME("WarpBrg", PROC_Obj_KakarikoBrg, 0xFF), - OBJNAME("WarpB2", PROC_Obj_KakarikoBrg, 0xFF), + OBJNAME("LntnTag", PROC_TAG_LANTERN, -1), + OBJNAME("EvtArea", PROC_TAG_EVTAREA, -1), + OBJNAME("AllMato", PROC_TAG_ALLMATO, -1), + OBJNAME("EvtMsg", PROC_TAG_EVTMSG, -1), + OBJNAME("KMsg", PROC_TAG_KMSG, -1), + OBJNAME("Push", PROC_TAG_PUSH, -1), + OBJNAME("Teloper", PROC_TAG_TELOP, -1), + OBJNAME("CamChg", PROC_TAG_CAMERA, -1), + OBJNAME("CamArea", PROC_TAG_CAMERA, -1), + OBJNAME("CamAreC", PROC_TAG_CAMERA, -1), + OBJNAME("ChkPntS", PROC_TAG_CHKPOINT, -1), + OBJNAME("ChkPntC", PROC_TAG_CHKPOINT, -1), + OBJNAME("setball", PROC_Tag_SetBall, -1), + OBJNAME("atkItem", PROC_Tag_AttackItem, -1), + OBJNAME("TagStat", PROC_Tag_Statue, -1), + OBJNAME("zdoor", PROC_Obj_ZDoor, -1), + OBJNAME("rdoor", PROC_Obj_ZDoor, -1), + OBJNAME("STDoa", PROC_Obj_ZDoor, -1), + OBJNAME("hasi00", PROC_Obj_Pillar, -1), + OBJNAME("hasi01", PROC_Obj_Pillar, -1), + OBJNAME("window", PROC_Obj_Window, -1), + OBJNAME("bbox", PROC_Obj_BBox, -1), + OBJNAME("spiralC", PROC_Obj_Lv3R10Saka, -1), + OBJNAME("spiral2", PROC_Obj_Lv3R10Saka, -1), + OBJNAME("digsnow", PROC_Obj_DigSnow, -1), + OBJNAME("digsand", PROC_Obj_Lv4DigSand, -1), + OBJNAME("fallobj", PROC_Obj_FallObj, -1), + OBJNAME("l7brg", PROC_Obj_Lv7Bridge, -1), + OBJNAME("dr", PROC_DR, -1), + OBJNAME("L7lowDr", PROC_L7lowDr, -1), + OBJNAME("swTime", PROC_SwTime, -1), + OBJNAME("pdrobj", PROC_Obj_PushDoor, -1), + OBJNAME("crystal", PROC_Obj_Crystal, -1), + OBJNAME("WarpBrg", PROC_Obj_KakarikoBrg, -1), + OBJNAME("WarpB2", PROC_Obj_KakarikoBrg, -1), OBJNAME("WarpOB1", PROC_Obj_OrdinBrg, 0x00), OBJNAME("WarpOB2", PROC_Obj_OrdinBrg, 0x01), - OBJNAME("VolcGnd", PROC_Obj_VolcGnd, 0xFF), - OBJNAME("r09wtr", PROC_Obj_WaterEff, 0xFF), - OBJNAME("ballSw", PROC_Obj_SwBallA, 0xFF), - OBJNAME("lballSw", PROC_Obj_SwBallB, 0xFF), - OBJNAME("lbsw", PROC_Obj_SwBallC, 0xFF), - OBJNAME("R50Sand", PROC_Obj_Lv4Sand, 0xFF), - OBJNAME("rwall", PROC_Obj_Lv4RailWall, 0xFF), - OBJNAME("l4brg", PROC_Obj_Lv4Bridge, 0xFF), - OBJNAME("l4floor", PROC_Obj_Lv4Floor, 0xFF), - OBJNAME("item", PROC_ITEM, 0xFF), - OBJNAME("itemKey", PROC_Obj_SmallKey, 0xFF), - OBJNAME("kantera", PROC_Obj_Kantera, 0xFF), - OBJNAME("witem", PROC_ITEM, 0xFF), - OBJNAME("wshield", PROC_Obj_Shield, 0xFF), - OBJNAME("htPiece", PROC_Obj_LifeContainer, 0xFF), - OBJNAME("htCase", PROC_Obj_LifeContainer, 0xFF), - OBJNAME("Mbrid15", PROC_Obj_RotBridge, 0xFF), - OBJNAME("Mbrid9", PROC_Obj_RotBridge, 0xFF), - OBJNAME("maglift", PROC_Obj_MagLift, 0xFF), - OBJNAME("Cldst00", PROC_Obj_Lv1Cdl00, 0xFF), - OBJNAME("Cldst01", PROC_Obj_Lv1Cdl01, 0xFF), - OBJNAME("RMback0", PROC_Tag_Restart, 0xFF), - OBJNAME("RMback1", PROC_Tag_ChgRestart, 0xFF), - OBJNAME("Mist", PROC_Tag_Mist, 0xFF), - OBJNAME("magLifR", PROC_Obj_MagLiftRot, 0xFF), - OBJNAME("TCdlst", PROC_Obj_TvCdlst, 0xFF), - OBJNAME("wdstick", PROC_Obj_WdStick, 0xFF), - OBJNAME("stBlock", PROC_Obj_StairBlock, 0xFF), - OBJNAME("hsMato", PROC_Obj_HsTarget, 0xFF), - OBJNAME("ktFire", PROC_Tag_KtOnFire, 0xFF), - OBJNAME("hswitch", PROC_Obj_HeavySw, 0xFF), - OBJNAME("goGate", PROC_Obj_GoGate, 0xFF), - OBJNAME("taAmi", PROC_Obj_TaFence, 0xFF), - OBJNAME("fireWd", PROC_Obj_FireWood, 0xFF), - OBJNAME("fireWd2", PROC_Obj_FireWood2, 0xFF), - OBJNAME("altar", PROC_Obj_Saidan, 0xFF), - OBJNAME("gpTaru", PROC_Obj_GpTaru, 0xFF), - OBJNAME("spinLf", PROC_Obj_SpinLift, 0xFF), - OBJNAME("bmWin", PROC_Obj_BmWindow, 0xFF), - OBJNAME("roofHl", PROC_Obj_RfHole, 0xFF), - OBJNAME("syRock", PROC_Obj_SyRock, 0xFF), - OBJNAME("wColumn", PROC_Obj_WaterPillar, 0xFF), - OBJNAME("kpot", PROC_Obj_KiPot, 0xFF), - OBJNAME("bsGate", PROC_Obj_BsGate, 0xFF), - OBJNAME("amiShut", PROC_Obj_AmiShutter, 0xFF), - OBJNAME("kwhel00", PROC_Obj_KWheel00, 0xFF), - OBJNAME("kwhel01", PROC_Obj_KWheel01, 0xFF), - OBJNAME("PRElvtr", PROC_Obj_PRElvtr, 0xFF), - OBJNAME("swhel00", PROC_Obj_KWheel00, 0xFF), - OBJNAME("M_hasu", PROC_Obj_MHasu, 0xFF), - OBJNAME("yiblltr", PROC_Obj_YIblltray, 0xFF), - OBJNAME("l6egate", PROC_Obj_Lv6EGate, 0xFF), - OBJNAME("l6eleva", PROC_Obj_Lv6ElevtA, 0xFF), - OBJNAME("wtGate", PROC_Obj_WtGate, 0xFF), - OBJNAME("candlL2", PROC_Obj_Lv2Candle, 0xFF), - OBJNAME("togeTp", PROC_Obj_TogeTrap, 0xFF), - OBJNAME("rotTrap", PROC_Obj_RotTrap, 0xFF), - OBJNAME("klift00", PROC_Obj_KLift00, 0xFF), - OBJNAME("l4chand", PROC_Obj_Lv4Chan, 0xFF), - OBJNAME("Ychndlr", PROC_Obj_Ychndlr, 0xFF), - OBJNAME("hbmbkoy", PROC_Obj_HBombkoya, 0xFF), - OBJNAME("TagCsw", PROC_TAG_CSW, 0xFF), - OBJNAME("TagCswO", PROC_TAG_CSW, 0xFF), - OBJNAME("P_Rwall", PROC_Obj_Lv4PRwall, 0xFF), - OBJNAME("PDtile", PROC_Obj_PDtile, 0xFF), - OBJNAME("PDwall", PROC_Obj_PDwall, 0xFF), - OBJNAME("Qs", PROC_TAG_QS, 0xFF), - OBJNAME("mirror", PROC_MIRROR, 0xFF), - OBJNAME("rGate", PROC_Obj_SwallShutter, 0xFF), - OBJNAME("l3water", PROC_Obj_Lv3Water, 0xFF), - OBJNAME("l3wat02", PROC_Obj_Lv3Water2, 0xFF), - OBJNAME("l3watB", PROC_OBJ_LV3WATERB, 0xFF), - OBJNAME("szbridg", PROC_Obj_SZbridge, 0xFF), - OBJNAME("kjgjs", PROC_Obj_KJgjs, 0xFF), - OBJNAME("kjs", PROC_Obj_KJgjs, 0xFF), - OBJNAME("candlL3", PROC_Obj_Lv3Candle, 0xFF), - OBJNAME("l5icewl", PROC_Obj_IceWall, 0xFF), - OBJNAME("Turara", PROC_Obj_Turara, 0xFF), - OBJNAME("twGate", PROC_Obj_TwGate, 0xFF), - OBJNAME("L4cdlTg", PROC_Tag_Lv4Candle, 0xFF), - OBJNAME("L4cddTg", PROC_Tag_Lv4CandleDm, 0xFF), - OBJNAME("togeRol", PROC_Obj_Lv6TogeRoll, 0xFF), - OBJNAME("l6TogeT", PROC_Obj_Lv6TogeTrap, 0xFF), - OBJNAME("Tenbin", PROC_Obj_Lv6Tenbin, 0xFF), - OBJNAME("l6Lblk", PROC_Obj_Lv6Lblock, 0xFF), - OBJNAME("l6SwGt", PROC_Obj_Lv6SwGate, 0xFF), - OBJNAME("l6ChBlk", PROC_Obj_Lv6ChgGate, 0xFF), - OBJNAME("l6FuriT", PROC_Obj_Lv6FuriTrap, 0xFF), - OBJNAME("KHdesk", PROC_Obj_BarDesk, 0xFF), - OBJNAME("Ytaihou", PROC_Obj_Ytaihou, 0xFF), - OBJNAME("L4eShut", PROC_Obj_Lv4EdShutter, 0xFF), - OBJNAME("pofire", PROC_Obj_poFire, 0xFF), - OBJNAME("pofiTg", PROC_Tag_poFire, 0xFF), - OBJNAME("poCandl", PROC_Obj_poCandle, 0xFF), - OBJNAME("L4Gate", PROC_Obj_Lv4Gate, 0xFF), - OBJNAME("L4Pgate", PROC_Obj_Lv4PoGate, 0xFF), - OBJNAME("L4SWall", PROC_Obj_Lv4SlideWall, 0xFF), - OBJNAME("L4hmato", PROC_Obj_Lv4HsTarget, 0xFF), - OBJNAME("propy", PROC_Obj_Lv7PropY, 0xFF), - OBJNAME("L7BsGt", PROC_Obj_Lv7BsGate, 0xFF), - OBJNAME("optLift", PROC_Obj_Lv8OptiLift, 0xFF), - OBJNAME("kkiTrap", PROC_Obj_Lv8KekkaiTrap, 0xFF), - OBJNAME("L8LiftX", PROC_Obj_Lv8Lift, 0xFF), - OBJNAME("swStep", PROC_Obj_Lv8UdFloor, 0xFF), - OBJNAME("L9SwSht", PROC_Obj_Lv9SwShutter, 0xFF), - OBJNAME("L5SwIce", PROC_Obj_Lv5SwIce, 0xFF), - OBJNAME("glwSph", PROC_Obj_glowSphere, 0xFF), - OBJNAME("MR_Scrw", PROC_Obj_MirrorScrew, 0xFF), - OBJNAME("MR_Sand", PROC_Obj_MirrorSand, 0xFF), - OBJNAME("MR_Tble", PROC_Obj_MirrorTable, 0xFF), - OBJNAME("MR_Chin", PROC_Obj_MirrorChain, 0xFF), - OBJNAME("MR_Pole", PROC_Obj_Mirror6Pole, 0xFF), - OBJNAME("PPolamp", PROC_PPolamp, 0xFF), - OBJNAME("l5hYuka", PROC_Obj_Lv5FBoard, 0xFF), - OBJNAME("BYRock", PROC_BkyRock, 0xFF), - OBJNAME("zrDrock", PROC_Obj_zrTurara, 0xFF), - OBJNAME("tkrDai", PROC_Obj_TakaraDai, 0xFF), - OBJNAME("Table", PROC_Obj_Table, 0xFF), - OBJNAME("CatDoor", PROC_Obj_CatDoor, 0xFF), - OBJNAME("RetTag", PROC_Tag_RetRoom, 0xFF), - OBJNAME("WdStone", PROC_Obj_WindStone, 0xFF), - OBJNAME("HwlWara", PROC_Tag_WaraHowl, 0xFF), - OBJNAME("SCannon", PROC_Obj_SCannon, 0xFF), - OBJNAME("szGate", PROC_Obj_Lv6SzGate, 0xFF), - OBJNAME("onsTaru", PROC_Obj_OnsenTaru, 0xFF), - OBJNAME("WStoneF", PROC_Obj_SmWStone, 0xFF), - OBJNAME("SCanCrs", PROC_Obj_SCannonCrs, 0xFF), - OBJNAME("snwEfTg", PROC_Tag_SnowEff, 0xFF), - OBJNAME("tmFire", PROC_Obj_TimeFire, 0xFF), - OBJNAME("L7Prop", PROC_Obj_Prop, 0xFF), - OBJNAME("awaPlar", PROC_Obj_awaPlar, 0xFF), - OBJNAME("poTbox", PROC_Obj_poTbox, 0xFF), - OBJNAME("SnwSoup", PROC_Obj_SnowSoup, 0xFF), - OBJNAME("Nagaisu", PROC_Obj_Nagaisu, 0xFF), - OBJNAME("RCircle", PROC_Obj_RCircle, 0xFF), - OBJNAME("L9Chand", PROC_Obj_Chandelier, 0xFF), - OBJNAME("L9Pictr", PROC_Obj_Picture, 0xFF), - OBJNAME("SmkEmt", PROC_Tag_SmkEmt, 0xFF), - OBJNAME("HFtr", PROC_Obj_HFtr, 0xFF), - OBJNAME("HBarrel", PROC_Obj_HBarrel, 0xFF), - OBJNAME("SCanTen", PROC_Obj_SCannonTen, 0xFF), - OBJNAME("cstaSw", PROC_Tag_CstaSw, 0xFF), - OBJNAME("l6cstSw", PROC_Tag_Lv6CstaSw, 0xFF), - OBJNAME("Hata", PROC_Obj_Hata, 0xFF), - OBJNAME("RmbitSw", PROC_Tag_RmbitSw, 0xFF), - OBJNAME("T_Maki", PROC_Obj_ToaruMaki, 0xFF), - OBJNAME("d_act", PROC_DEMO00, 0xFF), + OBJNAME("VolcGnd", PROC_Obj_VolcGnd, -1), + OBJNAME("r09wtr", PROC_Obj_WaterEff, -1), + OBJNAME("ballSw", PROC_Obj_SwBallA, -1), + OBJNAME("lballSw", PROC_Obj_SwBallB, -1), + OBJNAME("lbsw", PROC_Obj_SwBallC, -1), + OBJNAME("R50Sand", PROC_Obj_Lv4Sand, -1), + OBJNAME("rwall", PROC_Obj_Lv4RailWall, -1), + OBJNAME("l4brg", PROC_Obj_Lv4Bridge, -1), + OBJNAME("l4floor", PROC_Obj_Lv4Floor, -1), + OBJNAME("item", PROC_ITEM, -1), + OBJNAME("itemKey", PROC_Obj_SmallKey, -1), + OBJNAME("kantera", PROC_Obj_Kantera, -1), + OBJNAME("witem", PROC_ITEM, -1), + OBJNAME("wshield", PROC_Obj_Shield, -1), + OBJNAME("htPiece", PROC_Obj_LifeContainer, -1), + OBJNAME("htCase", PROC_Obj_LifeContainer, -1), + OBJNAME("Mbrid15", PROC_Obj_RotBridge, -1), + OBJNAME("Mbrid9", PROC_Obj_RotBridge, -1), + OBJNAME("maglift", PROC_Obj_MagLift, -1), + OBJNAME("Cldst00", PROC_Obj_Lv1Cdl00, -1), + OBJNAME("Cldst01", PROC_Obj_Lv1Cdl01, -1), + OBJNAME("RMback0", PROC_Tag_Restart, -1), + OBJNAME("RMback1", PROC_Tag_ChgRestart, -1), + OBJNAME("Mist", PROC_Tag_Mist, -1), + OBJNAME("magLifR", PROC_Obj_MagLiftRot, -1), + OBJNAME("TCdlst", PROC_Obj_TvCdlst, -1), + OBJNAME("wdstick", PROC_Obj_WdStick, -1), + OBJNAME("stBlock", PROC_Obj_StairBlock, -1), + OBJNAME("hsMato", PROC_Obj_HsTarget, -1), + OBJNAME("ktFire", PROC_Tag_KtOnFire, -1), + OBJNAME("hswitch", PROC_Obj_HeavySw, -1), + OBJNAME("goGate", PROC_Obj_GoGate, -1), + OBJNAME("taAmi", PROC_Obj_TaFence, -1), + OBJNAME("fireWd", PROC_Obj_FireWood, -1), + OBJNAME("fireWd2", PROC_Obj_FireWood2, -1), + OBJNAME("altar", PROC_Obj_Saidan, -1), + OBJNAME("gpTaru", PROC_Obj_GpTaru, -1), + OBJNAME("spinLf", PROC_Obj_SpinLift, -1), + OBJNAME("bmWin", PROC_Obj_BmWindow, -1), + OBJNAME("roofHl", PROC_Obj_RfHole, -1), + OBJNAME("syRock", PROC_Obj_SyRock, -1), + OBJNAME("wColumn", PROC_Obj_WaterPillar, -1), + OBJNAME("kpot", PROC_Obj_KiPot, -1), + OBJNAME("bsGate", PROC_Obj_BsGate, -1), + OBJNAME("amiShut", PROC_Obj_AmiShutter, -1), + OBJNAME("kwhel00", PROC_Obj_KWheel00, -1), + OBJNAME("kwhel01", PROC_Obj_KWheel01, -1), + OBJNAME("PRElvtr", PROC_Obj_PRElvtr, -1), + OBJNAME("swhel00", PROC_Obj_KWheel00, -1), + OBJNAME("M_hasu", PROC_Obj_MHasu, -1), + OBJNAME("yiblltr", PROC_Obj_YIblltray, -1), + OBJNAME("l6egate", PROC_Obj_Lv6EGate, -1), + OBJNAME("l6eleva", PROC_Obj_Lv6ElevtA, -1), + OBJNAME("wtGate", PROC_Obj_WtGate, -1), + OBJNAME("candlL2", PROC_Obj_Lv2Candle, -1), + OBJNAME("togeTp", PROC_Obj_TogeTrap, -1), + OBJNAME("rotTrap", PROC_Obj_RotTrap, -1), + OBJNAME("klift00", PROC_Obj_KLift00, -1), + OBJNAME("l4chand", PROC_Obj_Lv4Chan, -1), + OBJNAME("Ychndlr", PROC_Obj_Ychndlr, -1), + OBJNAME("hbmbkoy", PROC_Obj_HBombkoya, -1), + OBJNAME("TagCsw", PROC_TAG_CSW, -1), + OBJNAME("TagCswO", PROC_TAG_CSW, -1), + OBJNAME("P_Rwall", PROC_Obj_Lv4PRwall, -1), + OBJNAME("PDtile", PROC_Obj_PDtile, -1), + OBJNAME("PDwall", PROC_Obj_PDwall, -1), + OBJNAME("Qs", PROC_TAG_QS, -1), + OBJNAME("mirror", PROC_MIRROR, -1), + OBJNAME("rGate", PROC_Obj_SwallShutter, -1), + OBJNAME("l3water", PROC_Obj_Lv3Water, -1), + OBJNAME("l3wat02", PROC_Obj_Lv3Water2, -1), + OBJNAME("l3watB", PROC_OBJ_LV3WATERB, -1), + OBJNAME("szbridg", PROC_Obj_SZbridge, -1), + OBJNAME("kjgjs", PROC_Obj_KJgjs, -1), + OBJNAME("kjs", PROC_Obj_KJgjs, -1), + OBJNAME("candlL3", PROC_Obj_Lv3Candle, -1), + OBJNAME("l5icewl", PROC_Obj_IceWall, -1), + OBJNAME("Turara", PROC_Obj_Turara, -1), + OBJNAME("twGate", PROC_Obj_TwGate, -1), + OBJNAME("L4cdlTg", PROC_Tag_Lv4Candle, -1), + OBJNAME("L4cddTg", PROC_Tag_Lv4CandleDm, -1), + OBJNAME("togeRol", PROC_Obj_Lv6TogeRoll, -1), + OBJNAME("l6TogeT", PROC_Obj_Lv6TogeTrap, -1), + OBJNAME("Tenbin", PROC_Obj_Lv6Tenbin, -1), + OBJNAME("l6Lblk", PROC_Obj_Lv6Lblock, -1), + OBJNAME("l6SwGt", PROC_Obj_Lv6SwGate, -1), + OBJNAME("l6ChBlk", PROC_Obj_Lv6ChgGate, -1), + OBJNAME("l6FuriT", PROC_Obj_Lv6FuriTrap, -1), + OBJNAME("KHdesk", PROC_Obj_BarDesk, -1), + OBJNAME("Ytaihou", PROC_Obj_Ytaihou, -1), + OBJNAME("L4eShut", PROC_Obj_Lv4EdShutter, -1), + OBJNAME("pofire", PROC_Obj_poFire, -1), + OBJNAME("pofiTg", PROC_Tag_poFire, -1), + OBJNAME("poCandl", PROC_Obj_poCandle, -1), + OBJNAME("L4Gate", PROC_Obj_Lv4Gate, -1), + OBJNAME("L4Pgate", PROC_Obj_Lv4PoGate, -1), + OBJNAME("L4SWall", PROC_Obj_Lv4SlideWall, -1), + OBJNAME("L4hmato", PROC_Obj_Lv4HsTarget, -1), + OBJNAME("propy", PROC_Obj_Lv7PropY, -1), + OBJNAME("L7BsGt", PROC_Obj_Lv7BsGate, -1), + OBJNAME("optLift", PROC_Obj_Lv8OptiLift, -1), + OBJNAME("kkiTrap", PROC_Obj_Lv8KekkaiTrap, -1), + OBJNAME("L8LiftX", PROC_Obj_Lv8Lift, -1), + OBJNAME("swStep", PROC_Obj_Lv8UdFloor, -1), + OBJNAME("L9SwSht", PROC_Obj_Lv9SwShutter, -1), + OBJNAME("L5SwIce", PROC_Obj_Lv5SwIce, -1), + OBJNAME("glwSph", PROC_Obj_glowSphere, -1), + OBJNAME("MR_Scrw", PROC_Obj_MirrorScrew, -1), + OBJNAME("MR_Sand", PROC_Obj_MirrorSand, -1), + OBJNAME("MR_Tble", PROC_Obj_MirrorTable, -1), + OBJNAME("MR_Chin", PROC_Obj_MirrorChain, -1), + OBJNAME("MR_Pole", PROC_Obj_Mirror6Pole, -1), + OBJNAME("PPolamp", PROC_PPolamp, -1), + OBJNAME("l5hYuka", PROC_Obj_Lv5FBoard, -1), + OBJNAME("BYRock", PROC_BkyRock, -1), + OBJNAME("zrDrock", PROC_Obj_zrTurara, -1), + OBJNAME("tkrDai", PROC_Obj_TakaraDai, -1), + OBJNAME("Table", PROC_Obj_Table, -1), + OBJNAME("CatDoor", PROC_Obj_CatDoor, -1), + OBJNAME("RetTag", PROC_Tag_RetRoom, -1), + OBJNAME("WdStone", PROC_Obj_WindStone, -1), + OBJNAME("HwlWara", PROC_Tag_WaraHowl, -1), + OBJNAME("SCannon", PROC_Obj_SCannon, -1), + OBJNAME("szGate", PROC_Obj_Lv6SzGate, -1), + OBJNAME("onsTaru", PROC_Obj_OnsenTaru, -1), + OBJNAME("WStoneF", PROC_Obj_SmWStone, -1), + OBJNAME("SCanCrs", PROC_Obj_SCannonCrs, -1), + OBJNAME("snwEfTg", PROC_Tag_SnowEff, -1), + OBJNAME("tmFire", PROC_Obj_TimeFire, -1), + OBJNAME("L7Prop", PROC_Obj_Prop, -1), + OBJNAME("awaPlar", PROC_Obj_awaPlar, -1), + OBJNAME("poTbox", PROC_Obj_poTbox, -1), + OBJNAME("SnwSoup", PROC_Obj_SnowSoup, -1), + OBJNAME("Nagaisu", PROC_Obj_Nagaisu, -1), + OBJNAME("RCircle", PROC_Obj_RCircle, -1), + OBJNAME("L9Chand", PROC_Obj_Chandelier, -1), + OBJNAME("L9Pictr", PROC_Obj_Picture, -1), + OBJNAME("SmkEmt", PROC_Tag_SmkEmt, -1), + OBJNAME("HFtr", PROC_Obj_HFtr, -1), + OBJNAME("HBarrel", PROC_Obj_HBarrel, -1), + OBJNAME("SCanTen", PROC_Obj_SCannonTen, -1), + OBJNAME("cstaSw", PROC_Tag_CstaSw, -1), + OBJNAME("l6cstSw", PROC_Tag_Lv6CstaSw, -1), + OBJNAME("Hata", PROC_Obj_Hata, -1), + OBJNAME("RmbitSw", PROC_Tag_RmbitSw, -1), + OBJNAME("T_Maki", PROC_Obj_ToaruMaki, -1), + OBJNAME("d_act", PROC_DEMO00, -1), OBJNAME("d_act0", PROC_DEMO00, 0x00), OBJNAME("d_act1", PROC_DEMO00, 0x01), OBJNAME("d_act2", PROC_DEMO00, 0x02), @@ -1070,45 +1070,45 @@ static dStage_objectNameInf l_objectName[] = { OBJNAME("d_act29", PROC_DEMO00, 0x1D), OBJNAME("d_act30", PROC_DEMO00, 0x1E), OBJNAME("d_act31", PROC_DEMO00, 0x1F), - OBJNAME("TLogo", PROC_TITLE, 0xFF), -#ifdef DEBUG - OBJNAME("unitC00", PROC_Obj_TestCube, 0xFF), - OBJNAME("unitS00", PROC_Obj_TestCube, 0xFF), - OBJNAME("unitCy0", PROC_Obj_TestCube, 0xFF), - OBJNAME("damCps", PROC_Obj_DamCps, 0xFF), - OBJNAME("railDrw", PROC_PATH_LINE, 0xFF), - OBJNAME("sdoor", PROC_SPIRAL_DOOR, 0xFF), + OBJNAME("TLogo", PROC_TITLE, -1), +#if DEBUG + OBJNAME("unitC00", PROC_Obj_TestCube, -1), + OBJNAME("unitS00", PROC_Obj_TestCube, -1), + OBJNAME("unitCy0", PROC_Obj_TestCube, -1), + OBJNAME("damCps", PROC_Obj_DamCps, -1), + OBJNAME("railDrw", PROC_PATH_LINE, -1), + OBJNAME("sdoor", PROC_SPIRAL_DOOR, -1), #endif - OBJNAME("ClearB", PROC_Obj_Cboard, 0xFF), - OBJNAME("Bg", PROC_BG, 0xFF), - OBJNAME("Boom", PROC_BOOMERANG, 0xFF), - OBJNAME("Nbomb", PROC_NBOMB, 0xFF), - OBJNAME("Arrow", PROC_ARROW, 0xFF), - OBJNAME("E_Arrow", PROC_E_ARROW, 0xFF), - OBJNAME("Spinner", PROC_SPINNER, 0xFF), - OBJNAME("Crod", PROC_CROD, 0xFF), - OBJNAME("Midna", PROC_MIDNA, 0xFF), - OBJNAME("Vrbox", PROC_VRBOX, 0xFF), - OBJNAME("Vrbox2", PROC_VRBOX2, 0xFF), - OBJNAME("mvbg_a", PROC_BG_OBJ, 0xFF), - OBJNAME("burnBox", PROC_Obj_BurnBox, 0xFF), - OBJNAME("stnMark", PROC_Obj_StoneMark, 0xFF), -#ifndef DEBUG - OBJNAME("Passer", PROC_NPC_PASSER, 0xFF), + OBJNAME("ClearB", PROC_Obj_Cboard, -1), + OBJNAME("Bg", PROC_BG, -1), + OBJNAME("Boom", PROC_BOOMERANG, -1), + OBJNAME("Nbomb", PROC_NBOMB, -1), + OBJNAME("Arrow", PROC_ARROW, -1), + OBJNAME("E_Arrow", PROC_E_ARROW, -1), + OBJNAME("Spinner", PROC_SPINNER, -1), + OBJNAME("Crod", PROC_CROD, -1), + OBJNAME("Midna", PROC_MIDNA, -1), + OBJNAME("Vrbox", PROC_VRBOX, -1), + OBJNAME("Vrbox2", PROC_VRBOX2, -1), + OBJNAME("mvbg_a", PROC_BG_OBJ, -1), + OBJNAME("burnBox", PROC_Obj_BurnBox, -1), + OBJNAME("stnMark", PROC_Obj_StoneMark, -1), +#if !DEBUG + OBJNAME("Passer", PROC_NPC_PASSER, -1), #endif - OBJNAME("Passer2", PROC_NPC_PASSER2, 0xFF), - OBJNAME("ShopItm", PROC_ShopItem, 0xFF), - OBJNAME("E_yd_lf", PROC_E_YD_LEAF, 0xFF), - OBJNAME("E_db_lf", PROC_E_DB_LEAF, 0xFF), - OBJNAME("E_hb_lf", PROC_E_HB_LEAF, 0xFF), - OBJNAME("E_bi_lf", PROC_E_BI_LEAF, 0xFF), - OBJNAME("O_Mato", PROC_Obj_Mato, 0xFF), - OBJNAME("O_Flag", PROC_Obj_Flag, 0xFF), - OBJNAME("O_Flag2", PROC_Obj_Flag2, 0xFF), - OBJNAME("O_Flag3", PROC_Obj_Flag3, 0xFF), - OBJNAME("CRVLH_U", PROC_Obj_CRVLH_UP, 0xFF), - OBJNAME("DemoItm", PROC_Demo_Item, 0xFF), - OBJNAME("EndCode", PROC_PLAY_SCENE, 0xFF), + OBJNAME("Passer2", PROC_NPC_PASSER2, -1), + OBJNAME("ShopItm", PROC_ShopItem, -1), + OBJNAME("E_yd_lf", PROC_E_YD_LEAF, -1), + OBJNAME("E_db_lf", PROC_E_DB_LEAF, -1), + OBJNAME("E_hb_lf", PROC_E_HB_LEAF, -1), + OBJNAME("E_bi_lf", PROC_E_BI_LEAF, -1), + OBJNAME("O_Mato", PROC_Obj_Mato, -1), + OBJNAME("O_Flag", PROC_Obj_Flag, -1), + OBJNAME("O_Flag2", PROC_Obj_Flag2, -1), + OBJNAME("O_Flag3", PROC_Obj_Flag3, -1), + OBJNAME("CRVLH_U", PROC_Obj_CRVLH_UP, -1), + OBJNAME("DemoItm", PROC_Demo_Item, -1), + OBJNAME("EndCode", PROC_PLAY_SCENE, -1), }; // clang-format on @@ -1398,7 +1398,7 @@ void dStage_stageDt_c::init() { mElst = NULL; mWorldRollAngleX = 0; mWorldRollDirAngleY = 0; -#ifdef DEBUG +#if DEBUG mPaletteNumInfo = 0; mPselectNumInfo = 0; mVrboxNumInfo = 0; @@ -1432,7 +1432,7 @@ void dStage_roomDt_c::init() { mDrTg = NULL; mDoor = NULL; mFloorInfo = NULL; -#ifdef DEBUG +#if DEBUG field_0x60 = 0; #endif } @@ -1519,7 +1519,7 @@ dStage_roomControl_c::nameData* dStage_roomControl_c::mArcBankName; dStage_roomControl_c::bankData* dStage_roomControl_c::mArcBankData; -s8 dStage_roomControl_c::mRoomReadId = 0xFF; +s8 dStage_roomControl_c::mRoomReadId = -1; static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_class* i_actorPrm) { dStage_objectNameInf* actorInf = dStage_searchName(i_actorData->name); diff --git a/src/dolphin/ai/ai.c b/src/dolphin/ai/ai.c index c9c38ee265..f731c4e210 100644 --- a/src/dolphin/ai/ai.c +++ b/src/dolphin/ai/ai.c @@ -5,7 +5,7 @@ #include "__gx.h" -#ifdef DEBUG +#if DEBUG const char* __AIVersion = "<< Dolphin SDK - AI\tdebug build: Apr 5 2004 03:56:18 (0x2301) >>"; #else const char* __AIVersion = "<< Dolphin SDK - AI\trelease build: Apr 5 2004 04:15:02 (0x2301) >>"; @@ -317,7 +317,7 @@ static void __AIDHandler(__OSInterrupt interrupt, OSContext* context) { OSSetCurrentContext(context); } -static asm void __AICallbackStackSwitch(register void* cb) { +static asm void __AICallbackStackSwitch(__REGISTER void* cb) { nofralloc mflr r0 stw r0, 0x4(r1) diff --git a/src/dolphin/am/am.c b/src/dolphin/am/am.c index 56350a9c3a..ba3fd2e4b7 100644 --- a/src/dolphin/am/am.c +++ b/src/dolphin/am/am.c @@ -130,7 +130,7 @@ u32 AMPush(char* path) { OSFree(buffer); return ret_val; } else { -#ifdef DEBUG +#if DEBUG OSReport("AMPush(): WARNING: File has zero length.\n"); #endif return 0; @@ -234,13 +234,13 @@ u32 __AMPushBuffered(char* path, void* buffer, u32 buffer_size, AMCallback callb } } } else { -#ifdef DEBUG +#if DEBUG OSReport("AMPushBuffered(): WARNING: Not enough space in ARAM.\n"); #endif return 0; } } else { -#ifdef DEBUG +#if DEBUG OSReport("AMPushBuffered(): WARNING: Stack table is full.\n"); #endif return 0; diff --git a/src/dolphin/ar/ar.c b/src/dolphin/ar/ar.c index d431eebbc1..a7c9400fc5 100644 --- a/src/dolphin/ar/ar.c +++ b/src/dolphin/ar/ar.c @@ -4,7 +4,7 @@ #include "__ar.h" -#ifdef DEBUG +#if DEBUG const char* __ARVersion = "<< Dolphin SDK - AR\tdebug build: Apr 5 2004 03:56:19 (0x2301) >>"; #else const char* __ARVersion = "<< Dolphin SDK - AR\trelease build: Apr 5 2004 04:15:03 (0x2301) >>"; @@ -134,7 +134,7 @@ void ARReset(void) { } void ARSetSize(void) { -#ifdef DEBUG +#if DEBUG OSReport("ARSetSize(): I don't do anything anymore!\n"); #endif } @@ -405,7 +405,7 @@ static void __ARChecksize(void) { } } -#ifdef DEBUG +#if DEBUG OSReport("__ARChecksize(): ARAM Expansion present.\n"); #endif __DSPRegs[9] = (u16)((__DSPRegs[9] & ~(0x07 | 0x38)) | ARAM_mode); diff --git a/src/dolphin/ar/arq.c b/src/dolphin/ar/arq.c index 1adf24bbba..baf3acead4 100644 --- a/src/dolphin/ar/arq.c +++ b/src/dolphin/ar/arq.c @@ -3,7 +3,7 @@ #include "__ar.h" -#ifdef DEBUG +#if DEBUG const char* __ARQVersion = "<< Dolphin SDK - ARQ\tdebug build: Apr 5 2004 03:56:20 (0x2301) >>"; #else const char* __ARQVersion = "<< Dolphin SDK - ARQ\trelease build: Apr 5 2004 04:15:04 (0x2301) >>"; diff --git a/src/dolphin/ax/AX.c b/src/dolphin/ax/AX.c index bc579464d5..eb06c5906d 100644 --- a/src/dolphin/ax/AX.c +++ b/src/dolphin/ax/AX.c @@ -3,7 +3,7 @@ #include "__ax.h" -#ifdef DEBUG +#if DEBUG const char* __AXVersion = "<< Dolphin SDK - AX\tdebug build: Apr 5 2004 03:56:21 (0x2301) >>"; #else const char* __AXVersion = "<< Dolphin SDK - AX\trelease build: Apr 5 2004 04:15:05 (0x2301) >>"; @@ -14,7 +14,7 @@ void AXInit(void) { } void AXInitEx(u32 outputBufferMode) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AX\n"); #endif OSRegisterVersion(__AXVersion); @@ -28,7 +28,7 @@ void AXInitEx(u32 outputBufferMode) { } void AXQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AX\n"); #endif __AXAllocQuit(); diff --git a/src/dolphin/ax/AXAlloc.c b/src/dolphin/ax/AXAlloc.c index 66b3f0331e..3fcd6278c1 100644 --- a/src/dolphin/ax/AXAlloc.c +++ b/src/dolphin/ax/AXAlloc.c @@ -59,14 +59,14 @@ void __AXInitVoiceStacks(void) { } void __AXAllocInit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXAlloc code module\n"); #endif __AXInitVoiceStacks(); } void __AXAllocQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXAlloc code module\n"); #endif __AXInitVoiceStacks(); diff --git a/src/dolphin/ax/AXAux.c b/src/dolphin/ax/AXAux.c index 094dac46a9..7c3294d1a6 100644 --- a/src/dolphin/ax/AXAux.c +++ b/src/dolphin/ax/AXAux.c @@ -25,7 +25,7 @@ void __AXAuxInit(void) { s32* pA; s32* pB; -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXAux code module\n"); #endif __AXCallbackAuxA = NULL; @@ -48,7 +48,7 @@ void __AXAuxInit(void) { } void __AXAuxQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXAux code module\n"); #endif __AXCallbackAuxA = NULL; diff --git a/src/dolphin/ax/AXCL.c b/src/dolphin/ax/AXCL.c index 05107a5f75..e51eb3d311 100644 --- a/src/dolphin/ax/AXCL.c +++ b/src/dolphin/ax/AXCL.c @@ -144,7 +144,7 @@ void __AXNextFrame(void* sbuffer, void* buffer) { } void __AXClInit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXCL code module\n"); #endif ASSERTLINE(338, ((u32)&__AXCommandList[0][0] & 0x1F) == 0); @@ -156,7 +156,7 @@ void __AXClInit(void) { } void __AXClQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXCL code module\n"); #endif } diff --git a/src/dolphin/ax/AXOut.c b/src/dolphin/ax/AXOut.c index e0649ba3b8..b7402c4966 100644 --- a/src/dolphin/ax/AXOut.c +++ b/src/dolphin/ax/AXOut.c @@ -170,7 +170,7 @@ void __AXOutInitDSP(void) { } void __AXOutInit(u32 outputBufferMode) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXOut code module\n"); #endif ASSERTLINE(404, ((u32)&__AXOutBuffer[0][0] & 0x1F) == 0); @@ -214,7 +214,7 @@ void __AXOutInit(u32 outputBufferMode) { void __AXOutQuit(void) { BOOL old; -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXOut code module\n"); #endif old = OSDisableInterrupts(); diff --git a/src/dolphin/ax/AXSPB.c b/src/dolphin/ax/AXSPB.c index 3ff765d1d5..829c8ef35a 100644 --- a/src/dolphin/ax/AXSPB.c +++ b/src/dolphin/ax/AXSPB.c @@ -58,7 +58,7 @@ void __AXPrintStudio(void) { } void __AXSPBInit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXSPB code module\n"); #endif __AXSpbAL = @@ -73,7 +73,7 @@ void __AXSPBInit(void) { } void __AXSPBQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXSPB code module\n"); #endif } diff --git a/src/dolphin/ax/AXVPB.c b/src/dolphin/ax/AXVPB.c index eba17fd686..bd6ffe02aa 100644 --- a/src/dolphin/ax/AXVPB.c +++ b/src/dolphin/ax/AXVPB.c @@ -472,7 +472,7 @@ void __AXVPBInit(void) { AXVPB* pvpb; u32* p; -#ifdef DEBUG +#if DEBUG OSReport("Initializing AXVPB code module\n"); #endif __AXMaxDspCycles = OS_BUS_CLOCK / 400; @@ -536,7 +536,7 @@ void __AXVPBInit(void) { } void __AXVPBQuit(void) { -#ifdef DEBUG +#if DEBUG OSReport("Shutting down AXVPB code module\n"); #endif } diff --git a/src/dolphin/axart/axartsound.c b/src/dolphin/axart/axartsound.c index 732171dbb0..3537849197 100644 --- a/src/dolphin/axart/axartsound.c +++ b/src/dolphin/axart/axartsound.c @@ -94,7 +94,7 @@ void AXARTServiceSound(AXART_SOUND* sound) { AXARTLpf((AXART_LPF*)articulator, sound->axvpb); break; default: -#ifdef DEBUG +#if DEBUG OSPanic(__FILE__, 196, "unknown articulator type!\n"); #endif break; diff --git a/src/dolphin/axfx/chorus.c b/src/dolphin/axfx/chorus.c index 56bcffca8d..f383a03b36 100644 --- a/src/dolphin/axfx/chorus.c +++ b/src/dolphin/axfx/chorus.c @@ -116,7 +116,7 @@ const static double i2fMagic = 4503601774854144.0; static void do_src1(AXFX_CHORUS_SRCINFO* src); static void do_src2(AXFX_CHORUS_SRCINFO* src); -asm static void do_src1(register AXFX_CHORUS_SRCINFO* src) { +asm static void do_src1(__REGISTER AXFX_CHORUS_SRCINFO* src) { nofralloc stwu r1, -64(r1) stmw r26, 40(r1) @@ -227,7 +227,7 @@ L_00000160: blr } -asm static void do_src2(register AXFX_CHORUS_SRCINFO* src) { +asm static void do_src2(__REGISTER AXFX_CHORUS_SRCINFO* src) { nofralloc stwu r1, -64(r1) stmw r26, 40(r1) diff --git a/src/dolphin/axfx/reverb_hi.c b/src/dolphin/axfx/reverb_hi.c index f7707000d8..02283ac476 100644 --- a/src/dolphin/axfx/reverb_hi.c +++ b/src/dolphin/axfx/reverb_hi.c @@ -186,7 +186,7 @@ const static f32 value1_0 = 1.0f; const static f32 value0_3 = 0.3f; const static f32 value0_6 = 0.6f; -asm static void DoCrossTalk(register s32* l, register s32* r, register f32 cross, register f32 invcross) { +asm static void DoCrossTalk(__REGISTER s32* l, __REGISTER s32* r, __REGISTER f32 cross, __REGISTER f32 invcross) { nofralloc stwu r1, -48(r1) stfd f14, 40(r1) @@ -291,7 +291,7 @@ loop: blr } -asm static void HandleReverb(register s32* sptr, register AXFX_REVHI_WORK* rv, register s32 k) { +asm static void HandleReverb(__REGISTER s32* sptr, __REGISTER AXFX_REVHI_WORK* rv, __REGISTER s32 k) { nofralloc stwu r1, -0xc0(r1) stmw r14, 0x8(r1) diff --git a/src/dolphin/axfx/reverb_hi_4ch.c b/src/dolphin/axfx/reverb_hi_4ch.c index df10073336..a840dfee15 100644 --- a/src/dolphin/axfx/reverb_hi_4ch.c +++ b/src/dolphin/axfx/reverb_hi_4ch.c @@ -176,7 +176,7 @@ const static f32 value0_6 = 0.6f; const static f32 value0_3 = 0.3f; const static double i2fMagic = 4503601774854144.0; -asm static void HandleReverbDpl2(register s32* sptr, register AXFX_REVHI_WORK_DPL2* rv, register s32 k) { +asm static void HandleReverbDpl2(__REGISTER s32* sptr, __REGISTER AXFX_REVHI_WORK_DPL2* rv, __REGISTER s32 k) { nofralloc stwu r1, -0xc0(r1) stmw r14, 0x8(r1) diff --git a/src/dolphin/axfx/reverb_std.c b/src/dolphin/axfx/reverb_std.c index 6703890a76..960c68c514 100644 --- a/src/dolphin/axfx/reverb_std.c +++ b/src/dolphin/axfx/reverb_std.c @@ -170,7 +170,7 @@ const static f32 value0_3 = 0.3f; const static f32 value0_6 = 0.6f; const static double i2fMagic = 4503601774854144.0; -asm static void HandleReverb(register s32* sptr, register AXFX_REVSTD_WORK* rv) { +asm static void HandleReverb(__REGISTER s32* sptr, __REGISTER AXFX_REVSTD_WORK* rv) { nofralloc stwu r1, -144(r1) stmw r17, 8(r1) diff --git a/src/dolphin/base/PPCArch.c b/src/dolphin/base/PPCArch.c index 511f1022e9..b23dc209ee 100644 --- a/src/dolphin/base/PPCArch.c +++ b/src/dolphin/base/PPCArch.c @@ -7,27 +7,27 @@ asm u32 PPCMfmsr() { blr } -asm void PPCMtmsr(register u32 newMSR) { +asm void PPCMtmsr(__REGISTER u32 newMSR) { nofralloc mtmsr newMSR blr } -asm u32 PPCOrMsr(register u32 value) { +asm u32 PPCOrMsr(__REGISTER u32 value) { nofralloc mfmsr r4 or value, r4, value blr } -asm u32 PPCAndMsr(register u32 value) { +asm u32 PPCAndMsr(__REGISTER u32 value) { nofralloc mfmsr r4 and value, r4, value blr } -asm u32 PPCAndCMsr(register u32 value) { +asm u32 PPCAndCMsr(__REGISTER u32 value) { nofralloc mfmsr r4 andc value, r4, value @@ -40,7 +40,7 @@ asm u32 PPCMfhid0() { blr } -asm void PPCMthid0(register u32 newHID0) { +asm void PPCMthid0(__REGISTER u32 newHID0) { nofralloc mtspr HID0, newHID0 blr @@ -58,13 +58,13 @@ asm u32 PPCMfl2cr() { blr } -asm void PPCMtl2cr(register u32 newL2cr) { +asm void PPCMtl2cr(__REGISTER u32 newL2cr) { nofralloc mtspr L2CR, newL2cr blr } -asm void PPCMtdec(register u32 newDec) { +asm void PPCMtdec(__REGISTER u32 newDec) { nofralloc mtdec newDec blr @@ -115,7 +115,7 @@ asm u32 PPCMfmmcr0() { blr } -asm void PPCMtmmcr0(register u32 newMmcr0) { +asm void PPCMtmmcr0(__REGISTER u32 newMmcr0) { nofralloc mtspr MMCR0, newMmcr0 blr @@ -127,7 +127,7 @@ asm u32 PPCMfmmcr1() { blr } -asm void PPCMtmmcr1(register u32 newMmcr1) { +asm void PPCMtmmcr1(__REGISTER u32 newMmcr1) { nofralloc mtspr MMCR1, newMmcr1 blr @@ -139,7 +139,7 @@ asm u32 PPCMfpmc1() { blr } -asm void PPCMtpmc1(register u32 newPmc1) { +asm void PPCMtpmc1(__REGISTER u32 newPmc1) { nofralloc mtspr PMC1, newPmc1 blr @@ -151,7 +151,7 @@ asm u32 PPCMfpmc2() { blr } -asm void PPCMtpmc2(register u32 newPmc2) { +asm void PPCMtpmc2(__REGISTER u32 newPmc2) { nofralloc mtspr PMC2, newPmc2 blr @@ -163,7 +163,7 @@ asm u32 PPCMfpmc3() { blr } -asm void PPCMtpmc3(register u32 newPmc3) { +asm void PPCMtpmc3(__REGISTER u32 newPmc3) { nofralloc mtspr PMC3, newPmc3 blr @@ -175,7 +175,7 @@ asm u32 PPCMfpmc4() { blr } -asm void PPCMtpmc4(register u32 newPmc4) { +asm void PPCMtpmc4(__REGISTER u32 newPmc4) { nofralloc mtspr PMC4, newPmc4 blr @@ -187,7 +187,7 @@ asm u32 PPCMfsia() { blr } -asm void PPCMtsia(register u32 newSia) { +asm void PPCMtsia(__REGISTER u32 newSia) { nofralloc mtspr SIA, newSia blr @@ -204,7 +204,7 @@ u32 PPCMffpscr() { return m.u.fpscr; } -void PPCMtfpscr(register u32 newFPSCR) { +void PPCMtfpscr(__REGISTER u32 newFPSCR) { union FpscrUnion m; asm { @@ -222,7 +222,7 @@ asm u32 PPCMfhid2() { blr } -asm void PPCMthid2(register u32 newhid2) { +asm void PPCMthid2(__REGISTER u32 newhid2) { nofralloc mtspr HID2, newhid2 blr @@ -235,7 +235,7 @@ asm u32 PPCMfwpar() { blr } -asm void PPCMtwpar(register u32 newwpar) { +asm void PPCMtwpar(__REGISTER u32 newwpar) { nofralloc mtspr WPAR, newwpar blr @@ -253,13 +253,13 @@ asm u32 PPCMfdmaL() { blr } -asm void PPCMtdmaU(register u32 newdmau) { +asm void PPCMtdmaU(__REGISTER u32 newdmau) { nofralloc mtspr DMA_U, newdmau blr } -asm void PPCMtdmaL(register u32 newdmal) { +asm void PPCMtdmaL(__REGISTER u32 newdmal) { nofralloc mtspr DMA_L, newdmal blr diff --git a/src/dolphin/dsp/dsp.c b/src/dolphin/dsp/dsp.c index d5570b1f77..3c4177a7b7 100644 --- a/src/dolphin/dsp/dsp.c +++ b/src/dolphin/dsp/dsp.c @@ -11,7 +11,7 @@ #define BUILD_TIME "04:15:32" #endif -#ifdef DEBUG +#if DEBUG const char* __DSPVersion = "<< Dolphin SDK - DSP\tdebug build: Apr 5 2004 03:56:49 (0x2301) >>"; #else const char* __DSPVersion = "<< Dolphin SDK - DSP\trelease build: Apr 5 2004 04:15:32 (0x2301) >>"; diff --git a/src/dolphin/dvd/dvd.c b/src/dolphin/dvd/dvd.c index 3b7e9704a3..003be19cf6 100644 --- a/src/dolphin/dvd/dvd.c +++ b/src/dolphin/dvd/dvd.c @@ -10,7 +10,7 @@ extern void __DVDPrintFatalMessage(); extern int DVDCompareDiskID(const struct DVDDiskID * id1 /* r29 */, const struct DVDDiskID * id2 /* r30 */); extern int __DVDLowTestAlarm(const OSAlarm * alarm /* r3 */); -#ifdef DEBUG +#if DEBUG const char* __DVDVersion = "<< Dolphin SDK - DVD\tdebug build: Apr 5 2004 03:56:07 (0x2301) >>"; #else const char* __DVDVersion = "<< Dolphin SDK - DVD\trelease build: Apr 5 2004 04:14:51 (0x2301) >>"; diff --git a/src/dolphin/dvd/dvdidutils.c b/src/dolphin/dvd/dvdidutils.c index a702a657fe..64e533ea43 100644 --- a/src/dolphin/dvd/dvdidutils.c +++ b/src/dolphin/dvd/dvdidutils.c @@ -16,7 +16,7 @@ static u32 strnlen(const char* str, u32 maxlen) { } int DVDCompareDiskID(const DVDDiskID* id1, const DVDDiskID* id2) { -#ifdef DEBUG +#if DEBUG const char* game1; const char* game2; const char* company1; diff --git a/src/dolphin/dvd/dvdlow.c b/src/dolphin/dvd/dvdlow.c index 79dca99cb4..9e2c834f37 100644 --- a/src/dolphin/dvd/dvdlow.c +++ b/src/dolphin/dvd/dvdlow.c @@ -414,7 +414,7 @@ BOOL DVDLowRequestAudioStatus(u32 subcmd, DVDLowCallback callback) { } BOOL DVDLowAudioBufferConfig(BOOL enable, u32 size, DVDLowCallback callback) { -#ifdef DEBUG +#if DEBUG u32 bufSize; u32 trigger; #endif @@ -422,7 +422,7 @@ BOOL DVDLowAudioBufferConfig(BOOL enable, u32 size, DVDLowCallback callback) { Callback = callback; StopAtNextInt = FALSE; -#ifdef DEBUG +#if DEBUG bufSize = size & 0xF; trigger = (size >> 4) & 0xF; ASSERTLINE(1242, bufSize < 16); diff --git a/src/dolphin/gx/GXAttr.c b/src/dolphin/gx/GXAttr.c index 136661d6df..00ad9e34fb 100644 --- a/src/dolphin/gx/GXAttr.c +++ b/src/dolphin/gx/GXAttr.c @@ -23,7 +23,7 @@ static void __GXXfVtxSpecs(void) { nNrm = __GXData->hasBiNrms ? 2 : __GXData->hasNrms ? 1 : 0; -#ifdef DEBUG +#if DEBUG nCols = GET_REG_FIELD(__GXData->vcdLo, 2, 13) ? 1 : 0; nCols += GET_REG_FIELD(__GXData->vcdLo, 2, 15) ? 1 : 0; #else @@ -31,7 +31,7 @@ static void __GXXfVtxSpecs(void) { nCols /= 2; #endif -#ifdef DEBUG +#if DEBUG nTex = 0; nTex += GET_REG_FIELD(__GXData->vcdHi, 2, 0) ? 1 : 0; nTex += GET_REG_FIELD(__GXData->vcdHi, 2, 2) ? 1 : 0; @@ -332,7 +332,7 @@ void GXSetVtxAttrFmt(GXVtxFmt vtxfmt, GXAttr attr, GXCompCnt cnt, GXCompType typ vc = &__GXData->vatC[vtxfmt]; SETVAT(va, vb, vc, attr, cnt, type, frac); -#ifdef DEBUG +#if DEBUG __GXVerifyVATImm(attr, cnt, type, frac); #endif @@ -357,7 +357,7 @@ void GXSetVtxAttrFmtv(GXVtxFmt vtxfmt, const GXVtxAttrFmtList* list) { CHECK_ATTRNAME4(725, list->attr); CHECK_FRAC(726, list->frac); SETVAT(va, vb, vc, list->attr, list->cnt, list->type, list->frac); -#ifdef DEBUG +#if DEBUG __GXVerifyVATImm(list->attr, list->cnt, list->type, list->frac); #endif list++; diff --git a/src/dolphin/gx/GXDisplayList.c b/src/dolphin/gx/GXDisplayList.c index ff53e8a8f2..667b31df40 100644 --- a/src/dolphin/gx/GXDisplayList.c +++ b/src/dolphin/gx/GXDisplayList.c @@ -40,7 +40,7 @@ void GXBeginDisplayList(void* list, u32 size) { u32 GXEndDisplayList(void) { u32 ov; -#ifdef DEBUG +#if DEBUG u32 reg; #endif BOOL enabled; @@ -49,7 +49,7 @@ u32 GXEndDisplayList(void) { CHECK_GXBEGIN(195, "GXEndDisplayList"); ASSERTMSGLINE(196, __GXData->inDispList == TRUE, "GXEndDisplayList: no display list in progress"); GXFlush(); -#ifdef DEBUG +#if DEBUG reg = GX_GET_PI_REG(5); ov = (reg >> 26) & 1; #else diff --git a/src/dolphin/gx/GXInit.c b/src/dolphin/gx/GXInit.c index 681952d13f..53f7f0cc1a 100644 --- a/src/dolphin/gx/GXInit.c +++ b/src/dolphin/gx/GXInit.c @@ -17,7 +17,7 @@ #define RBUILD_TIME "06:27:12" #endif -#ifdef DEBUG +#if DEBUG const char* __GXVersion = "<< Dolphin SDK - GX\tdebug build: "BUILD_DATE" "DBUILD_TIME" (0x2301) >>"; #else const char* __GXVersion = "<< Dolphin SDK - GX\trelease build: "BUILD_DATE" "RBUILD_TIME" (0x2301) >>"; diff --git a/src/dolphin/gx/GXLight.c b/src/dolphin/gx/GXLight.c index d1b005d23f..78418c02c2 100644 --- a/src/dolphin/gx/GXLight.c +++ b/src/dolphin/gx/GXLight.c @@ -319,10 +319,10 @@ static inline u32 ConvLightID2Num(GXLightID id) { } } -static inline void PushLight(const register GXLightObj* lt_obj, register void* dest) { - register u32 zero, color; - register f32 a0_a1, a2_k0, k1_k2; - register f32 px_py, pz_dx, dy_dz; +static inline void PushLight(const __REGISTER GXLightObj* lt_obj, __REGISTER void* dest) { + __REGISTER u32 zero, color; + __REGISTER f32 a0_a1, a2_k0, k1_k2; + __REGISTER f32 px_py, pz_dx, dy_dz; #ifdef __MWERKS__ // clang-format off asm { lwz color, 12(lt_obj) diff --git a/src/dolphin/gx/GXTransform.c b/src/dolphin/gx/GXTransform.c index e454017a62..81334236af 100644 --- a/src/dolphin/gx/GXTransform.c +++ b/src/dolphin/gx/GXTransform.c @@ -32,9 +32,10 @@ void GXProject(f32 x, f32 y, f32 z, const Mtx mtx, const f32* pm, const f32* vp, *sz = vp[5] + (wc * (zc * (vp[5] - vp[4]))); } -static void WriteProjPS(const register f32 proj[6], register volatile void* dest) { - register f32 p01, p23, p45; +static void WriteProjPS(const __REGISTER f32 proj[6], __REGISTER volatile void* dest) { + __REGISTER f32 p01, p23, p45; +#ifdef __MWERKS__ asm { psq_l p01, 0(proj), 0, 0 psq_l p23, 8(proj), 0, 0 @@ -43,10 +44,11 @@ static void WriteProjPS(const register f32 proj[6], register volatile void* dest psq_st p23, 0(dest), 0, 0 psq_st p45, 0(dest), 0, 0 } +#endif } -static void Copy6Floats(const register f32 src[6], register volatile f32* dest) { - register f32 ps01, ps23, ps45; +static void Copy6Floats(const __REGISTER f32 src[6], __REGISTER volatile f32* dest) { + __REGISTER f32 ps01, ps23, ps45; asm { psq_l ps01, 0(src), 0, 0 @@ -135,13 +137,13 @@ void GXGetProjectionv(f32* ptr) { #endif } -static void WriteMTXPS4x3(const register f32 mtx[3][4], register volatile f32* dest) { - register f32 a00_a01; - register f32 a02_a03; - register f32 a10_a11; - register f32 a12_a13; - register f32 a20_a21; - register f32 a22_a23; +static void WriteMTXPS4x3(const __REGISTER f32 mtx[3][4], __REGISTER volatile f32* dest) { + __REGISTER f32 a00_a01; + __REGISTER f32 a02_a03; + __REGISTER f32 a10_a11; + __REGISTER f32 a12_a13; + __REGISTER f32 a20_a21; + __REGISTER f32 a22_a23; asm { psq_l a00_a01, 0x00(mtx), 0, qr0 @@ -159,13 +161,13 @@ static void WriteMTXPS4x3(const register f32 mtx[3][4], register volatile f32* d } } -static void WriteMTXPS3x3from3x4(register f32 mtx[3][4], register volatile f32* dest) { - register f32 a00_a01; - register f32 a02_a03; - register f32 a10_a11; - register f32 a12_a13; - register f32 a20_a21; - register f32 a22_a23; +static void WriteMTXPS3x3from3x4(__REGISTER f32 mtx[3][4], __REGISTER volatile f32* dest) { + __REGISTER f32 a00_a01; + __REGISTER f32 a02_a03; + __REGISTER f32 a10_a11; + __REGISTER f32 a12_a13; + __REGISTER f32 a20_a21; + __REGISTER f32 a22_a23; asm { psq_l a00_a01, 0x00(mtx), 0, qr0 @@ -183,12 +185,12 @@ static void WriteMTXPS3x3from3x4(register f32 mtx[3][4], register volatile f32* } } -static void WriteMTXPS3x3(register f32 mtx[3][3], register volatile f32* dest) { - register f32 a00_a01; - register f32 a02_a10; - register f32 a11_a12; - register f32 a20_a21; - register f32 a22_nnn; +static void WriteMTXPS3x3(__REGISTER f32 mtx[3][3], __REGISTER volatile f32* dest) { + __REGISTER f32 a00_a01; + __REGISTER f32 a02_a10; + __REGISTER f32 a11_a12; + __REGISTER f32 a20_a21; + __REGISTER f32 a22_nnn; asm { psq_l a00_a01, 0x00(mtx), 0, qr0 @@ -204,11 +206,11 @@ static void WriteMTXPS3x3(register f32 mtx[3][3], register volatile f32* dest) { } } -static void WriteMTXPS4x2(const register f32 mtx[2][4], register volatile f32* dest) { - register f32 a00_a01; - register f32 a02_a03; - register f32 a10_a11; - register f32 a12_a13; +static void WriteMTXPS4x2(const __REGISTER f32 mtx[2][4], __REGISTER volatile f32* dest) { + __REGISTER f32 a00_a01; + __REGISTER f32 a02_a03; + __REGISTER f32 a10_a11; + __REGISTER f32 a12_a13; asm { psq_l a00_a01, 0x00(mtx), 0, qr0 diff --git a/src/dolphin/gx/__gx.h b/src/dolphin/gx/__gx.h index 20a85d2cc3..ab852bb66b 100644 --- a/src/dolphin/gx/__gx.h +++ b/src/dolphin/gx/__gx.h @@ -121,7 +121,7 @@ do { \ VERIF_RAS_REG(value); \ } while (0) -#ifdef DEBUG +#if DEBUG #define GX_WRITE_SOME_REG2(a, b, c, addr) \ do { \ long regAddr; \ @@ -142,7 +142,7 @@ do { \ } while (0) #endif -#ifdef DEBUG +#if DEBUG #define GX_WRITE_SOME_REG3(a, b, c, addr) \ do { \ long regAddr; \ diff --git a/src/dolphin/hio/hio.c b/src/dolphin/hio/hio.c index aa146d5c90..177fff505d 100644 --- a/src/dolphin/hio/hio.c +++ b/src/dolphin/hio/hio.c @@ -6,7 +6,7 @@ static u32 Dev; #define HIO_DEV Dev -#ifdef DEBUG +#if DEBUG const char* __HIOVersion = "<< Dolphin SDK - HIO\tdebug build: Apr 5 2004 03:57:05 (0x2301) >>"; #else const char* __HIOVersion = "<< Dolphin SDK - HIO\trelease build: Apr 5 2004 04:15:47 (0x2301) >>"; @@ -14,7 +14,7 @@ const char* __HIOVersion = "<< Dolphin SDK - HIO\trelease build: Apr 5 2004 04: static char __HIODigest1[71] = "\"HIO library - Copyright (C) 2000-2002 Nintendo. All rights reserved.\""; -#ifdef DEBUG +#if DEBUG static char __HIODigest2[34] = "\"HIO built: Apr 5 2004 03:57:05\""; #else static char __HIODigest2[34] = "\"HIO built: Apr 5 2004 04:15:47\""; diff --git a/src/dolphin/mcc/fio.c b/src/dolphin/mcc/fio.c index dca9488d74..e576373491 100644 --- a/src/dolphin/mcc/fio.c +++ b/src/dolphin/mcc/fio.c @@ -1,7 +1,7 @@ #include #include -#ifdef DEBUG +#if DEBUG const char* __FIOVersion = "<< Dolphin SDK - FIO\tdebug build: Apr 5 2004 03:57:07 (0x2301) >>"; #else const char* __FIOVersion = "<< Dolphin SDK - FIO\trelease build: Apr 5 2004 04:15:50 (0x2301) >>"; @@ -1205,7 +1205,7 @@ exit:; } static int fioPacketResultWrite(void* buffer, u32 dataSize) { - register int nResult = 0; + __REGISTER int nResult = 0; MCC_CHANNEL nChID; u8 nChannelBlocks = 0; u32 dataBlockSize; diff --git a/src/dolphin/mcc/mcc.c b/src/dolphin/mcc/mcc.c index bed12b501c..e0f3014fcc 100644 --- a/src/dolphin/mcc/mcc.c +++ b/src/dolphin/mcc/mcc.c @@ -1,7 +1,7 @@ #include #include -#ifdef DEBUG +#if DEBUG const char* __MCCVersion = "<< Dolphin SDK - MCC\tdebug build: Apr 5 2004 03:57:07 (0x2301) >>"; #else const char* __MCCVersion = "<< Dolphin SDK - MCC\trelease build: Apr 5 2004 04:15:49 (0x2301) >>"; @@ -303,7 +303,7 @@ static int AsyncResourceIsBusy(void) { static int LoadChannelInfo(MCC_ChannelInfo* info) { volatile int result = 0; u8 count; -#ifndef DEBUG +#if !DEBUG int unused; // this is fake, but i cant seem to find whats messing with the stack. #endif @@ -453,7 +453,7 @@ static int NotifyCompulsorily(MCC_CHANNEL chID, u32 notify, u32 timeout) { volatile u32 tickStart; volatile u32 tickCur; volatile u32 tickSec; -#ifndef DEBUG +#if !DEBUG int unused; // fake but blah #endif @@ -500,7 +500,7 @@ static int NotifyInitDone(void) { } static int NotifyChannelEvent(MCC_CHANNEL chID, u32 notify) { -#ifndef DEBUG +#if !DEBUG int unused[2]; // fake but blah #endif @@ -539,7 +539,7 @@ static void MailboxCheck(void) { u8 chID; u32 value; BOOL bDoCall; -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -643,7 +643,7 @@ static void MCCRxCallback(void) { static int mccInitializeCheck(u8 timeout) { int dmyFlag; int i; -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -699,7 +699,7 @@ int MCCInit(MCC_EXI exiChannel, u8 timeout, MCC_CBSysEvent callbackSysEvent) { u32 mailbox; u32 status; int i; -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -796,7 +796,7 @@ int MCCEnumDevices(MCC_CBEnumDevices callbackEnumDevices) { } u8 MCCGetFreeBlocks(MCC_MODE mode) { -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -824,7 +824,7 @@ u8 MCCGetLastError(void) { } int MCCGetChannelInfo(MCC_CHANNEL chID, MCC_Info* info) { -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -852,7 +852,7 @@ int MCCGetChannelInfo(MCC_CHANNEL chID, MCC_Info* info) { int MCCGetConnectionStatus(MCC_CHANNEL chID, MCC_CONNECT* connect) { MCC_Info info; -#ifndef DEBUG +#if !DEBUG int unused[2]; // fake but blah #endif @@ -886,7 +886,7 @@ int MCCGetConnectionStatus(MCC_CHANNEL chID, MCC_CONNECT* connect) { int MCCNotify(MCC_CHANNEL chID, u32 notify) { MCC_CONNECT connect; -#ifndef DEBUG +#if !DEBUG int unused[3]; // fake but blah #endif @@ -916,7 +916,7 @@ int MCCNotify(MCC_CHANNEL chID, u32 notify) { u32 MCCSetChannelEventMask(MCC_CHANNEL chID, u32 event) { u32 oldMask; -#ifndef DEBUG +#if !DEBUG int unused[2]; // fake but blah #endif @@ -942,11 +942,11 @@ u32 MCCSetChannelEventMask(MCC_CHANNEL chID, u32 event) { int MCCOpen(MCC_CHANNEL chID, u8 blockSize, MCC_CBEvent callbackEvent) { u8 connectSide; u8 blockIndex; -#ifndef DEBUG +#if !DEBUG int unused2[2]; #endif u8 freeBlocks; -#ifndef DEBUG +#if !DEBUG int unused[6]; // fake but blah #endif @@ -1038,7 +1038,7 @@ exit:; int MCCClose(MCC_CHANNEL chID) { u8 connectSide; -#ifndef DEBUG +#if !DEBUG int unused[4]; // fake but blah #endif @@ -1093,7 +1093,7 @@ exit:; } int MCCLock(MCC_CHANNEL chID) { -#ifndef DEBUG +#if !DEBUG int unused[7]; // fake but blah #endif @@ -1146,7 +1146,7 @@ exit:; } int MCCUnlock(MCC_CHANNEL chID) { -#ifndef DEBUG +#if !DEBUG int unused[7]; // fake but blah #endif @@ -1199,7 +1199,7 @@ exit: } int MCCRead(MCC_CHANNEL chID, u32 offset, void* data, s32 size, MCC_SYNC_STATE async) { -#ifndef DEBUG +#if !DEBUG int unused[11]; // fake but blah #endif @@ -1285,7 +1285,7 @@ exit:; } int MCCWrite(MCC_CHANNEL chID, u32 offset, void* data, s32 size, MCC_SYNC_STATE async) { -#ifndef DEBUG +#if !DEBUG int unused[11]; // fake but blah #endif mccDebugPrint("MCCWrite\n"); @@ -1379,7 +1379,7 @@ int MCCCheckAsyncDone() { u16 stat; u16 mode; u8 chID; -#ifndef DEBUG +#if !DEBUG int unused[5]; // fake but blah #endif diff --git a/src/dolphin/mcc/tty.c b/src/dolphin/mcc/tty.c index 1c230e4757..bb8aa31818 100644 --- a/src/dolphin/mcc/tty.c +++ b/src/dolphin/mcc/tty.c @@ -1,7 +1,7 @@ #include #include -#ifdef DEBUG +#if DEBUG const char* __TTYVersion = "<< Dolphin SDK - TTY\tdebug build: Apr 5 2004 03:57:08 (0x2301) >>"; #else const char* __TTYVersion = "<< Dolphin SDK - TTY\trelease build: Apr 5 2004 04:15:50 (0x2301) >>"; diff --git a/src/dolphin/mtx/mtx.c b/src/dolphin/mtx/mtx.c index f177c1739a..2fd287beb5 100644 --- a/src/dolphin/mtx/mtx.c +++ b/src/dolphin/mtx/mtx.c @@ -23,11 +23,11 @@ void C_MTXIdentity(Mtx m) { m[2][3] = 0; } -void PSMTXIdentity(register Mtx m) { - register f32 c_zero = 0.0f; - register f32 c_one = 1.0f; - register f32 c_01; - register f32 c_10; +void PSMTXIdentity(__REGISTER Mtx m) { + __REGISTER f32 c_zero = 0.0f; + __REGISTER f32 c_one = 1.0f; + __REGISTER f32 c_01; + __REGISTER f32 c_10; asm { psq_st c_zero, 8(m), 0, 0 @@ -60,7 +60,7 @@ void C_MTXCopy(const Mtx src, Mtx dst) { } } -asm void PSMTXCopy(const register Mtx src, register Mtx dst) { +asm void PSMTXCopy(const __REGISTER Mtx src, __REGISTER Mtx dst) { psq_l f0, 0(src), 0, 0 psq_st f0, 0(dst), 0, 0 psq_l f1, 8(src), 0, 0 @@ -109,7 +109,7 @@ void C_MTXConcat(const Mtx a, const Mtx b, Mtx ab) { } } -asm void PSMTXConcat(const register Mtx a, const register Mtx b, register Mtx ab) { +asm void PSMTXConcat(const __REGISTER Mtx a, const __REGISTER Mtx b, __REGISTER Mtx ab) { nofralloc stwu r1, -64(r1) psq_l f0, 0(a), 0, 0 @@ -184,12 +184,12 @@ void C_MTXConcatArray(const Mtx a, const Mtx* srcBase, Mtx* dstBase, u32 count) #pragma optimization_level 1 // This function will not compile at optimization level 0 #endif -void PSMTXConcatArray(const register Mtx a, const register Mtx* srcBase, register Mtx* dstBase, register u32 count) { - register f32 va0, va1, va2, va3, va4, va5; - register f32 vb0, vb1, vb2, vb3, vb4, vb5; - register f32 vd0, vd1, vd2, vd3, vd4, vd5; - register f32 u01; - register f32* u01Ptr = Unit01; +void PSMTXConcatArray(const __REGISTER Mtx a, const __REGISTER Mtx* srcBase, __REGISTER Mtx* dstBase, __REGISTER u32 count) { + __REGISTER f32 va0, va1, va2, va3, va4, va5; + __REGISTER f32 vb0, vb1, vb2, vb3, vb4, vb5; + __REGISTER f32 vd0, vd1, vd2, vd3, vd4, vd5; + __REGISTER f32 u01; + __REGISTER f32* u01Ptr = Unit01; asm { psq_l va0, 0(a), 0, 0; @@ -307,15 +307,15 @@ void C_MTXTranspose(const Mtx src, Mtx xPose) { } } -void PSMTXTranspose(const register Mtx src, register Mtx xPose) { - register f32 c_zero = 0; - register f32 row0a; - register f32 row1a; - register f32 row0b; - register f32 row1b; - register f32 trns0; - register f32 trns1; - register f32 trns2; +void PSMTXTranspose(const __REGISTER Mtx src, __REGISTER Mtx xPose) { + __REGISTER f32 c_zero = 0; + __REGISTER f32 row0a; + __REGISTER f32 row1a; + __REGISTER f32 row0b; + __REGISTER f32 row1b; + __REGISTER f32 trns0; + __REGISTER f32 trns1; + __REGISTER f32 trns2; asm { psq_l row0a, 0(src), 0, 0 @@ -388,7 +388,7 @@ u32 C_MTXInverse(const Mtx src, Mtx inv) { return 1; } -asm u32 PSMTXInverse(const register Mtx src, register Mtx inv) { +asm u32 PSMTXInverse(const __REGISTER Mtx src, __REGISTER Mtx inv) { psq_l f0, 0(src), 1, 0 psq_l f1, 4(src), 0, 0 psq_l f2, 16(src), 1, 0 @@ -498,7 +498,7 @@ u32 C_MTXInvXpose(const Mtx src, Mtx invX) { return 1; } -asm u32 PSMTXInvXpose(const register Mtx src, register Mtx invX) { +asm u32 PSMTXInvXpose(const __REGISTER Mtx src, __REGISTER Mtx invX) { psq_l f0, 0(src), 1, 0 psq_l f1, 4(src), 0, 0 psq_l f2, 16(src), 1, 0 @@ -622,9 +622,9 @@ void C_MTXRotTrig(Mtx m, char axis, f32 sinA, f32 cosA) { } } -void PSMTXRotTrig(register Mtx m, register char axis, register f32 sinA, register f32 cosA) { - register f32 fc0, fc1, nsinA; - register f32 fw0, fw1, fw2, fw3; +void PSMTXRotTrig(__REGISTER Mtx m, __REGISTER char axis, __REGISTER f32 sinA, __REGISTER f32 cosA) { + __REGISTER f32 fc0, fc1, nsinA; + __REGISTER f32 fw0, fw1, fw2, fw3; asm { frsp sinA, sinA @@ -685,10 +685,10 @@ void PSMTXRotTrig(register Mtx m, register char axis, register f32 sinA, registe } } -static void __PSMTXRotAxisRadInternal(register Mtx m, const register Vec* axis, register f32 sT, register f32 cT) { - register f32 tT, fc0; - register f32 tmp0, tmp1, tmp2, tmp3, tmp4; - register f32 tmp5, tmp6, tmp7, tmp8, tmp9; +static void __PSMTXRotAxisRadInternal(__REGISTER Mtx m, const __REGISTER Vec* axis, __REGISTER f32 sT, __REGISTER f32 cT) { + __REGISTER f32 tT, fc0; + __REGISTER f32 tmp0, tmp1, tmp2, tmp3, tmp4; + __REGISTER f32 tmp5, tmp6, tmp7, tmp8, tmp9; tmp9 = 0.5f; tmp8 = 3.0f; @@ -801,9 +801,9 @@ void C_MTXTrans(Mtx m, f32 xT, f32 yT, f32 zT) { m[2][3] = zT; } -void PSMTXTrans(register Mtx m, register f32 xT, register f32 yT, register f32 zT) { - register f32 c0 = 0.0f; - register f32 c1 = 1.0f; +void PSMTXTrans(__REGISTER Mtx m, __REGISTER f32 xT, __REGISTER f32 yT, __REGISTER f32 zT) { + __REGISTER f32 c0 = 0.0f; + __REGISTER f32 c1 = 1.0f; asm { stfs xT, 12(m) @@ -840,7 +840,7 @@ void C_MTXTransApply(const Mtx src, Mtx dst, f32 xT, f32 yT, f32 zT) { dst[2][3] = (src[2][3] + zT); } -asm void PSMTXTransApply(const register Mtx src, register Mtx dst, register f32 xT, register f32 yT, register f32 zT) { +asm void PSMTXTransApply(const __REGISTER Mtx src, __REGISTER Mtx dst, __REGISTER f32 xT, __REGISTER f32 yT, __REGISTER f32 zT) { nofralloc psq_l fp4, 0(src), 0, 0 frsp xT, xT @@ -879,8 +879,8 @@ void C_MTXScale(Mtx m, f32 xS, f32 yS, f32 zS) { m[2][3] = 0; } -void PSMTXScale(register Mtx m, register f32 xS, register f32 yS, register f32 zS) { - register f32 c0 = 0.0f; +void PSMTXScale(__REGISTER Mtx m, __REGISTER f32 xS, __REGISTER f32 yS, __REGISTER f32 zS) { + __REGISTER f32 c0 = 0.0f; asm { stfs xS, 0(m) @@ -911,7 +911,7 @@ void C_MTXScaleApply(const Mtx src, Mtx dst, f32 xS, f32 yS, f32 zS) { dst[2][3] = (src[2][3] * zS); } -asm void PSMTXScaleApply(const register Mtx src, register Mtx dst, register f32 xS, register f32 yS, register f32 zS) { +asm void PSMTXScaleApply(const __REGISTER Mtx src, __REGISTER Mtx dst, __REGISTER f32 xS, __REGISTER f32 yS, __REGISTER f32 zS) { nofralloc frsp xS, xS psq_l fp4, 0(src), 0, 0 @@ -982,10 +982,10 @@ void C_MTXQuat(Mtx m, const Quaternion* q) { m[2][3] = 0; } -void PSMTXQuat(register Mtx m, const register Quaternion* q) { - register f32 c_zero, c_one, c_two, scale; - register f32 tmp0, tmp1, tmp2, tmp3, tmp4; - register f32 tmp5, tmp6, tmp7, tmp8, tmp9; +void PSMTXQuat(__REGISTER Mtx m, const __REGISTER Quaternion* q) { + __REGISTER f32 c_zero, c_one, c_two, scale; + __REGISTER f32 tmp0, tmp1, tmp2, tmp3, tmp4; + __REGISTER f32 tmp5, tmp6, tmp7, tmp8, tmp9; c_one = 1.0f; asm { @@ -1055,13 +1055,13 @@ void C_MTXReflect(Mtx m, const Vec* p, const Vec* n) { m[2][3] = (pdotn * n->z); } -void PSMTXReflect(register Mtx m, const register Vec* p, const register Vec* n) { - register f32 c_one; - register f32 vn_xy, vn_z1; - register f32 n2vn_xy, n2vn_z1; - register f32 pdotn; - register f32 tmp0, tmp1, tmp2, tmp3; - register f32 tmp4, tmp5, tmp6, tmp7; +void PSMTXReflect(__REGISTER Mtx m, const __REGISTER Vec* p, const __REGISTER Vec* n) { + __REGISTER f32 c_one; + __REGISTER f32 vn_xy, vn_z1; + __REGISTER f32 n2vn_xy, n2vn_z1; + __REGISTER f32 pdotn; + __REGISTER f32 tmp0, tmp1, tmp2, tmp3; + __REGISTER f32 tmp4, tmp5, tmp6, tmp7; c_one = 1.0f; diff --git a/src/dolphin/mtx/mtx44.c b/src/dolphin/mtx/mtx44.c index 59376a3bb3..d1657d341a 100644 --- a/src/dolphin/mtx/mtx44.c +++ b/src/dolphin/mtx/mtx44.c @@ -112,9 +112,9 @@ void C_MTX44Identity(Mtx44 m) { m[3][3] = 1.0f; } -void PSMTX44Identity(register Mtx44 m) { - register f32 c1 = 1.0f; - register f32 c0 = 0.0f; +void PSMTX44Identity(__REGISTER Mtx44 m) { + __REGISTER f32 c1 = 1.0f; + __REGISTER f32 c0 = 0.0f; asm { stfs c1, 0x0(m) @@ -154,7 +154,7 @@ void C_MTX44Copy(const Mtx44 src, Mtx44 dst) { } } -asm void PSMTX44Copy(const register Mtx44 src, register Mtx44 dst) { +asm void PSMTX44Copy(const __REGISTER Mtx44 src, __REGISTER Mtx44 dst) { nofralloc psq_l f1, 0x0(src), 0, 0 psq_st f1, 0x0(dst), 0, 0 @@ -214,7 +214,7 @@ void C_MTX44Concat(const Mtx44 a, const Mtx44 b, Mtx44 ab) { } } -asm void PSMTX44Concat(const register Mtx44 a, const register Mtx44 b, register Mtx44 ab) { +asm void PSMTX44Concat(const __REGISTER Mtx44 a, const __REGISTER Mtx44 b, __REGISTER Mtx44 ab) { nofralloc psq_l f0, 0x0(a), 0, 0 psq_l f2, 0x0(b), 0, 0 @@ -318,7 +318,7 @@ void C_MTX44Transpose(const Mtx44 src, Mtx44 xPose) { } } -asm void PSMTX44Transpose(const register Mtx44 src, register Mtx44 xPose) { +asm void PSMTX44Transpose(const __REGISTER Mtx44 src, __REGISTER Mtx44 xPose) { nofralloc psq_l f0, 0x0(src), 0, 0 psq_l f1, 0x10(src), 0, 0 @@ -438,10 +438,10 @@ void C_MTX44Trans(Mtx44 m, f32 xT, f32 yT, f32 zT) { m[3][3] = 1.0f; } -void PSMTX44Trans(register Mtx44 m, register f32 xT, register f32 yT, register f32 zT) { - register f32 c_zero = 0.0f; - register f32 c_one = 1.0f; - register f32 c_01; +void PSMTX44Trans(__REGISTER Mtx44 m, __REGISTER f32 xT, __REGISTER f32 yT, __REGISTER f32 zT) { + __REGISTER f32 c_zero = 0.0f; + __REGISTER f32 c_one = 1.0f; + __REGISTER f32 c_01; asm { stfs xT, 0xc(m) @@ -488,7 +488,7 @@ void C_MTX44TransApply(const Mtx44 src, Mtx44 dst, f32 xT, f32 yT, f32 zT) { dst[2][3] = (src[2][3] + zT); } -asm void PSMTX44TransApply(const register Mtx44 src, register Mtx44 dst, register f32 xT, register f32 yT, register f32 zT) { +asm void PSMTX44TransApply(const __REGISTER Mtx44 src, __REGISTER Mtx44 dst, __REGISTER f32 xT, __REGISTER f32 yT, __REGISTER f32 zT) { nofralloc psq_l f4, 0x0(src), 0, 0 frsp xT, xT @@ -538,9 +538,9 @@ void C_MTX44Scale(Mtx44 m, f32 xS, f32 yS, f32 zS) { m[3][3] = 1.0f; } -void PSMTX44Scale(register Mtx44 m, register f32 xS, register f32 yS, register f32 zS) { - register f32 c_zero = 0.0f; - register f32 c_one = 1.0f; +void PSMTX44Scale(__REGISTER Mtx44 m, __REGISTER f32 xS, __REGISTER f32 yS, __REGISTER f32 zS) { + __REGISTER f32 c_zero = 0.0f; + __REGISTER f32 c_one = 1.0f; asm { stfs xS, 0x0(m) @@ -581,7 +581,7 @@ void C_MTX44ScaleApply(const Mtx44 src, Mtx44 dst, f32 xS, f32 yS, f32 zS) { dst[3][3] = src[3][3]; } -asm void PSMTX44ScaleApply(const register Mtx44 src, register Mtx44 dst, register f32 xS, register f32 yS, register f32 zS) { +asm void PSMTX44ScaleApply(const __REGISTER Mtx44 src, __REGISTER Mtx44 dst, __REGISTER f32 xS, __REGISTER f32 yS, __REGISTER f32 zS) { nofralloc psq_l f4, 0x0(src), 0, 0 frsp xS, xS @@ -695,15 +695,15 @@ void C_MTX44RotTrig(Mtx44 m, char axis, f32 sinA, f32 cosA) { } } -void PSMTX44RotTrig(register Mtx44 m, register char axis, register f32 sinA, register f32 cosA) { - register f32 ftmp0; - register f32 ftmp1; - register f32 ftmp2; - register f32 ftmp3; - register f32 ftmp4; +void PSMTX44RotTrig(__REGISTER Mtx44 m, __REGISTER char axis, __REGISTER f32 sinA, __REGISTER f32 cosA) { + __REGISTER f32 ftmp0; + __REGISTER f32 ftmp1; + __REGISTER f32 ftmp2; + __REGISTER f32 ftmp3; + __REGISTER f32 ftmp4; - register f32 c_zero = 0.0f; - register f32 c_one = 1.0f; + __REGISTER f32 c_zero = 0.0f; + __REGISTER f32 c_one = 1.0f; asm { frsp sinA, sinA @@ -813,19 +813,19 @@ void C_MTX44RotAxisRad(Mtx44 m, const Vec* axis, f32 rad) { m[3][3] = 1.0f; } -static void __PSMTX44RotAxisRadInternal(register Mtx44 m, const register Vec* axis, register f32 sT, register f32 cT) { - register f32 tT; - register f32 fc0; - register f32 tmp0; - register f32 tmp1; - register f32 tmp2; - register f32 tmp3; - register f32 tmp4; - register f32 tmp5; - register f32 tmp6; - register f32 tmp7; - register f32 tmp8; - register f32 tmp9; +static void __PSMTX44RotAxisRadInternal(__REGISTER Mtx44 m, const __REGISTER Vec* axis, __REGISTER f32 sT, __REGISTER f32 cT) { + __REGISTER f32 tT; + __REGISTER f32 fc0; + __REGISTER f32 tmp0; + __REGISTER f32 tmp1; + __REGISTER f32 tmp2; + __REGISTER f32 tmp3; + __REGISTER f32 tmp4; + __REGISTER f32 tmp5; + __REGISTER f32 tmp6; + __REGISTER f32 tmp7; + __REGISTER f32 tmp8; + __REGISTER f32 tmp9; tmp9 = 0.5f; tmp8 = 3.0f; diff --git a/src/dolphin/mtx/mtx44vec.c b/src/dolphin/mtx/mtx44vec.c index 478c49fc97..e0989ed750 100644 --- a/src/dolphin/mtx/mtx44vec.c +++ b/src/dolphin/mtx/mtx44vec.c @@ -21,7 +21,7 @@ void C_MTX44MultVec(const Mtx44 m, const Vec* src, Vec* dst) { dst->z = vTmp.z * w; } -asm void PSMTX44MultVec(const register Mtx44 m, const register Vec* src, register Vec* dst) { +asm void PSMTX44MultVec(const __REGISTER Mtx44 m, const __REGISTER Vec* src, __REGISTER Vec* dst) { nofralloc psq_l f0, 0x0(src), 0, 0 psq_l f2, 0x30(m), 0, 0 @@ -78,7 +78,7 @@ void C_MTX44MultVecArray(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 co } } -asm void PSMTX44MultVecArray(const register Mtx44 m, const register Vec* srcBase, register Vec* dstBase, register u32 count) { +asm void PSMTX44MultVecArray(const __REGISTER Mtx44 m, const __REGISTER Vec* srcBase, __REGISTER Vec* dstBase, __REGISTER u32 count) { nofralloc stwu r1, -0x10(r1) subi count, count, 0x1 @@ -157,7 +157,7 @@ void C_MTX44MultVecSR(const Mtx44 m, const Vec* src, Vec* dst) { dst->z = vTmp.z; } -asm void PSMTX44MultVecSR(const register Mtx m, const register Vec* src, register Vec* dst) { +asm void PSMTX44MultVecSR(const __REGISTER Mtx m, const __REGISTER Vec* src, __REGISTER Vec* dst) { nofralloc psq_l f0, 0x0(m), 0, 0 psq_l f6, 0x0(src), 0, 0 @@ -202,7 +202,7 @@ void C_MTX44MultVecArraySR(const Mtx44 m, const Vec* srcBase, Vec* dstBase, u32 } } -asm void PSMTX44MultVecArraySR(const register Mtx44 m, const register Vec* srcBase, register Vec* dstBase, register u32 count) { +asm void PSMTX44MultVecArraySR(const __REGISTER Mtx44 m, const __REGISTER Vec* srcBase, __REGISTER Vec* dstBase, __REGISTER u32 count) { nofralloc psq_l f0, 0x0(m), 0, 0 subi count, count, 0x1 diff --git a/src/dolphin/mtx/mtxvec.c b/src/dolphin/mtx/mtxvec.c index cf98b5d94b..befb7684b8 100644 --- a/src/dolphin/mtx/mtxvec.c +++ b/src/dolphin/mtx/mtxvec.c @@ -17,7 +17,7 @@ void C_MTXMultVec(const Mtx m, const Vec* src, Vec* dst) { dst->z = vTmp.z; } -asm void PSMTXMultVec(const register Mtx m, const register Vec* src, register Vec* dst) { +asm void PSMTXMultVec(const __REGISTER Mtx m, const __REGISTER Vec* src, __REGISTER Vec* dst) { nofralloc psq_l f0, Vec.x(src), 0, 0 psq_l f2, 0(m), 0, 0 @@ -63,7 +63,7 @@ void C_MTXMultVecArray(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 count) } } -asm void PSMTXMultVecArray(const register Mtx m, const register Vec* srcBase, register Vec* dstBase, register u32 count) { +asm void PSMTXMultVecArray(const __REGISTER Mtx m, const __REGISTER Vec* srcBase, __REGISTER Vec* dstBase, __REGISTER u32 count) { nofralloc psq_l f13, 0x0(m), 0, 0 psq_l f12, 0x10(m), 0, 0 @@ -118,7 +118,7 @@ void C_MTXMultVecSR(const Mtx m, const Vec* src, Vec* dst) { dst->z = vTmp.z; } -asm void PSMTXMultVecSR(const register Mtx m, const register Vec* src, register Vec* dst) { +asm void PSMTXMultVecSR(const __REGISTER Mtx m, const __REGISTER Vec* src, __REGISTER Vec* dst) { nofralloc psq_l f0, 0x0(m), 0, 0 psq_l f6, 0x0(src), 0, 0 @@ -164,7 +164,7 @@ void C_MTXMultVecArraySR(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 coun } } -asm void PSMTXMultVecArraySR(const register Mtx m, const register Vec* srcBase, register Vec* dstBase, register u32 count) { +asm void PSMTXMultVecArraySR(const __REGISTER Mtx m, const __REGISTER Vec* srcBase, __REGISTER Vec* dstBase, __REGISTER u32 count) { nofralloc psq_l f13, 0x0(m), 0, 0 psq_l f12, 0x10(m), 0, 0 diff --git a/src/dolphin/mtx/psmtx.c b/src/dolphin/mtx/psmtx.c index 6ec6c29554..f8f79d1573 100644 --- a/src/dolphin/mtx/psmtx.c +++ b/src/dolphin/mtx/psmtx.c @@ -2,7 +2,7 @@ #include #include "fake_tgmath.h" -asm void PSMTXReorder(const register Mtx src, register ROMtx dest) { +asm void PSMTXReorder(const __REGISTER Mtx src, __REGISTER ROMtx dest) { psq_l f0, 0(src), 0, 0 psq_l f2, 16(src), 0, 0 psq_l f4, 32(src), 0, 0 @@ -23,7 +23,7 @@ asm void PSMTXReorder(const register Mtx src, register ROMtx dest) { psq_st f10, 40(dest), 0, 0 } -asm void PSMTXROMultVecArray(const register ROMtx m, const register Vec* srcBase, register Vec* dstBase, register u32 count) { +asm void PSMTXROMultVecArray(const __REGISTER ROMtx m, const __REGISTER Vec* srcBase, __REGISTER Vec* dstBase, __REGISTER u32 count) { nofralloc stwu r1, -64(r1) stfd f14, 8(r1) @@ -99,7 +99,7 @@ exit: blr } -asm void PSMTXROSkin2VecArray(const register ROMtx m0, const register ROMtx m1, const register f32* wtBase, const register Vec* srcBase, register Vec* dstBase, register u32 count) { +asm void PSMTXROSkin2VecArray(const __REGISTER ROMtx m0, const __REGISTER ROMtx m1, const __REGISTER f32* wtBase, const __REGISTER Vec* srcBase, __REGISTER Vec* dstBase, __REGISTER u32 count) { nofralloc stwu r1, -160(r1) stfd f14, 8(r1) @@ -210,7 +210,7 @@ loop: blr } -asm void PSMTXROMultS16VecArray(const register Mtx m, const register S16Vec* srcBase, register Vec* dstBase, register u32 count) { +asm void PSMTXROMultS16VecArray(const __REGISTER Mtx m, const __REGISTER S16Vec* srcBase, __REGISTER Vec* dstBase, __REGISTER u32 count) { nofralloc stwu r1, -64(r1) stfd f14, 8(r1) @@ -288,7 +288,7 @@ exit: blr } -asm void PSMTXMultS16VecArray(const register ROMtx* m, const register S16Vec* srcBase, register Vec* dstBase, register u32 count) { +asm void PSMTXMultS16VecArray(const __REGISTER ROMtx* m, const __REGISTER S16Vec* srcBase, __REGISTER Vec* dstBase, __REGISTER u32 count) { psq_l f0, 0(m), 0, 0 lis r7, 7 mtspr GQR6, r7 diff --git a/src/dolphin/mtx/quat.c b/src/dolphin/mtx/quat.c index 9af3c3cd56..2acb4a7d3b 100644 --- a/src/dolphin/mtx/quat.c +++ b/src/dolphin/mtx/quat.c @@ -13,8 +13,8 @@ void C_QUATAdd(const Quaternion* p, const Quaternion* q, Quaternion* r) { r->w = p->w + q->w; } -void PSQUATAdd(const register Quaternion* p, const register Quaternion* q, register Quaternion* r) { - register f32 pxy, qxy, rxy, pzw, qzw, rzw; +void PSQUATAdd(const __REGISTER Quaternion* p, const __REGISTER Quaternion* q, __REGISTER Quaternion* r) { + __REGISTER f32 pxy, qxy, rxy, pzw, qzw, rzw; asm { psq_l pxy, 0(p), 0, 0 @@ -39,8 +39,8 @@ void C_QUATSubtract(const Quaternion* p, const Quaternion* q, Quaternion* r) { r->w = p->w - q->w; } -void PSQUATSubtract(const register Quaternion* p, const register Quaternion* q, register Quaternion* r) { - register f32 pxy, qxy, rxy, pzw, qzw, rzw; +void PSQUATSubtract(const __REGISTER Quaternion* p, const __REGISTER Quaternion* q, __REGISTER Quaternion* r) { + __REGISTER f32 pxy, qxy, rxy, pzw, qzw, rzw; asm { psq_l pxy, 0(p), 0, 0 @@ -78,12 +78,12 @@ void C_QUATMultiply(const Quaternion* p, const Quaternion* q, Quaternion* pq) { } } -void PSQUATMultiply(const register Quaternion* p, const register Quaternion* q, register Quaternion* pq) { - register f32 pxy, pzw; - register f32 qxy, qzw; - register f32 pnxy, pnzw, pnxny, pnznw; - register f32 rxy, rzw; - register f32 sxy, szw; +void PSQUATMultiply(const __REGISTER Quaternion* p, const __REGISTER Quaternion* q, __REGISTER Quaternion* pq) { + __REGISTER f32 pxy, pzw; + __REGISTER f32 qxy, qzw; + __REGISTER f32 pnxy, pnzw, pnxny, pnznw; + __REGISTER f32 rxy, rzw; + __REGISTER f32 sxy, szw; asm { psq_l pxy, 0x0(p), 0, 0 @@ -121,8 +121,8 @@ void C_QUATScale(const Quaternion* q, Quaternion* r, f32 scale) { r->w = q->w * scale; } -void PSQUATScale(const register Quaternion* q, register Quaternion* r, register f32 scale) { - register f32 rxy, rzw; +void PSQUATScale(const __REGISTER Quaternion* q, __REGISTER Quaternion* r, __REGISTER f32 scale) { + __REGISTER f32 rxy, rzw; asm { psq_l rxy, 0(q), 0, 0 @@ -141,8 +141,8 @@ f32 C_QUATDotProduct(const Quaternion* p, const Quaternion* q) { return (q->x * p->x) + (q->y * p->y) + (q->z * p->z) + (q->w * p->w); } -f32 PSQUATDotProduct(const register Quaternion* p, const register Quaternion* q) { - register f32 pxy, pzw, qxy, qzw, dp; +f32 PSQUATDotProduct(const __REGISTER Quaternion* p, const __REGISTER Quaternion* q) { + __REGISTER f32 pxy, pzw, qxy, qzw, dp; asm { psq_l pxy, 0(p), 0, 0 @@ -175,16 +175,16 @@ void C_QUATNormalize(const Quaternion* src, Quaternion* unit) { } } -void PSQUATNormalize(const register Quaternion* src, register Quaternion* unit) { - register f32 sxy, szw; - register f32 mag, rsqmag; - register f32 diff; - register f32 c_zero; - register f32 nwork0, nwork1; +void PSQUATNormalize(const __REGISTER Quaternion* src, __REGISTER Quaternion* unit) { + __REGISTER f32 sxy, szw; + __REGISTER f32 mag, rsqmag; + __REGISTER f32 diff; + __REGISTER f32 c_zero; + __REGISTER f32 nwork0, nwork1; - register f32 epsilon = 0.00001f; - register f32 c_half = 0.5f; - register f32 c_three = 3.0f; + __REGISTER f32 epsilon = 0.00001f; + __REGISTER f32 c_half = 0.5f; + __REGISTER f32 c_three = 3.0f; asm { psq_l sxy, 0x0(src), 0, 0 @@ -224,15 +224,15 @@ void C_QUATInverse(const Quaternion* src, Quaternion* inv) { inv->w = src->w * norminv; } -void PSQUATInverse(const register Quaternion* src, register Quaternion* inv) { - register f32 sxy, szw; - register f32 izz, iww; - register f32 mag, nmag; - register f32 norminv, nninv; - register f32 nwork0; - register f32 c_two; - register f32 c_zero; - register f32 c_one = 1.0f; +void PSQUATInverse(const __REGISTER Quaternion* src, __REGISTER Quaternion* inv) { + __REGISTER f32 sxy, szw; + __REGISTER f32 izz, iww; + __REGISTER f32 mag, nmag; + __REGISTER f32 norminv, nninv; + __REGISTER f32 nwork0; + __REGISTER f32 c_two; + __REGISTER f32 c_zero; + __REGISTER f32 c_one = 1.0f; asm { psq_l sxy, 0x0(src), 0, 0 @@ -305,7 +305,7 @@ void C_QUATLogN(const Quaternion* q, Quaternion* r) { scale = (q->x * q->x) + (q->y * q->y) + (q->z * q->z); -#ifdef DEBUG +#if DEBUG mag = scale + (q->z * q->z); if (mag < 1.0f - 0.00001f || mag > 1.0f + 0.00001f || mag > 1.00001f) {} #endif diff --git a/src/dolphin/mtx/vec.c b/src/dolphin/mtx/vec.c index 646caa410c..3a3aff27a2 100644 --- a/src/dolphin/mtx/vec.c +++ b/src/dolphin/mtx/vec.c @@ -11,7 +11,7 @@ void C_VECAdd(const Vec* a, const Vec* b, Vec* ab) { ab->z = a->z + b->z; } -asm void PSVECAdd(const register Vec* a, const register Vec* b, register Vec* ab) { +asm void PSVECAdd(const __REGISTER Vec* a, const __REGISTER Vec* b, __REGISTER Vec* ab) { psq_l f2, Vec.x(a), 0, 0 psq_l f4, Vec.x(b), 0, 0 ps_add f6, f2, f4 @@ -31,7 +31,7 @@ void C_VECSubtract(const Vec* a, const Vec* b, Vec* a_b) { a_b->z = a->z - b->z; } -asm void PSVECSubtract(const register Vec* a, const register Vec* b, register Vec* a_b) { +asm void PSVECSubtract(const __REGISTER Vec* a, const __REGISTER Vec* b, __REGISTER Vec* a_b) { psq_l f2, Vec.x(a), 0, 0 psq_l f4, Vec.x(b), 0, 0 ps_sub f6, f2, f4 @@ -50,8 +50,8 @@ void C_VECScale(const Vec* src, Vec* dst, f32 scale) { dst->z = (src->z * scale); } -void PSVECScale(const register Vec* src, register Vec* dst, register f32 scale) { - register f32 vxy, vz, rxy, rz; +void PSVECScale(const __REGISTER Vec* src, __REGISTER Vec* dst, __REGISTER f32 scale) { + __REGISTER f32 vxy, vz, rxy, rz; asm { psq_l vxy, 0x0(src), 0, 0 @@ -78,17 +78,17 @@ void C_VECNormalize(const Vec* src, Vec* unit) { unit->z = src->z * mag; } -void PSVECNormalize(const register Vec* src, register Vec* unit) { - register float c_half = 0.5f; - register float c_three = 3.0f; - register float v1_xy; - register float v1_z; - register float xx_zz; - register float xx_yy; - register float sqsum; - register float rsqrt; - register float nwork0; - register float nwork1; +void PSVECNormalize(const __REGISTER Vec* src, __REGISTER Vec* unit) { + __REGISTER float c_half = 0.5f; + __REGISTER float c_three = 3.0f; + __REGISTER float v1_xy; + __REGISTER float v1_z; + __REGISTER float xx_zz; + __REGISTER float xx_yy; + __REGISTER float sqsum; + __REGISTER float rsqrt; + __REGISTER float nwork0; + __REGISTER float nwork1; asm { psq_l v1_xy, 0x0(src), 0, 0 @@ -117,8 +117,8 @@ f32 C_VECSquareMag(const Vec* v) { return sqmag; } -f32 PSVECSquareMag(const register Vec* v) { - register f32 vxy, vzz, sqmag; +f32 PSVECSquareMag(const __REGISTER Vec* v) { + __REGISTER f32 vxy, vzz, sqmag; asm { psq_l vxy, 0x0(v), 0, 0 @@ -135,11 +135,11 @@ f32 C_VECMag(const Vec* v) { return sqrtf(C_VECSquareMag(v)); } -f32 PSVECMag(const register Vec* v) { - register f32 vxy, vzz; - register f32 sqmag, rmag; - register f32 nwork0, nwork1; - register f32 c_three, c_half, c_zero; +f32 PSVECMag(const __REGISTER Vec* v) { + __REGISTER f32 vxy, vzz; + __REGISTER f32 sqmag, rmag; + __REGISTER f32 nwork0, nwork1; + __REGISTER f32 c_three, c_half, c_zero; c_half = 0.5f; @@ -178,7 +178,7 @@ f32 C_VECDotProduct(const Vec* a, const Vec* b) { return dot; } -asm f32 PSVECDotProduct(const register Vec* a, const register Vec* b) { +asm f32 PSVECDotProduct(const __REGISTER Vec* a, const __REGISTER Vec* b) { psq_l f2, Vec.y(a), 0, 0 psq_l f3, Vec.y(b), 0, 0 ps_mul f2, f2, f3 @@ -203,7 +203,7 @@ void C_VECCrossProduct(const Vec* a, const Vec* b, Vec* axb) { axb->z = vTmp.z; } -asm void PSVECCrossProduct(const register Vec* a, const register Vec* b, register Vec* axb) { +asm void PSVECCrossProduct(const __REGISTER Vec* a, const __REGISTER Vec* b, __REGISTER Vec* axb) { psq_l f1, Vec.x(b), 0, 0 lfs f2, Vec.z(a) psq_l f0, Vec.x(a), 0, 0 @@ -279,9 +279,9 @@ f32 C_VECSquareDistance(const Vec* a, const Vec* b) { return (diff.z * diff.z) + ((diff.x * diff.x) + (diff.y * diff.y)); } -f32 PSVECSquareDistance(const register Vec* a, const register Vec* b) { - register f32 v0yz, v1yz, v0xy, v1xy, dyz, dxy; - register f32 sqdist; +f32 PSVECSquareDistance(const __REGISTER Vec* a, const __REGISTER Vec* b) { + __REGISTER f32 v0yz, v1yz, v0xy, v1xy, dyz, dxy; + __REGISTER f32 sqdist; asm { psq_l v0yz, 0x4(a), 0, 0 @@ -302,11 +302,11 @@ f32 C_VECDistance(const Vec* a, const Vec* b) { return sqrtf(C_VECSquareDistance(a, b)); } -f32 PSVECDistance(const register Vec* a, const register Vec* b) { - register f32 v0yz, v1yz, v0xy, v1xy, dyz, dxy; - register f32 sqdist, rdist; - register f32 nwork0, nwork1; - register f32 c_half, c_three, c_zero; +f32 PSVECDistance(const __REGISTER Vec* a, const __REGISTER Vec* b) { + __REGISTER f32 v0yz, v1yz, v0xy, v1xy, dyz, dxy; + __REGISTER f32 sqdist, rdist; + __REGISTER f32 nwork0, nwork1; + __REGISTER f32 c_half, c_three, c_zero; asm { psq_l v0yz, 0x4(a), 0, 0 diff --git a/src/dolphin/os/OS.c b/src/dolphin/os/OS.c index 67fe5457b9..24a274b571 100644 --- a/src/dolphin/os/OS.c +++ b/src/dolphin/os/OS.c @@ -32,7 +32,7 @@ extern void __OSInitMemoryProtection(void); #define RBUILD_TIME "06:26:41" #endif -#ifdef DEBUG +#if DEBUG const char* __OSVersion = "<< Dolphin SDK - OS\tdebug build: "BUILD_DATE" "DBUILD_TIME" (0x2301) >>"; #else const char* __OSVersion = "<< Dolphin SDK - OS\trelease build: "BUILD_DATE" "RBUILD_TIME" (0x2301) >>"; @@ -590,7 +590,7 @@ entry __OSEVEnd void __OSUnhandledException(__OSException exception, OSContext* context, u32 dsisr, u32 dar); #ifdef __GEKKO__ -asm void OSDefaultExceptionHandler(register __OSException exception, register OSContext* context) { +asm void OSDefaultExceptionHandler(__REGISTER __OSException exception, __REGISTER OSContext* context) { nofralloc OS_EXCEPTION_SAVE_GPRS(context) mfdsisr r5 diff --git a/src/dolphin/os/OSAlarm.c b/src/dolphin/os/OSAlarm.c index 9a0d0d610b..b1922a6fa2 100644 --- a/src/dolphin/os/OSAlarm.c +++ b/src/dolphin/os/OSAlarm.c @@ -12,7 +12,7 @@ typedef struct { // prototypes static void SetTimer(OSAlarm * alarm); static void InsertAlarm(OSAlarm* alarm, OSTime fire, OSAlarmHandler handler); -static void DecrementerExceptionCallback(register __OSException exception, register OSContext* context); +static void DecrementerExceptionCallback(__REGISTER __OSException exception, __REGISTER OSContext* context); static void DecrementerExceptionHandler(__OSException exception, OSContext* context); static BOOL OnReset(BOOL final); @@ -178,8 +178,8 @@ void OSCancelAlarm(OSAlarm* alarm) { OSRestoreInterrupts(enabled); } -static void DecrementerExceptionCallback(register __OSException exception, - register OSContext* context) { +static void DecrementerExceptionCallback(__REGISTER __OSException exception, + __REGISTER OSContext* context) { OSAlarm* alarm; OSAlarm* next; OSAlarmHandler handler; @@ -230,8 +230,8 @@ static void DecrementerExceptionCallback(register __OSException exception, } #ifdef __GEKKO__ -static asm void DecrementerExceptionHandler(register __OSException exception, - register OSContext* context) { +static asm void DecrementerExceptionHandler(__REGISTER __OSException exception, + __REGISTER OSContext* context) { nofralloc OS_EXCEPTION_SAVE_GPRS(context) stwu r1, -8(r1) diff --git a/src/dolphin/os/OSAlloc.c b/src/dolphin/os/OSAlloc.c index 2ad58e3b4d..b45ba83aef 100644 --- a/src/dolphin/os/OSAlloc.c +++ b/src/dolphin/os/OSAlloc.c @@ -9,7 +9,7 @@ #define HEADERSIZE 32u #define MINOBJSIZE 64u -#ifdef DEBUG +#if DEBUG #define ENABLE_HEAPDESC #endif diff --git a/src/dolphin/os/OSCache.c b/src/dolphin/os/OSCache.c index b09cfbb1c9..c1bd1f2590 100644 --- a/src/dolphin/os/OSCache.c +++ b/src/dolphin/os/OSCache.c @@ -53,37 +53,37 @@ asm void DCUnfreeze(void) { blr } -asm void DCTouchLoad(register void* addr) { +asm void DCTouchLoad(__REGISTER void* addr) { nofralloc dcbt r0, addr blr } -asm void DCBlockZero(register void* addr) { +asm void DCBlockZero(__REGISTER void* addr) { nofralloc dcbz r0, addr blr } -asm void DCBlockStore(register void* addr) { +asm void DCBlockStore(__REGISTER void* addr) { nofralloc dcbst r0, addr blr } -asm void DCBlockFlush(register void* addr) { +asm void DCBlockFlush(__REGISTER void* addr) { nofralloc dcbf r0, addr blr } -asm void DCBlockInvalidate(register void* addr) { +asm void DCBlockInvalidate(__REGISTER void* addr) { nofralloc dcbi r0, addr blr } -asm void DCInvalidateRange(register void* addr, register u32 nBytes) { +asm void DCInvalidateRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -100,7 +100,7 @@ asm void DCInvalidateRange(register void* addr, register u32 nBytes) { blr } -asm void DCFlushRange(register void* addr, register u32 nBytes) { +asm void DCFlushRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -118,7 +118,7 @@ asm void DCFlushRange(register void* addr, register u32 nBytes) { blr } -asm void DCStoreRange(register void* addr, register u32 nBytes) { +asm void DCStoreRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -137,7 +137,7 @@ asm void DCStoreRange(register void* addr, register u32 nBytes) { blr } -asm void DCFlushRangeNoSync(register void* addr, register u32 nBytes) { +asm void DCFlushRangeNoSync(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -154,7 +154,7 @@ asm void DCFlushRangeNoSync(register void* addr, register u32 nBytes) { blr } -asm void DCStoreRangeNoSync(register void* addr, register u32 nBytes) { +asm void DCStoreRangeNoSync(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -172,7 +172,7 @@ asm void DCStoreRangeNoSync(register void* addr, register u32 nBytes) { blr } -asm void DCZeroRange(register void* addr, register u32 nBytes) { +asm void DCZeroRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -190,7 +190,7 @@ asm void DCZeroRange(register void* addr, register u32 nBytes) { blr } -asm void DCTouchRange(register void* addr, register u32 nBytes) { +asm void DCTouchRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -208,7 +208,7 @@ asm void DCTouchRange(register void* addr, register u32 nBytes) { blr } -asm void ICInvalidateRange(register void* addr, register u32 nBytes) { +asm void ICInvalidateRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -271,7 +271,7 @@ asm void ICUnfreeze(void) { blr } -asm void ICBlockInvalidate(register void* addr) { +asm void ICBlockInvalidate(__REGISTER void* addr) { nofralloc icbi r0, addr blr @@ -371,7 +371,7 @@ asm void LCDisable(void) { blr } -asm void LCAllocOneTag(register BOOL invalidate, register void* tag) { +asm void LCAllocOneTag(__REGISTER BOOL invalidate, __REGISTER void* tag) { nofralloc cmpwi invalidate, 0 beq @1 @@ -381,7 +381,7 @@ asm void LCAllocOneTag(register BOOL invalidate, register void* tag) { blr } -asm void LCAllocTags(register BOOL invalidate, register void* startTag, register u32 numBlocks) { +asm void LCAllocTags(__REGISTER BOOL invalidate, __REGISTER void* startTag, __REGISTER u32 numBlocks) { nofralloc mflr r6 cmplwi numBlocks, 0 @@ -404,7 +404,7 @@ asm void LCAllocTags(register BOOL invalidate, register void* startTag, register blr } -asm void LCLoadBlocks(register void* destTag, register void* srcAddr, register u32 numBlocks) { +asm void LCLoadBlocks(__REGISTER void* destTag, __REGISTER void* srcAddr, __REGISTER u32 numBlocks) { nofralloc rlwinm r6, numBlocks, 30, 27, 31 rlwinm srcAddr, srcAddr, 0, 4, 31 @@ -417,7 +417,7 @@ asm void LCLoadBlocks(register void* destTag, register void* srcAddr, register u blr } -asm void LCStoreBlocks(register void* destAddr, register void* srcTag, register u32 numBlocks) { +asm void LCStoreBlocks(__REGISTER void* destAddr, __REGISTER void* srcTag, __REGISTER u32 numBlocks) { nofralloc rlwinm r6, numBlocks, 30, 27, 31 rlwinm destAddr, destAddr, 0, 4, 31 @@ -509,7 +509,7 @@ asm u32 LCQueueLength(void) { blr } -asm void LCQueueWait(register u32 len) { +asm void LCQueueWait(__REGISTER u32 len) { nofralloc @1 mfspr r4, HID2 diff --git a/src/dolphin/os/OSContext.c b/src/dolphin/os/OSContext.c index a0c49b8481..0edc0f863c 100644 --- a/src/dolphin/os/OSContext.c +++ b/src/dolphin/os/OSContext.c @@ -14,7 +14,7 @@ volatile OSContext* __OSCurrentContext AT_ADDRESS(OS_BASE_CACHED | 0x00D4); volatile OSContext* __OSFPUContext AT_ADDRESS(OS_BASE_CACHED | 0x00D8); #ifdef __GEKKO__ -static asm void __OSLoadFPUContext(register u32 dummy, register OSContext* fpucontext) { +static asm void __OSLoadFPUContext(__REGISTER u32 dummy, __REGISTER OSContext* fpucontext) { nofralloc lhz r5, fpucontext->state; clrlwi. r5, r5, 31 @@ -96,7 +96,7 @@ _return: blr } -static asm void __OSSaveFPUContext(register u32 dummy1, register u32 dummy2, register OSContext* fpucontext) { +static asm void __OSSaveFPUContext(__REGISTER u32 dummy1, __REGISTER u32 dummy2, __REGISTER OSContext* fpucontext) { nofralloc lhz r3, fpucontext->state @@ -182,19 +182,19 @@ _return: blr } -asm void OSLoadFPUContext(register OSContext* fpucontext) { +asm void OSLoadFPUContext(__REGISTER OSContext* fpucontext) { nofralloc addi r4, fpucontext, 0 b __OSLoadFPUContext } -asm void OSSaveFPUContext(register OSContext* fpucontext) { +asm void OSSaveFPUContext(__REGISTER OSContext* fpucontext) { nofralloc addi r5, fpucontext, 0 b __OSSaveFPUContext } -asm void OSSetCurrentContext(register OSContext* context){ +asm void OSSetCurrentContext(__REGISTER OSContext* context){ nofralloc addis r4, r0, OS_CACHED_REGION_PREFIX @@ -234,7 +234,7 @@ OSContext* OSGetCurrentContext(void) { } #ifdef __GEKKO__ -asm u32 OSSaveContext(register OSContext* context) { +asm u32 OSSaveContext(__REGISTER OSContext* context) { nofralloc stmw r13, context->gpr[13] mfspr r0, GQR1 @@ -270,7 +270,7 @@ asm u32 OSSaveContext(register OSContext* context) { blr } -asm void OSLoadContext(register OSContext* context) { +asm void OSLoadContext(__REGISTER OSContext* context) { nofralloc lis r4,__RAS_OSDisableInterrupts_begin@ha @@ -347,7 +347,7 @@ asm u32 OSGetStackPointer() { blr } -asm u32 OSSwitchStack(register u32 newsp) { +asm u32 OSSwitchStack(__REGISTER u32 newsp) { nofralloc mr r5, r1 mr r1, newsp @@ -355,7 +355,7 @@ asm u32 OSSwitchStack(register u32 newsp) { blr } -asm int OSSwitchFiber(register u32 pc, register u32 newsp) { +asm int OSSwitchFiber(__REGISTER u32 pc, __REGISTER u32 newsp) { nofralloc mflr r0 mr r5, r1 @@ -372,7 +372,7 @@ asm int OSSwitchFiber(register u32 pc, register u32 newsp) { } #endif -void OSClearContext(register OSContext* context) { +void OSClearContext(__REGISTER OSContext* context) { context->mode = 0; context->state = 0; if (context == __OSFPUContext) @@ -380,7 +380,7 @@ void OSClearContext(register OSContext* context) { } #ifdef __GEKKO__ -asm void OSInitContext(register OSContext* context, register u32 pc, register u32 newsp) { +asm void OSInitContext(__REGISTER OSContext* context, __REGISTER u32 pc, __REGISTER u32 newsp) { nofralloc stw pc, OS_CONTEXT_SRR0(context) @@ -491,7 +491,7 @@ void OSDumpContext(OSContext* context) { } #ifdef __GEKKO__ -static asm void OSSwitchFPUContext(register __OSException exception, register OSContext* context) { +static asm void OSSwitchFPUContext(__REGISTER __OSException exception, __REGISTER OSContext* context) { nofralloc mfmsr r5 ori r5, r5, 0x2000 @@ -538,7 +538,7 @@ void __OSContextInit(void) { } #ifdef __GEKKO__ -asm void OSFillFPUContext(register OSContext* context) { +asm void OSFillFPUContext(__REGISTER OSContext* context) { nofralloc mfmsr r5 ori r5, r5, 0x2000 diff --git a/src/dolphin/os/OSExec.c b/src/dolphin/os/OSExec.c index 9033bc44c2..77fc0c86c1 100644 --- a/src/dolphin/os/OSExec.c +++ b/src/dolphin/os/OSExec.c @@ -51,7 +51,7 @@ static int PackArgs(void* addr, s32 argc, char** argv) { } #ifdef __GEKKO__ -static asm void Run(register void* entryPoint) { +static asm void Run(__REGISTER void* entryPoint) { nofralloc mflr r0 diff --git a/src/dolphin/os/OSFont.c b/src/dolphin/os/OSFont.c index 4e6738bf7e..6cab5a1a52 100644 --- a/src/dolphin/os/OSFont.c +++ b/src/dolphin/os/OSFont.c @@ -376,7 +376,7 @@ static void ReadROM(void* buf, int length, int offset) { static u32 ReadFont(void* img, u16 encode, void* fontData) { u32 size; -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif diff --git a/src/dolphin/os/OSInterrupt.c b/src/dolphin/os/OSInterrupt.c index 77d92bba23..3c174a21e4 100644 --- a/src/dolphin/os/OSInterrupt.c +++ b/src/dolphin/os/OSInterrupt.c @@ -77,7 +77,7 @@ char* __OSPIErrors[8] = { #endif // prototypes -static void ExternalInterruptHandler(register __OSException exception, register OSContext* context); +static void ExternalInterruptHandler(__REGISTER __OSException exception, __REGISTER OSContext* context); extern void __RAS_OSDisableInterrupts_begin(void); extern void __RAS_OSDisableInterrupts_end(void); @@ -103,7 +103,7 @@ asm BOOL OSEnableInterrupts(void) { blr } -asm BOOL OSRestoreInterrupts(register BOOL level) { +asm BOOL OSRestoreInterrupts(__REGISTER BOOL level) { nofralloc cmpwi level, 0 @@ -497,8 +497,8 @@ void __OSDispatchInterrupt(__OSException exception, OSContext* context) { } #ifdef __GEKKO__ -static asm void ExternalInterruptHandler(register __OSException exception, - register OSContext* context) { +static asm void ExternalInterruptHandler(__REGISTER __OSException exception, + __REGISTER OSContext* context) { #pragma unused(exception) nofralloc OS_EXCEPTION_SAVE_GPRS(context) diff --git a/src/dolphin/os/OSMemory.c b/src/dolphin/os/OSMemory.c index defbad9901..0e0ac287b1 100644 --- a/src/dolphin/os/OSMemory.c +++ b/src/dolphin/os/OSMemory.c @@ -179,7 +179,7 @@ static asm void Config48MB(void) { #endif #ifdef __GEKKO__ -static asm void RealMode(register u32 addr) { +static asm void RealMode(__REGISTER u32 addr) { nofralloc clrlwi addr, addr, 2 mtsrr0 addr @@ -191,7 +191,7 @@ static asm void RealMode(register u32 addr) { #endif void __OSInitMemoryProtection(void) { -#ifndef DEBUG +#if !DEBUG u32 padding[9]; u32 temp; #endif @@ -213,7 +213,7 @@ void __OSInitMemoryProtection(void) { __OSSetInterruptHandler(__OS_INTERRUPT_MEM_ADDRESS, MEMIntrruptHandler); OSRegisterResetFunction(&ResetFunctionInfo); -#ifdef DEBUG +#if DEBUG if (OSGetConsoleSimulatedMemSize() < OSGetPhysicalMemSize() && OSGetConsoleSimulatedMemSize() == 0x1800000) #else temp = OSGetConsoleSimulatedMemSize(); // not sure how else to get the order right on retail diff --git a/src/dolphin/os/OSRtc.c b/src/dolphin/os/OSRtc.c index 7b37b4cae0..ee55fcc0e4 100644 --- a/src/dolphin/os/OSRtc.c +++ b/src/dolphin/os/OSRtc.c @@ -331,7 +331,7 @@ u32 OSGetProgressiveMode(void) { } void OSSetProgressiveMode(u32 on) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSram* sram; @@ -439,7 +439,7 @@ u32 OSGetEuRgb60Mode(void) { } void OSSetEuRgb60Mode(u32 on) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSram* sram; @@ -492,7 +492,7 @@ u16 OSGetGbsMode(void) { } void OSSetGbsMode(u16 mode) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSramEx* sram; diff --git a/src/dolphin/os/OSThread.c b/src/dolphin/os/OSThread.c index e4f2362c90..6befa33a5d 100644 --- a/src/dolphin/os/OSThread.c +++ b/src/dolphin/os/OSThread.c @@ -131,7 +131,7 @@ void __OSThreadInit() { thread->mutex = 0; OSInitThreadQueue(&thread->queueJoin); -#ifdef DEBUG +#if DEBUG OSInitMutexQueue(&thread->queueMutex); #else thread->queueMutex.head = thread->queueMutex.tail = 0; // it got inlined? cant reproduce the inline... @@ -208,7 +208,7 @@ static BOOL __OSIsThreadActive(OSThread* thread) { } s32 OSDisableScheduler(void) { - register BOOL enabled; + __REGISTER BOOL enabled; s32 count; enabled = OSDisableInterrupts(); @@ -219,7 +219,7 @@ s32 OSDisableScheduler(void) { } s32 OSEnableScheduler(void) { - register BOOL enabled; + __REGISTER BOOL enabled; s32 count; enabled = OSDisableInterrupts(); @@ -430,7 +430,7 @@ int OSCreateThread(OSThread* thread, void* (*func)(void*), void* param, void* st thread->val = (void*)-1; thread->mutex = 0; OSInitThreadQueue(&thread->queueJoin); -#ifdef DEBUG +#if DEBUG OSInitMutexQueue(&thread->queueMutex); #else OSInitThreadQueue((void*)&thread->queueMutex); // why @@ -492,7 +492,7 @@ void OSExitThread(void* val) { __OSUnlockAllMutex(currentThread); OSWakeupThread(¤tThread->queueJoin); RunQueueHint = 1; -#ifdef DEBUG +#if DEBUG __OSReschedule(); #else if (RunQueueHint != 0) { @@ -839,9 +839,9 @@ s32 OSCheckActiveThreads(void) { } void OSClearStack(u8 val) { - register u32 sp; - register u32* p; - register u32 pattern; + __REGISTER u32 sp; + __REGISTER u32* p; + __REGISTER u32 pattern; pattern = (val << 24) | (val << 16) | (val << 8) | val; sp = OSGetStackPointer(); diff --git a/src/dolphin/os/OSTime.c b/src/dolphin/os/OSTime.c index 5813615e14..dc7644b277 100644 --- a/src/dolphin/os/OSTime.c +++ b/src/dolphin/os/OSTime.c @@ -81,7 +81,7 @@ OSTime __OSTimeToSystemTime(OSTime time) { } #ifdef __GEKKO__ -asm void __OSSetTick(register OSTick newTicks) { +asm void __OSSetTick(__REGISTER OSTick newTicks) { nofralloc mttbl newTicks blr diff --git a/src/dolphin/os/OSTimer.c b/src/dolphin/os/OSTimer.c index 99c13a62f5..1d0f90a02b 100644 --- a/src/dolphin/os/OSTimer.c +++ b/src/dolphin/os/OSTimer.c @@ -111,7 +111,7 @@ static void DecrementerExceptionCallback(__OSException exception, OSContext* con #ifdef __GEKKO__ static asm void DecrementerExceptionHandler(__OSException exception, - register OSContext* context) { + __REGISTER OSContext* context) { nofralloc stw r0, context->gpr[0] diff --git a/src/dolphin/os/__os.h b/src/dolphin/os/__os.h index 3ba03f3e8d..b74a5c3ae8 100644 --- a/src/dolphin/os/__os.h +++ b/src/dolphin/os/__os.h @@ -98,7 +98,7 @@ void __OSReschedule(void); // OSTime void __OSSetTime(OSTime time); OSTime __OSGetSystemTime(); -void __OSSetTick(register OSTick newTicks); +void __OSSetTick(__REGISTER OSTick newTicks); OSTime __OSTimeToSystemTime(OSTime time); // ppc_eabi_init diff --git a/src/dolphin/perf/perf.c b/src/dolphin/perf/perf.c index 08442222a1..fc86eebd67 100644 --- a/src/dolphin/perf/perf.c +++ b/src/dolphin/perf/perf.c @@ -50,7 +50,7 @@ static void PERFTimerCallback(OSAlarm* alarm, OSContext* context); void PERFStartAutoSampling(f32 msInterval); void PERFStopAutoSampling(void); -#ifndef DEBUG +#if !DEBUG inline s32 PERFGetNewSample(void) { if (PERFCurrSample >= (PERFNumSamples - 1)) { PERFCurrSample = PERFNumSamples - 1; diff --git a/src/dolphin/perf/perfdraw.c b/src/dolphin/perf/perfdraw.c index 621d1815e2..8bd961af0c 100644 --- a/src/dolphin/perf/perfdraw.c +++ b/src/dolphin/perf/perfdraw.c @@ -107,7 +107,7 @@ static f32 GPPts[4] = { void (*GameDrawInit)(); Mtx mID; -#ifndef DEBUG +#if !DEBUG inline f32 HEIGHT(u32 a, f32 f) { return 140.0f * ((f32) a / ((f32) MaxBusTransactions * f)); } diff --git a/src/dolphin/si/SIBios.c b/src/dolphin/si/SIBios.c index cc7164e8d2..39c2acb9bd 100644 --- a/src/dolphin/si/SIBios.c +++ b/src/dolphin/si/SIBios.c @@ -5,7 +5,7 @@ #define ROUND(n, a) (((u32)(n) + (a)-1) & ~((a)-1)) -#ifdef DEBUG +#if DEBUG const char* __SIVersion = "<< Dolphin SDK - SI\tdebug build: Apr 5 2004 03:55:31 (0x2301) >>"; #else const char* __SIVersion = "<< Dolphin SDK - SI\trelease build: Apr 5 2004 04:14:16 (0x2301) >>"; diff --git a/src/dolphin/si/SISteering.c b/src/dolphin/si/SISteering.c index c0d6c66b55..ceae68b131 100644 --- a/src/dolphin/si/SISteering.c +++ b/src/dolphin/si/SISteering.c @@ -80,7 +80,7 @@ s32 SIResetSteering(s32 chan) { SISteeringControl* sc; s32 ret; -#ifndef DEBUG +#if !DEBUG u32 padding; #endif diff --git a/src/dolphin/vi/vi.c b/src/dolphin/vi/vi.c index c28ed1c907..b35685ad5d 100644 --- a/src/dolphin/vi/vi.c +++ b/src/dolphin/vi/vi.c @@ -8,7 +8,7 @@ #include "__os.h" #include "__vi.h" -#ifdef DEBUG +#if DEBUG const char* __VIVersion = "<< Dolphin SDK - VI\tdebug build: Apr 7 2004 03:55:59 (0x2301) >>"; #else const char* __VIVersion = "<< Dolphin SDK - VI\trelease build: Apr 7 2004 04:13:59 (0x2301) >>"; @@ -773,7 +773,7 @@ void VIConfigure(const GXRenderModeObj* rm) { "VIConfigure(): Odd number(%d) is specified to viHeight\n", rm->viHeight); -#ifdef DEBUG +#if DEBUG if (rm->xFBmode == VI_XFBMODE_DF || newNonInter == VI_TVMODE_NTSC_PROG || newNonInter == 3) { ASSERTMSGLINEV(1933, rm->xfbHeight == rm->viHeight, "VIConfigure(): xfbHeight(%d) is not equal to viHeight(%d) when DF XFB mode or progressive mode is specified\n", diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index eb5aac665b..59efc4d817 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -705,7 +705,7 @@ static cull_box l_cullSizeBox[] = { {-60.0f, -20.0f, -60.0f}, {60.0f, 160.0f, 60.0f}, }, -#ifdef DEBUG +#if DEBUG { {-200.0f, 0.0f, -200.0f}, {200.0f, 400.0f, 200.0f}, @@ -746,7 +746,7 @@ static cull_sphere l_cullSizeSphere[] = { {0.0f, 0.0f, 0.0f}, 400.0f, }, -#ifdef DEBUG +#if DEBUG { {0.0f, 0.0f, 0.0f}, 400.0f, @@ -1140,7 +1140,7 @@ u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo) { return i_tableNo; } -#ifdef DEBUG +#if DEBUG if (tableList->mTableNum - 1 < i_tableNo) { // "Table Num<%d>, Specified Table<%d>, over table num!\n" OSReport_Error("テーブル数<%d>、指定テーブル番号<%d>で、テーブル数オーバーしています！\n", @@ -1231,7 +1231,7 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_itemNo, int i_ite return fpcM_ERROR_PROCESS_ID_e; } -#ifdef DEBUG +#if DEBUG if (tableList->mTableNum - 1 < i_itemNo) { // "Table Num<%d>, Specified Table<%d>, over table num!\n" OSReport_Error("テーブル数<%d>、指定テーブル番号<%d>で、テーブル数オーバーしています！\n", @@ -1335,7 +1335,7 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i switch (i_itemNo) { case fpcNm_ITEM_RECOVERY_FAILY: return fopAcM_create(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); -#ifdef DEBUG +#if DEBUG case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); @@ -1391,7 +1391,7 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi case fpcNm_ITEM_RECOVERY_FAILY: return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); -#ifdef DEBUG +#if DEBUG case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); @@ -1449,7 +1449,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, case fpcNm_ITEM_RECOVERY_FAILY: return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); -#ifdef DEBUG +#if DEBUG case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index e10cd007e0..49406aee04 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -44,7 +44,7 @@ int fpcBs_MakeOfId() { int fpcBs_Execute(base_process_class* i_proc) { int result = 1; -#ifdef DEBUG +#if DEBUG if (!fpcBs_Is_JustOfType(g_fpcBs_type, i_proc->type)) { if (g_fpcDbSv_service[10] != NULL) { g_fpcDbSv_service[10](i_proc); diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp index 9e4c14a57f..36fbcf9604 100644 --- a/src/f_pc/f_pc_create_req.cpp +++ b/src/f_pc/f_pc_create_req.cpp @@ -100,7 +100,7 @@ BOOL fpcCtRq_Do(create_request* i_request) { } case cPhs_UNK3_e: case cPhs_ERROR_e: -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[2] != NULL) { g_fpcDbSv_service[2](i_request->process); } @@ -112,7 +112,7 @@ BOOL fpcCtRq_Do(create_request* i_request) { } int fpcCtRq_Handler() { -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[3] != NULL) { g_fpcDbSv_service[3](&g_fpcCtTg_Queue.mSize); } diff --git a/src/f_pc/f_pc_debug_sv.cpp b/src/f_pc/f_pc_debug_sv.cpp index ee78360f14..5d78ea3e22 100644 --- a/src/f_pc/f_pc_debug_sv.cpp +++ b/src/f_pc/f_pc_debug_sv.cpp @@ -1,4 +1,4 @@ -#ifdef DEBUG +#if DEBUG #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_debug_sv.h" diff --git a/src/f_pc/f_pc_delete_tag.cpp b/src/f_pc/f_pc_delete_tag.cpp index cb5e4c026c..2dc2b5a4c3 100644 --- a/src/f_pc/f_pc_delete_tag.cpp +++ b/src/f_pc/f_pc_delete_tag.cpp @@ -32,7 +32,7 @@ s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) { if (i_func(i_deleteTag->base.mpTagData) == 0) { fpcDtTg_ToDeleteQ(i_deleteTag); -#ifdef DEBUG +#if DEBUG if (i_deleteTag->unk_0x1c-- <= 0) { i_deleteTag->unk_0x1c = 0; if (g_fpcDbSv_service[4] != NULL) { diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp index 36612f8f0c..23b061652c 100644 --- a/src/f_pc/f_pc_deletor.cpp +++ b/src/f_pc/f_pc_deletor.cpp @@ -34,7 +34,7 @@ s32 fpcDt_deleteMethod(base_process_class* i_proc) { } void fpcDt_Handler() { -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[6] != NULL) { g_fpcDbSv_service[6](&g_fpcDtTg_Queue.mSize); } @@ -105,7 +105,7 @@ s32 fpcDt_Delete(void* i_proc) { base_process_class* proc = (base_process_class*)i_proc; if (proc != NULL) { -#ifdef DEBUG +#if DEBUG if (!fpcBs_Is_JustOfType(g_fpcBs_type, proc->type)) { if (g_fpcDbSv_service[12] != NULL) { g_fpcDbSv_service[12](proc); @@ -121,7 +121,7 @@ s32 fpcDt_Delete(void* i_proc) { return 0; int ret = fpcDt_ToDeleteQ(proc); -#ifdef DEBUG +#if DEBUG if (ret == 0) { if (g_fpcDbSv_service[5] != NULL) { g_fpcDbSv_service[5](proc); diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp index 86ee24a1aa..de6b0c6b66 100644 --- a/src/f_pc/f_pc_executor.cpp +++ b/src/f_pc/f_pc_executor.cpp @@ -45,7 +45,7 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) { return 0; } -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[1] != NULL) { g_fpcDbSv_service[1](i_proc); } diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index 9a6ce532d8..4a1664e43d 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -22,7 +22,7 @@ s32 fpcLf_Draw(leafdraw_class* i_leaf) { } s32 fpcLf_Execute(leafdraw_class* i_leaf) { -#ifdef DEBUG +#if DEBUG if (fpcBs_Is_JustOfType(g_fpcLf_type, i_leaf->base.subtype) == 0) { if (g_fpcDbSv_service[12] != NULL) { g_fpcDbSv_service[12](i_leaf); diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index 0982b64a94..d3c387d484 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -29,7 +29,7 @@ s32 fpcNd_Execute(process_node_class* i_procNode) { s32 ret = 0; layer_class* save_layer = fpcLy_CurrentLayer(); -#ifdef DEBUG +#if DEBUG if (fpcBs_Is_JustOfType(g_fpcNd_type, i_procNode->base.subtype) == 0) { if (g_fpcDbSv_service[11] != NULL) { g_fpcDbSv_service[11](i_procNode); diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 6c15f5180c..dbb8640f0b 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -29,7 +29,7 @@ void fpcNdRq_ToRequestQ(node_create_request* i_request) { s32 fpcNdRq_phase_IsCreated(node_create_request* i_request) { if (fpcCtRq_IsCreatingByID(i_request->creating_id) == TRUE) { -#ifdef DEBUG +#if DEBUG if (i_request->unk_0x64-- <= 0) { i_request->unk_0x64 = 0; if (g_fpcDbSv_service[8] != NULL) { @@ -64,7 +64,7 @@ s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request) { s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request) { if (fpcDt_IsComplete() == FALSE) { -#ifdef DEBUG +#if DEBUG if (i_request->unk_0x68-- <= 0) { i_request->unk_0x68 = 0; if (g_fpcDbSv_service[7] != NULL) { @@ -140,7 +140,7 @@ s32 fpcNdRq_Cancel(node_create_request* i_request) { s32 fpcNdRq_Handler() { node_class* node = l_fpcNdRq_Queue.mpHead; -#ifdef DEBUG +#if DEBUG if (g_fpcDbSv_service[9] != NULL) { g_fpcDbSv_service[9](&l_fpcNdRq_Queue.mSize); } @@ -218,7 +218,7 @@ node_create_request* fpcNdRq_Create(u32 i_requestSize) { cTg_Create(&req->create_tag, req); fpcMtdTg_Init(&req->method_tag, (process_method_tag_func)fpcNdRq_Cancel, req); req->request_id = request_id++; -#ifdef DEBUG +#if DEBUG req->unk_0x64 = 60; req->unk_0x68 = 60; #endif diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index de1d54cde4..b445e994bc 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -44,7 +44,7 @@ s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) { fpcLy_SetCurrentLayer(i_request->base.layer); int ret = fpcBs_SubCreate(i_request->base.process); -#ifdef DEBUG +#if DEBUG if (ret == 0 && i_request->unk_0x60-- <= 0) { i_request->unk_0x60 = 0; if (g_fpcDbSv_service[0] != NULL) { @@ -139,7 +139,7 @@ fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc request->create_post_method = i_createFunc; request->unk_0x5C = param_4; request->process_append = i_append; -#ifdef DEBUG +#if DEBUG request->unk_0x60 = 60; #endif diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index e7ca3efa65..4c4f85c785 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -717,7 +717,7 @@ JKRExpHeap* mDoExt_getHostIOHeap() { return HostIOHeap; } -#ifdef DEBUG +#if DEBUG extern u8 lbl_8074C3B9[1]; #endif @@ -728,7 +728,7 @@ static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_a JKRSolidHeap* createdHeap; if (i_size == 0 || i_size == -1) { - #ifdef DEBUG + #if DEBUG if (lbl_8074C3B9[0] != 0) { OS_REPORT("\x1b[44mmDoExt_createSolidHeap サイズ未設定\n\x1b[m"); OS_REPORT("最大空き容量確保します %08x\n\x1b[m", i_heap->getFreeSize()); @@ -748,7 +748,7 @@ static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_a if (createdHeap != NULL) { JKRSetErrorFlag(createdHeap, true); - #ifdef DEBUG + #if DEBUG if (lbl_8074C3B9[0] != 0) { u32 heapSize = createdHeap->getHeapSize(); OS_REPORT( @@ -761,7 +761,7 @@ static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_a #endif } -#ifdef DEBUG +#if DEBUG if (createdHeap == NULL) { OS_WARNING( "mDoExt_createMaxSolidHeap : ソリッドヒープ%fKの確保に失敗 連続空き容量=%fK 残り空き容量=%f\n", @@ -2807,7 +2807,7 @@ void mDoExt_3DlineMatSortPacket::draw() { J3DShape::resetVcdVatCache(); } -#ifdef DEBUG +#if DEBUG mDoExt_cube8pPacket::mDoExt_cube8pPacket(cXyz* i_points, const GXColor& i_color) { cXyz* pnt_array = mPoints; diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 2765a65c99..5b80b40201 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -767,8 +767,9 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ if (daPy_getLinkPlayerActorClass() != NULL) { u8 sp8 = 1; #if DEBUG - if (g_envHIO.mOther.mDepthOfField) { + if (g_envHIO.mOther.mDepthOfField) #endif + { if (mDoGph_gInf_c::isAutoForcus()) { f32 sp4C[7]; f32 sp34[6]; @@ -998,9 +999,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ GXSetTevSwapModeTable(GX_TEV_SWAP3, GX_CH_BLUE, GX_CH_BLUE, GX_CH_BLUE, GX_CH_ALPHA); GXSetTevSwapMode(GX_TEVSTAGE0, GX_TEV_SWAP0, GX_TEV_SWAP0); GXSetProjection(param_0->projMtx, GX_PERSPECTIVE); - #if DEBUG } - #endif } } @@ -1537,17 +1536,11 @@ int mDoGph_Painter() { dComIfGd_drawOpaListDarkBG(); dComIfGd_drawOpaListMiddle(); - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawFogPri0_B(&draw_info); } - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawNormalPri0_B(&draw_info); } @@ -1569,14 +1562,11 @@ int mDoGph_Painter() { dComIfGd_drawOpaList(); - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d) { + if (DEBUG && g_kankyoHIO.navy.field_0x30d) { if (dKy_darkworld_check() != TRUE) { dComIfGd_drawOpaListDark(); } - } else - #endif - { + } else { dComIfGd_drawOpaListDark(); } @@ -1592,10 +1582,7 @@ int mDoGph_Painter() { dComIfGd_drawXluListBG(); dComIfGd_drawXluListDarkBG(); - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawFogPri0_A(&draw_info); dComIfGp_particle_drawNormalPri0_A(&draw_info); } @@ -1609,14 +1596,11 @@ int mDoGph_Painter() { dComIfGd_drawXluList(); - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d) { + if (DEBUG && g_kankyoHIO.navy.field_0x30d) { if (dKy_darkworld_check() != TRUE) { dComIfGd_drawXluListDark(); } - } else - #endif - { + } else { dComIfGd_drawXluListDark(); } @@ -1653,10 +1637,8 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d == 0 || dKy_darkworld_check() != TRUE) - #endif - { + if (!(DEBUG && g_kankyoHIO.navy.field_0x30d != 0 && + dKy_darkworld_check() == TRUE)) { if (g_env_light.is_blure == 0) { dComIfGd_drawOpaListInvisible(); dComIfGd_drawXluListInvisible(); @@ -1671,10 +1653,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawFogPri4(&draw_info); dComIfGp_particle_drawProjection(&draw_info); } @@ -1697,14 +1676,11 @@ int mDoGph_Painter() { GXSetClipMode(GX_CLIP_ENABLE); - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d) { + if (DEBUG && g_kankyoHIO.navy.field_0x30d) { if (dKy_darkworld_check() != TRUE) { dComIfGd_drawOpaListFilter(); } - } else - #endif - { + } else { dComIfGd_drawOpaListFilter(); } @@ -1717,10 +1693,7 @@ int mDoGph_Painter() { GXSetClipMode(GX_CLIP_ENABLE); - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawFogPri1(&draw_info); dComIfGp_particle_draw(&draw_info); dComIfGp_particle_drawFogPri2(&draw_info); @@ -1748,20 +1721,15 @@ int mDoGph_Painter() { GXSetClipMode(GX_CLIP_ENABLE); - #if DEBUG - if (g_kankyoHIO.navy.field_0x30d == 0 || dKy_darkworld_check() != TRUE) - #endif - { + if (!(DEBUG && g_kankyoHIO.navy.field_0x30d != 0 && + dKy_darkworld_check() == TRUE)) { if (g_env_light.is_blure == 1) { dComIfGd_drawOpaListInvisible(); dComIfGd_drawXluListInvisible(); } } - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { dComIfGp_particle_drawScreen(&draw_info); } @@ -1848,10 +1816,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - #if DEBUG - if (fapGmHIO_getParticle()) - #endif - { + if (fapGmHIO_getParticle()) { #if WIDESCREEN_SUPPORT if (mDoGph_gInf_c::isWideZoom()) { ortho.setOrtho(0.0f, 0.0f, 608.0f, 448.0f, 100000.0f, -100000.0f); @@ -1947,10 +1912,7 @@ int mDoGph_Painter() { captureScreenSetPort(); #endif - #if DEBUG - if (fapGmHIO_get2Ddraw()) - #endif - { + if (fapGmHIO_get2Ddraw()) { Mtx m4; cMtx_copy(j3dSys.getViewMtx(), m4); diff --git a/src/m_Do/m_Do_hostIO.cpp b/src/m_Do/m_Do_hostIO.cpp index 1f2cc6c1f1..3183dc76e7 100644 --- a/src/m_Do/m_Do_hostIO.cpp +++ b/src/m_Do/m_Do_hostIO.cpp @@ -1,7 +1,7 @@ #include "m_Do/m_Do_hostIO.h" #include -#ifdef DEBUG +#if DEBUG mDoHIO_root_c mDoHIO_root; diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 54caefa88e..fed3d8c4d3 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -219,7 +219,7 @@ GXRenderModeObj g_ntscZeldaProg = { }; #endif -#ifdef DEBUG +#if DEBUG static void myGXVerifyCallback(GXWarningLevel, u32, const char*); GXRenderModeObj g_palZeldaProg60 = { @@ -601,14 +601,14 @@ int mDoMch_Create() { } JKRHeap::setDefaultDebugFill(mDoMch::mDebugFill); - #ifdef DEBUG + #if DEBUG JKRSetDebugFillNotuse(mDoMch::mDebugFillNotUse); JKRSetDebugFillNew(mDoMch::mDebugFillNew); JKRSetDebugFillDelete(mDoMch::mDebugFillDelete); #endif JFWSystem::setMaxStdHeap(1); - #ifndef DEBUG + #if !DEBUG uintptr_t arenaHi = (uintptr_t)OSGetArenaHi(); uintptr_t arenaLo = (uintptr_t)OSGetArenaLo(); @@ -654,7 +654,7 @@ int mDoMch_Create() { gameHeapSize += 0x100000; dynamicLinkHeapSize = 0x180000; - #ifndef DEBUG + #if !DEBUG // Fakematch because the heap sizes differ between debug and retail. // Maybe the actual calculations above use sizeof or constants and that's why it's different? archiveHeapSize -= 0x641800; @@ -666,7 +666,7 @@ int mDoMch_Create() { gameHeapSize += 0xC800; #endif - #ifdef DEBUG + #if DEBUG if (mDoMain::archiveHeapSize != -1) { OSReport_Error("アーカイブヒープサイズ指定！\n"); archiveHeapSize = mDoMain::archiveHeapSize; @@ -685,7 +685,7 @@ int mDoMch_Create() { arenaSize -= (dbPrintHeapSize + 0x10); arenaSize -= 0x120; - #ifndef DEBUG + #if !DEBUG arenaSize -= 0xDAB400; #endif #if VERSION == VERSION_GCN_JPN @@ -700,14 +700,14 @@ int mDoMch_Create() { } JFWSystem::setFifoBufSize(0xA0000); - #ifdef DEBUG + #if DEBUG JFWSystem::setAramAudioBufSize(0xB00000); #else JFWSystem::setAramAudioBufSize(0xA00000); #endif JFWSystem::setAramGraphBufSize(-1); - #ifdef DEBUG + #if DEBUG VIInit(); if (VIGetDTVStatus() != 0 && mDoMch_IsProgressiveMode()) { mDoMch_render_c::setProgressiveMode(); @@ -752,7 +752,7 @@ int mDoMch_Create() { JKRSetErrorFlag(JFWSystem::getSystemHeap(), true); JKRHeap* rootHeap = (JKRHeap*)JKRGetRootHeap(); - #ifdef DEBUG + #if DEBUG JKRHeap* rootHeap2 = JKRGetRootHeap2(); #else JKRHeap* rootHeap2 = rootHeap; @@ -762,7 +762,7 @@ int mDoMch_Create() { heap = mDoExt_createCommandHeap(commandHeapSize, rootHeap); my_SysPrintHeap("コマンドヒープ", heap, commandHeapSize); - #ifdef DEBUG + #if DEBUG heap = DynamicModuleControlBase::createHeap(dynamicLinkHeapSize, rootHeap); my_SysPrintHeap("ダイナミックリンクヒープ", heap, dynamicLinkHeapSize); #endif @@ -779,7 +779,7 @@ int mDoMch_Create() { heap = mDoExt_createGameHeap(gameHeapSize, rootHeap); my_SysPrintHeap("ゲームヒープ", heap, gameHeapSize); - #ifdef DEBUG + #if DEBUG JKRHeap* sp28 = rootHeap2; u32 hostIOHeapSize = 0x71450; hostIOHeapSize += 0x32000; @@ -795,7 +795,7 @@ int mDoMch_Create() { my_SysPrintHeap("ゼルダヒープ", zeldaHeap, size); JKRSetCurrentHeap(zeldaHeap); - #ifdef DEBUG + #if DEBUG my_PrintHeap("システムヒープ", JKRGetSystemHeap()->getTotalFreeSize()); my_PrintHeap("ルートヒープ", JKRGetRootHeap()->getTotalFreeSize()); my_PrintHeap("ルートヒープ2", JKRGetRootHeap2()->getTotalFreeSize()); @@ -811,7 +811,7 @@ int mDoMch_Create() { sysConsole->setOutput(JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT); sysConsole->setPosition(16, 42); -#ifdef DEBUG +#if DEBUG JUTException::setMapFile("/map/RVL/Debug/RframeworkD.map"); #else JUTException::appendMapFile("/map/Final/Release/frameworkF.map"); @@ -821,7 +821,7 @@ int mDoMch_Create() { cMl::init(mDoExt_getZeldaHeap()); cM_initRnd(100, 100, 100); - #ifdef DEBUG + #if DEBUG GXSetVerifyLevel((GXWarningLevel)mDoMch::GXWarningLevel); GXSetVerifyCallback((GXVerifyCallback)&myGXVerifyCallback); #endif diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 6574caa9be..2847f5a811 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -176,14 +176,14 @@ int mDoMain::argument = -1; s8 mDoMain::developmentMode = -1; -#ifdef DEBUG +#if DEBUG u32 mDoMain::gameHeapSize = 0xFFFFFFFF; u32 mDoMain::archiveHeapSize = 0xFFFFFFFF; #endif u32 mDoMain::memMargin = 0xFFFFFFFF; -#ifdef DEBUG +#if DEBUG int mDoMain::e3menu_no = -1; #endif diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index a9cedd3dfa..70b15a7238 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -19,7 +19,7 @@ u8 __OSReport_System_disable; u8 __OSReport_enable; #ifdef __GEKKO__ -asm void OSSwitchFiberEx(register u32 param_0, register u32 param_1, register u32 param_2, register u32 param_3, register u32 code, register u32 stack) { +asm void OSSwitchFiberEx(__REGISTER u32 param_0, __REGISTER u32 param_1, __REGISTER u32 param_2, __REGISTER u32 param_3, __REGISTER u32 code, __REGISTER u32 stack) { nofralloc mflr r0 diff --git a/src/revolution/os/OS.c b/src/revolution/os/OS.c index 6a24724002..fc769082da 100644 --- a/src/revolution/os/OS.c +++ b/src/revolution/os/OS.c @@ -936,7 +936,7 @@ entry __OSEVEnd void __OSUnhandledException(__OSException exception, OSContext* context, u32 dsisr, u32 dar); #ifdef __GEKKO__ -asm void OSDefaultExceptionHandler(register __OSException exception, register OSContext* context) { +asm void OSDefaultExceptionHandler(__REGISTER __OSException exception, __REGISTER OSContext* context) { nofralloc OS_EXCEPTION_SAVE_GPRS(context) mfdsisr r5 diff --git a/src/revolution/os/OSAlarm.c b/src/revolution/os/OSAlarm.c index 5bebab4b6a..fd50cb3199 100644 --- a/src/revolution/os/OSAlarm.c +++ b/src/revolution/os/OSAlarm.c @@ -12,7 +12,7 @@ typedef struct { // prototypes static void SetTimer(OSAlarm * alarm); static void InsertAlarm(OSAlarm* alarm, OSTime fire, OSAlarmHandler handler); -static void DecrementerExceptionCallback(register __OSException exception, register OSContext* context); +static void DecrementerExceptionCallback(__REGISTER __OSException exception, __REGISTER OSContext* context); static void DecrementerExceptionHandler(__OSException exception, OSContext* context); static BOOL OnReset(BOOL final, u32 event); @@ -178,8 +178,8 @@ void OSCancelAlarm(OSAlarm* alarm) { OSRestoreInterrupts(enabled); } -static void DecrementerExceptionCallback(register __OSException exception, - register OSContext* context) { +static void DecrementerExceptionCallback(__REGISTER __OSException exception, + __REGISTER OSContext* context) { OSAlarm* alarm; OSAlarm* next; OSAlarmHandler handler; @@ -230,8 +230,8 @@ static void DecrementerExceptionCallback(register __OSException exception, } #ifdef __GEKKO__ -static asm void DecrementerExceptionHandler(register __OSException exception, - register OSContext* context) { +static asm void DecrementerExceptionHandler(__REGISTER __OSException exception, + __REGISTER OSContext* context) { nofralloc OS_EXCEPTION_SAVE_GPRS(context) stwu r1, -8(r1) diff --git a/src/revolution/os/OSAlloc.c b/src/revolution/os/OSAlloc.c index e1294521c9..15d46404a9 100644 --- a/src/revolution/os/OSAlloc.c +++ b/src/revolution/os/OSAlloc.c @@ -9,7 +9,7 @@ #define HEADERSIZE 32u #define MINOBJSIZE 64u -#ifdef DEBUG +#if DEBUG #define ENABLE_HEAPDESC #endif diff --git a/src/revolution/os/OSCache.c b/src/revolution/os/OSCache.c index 9cfbfd701f..8d25467da4 100644 --- a/src/revolution/os/OSCache.c +++ b/src/revolution/os/OSCache.c @@ -53,37 +53,37 @@ asm void DCUnfreeze(void) { blr } -asm void DCTouchLoad(register void* addr) { +asm void DCTouchLoad(__REGISTER void* addr) { nofralloc dcbt r0, addr blr } -asm void DCBlockZero(register void* addr) { +asm void DCBlockZero(__REGISTER void* addr) { nofralloc dcbz r0, addr blr } -asm void DCBlockStore(register void* addr) { +asm void DCBlockStore(__REGISTER void* addr) { nofralloc dcbst r0, addr blr } -asm void DCBlockFlush(register void* addr) { +asm void DCBlockFlush(__REGISTER void* addr) { nofralloc dcbf r0, addr blr } -asm void DCBlockInvalidate(register void* addr) { +asm void DCBlockInvalidate(__REGISTER void* addr) { nofralloc dcbi r0, addr blr } -asm void DCInvalidateRange(register void* addr, register u32 nBytes) { +asm void DCInvalidateRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -100,7 +100,7 @@ asm void DCInvalidateRange(register void* addr, register u32 nBytes) { blr } -asm void DCFlushRange(register void* addr, register u32 nBytes) { +asm void DCFlushRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -118,7 +118,7 @@ asm void DCFlushRange(register void* addr, register u32 nBytes) { blr } -asm void DCStoreRange(register void* addr, register u32 nBytes) { +asm void DCStoreRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -137,7 +137,7 @@ asm void DCStoreRange(register void* addr, register u32 nBytes) { blr } -asm void DCFlushRangeNoSync(register void* addr, register u32 nBytes) { +asm void DCFlushRangeNoSync(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -154,7 +154,7 @@ asm void DCFlushRangeNoSync(register void* addr, register u32 nBytes) { blr } -asm void DCStoreRangeNoSync(register void* addr, register u32 nBytes) { +asm void DCStoreRangeNoSync(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -172,7 +172,7 @@ asm void DCStoreRangeNoSync(register void* addr, register u32 nBytes) { blr } -asm void DCZeroRange(register void* addr, register u32 nBytes) { +asm void DCZeroRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -190,7 +190,7 @@ asm void DCZeroRange(register void* addr, register u32 nBytes) { blr } -asm void DCTouchRange(register void* addr, register u32 nBytes) { +asm void DCTouchRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -208,7 +208,7 @@ asm void DCTouchRange(register void* addr, register u32 nBytes) { blr } -asm void ICInvalidateRange(register void* addr, register u32 nBytes) { +asm void ICInvalidateRange(__REGISTER void* addr, __REGISTER u32 nBytes) { nofralloc cmplwi nBytes, 0 blelr @@ -271,7 +271,7 @@ asm void ICUnfreeze(void) { blr } -asm void ICBlockInvalidate(register void* addr) { +asm void ICBlockInvalidate(__REGISTER void* addr) { nofralloc icbi r0, addr blr @@ -371,7 +371,7 @@ asm void LCDisable(void) { blr } -asm void LCAllocOneTag(register BOOL invalidate, register void* tag) { +asm void LCAllocOneTag(__REGISTER BOOL invalidate, __REGISTER void* tag) { nofralloc cmpwi invalidate, 0 beq @1 @@ -381,7 +381,7 @@ asm void LCAllocOneTag(register BOOL invalidate, register void* tag) { blr } -asm void LCAllocTags(register BOOL invalidate, register void* startTag, register u32 numBlocks) { +asm void LCAllocTags(__REGISTER BOOL invalidate, __REGISTER void* startTag, __REGISTER u32 numBlocks) { nofralloc mflr r6 cmplwi numBlocks, 0 @@ -404,7 +404,7 @@ asm void LCAllocTags(register BOOL invalidate, register void* startTag, register blr } -asm void LCLoadBlocks(register void* destTag, register void* srcAddr, register u32 numBlocks) { +asm void LCLoadBlocks(__REGISTER void* destTag, __REGISTER void* srcAddr, __REGISTER u32 numBlocks) { nofralloc rlwinm r6, numBlocks, 30, 27, 31 rlwinm srcAddr, srcAddr, 0, 4, 31 @@ -417,7 +417,7 @@ asm void LCLoadBlocks(register void* destTag, register void* srcAddr, register u blr } -asm void LCStoreBlocks(register void* destAddr, register void* srcTag, register u32 numBlocks) { +asm void LCStoreBlocks(__REGISTER void* destAddr, __REGISTER void* srcTag, __REGISTER u32 numBlocks) { nofralloc rlwinm r6, numBlocks, 30, 27, 31 rlwinm destAddr, destAddr, 0, 3, 31 @@ -509,7 +509,7 @@ asm u32 LCQueueLength(void) { blr } -asm void LCQueueWait(register u32 len) { +asm void LCQueueWait(__REGISTER u32 len) { nofralloc @1 mfspr r4, HID2 diff --git a/src/revolution/os/OSContext.c b/src/revolution/os/OSContext.c index 57e670f4f3..b603cef34f 100644 --- a/src/revolution/os/OSContext.c +++ b/src/revolution/os/OSContext.c @@ -14,7 +14,7 @@ volatile OSContext* __OSCurrentContext AT_ADDRESS(OS_BASE_CACHED | 0x00D4); volatile OSContext* __OSFPUContext AT_ADDRESS(OS_BASE_CACHED | 0x00D8); #ifdef __GEKKO__ -static asm void __OSLoadFPUContext(register u32 dummy, register OSContext* fpucontext) { +static asm void __OSLoadFPUContext(__REGISTER u32 dummy, __REGISTER OSContext* fpucontext) { nofralloc lhz r5, fpucontext->state; clrlwi. r5, r5, 31 @@ -96,7 +96,7 @@ _return: blr } -static asm void __OSSaveFPUContext(register u32 dummy1, register u32 dummy2, register OSContext* fpucontext) { +static asm void __OSSaveFPUContext(__REGISTER u32 dummy1, __REGISTER u32 dummy2, __REGISTER OSContext* fpucontext) { nofralloc lhz r3, fpucontext->state @@ -182,19 +182,19 @@ _return: blr } -asm void OSLoadFPUContext(register OSContext* fpucontext) { +asm void OSLoadFPUContext(__REGISTER OSContext* fpucontext) { nofralloc addi r4, fpucontext, 0 b __OSLoadFPUContext } -asm void OSSaveFPUContext(register OSContext* fpucontext) { +asm void OSSaveFPUContext(__REGISTER OSContext* fpucontext) { nofralloc addi r5, fpucontext, 0 b __OSSaveFPUContext } -asm void OSSetCurrentContext(register OSContext* context){ +asm void OSSetCurrentContext(__REGISTER OSContext* context){ nofralloc addis r4, r0, OS_CACHED_REGION_PREFIX @@ -234,7 +234,7 @@ OSContext* OSGetCurrentContext(void) { } #ifdef __GEKKO__ -asm u32 OSSaveContext(register OSContext* context) { +asm u32 OSSaveContext(__REGISTER OSContext* context) { nofralloc stmw r13, context->gpr[13] mfspr r0, GQR1 @@ -270,7 +270,7 @@ asm u32 OSSaveContext(register OSContext* context) { blr } -asm void OSLoadContext(register OSContext* context) { +asm void OSLoadContext(__REGISTER OSContext* context) { nofralloc lis r4,__RAS_OSDisableInterrupts_begin@ha @@ -347,7 +347,7 @@ asm u32 OSGetStackPointer() { blr } -asm u32 OSSwitchStack(register u32 newsp) { +asm u32 OSSwitchStack(__REGISTER u32 newsp) { nofralloc mr r5, r1 mr r1, newsp @@ -355,7 +355,7 @@ asm u32 OSSwitchStack(register u32 newsp) { blr } -asm int OSSwitchFiber(register u32 pc, register u32 newsp) { +asm int OSSwitchFiber(__REGISTER u32 pc, __REGISTER u32 newsp) { nofralloc mflr r0 mr r5, r1 @@ -373,7 +373,7 @@ asm int OSSwitchFiber(register u32 pc, register u32 newsp) { #endif #ifdef __GEKKO__ -asm void OSSwitchFiberEx(register u32 param_0, register u32 param_1, register u32 param_2, register u32 param_3, register u32 pc, register u32 newsp) { +asm void OSSwitchFiberEx(__REGISTER u32 param_0, __REGISTER u32 param_1, __REGISTER u32 param_2, __REGISTER u32 param_3, __REGISTER u32 pc, __REGISTER u32 newsp) { nofralloc mflr r0 @@ -400,7 +400,7 @@ asm void OSSwitchFiberEx(register u32 param_0, register u32 param_1, register u3 } #endif -void OSClearContext(register OSContext* context) { +void OSClearContext(__REGISTER OSContext* context) { context->mode = 0; context->state = 0; if (context == __OSFPUContext) @@ -408,7 +408,7 @@ void OSClearContext(register OSContext* context) { } #ifdef __GEKKO__ -asm void OSInitContext(register OSContext* context, register u32 pc, register u32 newsp) { +asm void OSInitContext(__REGISTER OSContext* context, __REGISTER u32 pc, __REGISTER u32 newsp) { nofralloc stw pc, OS_CONTEXT_SRR0(context) @@ -519,7 +519,7 @@ void OSDumpContext(OSContext* context) { } #ifdef __GEKKO__ -static asm void OSSwitchFPUContext(register __OSException exception, register OSContext* context) { +static asm void OSSwitchFPUContext(__REGISTER __OSException exception, __REGISTER OSContext* context) { nofralloc mfmsr r5 ori r5, r5, 0x2000 @@ -569,7 +569,7 @@ void __OSContextInit(void) { } #ifdef __GEKKO__ -asm void OSFillFPUContext(register OSContext* context) { +asm void OSFillFPUContext(__REGISTER OSContext* context) { nofralloc mfmsr r5 ori r5, r5, 0x2000 diff --git a/src/revolution/os/OSExec.c b/src/revolution/os/OSExec.c index db8588957c..b4b8b2d6cb 100644 --- a/src/revolution/os/OSExec.c +++ b/src/revolution/os/OSExec.c @@ -145,7 +145,7 @@ BOOL PackInstallerArgs(void* addr, s32 argc, char* argv[]) { } #ifdef __GEKKO__ -static asm void Run(register void* entryPoint) { +static asm void Run(__REGISTER void* entryPoint) { fralloc bl ICFlashInvalidate diff --git a/src/revolution/os/OSFont.c b/src/revolution/os/OSFont.c index 29e1a8192b..d345fdd2c6 100644 --- a/src/revolution/os/OSFont.c +++ b/src/revolution/os/OSFont.c @@ -373,7 +373,7 @@ static void ReadROM(void* buf, int length, int offset) { static u32 ReadFont(void* img, u16 encode, void* fontData) { u32 size; -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif diff --git a/src/revolution/os/OSInterrupt.c b/src/revolution/os/OSInterrupt.c index 17993fd481..cc5e30cb1c 100644 --- a/src/revolution/os/OSInterrupt.c +++ b/src/revolution/os/OSInterrupt.c @@ -78,7 +78,7 @@ char* __OSPIErrors[8] = { #endif // prototypes -static void ExternalInterruptHandler(register __OSException exception, register OSContext* context); +static void ExternalInterruptHandler(__REGISTER __OSException exception, __REGISTER OSContext* context); extern void __RAS_OSDisableInterrupts_begin(void); extern void __RAS_OSDisableInterrupts_end(void); @@ -104,7 +104,7 @@ asm BOOL OSEnableInterrupts(void) { blr } -asm BOOL OSRestoreInterrupts(register BOOL level) { +asm BOOL OSRestoreInterrupts(__REGISTER BOOL level) { nofralloc cmpwi level, 0 @@ -507,8 +507,8 @@ void __OSDispatchInterrupt(__OSException exception, OSContext* context) { } #ifdef __GEKKO__ -static asm void ExternalInterruptHandler(register __OSException exception, - register OSContext* context) { +static asm void ExternalInterruptHandler(__REGISTER __OSException exception, + __REGISTER OSContext* context) { #pragma unused(exception) nofralloc OS_EXCEPTION_SAVE_GPRS(context) diff --git a/src/revolution/os/OSMemory.c b/src/revolution/os/OSMemory.c index 76309cffc8..ea70d1fca2 100644 --- a/src/revolution/os/OSMemory.c +++ b/src/revolution/os/OSMemory.c @@ -591,7 +591,7 @@ static asm void ConfigMEM_ES1_0(void) { #endif #ifdef __GEKKO__ -static asm void RealMode(register u32 addr) { +static asm void RealMode(__REGISTER u32 addr) { nofralloc clrlwi addr, addr, 2 mtsrr0 addr @@ -648,7 +648,7 @@ void __OSRestoreCodeExecOnMEM1(u32 param_0) { void __OSInitMemoryProtection(void) { static BOOL initialized = FALSE; -#ifndef DEBUG +#if !DEBUG u32 padding[9]; u32 temp; #endif diff --git a/src/revolution/os/OSRtc.c b/src/revolution/os/OSRtc.c index 67a5d90527..11fa04e05d 100644 --- a/src/revolution/os/OSRtc.c +++ b/src/revolution/os/OSRtc.c @@ -331,7 +331,7 @@ u32 OSGetProgressiveMode(void) { } void OSSetProgressiveMode(u32 on) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSram* sram; @@ -439,7 +439,7 @@ u32 OSGetEuRgb60Mode(void) { } void OSSetEuRgb60Mode(u32 on) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSram* sram; @@ -492,7 +492,7 @@ u16 OSGetGbsMode(void) { } void OSSetGbsMode(u16 mode) { -#ifndef DEBUG +#if !DEBUG u32 padding[1]; #endif OSSramEx* sram; diff --git a/src/revolution/os/OSThread.c b/src/revolution/os/OSThread.c index a9d12f7a5b..6bf9b1a6c3 100644 --- a/src/revolution/os/OSThread.c +++ b/src/revolution/os/OSThread.c @@ -122,7 +122,7 @@ void __OSThreadInit() { thread->mutex = 0; OSInitThreadQueue(&thread->queueJoin); -#ifdef DEBUG +#if DEBUG OSInitMutexQueue(&thread->queueMutex); #else thread->queueMutex.head = thread->queueMutex.tail = 0; // it got inlined? cant reproduce the inline... @@ -425,7 +425,7 @@ int OSCreateThread(OSThread* thread, void* (*func)(void*), void* param, void* st thread->val = (void*)-1; thread->mutex = 0; OSInitThreadQueue(&thread->queueJoin); -#ifdef DEBUG +#if DEBUG OSInitMutexQueue(&thread->queueMutex); #else OSInitThreadQueue((void*)&thread->queueMutex); // why @@ -487,7 +487,7 @@ void OSExitThread(void* val) { __OSUnlockAllMutex(currentThread); OSWakeupThread(¤tThread->queueJoin); RunQueueHint = 1; -#ifdef DEBUG +#if DEBUG __OSReschedule(); #else if (RunQueueHint != 0) { @@ -836,9 +836,9 @@ s32 OSCheckActiveThreads(void) { } void OSClearStack(u8 val) { - register u32 sp; - register u32* p; - register u32 pattern; + __REGISTER u32 sp; + __REGISTER u32* p; + __REGISTER u32 pattern; pattern = (val << 24) | (val << 16) | (val << 8) | val; sp = OSGetStackPointer(); diff --git a/src/revolution/os/OSTime.c b/src/revolution/os/OSTime.c index 2688a17c5c..a7c2538160 100644 --- a/src/revolution/os/OSTime.c +++ b/src/revolution/os/OSTime.c @@ -82,7 +82,7 @@ OSTime __OSTimeToSystemTime(OSTime time) { } #ifdef __GEKKO__ -asm void __OSSetTick(register OSTick newTicks) { +asm void __OSSetTick(__REGISTER OSTick newTicks) { nofralloc mttbl newTicks blr diff --git a/src/revolution/os/__os.h b/src/revolution/os/__os.h index 571a97bea7..75e76f5df3 100644 --- a/src/revolution/os/__os.h +++ b/src/revolution/os/__os.h @@ -112,7 +112,7 @@ void __OSReschedule(void); // OSTime void __OSSetTime(OSTime time); OSTime __OSGetSystemTime(); -void __OSSetTick(register OSTick newTicks); +void __OSSetTick(__REGISTER OSTick newTicks); OSTime __OSTimeToSystemTime(OSTime time); // ppc_eabi_init