summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_e_warpappear.cpp
diff options
context:
space:
mode:
authorCarco_21 <144170194+carter-ktb21@users.noreply.github.com>2025-08-08 14:39:26 -0400
committerGitHub <noreply@github.com>2025-08-08 21:39:26 +0300
commite0b1fe92b1e79b5b93e8a3df6ee56e5771e80915 (patch)
tree6a34a131100ef6c58171b7a1e9e4e1be0e65fb18 /src/d/actor/d_a_e_warpappear.cpp
parent9fbbec4326a5fcc9443e219415386da36b8ec5e8 (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_e_warpappear.cpp')
-rw-r--r--src/d/actor/d_a_e_warpappear.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp
index 8b71e1b7ca..1f6460d14e 100644
--- a/src/d/actor/d_a_e_warpappear.cpp
+++ b/src/d/actor/d_a_e_warpappear.cpp
@@ -216,8 +216,9 @@ static void action(e_warpappear_class* i_this) {
fpcM_Search(s_s1entry_sub, i_this);
}
- if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x40]) &&
- dComIfGs_isSwitch(18, fopAcM_GetRoomNo(a_this)))
+ /* dSv_event_flag_c::M_031 - Goron Mines - Goron Mines clear */
+ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x40])
+ && dComIfGs_isSwitch(18, fopAcM_GetRoomNo(a_this)))
{
i_this->field_0x596 = 1;
i_this->field_0x59e = 20;
@@ -510,6 +511,7 @@ static void demo_camera(e_warpappear_class* i_this) {
daPy_getPlayerActorClass()->cancelOriginalDemo();
fopAcM_delete(i_this);
fpcM_Search(s_s1fight_sub, i_this);
+ /* dSv_event_flag_c::F_0053 - Faron Woods - Saw night stalker appearance cutscene */
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[151]);
}
break;
@@ -881,6 +883,7 @@ static int daE_Warpappear_Create(fopAc_ac_c* actor) {
i_this->field_0x570 = fopAcM_GetParam(i_this);
if (i_this->field_0x570 != 53) {
if (i_this->field_0x570 == 0xff) {
+ /* dSv_event_flag_c::F_0053 - Faron Woods - Saw night stalker appearance cutscene */
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x97])) {
return cPhs_ERROR_e;
}