diff options
| author | roeming <brother64youyou@gmail.com> | 2025-12-07 20:09:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-07 17:09:47 -0800 |
| commit | 07a4e6b05289b7efcd37f9c69afb8336c0171aa0 (patch) | |
| tree | bfe2a1297687b67d6539eb5102d8af992b591369 /src/d/d_save.cpp | |
| parent | e82c27fd001994abdd894f94d62b7e628b446c8e (diff) | |
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
Diffstat (limited to 'src/d/d_save.cpp')
| -rw-r--r-- | src/d/d_save.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 2e92baef02..f2fa9866ce 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -1708,14 +1708,14 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { #endif // If haven't gotten then lantern back from the monkey - if (!dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[226])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { // Store whether or not it's stolen and dropped - lantern_dropped = dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[224]); - lantern_stolen = dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[225]); + lantern_dropped = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[224]); + lantern_stolen = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[225]); // Then turn those events off - dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[224]); - dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[225]); + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]); + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); // Used to turn events back on later lantern_not_recovered = true; @@ -1765,10 +1765,10 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { // Now that we've saved, reset events if needed if (lantern_not_recovered == true) { if (lantern_dropped) { - dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[224]); + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[224]); } if (lantern_stolen) { - dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[225]); + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[225]); } } @@ -2014,7 +2014,12 @@ BOOL flagFile_c::check_flag(u16 i_flag) { #if VERSION > VERSION_GCN_JPN const #endif -u16 dSv_event_flag_c::saveBitLabels[822] = { +#if PLATFORM_SHIELD +s16 +#else +u16 +#endif +dSv_event_flag_c::saveBitLabels[822] = { UNUSED, TEST_001, TEST_002, TEST_003, TEST_004, F_0001, F_0002, F_0003, F_0004, F_0005, F_0006, F_0007, F_0008, F_0009, F_0010, F_0011, F_0012, F_0013, F_0014, F_0015, F_0016, F_0017, F_0018, F_0019, F_0020, D_0001, F_0021, F_0022, F_0023, F_0024, F_0025, F_0026, F_0027, F_0028, F_0029, |