From a6e76c0841cae03cae0c0e6ac75c32f979043093 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sun, 30 Nov 2025 14:23:42 -0800 Subject: 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 --- src/d/d_menu_option.cpp | 92 ------------------------------------------------- 1 file changed, 92 deletions(-) (limited to 'src/d/d_menu_option.cpp') diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index 3351be53e8..75f7b52fbe 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -76,8 +76,6 @@ enum SelectType { SelectType8, }; -/* 801E1F10-801E2014 1DC850 0104+00 0/0 2/2 0/0 .text - * __ct__14dMenu_Option_cFP10JKRArchiveP9STControl */ dMenu_Option_c::dMenu_Option_c(JKRArchive* i_archive, STControl* i_stick) { mUseFlag = 0; mBarScale[0] = g_drawHIO.mOptionScreen.mBarScale[0]; @@ -89,13 +87,10 @@ dMenu_Option_c::dMenu_Option_c(JKRArchive* i_archive, STControl* i_stick) { mpCalibration = NULL; } -/* 801E2014-801E205C 1DC954 0048+00 1/0 0/0 0/0 .text __dt__14dMenu_Option_cFv */ dMenu_Option_c::~dMenu_Option_c() {} -/* 80396EA8-80396EB8 023508 000C+04 4/4 0/0 0/0 .rodata dMo_soundMode */ static const u32 dMo_soundMode[3] = {0, 1, 2}; -/* 801E205C-801E2C1C 1DC99C 0BC0+00 1/1 0/0 0/0 .text _create__14dMenu_Option_cFv */ void dMenu_Option_c::_create() { static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'}; static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'}; @@ -251,7 +246,6 @@ void dMenu_Option_c::_create() { setHIO(true); } -/* 801E2C1C-801E3408 1DD55C 07EC+00 0/0 3/3 0/0 .text _delete__14dMenu_Option_cFv */ void dMenu_Option_c::_delete() { delete mpString; mpString = NULL; @@ -429,7 +423,6 @@ void dMenu_Option_c::_delete() { dComIfGp_setOptionResArchive(NULL); } -/* 801E3408-801E36CC 1DDD48 02C4+00 0/0 2/2 0/0 .text _move__14dMenu_Option_cFv */ void dMenu_Option_c::_move() { mpStick->checkTrigger(); if (field_0x3ea != 0 && !isRumbleSupported()) { @@ -492,7 +485,6 @@ skip: setHIO(false); } -/* 801E36CC-801E38CC 1DE00C 0200+00 1/1 1/1 0/0 .text _draw__14dMenu_Option_cFv */ void dMenu_Option_c::_draw() { if (mpArchive != NULL) { J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort(); @@ -520,7 +512,6 @@ void dMenu_Option_c::_draw() { } } -/* 801E38CC-801E3A7C 1DE20C 01B0+00 1/1 0/0 0/0 .text drawHaihai__14dMenu_Option_cFv */ void dMenu_Option_c::drawHaihai() { CPaneMgr pane; u8 selectType = getSelectType(); @@ -546,7 +537,6 @@ void dMenu_Option_c::drawHaihai() { } } -/* 801E3A7C-801E3AA4 1DE3BC 0028+00 0/0 1/1 0/0 .text isSync__14dMenu_Option_cFv */ bool dMenu_Option_c::isSync() { if (mpMount != NULL && mpMount->sync() == false) { return 0; @@ -554,17 +544,14 @@ bool dMenu_Option_c::isSync() { return 1; } -/* 801E3AA4-801E3AC8 1DE3E4 0024+00 4/4 0/0 0/0 .text checkLeftTrigger__14dMenu_Option_cFv */ bool dMenu_Option_c::checkLeftTrigger() { return mpStick->checkLeftTrigger(); } -/* 801E3AC8-801E3AEC 1DE408 0024+00 4/4 0/0 0/0 .text checkRightTrigger__14dMenu_Option_cFv */ bool dMenu_Option_c::checkRightTrigger() { return mpStick->checkRightTrigger(); } -/* 801E3AEC-801E3B98 1DE42C 00AC+00 4/4 0/0 0/0 .text setAnimation__14dMenu_Option_cFv */ void dMenu_Option_c::setAnimation() { s16 frameMax; @@ -583,7 +570,6 @@ void dMenu_Option_c::setAnimation() { field_0x30->setFrame(field_0x3c4); } -/* 801E3B98-801E3DE0 1DE4D8 0248+00 0/0 2/2 0/0 .text _open__14dMenu_Option_cFv */ bool dMenu_Option_c::_open() { if (!mpMount) { mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/optres.arc", 0, NULL); @@ -631,7 +617,6 @@ bool dMenu_Option_c::_open() { } } -/* 801E3DE0-801E3F6C 1DE720 018C+00 0/0 1/1 0/0 .text _close__14dMenu_Option_cFv */ bool dMenu_Option_c::_close() { s16 closeFrame = g_drawHIO.mOptionScreen.mCloseFrames; mFrame = 0; @@ -660,7 +645,6 @@ bool dMenu_Option_c::_close() { } } -/* 801E3F6C-801E3FC4 1DE8AC 0058+00 2/1 0/0 0/0 .text atten_init__14dMenu_Option_cFv */ void dMenu_Option_c::atten_init() { mpDrawCursor->setAlphaRate(1.0f); setCursorPos(0); @@ -668,7 +652,6 @@ void dMenu_Option_c::atten_init() { setBButtonString(0x3F9); } -/* 801E3FC4-801E41A0 1DE904 01DC+00 1/0 0/0 0/0 .text atten_move__14dMenu_Option_cFv */ void dMenu_Option_c::atten_move() { bool downTrigger = mpStick->checkDownTrigger(); bool leftTrigger = checkLeftTrigger(); @@ -757,7 +740,6 @@ void dMenu_Option_c::ruby_move() { } #endif -/* 801E41A0-801E41F8 1DEAE0 0058+00 1/0 0/0 0/0 .text vib_init__14dMenu_Option_cFv */ void dMenu_Option_c::vib_init() { mpDrawCursor->setAlphaRate(1.0f); setCursorPos(SelectType1); @@ -765,7 +747,6 @@ void dMenu_Option_c::vib_init() { setBButtonString(0x3F9); } -/* 801E41F8-801E4488 1DEB38 0290+00 1/0 0/0 0/0 .text vib_move__14dMenu_Option_cFv */ void dMenu_Option_c::vib_move() { bool upTrigger = mpStick->checkUpTrigger(); bool downTrigger = mpStick->checkDownTrigger(); @@ -815,7 +796,6 @@ void dMenu_Option_c::vib_move() { } } -/* 801E4488-801E44E0 1DEDC8 0058+00 1/0 0/0 0/0 .text sound_init__14dMenu_Option_cFv */ void dMenu_Option_c::sound_init() { mpDrawCursor->setAlphaRate(1.0f); setCursorPos(SelectType2); @@ -823,7 +803,6 @@ void dMenu_Option_c::sound_init() { setBButtonString(0x3F9); } -/* 801E44E0-801E48AC 1DEE20 03CC+00 1/0 0/0 0/0 .text sound_move__14dMenu_Option_cFv */ void dMenu_Option_c::sound_move() { bool upTrigger = mpStick->checkUpTrigger(); mpStick->checkDownTrigger(); @@ -892,13 +871,11 @@ void dMenu_Option_c::sound_move() { } } -/* 801E48AC-801E48E8 1DF1EC 003C+00 1/0 0/0 0/0 .text change_init__14dMenu_Option_cFv */ void dMenu_Option_c::change_init() { setAButtonString(0x40C); setBButtonString(0x3F9); } -/* 801E48E8-801E4B34 1DF228 024C+00 1/0 0/0 0/0 .text change_move__14dMenu_Option_cFv */ void dMenu_Option_c::change_move() { f32 x = 0.0f; @@ -972,7 +949,6 @@ void dMenu_Option_c::change_move() { } } -/* 801E4B34-801E4C10 1DF474 00DC+00 1/0 0/0 0/0 .text confirm_open_init__14dMenu_Option_cFv */ void dMenu_Option_c::confirm_open_init() { if (field_0x3f7 == 1) { mpWarning->setText(0x55F); @@ -989,7 +965,6 @@ void dMenu_Option_c::confirm_open_init() { Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } -/* 801E4C10-801E4CE4 1DF550 00D4+00 1/0 0/0 0/0 .text confirm_open_move__14dMenu_Option_cFv */ void dMenu_Option_c::confirm_open_move() { bool status = mpWarning->getStatus(); bool yesNoMenuMove = yesnoMenuMoveAnm(); @@ -1008,13 +983,11 @@ void dMenu_Option_c::confirm_open_move() { setAnimation(); } -/* 801E4CE4-801E4D20 1DF624 003C+00 1/0 0/0 0/0 .text confirm_move_init__14dMenu_Option_cFv */ void dMenu_Option_c::confirm_move_init() { setAButtonString(0x40C); setBButtonString(0x3F9); } -/* 801E4D20-801E4E98 1DF660 0178+00 1/0 0/0 0/0 .text confirm_move_move__14dMenu_Option_cFv */ void dMenu_Option_c::confirm_move_move() { bool leftTrigger = checkLeftTrigger(); bool rightTrigger = checkRightTrigger(); @@ -1051,11 +1024,9 @@ void dMenu_Option_c::confirm_move_move() { setAnimation(); } -/* 801E4E98-801E4E9C 1DF7D8 0004+00 1/0 0/0 0/0 .text confirm_select_init__14dMenu_Option_cFv */ void dMenu_Option_c::confirm_select_init() { } -/* 801E4E9C-801E4F18 1DF7DC 007C+00 1/0 0/0 0/0 .text confirm_select_move__14dMenu_Option_cFv */ void dMenu_Option_c::confirm_select_move() { u8 selectMoveAnm = yesnoSelectMoveAnm(); u8 wakuAlphaAnm = yesnoWakuAlpahAnm(field_0x3fa); @@ -1068,7 +1039,6 @@ void dMenu_Option_c::confirm_select_move() { setAnimation(); } -/* 801E4F18-801E4FB0 1DF858 0098+00 1/0 0/0 0/0 .text confirm_close_init__14dMenu_Option_cFv */ void dMenu_Option_c::confirm_close_init() { mpWarning->closeInit(); setSelectColor(field_0x403, false); @@ -1078,7 +1048,6 @@ void dMenu_Option_c::confirm_close_init() { Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } -/* 801E4FB0-801E51CC 1DF8F0 021C+00 1/0 0/0 0/0 .text confirm_close_move__14dMenu_Option_cFv */ void dMenu_Option_c::confirm_close_move() { bool status = mpWarning->getStatus(); yesnoMenuMoveAnm(); @@ -1128,8 +1097,6 @@ void dMenu_Option_c::confirm_close_move() { setAnimation(); } -/* 801E51CC-801E5244 1DFB0C 0078+00 1/0 0/0 0/0 .text tv_open1_move__14dMenu_Option_cFv - */ void dMenu_Option_c::tv_open1_move() { if (mDoGph_gInf_c::getFader()->getStatus() == 0) { dMw_c::dMw_fade_in(); @@ -1141,15 +1108,12 @@ void dMenu_Option_c::tv_open1_move() { } } -/* 801E5244-801E5260 1DFB84 001C+00 1/0 0/0 0/0 .text tv_open2_move__14dMenu_Option_cFv - */ void dMenu_Option_c::tv_open2_move() { if (mDoGph_gInf_c::getFader()->getStatus() == 1) { field_0x3f3 = 2; } } -/* 801E5260-801E5300 1DFBA0 00A0+00 1/0 0/0 0/0 .text tv_move_move__14dMenu_Option_cFv */ void dMenu_Option_c::tv_move_move() { if (mDoCPd_c::getTrigZ(PAD_1) != 0 || mDoCPd_c::getTrigA(PAD_1) != 0) { Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1161,8 +1125,6 @@ void dMenu_Option_c::tv_move_move() { } } -/* 801E5300-801E5364 1DFC40 0064+00 1/0 0/0 0/0 .text tv_close1_move__14dMenu_Option_cFv - */ void dMenu_Option_c::tv_close1_move() { if (mDoGph_gInf_c::getFader()->getStatus() == 0) { dMw_c::dMw_fade_in(); @@ -1172,16 +1134,12 @@ void dMenu_Option_c::tv_close1_move() { } } -/* 801E5364-801E5380 1DFCA4 001C+00 1/0 0/0 0/0 .text tv_close2_move__14dMenu_Option_cFv - */ void dMenu_Option_c::tv_close2_move() { if (mDoGph_gInf_c::getFader()->getStatus() == 1) { field_0x3f3 = 5; } } -/* 801E5380-801E53C4 1DFCC0 0044+00 1/0 0/0 0/0 .text calibration_open1_move__14dMenu_Option_cFv - */ void dMenu_Option_c::calibration_open1_move() { if (mDoGph_gInf_c::getFader()->getStatus() == 0) { dMw_c::dMw_fade_in(); @@ -1189,15 +1147,12 @@ void dMenu_Option_c::calibration_open1_move() { } } -/* 801E53C4-801E53E0 1DFD04 001C+00 1/0 0/0 0/0 .text calibration_open2_move__14dMenu_Option_cFv - */ void dMenu_Option_c::calibration_open2_move() { if (mDoGph_gInf_c::getFader()->getStatus() == 1) { field_0x3f4 = 2; } } -/* 801E53E0-801E5434 1DFD20 0054+00 1/0 0/0 0/0 .text calibration_move_move__14dMenu_Option_cFv */ void dMenu_Option_c::calibration_move_move() { if (mpCalibration->mStatus == 0) { dMw_c::dMw_fade_out(); @@ -1207,8 +1162,6 @@ void dMenu_Option_c::calibration_move_move() { } } -/* 801E5434-801E5478 1DFD74 0044+00 1/0 0/0 0/0 .text calibration_close1_move__14dMenu_Option_cFv - */ void dMenu_Option_c::calibration_close1_move() { if (mDoGph_gInf_c::getFader()->getStatus() == 0) { dMw_c::dMw_fade_in(); @@ -1216,15 +1169,12 @@ void dMenu_Option_c::calibration_close1_move() { } } -/* 801E5478-801E5494 1DFDB8 001C+00 1/0 0/0 0/0 .text calibration_close2_move__14dMenu_Option_cFv - */ void dMenu_Option_c::calibration_close2_move() { if (mDoGph_gInf_c::getFader()->getStatus() == 1) { field_0x3f4 = 5; } } -/* 801E5494-801E54F8 1DFDD4 0064+00 1/1 0/0 0/0 .text menuVisible__14dMenu_Option_cFv */ void dMenu_Option_c::menuVisible() { for (int i = 0; i < 6; i++) { if (i < SelectType3) { @@ -1235,7 +1185,6 @@ void dMenu_Option_c::menuVisible() { } } -/* 801E54F8-801E55B8 1DFE38 00C0+00 1/1 0/0 0/0 .text menuShow__14dMenu_Option_cFi */ void dMenu_Option_c::menuShow(int index) { mpMenuNull[index]->show(); mpMenuPane[index]->show(); @@ -1255,7 +1204,6 @@ void dMenu_Option_c::menuShow(int index) { } } -/* 801E55B8-801E5678 1DFEF8 00C0+00 1/1 0/0 0/0 .text menuHide__14dMenu_Option_cFi */ void dMenu_Option_c::menuHide(int index) { mpMenuNull[index]->hide(); mpMenuPane[index]->hide(); @@ -1275,7 +1223,6 @@ void dMenu_Option_c::menuHide(int index) { } } -/* 801E5678-801E6FBC 1DFFB8 1944+00 1/1 0/0 0/0 .text screenSet__14dMenu_Option_cFv */ void dMenu_Option_c::screenSet() { static const u64 tag_frame[6] = { 'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05', @@ -1744,8 +1691,6 @@ void dMenu_Option_c::screenSet() { } } -/* 801E6FBC-801E7004 1E18FC 0048+00 2/2 0/0 0/0 .text setSoundMode__14dMenu_Option_cFUl - */ void dMenu_Option_c::setSoundMode(u32 param_0) { switch (param_0) { case 0: @@ -1758,8 +1703,6 @@ void dMenu_Option_c::setSoundMode(u32 param_0) { } } -/* 801E7004-801E70E8 1E1944 00E4+00 2/2 0/0 0/0 .text setAttenString__14dMenu_Option_cFv - */ void dMenu_Option_c::setAttenString() { u16 stringId1; u16 stringId2; @@ -1806,7 +1749,6 @@ void dMenu_Option_c::setRubyString() { } #endif -/* 801E70E8-801E71CC 1E1A28 00E4+00 2/2 0/0 0/0 .text setVibString__14dMenu_Option_cFv */ void dMenu_Option_c::setVibString() { u16 stringId1; u16 stringId2; @@ -1834,8 +1776,6 @@ void dMenu_Option_c::setVibString() { } } -/* 801E71CC-801E7314 1E1B0C 0148+00 2/2 0/0 0/0 .text setSoundString__14dMenu_Option_cFv - */ void dMenu_Option_c::setSoundString() { u16 stringId1; u16 stringId2; @@ -1873,8 +1813,6 @@ void dMenu_Option_c::setSoundString() { } } -/* 801E7314-801E73D8 1E1C54 00C4+00 8/8 0/0 0/0 .text setCursorPos__14dMenu_Option_cFUc - */ void dMenu_Option_c::setCursorPos(u8 i_index) { #if VERSION != VERSION_GCN_JPN if (i_index == 4) { @@ -1889,7 +1827,6 @@ void dMenu_Option_c::setCursorPos(u8 i_index) { changeBarColor(false); } -/* 801E73D8-801E76EC 1E1D18 0314+00 4/4 0/0 0/0 .text setSelectColor__14dMenu_Option_cFUcb */ void dMenu_Option_c::setSelectColor(u8 param_0, bool param_1) { for (int i = 0; i < 6; i++) { if (i == param_0 || param_1) { @@ -1930,8 +1867,6 @@ void dMenu_Option_c::setSelectColor(u8 param_0, bool param_1) { } } -/* 801E76EC-801E7718 1E202C 002C+00 8/8 0/0 0/0 .text getSelectType__14dMenu_Option_cFv - */ u8 dMenu_Option_c::getSelectType() { if (field_0x3ef < SelectType3) { return field_0x3ef; @@ -1942,8 +1877,6 @@ u8 dMenu_Option_c::getSelectType() { return 0; } -/* 801E7718-801E78B8 1E2058 01A0+00 3/3 0/0 0/0 .text changeBarColor__14dMenu_Option_cFb - */ void dMenu_Option_c::changeBarColor(bool i_changeColor) { u8 selectType = getSelectType(); @@ -1964,7 +1897,6 @@ void dMenu_Option_c::changeBarColor(bool i_changeColor) { } } -/* 801E78B8-801E7D18 1E21F8 0460+00 4/4 0/0 0/0 .text setHIO__14dMenu_Option_cFb */ void dMenu_Option_c::setHIO(bool i_useHIO) { if (field_0x378 != g_drawHIO.mOptionScreen.mWindowPosX || field_0x37c != g_drawHIO.mOptionScreen.mWindowPosY) @@ -2043,13 +1975,11 @@ void dMenu_Option_c::setHIO(bool i_useHIO) { } } -/* 801E7D18-801E7D60 1E2658 0048+00 2/2 0/0 0/0 .text cursorAnime__14dMenu_Option_cFf */ void dMenu_Option_c::cursorAnime(f32 i_cursorValue) { mpDrawCursor->setAlphaRate(i_cursorValue); mpDrawCursor->setScale(i_cursorValue); } -/* 801E7D60-801E7DF4 1E26A0 0094+00 3/3 0/0 0/0 .text setZButtonString__14dMenu_Option_cFUs */ void dMenu_Option_c::setZButtonString(u16 i_stringID) { if (i_stringID == 0) { for (int i = 0; i < 3; i++) { @@ -2066,8 +1996,6 @@ void dMenu_Option_c::setZButtonString(u16 i_stringID) { } } -/* 801E7DF4-801E7E98 1E2734 00A4+00 3/3 0/0 0/0 .text changeTVCheck__14dMenu_Option_cFv - */ void dMenu_Option_c::changeTVCheck() { if (mDoCPd_c::getTrigZ(PAD_1) != 0) { Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CHANGE_WINDOW, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, @@ -2089,7 +2017,6 @@ static void dummy() { #endif } -/* 801E7E98-801E7F9C 1E27D8 0104+00 11/11 0/0 0/0 .text setAButtonString__14dMenu_Option_cFUs */ void dMenu_Option_c::setAButtonString(u16 i_stringID) { static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'}; u32 stringId = i_stringID; @@ -2109,7 +2036,6 @@ void dMenu_Option_c::setAButtonString(u16 i_stringID) { } } -/* 801E7F9C-801E80A0 1E28DC 0104+00 11/11 0/0 0/0 .text setBButtonString__14dMenu_Option_cFUs */ void dMenu_Option_c::setBButtonString(u16 i_stringID) { static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'}; u32 stringId = i_stringID; @@ -2130,17 +2056,14 @@ void dMenu_Option_c::setBButtonString(u16 i_stringID) { } } -/* 801E80A0-801E80AC 1E29E0 000C+00 4/4 0/0 0/0 .text isRumbleSupported__14dMenu_Option_cFv */ bool dMenu_Option_c::isRumbleSupported() { return JUTGamePad::sRumbleSupported >> 0x1f; } -/* 801E80AC-801E80B4 1E29EC 0008+00 1/1 0/0 0/0 .text dpdMenuMove__14dMenu_Option_cFv */ bool dMenu_Option_c::dpdMenuMove() { return false; } -/* 801E80B4-801E8210 1E29F4 015C+00 1/1 0/0 0/0 .text paneResize__14dMenu_Option_cFUx */ void dMenu_Option_c::paneResize(u64 i_tag) { f32 boundsY = mpClipScreen->search(i_tag)->getBounds().i.y; f32 boundsX = mpClipScreen->search(i_tag)->getBounds().i.x - 5.0f; @@ -2154,7 +2077,6 @@ void dMenu_Option_c::paneResize(u64 i_tag) { mpClipScreen->search(i_tag)->resize(boundsX + 10.0f, boundsY); } -/* 801E8210-801E82C4 1E2B50 00B4+00 1/1 1/1 0/0 .text initialize__14dMenu_Option_cFv */ void dMenu_Option_c::initialize() { field_0x3e4 = dComIfGs_getOptAttentionType(); #if VERSION == VERSION_GCN_JPN @@ -2185,8 +2107,6 @@ void dMenu_Option_c::initialize() { field_0x3da = 0; } -/* 801E82C4-801E8438 1E2C04 0174+00 3/3 0/0 0/0 .text yesnoMenuMoveAnmInitSet__14dMenu_Option_cFii - */ void dMenu_Option_c::yesnoMenuMoveAnmInitSet(int param_0, int param_1) { if (field_0x3f8 == 0) { field_0x3f9 = 0; @@ -2208,7 +2128,6 @@ void dMenu_Option_c::yesnoMenuMoveAnmInitSet(int param_0, int param_1) { mpYesNoSelBase_c[1]->getPanePtr()->animationTransform(); } -/* 801E8438-801E85D4 1E2D78 019C+00 2/2 0/0 0/0 .text yesnoMenuMoveAnm__14dMenu_Option_cFv */ bool dMenu_Option_c::yesnoMenuMoveAnm() { bool ret; if (field_0x3c8[2] != field_0x3c8[3]) { @@ -2246,13 +2165,10 @@ bool dMenu_Option_c::yesnoMenuMoveAnm() { return ret; } -/* 80450730-80450738 0001B0 0008+00 2/2 0/0 0/0 .sdata OptYnSelStartFrameTbl */ static s32 OptYnSelStartFrameTbl[2] = {1251, 1236}; -/* 80450738-80450740 0001B8 0008+00 2/2 0/0 0/0 .sdata OptYnSelEndFrameTbl */ static s32 OptYnSelEndFrameTbl[2] = {1236, 1251}; -/* 801E85D4-801E8888 1E2F14 02B4+00 1/1 0/0 0/0 .text yesnoSelectMoveAnm__14dMenu_Option_cFv */ u8 dMenu_Option_c::yesnoSelectMoveAnm() { u8 ret = 0; bool bVar1; @@ -2318,8 +2234,6 @@ u8 dMenu_Option_c::yesnoSelectMoveAnm() { return ret; } -/* 801E8888-801E89F8 1E31C8 0170+00 2/2 0/0 0/0 .text yesnoCursorShow__14dMenu_Option_cFv - */ void dMenu_Option_c::yesnoCursorShow() { if (field_0x3f9 != 0xff) { ((J2DTextBox*)mpYesNoTxt_c[field_0x3f9]->getPanePtr()) @@ -2335,7 +2249,6 @@ void dMenu_Option_c::yesnoCursorShow() { } } -/* 801E89F8-801E8AC8 1E3338 00D0+00 1/1 0/0 0/0 .text yesNoSelectStart__14dMenu_Option_cFv */ void dMenu_Option_c::yesNoSelectStart() { if (field_0x3f9 != 0) { if (field_0x3f7 == 1) { @@ -2350,7 +2263,6 @@ void dMenu_Option_c::yesNoSelectStart() { } } -/* 801E8AC8-801E8C38 1E3408 0170+00 1/1 0/0 0/0 .text yesnoSelectAnmSet__14dMenu_Option_cFv */ void dMenu_Option_c::yesnoSelectAnmSet() { if (field_0x3fa != 0xff) { yesnoWakuAlpahAnmInit(field_0x3fa, 0xff, 0, 5); @@ -2368,15 +2280,12 @@ void dMenu_Option_c::yesnoSelectAnmSet() { } } -/* 801E8C38-801E8CB0 1E3578 0078+00 2/2 0/0 0/0 .text yesnoCancelAnmSet__14dMenu_Option_cFv */ void dMenu_Option_c::yesnoCancelAnmSet() { Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); mpDrawCursor->setAlphaRate(0.0f); yesnoMenuMoveAnmInitSet(0x47D, 0x473); } -/* 801E8CB0-801E8CFC 1E35F0 004C+00 1/1 0/0 0/0 .text - * yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc */ void dMenu_Option_c::yesnoWakuAlpahAnmInit(u8 i_idx, u8 param_1, u8 param_2, u8 param_3) { if (i_idx != 0xff) { mpYesNoCurWaku_c[i_idx]->alphaAnimeStart(0); @@ -2389,7 +2298,6 @@ void dMenu_Option_c::yesnoWakuAlpahAnmInit(u8 i_idx, u8 param_1, u8 param_2, u8 } } -/* 801E8CFC-801E8E6C 1E363C 0170+00 1/1 0/0 0/0 .text yesnoWakuAlpahAnm__14dMenu_Option_cFUc */ u8 dMenu_Option_c::yesnoWakuAlpahAnm(u8 i_idx) { u8 ret = 0; bool wakuAnime; -- cgit v1.2.3