diff options
Diffstat (limited to 'src/d/d_meter_HIO.cpp')
| -rw-r--r-- | src/d/d_meter_HIO.cpp | 650 |
1 files changed, 540 insertions, 110 deletions
diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index f83e93c17c..79d8ed4081 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -1,12 +1,6 @@ -// -// Generated By: dol2asm -// Translation Unit: d/d_meter_HIO -// - #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter_HIO.h" -#include "d/d_save.h" #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "m_Do/m_Do_ext.h" @@ -16,6 +10,12 @@ dMeter_menuHIO_c::dMeter_menuHIO_c() { mGameover = 70; } +#if DEBUG +void dMeter_menuHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FE348-801FE4EC 1F8C88 01A4+00 1/1 0/0 0/0 .text __ct__23dMeter_drawCollectHIO_cFv */ dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c() { @@ -58,6 +58,12 @@ dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c() { mVesselFront[VESSEL_DECOR].set(200, 190, 100, 175); } +#if DEBUG +void dMeter_drawCollectHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FE4EC-801FE5CC 1F8E2C 00E0+00 1/1 0/0 0/0 .text __ct__22dMeter_drawOptionHIO_cFv */ dMeter_drawOptionHIO_c::dMeter_drawOptionHIO_c() { mBarScale[0] = 1.02f; @@ -88,6 +94,12 @@ dMeter_drawOptionHIO_c::dMeter_drawOptionHIO_c() { mArrowOffsetX_4x3 = 4.0f; } +#if DEBUG +void dMeter_drawOptionHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FE5CC-801FE730 1F8F0C 0164+00 1/1 0/0 0/0 .text __ct__22dMeter_drawLetterHIO_cFv */ dMeter_drawLetterHIO_c::dMeter_drawLetterHIO_c() { for (int i = 0; i < 2; i++) { @@ -126,6 +138,12 @@ dMeter_drawLetterHIO_c::dMeter_drawLetterHIO_c() { mLetterTextFront.set(65, 55, 30, 255); } +#if DEBUG +void dMeter_drawLetterHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FE730-801FE8DC 1F9070 01AC+00 1/1 0/0 0/0 .text __ct__23dMeter_drawFishingHIO_cFv */ dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() { @@ -133,10 +151,27 @@ dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() { static f32 const fipaPosX[6] = {1.3f, 6.6f, 0.0f, 3.96f, 4.0f, 27.5f}; static f32 const fipaPosY[6] = {-9.2f, -27.5f, -11.7f, -9.2f, -30.1f, -17.9f}; static f32 const finaScale[6] = {0.9f, 0.9f, 0.9f, 0.9f, 0.9f, 0.9f}; + +#if PLATFORM_SHIELD + static f32 const finaPosX[6] = {0.0f, -4.0f, 0.0f, 0.0f, 0.0f, -4.0f}; +#else static f32 const finaPosX[6] = {-25.0f, -4.0f, 0.0f, 0.0f, 0.0f, -4.0f}; +#endif + +#if PLATFORM_SHIELD + static f32 const finaPosY[6] = {-14.4f, -40.6, -24.0f, -11.7f, -37.9f, -13.0f}; +#else static f32 const finaPosY[6] = {-16.0f, -40.6, -24.0f, -11.7f, -37.9f, -13.0f}; +#endif + static f32 const filiScale[6] = {0.65f, 0.65f, 0.65f, 0.65f, 0.65f, 0.65f}; + +#if PLATFORM_SHIELD + static f32 const filiPosX[6] = {0.0f, -8.0f, 9.2f, 9.2f, 9.2f, -8.0f}; +#else static f32 const filiPosX[6] = {-28.0f, -8.0f, 9.2f, 9.2f, 9.2f, -8.0f}; +#endif + static f32 const filiPosY[6] = {-6.6f, -14.0f, -14.4f, 24.9f, -11.7f, 24.9f}; static f32 const bboxScale[6] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; static f32 const bboxPosX[6] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}; @@ -145,18 +180,22 @@ dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() { static f32 const rboxPosX[6] = {1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}; static f32 const rboxPosY[6] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}; static f32 const finfoScale[6] = {0.87f, 0.87f, 0.88f, 0.87f, 0.87f, 0.87f}; + #if VERSION == VERSION_GCN_JPN static f32 const finfoPosX[6] = {-27.0f, 0.0f, -12.0f, 0.0f, -12.0f, -32.8f}; #else static f32 const finfoPosX[6] = {-17.0f, 0.0f, -14.0f, 0.0f, -12.0f, -32.8f}; #endif + static f32 const finfoPosY[6] = {6.6f, 0.0f, 0.0f, 0.0f, 1.3f, 0.0f}; static f32 const fishnScale[6] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; + #if VERSION == VERSION_GCN_JPN static f32 const fishnPosX[6] = {12.0f, -20.0f, 1.3f, 6.6f, 14.0f, -6.6f}; #else static f32 const fishnPosX[6] = {4.0f, -20.0f, 1.3f, 6.6f, 1.3f, 9.2f}; #endif + static f32 const fishnPosY[6] = {-72.1f, 129.6f, 0.0f, 6.6f, 32.8f, 11.7f}; mOpenFrames = 10; @@ -198,6 +237,12 @@ dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() { mCaughtNumPosX_4x3 = -188.0f; } +#if DEBUG +void dMeter_drawFishingHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FE8DC-801FE954 1F921C 0078+00 1/1 0/0 0/0 .text __ct__22dMeter_drawInsectHIO_cFv */ dMeter_drawInsectHIO_c::dMeter_drawInsectHIO_c() { mOpenFrame = 10; @@ -225,6 +270,12 @@ dMeter_drawInsectHIO_c::dMeter_drawInsectHIO_c() { mConfirmOptionPosY = 119.0f; } +#if DEBUG +void dMeter_drawInsectHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FE954-801FE990 1F9294 003C+00 1/1 0/0 0/0 .text __ct__27dMeter_drawCalibrationHIO_cFv */ dMeter_drawCalibrationHIO_c::dMeter_drawCalibrationHIO_c() { mOpenFrames = 10; @@ -235,6 +286,12 @@ dMeter_drawCalibrationHIO_c::dMeter_drawCalibrationHIO_c() { mCircleScale2 = 0.75f; } +#if DEBUG +void dMeter_drawCalibrationHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FE990-801FEAF0 1F92D0 0160+00 1/1 0/0 0/0 .text __ct__21dMeter_drawSkillHIO_cFv */ dMeter_drawSkillHIO_c::dMeter_drawSkillHIO_c() { for (int i = 0; i < 2; i++) { @@ -271,21 +328,60 @@ dMeter_drawSkillHIO_c::dMeter_drawSkillHIO_c() { mSkillTitleScale = 1.1f; } +#if DEBUG +void dMeter_drawSkillHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FEAF0-801FEFF0 1F9430 0500+00 1/1 0/0 0/0 .text __ct__25dMeter_drawEmpButtonHIO_cFv */ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mPikariScale = 2.5f; - mPikariFrontInner.set(255, 255, 255, 185); - mPikariFrontOuter.set(0, 155, 0, 0); - mPikariBackInner.set(255, 255, 255, 87); - mPikariBackOuter.set(0, 115, 0, 0); - mPikariAnimSpeed = 0.772705f; + mPikariFrontInner.r = 255; + mPikariFrontInner.g = 255; + mPikariFrontInner.b = 255; + mPikariFrontInner.a = 185; + + mPikariFrontOuter.r = 0; + mPikariFrontOuter.g = 155; + mPikariFrontOuter.b = 0; + mPikariFrontOuter.a = 0; + + mPikariBackInner.r = 255; + mPikariBackInner.g = 255; + mPikariBackInner.b = 255; + mPikariBackInner.a = 87; + + mPikariBackOuter.r = 0; + mPikariBackOuter.g = 115; + mPikariBackOuter.b = 0; + mPikariBackOuter.a = 0; + + mPikariAnimSpeed = 0.772705f; mPikariFastScale = 3.0f; - mPikariFastFrontInner.set(255, 255, 255, 255); - mPikariFastFrontOuter.set(220, 220, 215, 0); - mPikariFastBackInner.set(255, 255, 190, 255); - mPikariFastBackOuter.set(200, 200, 210, 0); + + mPikariFastFrontInner.r = 255; + mPikariFastFrontInner.g = 255; + mPikariFastFrontInner.b = 255; + mPikariFastFrontInner.a = 255; + + mPikariFastFrontOuter.r = 220; + mPikariFastFrontOuter.g = 220; + mPikariFastFrontOuter.b = 215; + mPikariFastFrontOuter.a = 0; + + mPikariFastBackInner.r = 255; + mPikariFastBackInner.g = 255; + mPikariFastBackInner.b = 190; + mPikariFastBackInner.a = 255; + + mPikariFastBackOuter.r = 200; + mPikariFastBackOuter.g = 200; + mPikariFastBackOuter.b = 210; + mPikariFastBackOuter.a = 0; + mPikariFastAnimSpeed = 2.0f; mPikariListenScale = 1.0f; @@ -308,7 +404,12 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mDebugDisplayButton[0] = 0; } + #if PLATFORM_SHIELD + mDisplaySpace = 70.0f; + #else mDisplaySpace = 35.0f; + #endif + mEmpButtonPosX = 0.0f; mEmpButtonPosY = 175.0f; mEmpButtonScale = 1.0f; @@ -405,12 +506,9 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mViewChangePosY = 67.0f; mViewChangeScale = 1.0f; - mText2PosX = 2.0f; - mText1PosX = 2.0f; - mText2PosY = 3.0f; - mText1PosY = 3.0f; - mText2Scale = 1.0f; - mText1Scale = 1.0f; + mText1PosX = mText2PosX = 2.0f; + mText1PosY = mText2PosY = 3.0f; + mText1Scale = mText2Scale = 1.0f; mItemPosX = 12.0f; mItemPosY = 0.0f; @@ -435,11 +533,9 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mHawkeyeZoomPosY = 25.0f; mHawkeyeZoomScale = 0.8f; mHawkeyeZoomScale_4x3 = 0.9f; - // fake match, fix later for (int i = 0; i < 3; i++) { - int* tmp = (int*)this + i; - *(f32*)(tmp + 0x62) = 0.0f; - *(f32*)(tmp + 0x6B) = 1.0f; + mHawkeyeIconPosX[i] = 0.0f; + mHawkeyeIconScale[i] = 1.0f; } mHawkeyeTextIconPosY = -6.0f; mHawkeyeZoomTextPosY = -8.0f; @@ -460,6 +556,12 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mPointerONAnimFrame = 30; } +#if DEBUG +void dMeter_drawEmpButtonHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FEFF0-801FF31C 1F9930 032C+00 1/1 0/0 0/0 .text __ct__24dMeter_drawMiniGameHIO_cFv */ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { @@ -550,19 +652,53 @@ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { mGetInTextAlphaFrames = 10; mGetInPikariAppearFrames = 30; mGetInPikariScale = 1.8f; - mGetInPikariFrontInner.set(255, 255, 167, 80); - mGetInPikariFrontOuter.set(220, 110, 30, 0); - mGetInPikariBackInner.set(255, 255, 190, 90); - mGetInPikariBackOuter.set(170, 110, 0, 0); + + mGetInPikariFrontInner.r = 255; + mGetInPikariFrontInner.g = 255; + mGetInPikariFrontInner.b = 167; + mGetInPikariFrontInner.a = 80; + + mGetInPikariFrontOuter.r = 220; + mGetInPikariFrontOuter.g = 110; + mGetInPikariFrontOuter.b = 30; + mGetInPikariFrontOuter.a = 0; + + mGetInPikariBackInner.r = 255; + mGetInPikariBackInner.g = 255; + mGetInPikariBackInner.b = 190; + mGetInPikariBackInner.a = 90; + + mGetInPikariBackOuter.r = 170; + mGetInPikariBackOuter.g = 110; + mGetInPikariBackOuter.b = 0; + mGetInPikariBackOuter.a = 0; + mGetInPikariAnimSpeed = 0.6f; mGetInTextLocation = 0; mStartPikariAppearFrames = 30; mStartPikariScale = 1.8f; - mStartPikariFrontInner.set(255, 255, 167, 80); - mStartPikariFrontOuter.set(220, 110, 30, 0); - mStartPikariBackInner.set(255, 255, 190, 90); - mStartPikariBackOuter.set(170, 110, 0, 0); + + mStartPikariFrontInner.r = 255; + mStartPikariFrontInner.g = 255; + mStartPikariFrontInner.b = 167; + mStartPikariFrontInner.a = 80; + + mStartPikariFrontOuter.r = 220; + mStartPikariFrontOuter.g = 110; + mStartPikariFrontOuter.b = 30; + mStartPikariFrontOuter.a = 0; + + mStartPikariBackInner.r = 255; + mStartPikariBackInner.g = 255; + mStartPikariBackInner.b = 190; + mStartPikariBackInner.a = 90; + + mStartPikariBackOuter.r = 170; + mStartPikariBackOuter.g = 110; + mStartPikariBackOuter.b = 0; + mStartPikariBackOuter.a = 0; + mStartPikariAnimSpeed = 0.6f; mStartPikariDisplayFrames = 30; @@ -575,13 +711,36 @@ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { field_0x172 = 10; mReadyFightPikariAppearFrames = 30; mReadyFightPikariScale = 1.8f; - mReadyFightPikariFrontInner.set(255, 255, 167, 80); - mReadyFightPikariFrontOuter.set(220, 110, 30, 0); - mReadyFightPikariBackInner.set(255, 255, 190, 90); - mReadyFightPikariBackOuter.set(170, 110, 0, 0); + + mReadyFightPikariFrontInner.r = 255; + mReadyFightPikariFrontInner.g = 255; + mReadyFightPikariFrontInner.b = 167; + mReadyFightPikariFrontInner.a = 80; + + mReadyFightPikariFrontOuter.r = 220; + mReadyFightPikariFrontOuter.g = 110; + mReadyFightPikariFrontOuter.b = 30; + mReadyFightPikariFrontOuter.a = 0; + + mReadyFightPikariBackInner.r = 255; + mReadyFightPikariBackInner.g = 255; + mReadyFightPikariBackInner.b = 190; + mReadyFightPikariBackInner.a = 90; + + mReadyFightPikariBackOuter.r = 170; + mReadyFightPikariBackOuter.g = 110; + mReadyFightPikariBackOuter.b = 0; + mReadyFightPikariBackOuter.a = 0; + mReadyFightPikariAnimSpeed = 0.6f; } +#if DEBUG +void dMeter_drawMiniGameHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FF31C-801FF5B8 1F9C5C 029C+00 1/1 0/0 0/0 .text __ct__25dMeter_drawLightDropHIO_cFv */ dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() { @@ -624,10 +783,26 @@ dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() { mPikariLoopBackOuter[1].set(126, 238, 218, 0); mPikariLoopBackStopFrame = 19.0f; - mDropPikariFrontInner.set(255, 255, 255, 255); - mDropPikariFrontOuter.set(0, 0, 0, 0); - mDropPikariBackInner.set(255, 255, 255, 255); - mDropPikariBackOuter.set(126, 238, 218, 0); + mDropPikariFrontInner.r = 255; + mDropPikariFrontInner.g = 255; + mDropPikariFrontInner.b = 255; + mDropPikariFrontInner.a = 255; + + mDropPikariFrontOuter.r = 0; + mDropPikariFrontOuter.g = 0; + mDropPikariFrontOuter.b = 0; + mDropPikariFrontOuter.a = 0; + + mDropPikariBackInner.r = 255; + mDropPikariBackInner.g = 255; + mDropPikariBackInner.b = 255; + mDropPikariBackInner.a = 255; + + mDropPikariBackOuter.r = 126; + mDropPikariBackOuter.g = 238; + mDropPikariBackOuter.b = 218; + mDropPikariBackOuter.a = 0; + mDropPikariAnimSpeed = 0.1f; mDropPikariAnimSpeed_Completed = 0.6f; mPikariScaleNormal = 1.3f; @@ -635,6 +810,12 @@ dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() { mAnimDebug = 0; } +#if DEBUG +void dMeter_drawLightDropHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 801FF5B8-802001AC 1F9EF8 0BF4+00 1/1 0/0 0/0 .text __ct__16dMeter_drawHIO_cFv */ dMeter_drawHIO_c::dMeter_drawHIO_c() { #ifdef DEBUG @@ -880,27 +1061,42 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mButtonATextScale = 1.0f; mButtonATextPosX = 0.0f; mButtonATextPosY = 0.0f; - mButtonATextColor.set(255, 255, 255, 255); + mButtonATextColor.r = 255; + mButtonATextColor.g = 255; + mButtonATextColor.b = 255; + mButtonATextColor.a = 255; mButtonBFontScale = 1.0f; mButtonBFontPosX = -8.0f; mButtonBFontPosY = 4.0f; - mButtonBFontColor.set(255, 255, 255, 255); + mButtonBFontColor.r = 255; + mButtonBFontColor.g = 255; + mButtonBFontColor.b = 255; + mButtonBFontColor.a = 255; field_0x2e4 = 1.0f; field_0x2e8 = 0.0f; field_0x2ec = 0.0f; - field_0x2f0.set(255, 255, 255, 255); + field_0x2f0.r = 255; + field_0x2f0.g = 255; + field_0x2f0.b = 255; + field_0x2f0.a = 255; mButtonXYTextScale = 1.0f; mButtonXYTextPosX = 0.0f; mButtonXYTextPosY = 0.0f; - mButtonXYTextColor.set(255, 255, 255, 255); + mButtonXYTextColor.r = 255; + mButtonXYTextColor.g = 255; + mButtonXYTextColor.b = 255; + mButtonXYTextColor.a = 255; mButtonZFontScale = 1.0f; mButtonZFontPosX = 0.0f; mButtonZFontPosY = -4.7f; - mButtonZFontColor.set(255, 255, 255, 255); + mButtonZFontColor.r = 255; + mButtonZFontColor.g = 255; + mButtonZFontColor.b = 255; + mButtonZFontColor.a = 255; mRupeeKeyScale = 1.0f; mRupeeKeyPosX = 9.2f; @@ -980,66 +1176,226 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mMaxSpurAmount = 6; - mSpurIconPikariFrontInner.set(255, 255, 255, 255); - mSpurIconPikariFrontOuter.set(140, 232, 228, 0); - mSpurIconPikariBackInner.set(255, 255, 190, 255); - mSpurIconPikariBackOuter.set(55, 215, 90, 0); + mSpurIconPikariFrontInner.r = 255; + mSpurIconPikariFrontInner.g = 255; + mSpurIconPikariFrontInner.b = 255; + mSpurIconPikariFrontInner.a = 255; + + mSpurIconPikariFrontOuter.r = 140; + mSpurIconPikariFrontOuter.g = 232; + mSpurIconPikariFrontOuter.b = 228; + mSpurIconPikariFrontOuter.a = 0; + + mSpurIconPikariBackInner.r = 255; + mSpurIconPikariBackInner.g = 255; + mSpurIconPikariBackInner.b = 190; + mSpurIconPikariBackInner.a = 255; + + mSpurIconPikariBackOuter.r = 55; + mSpurIconPikariBackOuter.g = 215; + mSpurIconPikariBackOuter.b = 90; + mSpurIconPikariBackOuter.a = 0; + mSpurIconPikariAnimSpeed = 1.5f; - mSpurIconRevivePikariFrontInner.set(255, 255, 255, 255); - mSpurIconRevivePikariFrontOuter.set(220, 110, 30, 0); - mSpurIconRevivePikariBackInner.set(255, 255, 190, 255); - mSpurIconRevivePikariBackOuter.set(170, 110, 0, 0); + mSpurIconRevivePikariFrontInner.r = 255; + mSpurIconRevivePikariFrontInner.g = 255; + mSpurIconRevivePikariFrontInner.b = 255; + mSpurIconRevivePikariFrontInner.a = 255; + + mSpurIconRevivePikariFrontOuter.r = 220; + mSpurIconRevivePikariFrontOuter.g = 110; + mSpurIconRevivePikariFrontOuter.b = 30; + mSpurIconRevivePikariFrontOuter.a = 0; + + mSpurIconRevivePikariBackInner.r = 255; + mSpurIconRevivePikariBackInner.g = 255; + mSpurIconRevivePikariBackInner.b = 190; + mSpurIconRevivePikariBackInner.a = 255; + + mSpurIconRevivePikariBackOuter.r = 170; + mSpurIconRevivePikariBackOuter.g = 110; + mSpurIconRevivePikariBackOuter.b = 0; + mSpurIconRevivePikariBackOuter.a = 0; + mSpurIconRevivePikariAnimSpeed = 0.5f; - mButtonZPikariFrontInner.set(255, 255, 255, 255); - mButtonZPikariFrontOuter.set(0, 0, 0, 0); - mButtonZPikariBackInner.set(255, 255, 255, 255); - mButtonZPikariBackOuter.set(160, 160, 110, 0); + mButtonZPikariFrontInner.r = 255; + mButtonZPikariFrontInner.g = 255; + mButtonZPikariFrontInner.b = 255; + mButtonZPikariFrontInner.a = 255; + + mButtonZPikariFrontOuter.r = 0; + mButtonZPikariFrontOuter.g = 0; + mButtonZPikariFrontOuter.b = 0; + mButtonZPikariFrontOuter.a = 0; + + mButtonZPikariBackInner.r = 255; + mButtonZPikariBackInner.g = 255; + mButtonZPikariBackInner.b = 255; + mButtonZPikariBackInner.a = 255; + + mButtonZPikariBackOuter.r = 160; + mButtonZPikariBackOuter.g = 160; + mButtonZPikariBackOuter.b = 110; + mButtonZPikariBackOuter.a = 0; + mButtonZPikariAnimSpeed = 0.4f; - mButtonXYPikariFrontInner.set(255, 255, 255, 255); - mButtonXYPikariFrontOuter.set(0, 0, 0, 0); - mButtonXYPikariBackInner.set(255, 255, 255, 255); - mButtonXYPikariBackOuter.set(160, 160, 110, 0); + mButtonXYPikariFrontInner.r = 255; + mButtonXYPikariFrontInner.g = 255; + mButtonXYPikariFrontInner.b = 255; + mButtonXYPikariFrontInner.a = 255; + + mButtonXYPikariFrontOuter.r = 0; + mButtonXYPikariFrontOuter.g = 0; + mButtonXYPikariFrontOuter.b = 0; + mButtonXYPikariFrontOuter.a = 0; + + mButtonXYPikariBackInner.r = 255; + mButtonXYPikariBackInner.g = 255; + mButtonXYPikariBackInner.b = 255; + mButtonXYPikariBackInner.a = 255; + + mButtonXYPikariBackOuter.r = 160; + mButtonXYPikariBackOuter.g = 160; + mButtonXYPikariBackOuter.b = 110; + mButtonXYPikariBackOuter.a = 0; + mButtonXYPikariAnimSpeed = 0.4f; - mButtonAPikariFrontInner.set(255, 255, 255, 160); - mButtonAPikariFrontOuter.set(0, 0, 0, 0); - mButtonAPikariBackInner.set(255, 255, 255, 128); - mButtonAPikariBackOuter.set(0, 255, 0, 0); + mButtonAPikariFrontInner.r = 255; + mButtonAPikariFrontInner.g = 255; + mButtonAPikariFrontInner.b = 255; + mButtonAPikariFrontInner.a = 160; + + mButtonAPikariFrontOuter.r = 0; + mButtonAPikariFrontOuter.g = 0; + mButtonAPikariFrontOuter.b = 0; + mButtonAPikariFrontOuter.a = 0; + + mButtonAPikariBackInner.r = 255; + mButtonAPikariBackInner.g = 255; + mButtonAPikariBackInner.b = 255; + mButtonAPikariBackInner.a = 128; + + mButtonAPikariBackOuter.r = 0; + mButtonAPikariBackOuter.g = 255; + mButtonAPikariBackOuter.b = 0; + mButtonAPikariBackOuter.a = 0; + mButtonAPikariAnimSpeed = 0.4f; - mButtonBPikariFrontInner.set(255, 180, 180, 160); - mButtonBPikariFrontOuter.set(0, 0, 0, 0); - mButtonBPikariBackInner.set(255, 255, 255, 128); - mButtonBPikariBackOuter.set(255, 0, 0, 0); + mButtonBPikariFrontInner.r = 255; + mButtonBPikariFrontInner.g = 180; + mButtonBPikariFrontInner.b = 180; + mButtonBPikariFrontInner.a = 160; + + mButtonBPikariFrontOuter.r = 0; + mButtonBPikariFrontOuter.g = 0; + mButtonBPikariFrontOuter.b = 0; + mButtonBPikariFrontOuter.a = 0; + + mButtonBPikariBackInner.r = 255; + mButtonBPikariBackInner.g = 255; + mButtonBPikariBackInner.b = 255; + mButtonBPikariBackInner.a = 128; + + mButtonBPikariBackOuter.r = 255; + mButtonBPikariBackOuter.g = 0; + mButtonBPikariBackOuter.b = 0; + mButtonBPikariBackOuter.a = 0; + mButtonBPikariAnimSpeed = 0.4f; - field_0x4a8.set(255, 180, 180, 160); - field_0x4ac.set(0, 0, 0, 0); - field_0x4b0.set(255, 255, 255, 128); - field_0x4b4.set(255, 0, 0, 0); + field_0x4a8.r = 255; + field_0x4a8.g = 180; + field_0x4a8.b = 180; + field_0x4a8.a = 160; + + field_0x4ac.r = 0; + field_0x4ac.g = 0; + field_0x4ac.b = 0; + field_0x4ac.a = 0; + + field_0x4b0.r = 255; + field_0x4b0.g = 255; + field_0x4b0.b = 255; + field_0x4b0.a = 128; + + field_0x4b4.r = 255; + field_0x4b4.g = 0; + field_0x4b4.b = 0; + field_0x4b4.a = 0; + field_0x4b8 = 0.4f; - field_0x4bc.set(255, 180, 180, 160); - field_0x4c0.set(0, 0, 0, 0); - field_0x4c4.set(255, 255, 255, 128); - field_0x4c8.set(255, 255, 255, 0); + field_0x4bc.r = 255; + field_0x4bc.g = 180; + field_0x4bc.b = 180; + field_0x4bc.a = 160; + + field_0x4c0.r = 0; + field_0x4c0.g = 0; + field_0x4c0.b = 0; + field_0x4c0.a = 0; + + field_0x4c4.r = 255; + field_0x4c4.g = 255; + field_0x4c4.b = 255; + field_0x4c4.a = 128; + + field_0x4c8.r = 255; + field_0x4c8.g = 255; + field_0x4c8.b = 255; + field_0x4c8.a = 0; + field_0x4cc = 0.4f; field_0x3d0 = 0.7f; - field_0x4d0.set(255, 180, 180, 160); - field_0x4d4.set(0, 0, 0, 0); - field_0x4d8.set(255, 255, 255, 128); - field_0x4dc.set(255, 255, 255, 0); + field_0x4d0.r = 255; + field_0x4d0.g = 180; + field_0x4d0.b = 180; + field_0x4d0.a = 160; + + field_0x4d4.r = 0; + field_0x4d4.g = 0; + field_0x4d4.b = 0; + field_0x4d4.a = 0; + + field_0x4d8.r = 255; + field_0x4d8.g = 255; + field_0x4d8.b = 255; + field_0x4d8.a = 128; + + field_0x4dc.r = 255; + field_0x4dc.g = 255; + field_0x4dc.b = 255; + field_0x4dc.a = 0; + field_0x4e0 = 0.4f; field_0x3d4 = 0.7f; - mMidnaIconPikariFrontInner.set(200, 235, 255, 255); - mMidnaIconPikariFrontOuter.set(0, 0, 0, 0); - mMidnaIconPikariBackInner.set(255, 255, 255, 255); - mMidnaIconPikariBackOuter.set(140, 200, 125, 0); + mMidnaIconPikariFrontInner.r = 200; + mMidnaIconPikariFrontInner.g = 235; + mMidnaIconPikariFrontInner.b = 255; + mMidnaIconPikariFrontInner.a = 255; + + mMidnaIconPikariFrontOuter.r = 0; + mMidnaIconPikariFrontOuter.g = 0; + mMidnaIconPikariFrontOuter.b = 0; + mMidnaIconPikariFrontOuter.a = 0; + + mMidnaIconPikariBackInner.r = 255; + mMidnaIconPikariBackInner.g = 255; + mMidnaIconPikariBackInner.b = 255; + mMidnaIconPikariBackInner.a = 255; + + mMidnaIconPikariBackOuter.r = 140; + mMidnaIconPikariBackOuter.g = 200; + mMidnaIconPikariBackOuter.b = 125; + mMidnaIconPikariBackOuter.a = 0; + mMidnaIconPikariAnimSpeed = 0.5f; mMidnaIconFlashRate = 50; @@ -1106,6 +1462,22 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mLanternIconMeterSize = 1.0f; } +#if WIDESCREEN_SUPPORT +void dMeter_drawHIO_c::updateOnWide() {} + +void dMeter_drawHIO_c::updateOffWide() {} +#endif + +#if DEBUG +void dMeter_drawHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} + +void dMeter_drawHIO_c::updateFMsgDebug() { + +} +#endif + /* 802001AC-802004B4 1FAAEC 0308+00 1/1 0/0 0/0 .text __ct__16dMeter_ringHIO_cFv */ dMeter_ringHIO_c::dMeter_ringHIO_c() { mRingRadiusH = 175.0f; @@ -1218,6 +1590,18 @@ dMeter_ringHIO_c::dMeter_ringHIO_c() { mDirectSelectWaitFrames = 4; } +#if WIDESCREEN_SUPPORT +void dMeter_ringHIO_c::updateOnWide() {} + +void dMeter_ringHIO_c::updateOffWide() {} +#endif + +#if DEBUG +void dMeter_ringHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 802004B4-802006C8 1FADF4 0214+00 1/1 0/0 0/0 .text __ct__19dMeter_mapIconHIO_cFv */ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() { mPortalCursorScale = 0.5f; @@ -1311,7 +1695,7 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() { mLV5DungeonItem = fpcNm_ITEM_NONE; mIconDebug = false; - for (int i = 0; i < ARRAY_SIZEU(mIconDisplay); i++) { + for (int i = 0; i < ARRAY_SIZE(mIconDisplay); i++) { mIconDisplay[i] = true; } @@ -1326,11 +1710,21 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() { mLightDropFlashFrameNum = 10; } +#if DEBUG +void dMeter_mapIconHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 802006C8-80200BCC 1FB008 0504+00 1/1 0/0 0/0 .text __ct__16dMeter_fmapHIO_cFv */ dMeter_fmapHIO_c::dMeter_fmapHIO_c() { - field_0xc = NULL; - field_0x10 = NULL; - mpArchive = NULL; + mpArcFile = NULL; + mpDecompBuf = NULL; + mpArcData = NULL; + + #if DEBUG + mpEvtCallBack = NULL; + #endif mDisplayFrameNum = 8; mUndisplayFrameNum = 6; @@ -1362,17 +1756,18 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() { mScrollSpeedSlowBound = 0.2f; mScrollSpeedFastBound = 1.0f; - // fake match for (int i = 0; i < 8; i++) { - int* tmp = (int*)this + i; - *(f32*)(tmp + 0x5B) = 0.0f; - *(f32*)(tmp + 0x63) = 0.0f; - *(f32*)(tmp + 0x6B) = 0.0f; - *(f32*)(tmp + 0x73) = -300000.0f; - *(f32*)(tmp + 0x7B) = -300000.0f; - *(f32*)(tmp + 0x83) = 300000.0f; - *(f32*)(tmp + 0x8B) = 300000.0f; + mRegionImagePosX[i] = 0.0f; + mRegionImagePosZ[i] = 0.0f; + mRegionImageScale[i] = 0.0f; + + mRegionScrollRangeMinX[i] = -300000.0f; + mRegionScrollRangeMinZ[i] = -300000.0f; + + mRegionScrollRangeMaxX[i] = 300000.0f; + mRegionScrollRangeMaxZ[i] = 300000.0f; } + mScrollRangeDebugON = false; mScrollRangeDisplay = false; field_0x308 = true; @@ -1500,30 +1895,59 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() { mMapBlink[ZOOM_VIEW].field_0x20.set(0, 0, 0, 0); mMapBlink[ZOOM_VIEW].field_0x24.set(0, 0, 0, 255); - for (int i = 0; i < ARRAY_SIZEU(mDebugRegionBits); i++) { + for (int i = 0; i < ARRAY_SIZE(mDebugRegionBits); i++) { mDebugRegionBits[i] = 0; } } /* 80200BCC-80200CD4 1FB50C 0108+00 2/1 0/0 0/0 .text __dt__16dMeter_fmapHIO_cFv */ dMeter_fmapHIO_c::~dMeter_fmapHIO_c() { - if (field_0xc != NULL) { - mDoExt_getGameHeap()->free(field_0xc); - field_0xc = NULL; + if (mpArcFile != NULL) { + mDoExt_getGameHeap()->free(mpArcFile); + mpArcFile = NULL; } - if (field_0x10 != NULL) { - mDoExt_getGameHeap()->free(field_0x10); - field_0x10 = NULL; + if (mpDecompBuf != NULL) { + mDoExt_getGameHeap()->free(mpDecompBuf); + mpDecompBuf = NULL; } - if (mpArchive != NULL) { - mpArchive->unmount(); - delete mpArchive; - mpArchive = NULL; + if (mpArcData != NULL) { + JKRUnmountArchive(mpArcData); + delete mpArcData; + mpArcData = NULL; } + + #if DEBUG + if (mpEvtCallBack != NULL) { + delete mpEvtCallBack; + mpEvtCallBack = NULL; + } + #endif +} + +#if DEBUG +void dMeter_fmapHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} + +void dMeter_fmapHIO_c::listenPropertyEvent(const JORPropertyEvent*) { + } +void dMeter_fmapHIO_c::createEvtCallBackObject() { + +} + +void dMeter_fmapHIO_c::deleteEvtCallBackObject() { + +} + +void dMeter_fmapHIO_c::update() { + +} +#endif + /* 80200CD4-80200D58 1FB614 0084+00 1/1 0/0 0/0 .text __ct__18dMeter_cursorHIO_cFv */ dMeter_cursorHIO_c::dMeter_cursorHIO_c() { mShopCursorScale = 1.05f; @@ -1538,6 +1962,12 @@ dMeter_cursorHIO_c::dMeter_cursorHIO_c() { mMagicArmorObjZoomAngleX = -500; } +#if DEBUG +void dMeter_cursorHIO_c::genMessage(JORMContext* mctx) { + // NONMATCHING +} +#endif + /* 804510B0-804510B8 0005B0 0008+00 1/1 1/1 0/0 .sbss g_menuHIO */ dMeter_menuHIO_c g_menuHIO; |