diff options
| author | Carco_21 <144170194+carter-ktb21@users.noreply.github.com> | 2025-08-08 14:39:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-08 21:39:26 +0300 |
| commit | e0b1fe92b1e79b5b93e8a3df6ee56e5771e80915 (patch) | |
| tree | 6a34a131100ef6c58171b7a1e9e4e1be0e65fb18 /src/d/d_menu_fmap2D.cpp | |
| parent | 9fbbec4326a5fcc9443e219415386da36b8ec5e8 (diff) | |
ChkBit comments and enum work (#2571)
* Jagar cleanup
* saru work
* e_fm work
* gob enum added
* gob cleanup
* gob anm enums
* dComIfGs_isEventBit comments added
* More bit work and besu enum work
* Maybe fixed the issue?
Diffstat (limited to 'src/d/d_menu_fmap2D.cpp')
| -rw-r--r-- | src/d/d_menu_fmap2D.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index 88821d8871..0ef70fce21 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -2734,7 +2734,9 @@ bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion4() { return false; } + /* dSv_event_flag_c::M_071 - Cutscene - [cutscene: 20] Zant appears (during Midna's desperate hour) */ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[104]) + /* dSv_event_flag_c::F_0250 - Cutscene - [cutscene: 21] reunion with Zelda / Midna revived (Hyrule Castle barrier appears) */ && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[250])) { return false; @@ -2743,10 +2745,11 @@ bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion4() { return true; } -/* 801D7B58-801D7BCC 1D2498 0074+00 1/1 3/3 0/0 .text checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv - */ +/* 801D7B58-801D7BCC 1D2498 0074+00 1/1 3/3 0/0 .text checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv */ bool dMenu_Fmap2DTop_c::checkWarpAcceptCannon() { + /* dSv_event_flag_c::F_0786 - Kakariko Village - Forced conversation with Shad when he sees the sky cannon */ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[786]) + /* dSv_event_flag_c::F_0785 - Kakariko Village - Shad leaves after attempting to warp sky cannon */ && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[785])) { return false; @@ -2834,9 +2837,9 @@ void dMenu_Fmap2DTop_c::setHIO(bool param_0) { } } -/* 801D8088-801D810C 1D29C8 0084+00 1/1 3/3 0/0 .text isWarpAccept__17dMenu_Fmap2DTop_cFv - */ +/* 801D8088-801D810C 1D29C8 0084+00 1/1 3/3 0/0 .text isWarpAccept__17dMenu_Fmap2DTop_cFv */ bool dMenu_Fmap2DTop_c::isWarpAccept() { + /* dSv_event_flag_c::M_021 - Main Event - First portal warp */ if ((dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[54]) && dMeter2Info_getMapStatus() != 9 && dMeter2Info_getMapStatus() != 7 && dMeter2Info_getMapStatus() != 8) || g_fmapHIO.mPortalWarpON) @@ -2844,4 +2847,4 @@ bool dMenu_Fmap2DTop_c::isWarpAccept() { return true; } return false; -}
\ No newline at end of file +} |