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/actor/d_a_npc_the.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/actor/d_a_npc_the.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_the.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 2800560afc..ca1a7d50e1 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -1183,8 +1183,11 @@ cPhs__Step daNpcThe_c::create() { mFlowID = -1; } - if (mType == TYPE_KAKARIKO && (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68]) - || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[78]))) { + if (mType == TYPE_KAKARIKO + /* dSv_event_flag_c::M_035 - Cutscene - [cutscene: 35] after carriage guarding event */ + && (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68]) + /* dSv_event_flag_c::M_045 - Lakebed Temple - Lakebed Temple clear */ + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[78]))) { return cPhs_ERROR_e; } @@ -1431,6 +1434,7 @@ BOOL daNpcThe_c::doEvent() { dEvent_manager_c& event_manager = dComIfGp_getEventManager(); if (eventInfo.checkCommandTalk()) { if (mTwilight) { + /* dSv_event_flag_c::F_0277 - Castle Town - Hear conversation between Telma and Ilia in Telma's shop (Twilight) */ if (daNpcF_chkEvtBit(0x115)) { mOrderEvtNo = 2; } else { |