mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 15:23:01 -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_dmap.cpp
-101
View File
@@ -78,8 +78,6 @@ static ProcFunc map_move_process[3] = {
&dMenu_Dmap_c::zoomOut_proc,
};
/* 801B7F20-801B8110 1B2860 01F0+00 1/1 0/0 0/0 .text
* __ct__14dMenu_DmapBg_cFP10JKRExpHeapP9STControl */
dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* i_heap, STControl* i_stick) {
mpHeap = i_heap;
mpStick = i_stick;
@@ -136,8 +134,6 @@ dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* i_heap, STControl* i_stick) {
field_0xdd0 = 0;
}
/* 801B8110-801B884C 1B2A50 073C+00 1/1 0/0 0/0 .text mapScreenInit__14dMenu_DmapBg_cFv
*/
void dMenu_DmapBg_c::mapScreenInit() {
for (int i = 0; i < 2; i++) {
mMapScreen[i] = new J2DScreen();
@@ -222,8 +218,6 @@ void dMenu_DmapBg_c::mapScreenInit() {
}
}
/* 801B884C-801B88F4 1B318C 00A8+00 1/1 0/0 0/0 .text mapScreenAnime__14dMenu_DmapBg_cFv
*/
void dMenu_DmapBg_c::mapScreenAnime() {
if (0.0f == field_0xd94 && 0.0f == field_0xd98) {
for (int i = 0; i < 1; i++) {
@@ -237,7 +231,6 @@ void dMenu_DmapBg_c::mapScreenAnime() {
}
}
/* 801B88F4-801B893C 1B3234 0048+00 1/1 0/0 0/0 .text mapIconScaleSet__14dMenu_DmapBg_cFUc */
void dMenu_DmapBg_c::mapIconScaleSet(u8 param_1) {
f32 fVar1;
f32 fVar2;
@@ -252,7 +245,6 @@ void dMenu_DmapBg_c::mapIconScaleSet(u8 param_1) {
iconScale(1, fVar1, fVar1, fVar2);
}
/* 801B893C-801B8954 1B327C 0018+00 2/2 0/0 0/0 .text iconScaleAnmInit__14dMenu_DmapBg_cFffUc */
void dMenu_DmapBg_c::iconScaleAnmInit(f32 param_0, f32 param_1, u8 param_2) {
field_0xdac = param_0;
field_0xdb0 = param_1;
@@ -260,7 +252,6 @@ void dMenu_DmapBg_c::iconScaleAnmInit(f32 param_0, f32 param_1, u8 param_2) {
field_0xdd2 = 0;
}
/* 801B8954-801B8A0C 1B3294 00B8+00 2/2 0/0 0/0 .text iconScaleAnm__14dMenu_DmapBg_cFv */
bool dMenu_DmapBg_c::iconScaleAnm() {
bool rv = false;
if (field_0xdd2 > field_0xdd1) {
@@ -289,7 +280,6 @@ bool dMenu_DmapBg_c::iconScaleAnm() {
return rv;
}
/* 801B8A0C-801B8DE4 1B334C 03D8+00 1/1 0/0 0/0 .text buttonIconScreenInit__14dMenu_DmapBg_cFv */
void dMenu_DmapBg_c::buttonIconScreenInit() {
static u64 const cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'};
static u64 const cont_bt[5] = {'cont_bt', 'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4'};
@@ -379,7 +369,6 @@ void dMenu_DmapBg_c::buttonIconScreenInit() {
field_0xcf4->paneTrans(321.0f, 0.0f);
}
/* 801B8DE4-801B8EBC 1B3724 00D8+00 7/7 0/0 0/0 .text setAButtonString__14dMenu_DmapBg_cFUl */
void dMenu_DmapBg_c::setAButtonString(u32 i_msgNo) {
static u64 const cont_at[5] = {
#if VERSION == VERSION_GCN_JPN
@@ -397,7 +386,6 @@ void dMenu_DmapBg_c::setAButtonString(u32 i_msgNo) {
}
}
/* 801B8EBC-801B8F94 1B37FC 00D8+00 8/8 0/0 0/0 .text setBButtonString__14dMenu_DmapBg_cFUl */
void dMenu_DmapBg_c::setBButtonString(u32 i_msgNo) {
static u64 const cont_bt[5] = {
#if VERSION == VERSION_GCN_JPN
@@ -415,16 +403,12 @@ void dMenu_DmapBg_c::setBButtonString(u32 i_msgNo) {
}
}
/* 80451078-8045107C 000578 0004+00 1/1 0/0 0/0 .sbss player_px */
static f32 player_px;
/* 8045107C-80451080 00057C 0004+00 1/1 0/0 0/0 .sbss player_py */
static f32 player_py;
/* 80451080-80451088 000580 0004+04 6/6 0/0 0/0 .sbss myclass__12dMenu_Dmap_c */
dMenu_Dmap_c* dMenu_Dmap_c::myclass;
/* 801B8F94-801B90BC 1B38D4 0128+00 1/1 0/0 0/0 .text setCButtonString__14dMenu_DmapBg_cFUl */
void dMenu_DmapBg_c::setCButtonString(u32 i_msgNo) {
static u64 const c_tag[2] = {
#if VERSION == VERSION_GCN_JPN
@@ -455,13 +439,10 @@ void dMenu_DmapBg_c::setCButtonString(u32 i_msgNo) {
}
}
/* 801B90BC-801B90E0 1B39FC 0024+00 1/1 0/0 0/0 .text setJButtonString__14dMenu_DmapBg_cFUl */
void dMenu_DmapBg_c::setJButtonString(u32 i_msgNo) {
dMenu_Dmap_c::myclass->isMapMoveState();
}
/* 801B90E0-801B9164 1B3A20 0084+00 1/1 0/0 0/0 .text createExplain__14dMenu_DmapBg_cFv
*/
void dMenu_DmapBg_c::createExplain() {
if (mpItemExplain == NULL) {
JKRHeap* prevHeap = mDoExt_setCurrentHeap(mpTalkHeap);
@@ -472,8 +453,6 @@ void dMenu_DmapBg_c::createExplain() {
}
}
/* 801B9164-801B91DC 1B3AA4 0078+00 2/2 0/0 0/0 .text deleteExplain__14dMenu_DmapBg_cFv
*/
void dMenu_DmapBg_c::deleteExplain() {
if (mpItemExplain != NULL) {
JKRHeap* prevHeap = mDoExt_setCurrentHeap(mpTalkHeap);
@@ -483,8 +462,6 @@ void dMenu_DmapBg_c::deleteExplain() {
}
}
/* 801B91DC-801B944C 1B3B1C 0270+00 1/1 0/0 0/0 .text baseScreenInit__14dMenu_DmapBg_cFv
*/
void dMenu_DmapBg_c::baseScreenInit() {
mBaseScreen = new J2DScreen();
JUT_ASSERT(1336, mBaseScreen != NULL);
@@ -533,8 +510,6 @@ void dMenu_DmapBg_c::baseScreenInit() {
}
}
/* 801B944C-801BA0B4 1B3D8C 0C68+00 1/1 0/0 0/0 .text setFloorMessage__14dMenu_DmapBg_cFv
*/
void dMenu_DmapBg_c::setFloorMessage() {
int var_r26 = -5;
@@ -659,13 +634,11 @@ void dMenu_DmapBg_c::setFloorMessage() {
}
}
/* 801BA0B4-801BA0BC 1B49F4 0008+00 1/1 0/0 0/0 .text dpdMove__14dMenu_DmapBg_cFScScScPUcUc */
bool dMenu_DmapBg_c::dpdMove(s8 param_0, s8 param_1, s8 param_2, u8* param_3, u8 param_4) {
bool var_r31 = false;
return var_r31;
}
/* 801BA0BC-801BA60C 1B49FC 0550+00 2/1 0/0 0/0 .text __dt__14dMenu_DmapBg_cFv */
dMenu_DmapBg_c::~dMenu_DmapBg_c() {
dComIfGp_getDmapResArchive()->removeResourceAll();
delete mString;
@@ -788,7 +761,6 @@ dMenu_DmapBg_c::~dMenu_DmapBg_c() {
}
}
/* 801BA60C-801BA700 1B4F4C 00F4+00 2/2 0/0 0/0 .text setAllAlphaRate__14dMenu_DmapBg_cFfb */
void dMenu_DmapBg_c::setAllAlphaRate(f32 i_rate, bool param_2) {
field_0xd9c = i_rate;
@@ -821,7 +793,6 @@ void dMenu_DmapBg_c::setAllAlphaRate(f32 i_rate, bool param_2) {
}
}
/* 801BA700-801BA7F0 1B5040 00F0+00 3/3 0/0 0/0 .text setGoldAnimation__14dMenu_DmapBg_cFb */
void dMenu_DmapBg_c::setGoldAnimation(bool param_1) {
J2DPane* gold0 = mMapScreen[0]->search('gold00_0');
J2DPane* gold1 = mMapScreen[0]->search('gold00_1');
@@ -835,7 +806,6 @@ void dMenu_DmapBg_c::setGoldAnimation(bool param_1) {
}
}
/* 801BA7F0-801BA974 1B5130 0184+00 3/3 0/0 0/0 .text setGoldFrameAlphaRate__14dMenu_DmapBg_cFf */
void dMenu_DmapBg_c::setGoldFrameAlphaRate(f32 i_rate) {
if (0.0f == i_rate) {
mMapScreen[0]->search('gold00_0')->hide();
@@ -848,7 +818,6 @@ void dMenu_DmapBg_c::setGoldFrameAlphaRate(f32 i_rate) {
}
}
/* 801BA974-801BAA4C 1B52B4 00D8+00 1/1 0/0 0/0 .text addGoldFrameAlphaRate__14dMenu_DmapBg_cFv */
void dMenu_DmapBg_c::addGoldFrameAlphaRate() {
f32 rate;
if (field_0xdd7 >= g_fmapHIO.mDisplayFrameNum) {
@@ -865,7 +834,6 @@ void dMenu_DmapBg_c::addGoldFrameAlphaRate() {
setGoldFrameAlphaRate(rate);
}
/* 801BAA4C-801BAB10 1B538C 00C4+00 1/1 0/0 0/0 .text decGoldFrameAlphaRate__14dMenu_DmapBg_cFv */
void dMenu_DmapBg_c::decGoldFrameAlphaRate() {
f32 rate;
setGoldAnimation(false);
@@ -885,7 +853,6 @@ void dMenu_DmapBg_c::decGoldFrameAlphaRate() {
setGoldFrameAlphaRate(rate);
}
/* 801BAB10-801BB334 1B5450 0824+00 1/0 0/0 0/0 .text draw__14dMenu_DmapBg_cFv */
void dMenu_DmapBg_c::draw() {
u32 scissor_left;
u32 scissor_top;
@@ -987,7 +954,6 @@ void dMenu_DmapBg_c::draw() {
grafContext->setup2D();
}
/* 801BB334-801BB464 1B5C74 0130+00 1/1 0/0 0/0 .text update__14dMenu_DmapBg_cFv */
void dMenu_DmapBg_c::update() {
if (mpArchiveMount != NULL) {
if (mpArchiveMount->sync() && mpArchive == NULL) {
@@ -1014,16 +980,12 @@ void dMenu_DmapBg_c::update() {
}
}
/* 801BB464-801BB468 1B5DA4 0004+00 1/1 0/0 0/0 .text calcCursor__14dMenu_DmapBg_cFv */
void dMenu_DmapBg_c::calcCursor() {}
/* 801BB468-801BB498 1B5DA8 0030+00 1/1 0/0 0/0 .text drawCursor__14dMenu_DmapBg_cFv */
void dMenu_DmapBg_c::drawCursor() {
mpDrawCursor->draw();
}
/* 801BB498-801BB634 1B5DD8 019C+00 0/0 1/1 0/0 .text
* __ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc */
dMenu_Dmap_c::dMenu_Dmap_c(JKRExpHeap* param_1, STControl* param_2, CSTControl* param_3,
u8 param_4, u8 param_5) {
dMeter2Info_setMapDrugFlag(0);
@@ -1097,7 +1059,6 @@ dMenu_Dmap_c::dMenu_Dmap_c(JKRExpHeap* param_1, STControl* param_2, CSTControl*
mpDresArchive = 0;
}
/* 801BB634-801BC788 1B5F74 1154+00 1/1 0/0 0/0 .text screenInit__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::screenInit() {
static u64 const floor_tag[8] = {'floor7_n', 'floor0_n', 'floor1_n', 'floor2_n',
'floor3_n', 'floor4_n', 'floor5_n', 'floor6_n'};
@@ -1312,7 +1273,6 @@ void dMenu_Dmap_c::screenInit() {
field_0x98->hide();
}
/* 801BC788-801BC848 1B70C8 00C0+00 1/1 0/0 0/0 .text getPlayerIconPos__12dMenu_Dmap_cFScf */
void dMenu_Dmap_c::getPlayerIconPos(s8 i_floorNo, f32 param_2) {
if (i_floorNo == field_0x172) {
f32 pos_x;
@@ -1325,7 +1285,6 @@ void dMenu_Dmap_c::getPlayerIconPos(s8 i_floorNo, f32 param_2) {
}
}
/* 801BC848-801BCDF4 1B7188 05AC+00 2/2 0/0 0/0 .text getIconPos__12dMenu_Dmap_cFScf */
void dMenu_Dmap_c::getIconPos(s8 i_floorNo, f32 param_2) {
f32 pos_x;
f32 pos_y;
@@ -1443,7 +1402,6 @@ void dMenu_Dmap_c::getIconPos(s8 i_floorNo, f32 param_2) {
getPlayerIconPos(i_floorNo, param_2);
}
/* 801BCDF4-801BD144 1B7734 0350+00 1/0 0/0 0/0 .text __dt__12dMenu_Dmap_cFv */
dMenu_Dmap_c::~dMenu_Dmap_c() {
s32 iVar2 = field_0xe8->getTotalFreeSize();
s32 iVar4 = field_0xe8->getTotalFreeSize();
@@ -1538,20 +1496,16 @@ dMenu_Dmap_c::~dMenu_Dmap_c() {
dMenu_Dmap_c::myclass = NULL;
}
/* 801BD1D4-801BD1E8 1B7B14 0014+00 10/10 0/0 0/0 .text getCurFloorPos__12dMenu_Dmap_cFv
*/
s8 dMenu_Dmap_c::getCurFloorPos() {
s8 i_floor = field_0x16c - mBottomFloor;
JUT_ASSERT(3393, i_floor >= 0 && i_floor < (8));
return i_floor;
}
/* 801BD1E8-801BD208 1B7B28 0020+00 4/4 0/0 0/0 .text getDefaultCurFloorPos__12dMenu_Dmap_cFv */
s8 dMenu_Dmap_c::getDefaultCurFloorPos() {
return getCurFloorPos();
}
/* 801BD208-801BD3B8 1B7B48 01B0+00 4/4 0/0 0/0 .text iconMoveCalc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::iconMoveCalc() {
s32 iVar7 = ((s16)field_0x172 - (s16)mBottomFloor);
mStayIcon[0]->show();
@@ -1576,8 +1530,6 @@ void dMenu_Dmap_c::iconMoveCalc() {
}
}
/* 801BD3B8-801BD524 1B7CF8 016C+00 1/1 0/0 0/0 .text
* drawFloorScreenBack__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph */
void dMenu_Dmap_c::drawFloorScreenBack(J2DScreen* i_screen, f32 i_transX, f32 i_transY,
J2DOrthoGraph* i_ortho) {
for (int i = 0; i < getFloorAll(); i++) {
@@ -1605,8 +1557,6 @@ void dMenu_Dmap_c::drawFloorScreenBack(J2DScreen* i_screen, f32 i_transX, f32 i_
i_screen->draw(i_transX, i_transY, i_ortho);
}
/* 801BD524-801BD690 1B7E64 016C+00 1/1 0/0 0/0 .text
* drawFloorScreenTop__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph */
void dMenu_Dmap_c::drawFloorScreenTop(J2DScreen* i_screen, f32 i_transX, f32 i_transY,
J2DOrthoGraph* i_ortho) {
for (int i = 0; i < getFloorAll(); i++) {
@@ -1634,7 +1584,6 @@ void dMenu_Dmap_c::drawFloorScreenTop(J2DScreen* i_screen, f32 i_transX, f32 i_t
i_screen->draw(i_transX, i_transY, i_ortho);
}
/* 801BD690-801BD6C4 1B7FD0 0034+00 3/3 0/0 0/0 .text isMapMoveState__12dMenu_Dmap_cFv */
bool dMenu_Dmap_c::isMapMoveState() {
field_0x184 = true;
if (mMapCtrl->getDisableZoomMoveFlgX() == true && mMapCtrl->getDisableZoomMoveFlgZ() == true) {
@@ -1644,8 +1593,6 @@ bool dMenu_Dmap_c::isMapMoveState() {
return field_0x184;
}
/* 801BD6C4-801BD7C0 1B8004 00FC+00 1/1 0/0 0/0 .text floorChangeMode__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::floorChangeMode() {
if (field_0x16d > field_0x16c) {
field_0x16e = field_0x16c;
@@ -1674,7 +1621,6 @@ void dMenu_Dmap_c::floorChangeMode() {
}
}
/* 801BD7C0-801BDD40 1B8100 0580+00 1/1 0/0 0/0 .text _create__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::_create() {
u32 sp30 = field_0xe8->getTotalFreeSize();
OS_REPORT("MenuDmap create前 最大===========> %d bytes max\n", field_0xe8->getFreeSize());
@@ -1798,7 +1744,6 @@ void dMenu_Dmap_c::_create() {
(this->*map_init_process[field_0x17e])();
}
/* 801BDDA4-801BDEF8 1B86E4 0154+00 0/0 1/1 0/0 .text _move__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::_move() {
u8 prev_process = m_process;
JKRHeap* prev_heap = mDoExt_setCurrentHeap(mDmapHeap);
@@ -1839,18 +1784,15 @@ void dMenu_Dmap_c::_move() {
mDoExt_setCurrentHeap(prev_heap);
}
/* 801BDEF8-801BDF48 1B8838 0050+00 1/1 0/0 0/0 .text setMapTexture__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::setMapTexture() {
f32 mapBlendPer = mMapCtrl->getMapBlendPer();
mpDrawBg->getMapPane()->setBlendRatio(mapBlendPer, 1.0f - mapBlendPer);
}
/* 801BDF48-801BDF6C 1B8888 0024+00 1/1 0/0 0/0 .text mapBgAnime__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::mapBgAnime() {
mpDrawBg->mapScreenAnime();
}
/* 801BDF6C-801BE328 1B88AC 03BC+00 1/1 0/0 0/0 .text mapControl__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::mapControl() {
u8 temp_r27 = field_0x17e;
if (m_process == 0 || field_0x183 == 0) {
@@ -1931,7 +1873,6 @@ void dMenu_Dmap_c::mapControl() {
}
}
/* 801BE328-801BE670 1B8C68 0348+00 0/0 1/1 0/0 .text isOpen__12dMenu_Dmap_cFv */
bool dMenu_Dmap_c::isOpen() {
bool var_r28 = false;
bool var_r27 = false;
@@ -2003,7 +1944,6 @@ bool dMenu_Dmap_c::isOpen() {
return var_r28;
}
/* 801BE670-801BE7E0 1B8FB0 0170+00 0/0 1/1 0/0 .text isClose__12dMenu_Dmap_cFv */
bool dMenu_Dmap_c::isClose() {
bool var_r30 = true;
bool var_r29 = false;
@@ -2043,7 +1983,6 @@ bool dMenu_Dmap_c::isClose() {
return var_r30;
}
/* 801BE7E0-801BEAFC 1B9120 031C+00 0/0 1/1 0/0 .text _draw__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::_draw() {
if (mMapCtrl != NULL) {
mMapCtrl->draw();
@@ -2104,18 +2043,15 @@ void dMenu_Dmap_c::_draw() {
}
}
/* 801BEAFC-801BEB0C 1B943C 0010+00 1/0 0/0 0/0 .text itemInfo_init_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::itemInfo_init_proc() {
m_itemSubProcess = 0;
field_0x185 = 0;
}
/* 801BEB0C-801BEB44 1B944C 0038+00 1/0 0/0 0/0 .text itemInfo_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::itemInfo_proc() {
(this->*itemInfo_subProcess[m_itemSubProcess])();
}
/* 801BEB44-801BEF28 1B9484 03E4+00 1/0 0/0 0/0 .text itemSelect__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::itemSelect() {
if (mpDrawBg->field_0xdd4 == -99 && mpDrawBg->field_0xdd5 == 0xFF) {
mSelStick->checkTrigger();
@@ -2207,7 +2143,6 @@ void dMenu_Dmap_c::itemSelect() {
}
}
/* 801BEF28-801BEFCC 1B9868 00A4+00 1/1 0/0 0/0 .text getNextItem__12dMenu_Dmap_cFi */
int dMenu_Dmap_c::getNextItem(int param_0) {
if (!itemCarryCheck()) {
return -1;
@@ -2232,8 +2167,6 @@ int dMenu_Dmap_c::getNextItem(int param_0) {
return var_r28;
}
/* 801BEFCC-801BF030 1B990C 0064+00 1/1 0/0 0/0 .text itemSelectAnmInit__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::itemSelectAnmInit() {
field_0x94->hide();
field_0x88[field_0x178]->scaleAnimeStart(0);
@@ -2241,7 +2174,6 @@ void dMenu_Dmap_c::itemSelectAnmInit() {
m_itemSubProcess = 1;
}
/* 801BF030-801BF180 1B9970 0150+00 1/0 0/0 0/0 .text itemSelectAnm__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::itemSelectAnm() {
bool temp_r29 = field_0x88[field_0x178]->scaleAnime(field_0x179, 1.0f, 0.9f, 0);
bool temp_r28 = field_0x88[field_0x177]->scaleAnime(field_0x179, 0.9f, 1.0f, 0);
@@ -2257,13 +2189,10 @@ void dMenu_Dmap_c::itemSelectAnm() {
}
}
/* 801BF180-801BF18C 1B9AC0 000C+00 1/0 0/0 0/0 .text itemInfoOpenAnm__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::itemInfoOpenAnm() {
m_itemSubProcess = 3;
}
/* 801BF18C-801BF278 1B9ACC 00EC+00 1/0 0/0 0/0 .text itemInfoWait__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::itemInfoWait() {
mpDrawBg->getItemExplainPtr()->move();
@@ -2291,8 +2220,6 @@ void dMenu_Dmap_c::itemInfoWait() {
}
}
/* 801BF278-801BF334 1B9BB8 00BC+00 1/0 0/0 0/0 .text itemInfoCloseAnm__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::itemInfoCloseAnm() {
bool var_r30 = false;
mpDrawBg->getItemExplainPtr()->move();
@@ -2322,7 +2249,6 @@ void dMenu_Dmap_c::itemInfoCloseAnm() {
}
}
/* 801BF334-801BF410 1B9C74 00DC+00 0/0 1/1 0/0 .text getNextStatus__12dMenu_Dmap_cFv */
u8 dMenu_Dmap_c::getNextStatus() {
if (POINTER_OPT != 0) {
if ((dMw_LEFT_TRIGGER() || (dMw_B_TRIGGER() && (!getZoomState() || (m_process == 0 && m_itemSubProcess == 0)))) && !isKeyCheck()) {
@@ -2347,7 +2273,6 @@ u8 dMenu_Dmap_c::getNextStatus() {
return 0;
}
/* 801BF410-801BF464 1B9D50 0054+00 1/1 1/1 0/0 .text isSync__12dMenu_Dmap_cFv */
bool dMenu_Dmap_c::isSync() {
if (mpDrawBg != NULL && (mpDrawBg->mpArchiveMount != NULL) && !mpDrawBg->mpArchiveMount->sync()) {
return false;
@@ -2360,7 +2285,6 @@ bool dMenu_Dmap_c::isSync() {
return true;
}
/* 801BF464-801BF4A4 1B9DA4 0040+00 1/1 0/0 0/0 .text isKeyCheck__12dMenu_Dmap_cFv */
bool dMenu_Dmap_c::isKeyCheck() {
if (!isSync()) {
return true;
@@ -2369,8 +2293,6 @@ bool dMenu_Dmap_c::isKeyCheck() {
return field_0x185;
}
/* 801BF4A4-801BF528 1B9DE4 0084+00 1/0 0/0 0/0 .text infoModeChange_init_proc__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::infoModeChange_init_proc() {
field_0x10->hide();
mSelFloor[getCurFloorPos()]->scaleAnimeStart(0);
@@ -2378,7 +2300,6 @@ void dMenu_Dmap_c::infoModeChange_init_proc() {
field_0x88[field_0x177]->scaleAnimeStart(0);
}
/* 801BF528-801BF688 1B9E68 0160+00 1/0 0/0 0/0 .text infoModeChange_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::infoModeChange_proc() {
bool temp_r29 = mSelFloor[getCurFloorPos()]->scaleAnime(field_0x179, 1.0f, 0.9f, 0);
bool temp_r27 = mSelFloor[getCurFloorPos()]->alphaAnime(field_0x179, 0xFF, 0x80, 0);
@@ -2396,7 +2317,6 @@ void dMenu_Dmap_c::infoModeChange_proc() {
iconMoveCalc();
}
/* 801BF688-801BF70C 1B9FC8 0084+00 1/0 0/0 0/0 .text mapModeChange_init_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::mapModeChange_init_proc() {
field_0x94->hide();
mSelFloor[getCurFloorPos()]->scaleAnimeStart(0);
@@ -2404,7 +2324,6 @@ void dMenu_Dmap_c::mapModeChange_init_proc() {
field_0x88[field_0x177]->scaleAnimeStart(0);
}
/* 801BF70C-801BF8A0 1BA04C 0194+00 1/0 0/0 0/0 .text mapModeChange_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::mapModeChange_proc() {
bool temp_r29 = mSelFloor[getCurFloorPos()]->scaleAnime(field_0x179, 0.9f, 1.0f, 0);
bool temp_r27 = mSelFloor[getCurFloorPos()]->alphaAnime(field_0x179, 0x80, 0xFF, 0);
@@ -2424,14 +2343,12 @@ void dMenu_Dmap_c::mapModeChange_proc() {
iconMoveCalc();
}
/* 801BF8A0-801BF8F8 1BA1E0 0058+00 1/0 0/0 0/0 .text lv5_talk_init_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::lv5_talk_init_proc() {
field_0x185 = true;
dMsgObject_setTalkHeap(mpDrawBg->mpTalkHeap);
mpDrawBg->mMsgFlow.init(NULL, 0x202, 0, NULL);
}
/* 801BF8F8-801BF9D4 1BA238 00DC+00 1/0 0/0 0/0 .text lv5_talk_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::lv5_talk_proc() {
u16 msg_status = dMsgObject_c::getStatus();
if (msg_status == 15 || msg_status == 16) {
@@ -2457,13 +2374,10 @@ void dMenu_Dmap_c::lv5_talk_proc() {
}
}
/* 801BF9D4-801BF9E0 1BA314 000C+00 1/0 0/0 0/0 .text mapMode_init_proc__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::mapMode_init_proc() {
field_0x185 = false;
}
/* 801BF9E0-801BFA84 1BA320 00A4+00 1/0 0/0 0/0 .text mapMode_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::mapMode_proc() {
u8 temp_r30 = field_0x17d;
if (mpDrawBg->field_0xdd4 == -99 && mpDrawBg->field_0xdd5 == 0xFF) {
@@ -2477,11 +2391,8 @@ void dMenu_Dmap_c::mapMode_proc() {
}
}
/* 801BFA84-801BFA88 1BA3C4 0004+00 1/0 0/0 0/0 .text floorSelect_init_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::floorSelect_init_proc() {}
/* 801BFA88-801BFC78 1BA3C8 01F0+00 1/0 0/0 0/0 .text floorSelect_proc__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::floorSelect_proc() {
if (field_0x16d != field_0x16c) {
floorChangeMode();
@@ -2515,7 +2426,6 @@ void dMenu_Dmap_c::floorSelect_proc() {
}
}
/* 801BFC78-801BFCAC 1BA5B8 0034+00 2/2 0/0 0/0 .text itemCarryCheck__12dMenu_Dmap_cFv */
int dMenu_Dmap_c::itemCarryCheck() {
int var_r29 = 0;
for (int i = 0; i < 3; i++) {
@@ -2527,7 +2437,6 @@ int dMenu_Dmap_c::itemCarryCheck() {
return var_r29;
}
/* 801BFCAC-801BFD5C 1BA5EC 00B0+00 1/0 0/0 0/0 .text floorChange_init_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::floorChange_init_proc() {
field_0x10->hide();
mSelFloor[getCurFloorPos()]->scaleAnimeStart(0);
@@ -2536,8 +2445,6 @@ void dMenu_Dmap_c::floorChange_init_proc() {
mSelFloor[getFloorPos(field_0x16e)]->alphaAnimeStart(0);
}
/* 801BFD5C-801BFF84 1BA69C 0228+00 1/0 0/0 0/0 .text floorChange_proc__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::floorChange_proc() {
bool temp_r29 = mSelFloor[getCurFloorPos()]->scaleAnime(field_0x179, 0.9f, 1.0f, 0);
bool temp_r28 = mSelFloor[getFloorPos(field_0x16e)]->scaleAnime(field_0x179, 1.0f, 0.9f, 0);
@@ -2557,10 +2464,8 @@ void dMenu_Dmap_c::floorChange_proc() {
iconMoveCalc();
}
/* 801BFF84-801BFF88 1BA8C4 0004+00 1/0 0/0 0/0 .text zoomWait_init_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::zoomWait_init_proc() {}
/* 801BFF88-801C008C 1BA8C8 0104+00 1/0 0/0 0/0 .text zoomWait_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::zoomWait_proc() {
if (m_process == 1) {
if (mDoCPd_c::getTrigA(PAD_1) && (((POINTER_OPT == 1 && mpDrawBg->field_0xdd3 != 0xFF) || POINTER_OPT == 0) && !dMeter2Info_isTouchKeyCheck(0xC))) {
@@ -2580,8 +2485,6 @@ void dMenu_Dmap_c::zoomWait_proc() {
}
}
/* 801C008C-801C01A0 1BA9CC 0114+00 1/0 0/0 0/0 .text zoomIn_init_proc__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::zoomIn_init_proc() {
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -2609,7 +2512,6 @@ void dMenu_Dmap_c::zoomIn_init_proc() {
mJMessageNum = 0;
}
/* 801C01A0-801C023C 1BAAE0 009C+00 1/0 0/0 0/0 .text zoomIn_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::zoomIn_proc() {
bool temp_r30 = mMapCtrl->isEndZoomIn();
bool temp_r29 = mpDrawBg->iconScaleAnm();
@@ -2625,8 +2527,6 @@ void dMenu_Dmap_c::zoomIn_proc() {
}
}
/* 801C023C-801C02F0 1BAB7C 00B4+00 1/0 0/0 0/0 .text zoomOut_init_proc__12dMenu_Dmap_cFv
*/
void dMenu_Dmap_c::zoomOut_init_proc() {
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMOUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
mMapCtrl->initZoomOut(10);
@@ -2641,7 +2541,6 @@ void dMenu_Dmap_c::zoomOut_init_proc() {
mJMessageNum = 0;
}
/* 801C02F0-801C0380 1BAC30 0090+00 1/0 0/0 0/0 .text zoomOut_proc__12dMenu_Dmap_cFv */
void dMenu_Dmap_c::zoomOut_proc() {
bool temp_r30 = mMapCtrl->isEndZoomOut();
bool temp_r29 = mpDrawBg->iconScaleAnm();