diff options
68 files changed, 1417 insertions, 1399 deletions
diff --git a/configure.py b/configure.py index b7d1205c10..9c75cb1079 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": 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>(f32 f1, f32* f2, f32* f3, f32* f4, f32* } template <> -inline f32 J2DHermiteInterpolation<s16>(register f32 pp1, register s16* pp2, register s16* pp3, - register s16* pp4, register s16* pp5, register s16* pp6, - register s16* pp7) { +inline f32 J2DHermiteInterpolation<s16>(__REGISTER f32 pp1, __REGISTER s16* pp2, __REGISTER s16* pp3, + __REGISTER s16* pp4, __REGISTER s16* pp5, __REGISTER s16* pp6, + __REGISTER s16* pp7) { #ifdef __MWERKS__ - register f32 p1 = pp1; - register f32 ff8; - register f32 ff7; - register f32 ff6; - register f32 ff5; - register f32 ff4; - register f32 ff3; - register f32 ff2; - register f32 ff0; - register f32 fout; - register s16* p2 = pp2; - register s16* p3 = pp3; - register s16* p4 = pp4; - register s16* p5 = pp5; - register s16* p6 = pp6; - register s16* p7 = pp7; + __REGISTER f32 p1 = pp1; + __REGISTER f32 ff8; + __REGISTER f32 ff7; + __REGISTER f32 ff6; + __REGISTER f32 ff5; + __REGISTER f32 ff4; + __REGISTER f32 ff3; + __REGISTER f32 ff2; + __REGISTER f32 ff0; + __REGISTER f32 fout; + __REGISTER s16* p2 = pp2; + __REGISTER s16* p3 = pp3; + __REGISTER s16* p4 = pp4; + __REGISTER s16* p5 = pp5; + __REGISTER s16* p6 = pp6; + __REGISTER s16* p7 = pp7; // clang-format off asm { psq_l ff2, 0(p2), 0x1, 5 diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h index 89331247ec..fd906d8a3c 100644 --- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h +++ b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h @@ -100,7 +100,7 @@ public: /* 0x10 */ u32 mFlags; }; // Size: 0x14 -inline void J3DFillZero32B(register void* param_0, register u32 param_1) { +inline void J3DFillZero32B(__REGISTER void* param_0, __REGISTER u32 param_1) { #ifdef __MWERKS__ asm { srwi param_1, param_1, 5 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/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index e62f8d9094..24fdb5c265 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -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/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h index 7b54237676..9b4fad8ce3 100644 --- a/include/JSystem/J3DGraphBase/J3DTransform.h +++ b/include/JSystem/J3DGraphBase/J3DTransform.h @@ -23,10 +23,10 @@ struct J3DTransformInfo { } */ #ifdef __MWERKS__ - inline J3DTransformInfo& operator=(const register J3DTransformInfo& b) { - register const J3DTransformInfo& var_r31 = b; - register J3DTransformInfo& var_r30 = *this; - register f32 var_f31; + inline J3DTransformInfo& operator=(const __REGISTER J3DTransformInfo& b) { + __REGISTER const J3DTransformInfo& var_r31 = b; + __REGISTER J3DTransformInfo& var_r30 = *this; + __REGISTER f32 var_f31; asm { psq_l var_f31, J3DTransformInfo.mScale(var_r31), 0, 0 psq_st var_f31, J3DTransformInfo.mScale(var_r30), 0, 0 @@ -64,13 +64,13 @@ void J3DScaleNrmMtx33(f32 (*)[3], const Vec&); void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]); void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], u32); -inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) { +inline void J3DPSMtx33Copy(__REGISTER Mtx3P src, __REGISTER Mtx3P dst) { #ifdef __MWERKS__ - register f32 fr4; - register f32 fr3; - register f32 fr2; - register f32 fr1; - register f32 fr0; + __REGISTER f32 fr4; + __REGISTER f32 fr3; + __REGISTER f32 fr2; + __REGISTER f32 fr1; + __REGISTER f32 fr0; asm { psq_l fr4, 0(src), 0, 0 @@ -87,14 +87,14 @@ inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) { #endif } -inline void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst) { +inline void J3DPSMtx33CopyFrom34(__REGISTER MtxP src, __REGISTER Mtx3P dst) { #ifdef __MWERKS__ - register f32 x_y1; - register f32 z1; - register f32 x_y2; - register f32 z2; - register f32 x_y3; - register f32 z3; + __REGISTER f32 x_y1; + __REGISTER f32 z1; + __REGISTER f32 x_y2; + __REGISTER f32 z2; + __REGISTER f32 x_y3; + __REGISTER f32 z3; asm { psq_l x_y1, 0(src), 0, 0 lfs z1, 8(src) @@ -112,7 +112,7 @@ inline void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst) { #endif } -inline void J3DPSMulMtxVec(register MtxP mtx, register Vec* vec, register Vec* dst) { +inline void J3DPSMulMtxVec(__REGISTER MtxP mtx, __REGISTER Vec* vec, __REGISTER Vec* dst) { #ifdef __MWERKS__ asm { psq_l f0, 0(vec), 0, 0 @@ -139,7 +139,7 @@ inline void J3DPSMulMtxVec(register MtxP mtx, register Vec* vec, register Vec* d #endif } -inline void J3DPSMulMtxVec(register MtxP mtx, register S16Vec* vec, register S16Vec* dst) { +inline void J3DPSMulMtxVec(__REGISTER MtxP mtx, __REGISTER S16Vec* vec, __REGISTER S16Vec* dst) { #ifdef __MWERKS__ asm { psq_l f0, 0(vec), 0, 7 @@ -166,7 +166,7 @@ inline void J3DPSMulMtxVec(register MtxP mtx, register S16Vec* vec, register S16 #endif } -inline void J3DPSMulMtxVec(register Mtx3P mtx, register Vec* vec, register Vec* dst) { +inline void J3DPSMulMtxVec(__REGISTER Mtx3P mtx, __REGISTER Vec* vec, __REGISTER Vec* dst) { #ifdef __MWERKS__ asm { lis r6, PSMulUnit01@ha @@ -197,7 +197,7 @@ inline void J3DPSMulMtxVec(register Mtx3P mtx, register Vec* vec, register Vec* #endif } -inline void J3DPSMulMtxVec(register Mtx3P mtx, register S16Vec* vec, register S16Vec* dst) { +inline void J3DPSMulMtxVec(__REGISTER Mtx3P mtx, __REGISTER S16Vec* vec, __REGISTER S16Vec* dst) { #ifdef __MWERKS__ asm { lis r6, PSMulUnit01@ha diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 6bec114c5a..9fd352a04b 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -127,11 +127,11 @@ struct TVec3<s16> { inline void setTVec3f(const f32* vec_a, f32* vec_b) { #ifdef __MWERKS__ - const register f32* v_a = vec_a; - register f32* v_b = vec_b; + const __REGISTER f32* v_a = vec_a; + __REGISTER f32* v_b = vec_b; - register f32 a_x; - register f32 b_x; + __REGISTER f32 a_x; + __REGISTER f32 b_x; asm { psq_l a_x, 0(v_a), 0, 0 @@ -154,14 +154,14 @@ inline float fsqrt_step(float mag) { #endif } -inline void mulInternal(register const f32* a, register const f32* b, register float* dst) { +inline void mulInternal(__REGISTER const f32* a, __REGISTER const f32* b, __REGISTER float* dst) { #ifdef __MWERKS__ - register f32 a_x_y; - register f32 b_x_y; - register f32 x_y; - register f32 za; - register f32 zb; - register f32 z; + __REGISTER f32 a_x_y; + __REGISTER f32 b_x_y; + __REGISTER f32 x_y; + __REGISTER f32 za; + __REGISTER f32 zb; + __REGISTER f32 z; asm { psq_l a_x_y, 0(a), 0, 0 @@ -283,12 +283,12 @@ struct TVec3<f32> : public Vec { return VECMag((Vec*)this); } - void scale(register f32 sc) { + void scale(__REGISTER f32 sc) { #ifdef __MWERKS__ - register f32 z; - register f32 x_y; - register f32* dst = &x; - register f32 zres; + __REGISTER f32 z; + __REGISTER f32 x_y; + __REGISTER f32* dst = &x; + __REGISTER f32 zres; asm { psq_l x_y, 0(dst), 0, 0 @@ -301,13 +301,13 @@ struct TVec3<f32> : public Vec { #endif } - void scale(register f32 sc, const TVec3<f32>& other) { + void scale(__REGISTER f32 sc, const TVec3<f32>& other) { #ifdef __MWERKS__ - register const f32* src = &other.x; - register f32 z; - register f32 x_y; - register f32* dst = &x; - register f32 zres; + __REGISTER const f32* src = &other.x; + __REGISTER f32 z; + __REGISTER f32 x_y; + __REGISTER f32* dst = &x; + __REGISTER f32 zres; asm { psq_l x_y, 0(src), 0, 0 @@ -320,16 +320,16 @@ struct TVec3<f32> : public Vec { #endif } - void scaleAdd(register f32 sc, const TVec3<f32>& a, const TVec3<f32>& b) { + void scaleAdd(__REGISTER f32 sc, const TVec3<f32>& a, const TVec3<f32>& b) { JMAVECScaleAdd(&a, &b, this, sc); } void negateInternal(TVec3<f32>* dst) { #ifdef __MWERKS__ - register f32* rdst = &dst->x; - const register f32* src = &x; - register f32 x_y; - register f32 z; + __REGISTER f32* rdst = &dst->x; + const __REGISTER f32* src = &x; + __REGISTER f32 x_y; + __REGISTER f32 z; asm { psq_l x_y, 0(src), 0, 0 diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index f54e33d565..1142f41389 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -7,9 +7,9 @@ void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32); void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3); void JMAQuatLerp(const Quaternion*, const Quaternion*, f32, Quaternion*); -void JMAFastVECNormalize(register const Vec* src, register Vec* dst); -void JMAVECScaleAdd(register const Vec* vec1, register const Vec* vec2, register Vec* dst, - register f32 scale); +void JMAFastVECNormalize(__REGISTER const Vec* src, __REGISTER Vec* dst); +void JMAVECScaleAdd(__REGISTER const Vec* vec1, __REGISTER const Vec* vec2, __REGISTER Vec* dst, + __REGISTER f32 scale); inline int JMAAbs(int value) { #ifdef __MWERKS__ @@ -23,9 +23,9 @@ inline f32 JMAFastReciprocal(f32 value) { #endif } -inline float __frsqrtes(register double f) { +inline float __frsqrtes(__REGISTER double f) { #ifdef __MWERKS__ - register float out; + __REGISTER float out; // clang-format off asm { @@ -37,10 +37,10 @@ inline float __frsqrtes(register double f) { #endif } -inline f32 JMAFastSqrt(register const f32 input) { +inline f32 JMAFastSqrt(__REGISTER const f32 input) { #ifdef __MWERKS__ if (input > 0.0f) { - register f32 out; + __REGISTER f32 out; asm { frsqrte out, input } @@ -51,17 +51,17 @@ inline f32 JMAFastSqrt(register const f32 input) { #endif } -inline f32 JMAHermiteInterpolation(register f32 p1, register f32 p2, register f32 p3, - register f32 p4, register f32 p5, register f32 p6, - register f32 p7) { +inline f32 JMAHermiteInterpolation(__REGISTER f32 p1, __REGISTER f32 p2, __REGISTER f32 p3, + __REGISTER f32 p4, __REGISTER f32 p5, __REGISTER f32 p6, + __REGISTER f32 p7) { #ifdef __MWERKS__ - register f32 ff25; - register f32 ff31; - register f32 ff30; - register f32 ff29; - register f32 ff28; - register f32 ff27; - register f32 ff26; + __REGISTER f32 ff25; + __REGISTER f32 ff31; + __REGISTER f32 ff30; + __REGISTER f32 ff29; + __REGISTER f32 ff28; + __REGISTER f32 ff27; + __REGISTER f32 ff26; // clang-format off asm { fsubs ff31, p1, p2 @@ -99,10 +99,10 @@ inline void fastVECNormalize(const Vec* src, Vec* dst) { return JMAFastVECNormalize(src, dst); } -inline void gekko_ps_copy3(register void* dst, register const void* src) { +inline void gekko_ps_copy3(__REGISTER void* dst, __REGISTER const void* src) { #ifdef __MWERKS__ - register f32 src0; - register f32 src1; + __REGISTER f32 src0; + __REGISTER f32 src1; asm { psq_l src0, 0(src), 0, 0 lfs src1, 8(src) @@ -112,11 +112,11 @@ inline void gekko_ps_copy3(register void* dst, register const void* src) { #endif } -inline void gekko_ps_copy6(register void* dst, register const void* src) { +inline void gekko_ps_copy6(__REGISTER void* dst, __REGISTER const void* src) { #ifdef __MWERKS__ - register f32 src0; - register f32 src1; - register f32 src2; + __REGISTER f32 src0; + __REGISTER f32 src1; + __REGISTER f32 src2; asm { psq_l src0, 0(src), 0, 0 psq_l src1, 8(src), 0, 0 @@ -128,14 +128,14 @@ inline void gekko_ps_copy6(register void* dst, register const void* src) { #endif } -inline void gekko_ps_copy12(register void* dst, register const void* src) { +inline void gekko_ps_copy12(__REGISTER void* dst, __REGISTER const void* src) { #ifdef __MWERKS__ - register f32 src0; - register f32 src1; - register f32 src2; - register f32 src3; - register f32 src4; - register f32 src5; + __REGISTER f32 src0; + __REGISTER f32 src1; + __REGISTER f32 src2; + __REGISTER f32 src3; + __REGISTER f32 src4; + __REGISTER f32 src5; asm { psq_l src0, 0(src), 0, 0 psq_l src1, 8(src), 0, 0 @@ -153,16 +153,16 @@ inline void gekko_ps_copy12(register void* dst, register const void* src) { #endif } -inline void gekko_ps_copy16(register void* dst, register const void* src) { +inline void gekko_ps_copy16(__REGISTER void* dst, __REGISTER const void* src) { #ifdef __MWERKS__ - register f32 src0; - register f32 src1; - register f32 src2; - register f32 src3; - register f32 src4; - register f32 src5; - register f32 src6; - register f32 src7; + __REGISTER f32 src0; + __REGISTER f32 src1; + __REGISTER f32 src2; + __REGISTER f32 src3; + __REGISTER f32 src4; + __REGISTER f32 src5; + __REGISTER f32 src6; + __REGISTER f32 src7; asm { psq_l src0, 0(src), 0, 0 psq_l src1, 8(src), 0, 0 @@ -187,13 +187,13 @@ inline void gekko_ps_copy16(register void* dst, register const void* src) { }; // namespace JMath namespace JMathInlineVEC { - inline void C_VECAdd(register const Vec* a, register const Vec* b, register Vec* ab) { + inline void C_VECAdd(__REGISTER const Vec* a, __REGISTER const Vec* b, __REGISTER Vec* ab) { #ifdef __MWERKS__ - register f32 axy; - register f32 bxy; - register f32 az; - register f32 sumz; - register f32 bz; + __REGISTER f32 axy; + __REGISTER f32 bxy; + __REGISTER f32 az; + __REGISTER f32 sumz; + __REGISTER f32 bz; asm { psq_l axy, 0(a), 0, 0 psq_l bxy, 0(b), 0, 0 @@ -207,13 +207,13 @@ namespace JMathInlineVEC { #endif } - inline void C_VECSubtract(register const Vec* a, register const Vec* b, register Vec* ab) { + inline void C_VECSubtract(__REGISTER const Vec* a, __REGISTER const Vec* b, __REGISTER Vec* ab) { #ifdef __MWERKS__ - register f32 axy; - register f32 bxy; - register f32 az; - register f32 subz; - register f32 bz; + __REGISTER f32 axy; + __REGISTER f32 bxy; + __REGISTER f32 az; + __REGISTER f32 subz; + __REGISTER f32 bz; asm { psq_l axy, 0(a), 0, 0 psq_l bxy, 0(b), 0, 0 @@ -227,11 +227,11 @@ namespace JMathInlineVEC { #endif } - inline f32 C_VECSquareMag(register const Vec* v) { + inline f32 C_VECSquareMag(__REGISTER const Vec* v) { #ifdef __MWERKS__ - register f32 x_y; - register f32 z; - register f32 res; + __REGISTER f32 x_y; + __REGISTER f32 z; + __REGISTER f32 res; asm { psq_l x_y, 0(v), 0, 0 @@ -244,13 +244,13 @@ namespace JMathInlineVEC { #endif } - inline f32 C_VECDotProduct(register const Vec *a, register const Vec *b) { + inline f32 C_VECDotProduct(__REGISTER const Vec *a, __REGISTER const Vec *b) { #ifdef __MWERKS__ - register f32 res; - register f32 thisyz; - register f32 otheryz; - register f32 otherxy; - register f32 thisxy; + __REGISTER f32 res; + __REGISTER f32 thisyz; + __REGISTER f32 otheryz; + __REGISTER f32 otherxy; + __REGISTER f32 thisxy; asm { psq_l thisyz, 4(a), 0, 0 psq_l otheryz, 4(b), 0, 0 diff --git a/include/dolphin/os.h b/include/dolphin/os.h index fdac723bf2..989324d7fc 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -288,10 +288,10 @@ extern int __OSInIPL; #define ASSERT(cond) ASSERTLINE(__LINE__, cond) -inline s16 __OSf32tos16(register f32 inF) { - register s16 out; +inline s16 __OSf32tos16(__REGISTER f32 inF) { + __REGISTER s16 out; u32 tmp; - register u32* tmpPtr = &tmp; + __REGISTER u32* tmpPtr = &tmp; // clang-format off #ifdef __MWERKS__ asm { @@ -308,10 +308,10 @@ inline void OSf32tos16(f32* f, s16* out) { *out = __OSf32tos16(*f); } -inline u8 __OSf32tou8(register f32 inF) { - register u8 out; +inline u8 __OSf32tou8(__REGISTER f32 inF) { + __REGISTER u8 out; u32 tmp; - register u32* tmpPtr = &tmp; + __REGISTER u32* tmpPtr = &tmp; // clang-format off #ifdef __MWERKS__ asm { diff --git a/include/dolphin/types.h b/include/dolphin/types.h index ad119905a9..411bb8ec27 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -76,6 +76,12 @@ typedef unsigned int uint; #endif #endif +#ifdef __MWERKS__ +#define __REGISTER register +#else +#define __REGISTER +#endif + #include <stddef.h> #endif diff --git a/include/revolution/os.h b/include/revolution/os.h index fd8d94e106..2ae31d5c5c 100644 --- a/include/revolution/os.h +++ b/include/revolution/os.h @@ -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 <stddef.h> #endif 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/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/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/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_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/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_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_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_ev_camera.cpp b/src/d/d_ev_camera.cpp index 6494dacb34..32050e09ad 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -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; } } 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 861649ba89..c2e8e80534 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -24,7 +24,7 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#ifdef DEBUG +#if DEBUG extern "C" int atoi(const char* str); extern "C" f32 atof(const char* str); #endif 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_stage.cpp b/src/d/d_stage.cpp index df4ca3fb0f..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), + OBJNAME("TLogo", PROC_TITLE, -1), #if 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("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), + 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, 0xFF), + 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 @@ -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 7039004fb3..f731c4e210 100644 --- a/src/dolphin/ai/ai.c +++ b/src/dolphin/ai/ai.c @@ -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/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/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/mcc/fio.c b/src/dolphin/mcc/fio.c index 5d60ead423..e576373491 100644 --- a/src/dolphin/mcc/fio.c +++ b/src/dolphin/mcc/fio.c @@ -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/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 <dolphin/mtx.h> #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 d0d1ce508c..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 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 f8ff6aecbd..24a274b571 100644 --- a/src/dolphin/os/OS.c +++ b/src/dolphin/os/OS.c @@ -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/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/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 654cfa2467..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 diff --git a/src/dolphin/os/OSThread.c b/src/dolphin/os/OSThread.c index 3abf127352..6befa33a5d 100644 --- a/src/dolphin/os/OSThread.c +++ b/src/dolphin/os/OSThread.c @@ -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(); @@ -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/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/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/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 052b2740f4..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 diff --git a/src/revolution/os/OSThread.c b/src/revolution/os/OSThread.c index 91b21aa561..6bf9b1a6c3 100644 --- a/src/revolution/os/OSThread.c +++ b/src/revolution/os/OSThread.c @@ -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 |