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
+4 -4
View File
@@ -734,9 +734,9 @@ u8 daObjKAM_c::CreateChk() {
if (field_0x9c0 != 2) {
if (unkInt1 != 0) {
if (!dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ||
dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) ||
!dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]))
dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]]))
{
return 0;
}
@@ -750,10 +750,10 @@ u8 daObjKAM_c::CreateChk() {
if (mSex == SEX_MALE &&
!dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) ||
dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]) ||
mSex == SEX_FEMALE &&
!dComIfGs_isEventBit(
(u16)dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))
dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))
{
return 0;
}