mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-27 06:31:42 -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_fmap.cpp
-188
View File
@@ -1,8 +1,3 @@
//
// Generated By: dol2asm
// Translation Unit: d/d_menu_fmap
//
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/d_menu_fmap.h"
@@ -27,10 +22,8 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_midna.h"
/* 8042E82C-8042E840 05B54C 0014+00 2/2 0/0 0/0 .bss g_fmHIO */
static dMf_HIO_c g_fmHIO;
/* 803BD204-803BD36C 01A324 0168+00 2/3 0/0 0/0 .data init_process */
static dMenu_Fmap_c::process init_process[30] = {
&dMenu_Fmap_c::all_map_init,
&dMenu_Fmap_c::portal_demo2_init,
@@ -64,7 +57,6 @@ static dMenu_Fmap_c::process init_process[30] = {
&dMenu_Fmap_c::howl_demo3_init,
};
/* 803BD4D4-803BD63C 01A5F4 0168+00 1/2 0/0 0/0 .data move_process */
static dMenu_Fmap_c::process move_process[30] = {
&dMenu_Fmap_c::all_map_proc,
&dMenu_Fmap_c::portal_demo2_move,
@@ -98,10 +90,8 @@ static dMenu_Fmap_c::process move_process[30] = {
&dMenu_Fmap_c::howl_demo3_move,
};
/* 804510A0-804510A4 0005A0 0004+00 1/1 0/0 0/0 .sbss mMySelfPointer__9dMf_HIO_c */
dMf_HIO_c* dMf_HIO_c::mMySelfPointer;
/* 801C65F8-801C662C 1C0F38 0034+00 1/1 0/0 0/0 .text __ct__9dMf_HIO_cFv */
dMf_HIO_c::dMf_HIO_c() {
mMySelfPointer = this;
mBackAnimeStep = 0.2f;
@@ -110,7 +100,6 @@ dMf_HIO_c::dMf_HIO_c() {
mMoyaAlpha = 95;
}
/* 801C662C-801C66E4 1C0F6C 00B8+00 5/5 2/2 0/0 .text dMenuFmap_getStartStageName__FPv */
const char* dMenuFmap_getStartStageName(void* i_fieldData) {
static char virtual_stage[8];
stage_stag_info_class* stag_info = dComIfGp_getStage()->getStagInfo();
@@ -130,11 +119,8 @@ const char* dMenuFmap_getStartStageName(void* i_fieldData) {
return dComIfGp_getStartStageName();
}
/* 804510AC-804510B0 0005AC 0004+00 2/2 0/0 0/0 .sbss MyClass__12dMenu_Fmap_c */
dMenu_Fmap_c* dMenu_Fmap_c::MyClass;
/* 801C66E4-801C6AC8 1C1024 03E4+00 0/0 1/1 0/0 .text
* __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc */
dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cstick,
u8 i_process, u8 i_regionCursor, u8 i_stageCursor, f32 i_stageTransX,
f32 i_stageTransZ, u8 i_panDirection) {
@@ -265,7 +251,6 @@ dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
resetRoomDataBit();
}
/* 801C6AC8-801C6D64 1C1408 029C+00 1/0 0/0 0/0 .text __dt__12dMenu_Fmap_cFv */
dMenu_Fmap_c::~dMenu_Fmap_c() {
mpHeap->getTotalFreeSize();
if (mpFieldDat != NULL) {
@@ -335,7 +320,6 @@ dMenu_Fmap_c::~dMenu_Fmap_c() {
}
}
/* 801C6D64-801C74A4 1C16A4 0740+00 1/1 0/0 0/0 .text _create__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::_create() {
mpHeap->getTotalFreeSize();
mpDraw2DBack = new dMenu_Fmap2DBack_c();
@@ -479,12 +463,10 @@ void dMenu_Fmap_c::_create() {
g_fmapHIO.field_0x2f9 = false;
}
/* 801C74A4-801C74A8 1C1DE4 0004+00 0/0 1/1 0/0 .text _delete__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::_delete() {
/* empty function */
}
/* 801C74A8-801C7650 1C1DE8 01A8+00 0/0 1/1 0/0 .text _move__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::_move() {
u8 process = mProcess;
field_0x310 = 0;
@@ -524,7 +506,6 @@ void dMenu_Fmap_c::_move() {
}
}
/* 801C7650-801C77F0 1C1F90 01A0+00 0/0 1/1 0/0 .text _draw__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::_draw() {
if (mpDraw2DBack != NULL && mpDraw2DTop != NULL) {
if (field_0x305) {
@@ -556,8 +537,6 @@ void dMenu_Fmap_c::_draw() {
}
}
/* 801C77F0-801C7AFC 1C2130 030C+00 0/0 1/1 0/0 .text getNextStatus__12dMenu_Fmap_cFPUc
*/
u8 dMenu_Fmap_c::getNextStatus(u8* param_0) {
u8 ret = 8;
*param_0 = 0;
@@ -626,7 +605,6 @@ u8 dMenu_Fmap_c::getNextStatus(u8* param_0) {
return ret;
}
/* 801C7AFC-801C7B24 1C243C 0028+00 1/1 1/1 0/0 .text isSync__12dMenu_Fmap_cFv */
bool dMenu_Fmap_c::isSync() {
if (mpMountArchive != NULL && !mpMountArchive->sync()) {
return false;
@@ -634,7 +612,6 @@ bool dMenu_Fmap_c::isSync() {
return true;
}
/* 801C7B24-801C7C2C 1C2464 0108+00 1/0 0/0 0/0 .text all_map_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::all_map_init() {
if (mIsWarpMap == true) {
setTitleName(0x525);
@@ -661,7 +638,6 @@ void dMenu_Fmap_c::all_map_init() {
mpDraw2DTop->setCrossLRString(0x3f9);
}
/* 801C7C2C-801C8230 1C256C 0604+00 1/0 0/0 0/0 .text all_map_proc__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::all_map_proc() {
mpStick->checkTrigger();
@@ -781,7 +757,6 @@ void dMenu_Fmap_c::all_map_proc() {
}
}
/* 801C8230-801C8308 1C2B70 00D8+00 1/0 0/0 0/0 .text zoom_all_to_region_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::zoom_all_to_region_init() {
if (!readWorldData(mpDraw2DBack->getRegionCursor() + 1)) {
setProcess(PROC_ALL_MAP);
@@ -795,7 +770,6 @@ void dMenu_Fmap_c::zoom_all_to_region_init() {
}
}
/* 801C8308-801C83E0 1C2C48 00D8+00 1/0 0/0 0/0 .text zoom_all_to_region_proc__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::zoom_all_to_region_proc() {
mZoomLevel++;
mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f);
@@ -816,13 +790,11 @@ void dMenu_Fmap_c::zoom_all_to_region_proc() {
}
}
/* 801C83E0-801C8438 1C2D20 0058+00 1/0 0/0 0/0 .text zoom_region_to_all_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::zoom_region_to_all_init() {
mZoomLevel = 10;
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMOUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
/* 801C8438-801C8518 1C2D78 00E0+00 1/0 0/0 0/0 .text zoom_region_to_all_proc__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::zoom_region_to_all_proc() {
mZoomLevel--;
mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f);
@@ -843,8 +815,6 @@ void dMenu_Fmap_c::zoom_region_to_all_proc() {
}
}
/* 801C8518-801C8600 1C2E58 00E8+00 1/0 0/0 0/0 .text region_map_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::region_map_init() {
setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
mResetAreaName = true;
@@ -865,8 +835,6 @@ void dMenu_Fmap_c::region_map_init() {
mpDraw2DTop->setCrossLRString(0x3f9);
}
/* 801C8600-801C8B00 1C2F40 0500+00 1/0 0/0 0/0 .text region_map_proc__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::region_map_proc() {
bool r29 = false;
mpDraw2DTop->setAButtonString(0x527, dMenu_Fmap2DTop_c::ALPHA_DEFAULT);
@@ -962,12 +930,10 @@ void dMenu_Fmap_c::region_map_proc() {
}
}
/* 801C8B00-801C8B0C 1C3440 000C+00 1/0 0/0 0/0 .text to_portal_warp_map_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::to_portal_warp_map_init() {
mZoomLevel = 10;
}
/* 801C8B0C-801C8B48 1C344C 003C+00 1/0 0/0 0/0 .text to_portal_warp_map_proc__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::to_portal_warp_map_proc() {
mZoomLevel--;
if (mZoomLevel <= 0) {
@@ -975,7 +941,6 @@ void dMenu_Fmap_c::to_portal_warp_map_proc() {
}
}
/* 801C8B48-801C8C0C 1C3488 00C4+00 1/0 0/0 0/0 .text portal_warp_map_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::portal_warp_map_init() {
if (mPrevProcess != PROC_PORTAL_WARP_SELECT) {
mPortalNo = 0xff;
@@ -993,7 +958,6 @@ void dMenu_Fmap_c::portal_warp_map_init() {
mpDraw2DTop->set3DStickString(0x526);
}
/* 801C8C0C-801C90A4 1C354C 0498+00 1/0 0/0 0/0 .text portal_warp_map_proc__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::portal_warp_map_proc() {
mpStick->checkTrigger();
@@ -1074,12 +1038,10 @@ void dMenu_Fmap_c::portal_warp_map_proc() {
setFlash(mpDraw2DBack->getSpotCursor(), false);
}
/* 801C90A4-801C90A8 1C39E4 0004+00 1/0 0/0 0/0 .text portal_warp_select_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::portal_warp_select_init() {
/* empty function */
}
/* 801C90A8-801C91D8 1C39E8 0130+00 1/0 0/0 0/0 .text portal_warp_select_proc__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::portal_warp_select_proc() {
mpDraw2DTop->getScrnExplainPtr()->move();
@@ -1108,7 +1070,6 @@ void dMenu_Fmap_c::portal_warp_select_proc() {
setFlash(mpDraw2DBack->getSpotCursor(), false);
}
/* 801C91D8-801C9238 1C3B18 0060+00 1/0 0/0 0/0 .text portal_warp_forbid_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::portal_warp_forbid_init() {
mpDraw2DTop->setBButtonString(0x3f9, dMenu_Fmap2DTop_c::ALPHA_DEFAULT);
mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT);
@@ -1116,7 +1077,6 @@ void dMenu_Fmap_c::portal_warp_forbid_init() {
mpDraw2DTop->setCrossLRString(0);
}
/* 801C9238-801C92A4 1C3B78 006C+00 1/0 0/0 0/0 .text portal_warp_forbid_proc__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::portal_warp_forbid_proc() {
mpDraw2DTop->getScrnExplainPtr()->move();
if (mpDraw2DTop->getScrnExplainPtr()->getStatus() == 0) {
@@ -1126,16 +1086,12 @@ void dMenu_Fmap_c::portal_warp_forbid_proc() {
setFlash(mpDraw2DBack->getSpotCursor(), false);
}
/* 801C92A4-801C9304 1C3BE4 0060+00 1/0 0/0 0/0 .text zoom_region_to_spot_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::zoom_region_to_spot_init() {
mZoomLevel = 0;
field_0x1ec = 0.0f;
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
/* 801C9304-801C93CC 1C3C44 00C8+00 1/0 0/0 0/0 .text zoom_region_to_spot_proc__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::zoom_region_to_spot_proc() {
mZoomLevel++;
field_0x1ec = (f32)mZoomLevel / 10.0f;
@@ -1153,16 +1109,12 @@ void dMenu_Fmap_c::zoom_region_to_spot_proc() {
}
}
/* 801C93CC-801C9428 1C3D0C 005C+00 1/0 0/0 0/0 .text zoom_spot_to_region_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::zoom_spot_to_region_init() {
mZoomLevel = 10;
field_0x1ec = 1.0f;
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMOUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
/* 801C9428-801C950C 1C3D68 00E4+00 1/0 0/0 0/0 .text zoom_spot_to_region_proc__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::zoom_spot_to_region_proc() {
mZoomLevel--;
field_0x1ec = (f32)mZoomLevel / 10.0f;
@@ -1184,7 +1136,6 @@ void dMenu_Fmap_c::zoom_spot_to_region_proc() {
}
}
/* 801C950C-801C9618 1C3E4C 010C+00 1/0 0/0 0/0 .text spot_map_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::spot_map_init() {
field_0x1ec = 1.0f;
setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
@@ -1209,7 +1160,6 @@ void dMenu_Fmap_c::spot_map_init() {
mpDraw2DTop->setCrossLRString(0x3f9);
}
/* 801C9618-801C9A4C 1C3F58 0434+00 1/0 0/0 0/0 .text spot_map_proc__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::spot_map_proc() {
if (dMw_B_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc)
&& dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1)
@@ -1307,8 +1257,6 @@ void dMenu_Fmap_c::spot_map_proc() {
}
}
/* 801C9A4C-801C9B64 1C438C 0118+00 1/0 0/0 0/0 .text portal_demo1_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo1_init() {
mpDraw2DBack->setRegionCursor(2);
setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
@@ -1327,8 +1275,6 @@ void dMenu_Fmap_c::portal_demo1_init() {
mZoomLevel = 10;
}
/* 801C9B64-801C9C7C 1C44A4 0118+00 1/0 0/0 0/0 .text portal_demo1_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo1_move() {
talkButton();
mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1350,15 +1296,11 @@ void dMenu_Fmap_c::portal_demo1_move() {
}
}
/* 801C9C7C-801C9CC8 1C45BC 004C+00 1/0 0/0 0/0 .text portal_demo2_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo2_init() {
setTitleName(mAllTitleName);
setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]);
}
/* 801C9CC8-801C9D60 1C4608 0098+00 1/0 0/0 0/0 .text portal_demo2_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo2_move() {
talkButton();
mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1372,16 +1314,12 @@ void dMenu_Fmap_c::portal_demo2_move() {
mpDraw2DBack->mapBlink();
}
/* 801C9D60-801C9DB4 1C46A0 0054+00 1/0 0/0 0/0 .text portal_demo3_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo3_init() {
setTitleName(mAllTitleName);
setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]);
mZoomLevel = 0;
}
/* 801C9DB4-801C9EB8 1C46F4 0104+00 1/0 0/0 0/0 .text portal_demo3_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo3_move() {
talkButton();
mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1403,8 +1341,6 @@ void dMenu_Fmap_c::portal_demo3_move() {
}
}
/* 801C9EB8-801C9F14 1C47F8 005C+00 1/0 0/0 0/0 .text portal_demo4_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo4_init() {
mPortalNo = 0xff;
setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
@@ -1413,8 +1349,6 @@ void dMenu_Fmap_c::portal_demo4_init() {
}
}
/* 801C9F14-801C9F7C 1C4854 0068+00 1/0 0/0 0/0 .text portal_demo4_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo4_move() {
talkButton();
if (mMsgFlow.doFlow(NULL, NULL, 0)) {
@@ -1423,15 +1357,11 @@ void dMenu_Fmap_c::portal_demo4_move() {
setFlash(mpDraw2DBack->getSpotCursor(), false);
}
/* 801C9F7C-801C9FBC 1C48BC 0040+00 1/0 0/0 0/0 .text portal_demo5_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo5_init() {
mpDraw2DTop->set3DStickString(0x526);
mpDraw2DBack->onArrowDrawFlag();
}
/* 801C9FBC-801CA158 1C48FC 019C+00 1/0 0/0 0/0 .text portal_demo5_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo5_move() {
mpStick->checkTrigger();
@@ -1462,14 +1392,10 @@ void dMenu_Fmap_c::portal_demo5_move() {
setFlash(mpDraw2DBack->getSpotCursor(), false);
}
/* 801CA158-801CA15C 1C4A98 0004+00 1/0 0/0 0/0 .text portal_demo6_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo6_init() {
/* empty function */
}
/* 801CA15C-801CA1E8 1C4A9C 008C+00 1/0 0/0 0/0 .text portal_demo6_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::portal_demo6_move() {
if (dMsgObject_getMsgObjectClass()->getStatus() == 0xe) {
dMsgObject_getMsgObjectClass()->setStatus(0x10);
@@ -1483,7 +1409,6 @@ void dMenu_Fmap_c::portal_demo6_move() {
setFlash(mpDraw2DBack->getSpotCursor(), false);
}
/* 801CA1E8-801CA2F4 1C4B28 010C+00 1/0 0/0 0/0 .text yamiboss_demo1_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo1_init() {
setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
setAreaName(mAreaName[mpDraw2DBack->getSpotCursor()]);
@@ -1501,7 +1426,6 @@ void dMenu_Fmap_c::yamiboss_demo1_init() {
mZoomLevel = 10;
}
/* 801CA2F4-801CA34C 1C4C34 0058+00 1/0 0/0 0/0 .text yamiboss_demo1_move__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo1_move() {
talkButton();
mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1510,13 +1434,11 @@ void dMenu_Fmap_c::yamiboss_demo1_move() {
}
}
/* 801CA34C-801CA35C 1C4C8C 0010+00 1/0 0/0 0/0 .text yamiboss_demo2_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo2_init() {
mZoomLevel = 0;
field_0x30b = false;
}
/* 801CA35C-801CA40C 1C4C9C 00B0+00 1/0 0/0 0/0 .text yamiboss_demo2_move__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo2_move() {
if (dMsgObject_getMsgObjectClass()->getStatus() == 0xe) {
mZoomLevel++;
@@ -1535,12 +1457,10 @@ void dMenu_Fmap_c::yamiboss_demo2_move() {
}
}
/* 801CA40C-801CA410 1C4D4C 0004+00 1/0 0/0 0/0 .text yamiboss_demo3_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo3_init() {
/* empty function */
}
/* 801CA410-801CA468 1C4D50 0058+00 1/0 0/0 0/0 .text yamiboss_demo3_move__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo3_move() {
talkButton();
mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1549,13 +1469,11 @@ void dMenu_Fmap_c::yamiboss_demo3_move() {
}
}
/* 801CA468-801CA4C0 1C4DA8 0058+00 1/0 0/0 0/0 .text yamiboss_demo4_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo4_init() {
mZoomLevel = 0;
Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
/* 801CA4C0-801CA544 1C4E00 0084+00 1/0 0/0 0/0 .text yamiboss_demo4_move__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo4_move() {
mZoomLevel++;
field_0x1ec = (f32)mZoomLevel / 10.0f;
@@ -1565,12 +1483,10 @@ void dMenu_Fmap_c::yamiboss_demo4_move() {
}
}
/* 801CA544-801CA548 1C4E84 0004+00 1/0 0/0 0/0 .text yamiboss_demo5_init__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo5_init() {
/* empty function */
}
/* 801CA548-801CA5CC 1C4E88 0084+00 1/0 0/0 0/0 .text yamiboss_demo5_move__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamiboss_demo5_move() {
if (field_0x30b && dMsgObject_getMessageID() >= 4018) {
field_0x30b = false;
@@ -1582,8 +1498,6 @@ void dMenu_Fmap_c::yamiboss_demo5_move() {
}
}
/* 801CA5CC-801CA7A4 1C4F0C 01D8+00 1/0 0/0 0/0 .text light_demo1_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::light_demo1_init() {
mpDraw2DBack->zoomMapCalc2(1.0f);
mZoomLevel = -10;
@@ -1612,8 +1526,6 @@ void dMenu_Fmap_c::light_demo1_init() {
mMsgFlow.init(NULL, 125, 0, NULL);
}
/* 801CA7A4-801CA7E0 1C50E4 003C+00 1/0 0/0 0/0 .text light_demo1_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::light_demo1_move() {
mZoomLevel++;
if (mZoomLevel > 0) {
@@ -1621,14 +1533,10 @@ void dMenu_Fmap_c::light_demo1_move() {
}
}
/* 801CA7E0-801CA814 1C5120 0034+00 1/0 0/0 0/0 .text light_demo2_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::light_demo2_init() {
mMsgFlow.init(NULL, 125, 0, NULL);
}
/* 801CA814-801CA874 1C5154 0060+00 1/0 0/0 0/0 .text light_demo2_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::light_demo2_move() {
talkButton();
if (mMsgFlow.doFlow(NULL, NULL, 0)) {
@@ -1637,8 +1545,6 @@ void dMenu_Fmap_c::light_demo2_move() {
}
}
/* 801CA874-801CA9B4 1C51B4 0140+00 1/0 0/0 0/0 .text table_demo1_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::table_demo1_init() {
mZoomLevel = -10;
mpDraw2DBack->setRegionCursor(dMeter2Info_getTableMapRegionNo());
@@ -1666,8 +1572,6 @@ void dMenu_Fmap_c::table_demo1_init() {
}
}
/* 801CA9B4-801CAA78 1C52F4 00C4+00 1/0 0/0 0/0 .text table_demo1_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::table_demo1_move() {
mZoomLevel++;
if (mZoomLevel == 1) {
@@ -1681,16 +1585,12 @@ void dMenu_Fmap_c::table_demo1_move() {
}
}
/* 801CAA78-801CAABC 1C53B8 0044+00 1/0 0/0 0/0 .text table_demo2_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::table_demo2_init() {
mZoomLevel = -10;
tableArrowPosInit(true);
mpDraw2DBack->zoomMapCalc2(0.0f);
}
/* 801CAABC-801CAB88 1C53FC 00CC+00 1/0 0/0 0/0 .text table_demo2_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::table_demo2_move() {
mZoomLevel++;
if (mZoomLevel == 1) {
@@ -1705,15 +1605,11 @@ void dMenu_Fmap_c::table_demo2_move() {
}
}
/* 801CAB88-801CABD0 1C54C8 0048+00 1/0 0/0 0/0 .text table_demo3_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::table_demo3_init() {
dMsgObject_setTalkHeap(mpTalkHeap);
mMsgFlow.init(NULL, 1089, 0, NULL);
}
/* 801CABD0-801CAC30 1C5510 0060+00 1/0 0/0 0/0 .text table_demo3_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::table_demo3_move() {
talkButton();
if (mMsgFlow.doFlow(NULL, NULL, 0)) {
@@ -1722,16 +1618,12 @@ void dMenu_Fmap_c::table_demo3_move() {
}
}
/* 801CAC30-801CAC7C 1C5570 004C+00 1/0 0/0 0/0 .text howl_demo1_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::howl_demo1_init() {
mZoomLevel = -10;
mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT);
mpDraw2DBack->zoomMapCalc2(0.0f);
}
/* 801CAC7C-801CAD48 1C55BC 00CC+00 1/0 0/0 0/0 .text howl_demo1_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::howl_demo1_move() {
mZoomLevel++;
if (mZoomLevel == 1) {
@@ -1746,14 +1638,10 @@ void dMenu_Fmap_c::howl_demo1_move() {
}
}
/* 801CAD48-801CAD54 1C5688 000C+00 1/0 0/0 0/0 .text howl_demo2_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::howl_demo2_init() {
mZoomLevel = -10;
}
/* 801CAD54-801CAD9C 1C5694 0048+00 1/0 0/0 0/0 .text howl_demo2_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::howl_demo2_move() {
mZoomLevel++;
if (mZoomLevel > 0) {
@@ -1762,19 +1650,14 @@ void dMenu_Fmap_c::howl_demo2_move() {
}
}
/* 801CAD9C-801CADA0 1C56DC 0004+00 1/0 0/0 0/0 .text howl_demo3_init__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::howl_demo3_init() {
/* empty function */
}
/* 801CADA0-801CADC4 1C56E0 0024+00 1/0 0/0 0/0 .text howl_demo3_move__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::howl_demo3_move() {
setProcess(PROC_REGION_MAP);
}
/* 801CADC4-801CB038 1C5704 0274+00 0/0 1/1 0/0 .text isOpen__12dMenu_Fmap_cFv */
bool dMenu_Fmap_c::isOpen() {
bool ret = false;
bool init = false;
@@ -1836,7 +1719,6 @@ bool dMenu_Fmap_c::isOpen() {
return ret;
}
/* 801CB038-801CB1DC 1C5978 01A4+00 0/0 1/1 0/0 .text isClose__12dMenu_Fmap_cFv */
bool dMenu_Fmap_c::isClose() {
bool ret = true;
bool bVar2 = false;
@@ -1878,7 +1760,6 @@ bool dMenu_Fmap_c::isClose() {
return ret;
}
/* 801CB1DC-801CB200 1C5B1C 0024+00 0/0 1/1 0/0 .text getProcess__12dMenu_Fmap_cFv */
u8 dMenu_Fmap_c::getProcess() {
if (g_fmapHIO.field_0x2f9) {
return mProcess;
@@ -1886,8 +1767,6 @@ u8 dMenu_Fmap_c::getProcess() {
return PROC_REGION_MAP;
}
/* 801CB200-801CB230 1C5B40 0030+00 0/0 1/1 0/0 .text getRegionCursor__12dMenu_Fmap_cFv
*/
u8 dMenu_Fmap_c::getRegionCursor() {
if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) {
return mpDraw2DBack->getRegionCursor();
@@ -1895,7 +1774,6 @@ u8 dMenu_Fmap_c::getRegionCursor() {
return 0;
}
/* 801CB230-801CB260 1C5B70 0030+00 0/0 1/1 0/0 .text getStageCursor__12dMenu_Fmap_cFv */
u8 dMenu_Fmap_c::getStageCursor() {
if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) {
return mpDraw2DBack->getSpotCursor();
@@ -1903,7 +1781,6 @@ u8 dMenu_Fmap_c::getStageCursor() {
return 0;
}
/* 801CB260-801CB290 1C5BA0 0030+00 0/0 1/1 0/0 .text getStageTransX__12dMenu_Fmap_cFv */
f32 dMenu_Fmap_c::getStageTransX() {
if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) {
return mpDraw2DBack->getStageTransX();
@@ -1911,7 +1788,6 @@ f32 dMenu_Fmap_c::getStageTransX() {
return 0.0f;
}
/* 801CB290-801CB2C0 1C5BD0 0030+00 0/0 1/1 0/0 .text getStageTransZ__12dMenu_Fmap_cFv */
f32 dMenu_Fmap_c::getStageTransZ() {
if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) {
return mpDraw2DBack->getStageTransZ();
@@ -1919,7 +1795,6 @@ f32 dMenu_Fmap_c::getStageTransZ() {
return 0.0f;
}
/* 801CB2C0-801CB570 1C5C00 02B0+00 4/4 0/0 0/0 .text isRoomCheck__12dMenu_Fmap_cFii */
bool dMenu_Fmap_c::isRoomCheck(int i_stageNo, int i_roomNo) {
if (!field_0x305) {
return false;
@@ -2013,8 +1888,6 @@ bool dMenu_Fmap_c::isRoomCheck(int i_stageNo, int i_roomNo) {
return false;
}
/* 801CB570-801CB664 1C5EB0 00F4+00 2/2 0/0 0/0 .text checkStRoomData__12dMenu_Fmap_cFv
*/
u16 dMenu_Fmap_c::checkStRoomData() {
dMenu_Fmap_field_room_data_c* room_data
= (dMenu_Fmap_field_room_data_c*)((int)mpFieldDat + mpFieldDat->mRoomDataOffset);
@@ -2044,7 +1917,6 @@ u16 dMenu_Fmap_c::checkStRoomData() {
return -1;
}
/* 801CB664-801CB6D0 1C5FA4 006C+00 10/10 0/0 0/0 .text talkButton__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::talkButton() {
u16 status = dMsgObject_c::getStatus();
if (status == 5 || status == 0xf || status == 0x10) {
@@ -2054,13 +1926,11 @@ void dMenu_Fmap_c::talkButton() {
}
}
/* 801CB6D0-801CB6E0 1C6010 0010+00 31/31 0/0 0/0 .text setProcess__12dMenu_Fmap_cFUc */
void dMenu_Fmap_c::setProcess(u8 i_process) {
mPrevProcess = mProcess;
mProcess = i_process;
}
/* 801CB6E0-801CB770 1C6020 0090+00 10/10 0/0 0/0 .text setFlash__12dMenu_Fmap_cFUcb */
void dMenu_Fmap_c::setFlash(u8 i_stageNo, bool param_1) {
mpDraw2DBack->mapBlink(&field_0x210);
if (param_1) {
@@ -2071,7 +1941,6 @@ void dMenu_Fmap_c::setFlash(u8 i_stageNo, bool param_1) {
}
}
/* 801CB770-801CB938 1C60B0 01C8+00 6/6 0/0 0/0 .text readWorldData__12dMenu_Fmap_cFUc */
bool dMenu_Fmap_c::readWorldData(u8 i_regionNo) {
removeAreaData();
bool ret = false;
@@ -2130,7 +1999,6 @@ bool dMenu_Fmap_c::readWorldData(u8 i_regionNo) {
return ret;
}
/* 801CB938-801CBF04 1C6278 05CC+00 1/1 0/0 0/0 .text readAreaData__12dMenu_Fmap_cFUcb */
bool dMenu_Fmap_c::readAreaData(u8 i_regionNo, bool i_isSelectedRegion) {
if (field_0x305) {
return false;
@@ -2293,8 +2161,6 @@ bool dMenu_Fmap_c::readAreaData(u8 i_regionNo, bool i_isSelectedRegion) {
return true;
}
/* 801CBF04-801CC094 1C6844 0190+00 1/1 0/0 0/0 .text
* readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc */
bool dMenu_Fmap_c::readRoomData(char const* i_stageName, dMenu_Fmap_stage_data_c* i_stageData,
void* o_roomData, int i_regionNo, u8 param_4) {
dMenu_Fmap_room_data_c* prev_room_data = NULL;
@@ -2338,7 +2204,6 @@ bool dMenu_Fmap_c::readRoomData(char const* i_stageName, dMenu_Fmap_stage_data_c
return true;
}
/* 801CC094-801CC284 1C69D4 01F0+00 3/3 0/0 0/0 .text readFieldMapData__12dMenu_Fmap_cFPPvPCcbb */
bool dMenu_Fmap_c::readFieldMapData(void** o_data, char const* i_path, bool param_2,
bool param_3) {
u32 size;
@@ -2388,7 +2253,6 @@ bool dMenu_Fmap_c::readFieldMapData(void** o_data, char const* i_path, bool para
}
}
/* 801CC2B0-801CC4EC 1C6BF0 023C+00 1/1 0/0 0/0 .text decodeFieldMapData__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::decodeFieldMapData() {
int field_data = (int)mpFieldDat;
dMenu_Fmap_field_region_data_c* region_data
@@ -2446,8 +2310,6 @@ void dMenu_Fmap_c::decodeFieldMapData() {
setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]);
}
/* 801CC4EC-801CC51C 1C6E2C 0030+00 1/1 0/0 0/0 .text decodePortalData__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::decodePortalData() {
dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat;
if (g_fmapHIO.mPortalDataTerminalOutput) {
@@ -2455,7 +2317,6 @@ void dMenu_Fmap_c::decodePortalData() {
}
}
/* 801CC51C-801CC61C 1C6E5C 0100+00 1/1 0/0 0/0 .text readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc */
bool dMenu_Fmap_c::readRoomDzsData(void** i_data, u32 param_1, char const* i_path) {
void* res;
char* path = const_cast<char*>(i_path);
@@ -2478,7 +2339,6 @@ bool dMenu_Fmap_c::readRoomDzsData(void** i_data, u32 param_1, char const* i_pat
}
}
/* 801CC61C-801CC7A8 1C6F5C 018C+00 4/4 0/0 0/0 .text removeAreaData__12dMenu_Fmap_cFv */
bool dMenu_Fmap_c::removeAreaData() {
if (!field_0x305) {
return true;
@@ -2540,8 +2400,6 @@ bool dMenu_Fmap_c::removeAreaData() {
return true;
}
/* 801CC7A8-801CC85C 1C70E8 00B4+00 1/1 0/0 0/0 .text
* removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c */
bool dMenu_Fmap_c::removeRoomData(dMenu_Fmap_stage_data_c* i_stageData) {
dMenu_Fmap_room_data_c* room_data = i_stageData->getFmapRoomDataTop();
while (room_data != NULL) {
@@ -2560,27 +2418,20 @@ bool dMenu_Fmap_c::removeRoomData(dMenu_Fmap_stage_data_c* i_stageData) {
return true;
}
/* 801CC85C-801CC880 1C719C 0024+00 11/11 0/0 0/0 .text setTitleName__12dMenu_Fmap_cFUl
*/
void dMenu_Fmap_c::setTitleName(u32 i_msgIndex) {
mpDraw2DTop->setTitleNameString(i_msgIndex);
}
/* 801CC880-801CC8AC 1C71C0 002C+00 13/13 0/0 0/0 .text setAreaName__12dMenu_Fmap_cFUl */
void dMenu_Fmap_c::setAreaName(u32 i_msgIndex) {
mAreaNameSet = true;
mpDraw2DTop->setAreaNameString(i_msgIndex);
}
/* 801CC8AC-801CC8DC 1C71EC 0030+00 8/8 0/0 0/0 .text setAreaNameZero__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::setAreaNameZero() {
mAreaNameSet = false;
mpDraw2DTop->setAreaNameString(0);
}
/* 801CC8DC-801CCA70 1C721C 0194+00 2/2 0/0 0/0 .text
* portalWarpMapMove__12dMenu_Fmap_cFP9STControl */
void dMenu_Fmap_c::portalWarpMapMove(STControl* i_stick) {
mpDraw2DBack->regionMapMove(i_stick);
dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat;
@@ -2616,18 +2467,14 @@ void dMenu_Fmap_c::portalWarpMapMove(STControl* i_stick) {
}
}
/* 801CCA70-801CCA98 1C73B0 0028+00 1/1 0/0 0/0 .text onRoomDataBit__12dMenu_Fmap_cFi */
void dMenu_Fmap_c::onRoomDataBit(int i_bit) {
mRoomDataBits[i_bit >> 5] |= 1 << (i_bit & 0x1f);
}
/* 801CCA98-801CCAC4 1C73D8 002C+00 1/1 0/0 0/0 .text isRoomDataBit__12dMenu_Fmap_cFi */
BOOL dMenu_Fmap_c::isRoomDataBit(int i_bit) {
return (mRoomDataBits[i_bit >> 5] & 1 << (i_bit & 0x1f)) ? TRUE : FALSE;
}
/* 801CCAC4-801CCB08 1C7404 0044+00 2/2 0/0 0/0 .text resetRoomDataBit__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::resetRoomDataBit() {
for (int i = 0; i < 2; i++) {
mRoomDataBits[i] = 0;
@@ -2638,7 +2485,6 @@ void dMenu_Fmap_c::resetRoomDataBit() {
}
}
/* 801CCB08-801CCD98 1C7448 0290+00 2/2 0/0 0/0 .text drawIcon__12dMenu_Fmap_cFfb */
void dMenu_Fmap_c::drawIcon(f32 param_0, bool param_1) {
if (mpDraw2DBack->getRegionCursor() + 1 == dComIfGp_getNowLevel()) {
drawPlayEnterIcon();
@@ -2705,40 +2551,29 @@ void dMenu_Fmap_c::drawIcon(f32 param_0, bool param_1) {
}
}
/* 801CCD98-801CCDDC 1C76D8 0044+00 1/1 0/0 0/0 .text drawLightDropIcon__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::drawLightDropIcon() {
if (isLightVesselGet()) {
drawIcon(4, 5);
}
}
/* 801CCDDC-801CCE04 1C771C 0028+00 1/1 0/0 0/0 .text drawBatsumarkIcon__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::drawBatsumarkIcon() {
drawIcon(5, 0x12);
}
/* 801CCE04-801CCE48 1C7744 0044+00 1/1 0/0 0/0 .text drawSnowmanIcon__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::drawSnowmanIcon() {
drawIcon(0xd, 9);
drawIcon(0xe, 0xa);
}
/* 801CCE48-801CCE70 1C7788 0028+00 1/1 0/0 0/0 .text drawGoldWolfIcon__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::drawGoldWolfIcon() {
drawIcon(6, 0xb);
}
/* 801CCE70-801CCE98 1C77B0 0028+00 1/1 0/0 0/0 .text drawCoachIcon__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::drawCoachIcon() {
drawIcon(0xa, 0xd);
}
/* 801CCE98-801CCFB0 1C77D8 0118+00 1/1 0/0 0/0 .text drawPlayEnterIcon__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::drawPlayEnterIcon() {
cXyz pos;
s16 angle;
@@ -2758,7 +2593,6 @@ void dMenu_Fmap_c::drawPlayEnterIcon() {
}
}
/* 801CCFB0-801CD000 1C78F0 0050+00 3/3 0/0 0/0 .text checkDrawPortalIcon__12dMenu_Fmap_cFii */
bool dMenu_Fmap_c::checkDrawPortalIcon(int i_stageNo, int i_switchNo) {
if (g_fmapHIO.mAllRegionsUnlocked) {
return true;
@@ -2766,8 +2600,6 @@ bool dMenu_Fmap_c::checkDrawPortalIcon(int i_stageNo, int i_switchNo) {
return dComIfGs_isStageSwitch(i_stageNo, i_switchNo);
}
/* 801CD000-801CD10C 1C7940 010C+00 3/3 0/0 0/0 .text searchIcon__12dMenu_Fmap_cFUciPfPf
*/
bool dMenu_Fmap_c::searchIcon(u8 i_typeGroupNo, int i_swBit, f32* o_posX, f32* o_posZ) {
dMenuFmapIconDisp_c icon;
dMenu_Fmap_stage_data_c* stage_data;
@@ -2801,7 +2633,6 @@ bool dMenu_Fmap_c::searchIcon(u8 i_typeGroupNo, int i_swBit, f32* o_posX, f32* o
return ret;
}
/* 801CD10C-801CD210 1C7A4C 0104+00 6/6 0/0 0/0 .text drawIcon__12dMenu_Fmap_cFUci */
void dMenu_Fmap_c::drawIcon(u8 i_typeGroupNo, int param_1) {
dMenuFmapIconDisp_c icon;
dMenu_Fmap_stage_data_c* stage_data;
@@ -2830,13 +2661,11 @@ void dMenu_Fmap_c::drawIcon(u8 i_typeGroupNo, int param_1) {
}
}
/* 801CD210-801CD254 1C7B50 0044+00 1/1 0/0 0/0 .text drawEnterIcon__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::drawEnterIcon() {
drawIcon(1, 0x14);
drawIcon(8, 0x16);
}
/* 801CD254-801CD2FC 1C7B94 00A8+00 1/1 0/0 0/0 .text drawPortalIcon__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::drawPortalIcon() {
if (mIsWarpMap == true && mpPortalDat != NULL) {
dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat;
@@ -2850,8 +2679,6 @@ void dMenu_Fmap_c::drawPortalIcon() {
}
}
/* 801CD2FC-801CD350 1C7C3C 0054+00 1/1 0/0 0/0 .text getRegionStageNum__12dMenu_Fmap_cFi
*/
u8 dMenu_Fmap_c::getRegionStageNum(int param_0) {
if (mpFieldDat != NULL) {
dMenu_Fmap_field_region_data_c* region_data
@@ -2867,17 +2694,14 @@ u8 dMenu_Fmap_c::getRegionStageNum(int param_0) {
return 0;
}
/* 801CD350-801CD368 1C7C90 0018+00 6/6 0/0 0/0 .text getNowFmapRegionData__12dMenu_Fmap_cFv */
dMenu_Fmap_region_data_c* dMenu_Fmap_c::getNowFmapRegionData() {
return mpRegionData[mpDraw2DBack->getRegionCursor()];
}
/* 801CD368-801CD380 1C7CA8 0018+00 2/2 0/0 0/0 .text getNowFmapStageData__12dMenu_Fmap_cFv */
dMenu_Fmap_stage_data_c* dMenu_Fmap_c::getNowFmapStageData() {
return mpStageData[mpDraw2DBack->getRegionCursor()];
}
/* 801CD380-801CD3F0 1C7CC0 0070+00 1/1 0/0 0/0 .text searchPortalStageID__12dMenu_Fmap_cFPc */
u8 dMenu_Fmap_c::searchPortalStageID(char* param_0) {
for (int i = 0; i < 20; i++) {
if (!strcmp(param_0, mStageName[i])) {
@@ -2887,7 +2711,6 @@ u8 dMenu_Fmap_c::searchPortalStageID(char* param_0) {
return 0xff;
}
/* 801CD3F0-801CD460 1C7D30 0070+00 1/1 0/0 0/0 .text drawDebugStage__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::drawDebugStage() {
if (mProcess != PROC_ALL_MAP) {
mpDraw2DBack->setDebugData(mpMenuFmapMap, getNowFmapRegionData(), mStayStageNo);
@@ -2896,7 +2719,6 @@ void dMenu_Fmap_c::drawDebugStage() {
}
}
/* 801CD460-801CD5CC 1C7DA0 016C+00 1/1 0/0 0/0 .text arrowPosInit__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::arrowPosInit() {
if (mProcess == PROC_TABLE_DEMO1) {
tableArrowPosInit(false);
@@ -2930,8 +2752,6 @@ void dMenu_Fmap_c::arrowPosInit() {
}
}
/* 801CD5CC-801CD770 1C7F0C 01A4+00 2/2 0/0 0/0 .text tableArrowPosInit__12dMenu_Fmap_cFb
*/
void dMenu_Fmap_c::tableArrowPosInit(bool param_0) {
int iVar5 = -1;
int swbit;
@@ -2980,7 +2800,6 @@ void dMenu_Fmap_c::tableArrowPosInit(bool param_0) {
}
}
/* 801CD770-801CD814 1C80B0 00A4+00 1/1 0/0 0/0 .text yamibossArrowPosInit__12dMenu_Fmap_cFv */
void dMenu_Fmap_c::yamibossArrowPosInit() {
f32 pos1_x, pos2_x, pos1_z, pos2_z, icon_x, icon_z;
if (!searchIcon(4, 0x75, &icon_x, &icon_z)) {
@@ -2992,8 +2811,6 @@ void dMenu_Fmap_c::yamibossArrowPosInit() {
mpDraw2DBack->setArrowPosAxis(icon_x, icon_z + (pos1_z - pos2_z));
}
/* 801CD814-801CD8B4 1C8154 00A0+00 1/1 0/0 0/0 .text howlArrowPosInit__12dMenu_Fmap_cFv
*/
void dMenu_Fmap_c::howlArrowPosInit() {
u8 type = dMeter2Info_getGoldWolfMapType();
static char* stage_name[6] = {"F_SP104", "F_SP122", "F_SP122", "F_SP124", "F_SP111", "F_SP116"};
@@ -3006,8 +2823,6 @@ void dMenu_Fmap_c::howlArrowPosInit() {
}
}
/* 801CD8B4-801CD92C 1C81F4 0078+00 1/1 0/0 0/0 .text getHowlRegionID__12dMenu_Fmap_cFv
*/
u8 dMenu_Fmap_c::getHowlRegionID() {
switch (dMeter2Info_getGoldWolfMapType()) {
case 2:
@@ -3027,13 +2842,10 @@ u8 dMenu_Fmap_c::getHowlRegionID() {
}
}
/* 801CD92C-801CD95C 1C826C 0030+00 1/1 0/0 0/0 .text isLightVesselGet__12dMenu_Fmap_cFv
*/
bool dMenu_Fmap_c::isLightVesselGet() {
return (bool)dComIfGp_isLightDropMapVisible();
}
/* 801CD95C-801CDA2C 1C829C 00D0+00 1/1 0/0 0/0 .text getPlayerPos2D__12dMenu_Fmap_cFv */
cXyz* dMenu_Fmap_c::getPlayerPos2D() {
cXyz pos;
char stage_name[8];