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_info.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_info.cpp')
| -rw-r--r-- | src/d/d_meter2_info.cpp | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index f90c33566a..f62455b877 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -170,7 +170,6 @@ enum dMeter2_ItemType { ItemType_HAWK_ARROW, }; -/* 8021BDDC-8021BE20 21671C 0044+00 1/1 0/0 0/0 .text __ct__13dMeter2Info_cFv */ dMeter2Info_c::dMeter2Info_c() { init(); mTempBits = 0; @@ -178,7 +177,6 @@ dMeter2Info_c::dMeter2Info_c() { dMeter2Info_c::~dMeter2Info_c() {} -/* 8021BE68-8021C0E0 2167A8 0278+00 1/1 1/1 0/0 .text init__13dMeter2Info_cFv */ void dMeter2Info_c::init() { mMsgResource = NULL; mStageMsgResource = NULL; @@ -288,7 +286,6 @@ void dMeter2Info_c::init() { } -/* 8021C0E0-8021C11C 216A20 003C+00 0/0 1/1 2/2 .text setFloatingMessage__13dMeter2Info_cFUssb */ int dMeter2Info_c::setFloatingMessage(u16 i_msgID, s16 i_msgTimer, bool i_wakuVisible) { if (dComIfGp_event_runCheck()) { return 0; @@ -301,7 +298,6 @@ int dMeter2Info_c::setFloatingMessage(u16 i_msgID, s16 i_msgTimer, bool i_wakuVi return 1; } -/* 8021C11C-8021C1DC 216A5C 00C0+00 0/0 0/0 1/1 .text setFloatingFlow__13dMeter2Info_cFUssb */ int dMeter2Info_c::setFloatingFlow(u16 i_flowID, s16 i_msgTimer, bool i_wakuVisible) { if (dComIfGp_event_runCheck()) { return 0; @@ -320,8 +316,6 @@ int dMeter2Info_c::setFloatingFlow(u16 i_flowID, s16 i_msgTimer, bool i_wakuVisi return 1; } -/* 8021C1DC-8021C1F0 216B1C 0014+00 0/0 4/4 0/0 .text isFloatingMessageVisible__13dMeter2Info_cFv - */ bool dMeter2Info_c::isFloatingMessageVisible() { if (mFloatingMessageTimer > 0) { return true; @@ -330,8 +324,6 @@ bool dMeter2Info_c::isFloatingMessageVisible() { return false; } -/* 8021C1F0-8021C218 216B30 0028+00 0/0 1/1 0/0 .text decFloatingMessageTimer__13dMeter2Info_cFv - */ s16 dMeter2Info_c::decFloatingMessageTimer() { if (mFloatingMessageTimer > 0) { mFloatingMessageTimer--; @@ -342,7 +334,6 @@ s16 dMeter2Info_c::decFloatingMessageTimer() { return mFloatingMessageTimer; } -/* 8021C218-8021C238 216B58 0020+00 0/0 3/3 0/0 .text resetFloatingMessage__13dMeter2Info_cFv */ void dMeter2Info_c::resetFloatingMessage() { mFloatingFlowID = 0xFFFF; mFloatingMessageID = 0xFFFF; @@ -350,15 +341,12 @@ void dMeter2Info_c::resetFloatingMessage() { mFloatingMessageWakuVisible = false; } -/* 8021C238-8021C250 216B78 0018+00 0/0 2/2 0/0 .text decMsgKeyWaitTimer__13dMeter2Info_cFv */ void dMeter2Info_c::decMsgKeyWaitTimer() { if (mMsgKeyWaitTimer > 0) { mMsgKeyWaitTimer--; } } -/* 8021C250-8021C370 216B90 0120+00 0/0 16/16 0/0 .text - * getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c */ void dMeter2Info_c::getString(u32 i_stringID, char* o_string, JMSMesgEntry_c* i_msgEntry) { strcpy(o_string, ""); @@ -397,8 +385,6 @@ void dMeter2Info_c::getString(u32 i_stringID, char* o_string, JMSMesgEntry_c* i_ } } -/* 8021C370-8021C544 216CB0 01D4+00 0/0 1/1 0/0 .text - * getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c */ void dMeter2Info_c::getStringKana(u32 i_stringID, char* o_string, JMSMesgEntry_c* i_msgEntry) { strcpy(o_string, ""); @@ -468,8 +454,6 @@ void dMeter2Info_c::getStringKana(u32 i_stringID, char* o_string, JMSMesgEntry_c } } -/* 8021C544-8021C6A4 216E84 0160+00 0/0 32/32 1/1 .text - * getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c */ void dMeter2Info_c::getStringKanji(u32 i_stringID, char* o_string, JMSMesgEntry_c* i_msgEntry) { strcpy(o_string, ""); @@ -523,8 +507,6 @@ void dMeter2Info_c::getStringKanji(u32 i_stringID, char* o_string, JMSMesgEntry_ } } -/* 8021C6A4-8021C7F4 216FE4 0150+00 0/0 1/1 0/0 .text - * getStringLength__13dMeter2Info_cFP10J2DTextBoxPc */ f32 dMeter2Info_c::getStringLength(J2DTextBox* i_textbox, char* i_string) { f32 str_width = 0.0f; f32 str_len = 0.0f; @@ -564,8 +546,6 @@ f32 dMeter2Info_c::getStringLength(J2DTextBox* i_textbox, char* i_string) { return str_len; } -/* 8021C7FC-8021C934 21713C 0138+00 0/0 3/3 0/0 .text - * getStringLength__13dMeter2Info_cFP7JUTFontffPc */ f32 dMeter2Info_c::getStringLength(JUTFont* i_font, f32 param_2, f32 param_3, char* i_string) { f32 str_width = 0.0f; f32 str_len = 0.0f; @@ -598,21 +578,16 @@ f32 dMeter2Info_c::getStringLength(JUTFont* i_font, f32 param_2, f32 param_3, ch return str_len; } -/* 8021C934-8021C950 217274 001C+00 0/0 2/2 0/0 .text onDirectUseItem__13dMeter2Info_cFi - */ void dMeter2Info_c::onDirectUseItem(int param_0) { mDirectUseItem |= (u8)(1 << param_0); } -/* 8021C950-8021C970 217290 0020+00 0/0 4/4 0/0 .text isDirectUseItem__13dMeter2Info_cFi */ BOOL dMeter2Info_c::isDirectUseItem(int param_0) { return (mDirectUseItem & (u8)(1 << param_0)) ? TRUE : FALSE; } -/* 80430188-80430280 05CEA8 00F8+00 4/4 267/267 70/70 .bss g_meter2_info */ dMeter2Info_c g_meter2_info; -/* 8021C970-8021C9DC 2172B0 006C+00 0/0 0/0 5/5 .text setMeterString__13dMeter2Info_cFl */ int dMeter2Info_c::setMeterString(s32 i_string) { if (mMeterString != 0) { return 0; @@ -634,7 +609,6 @@ int dMeter2Info_c::setMeterString(s32 i_string) { return 0; } -/* 8021C9DC-8021CA04 21731C 0028+00 1/1 3/3 0/0 .text resetWarpStatus__13dMeter2Info_cFv */ void dMeter2Info_c::resetWarpStatus() { if (mWarpStatus == 2) { dComIfGs_resetLastWarpAcceptStage(); @@ -643,7 +617,6 @@ void dMeter2Info_c::resetWarpStatus() { mWarpStatus = 0; } -/* 8021CA04-8021CA70 217344 006C+00 0/0 2/2 3/3 .text warpInProc__13dMeter2Info_cFv */ void dMeter2Info_c::warpInProc() { dComIfGs_setWarpMarkFlag(0); dComIfGs_resetLastWarpAcceptStage(); @@ -653,7 +626,6 @@ void dMeter2Info_c::warpInProc() { } } -/* 8021CA70-8021CC00 2173B0 0190+00 0/0 1/1 0/0 .text warpOutProc__13dMeter2Info_cFv */ void dMeter2Info_c::warpOutProc() { dComIfGs_setLastWarpAcceptStage(dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())); @@ -684,14 +656,10 @@ void dMeter2Info_c::warpOutProc() { dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_BACK); } -/* 8021CC00-8021CC0C 217540 000C+00 0/0 1/1 1/1 .text resetMeterString__13dMeter2Info_cFv - */ void dMeter2Info_c::resetMeterString() { mMeterString = 0; } -/* 8021CC0C-8021CC80 21754C 0074+00 1/1 1/1 0/0 .text - * setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc */ void dMeter2Info_c::setWarpInfo(const char* i_stageName, const cXyz& i_position, s16 i_angle, u8 i_roomNo, u8 param_4, u8 i_warpPlayerNo) { strcpy(mWarpInfo.mStageName, i_stageName); @@ -702,7 +670,6 @@ void dMeter2Info_c::setWarpInfo(const char* i_stageName, const cXyz& i_position, mWarpInfo.mPlayerNo = (u8)i_warpPlayerNo; } -/* 8021CC80-8021CF08 2175C0 0288+00 2/2 0/0 0/0 .text getItemType__13dMeter2Info_cFUc */ u8 dMeter2Info_c::getItemType(u8 i_itemNo) { u8 type; switch (i_itemNo) { @@ -928,8 +895,6 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p return tex_num; } -/* 8021D36C-8021D44C 217CAC 00E0+00 0/0 2/2 0/0 .text - * setItemColor__13dMeter2Info_cFUcP10J2DPictureP10J2DPictureP10J2DPictureP10J2DPicture */ void dMeter2Info_c::setItemColor(u8 i_itemNo, J2DPicture* i_pic1, J2DPicture* i_pic2, J2DPicture* i_pic3, J2DPicture* i_pic4) { u8 itemType = getItemType(i_itemNo); @@ -953,8 +918,6 @@ void dMeter2Info_c::setItemColor(u8 i_itemNo, J2DPicture* i_pic1, J2DPicture* i_ } } -/* 8021D44C-8021D4B8 217D8C 006C+00 2/1 0/0 0/0 .text get2ndTexture__13dMeter2Info_cFUc - */ s16 dMeter2Info_c::get2ndTexture(u8 i_itemType) { switch (i_itemType) { case ItemType_GREEN_RUPEE: @@ -1006,8 +969,6 @@ s16 dMeter2Info_c::get2ndTexture(u8 i_itemType) { } } -/* 8021D4B8-8021D4FC 217DF8 0044+00 1/1 0/0 0/0 .text get3rdTexture__13dMeter2Info_cFUc - */ s16 dMeter2Info_c::get3rdTexture(u8 i_itemType) { switch (i_itemType) { case ItemType_GREEN_RUPEE: @@ -1028,8 +989,6 @@ s16 dMeter2Info_c::get3rdTexture(u8 i_itemType) { } } -/* 8021D4FC-8021D524 217E3C 0028+00 1/1 0/0 0/0 .text get4thTexture__13dMeter2Info_cFUc - */ s16 dMeter2Info_c::get4thTexture(u8 i_itemType) { switch (i_itemType) { case ItemType_GREEN_RUPEE: @@ -1045,8 +1004,6 @@ s16 dMeter2Info_c::get4thTexture(u8 i_itemType) { } } -/* 8021D524-8021D644 217E64 0120+00 2/2 0/0 0/0 .text set1stColor__13dMeter2Info_cFUcP10J2DPicture - */ void dMeter2Info_c::set1stColor(u8 i_itemType, J2DPicture* i_pic) { static GXColor const black_color[37] = { {0x00, 0x00, 0x00, 0x00}, {0x00, 0x60, 0x00, 0x00}, {0x00, 0x00, 0xC0, 0x00}, @@ -1152,8 +1109,6 @@ void dMeter2Info_c::set1stColor(u8 i_itemType, J2DPicture* i_pic) { *(JUtility::TColor*)&vertex_color_rd[i_itemType]); } -/* 8021D644-8021D764 217F84 0120+00 2/2 0/0 0/0 .text set2ndColor__13dMeter2Info_cFUcP10J2DPicture - */ void dMeter2Info_c::set2ndColor(u8 i_itemType, J2DPicture* i_pic) { static GXColor const black_color[37] = { {0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00}, @@ -1259,8 +1214,6 @@ void dMeter2Info_c::set2ndColor(u8 i_itemType, J2DPicture* i_pic) { *(JUtility::TColor*)&vertex_color_rd[i_itemType]); } -/* 8021D764-8021DB64 2180A4 0400+00 2/2 0/0 0/0 .text set3rdColor__13dMeter2Info_cFUcP10J2DPicture - */ void dMeter2Info_c::set3rdColor(u8 i_itemType, J2DPicture* i_pic) { if (i_itemType == ItemType_POU_FIRE) { i_pic->setBlackWhite(JUtility::TColor(0, 0, 0, 0), @@ -1283,8 +1236,6 @@ void dMeter2Info_c::set3rdColor(u8 i_itemType, J2DPicture* i_pic) { } } -/* 8021DB64-8021DCC4 2184A4 0160+00 2/2 0/0 0/0 .text set4thColor__13dMeter2Info_cFUcP10J2DPicture - */ void dMeter2Info_c::set4thColor(u8 i_itemType, J2DPicture* i_pic) { i_pic->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0xff, 0xff, 0xff, 0xff)); i_pic->setCornerColor( @@ -1292,7 +1243,6 @@ void dMeter2Info_c::set4thColor(u8 i_itemType, J2DPicture* i_pic) { JUtility::TColor(0xff, 0xff, 0xff, 0xff), JUtility::TColor(0xff, 0xff, 0xff, 0xff)); } -/* 8021DCC4-8021DCE0 218604 001C+00 0/0 2/2 0/0 .text setHotSpringTimer__13dMeter2Info_cFUc */ void dMeter2Info_c::setHotSpringTimer(u8 i_slotNo) { int i_bottleIdx = i_slotNo - 11; JUT_ASSERT(2699, i_bottleIdx >= 0 && i_bottleIdx <= dSv_player_item_c::BOTTLE_MAX); @@ -1300,7 +1250,6 @@ void dMeter2Info_c::setHotSpringTimer(u8 i_slotNo) { mHotSpringTimer[i_bottleIdx] = 900; } -/* 8021DCE0-8021DD5C 218620 007C+00 0/0 1/1 0/0 .text decHotSpringTimer__13dMeter2Info_cFv */ void dMeter2Info_c::decHotSpringTimer() { for (int i = 0; i < 4; i++) { if (mHotSpringTimer[i] != 0) { @@ -1312,7 +1261,6 @@ void dMeter2Info_c::decHotSpringTimer() { } } -/* 8021DD5C-8021DE18 21869C 00BC+00 2/2 1/1 0/0 .text changeWater__13dMeter2Info_cFUc */ void dMeter2Info_c::changeWater(u8 i_slotNo) { int i_bottleIdx = i_slotNo - SLOT_11; JUT_ASSERT(2739, i_bottleIdx >= 0 && i_bottleIdx <= dSv_player_item_c::BOTTLE_MAX); @@ -1330,8 +1278,6 @@ void dMeter2Info_c::changeWater(u8 i_slotNo) { } } -/* 8021DE18-8021E0C4 218758 02AC+00 0/0 3/3 3/3 .text setMiniGameItem__13dMeter2Info_cFUc - */ void dMeter2Info_c::setMiniGameItem(u8 i_minigameFlag) { bool item_set = false; if (mMiniGameItemSetFlag != 0) { @@ -1396,7 +1342,6 @@ void dMeter2Info_c::setMiniGameItem(u8 i_minigameFlag) { } } -/* 8021E0C4-8021E268 218A04 01A4+00 0/0 3/3 4/4 .text resetMiniGameItem__13dMeter2Info_cFb */ void dMeter2Info_c::resetMiniGameItem(bool i_saveItem) { if (mMiniGameItemSetFlag != 0) { if (i_saveItem) { @@ -1432,7 +1377,6 @@ void dMeter2Info_c::resetMiniGameItem(bool i_saveItem) { } } -/* 8021E268-8021E290 218BA8 0028+00 0/0 0/0 5/5 .text setMiniGameCount__13dMeter2Info_cFSc */ void dMeter2Info_c::setMiniGameCount(s8 i_count) { if (i_count < -99) { i_count = -99; @@ -1444,17 +1388,14 @@ void dMeter2Info_c::setMiniGameCount(s8 i_count) { mMiniGameCount = i_count; } -/* 8021E290-8021E2B4 218BD0 0024+00 1/1 2/2 0/0 .text setSaveStageName__13dMeter2Info_cFPCc */ void dMeter2Info_c::setSaveStageName(const char* i_stageName) { strcpy(mSaveStageName, i_stageName); } -/* 8021E2B4-8021E2C8 218BF4 0014+00 0/0 0/0 1/1 .text dMeter2Info_getNowLifeGauge__Fv */ s16 dMeter2Info_getNowLifeGauge() { return dMeter2Info_getMeterClass()->getNowLifeGauge(); } -/* 8021E2C8-8021E2DC 218C08 0014+00 0/0 11/11 3/3 .text dMeter2Info_getNumberTextureName__Fi */ const char* dMeter2Info_getNumberTextureName(int i_num) { static const char* tex_name[10] = { "im_font_number_32_32_ganshinkyo_0_02.bti", "im_font_number_32_32_ganshinkyo_1_02.bti", @@ -1473,7 +1414,6 @@ const char* dMeter2Info_getPlusTextureName() { return tex_name; } -/* 8021E308-8021E4B0 218C48 01A8+00 0/0 3/3 0/0 .text dMeter2Info_getPixel__FffffffPC7ResTIMG */ bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX, f32 i_sizeY, ResTIMG const* i_resTimg) { f32 temp_f31 = i_posX - param_2; @@ -1505,7 +1445,6 @@ bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 return var_r24 & 0x7000; } -/* 8021E4B0-8021E530 218DF0 0080+00 0/0 2/2 1/1 .text dMeter2Info_setCloth__FUcb */ void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) { switch (i_clothId) { case fpcNm_ITEM_WEAR_CASUAL: @@ -1527,7 +1466,6 @@ void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) { dComIfGp_setSelectEquipClothes(i_clothId); } -/* 8021E530-8021E5D4 218E70 00A4+00 0/0 3/3 3/3 .text dMeter2Info_setSword__FUcb */ void dMeter2Info_setSword(u8 i_itemId, bool i_offItemBit) { switch (i_itemId) { case fpcNm_ITEM_NONE: @@ -1550,7 +1488,6 @@ void dMeter2Info_setSword(u8 i_itemId, bool i_offItemBit) { dComIfGp_setSelectEquipSword(i_itemId); } -/* 8021E5D4-8021E660 218F14 008C+00 0/0 3/3 0/0 .text dMeter2Info_setShield__FUcb */ void dMeter2Info_setShield(u8 i_itemId, bool i_offItemBit) { switch (i_itemId) { case fpcNm_ITEM_NONE: @@ -1572,18 +1509,14 @@ void dMeter2Info_setShield(u8 i_itemId, bool i_offItemBit) { dComIfGp_setSelectEquipShield(i_itemId); } -/* 8021E660-8021E668 218FA0 0008+00 0/0 1/1 0/0 .text dMeter2Info_is2DActiveTouchArea__Fv - */ bool dMeter2Info_is2DActiveTouchArea() { return false; } -/* 8021E668-8021E688 218FA8 0020+00 0/0 1/1 0/0 .text dMeter2Info_isMapOpenCheck__Fv */ bool dMeter2Info_isMapOpenCheck() { return dMeter2Info_getMeterMapClass()->isMapOpenCheck(); } -/* 8021E688-8021E6E4 218FC8 005C+00 0/0 2/2 0/0 .text dMeter2Info_isItemOpenCheck__Fv */ bool dMeter2Info_isItemOpenCheck() { if (daPy_getPlayerActorClass()->checkCanoeSlider() || daPy_getPlayerActorClass()->getSumouMode() || dMeter2Info_isSub2DStatus(1)) { return false; @@ -1592,7 +1525,6 @@ bool dMeter2Info_isItemOpenCheck() { return true; } -/* 803BF81C-803BFA1C 01C93C 0200+00 3/3 6/6 0/0 .data letter_data__12dMenu_Letter */ dMenu_LetterData dMenu_Letter::letter_data[64] = { {0x09C5, 0x0A29, 0x0A8D, 0x010B}, {0x09C6, 0x0A2A, 0x0A8E, 0x0237}, {0x09C7, 0x0A2B, 0x0A8F, 0x0236}, {0x09C8, 0x0A2C, 0x0A90, 0x0037}, @@ -1628,8 +1560,6 @@ dMenu_LetterData dMenu_Letter::letter_data[64] = { {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000}, }; -/* 8021E6E4-8021E754 219024 0070+00 1/1 2/2 0/0 .text dMeter2Info_getRecieveLetterNum__Fv - */ u8 dMeter2Info_getRecieveLetterNum() { u8 letterNum = 0; @@ -1642,7 +1572,6 @@ u8 dMeter2Info_getRecieveLetterNum() { return letterNum; } -/* 8021E754-8021E804 219094 00B0+00 0/0 4/4 2/2 .text dMeter2Info_getNewLetterNum__Fv */ u8 dMeter2Info_getNewLetterNum() { u8 letterNum = 0; @@ -1658,8 +1587,6 @@ u8 dMeter2Info_getNewLetterNum() { return letterNum; } -/* 8021E804-8021E8DC 219144 00D8+00 0/0 1/1 0/0 .text dMeter2Info_setNewLetterSender__Fv - */ int dMeter2Info_setNewLetterSender() { u8 check = 0; @@ -1682,7 +1609,6 @@ int dMeter2Info_setNewLetterSender() { return 0; } -/* 8021E8DC-8021E9D0 21921C 00F4+00 0/0 1/1 0/0 .text dMeter2Info_recieveLetter__Fv */ int dMeter2Info_recieveLetter() { int rv = FALSE; u8 letterNum = dMeter2Info_getRecieveLetterNum(); @@ -1712,9 +1638,6 @@ int dMeter2Info_recieveLetter() { return rv; } -/* 8021E9D0-8021E9D4 219310 0004+00 0/0 33/33 0/0 .text dMeter2Info_set2DVibration__Fv */ void dMeter2Info_set2DVibration() {} -/* 8021E9D4-8021E9D8 219314 0004+00 0/0 12/12 0/0 .text dMeter2Info_set2DVibrationM__Fv - */ void dMeter2Info_set2DVibrationM() {} |
