match debug for D_menu_fmap2_d (#2925)

* menu_fmap2d debug progress

* match debug for d_menu_fmap2D

* fix broken function

* fix weird shield mismatch

* fix other shield mismatch

* fix suggestions

* fix func for wii version

* match func for all versions

* remove cast from saveBitLabels
This commit is contained in:
roeming
2025-12-07 20:09:47 -05:00
committed by GitHub
parent e82c27fd00
commit 07a4e6b052
28 changed files with 607 additions and 388 deletions
+2 -2
View File
@@ -2383,7 +2383,7 @@ int daNpcChat_c::getObjNum() {
}
// dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) &&
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) &&
objNum == OBJ_CELEB_BAG_M) {
objNum = OBJ_MARO_BAG_M;
}
@@ -2427,7 +2427,7 @@ int daNpcChat_c::getObjNum() {
}
// dSv_event_flag_c::F_0281 - Shop - Malo Mart opens in Castle Town
if (dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[281]) &&
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[281]) &&
objNum == OBJ_CELEB_BAG_W) {
objNum = OBJ_MARO_BAG_W;
}