d_menu_dmap mostly done (#2456)

* d_menu_dmap mostly done

* d_npc_lib equivalent

* m_Do_printf matching
This commit is contained in:
TakaRikka
2025-05-25 13:29:53 -07:00
committed by GitHub
parent de30e871af
commit 0e35bbddb9
13 changed files with 2154 additions and 1375 deletions
+7 -7
View File
@@ -396,8 +396,8 @@ inline static s16 rightModeCnvRot(s16 param_0) {
/* 801C0FF8-801C1128 1BB938 0130+00 0/0 1/1 0/0 .text
* getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc */
bool dMenu_StageMapCtrl_c::getTreasureList(f32* param_0, f32* param_1, s8* param_2, u8* param_3,
s8* param_4) {
bool dMenu_StageMapCtrl_c::getTreasureList(f32* o_posX, f32* o_posY, s8* param_2, u8* o_swbit,
s8* o_roomNo) {
bool var_r30 = false;
while (field_0xe4 != 0 && !var_r30) {
@@ -405,18 +405,18 @@ bool dMenu_StageMapCtrl_c::getTreasureList(f32* param_0, f32* param_1, s8* param
sp10 = *field_0x8c->getPos();
if (getRendPointer(0)->isDrawIconSingle(field_0x8c->getDataPointer(), (s8)dComIfGp_roomControl_getStayNo(), field_0xf7, true, true, &sp10)) {
cnvPosTo2Dpos(sp10.x, sp10.z, param_0, param_1);
cnvPosTo2Dpos(sp10.x, sp10.z, o_posX, o_posY);
if (param_2 != NULL) {
*param_2 = rightModeCnvRot((s8)field_0x8c->getAngleY()) >> 8;
}
if (param_3 != NULL) {
*param_3 = field_0x8c->getSwBit();
if (o_swbit != NULL) {
*o_swbit = field_0x8c->getSwBit();
}
if (param_4 != NULL) {
*param_4 = field_0x8c->getRoomNo();
if (o_roomNo != NULL) {
*o_roomNo = field_0x8c->getRoomNo();
}
var_r30 = true;