diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-11-30 14:23:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-30 15:23:42 -0700 |
| commit | a6e76c0841cae03cae0c0e6ac75c32f979043093 (patch) | |
| tree | 76b5f590c59c6abdf2c80d0a3d5c0ccb31ebd0fe /src/d/d_meter2_draw.cpp | |
| parent | 434415337d268e405b09f6b72935a7e918e4cfe7 (diff) | |
project cleanup (#2895)
* some wii OS fixes
* remove old dol2asm comments
* remove dol2asm.h
* remove function address comments
* normalize ATTRIBUTE_ALIGN usage
* DECL_WEAK macro
* fix gcc attribute weak macro
* wrap more mwcc specific things in ifdefs
* fixes
* fix revo sdk version flags
* fixes
Diffstat (limited to 'src/d/d_meter2_draw.cpp')
| -rw-r--r-- | src/d/d_meter2_draw.cpp | 138 |
1 files changed, 0 insertions, 138 deletions
diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index b11cc6c327..e953a2cbd2 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -22,8 +22,6 @@ #include "d/d_pane_class.h" #include "cstring.h" -/* 8020FAB4-802102F8 20A3F4 0844+00 0/0 1/1 0/0 .text __ct__13dMeter2Draw_cFP10JKRExpHeap - */ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n"); @@ -148,7 +146,6 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { OS_REPORT("exit dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n"); } -/* 802102F8-80210FB0 20AC38 0CB8+00 1/0 0/0 0/0 .text __dt__13dMeter2Draw_cFv */ dMeter2Draw_c::~dMeter2Draw_c() { dComIfGp_getMsgDtArchive(0)->removeResource(dMeter2Info_getMsgResource()); dComIfGp_getMsgDtArchive(0)->removeResource(dMeter2Info_getMsgUnitResource()); @@ -405,7 +402,6 @@ dMeter2Draw_c::~dMeter2Draw_c() { } } -/* 80210FB0-8021135C 20B8F0 03AC+00 1/1 0/0 0/0 .text init__13dMeter2Draw_cFv */ void dMeter2Draw_c::init() { field_0x608 = 0.0f; field_0x60c = 0.0f; @@ -538,7 +534,6 @@ void dMeter2Draw_c::init() { field_0x772 = 0; } -/* 8021135C-8021151C 20BC9C 01C0+00 0/0 1/1 0/0 .text exec__13dMeter2Draw_cFUl */ void dMeter2Draw_c::exec(u32 i_status) { if (mParentScale != g_drawHIO.mParentScale) { mParentScale = g_drawHIO.mParentScale; @@ -579,7 +574,6 @@ void dMeter2Draw_c::exec(u32 i_status) { } } -/* 8021151C-80211BEC 20BE5C 06D0+00 1/0 0/0 0/0 .text draw__13dMeter2Draw_cFv */ void dMeter2Draw_c::draw() { J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort(); graf_ctx->setup2D(); @@ -718,7 +712,6 @@ void dMeter2Draw_c::draw() { } } -/* 80211BEC-80211E64 20C52C 0278+00 1/1 0/0 0/0 .text initLife__13dMeter2Draw_cFv */ void dMeter2Draw_c::initLife() { if (dComIfGs_getLife() > dComIfGs_getMaxLifeGauge()) { // "●●●●●●Heart Count adjust======>%d, %d\n" @@ -794,7 +787,6 @@ void dMeter2Draw_c::initLife() { setAlphaLifeChange(true); } -/* 80211E64-80212190 20C7A4 032C+00 1/1 0/0 0/0 .text initMagic__13dMeter2Draw_cFv */ void dMeter2Draw_c::initMagic() { field_0x550 = 0.0f; field_0x554 = 0.0f; @@ -858,7 +850,6 @@ void dMeter2Draw_c::initMagic() { setAlphaKanteraChange(true); } -/* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text initLightDrop__13dMeter2Draw_cFv */ void dMeter2Draw_c::initLightDrop() { mpLightDropParent = new CPaneMgr(mpScreen, 's_tuta_n', 2, NULL); JUT_ASSERT(0, mpLightDropParent != NULL); @@ -915,7 +906,6 @@ void dMeter2Draw_c::initLightDrop() { setAlphaLightDropChange(true); } -/* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text initRupeeKey__13dMeter2Draw_cFv */ void dMeter2Draw_c::initRupeeKey() { mpRupeeKeyParent = new CPaneMgr(mpScreen, 'r_k_n', 2, NULL); JUT_ASSERT(0, mpRupeeKeyParent != NULL); @@ -966,7 +956,6 @@ void dMeter2Draw_c::initRupeeKey() { setAlphaKeyChange(true); } -/* 802126E4-8021350C 20D024 0E28+00 1/1 0/0 0/0 .text initButton__13dMeter2Draw_cFv */ void dMeter2Draw_c::initButton() { field_0x761 = 1; field_0x762 = 1; @@ -1218,8 +1207,6 @@ void dMeter2Draw_c::initButton() { mpButtonParent->setAlphaRate(0.0f); } -/* 8021350C-80213CEC 20DE4C 07E0+00 1/1 0/0 0/0 .text initButtonCross__13dMeter2Draw_cFv - */ void dMeter2Draw_c::initButtonCross() { mpButtonCrossParent = new CPaneMgr(mpScreen, 'juji_n', 2, NULL); JUT_ASSERT(0, mpButtonCrossParent != NULL); @@ -1274,7 +1261,6 @@ void dMeter2Draw_c::initButtonCross() { drawButtonCross(g_drawHIO.mButtonCrossOFFPosX, g_drawHIO.mButtonCrossOFFPosY); } -/* 80213CEC-80213D6C 20E62C 0080+00 3/3 0/0 0/0 .text playPikariBckAnimation__13dMeter2Draw_cFf */ void dMeter2Draw_c::playPikariBckAnimation(f32 i_frame) { mpPikariParent->getPanePtr()->setAnimation(mPikariBck); mPikariBck->setFrame(i_frame); @@ -1282,15 +1268,12 @@ void dMeter2Draw_c::playPikariBckAnimation(f32 i_frame) { mpPikariParent->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); } -/* 80213D6C-80213E3C 20E6AC 00D0+00 1/1 0/0 0/0 .text - * setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor */ void dMeter2Draw_c::setPikariBpkAnimation(J2DAnmColor* i_bpk) { mpPikariScreen->search('pika00')->setAnimation(i_bpk); mpPikariScreen->search('moya00')->setAnimation(i_bpk); mpPikariScreen->search('moyabs')->setAnimation(i_bpk); } -/* 80213E3C-80213E94 20E77C 0058+00 3/3 0/0 0/0 .text playPikariBpkAnimation__13dMeter2Draw_cFf */ void dMeter2Draw_c::playPikariBpkAnimation(f32 i_frame) { setPikariBpkAnimation(mPikariBpk); mPikariBpk->setFrame(i_frame); @@ -1298,8 +1281,6 @@ void dMeter2Draw_c::playPikariBpkAnimation(f32 i_frame) { setPikariBpkAnimation(NULL); } -/* 80213E94-80213FF0 20E7D4 015C+00 1/1 0/0 0/0 .text - * playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor */ void dMeter2Draw_c::playOxygenBpkAnimation(J2DAnmColor* i_bpk) { if (i_bpk == NULL || mpMagicMeter->getAlpha() == 0) { mpKanteraScreen->search('mm_00')->setAnimation((J2DAnmColor*)NULL); @@ -1426,7 +1407,6 @@ void dMeter2Draw_c::drawPikariHakusha(f32 i_posX, f32 i_posY, f32 i_frame, f32 i mpPikariScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort()); } -/* 802147CC-802149F4 20F10C 0228+00 1/1 0/0 0/0 .text changeTextureLife__13dMeter2Draw_cFibUc */ void dMeter2Draw_c::changeTextureLife(int i_no, bool param_1, u8 i_quarterNum) { if (param_1) { if (i_quarterNum == 0xFF) { @@ -1460,7 +1440,6 @@ void dMeter2Draw_c::changeTextureLife(int i_no, bool param_1, u8 i_quarterNum) { } } -/* 802149F4-80214C20 20F334 022C+00 1/1 1/1 0/0 .text drawLife__13dMeter2Draw_cFssff */ void dMeter2Draw_c::drawLife(s16 i_maxLife, s16 i_life, f32 i_posX, f32 i_posY) { s16 max_heart_cnt = i_maxLife / 5; s16 heart_cnt = i_life / 4; @@ -1509,7 +1488,6 @@ void dMeter2Draw_c::drawLife(s16 i_maxLife, s16 i_life, f32 i_posX, f32 i_posY) mpLifeParent->paneTrans(i_posX, i_posY); } -/* 80214C20-80214DF4 20F560 01D4+00 1/1 1/1 0/0 .text setAlphaLifeChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaLifeChange(bool param_0) { bool var_r31 = false; bool var_r30 = false; @@ -1558,7 +1536,6 @@ void dMeter2Draw_c::setAlphaLifeChange(bool param_0) { } } -/* 80214DF4-80214E54 20F734 0060+00 0/0 1/1 0/0 .text setAlphaLifeAnimeMin__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaLifeAnimeMin() { if (mpLifeParent->getAlphaRate() != 0.0f) { mpLifeParent->setAlphaRate(g_drawHIO.mParentAlpha); @@ -1566,7 +1543,6 @@ void dMeter2Draw_c::setAlphaLifeAnimeMin() { } } -/* 80214E54-80214EB4 20F794 0060+00 0/0 1/1 0/0 .text setAlphaLifeAnimeMax__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaLifeAnimeMax() { if (mpLifeParent->getAlphaRate() != g_drawHIO.mParentAlpha) { mpLifeParent->setAlphaRate(g_drawHIO.mParentAlpha); @@ -1574,7 +1550,6 @@ void dMeter2Draw_c::setAlphaLifeAnimeMax() { } } -/* 80214EB4-80215290 20F7F4 03DC+00 1/1 0/0 0/0 .text drawKanteraScreen__13dMeter2Draw_cFUc */ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) { J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort(); @@ -1627,7 +1602,6 @@ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) { mpKanteraScreen->draw(0.0f, 0.0f, graf_ctx); } -/* 80215290-80215380 20FBD0 00F0+00 1/1 0/0 0/0 .text drawMagic__13dMeter2Draw_cFssff */ void dMeter2Draw_c::drawMagic(s16 i_max, s16 i_magic, f32 i_posX, f32 i_posY) { f32 temp_f30 = mpMagicFrameL->getInitPosX(); f32 temp_f31 = mpMagicFrameR->getInitPosX() - temp_f30; @@ -1648,7 +1622,6 @@ void dMeter2Draw_c::drawMagic(s16 i_max, s16 i_magic, f32 i_posX, f32 i_posY) { field_0x5f0[0] = i_posY; } -/* 80215380-802154A8 20FCC0 0128+00 2/2 0/0 0/0 .text setAlphaMagicChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaMagicChange(bool i_forceSet) { bool meter_parent_alpha_set = false; bool meter_alpha_set = false; @@ -1684,8 +1657,6 @@ static f32 dummyLiteralOrder() { return 5.0f; } -/* 802154A8-802155B8 20FDE8 0110+00 1/1 1/1 0/0 .text drawKantera__13dMeter2Draw_cFllff - */ void dMeter2Draw_c::drawKantera(s32 i_max, s32 i_oil, f32 i_posX, f32 i_posY) { f32 var_f6 = mpMagicFrameR->getInitPosX() - mpMagicFrameL->getInitPosX(); f32 var_f7 = 0.0f; @@ -1708,7 +1679,6 @@ void dMeter2Draw_c::drawKantera(s32 i_max, s32 i_oil, f32 i_posX, f32 i_posY) { field_0x5f0[1] = i_posY; } -/* 802155B8-802156E0 20FEF8 0128+00 2/2 1/1 0/0 .text setAlphaKanteraChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaKanteraChange(bool i_forceSet) { bool meter_parent_alpha_set = false; bool meter_alpha_set = false; @@ -1739,8 +1709,6 @@ void dMeter2Draw_c::setAlphaKanteraChange(bool i_forceSet) { } } -/* 802156E0-8021575C 210020 007C+00 0/0 1/1 0/0 .text setAlphaKanteraAnimeMin__13dMeter2Draw_cFv - */ void dMeter2Draw_c::setAlphaKanteraAnimeMin() { if (field_0x742[1] <= 0) { mMeterAlphaRate[1] = 0.0f; @@ -1754,8 +1722,6 @@ void dMeter2Draw_c::setAlphaKanteraAnimeMin() { } } -/* 8021575C-802157E0 21009C 0084+00 0/0 1/1 0/0 .text setAlphaKanteraAnimeMax__13dMeter2Draw_cFv - */ void dMeter2Draw_c::setAlphaKanteraAnimeMax() { if (field_0x742[1] >= 5) { mMeterAlphaRate[1] = g_drawHIO.mParentAlpha; @@ -1769,7 +1735,6 @@ void dMeter2Draw_c::setAlphaKanteraAnimeMax() { } } -/* 802157E0-802158F0 210120 0110+00 0/0 1/1 0/0 .text drawOxygen__13dMeter2Draw_cFllff */ void dMeter2Draw_c::drawOxygen(s32 i_max, s32 i_oxygen, f32 i_posX, f32 i_posY) { f32 var_f6 = mpMagicFrameR->getInitPosX() - mpMagicFrameL->getInitPosX(); f32 var_f7 = 0.0f; @@ -1792,7 +1757,6 @@ void dMeter2Draw_c::drawOxygen(s32 i_max, s32 i_oxygen, f32 i_posX, f32 i_posY) field_0x5f0[2] = i_posY; } -/* 802158F0-80215A18 210230 0128+00 1/1 1/1 0/0 .text setAlphaOxygenChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaOxygenChange(bool i_forceSet) { bool meter_parent_alpha_set = false; bool meter_alpha_set = false; @@ -1823,7 +1787,6 @@ void dMeter2Draw_c::setAlphaOxygenChange(bool i_forceSet) { } } -/* 80215A18-80215A94 210358 007C+00 0/0 1/1 0/0 .text setAlphaOxygenAnimeMin__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaOxygenAnimeMin() { if (field_0x742[2] <= 0) { mMeterAlphaRate[2] = 0.0f; @@ -1837,7 +1800,6 @@ void dMeter2Draw_c::setAlphaOxygenAnimeMin() { } } -/* 80215A94-80215B18 2103D4 0084+00 0/0 1/1 0/0 .text setAlphaOxygenAnimeMax__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaOxygenAnimeMax() { if (field_0x742[2] >= 5) { mMeterAlphaRate[2] = g_drawHIO.mParentAlpha; @@ -1851,7 +1813,6 @@ void dMeter2Draw_c::setAlphaOxygenAnimeMax() { } } -/* 80215B18-80215DA4 210458 028C+00 1/1 1/1 0/0 .text drawLightDrop__13dMeter2Draw_cFUcUcffffUc */ void dMeter2Draw_c::drawLightDrop(u8 i_num, u8 i_needNum, f32 i_posX, f32 i_posY, f32 i_vesselScale, f32 param_5, u8 param_6) { for (int i = 0; i < 16; i++) { @@ -1905,12 +1866,8 @@ void dMeter2Draw_c::drawLightDrop(u8 i_num, u8 i_needNum, f32 i_posX, f32 i_posY mpLightDropParent->paneTrans(i_posX, i_posY); } -/* 80215DA4-80215DA8 2106E4 0004+00 1/1 1/1 0/0 .text setAlphaLightDropChange__13dMeter2Draw_cFb - */ void dMeter2Draw_c::setAlphaLightDropChange(bool unused) {} -/* 80215DA8-80215E40 2106E8 0098+00 0/0 1/1 0/0 .text getNowLightDropRateCalc__13dMeter2Draw_cFv - */ f32 dMeter2Draw_c::getNowLightDropRateCalc() { f32 drop_num = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()); f32 need_drop_num = dComIfGp_getNeedLightDropNum(); @@ -1927,8 +1884,6 @@ f32 dMeter2Draw_c::getNowLightDropRateCalc() { return rate; } -/* 80215E40-80215F88 210780 0148+00 0/0 1/1 0/0 .text setAlphaLightDropAnimeMin__13dMeter2Draw_cFv - */ void dMeter2Draw_c::setAlphaLightDropAnimeMin() { if (mpLightDropParent->getAlphaRate() != 0.0f) { mpLightDropParent->setAlphaRate(g_drawHIO.mParentAlpha * field_0x6fc); @@ -1951,8 +1906,6 @@ void dMeter2Draw_c::setAlphaLightDropAnimeMin() { } } -/* 80215F88-8021632C 2108C8 03A4+00 0/0 1/1 0/0 .text setAlphaLightDropAnimeMax__13dMeter2Draw_cFv - */ void dMeter2Draw_c::setAlphaLightDropAnimeMax() { f32 temp_f31 = g_drawHIO.mParentAlpha * field_0x6fc; @@ -2018,7 +1971,6 @@ void dMeter2Draw_c::setAlphaLightDropAnimeMax() { } } -/* 8021632C-80216684 210C6C 0358+00 1/1 1/1 0/0 .text drawRupee__13dMeter2Draw_cFs */ void dMeter2Draw_c::drawRupee(s16 i_rupeeNum) { mpRupeeTexture[3][0]->hide(); mpRupeeTexture[3][1]->hide(); @@ -2077,7 +2029,6 @@ void dMeter2Draw_c::drawRupee(s16 i_rupeeNum) { } } -/* 80216684-802168D0 210FC4 024C+00 1/1 1/1 0/0 .text setAlphaRupeeChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaRupeeChange(bool param_0) { bool set_parent = false; bool set_rupeekey = false; @@ -2133,7 +2084,6 @@ void dMeter2Draw_c::setAlphaRupeeChange(bool param_0) { } } -/* 802168D0-80216990 211210 00C0+00 0/0 1/1 0/0 .text setAlphaRupeeAnimeMin__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaRupeeAnimeMin() { f32 alphas[3]; alphas[0] = g_drawHIO.mRupeeAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); @@ -2148,7 +2098,6 @@ void dMeter2Draw_c::setAlphaRupeeAnimeMin() { } } -/* 80216990-80216A40 2112D0 00B0+00 0/0 1/1 0/0 .text setAlphaRupeeAnimeMax__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaRupeeAnimeMax() { f32 alphas[3]; alphas[0] = g_drawHIO.mRupeeAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); @@ -2163,7 +2112,6 @@ void dMeter2Draw_c::setAlphaRupeeAnimeMax() { } } -/* 80216A40-80216B28 211380 00E8+00 1/1 1/1 0/0 .text drawKey__13dMeter2Draw_cFs */ void dMeter2Draw_c::drawKey(s16 i_keyNum) { if (i_keyNum > 5) { i_keyNum = 5; @@ -2185,7 +2133,6 @@ void dMeter2Draw_c::drawKey(s16 i_keyNum) { mpKeyParent->paneTrans(g_drawHIO.mKeyPosX, g_drawHIO.mKeyPosY); } -/* 80216B28-80216CA8 211468 0180+00 1/1 1/1 0/0 .text setAlphaKeyChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaKeyChange(bool param_0) { bool set_parent = false; bool set_rupeekey = false; @@ -2223,7 +2170,6 @@ void dMeter2Draw_c::setAlphaKeyChange(bool param_0) { } } -/* 80216CA8-80216D2C 2115E8 0084+00 0/0 1/1 0/0 .text setAlphaKeyAnimeMin__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaKeyAnimeMin() { f32 alpha = g_drawHIO.mKeyAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); @@ -2233,7 +2179,6 @@ void dMeter2Draw_c::setAlphaKeyAnimeMin() { } } -/* 80216D2C-80216DAC 21166C 0080+00 0/0 1/1 0/0 .text setAlphaKeyAnimeMax__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaKeyAnimeMax() { f32 alpha = g_drawHIO.mKeyAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha); @@ -2243,7 +2188,6 @@ void dMeter2Draw_c::setAlphaKeyAnimeMax() { } } -/* 80216DAC-802170E4 2116EC 0338+00 1/1 1/1 0/0 .text drawButtonA__13dMeter2Draw_cFUcfffffbb */ void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textPosX, f32 i_textPosY, f32 i_scale, bool param_6, bool param_7) { char* mp_string = getActionString(i_action, 1, &field_0x761); @@ -2308,7 +2252,6 @@ void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textP g_drawHIO.mButtonATextPosY + i_textPosY); } -/* 802170E4-8021764C 211A24 0568+00 1/1 1/1 0/0 .text drawButtonB__13dMeter2Draw_cFUcbfffffb */ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_posY, f32 i_textPosX, f32 i_textPosY, f32 i_scale, bool param_7) { int var_r31 = 0; @@ -2409,8 +2352,6 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos g_drawHIO.mButtonBFontPosY + i_textPosY); } -/* 8021764C-802176EC 211F8C 00A0+00 1/1 1/1 0/0 .text drawButtonR__13dMeter2Draw_cFUcUcbb - */ void dMeter2Draw_c::drawButtonR(u8 unused0, u8 i_action, bool unused1, bool unused2) { mpScreen->search('item_r_n')->hide(); mpTextXY[2]->show(); @@ -2421,7 +2362,6 @@ void dMeter2Draw_c::drawButtonR(u8 unused0, u8 i_action, bool unused1, bool unus } } -/* 802176EC-80217904 21202C 0218+00 1/1 1/1 0/0 .text drawButtonZ__13dMeter2Draw_cFUc */ void dMeter2Draw_c::drawButtonZ(u8 i_action) { char* mp_string = getActionString(i_action, 1, &field_0x764); @@ -2460,7 +2400,6 @@ void dMeter2Draw_c::drawButtonZ(u8 i_action) { mpTextXY[2]->paneTrans(g_drawHIO.mButtonZFontPosX, g_drawHIO.mButtonZFontPosY); } -/* 80217904-80217954 212244 0050+00 1/1 1/1 0/0 .text drawButton3D__13dMeter2Draw_cFUc */ void dMeter2Draw_c::drawButton3D(u8 i_action) { getActionString(i_action, 1, &field_0x765); if (i_action != 0) { @@ -2468,7 +2407,6 @@ void dMeter2Draw_c::drawButton3D(u8 i_action) { } } -/* 80217954-802179C0 212294 006C+00 1/1 1/1 0/0 .text drawButtonC__13dMeter2Draw_cFUcb */ void dMeter2Draw_c::drawButtonC(u8 i_action, bool unused) { getActionString(i_action, 1, &field_0x766); if (i_action != 0 && (dComIfGp_isCStickSetFlag(2) & 1 || dComIfGp_isCStickSetFlag(4))) { @@ -2476,7 +2414,6 @@ void dMeter2Draw_c::drawButtonC(u8 i_action, bool unused) { } } -/* 802179C0-80217A10 212300 0050+00 1/1 1/1 0/0 .text drawButtonS__13dMeter2Draw_cFUc */ void dMeter2Draw_c::drawButtonS(u8 i_action) { getActionString(i_action, 1, &field_0x767); if (i_action != 0) { @@ -2484,8 +2421,6 @@ void dMeter2Draw_c::drawButtonS(u8 i_action) { } } -/* 80217A10-80217AB4 212350 00A4+00 0/0 1/1 0/0 .text drawButtonBin__13dMeter2Draw_cFUc - */ void dMeter2Draw_c::drawButtonBin(u8 i_action) { int bottle_num = 0; for (int i = 0; i < 4; i++) { @@ -2502,7 +2437,6 @@ void dMeter2Draw_c::drawButtonBin(u8 i_action) { } } -/* 80217AB4-80218238 2123F4 0784+00 1/1 1/1 0/0 .text drawButtonXY__13dMeter2Draw_cFiUcUcbb */ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_3, bool param_4) { JUT_ASSERT(0, i_no < SELECT_MAX_e); @@ -2649,14 +2583,10 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_ } } -/* 80218238-80218254 212B78 001C+00 0/0 1/1 0/0 .text - * getButtonCrossParentInitTransY__13dMeter2Draw_cFv */ f32 dMeter2Draw_c::getButtonCrossParentInitTransY() { return mpButtonCrossParent->getInitCenterPosY(); } -/* 80218254-80218338 212B94 00E4+00 1/1 1/1 0/0 .text drawButtonCross__13dMeter2Draw_cFff - */ void dMeter2Draw_c::drawButtonCross(f32 i_posX, f32 i_posY) { mpButtonCrossParent->scale(g_drawHIO.mButtonCrossScale, g_drawHIO.mButtonCrossScale); mpTextI->scale(g_drawHIO.mButtonCrossTextScale, g_drawHIO.mButtonCrossTextScale); @@ -2664,8 +2594,6 @@ void dMeter2Draw_c::drawButtonCross(f32 i_posX, f32 i_posY) { mpButtonCrossParent->paneTrans(i_posX, i_posY); } -/* 80218338-802183A8 212C78 0070+00 0/0 1/1 0/0 .text - * setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaButtonCrossAnimeMin() { if (mpButtonCrossParent->getAlphaRate() != 0.0f) { mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha); @@ -2676,8 +2604,6 @@ void dMeter2Draw_c::setAlphaButtonCrossAnimeMin() { setAlphaButtonCrossMapAnimeMin(); } -/* 802183A8-80218448 212CE8 00A0+00 0/0 1/1 0/0 .text - * setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaButtonCrossAnimeMax() { if (g_drawHIO.mParentAlpha != mpButtonCrossParent->getAlphaRate()) { mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha); @@ -2697,8 +2623,6 @@ void dMeter2Draw_c::setAlphaButtonCrossAnimeMax() { } } -/* 80218448-80218524 212D88 00DC+00 2/2 0/0 0/0 .text - * setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMin() { if (mpTextI->getAlphaRate() != 0.0f) { mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha); @@ -2713,8 +2637,6 @@ void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMin() { } } -/* 80218524-802185E8 212E64 00C4+00 1/1 0/0 0/0 .text - * setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMax() { if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha != mpTextI->getAlphaRate()) { mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha); @@ -2729,8 +2651,6 @@ void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMax() { } } -/* 802185E8-802186C4 212F28 00DC+00 2/2 0/0 0/0 .text - * setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMin() { if (mpTextM->getAlphaRate() != 0.0f) { mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha); @@ -2745,8 +2665,6 @@ void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMin() { } } -/* 802186C4-80218788 213004 00C4+00 1/1 0/0 0/0 .text - * setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMax() { if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha != mpTextM->getAlphaRate()) { mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha); @@ -2761,7 +2679,6 @@ void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMax() { } } -/* 80218788-8021901C 2130C8 0894+00 1/1 1/1 0/0 .text setAlphaButtonChange__13dMeter2Draw_cFb */ void dMeter2Draw_c::setAlphaButtonChange(bool param_0) { bool set_parent = false; bool set_buttonA = false; @@ -2960,7 +2877,6 @@ void dMeter2Draw_c::setAlphaButtonChange(bool param_0) { } } -/* 8021901C-802190A8 21395C 008C+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMin__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaButtonAnimeMin() { if (mpButtonParent->getAlphaRate() != 0.0f) { mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); @@ -2972,7 +2888,6 @@ void dMeter2Draw_c::setAlphaButtonAnimeMin() { } } -/* 802190A8-80219174 2139E8 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMax__13dMeter2Draw_cFv */ void dMeter2Draw_c::setAlphaButtonAnimeMax() { if (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha != mpButtonParent->getAlphaRate()) { mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha); @@ -2990,8 +2905,6 @@ void dMeter2Draw_c::setAlphaButtonAnimeMax() { } } -/* 80219174-80219258 213AB4 00E4+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMin__13dMeter2Draw_cFv - */ void dMeter2Draw_c::setAlphaButtonAAnimeMin() { if (mpButtonA->getAlphaRate() != 0.0f) { mpButtonA->setAlphaRate(g_drawHIO.mButtonAAlpha * @@ -3007,8 +2920,6 @@ void dMeter2Draw_c::setAlphaButtonAAnimeMin() { } } -/* 80219258-80219324 213B98 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMax__13dMeter2Draw_cFv - */ void dMeter2Draw_c::setAlphaButtonAAnimeMax() { if (g_drawHIO.mButtonAAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha) != mpButtonA->getAlphaRate()) @@ -3026,8 +2937,6 @@ void dMeter2Draw_c::setAlphaButtonAAnimeMax() { } } -/* 80219324-80219474 213C64 0150+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMin__13dMeter2Draw_cFv - */ void dMeter2Draw_c::setAlphaButtonBAnimeMin() { if (mpButtonB->getAlphaRate() != 0.0f) { mpButtonB->setAlphaRate(g_drawHIO.mButtonBAlpha * @@ -3052,8 +2961,6 @@ void dMeter2Draw_c::setAlphaButtonBAnimeMin() { } } -/* 80219474-802195A4 213DB4 0130+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMax__13dMeter2Draw_cFv - */ void dMeter2Draw_c::setAlphaButtonBAnimeMax() { if (mpButtonB->getAlphaRate() != g_drawHIO.mButtonBAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha)) @@ -3080,8 +2987,6 @@ void dMeter2Draw_c::setAlphaButtonBAnimeMax() { } } -/* 802195A4-80219788 213EE4 01E4+00 0/0 1/1 0/0 .text setButtonIconAAlpha__13dMeter2Draw_cFUcUlb - */ void dMeter2Draw_c::setButtonIconAAlpha(u8 unused0, u32 unused1, bool unused2) { if (mpButtonA->isVisible()) { u8 alpha = g_drawHIO.mButtonAAlpha * @@ -3106,8 +3011,6 @@ void dMeter2Draw_c::setButtonIconAAlpha(u8 unused0, u32 unused1, bool unused2) { } } -/* 80219788-80219A84 2140C8 02FC+00 0/0 1/1 0/0 .text setButtonIconBAlpha__13dMeter2Draw_cFUcUlb - */ void dMeter2Draw_c::setButtonIconBAlpha(u8 unused0, u32 unused1, bool param_2) { if (mpItemB->isVisible() || mpLightB->isVisible() || mpButtonB->isVisible()) { f32 temp_f30 = @@ -3150,8 +3053,6 @@ void dMeter2Draw_c::setButtonIconBAlpha(u8 unused0, u32 unused1, bool param_2) { } } -/* 80219A84-80219E98 2143C4 0414+00 0/0 1/1 0/0 .text setButtonIconMidonaAlpha__13dMeter2Draw_cFUl - */ void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) { mpButtonMidona->scale(g_drawHIO.mMidnaIconScale, g_drawHIO.mMidnaIconScale); mpButtonMidona->paneTrans(g_drawHIO.mMidnaIconPosX, g_drawHIO.mMidnaIconPosY); @@ -3232,8 +3133,6 @@ void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) { mpButtonXY[2]->setAlpha(255.0f * field_0x724 * temp_f30_2); } -/* 80219E98-8021A29C 2147D8 0404+00 0/0 1/1 0/0 .text setButtonIconAlpha__13dMeter2Draw_cFiUcUlb - */ void dMeter2Draw_c::setButtonIconAlpha(int i_no, u8 unused0, u32 unused1, bool unused2) { JUT_ASSERT(0, i_no < SELECT_MAX_e); @@ -3316,14 +3215,11 @@ void dMeter2Draw_c::setButtonIconAlpha(int i_no, u8 unused0, u32 unused1, bool u } } -/* 8021A29C-8021A2F4 214BDC 0058+00 1/1 0/0 0/0 .text getNumberTexture__13dMeter2Draw_cFi - */ ResTIMG* dMeter2Draw_c::getNumberTexture(int i) { return (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(i)); } -/* 8021A2F4-8021A468 214C34 0174+00 9/9 1/1 0/0 .text getActionString__13dMeter2Draw_cFUcUcPUc */ char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) { static u32 i_action_num[] = { 0, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1387, 1009, 1010, 1011, 1012, 1013, 1014, @@ -3383,7 +3279,6 @@ char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) { return i_text_buf; } -/* 8021A468-8021A71C 214DA8 02B4+00 2/2 0/0 0/0 .text changeTextureItemB__13dMeter2Draw_cFUc */ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { int var_r31 = 0; if (i_itemNo == fpcNm_ITEM_LURE_ROD) { @@ -3428,7 +3323,6 @@ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { mpItemBPane->resize(field_0x6e4, field_0x6e8); } -/* 8021A71C-8021A9C8 21505C 02AC+00 1/1 0/0 0/0 .text changeTextureItemXY__13dMeter2Draw_cFiUc */ void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) { JUT_ASSERT(0, i_no < SELECT_MAX_e); @@ -3481,8 +3375,6 @@ void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) { mpItemXYPane[i_no]->resize(field_0x6c4[i_no], field_0x6d0[i_no]); } -/* 8021A9C8-8021AAA4 215308 00DC+00 10/10 2/2 0/0 .text - * setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas */ void dMeter2Draw_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane, s16 i_min) { f32 alpha_rate = i_pane->getAlphaRate(); s16 alpha_timer = i_pane->getAlphaTimer(); @@ -3505,8 +3397,6 @@ void dMeter2Draw_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane, s16 i_min) { } } -/* 8021AAA4-8021AB84 2153E4 00E0+00 10/10 23/23 0/0 .text - * setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas */ void dMeter2Draw_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane, s16 i_max) { f32 alpha_rate = i_pane->getAlphaRate(); s16 alpha_timer = i_pane->getAlphaTimer(); @@ -3526,8 +3416,6 @@ void dMeter2Draw_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane, s16 i_max) { } } -/* 8021AB84-8021AEC8 2154C4 0344+00 0/0 6/6 0/0 .text setItemNum__13dMeter2Draw_cFUcUcUc - */ void dMeter2Draw_c::setItemNum(u8 i_button, u8 i_num, u8 i_max) { JUT_ASSERT(0, i_button < SELECT_MAX_e); @@ -3582,7 +3470,6 @@ void dMeter2Draw_c::setItemNum(u8 i_button, u8 i_num, u8 i_max) { } } -/* 8021AEC8-8021AF78 215808 00B0+00 0/0 1/1 0/0 .text drawItemNum__13dMeter2Draw_cFUcf */ void dMeter2Draw_c::drawItemNum(u8 i_button, f32 i_alpha) { JUT_ASSERT(0, i_button < SELECT_MAX_e); @@ -3595,7 +3482,6 @@ void dMeter2Draw_c::drawItemNum(u8 i_button, f32 i_alpha) { } } -/* 8021AF78-8021B0C8 2158B8 0150+00 0/0 1/1 0/0 .text drawKanteraMeter__13dMeter2Draw_cFUcf */ void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) { JUT_ASSERT(0, i_button < SELECT_MAX_e); @@ -3617,14 +3503,10 @@ void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) { mpKanteraMeter[i_button]->setAlphaRate(i_alphaRate); } -/* 8021B0C8-8021B104 215A08 003C+00 0/0 3/3 0/0 .text isButtonVisible__13dMeter2Draw_cFv - */ u8 dMeter2Draw_c::isButtonVisible() { return (mpButtonParent->getAlphaRate() == 0.0f) ^ 1; } -/* 8021B104-8021B364 215A44 0260+00 3/2 0/0 0/0 .text setItemParamX__13dMeter2Draw_cFUc - */ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { if (g_drawHIO.mButtonDebug[0]) { mItemParams[SELECT_X_e].pos_x = g_drawHIO.mButtonXItemPosX; @@ -3704,8 +3586,6 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { } } -/* 8021B364-8021B5B0 215CA4 024C+00 3/2 0/0 0/0 .text setItemParamY__13dMeter2Draw_cFUc - */ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { if (g_drawHIO.mButtonDebug[1]) { mItemParams[SELECT_Y_e].pos_x = g_drawHIO.mButtonYItemPosX; @@ -3785,8 +3665,6 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { } } -/* 8021B5B0-8021B810 215EF0 0260+00 3/2 0/0 0/0 .text setItemParamZ__13dMeter2Draw_cFUc - */ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { if (g_drawHIO.mButtonDebug[2]) { mItemParams[SELECT_Z_e].pos_x = g_drawHIO.field_0x1cc; @@ -3866,8 +3744,6 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { } } -/* 8021B810-8021BB6C 216150 035C+00 3/2 0/0 0/0 .text setItemParamB__13dMeter2Draw_cFUc - */ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { if (g_drawHIO.mButtonDebug[3]) { mItemParams[3].pos_x = g_drawHIO.mButtonBItemPosX[0]; @@ -3998,8 +3874,6 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { } } -/* 8021BB6C-8021BBB4 2164AC 0048+00 1/1 0/0 0/0 .text getFishingType__13dMeter2Draw_cFv - */ bool dMeter2Draw_c::getFishingType() { if (dMeter2Info_isGameStatus(1) && getCanoeFishing()) { return true; @@ -4012,8 +3886,6 @@ bool dMeter2Draw_c::getFishingType() { static const char* tex_name[] = {"tt_heart_00.bti", "tt_heart_01.bti", "tt_heart_02.bti", "tt_heart_03.bti"}; -/* 8021BBB4-8021BC24 2164F4 0070+00 2/2 1/1 0/0 .text getCanoeFishing__13dMeter2Draw_cFv - */ bool dMeter2Draw_c::getCanoeFishing() { if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && ((daPy_py_c*)dComIfGp_getPlayer(0))->checkCanoeRide()) @@ -4024,14 +3896,10 @@ bool dMeter2Draw_c::getCanoeFishing() { } } -/* 8021BC24-8021BC54 216564 0030+00 0/0 1/1 0/0 .text getCameraSubject__13dMeter2Draw_cFv - */ bool dMeter2Draw_c::getCameraSubject() { return dCam_getBody()->Mode() == 4 ? TRUE : FALSE; } -/* 8021BC54-8021BCAC 216594 0058+00 0/0 1/1 0/0 .text getItemSubject__13dMeter2Draw_cFv - */ bool dMeter2Draw_c::getItemSubject() { if (dCam_getBody()->Mode() != 4 && (dCam_getBody()->Mode() == 7 || dCam_getBody()->Mode() == 8)) { @@ -4041,13 +3909,10 @@ bool dMeter2Draw_c::getItemSubject() { return false; } -/* 8021BCAC-8021BCC0 2165EC 0014+00 0/0 1/1 0/0 .text getPlayerSubject__13dMeter2Draw_cFv - */ bool dMeter2Draw_c::getPlayerSubject() { return dComIfGp_checkPlayerStatus0(0, 0x8000000); } -/* 8021BCC0-8021BDD0 216600 0110+00 2/2 2/2 0/0 .text isBButtonShow__13dMeter2Draw_cFb */ bool dMeter2Draw_c::isBButtonShow(bool param_0) { if (dMsgObject_getMsgObjectClass() == NULL) { return false; @@ -4064,13 +3929,10 @@ bool dMeter2Draw_c::isBButtonShow(bool param_0) { return false; } -/* 8021BDD0-8021BDDC 216710 000C+00 0/0 1/1 0/0 .text getButtonTimer__13dMeter2Draw_cFv - */ s16 dMeter2Draw_c::getButtonTimer() { return mpButtonParent->getAlphaTimer(); } -/* 803988B8-803988D0 024F18 0018+00 0/0 0/0 0/0 .rodata tag$7759 */ // unused static u64 const tag_7759[] = { 'item_x_n', |
