mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-14 14:28:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

project cleanup (#2895)

Browse Source 
* 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
This commit is contained in:
TakaRikka
2025-11-30 14:23:42 -08:00
committed by GitHub
parent 434415337d
commit a6e76c0841
2375 changed files with 24683 additions and 71069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_menu_skill.cpp
-40
View File
@@ -33,8 +33,6 @@ static moveFunc map_move_process[] = {
&dMenu_Skill_c::read_close_move,
};
/* 801F7224-801F7348 1F1B64 0124+00 0/0 2/2 0/0 .text
* __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl */
dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* i_heap, STControl* i_stcontrol, CSTControl* i_cstcontrol) {
mpHeap = i_heap;
mpArchive = NULL;
@@ -55,7 +53,6 @@ dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* i_heap, STControl* i_stcontrol, CSTCont
mBarScale[0] = 1.0f;
}
/* 801F7348-801F763C 1F1C88 02F4+00 1/0 0/0 0/0 .text __dt__13dMenu_Skill_cFv */
dMenu_Skill_c::~dMenu_Skill_c() {
delete mpDrawCursor;
mpDrawCursor = NULL;
@@ -115,7 +112,6 @@ dMenu_Skill_c::~dMenu_Skill_c() {
}
}
/* 801F763C-801F7718 1F1F7C 00DC+00 1/1 0/0 0/0 .text _create__13dMenu_Skill_cFv */
void dMenu_Skill_c::_create() {
mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL);
mpDrawCursor->setParam(1.01f, 0.85f, 0.02f, 0.5f, 0.5f);
@@ -130,7 +126,6 @@ void dMenu_Skill_c::_create() {
init();
}
/* 801F7718-801F77B0 1F2058 0098+00 0/0 2/2 0/0 .text _move__13dMenu_Skill_cFv */
void dMenu_Skill_c::_move() {
JKRHeap* heap = mDoExt_setCurrentHeap((JKRHeap*)mpHeap);
u8 process = mProcess;
@@ -142,7 +137,6 @@ void dMenu_Skill_c::_move() {
mDoExt_setCurrentHeap(heap);
}
/* 801F77B0-801F7950 1F20F0 01A0+00 1/1 1/1 0/0 .text _draw__13dMenu_Skill_cFv */
void dMenu_Skill_c::_draw() {
if (mpArchive != NULL) {
J2DGrafContext* context = dComIfGp_getCurrentGrafPort();
@@ -165,7 +159,6 @@ void dMenu_Skill_c::_draw() {
}
}
/* 801F7950-801F7978 1F2290 0028+00 0/0 2/2 0/0 .text isSync__13dMenu_Skill_cFv */
bool dMenu_Skill_c::isSync() {
if (mpMount != NULL && mpMount->sync() == false) {
return 0;
@@ -173,8 +166,6 @@ bool dMenu_Skill_c::isSync() {
return 1;
}
/* 801F7978-801F79EC 1F22B8 0074+00 1/1 0/0 0/0 .text skill_init_calc__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::skill_init_calc() {
mTotalSkillNum = getSkillNum();
if (mTotalSkillNum < 7) {
@@ -190,14 +181,12 @@ void dMenu_Skill_c::skill_init_calc() {
}
}
/* 801F79EC-801F7A40 1F232C 0054+00 1/1 0/0 0/0 .text init__13dMenu_Skill_cFv */
void dMenu_Skill_c::init() {
setPageText();
changeActiveColor();
(this->*map_init_process[mProcess])();
}
/* 801F7A40-801F7C1C 1F2380 01DC+00 0/0 2/2 0/0 .text _open__13dMenu_Skill_cFv */
int dMenu_Skill_c::_open() {
if (!mpMount) {
mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/skillres.arc", 0, NULL);
@@ -239,7 +228,6 @@ int dMenu_Skill_c::_open() {
}
}
/* 801F7C1C-801F7D58 1F255C 013C+00 0/0 1/1 0/0 .text _close__13dMenu_Skill_cFv */
int dMenu_Skill_c::_close() {
s16 closeFrame = g_drawHIO.mSkillListScreen.mCloseFrame[0];
mFrame = 0;
@@ -264,13 +252,11 @@ int dMenu_Skill_c::_close() {
return mFrame <= 0;
}
/* 801F7D58-801F7D94 1F2698 003C+00 1/0 0/0 0/0 .text wait_init__13dMenu_Skill_cFv */
void dMenu_Skill_c::wait_init() {
setAButtonString(0x40C);
setBButtonString(0x3f9);
}
/* 801F7D94-801F7F24 1F26D4 0190+00 1/0 0/0 0/0 .text wait_move__13dMenu_Skill_cFv */
void dMenu_Skill_c::wait_move() {
u8 oldIndex = mIndex;
if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
@@ -298,8 +284,6 @@ void dMenu_Skill_c::wait_move() {
}
}
/* 801F7F24-801F7FF8 1F2864 00D4+00 1/0 0/0 0/0 .text read_open_init__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::read_open_init() {
static const u32 i_id[7] = {
1716, 1715, 1717, 1718, 1719, 1720, 1721,
@@ -319,8 +303,6 @@ void dMenu_Skill_c::read_open_init() {
mpBlackTex->setAlpha(0);
}
/* 801F7FF8-801F8114 1F2938 011C+00 1/0 0/0 0/0 .text read_open_move__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::read_open_move() {
s16 openSkillDescFrame =
g_drawHIO.mSkillListScreen.mOpenFrame[dMeter_drawSkillHIO_c::SKILL_DESC];
@@ -336,15 +318,11 @@ void dMenu_Skill_c::read_open_move() {
}
}
/* 801F8114-801F8150 1F2A54 003C+00 1/0 0/0 0/0 .text read_move_init__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::read_move_init() {
setAButtonString(0);
setBButtonString(0x3f9);
}
/* 801F8150-801F8218 1F2A90 00C8+00 1/0 0/0 0/0 .text read_move_move__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::read_move_move() {
if (mDoCPd_c::getTrigA(PAD_1) != 0) {
Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -358,8 +336,6 @@ void dMenu_Skill_c::read_move_move() {
}
}
/* 801F8218-801F826C 1F2B58 0054+00 1/0 0/0 0/0 .text read_close_init__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::read_close_init() {
mProcFrame = g_drawHIO.mSkillListScreen.mCloseFrame[dMeter_drawSkillHIO_c::SKILL_DESC];
mStringID = 0;
@@ -367,8 +343,6 @@ void dMenu_Skill_c::read_close_init() {
setBButtonString(0);
}
/* 801F826C-801F8388 1F2BAC 011C+00 1/0 0/0 0/0 .text read_close_move__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::read_close_move() {
s16 closeSkillDescFrame =
g_drawHIO.mSkillListScreen.mCloseFrame[dMeter_drawSkillHIO_c::SKILL_DESC];
@@ -384,7 +358,6 @@ void dMenu_Skill_c::read_close_move() {
}
}
/* 801F8388-801F8A18 1F2CC8 0690+00 1/1 0/0 0/0 .text screenSetMenu__13dMenu_Skill_cFv */
void dMenu_Skill_c::screenSetMenu() {
static const u64 tag_sub0[7] = {
'menu_t0s', 'menu_t1s', 'menu_t2s', 'menu_t3s', 'menu_t4s', 'menu_t5s', 'menu_t51',
@@ -507,8 +480,6 @@ void dMenu_Skill_c::screenSetMenu() {
mpString->getString(0x6a4, textBox, NULL, NULL, NULL, 0);
}
/* 801F8A18-801F8D20 1F3358 0308+00 1/1 0/0 0/0 .text screenSetLetter__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::screenSetLetter() {
static const u64 name_tag[4] = {
'item_n04',
@@ -557,8 +528,6 @@ void dMenu_Skill_c::screenSetLetter() {
mpBlackTex->setAlpha(0);
}
/* 801F8D20-801F8E9C 1F3660 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__13dMenu_Skill_cFv
*/
void dMenu_Skill_c::screenSetDoIcon() {
static const u64 text_a_tag[5] = {
'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
@@ -583,13 +552,11 @@ void dMenu_Skill_c::screenSetDoIcon() {
}
}
/* 801F8E9C-801F8F28 1F37DC 008C+00 3/3 0/0 0/0 .text setCursorPos__13dMenu_Skill_cFv */
void dMenu_Skill_c::setCursorPos() {
Vec pos = mpLetterParent[mIndex]->getGlobalVtxCenter(mpLetterParent[mIndex]->mPane, false, 0);
mpDrawCursor->setPos(pos.x, pos.y, mpLetterParent[mIndex]->getPanePtr(), false);
}
/* 801F8F28-801F9144 1F3868 021C+00 2/2 0/0 0/0 .text changeActiveColor__13dMenu_Skill_cFv */
void dMenu_Skill_c::changeActiveColor() {
setCursorPos();
for (int i = 0; i < 7; i++) {
@@ -609,7 +576,6 @@ void dMenu_Skill_c::changeActiveColor() {
}
}
/* 801F9144-801F9260 1F3A84 011C+00 1/1 0/0 0/0 .text setPageText__13dMenu_Skill_cFv */
void dMenu_Skill_c::setPageText() {
static const u32 i_id0[7] = {
1701, 1702, 1703, 1704, 1705, 1706, 1707,
@@ -626,7 +592,6 @@ void dMenu_Skill_c::setPageText() {
}
}
/* 801F9260-801F9310 1F3BA0 00B0+00 4/4 0/0 0/0 .text setAButtonString__13dMenu_Skill_cFUs */
void dMenu_Skill_c::setAButtonString(u16 i_stringID) {
if (i_stringID == 0) {
for (int i = 0; i < 5; i++) {
@@ -639,7 +604,6 @@ void dMenu_Skill_c::setAButtonString(u16 i_stringID) {
}
}
/* 801F9310-801F93C0 1F3C50 00B0+00 4/4 0/0 0/0 .text setBButtonString__13dMenu_Skill_cFUs */
void dMenu_Skill_c::setBButtonString(u16 i_stringID) {
if (i_stringID == 0) {
for (int i = 0; i < 5; i++) {
@@ -652,8 +616,6 @@ void dMenu_Skill_c::setBButtonString(u16 i_stringID) {
}
}
/* 801F93C0-801F9470 1F3D00 00B0+00 1/1 0/0 0/0 .text setNameString__13dMenu_Skill_cFUs
*/
void dMenu_Skill_c::setNameString(u16 i_stringID) {
if (i_stringID == 0) {
for (int i = 0; i < 4; i++) {
@@ -666,7 +628,6 @@ void dMenu_Skill_c::setNameString(u16 i_stringID) {
}
}
/* 801F9470-801F9500 1F3DB0 0090+00 1/1 0/0 0/0 .text getSkillNum__13dMenu_Skill_cFv */
u8 dMenu_Skill_c::getSkillNum() {
static u32 evt_id[7] = {
339, /* dSv_event_flag_c::F_0339 - Secret techniques - Obtained 2 secret techinques */
@@ -687,7 +648,6 @@ u8 dMenu_Skill_c::getSkillNum() {
return skillNum;
}
/* 801F9500-801F9A08 1F3E40 0508+00 2/2 0/0 0/0 .text setHIO__13dMenu_Skill_cFb */
void dMenu_Skill_c::setHIO(bool i_useHIO) {
if (i_useHIO || g_drawHIO.mSkillListScreen.mDebug) {
mSelectBlack[0].set(g_drawHIO.mSkillListScreen.mSelectBarBlack);