d_stage cleanup (#2392)

This commit is contained in:
LagoLunatic
2025-04-13 23:54:57 -04:00
committed by GitHub
parent efc781e892
commit cb8a9815b1
47 changed files with 1184 additions and 1609 deletions
+4 -4
View File
@@ -366,7 +366,7 @@ void dMenu_ItemExplain_c::open_init() {
u8 itemNo = field_0xe1;
s32 iVar = -1;
if (itemNo == 0x26) {
if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11) {
if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11) {
s32 itemsObtained = 0;
for (int i = 0; i < 3; i++) {
if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) {
@@ -383,7 +383,7 @@ void dMenu_ItemExplain_c::open_init() {
itemNo = 0xfd;
}
} else {
if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x14) {
if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x14) {
itemNo = 0xf6;
}
}
@@ -646,7 +646,7 @@ u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool
u8 ret = 0;
s32 itemsObtained = 0;
if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11 && param_0 == 0x26) {
if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11 && param_0 == 0x26) {
for (int i = 0; i < 3; i++) {
if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) {
itemsObtained++;
@@ -668,7 +668,7 @@ u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool
mStatus = 1;
field_0xe1 = param_0;
field_0xcc = itemNo + 0x165;
if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x14 && itemNo == 0x23) {
if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x14 && itemNo == 0x23) {
field_0xcc = 0x5bf;
}
if (itemNo == 0x25 && dComIfGs_isDungeonItemWarp(0x16)) {