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
@@ -5818,7 +5818,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) {
switch (i_this->mMode) {
case 0:
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x220] & 0xFFFF)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x220])) {
i_this->mMode = 40;
} else {
fpcM_Search(s_fs_sub, i_this);
@@ -6628,7 +6628,7 @@ static void kantera_sub(npc_ks_class* i_this) {
fopAcM_cancelCarryNow(a_this);
cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
i_this->field_0xc17 = 0;
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0xE2] & 0xFFFF);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0xE2]);
} else {
i_this->field_0xc04.x = -30715.0f + AREG_F(8);
i_this->field_0xc04.z = -17200.0f + AREG_F(9);
@@ -7260,7 +7260,7 @@ static BOOL start_check(npc_ks_class* i_this) {
break;
case 21:
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x20A] & 0xFFFF)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x20A])) {
rv = FALSE;
} else {
i_this->mActionID = 301;
@@ -7268,7 +7268,7 @@ static BOOL start_check(npc_ks_class* i_this) {
break;
case 22:
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241] & 0xFFFF)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241])) {
rv = FALSE;
} else {
i_this->mActionID = 302;