diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 2973f2fbd..bd4fd9a40 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -326,7 +326,7 @@ static BOOL daBoomerang_Draw(daBoomerang_c* i_this) { /* 800E19B8-800E1A14 .text getFlyMax__13daBoomerang_cFv */ float daBoomerang_c::getFlyMax() { - if (dComIfGp_checkPlayerStatus0(0, 0x10000) != 0) { + if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { return 5000.0f; } diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 3ee5e65b9..efd8adcfe 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -1400,7 +1400,7 @@ void daBemos_c::guard_proc() { local_4C += local_58; local_4C += local_64; - if (dComIfGp_checkPlayerStatus1(0, 0x20)) { + if (dComIfGp_checkPlayerStatus1(0, daPyStts1_DEKU_LEAF_FLY_e)) { local_4C.y -= 50.0f; mCyl.SetC(local_4C); mCyl.SetR(l_HIO.m44); diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index c9e1acc97..c07a0292a 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -563,7 +563,7 @@ BOOL daPy_lk_c::procTactPlay_init(s32 r27, int r30, int r31) { /* 8014EBA0-8014EFD4 .text procTactPlay__9daPy_lk_cFv */ BOOL daPy_lk_c::procTactPlay() { - if (dComIfGp_checkPlayerStatus0(0, daPyStts1_UNK10000_e)) { + if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { setShipRidePos(1); shape_angle.y -= 0x4000; } @@ -635,7 +635,7 @@ BOOL daPy_lk_c::procTactPlay() { } m3624 = 0x14A6; } else if (mProcVar0.m3570 == 2) { - if (checkNpcStatus() && !dComIfGp_checkPlayerStatus0(0, daPyStts1_UNK10000_e)) { + if (checkNpcStatus() && !dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { return procTactPlayEnd_init(mProcVar0.m3570); } m3624 = 0x14A8; @@ -705,7 +705,7 @@ BOOL daPy_lk_c::procTactPlayEnd_init(int r30) { /* 8014F210-8014F4DC .text procTactPlayEnd__9daPy_lk_cFv */ BOOL daPy_lk_c::procTactPlayEnd() { - if (dComIfGp_checkPlayerStatus0(0, daPyStts1_UNK10000_e)) { + if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { setShipRidePos(0); if (mProcVar0.m3570 == 0 && !dComIfGp_evmng_startCheck(l_tact_wind_change_event_label) && !dComIfGp_evmng_startCheck(l_tact_wind_change_event_label2)) diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index c994fd267..5c970d9c8 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -242,7 +242,7 @@ void daSalvage_c::checkOrder() { /* 00000C58-00000D64 .text eventOrder__11daSalvage_cFv */ void daSalvage_c::eventOrder() { - if (dComIfGp_checkPlayerStatus0(0, 0x10000)) { + if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { if (m2E9 == 2) { fopAcM_orderOtherEventId(this, mSalvageGetItemEventIdx, 0xff, 0xffff, 0, 1); eventInfo.onCondition(2); diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index 88a3d7c0f..ac0a1b6e5 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -406,7 +406,7 @@ BOOL daWarphr_c::check_warp() { daPy_py_c* player = daPy_getPlayerActorClass(); f32 abs = (player->current.pos - current.pos).absXZ(); - if (dComIfGp_checkPlayerStatus0(0, 0x10000)) { + if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { daShip_c* ship = dComIfGp_getShipActor(); if (ship != NULL) { f32 abs = (ship->current.pos - current.pos).absXZ(); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 49d27c8e5..580f31979 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -2954,7 +2954,7 @@ bool dCamera_c::followCamera(s32 param_1) { fVar37 = mpPlayerActor->current.pos.y; fVar37 -= groundHeight(&player_pos); - if (m360 && (check_owner_action(mPadId, daPyStts0_SWIM_e) || daNpc_kam_c::m_hyoi_kamome == 0 || check_owner_action(mPadId, 0x200))) { + if (m360 && (check_owner_action(mPadId, daPyStts0_SWIM_e) || daNpc_kam_c::m_hyoi_kamome == 0 || check_owner_action(mPadId, daPyStts0_UNK200_e))) { if (mWork.follow.m388 < 0x50) { mWork.follow.m388++; local_158.x = 176.0f; @@ -3085,7 +3085,10 @@ bool dCamera_c::followCamera(s32 param_1) { mWork.follow.m3B8 *= 0.1f; } - if (check_owner_action(mPadId, daPyStts0_UNK2000000_e | daPyStts0_UNK100_e) || check_owner_action1(mPadId, check_owner_action1(mPadId, daPyStts1_UNK10000_e))) { + if ( + check_owner_action(mPadId, daPyStts0_UNK2000000_e | daPyStts0_UNK100_e) || + check_owner_action1(mPadId, check_owner_action1(mPadId, daPyStts1_UNK10000_e)) + ) { if (mWork.follow.m38C == 0) { if (local_4ac > cSAngle::_270 && local_4ac < cSAngle::_90) { mWork.follow.m38C = 1; @@ -3917,7 +3920,7 @@ bool dCamera_c::subjectCamera(s32 param_1) { if (dComIfGp_getMiniGameType() == 3) { mWork.subject.m3C0 = 2; - } else if (dComIfGp_checkPlayerStatus0(mPadId, 0x2000) == 0 && (mCamParam.Flag(param_1, 0x10) == 0)) { + } else if (dComIfGp_checkPlayerStatus0(mPadId, daPyStts0_UNK2000_e) == 0 && (mCamParam.Flag(param_1, 0x10) == 0)) { mWork.subject.m3C0 = 1; }