From ce8d17ec0835c9679e54dc7a6700c042825352f9 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 20 Apr 2025 20:06:40 -0400 Subject: [PATCH] Add an enum for action button icon status --- include/d/actor/d_a_player_main.h | 2 +- include/d/d_com_inf_game.h | 69 ++++++++- include/d/d_resorce.h | 4 +- .../JStudio/JStudio_JStage/object-actor.cpp | 2 +- src/d/actor/d_a_auction.cpp | 18 +-- src/d/actor/d_a_fganon.cpp | 8 +- src/d/actor/d_a_leaflift.cpp | 4 +- src/d/actor/d_a_npc_bs1.cpp | 36 ++--- src/d/actor/d_a_npc_ji1.cpp | 4 +- src/d/actor/d_a_npc_kamome.cpp | 6 +- src/d/actor/d_a_npc_md.cpp | 20 +-- src/d/actor/d_a_npc_os.cpp | 6 +- src/d/actor/d_a_obj_barrel.cpp | 10 +- src/d/actor/d_a_obj_figure.cpp | 8 +- src/d/actor/d_a_obj_iceisland.cpp | 6 +- src/d/actor/d_a_player_battle.inc | 4 +- src/d/actor/d_a_player_boomerang.inc | 2 +- src/d/actor/d_a_player_bow.inc | 6 +- src/d/actor/d_a_player_climb.inc | 8 +- src/d/actor/d_a_player_crawl.inc | 2 +- src/d/actor/d_a_player_fan.inc | 2 +- src/d/actor/d_a_player_grab.inc | 24 +-- src/d/actor/d_a_player_hang.inc | 2 +- src/d/actor/d_a_player_hook.inc | 2 +- src/d/actor/d_a_player_ladder.inc | 6 +- src/d/actor/d_a_player_main.cpp | 30 ++-- src/d/actor/d_a_player_pushpull.inc | 6 +- src/d/actor/d_a_player_rope.inc | 14 +- src/d/actor/d_a_player_ship.inc | 36 ++--- src/d/actor/d_a_player_swim.inc | 2 +- src/d/actor/d_a_player_sword.inc | 28 ++-- src/d/actor/d_a_player_tact.inc | 8 +- src/d/actor/d_a_player_whide.inc | 6 +- src/d/actor/d_a_ship.cpp | 6 +- src/d/d_camera.cpp | 2 +- src/d/d_meter.cpp | 139 +++++++++--------- src/m_Do/m_Do_MemCardRWmng.cpp | 2 +- 37 files changed, 303 insertions(+), 237 deletions(-) diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index a8a8fb611..99e886e38 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -1819,7 +1819,7 @@ public: BOOL itemTriggerZ() const { return mItemTrigger & BTN_Z; } BOOL spLTrigger() const { return mItemTrigger & BTN_L; } BOOL spActionTrigger() const { return mItemTrigger & BTN_R; } - void allTrigger() const {} + BOOL allTrigger() const { return mItemTrigger & (BTN_A | BTN_B | BTN_X | BTN_Y | BTN_Z); } void otherWeaponTrigger() const {} BOOL checkPlayerDemoMode() const { return mDemo.getDemoType(); } diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 7d0ee06d4..2765df7a6 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -2592,6 +2592,73 @@ inline void dComIfGp_endMiniGame(u16 i_gameType) { g_dComIfG_gameInfo.play.endMiniGame(i_gameType); } +enum dActionStatus_e { + /* 0x00 */ dActStts_BLANK_e, + /* 0x01 */ dActStts_LOOK_e, // "Look" + /* 0x02 */ dActStts_SPEAK_e, // "Speak" + /* 0x03 */ dActStts_CHARTS_e, // "Charts" + /* 0x04 */ dActStts_LIFT_e, // "Lift" + /* 0x05 */ dActStts_CLIMB_e, // "Climb" + /* 0x06 */ dActStts_LET_GO_e, // "Let Go" + /* 0x07 */ dActStts_RETURN_e, // "Return" + /* 0x08 */ dActStts_PUT_AWAY_e, // "Put Away" + /* 0x09 */ dActStts_DROP_e, // "Drop" + /* 0x0A */ dActStts_CHECK_e, // "Check" + /* 0x0B */ dActStts_OPEN_e, // "Open" + /* 0x0C */ dActStts_ATTACK_e, // "Attack" + /* 0x0D */ dActStts_ba_osu, // "おす" + /* 0x0E */ dActStts_THROW_e, // "Throw" + /* 0x0F */ dActStts_CROUCH_e, // "Crouch" + /* 0x10 */ dActStts_SIDLE_e, // "Sidle" + /* 0x11 */ dActStts_GRAB_e, // "Grab" + /* 0x12 */ dActStts_JUMP_e, // "Jump" + /* 0x13 */ dActStts_STOP_e, // "Stop" + /* 0x14 */ dActStts_ba_haru, // "はる" + /* 0x15 */ dActStts_ba_tatamu, // "たたむ" + /* 0x16 */ dActStts_LET_GO_ROPE_e, // "Let Go" + /* 0x17 */ dActStts_CHOOSE_e, // "Choose" + /* 0x18 */ dActStts_ba_kogu, // "こぐ" + /* 0x19 */ dActStts_NEXT_e, // "Next" + /* 0x1A */ dActStts_PARRY_e, + /* 0x1B */ dActStts_PICK_UP_e, // "Pick Up" + /* 0x1C */ dActStts_GET_IN_SHIP_e, // "Get In" + /* 0x1D */ dActStts_GET_OUT_SHIP_e, // "Get Out" + /* 0x1E */ dActStts_ba_save, // "セーブ" + /* 0x1F */ dActStts_ba_option, // "オプション" + /* 0x20 */ dActStts_TAKE_PHOTO_e, // "Take Photo" + /* 0x21 */ dActStts_INFO_e, // "Info" + /* 0x22 */ dActStts_SWAP_MODES_e, // "Swap Modes" + /* 0x23 */ dActStts_FLY_e, // "Fly" + /* 0x24 */ dActStts_CALL_e, // "Call" + /* 0x25 */ dActStts_BID_e, // "Bid" + /* 0x26 */ dActStts_READ_e, // "Read" + /* 0x27 */ dActStts_CANCEL_e, // "Cancel" + /* 0x28 */ dActStts_ba_kakudai, // "拡大" + /* 0x29 */ dActStts_ba_hikaku, // "ひかく" + /* 0x2A */ dActStts_ba_zoom01, // "Zoom 1" + /* 0x2B */ dActStts_ba_zoom02, // "Zoom 2" + /* 0x2C */ dActStts_CRUISE_e, // "Cruise" + /* 0x2D */ dActStts_ba_nageru__dupe_2D, // TODO: special case + /* 0x2E */ dActStts_ba_motu__dupe_2E, // TODO: special case, use medlis' harp to reflect light? + /* 0x2F */ dActStts_SWING_e, // "Swing" + /* 0x30 */ dActStts_SEA_CHART_e, // "Sea Chart" + /* 0x31 */ dActStts_ba_sake__dupe_31, // TODO: special case + /* 0x32 */ dActStts_ba_modoru__dupe_32, // TODO + /* 0x33 */ dActStts_ba_save__dupe_33, // TODO + /* 0x34 */ dActStts_ba_save__dupe_34, // TODO + /* 0x35 */ dActStts_sword_01, // TODO + /* 0x36 */ dActStts_DEFEND_e, // "Defend" + /* 0x37 */ dActStts_boko_stick, // TODO + /* 0x38 */ dActStts_hatchet, // TODO + /* 0x39 */ dActStts_iron_club, // TODO + /* 0x3A */ dActStts_longsword, // TODO + /* 0x3B */ dActStts_spear, // TODO + /* 0x3C */ dActStts_spear__dupe_3C, // TODO + /* 0x3D */ dActStts_bow_01, // TODO + /* 0x3E */ dActStts_HIDDEN_e, // Hides the entire button itself, not just the text on the button + /* 0x43 */ dActStts_UNK43 = 0x43, // TODO +}; + // R Button inline u8 dComIfGp_getRStatus() { return g_dComIfG_gameInfo.play.getRStatus(); @@ -2787,7 +2854,7 @@ inline void dComIfGp_setMesgCameraTagInfo(int id) { } inline void dComIfGp_setMesgCameraAttrInfo(int param_1) { - g_dComIfG_gameInfo.play.setMesgCamInfoBasicID(param_1); + g_dComIfG_gameInfo.play.setMesgCamInfoBasicID(param_1); } inline dComIfG_MesgCamInfo_c* dComIfGp_getMesgCameraInfo() { diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 6904e8e6d..e61d328fc 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -33,8 +33,8 @@ public: } // Debug only - u64 dump(char*, dRes_info_c*, int) {} - u64 getSize() {} + void dump(char*, dRes_info_c*, int) {} + void getSize() {} private: /* 0x00 */ char mArchiveName[14]; diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp index a550672a3..e4699d9c2 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -10,7 +10,7 @@ namespace JStudio_JStage { /* 80276264-80276318 .text __ct__Q214JStudio_JStage14TAdaptor_actorFPCQ26JStage7TSystemPQ26JStage6TActor */ TAdaptor_actor::TAdaptor_actor(const JStage::TSystem* system, JStage::TActor* actor) - : JStudio::TAdaptor_actor() + : JStudio::TAdaptor_actor() , mSystem(system) , mObject(actor) , m12C(NULL) diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index d7fd4988d..42c1d411c 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -697,8 +697,8 @@ bool daAuction_c::eventStart() { } } - dComIfGp_setDoStatusForce(0x3E); - dComIfGp_setAStatusForce(0x3E); + dComIfGp_setDoStatusForce(dActStts_HIDDEN_e); + dComIfGp_setAStatusForce(dActStts_HIDDEN_e); return mpTimer != NULL; } @@ -991,8 +991,8 @@ void daAuction_c::eventMainKai() { } } - dComIfGp_setDoStatusForce(0x25); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_BID_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); } /* 000022A8-00002760 .text eventMainUri__11daAuction_cFv */ @@ -1092,7 +1092,7 @@ void daAuction_c::eventMainUri() { } if (m82E != 0) { - dComIfGp_setDoStatusForce(0x25); + dComIfGp_setDoStatusForce(dActStts_BID_e); } } @@ -1178,8 +1178,8 @@ void daAuction_c::eventMainMsgBikonC() { eyePos = getNpcActorP(m827)->eyePos; } - dComIfGp_setDoStatusForce(0); - dComIfGp_setAStatusForce(0x3E); + dComIfGp_setDoStatusForce(dActStts_BLANK_e); + dComIfGp_setAStatusForce(dActStts_HIDDEN_e); } /* 00002B90-00002C1C .text eventMainMsgBikonW__11daAuction_cFv */ @@ -1196,8 +1196,8 @@ void daAuction_c::eventMainMsgBikonW() { } } - dComIfGp_setDoStatusForce(0); - dComIfGp_setAStatusForce(0x3E); + dComIfGp_setDoStatusForce(dActStts_BLANK_e); + dComIfGp_setAStatusForce(dActStts_HIDDEN_e); } /* 00002C1C-00002D4C .text eventGetItemInit__11daAuction_cFv */ diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index e92539e92..04c948f34 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -174,7 +174,7 @@ void fly_se_set(fganon_class* i_this) { cXyz local_34 = i_this->current.pos - i_this->old.pos; uint uVar2 = (uint)(local_34.abs() * 3.5f); if (uVar2 > 100) { - uVar2 = 100; + uVar2 = 100; } fopAcM_seStart(i_this, JA_SE_CM_PG_FLYING, uVar2); } @@ -333,8 +333,8 @@ void shot(fganon_class* i_this) { pos_move(i_this, 0); fly_se_set(i_this); if ((i_this->m388 >= 2) && (i_this->m408 == 0)) { - i_this->m386 = 5; - i_this->m388 = 0; + i_this->m386 = 5; + i_this->m388 = 0; } if ((i_this->m388 == 3) || (i_this->m388 == 4)) { mDoAud_monsSeStart(JA_SE_OBJ_PG_EBALL_FLY_S, &i_this->m3E0, 100, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); @@ -2295,7 +2295,7 @@ void energy_ball_move(fganon_class* i_this) { local_5c = a_this->home.pos - i_this->m3E0; if (local_5c.abs() > 10000.0f) { - i_this->m408 = 35; + i_this->m408 = 35; } } diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index 151dd36df..707755006 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -247,7 +247,7 @@ bool daLlift_c::_execute() { mTargetRotation = ZeroQuat; if (distXZ > 270.0f) { mbIsDescending = TRUE; - } + } } MoveDownLift(); set_mtx(); @@ -290,7 +290,7 @@ BOOL daLlift_c::MoveDownLift() { float maxSpeed = m_max_speed; float minSpeed = m_min_speed; if (!mbIsDescending) { - return TRUE; + return TRUE; } float downVel = cLib_addCalc(¤t.pos.y, home.pos.y, 0.1f, maxSpeed, minSpeed); if (downVel == 0.0f) { diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 3e7565f37..80c5ba201 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -638,8 +638,8 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { break; } - dComIfGp_setDoStatusForce(0x17); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_CHOOSE_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); *pMsgNo = 0x2F6C; break; @@ -695,8 +695,8 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { break; } - dComIfGp_setDoStatusForce(0x17); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_CHOOSE_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); msgStatus = fopMsgStts_MSG_DISPLAYED_e; break; case 0x2F47: @@ -705,8 +705,8 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { break; } - dComIfGp_setDoStatusForce(0x17); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_CHOOSE_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); msgStatus = fopMsgStts_MSG_DISPLAYED_e; break; case 0xF3F: @@ -732,8 +732,8 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { break; } - dComIfGp_setDoStatusForce(0x17); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_CHOOSE_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); msgStatus = fopMsgStts_MSG_DISPLAYED_e; break; case 0x2F78: @@ -742,8 +742,8 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { break; } - dComIfGp_setDoStatusForce(0x17); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_CHOOSE_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); msgStatus = fopMsgStts_MSG_DISPLAYED_e; break; case 0xF42: @@ -769,8 +769,8 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { break; } - dComIfGp_setDoStatusForce(0x17); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_CHOOSE_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); *pMsgNo = mShopItems.getSelectItemBuyMsg(); break; case 0x2F4A: @@ -784,8 +784,8 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { break; } - dComIfGp_setDoStatusForce(0x17); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_CHOOSE_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); *pMsgNo = mShopItems.getSelectItemBuyMsg(); break; case 0xF45: @@ -1703,12 +1703,12 @@ bool daNpc_Bs1_c::talk01() { } else { if (shopMsgCheck(m738) && status == 8) { if (mShopItems.getSelectItemBuyMsg() == m738) { - dComIfGp_setDoStatusForce(0x17); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_CHOOSE_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); } } else if (status == 8 && checkBeastItemSellMsg(m738)) { - dComIfGp_setDoStatusForce(0x17); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_CHOOSE_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); } } return mpMorf->isMorf(); diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 09940ab58..10b9f223e 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -266,7 +266,7 @@ static void daJi1_AtHitCallback(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc /* 000004A0-000004CC .text isGuardAnim__11daNpc_Ji1_cFv */ BOOL daNpc_Ji1_c::isGuardAnim() { - if(field_0xD64 >= 8 && field_0xD64 <= 10 || field_0xD64 == 0xF) { + if((field_0xD64 >= 8 && field_0xD64 <= 10) || field_0xD64 == 0xF) { return true; } @@ -356,7 +356,7 @@ static BOOL daNpc_Ji1_plRoomOutCheck() { static cXyz out_chk_pos(0.0f, 0.0f, 500.0f); cXyz temp = plyrPos - out_chk_pos; - if(temp.absXZ() < 100.0f && dComIfGp_getDoStatus() == 0xB) { + if(temp.absXZ() < 100.0f && dComIfGp_getDoStatus() == dActStts_OPEN_e) { return true; } diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index ec4fbf20c..316c11616 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -470,9 +470,9 @@ void daNpc_kam_c::playerAction(void* arg) { setPlayerAction(&daNpc_kam_c::waitPlayerAction, NULL); } - dComIfGp_setRStatusForce(0x07); // Show "Return" on the R button - dComIfGp_setDoStatus(0x23); // Show "Fly" on the A button - dComIfGp_setAStatus(0x3E); // Do not display the B button icon at all + dComIfGp_setRStatusForce(dActStts_RETURN_e); + dComIfGp_setDoStatus(dActStts_FLY_e); + dComIfGp_setAStatus(dActStts_HIDDEN_e); (this->*mCurrPlayerActionFunc)(arg); } diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index d672ad402..3682f3afa 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -942,25 +942,25 @@ void daNpc_Md_c::playerAction(void* arg) { } if (mAcch.ChkGroundHit() && isOldLightBodyHit()) { - dComIfGp_setRStatusForce(0x07); // Show "Return" on the R button + dComIfGp_setRStatusForce(dActStts_RETURN_e); if (chkPlayerAction(&daNpc_Md_c::mkamaePlayerAction)) { - dComIfGp_setDoStatus(0x00); // Show the A button without anything on it - dComIfGp_setAStatus(0x08); // TODO + dComIfGp_setDoStatus(dActStts_BLANK_e); + dComIfGp_setAStatus(dActStts_PUT_AWAY_e); } else { - dComIfGp_setDoStatus(0x2E); // TODO - dComIfGp_setAStatus(0x3E); // Do not display the B button icon at all + dComIfGp_setDoStatus(dActStts_ba_motu__dupe_2E); + dComIfGp_setAStatus(dActStts_HIDDEN_e); if (!m3140) { dComIfGp_getVibration().StartShock(4, -0x21, cXyz(0.0f, 1.0f, 0.0f)); } } } else { - dComIfGp_setDoStatus(0x23); // Show "Fly" on the A button + dComIfGp_setDoStatus(dActStts_FLY_e); if (chkPlayerAction(&daNpc_Md_c::flyPlayerAction)) { - dComIfGp_setRStatusForce(0x3E); // TODO - dComIfGp_setAStatus(0x06); // Show "Let Go" on the B button icon + dComIfGp_setRStatusForce(dActStts_HIDDEN_e); + dComIfGp_setAStatus(dActStts_LET_GO_e); } else { - dComIfGp_setRStatusForce(0x07); // Show "Return" on the R button - dComIfGp_setAStatus(0x3E); // Do not display the B button icon at all + dComIfGp_setRStatusForce(dActStts_RETURN_e); + dComIfGp_setAStatus(dActStts_HIDDEN_e); } } diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 342203d5d..602c5983f 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -593,9 +593,9 @@ void daNpc_Os_c::playerAction(void* param_1) { setPlayerAction(&daNpc_Os_c::waitPlayerAction, 0); } - dComIfGp_setRStatusForce(7); - dComIfGp_setDoStatus(0x3E); - dComIfGp_setAStatus(0x3E); + dComIfGp_setRStatusForce(dActStts_RETURN_e); + dComIfGp_setDoStatus(dActStts_HIDDEN_e); + dComIfGp_setAStatus(dActStts_HIDDEN_e); (this->*mPlayerAction)(param_1); } diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index 941736810..048cae3eb 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/src/d/actor/d_a_obj_barrel.cpp @@ -254,10 +254,10 @@ void daObjBarrel::Act_c::mode_vib1_init() { /* 00000B74-00000BB8 .text mode_vib1__Q211daObjBarrel5Act_cFv */ void daObjBarrel::Act_c::mode_vib1() { - vib_pos_ang(); - if (--mTimer <= 0) { - mode_vib2_init(); - } + vib_pos_ang(); + if (--mTimer <= 0) { + mode_vib2_init(); + } } /* 00000BB8-00000BDC .text mode_vib2_init__Q211daObjBarrel5Act_cFv */ @@ -453,7 +453,7 @@ void daObjBarrel::Act_c::set_walk_rot() { targetAngle += 0x8000; negAngle = true; } - if (mag > l_min_move_dir || mMode == MODE_WAIT && mag > l_min_move_dir / 2) { + if (mag > l_min_move_dir || (mMode == MODE_WAIT && mag > l_min_move_dir / 2)) { cLib_chaseAngleS(&shape_angle.y, targetAngle, 0x600); } float fVar2 = mag / ((cM_scos(shape_angle.z) * 5.0f + l_s_radius) * 6.28f) * 65535.0f; diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index b7f956e28..8d7838920 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -1244,8 +1244,8 @@ bool daObjFigure_c::eventMesSet() { m73A--; } else { - dComIfGp_setDoStatusForce(0x21); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_INFO_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); if(g_mDoCPd_cpadInfo[0].mMainStickPosX || g_mDoCPd_cpadInfo[0].mMainStickPosY || g_mDoCPd_cpadInfo[0].mCStickPosY) { m738 = l_figure_check_tbl[0].field_0x32; m734 += (s16)(g_mDoCPd_cpadInfo[0].mMainStickPosX * l_figure_check_tbl[0].field_0x2C); @@ -1275,8 +1275,8 @@ bool daObjFigure_c::eventMesSet() { } } - dComIfGp_setDoStatusForce(0x21); - dComIfGp_setAStatusForce(0x27); + dComIfGp_setDoStatusForce(dActStts_INFO_e); + dComIfGp_setAStatusForce(dActStts_CANCEL_e); if(CPad_CHECK_TRIG_B(0)) { m732 = 0; m734 = 0; diff --git a/src/d/actor/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp index b738551e7..d2a4d7284 100644 --- a/src/d/actor/d_a_obj_iceisland.cpp +++ b/src/d/actor/d_a_obj_iceisland.cpp @@ -135,10 +135,10 @@ void daObjIceisland_c::daObjIceisland_freeze_demo_wait() { daObjIceisland_particle_set(); mBrkAnm.setPlaySpeed(-1.0f); field_0x39C = 5; - } - else { + } + else { fopAcM_orderOtherEventId(this, mFreezeIceEventIdx, 0xffff); - } + } } /* 000008C0-00000928 .text daObjIceisland_freeze_demo__16daObjIceisland_cFv */ diff --git a/src/d/actor/d_a_player_battle.inc b/src/d/actor/d_a_player_battle.inc index 88f0a42ec..a45657fa0 100644 --- a/src/d/actor/d_a_player_battle.inc +++ b/src/d/actor/d_a_player_battle.inc @@ -47,13 +47,13 @@ void daPy_lk_c::setSpecialBattle(BOOL param_0) { enemy->getBtNowFrame() < enemy->getBtEndFrame() && enemy->getBtMaxDis() > fopAcM_searchActorDistanceXZ(this, enemy)) { - dComIfGp_setDoStatus(0x1a); + dComIfGp_setDoStatus(dActStts_PARRY_e); } } /* 8013E384-8013E454 .text changeSpecialBattle__9daPy_lk_cFv */ BOOL daPy_lk_c::changeSpecialBattle() { - if (mpAttnActorLockOn != NULL && (dComIfGp_getDoStatus() == 26 || (m34C5 == 5))) { + if (mpAttnActorLockOn != NULL && (dComIfGp_getDoStatus() == dActStts_PARRY_e || (m34C5 == 5))) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)mpAttnActorLockOn; if (m34C5 == 5 || (spBattleTrigger() && enemy->getBtStartFrame() <= enemy->getBtNowFrame())) { if (enemy->getBtAttackType() == 1) { diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc index d15609cb8..5ee1a5914 100644 --- a/src/d/actor/d_a_player_boomerang.inc +++ b/src/d/actor/d_a_player_boomerang.inc @@ -170,7 +170,7 @@ BOOL daPy_lk_c::procBoomerangSubject() { } if (checkBoomerangReadyAnime()) { - dComIfGp_setDoStatus(7); + dComIfGp_setDoStatus(dActStts_RETURN_e); } setShapeAngleToAtnActor(); diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index db09061ed..42298f7da 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -142,7 +142,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() { m355C = 1; } else if (daArrow_c::changeArrowMp()) { if (mEquipItem != dItem_BOW_e) { - dComIfGp_setRStatus(0x22); + dComIfGp_setRStatus(dActStts_SWAP_MODES_e); if (spActionTrigger() && arrow != NULL) { mActorKeepEquip.setData(arrow->changeArrowType()); setBowReloadAnime(); @@ -169,7 +169,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() { } } else if (daArrow_c::changeArrowMp()) { if (mEquipItem != dItem_BOW_e) { - dComIfGp_setRStatus(0x22); + dComIfGp_setRStatus(dActStts_SWAP_MODES_e); if (spActionTrigger()) { daArrow_c::changeArrowTypeNotReady(); } @@ -245,7 +245,7 @@ BOOL daPy_lk_c::procBowSubject_init() { /* 8014A8D4-8014A974 .text procBowSubject__9daPy_lk_cFv */ BOOL daPy_lk_c::procBowSubject() { - dComIfGp_setDoStatus(7); + dComIfGp_setDoStatus(dActStts_RETURN_e); if (mpAttention->Lockon()) { setSpeedAndAngleAtn(); diff --git a/src/d/actor/d_a_player_climb.inc b/src/d/actor/d_a_player_climb.inc index be4c436d5..571b29e22 100644 --- a/src/d/actor/d_a_player_climb.inc +++ b/src/d/actor/d_a_player_climb.inc @@ -256,7 +256,7 @@ BOOL daPy_lk_c::procClimbUpStart() { J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; m34C2 = 5; if (frameCtrl.getRate() < 0.01f) { - dComIfGp_setDoStatus(6); + dComIfGp_setDoStatus(dActStts_LET_GO_e); if (m34D4 == 0) { setLadderFootSe(); m34D4 = 1; @@ -305,7 +305,7 @@ BOOL daPy_lk_c::procClimbDownStart() { J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; m34C2 = 5; if (frameCtrl.getRate() < 0.01f) { - dComIfGp_setDoStatus(6); + dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { m34C2 = 0; procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); @@ -368,7 +368,7 @@ BOOL daPy_lk_c::procClimbMoveUpDown() { } m34C2 = 5; - dComIfGp_setDoStatus(6); + dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { m34C2 = 0; procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); @@ -437,7 +437,7 @@ BOOL daPy_lk_c::procClimbMoveSide() { } m34C2 = 5; - dComIfGp_setDoStatus(6); + dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { m34C2 = 0; procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc index a109c6d25..b544d82ae 100644 --- a/src/d/actor/d_a_player_crawl.inc +++ b/src/d/actor/d_a_player_crawl.inc @@ -310,7 +310,7 @@ BOOL daPy_lk_c::procCrawlAutoMove() { f32 fVar2; f32 fVar3; - dComIfGp_setRStatus(0xf); + dComIfGp_setRStatus(dActStts_CROUCH_e); J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; onResetFlg0(daPyRFlg0_UNK1000); s16 sVar4 = shape_angle.y; diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 8710074be..524e84583 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -417,7 +417,7 @@ BOOL daPy_lk_c::procFanGlide() { } } if (m34D2 == 0) { - dComIfGp_setDoStatus(0x27); + dComIfGp_setDoStatus(dActStts_CANCEL_e); } if ((m34D2 == 0 && (doTrigger() || cancelTrigger())) || (dComIfGs_getMagic() < 1 && m3574 == 0)) { m3688 = current.pos; diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index e591f43fb..9d0c6eb91 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -211,26 +211,26 @@ BOOL daPy_lk_c::checkNextActionGrab() { int iVar3 = checkGrabBarrelSearch(0); if (fopAcM_CheckStatus(grab_actor, fopAcStts_UNK10000_e) && !checkGrabSpecialHeavyState()) { - dComIfGp_setRStatus(14); - dComIfGp_setDoStatus(14); + dComIfGp_setRStatus(dActStts_THROW_e); + dComIfGp_setDoStatus(dActStts_THROW_e); } else { - dComIfGp_setRStatus(9); + dComIfGp_setRStatus(dActStts_DROP_e); } if (mpAttnActorLockOn == NULL && mpAttnEntryA != NULL && iVar3 == 0 && mpAttnEntryA->mType == fopAc_Attn_TYPE_DOOR_e && fopAcM_CheckStatus(grab_actor, fopAcStts_UNK2000000_e)) { - dComIfGp_setDoStatus(11); + dComIfGp_setDoStatus(dActStts_OPEN_e); } else if (iVar3 != 0) { - dComIfGp_setDoStatus(9); + dComIfGp_setDoStatus(dActStts_DROP_e); } else if (mpAttention->Lockon()) { int direction = getDirectionFromShapeAngle(); if (mStickDistance <= 0.05f || (mStickDistance > 0.05f && (direction == DIR_FORWARD || direction == DIR_BACKWARD))) { - dComIfGp_setDoStatus(14); + dComIfGp_setDoStatus(dActStts_THROW_e); } } else { - dComIfGp_setDoStatus(14); + dComIfGp_setDoStatus(dActStts_THROW_e); } if (setHintActor() && doTrigger()) { fopAcM_orderZHintEvent(this, dComIfGp_att_getZHint()); @@ -250,7 +250,7 @@ BOOL daPy_lk_c::checkNextActionGrab() { return procGrabThrow_init(0); } if (cancelTrigger() && checkSwordEquip() && iVar3 == 0) { - if (dComIfGp_getRStatus() == 14) { + if (dComIfGp_getRStatus() == dActStts_THROW_e) { return procGrabThrow_init(1); } freeGrabItem(); @@ -258,13 +258,13 @@ BOOL daPy_lk_c::checkNextActionGrab() { return true; } if (doTrigger() && !checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000)) && - dComIfGp_getDoStatus() == 11) + dComIfGp_getDoStatus() == dActStts_OPEN_e) { fopAcM_orderDoorEvent(this, mpAttnActorA); return true; } - if ((doTrigger() && dComIfGp_getDoStatus() == 14) || - (dComIfGp_getRStatus() == 14 && ((mItemTrigger & 0x1f) != 0 || spActionTrigger()))) + if ((doTrigger() && dComIfGp_getDoStatus() == dActStts_THROW_e) || + (dComIfGp_getRStatus() == dActStts_THROW_e && (allTrigger() || spActionTrigger()))) { if (cancelTrigger()) { return procGrabThrow_init(1); @@ -272,7 +272,7 @@ BOOL daPy_lk_c::checkNextActionGrab() { return procGrabThrow_init(0); } } - if ((((mItemTrigger & 0x1f) != 0) || spActionTrigger()) && (!doTrigger() || dComIfGp_getDoStatus() != 0)) { + if ((allTrigger() || spActionTrigger()) && (!doTrigger() || dComIfGp_getDoStatus() != dActStts_BLANK_e)) { return procGrabPut_init(); } else { return false; diff --git a/src/d/actor/d_a_player_hang.inc b/src/d/actor/d_a_player_hang.inc index 7a630e51d..1fa3fedc8 100644 --- a/src/d/actor/d_a_player_hang.inc +++ b/src/d/actor/d_a_player_hang.inc @@ -123,7 +123,7 @@ int daPy_lk_c::changeHangEndProc(int param_0) { return procLand_init(daPy_HIO_autoJump_c0::m.field_0x24, 0); } if (param_0 != 0) { - dComIfGp_setDoStatus(6); + dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { speed.y = 0.0f; return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index b733330cc..ebca8d154 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -219,7 +219,7 @@ BOOL daPy_lk_c::procHookshotSubject() { daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); if (hookshot->checkWait()) { - dComIfGp_setDoStatus(7); + dComIfGp_setDoStatus(dActStts_RETURN_e); } if (mpAttention->Lockon()) { diff --git a/src/d/actor/d_a_player_ladder.inc b/src/d/actor/d_a_player_ladder.inc index 207f67f2c..d4603dd6b 100644 --- a/src/d/actor/d_a_player_ladder.inc +++ b/src/d/actor/d_a_player_ladder.inc @@ -145,7 +145,7 @@ BOOL daPy_lk_c::procLadderUpStart() { J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; m34C2 = 5; if (frameCtrl.getRate() < 0.01f) { - dComIfGp_setDoStatus(6); + dComIfGp_setDoStatus(dActStts_LET_GO_e); if (m34D4 == 0) { setLadderFootSe(); m34D4 = 1; @@ -260,7 +260,7 @@ BOOL daPy_lk_c::procLadderDownStart() { J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; m34C2 = 5; if (frameCtrl.getRate() < 0.01f) { - dComIfGp_setDoStatus(6); + dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { m34C2 = 0; procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); @@ -373,7 +373,7 @@ BOOL daPy_lk_c::procLadderMove() { return true; } m34C2 = 5; - dComIfGp_setDoStatus(6); + dComIfGp_setDoStatus(dActStts_LET_GO_e); if (doTrigger()) { m34C2 = 0; diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 1ea118f12..15dbffa64 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -2019,7 +2019,7 @@ BOOL daPy_lk_c::checkItemChangeFromButton() { return TRUE; } } else if (doTrigger()) { - if (dComIfGp_getDoStatus() == 0x08) { // A button shows "Put Away" + if (dComIfGp_getDoStatus() == dActStts_PUT_AWAY_e) { setAnimeUnequip(); } } @@ -2034,12 +2034,12 @@ BOOL daPy_lk_c::checkItemChangeFromButton() { } else if (checkSetItemTrigger(dItem_FAIRY_BOTTLE_e, 0)) { return procBottleOpen_init(dItem_FAIRY_BOTTLE_e); } else if (doTrigger()) { - if (dComIfGp_getDoStatus() == 0x08) { // A button shows "Put Away" + if (dComIfGp_getDoStatus() == dActStts_PUT_AWAY_e) { setAnimeUnequip(); } } } else if (doTrigger()) { - if (dComIfGp_getDoStatus() == 0x08) { // A button shows "Put Away" + if (dComIfGp_getDoStatus() == dActStts_PUT_AWAY_e) { setAnimeUnequip(); } } @@ -3066,7 +3066,7 @@ BOOL daPy_lk_c::procSubjectivity_init(BOOL i_crouch) { /* 80112B18-80112BEC .text procSubjectivity__9daPy_lk_cFv */ BOOL daPy_lk_c::procSubjectivity() { - dComIfGp_setAStatus(7); // Show "Return" on the B button + dComIfGp_setAStatus(dActStts_RETURN_e); if( checkSubjectEnd(FALSE) || @@ -3432,7 +3432,7 @@ BOOL daPy_lk_c::procCrouchDefenseSlip_init() { /* 801142F4-801143D4 .text procCrouchDefenseSlip__9daPy_lk_cFv */ BOOL daPy_lk_c::procCrouchDefenseSlip() { - dComIfGp_setRStatus(0x36); + dComIfGp_setRStatus(dActStts_DEFEND_e); if (m34D0 > 0) { m34D0--; } @@ -5631,15 +5631,15 @@ BOOL daPy_lk_c::execute() { m35B4 = mStickDistance; m34EA = m34DC; - dComIfGp_setDoStatus(0); - dComIfGp_setRStatus(0); + dComIfGp_setDoStatus(dActStts_BLANK_e); + dComIfGp_setRStatus(dActStts_BLANK_e); if (mEquipItem == daPyItem_BOKO_e) { - dComIfGp_setAStatus(0x2F); + dComIfGp_setAStatus(dActStts_SWING_e); } else if (checkSwordEquip()) { - dComIfGp_setAStatus(0x35); + dComIfGp_setAStatus(dActStts_sword_01); } else { - dComIfGp_setAStatus(0x00); + dComIfGp_setAStatus(dActStts_BLANK_e); } mFrontWallType = 0; @@ -6021,14 +6021,14 @@ BOOL daPy_lk_c::execute() { offNoResetFlg1((daPy_FLG1)(daPyFlg1_NPC_CALL_COMMAND | daPyFlg1_VINE_CATCH)); if (dComIfGp_event_runCheck() || checkNoControll()) { - dComIfGp_setDoStatus(0); - dComIfGp_setRStatus(0); + dComIfGp_setDoStatus(dActStts_BLANK_e); + dComIfGp_setRStatus(dActStts_BLANK_e); } else { - if (dComIfGp_getDoStatus() == 0x43) { - dComIfGp_setDoStatus(0x12); + if (dComIfGp_getDoStatus() == dActStts_UNK43) { + dComIfGp_setDoStatus(dActStts_JUMP_e); } if (checkResetFlg0(daPyRFlg0_UNK10000000)) { - dComIfGp_setAStatus(0); + dComIfGp_setAStatus(dActStts_BLANK_e); } } offNoResetFlg1((daPy_FLG1)(daPyFlg1_UNK4 | daPyFlg1_FORCE_VOMIT_JUMP | daPyFlg1_FORCE_VOMIT_JUMP_SHORT | daPyFlg1_UNK10000000)); diff --git a/src/d/actor/d_a_player_pushpull.inc b/src/d/actor/d_a_player_pushpull.inc index c448a1029..7f1e6eb59 100644 --- a/src/d/actor/d_a_player_pushpull.inc +++ b/src/d/actor/d_a_player_pushpull.inc @@ -79,7 +79,7 @@ BOOL daPy_lk_c::procPushPullWait_init(int param_0) { /* 801517C0-8015198C .text procPushPullWait__9daPy_lk_cFv */ BOOL daPy_lk_c::procPushPullWait() { - dComIfGp_setRStatus(0x11); + dComIfGp_setRStatus(dActStts_GRAB_e); setFrontWallType(); if (m34D6 != 0) { if (checkNoUpperAnime()) { @@ -134,7 +134,7 @@ BOOL daPy_lk_c::procPushMove_init() { /* 80151A1C-80151B38 .text procPushMove__9daPy_lk_cFv */ BOOL daPy_lk_c::procPushMove() { - dComIfGp_setRStatus(0x11); + dComIfGp_setRStatus(dActStts_GRAB_e); int direction = getDirectionFromShapeAngle(); setFrontWallType(); if (!checkResetFlg0(daPyRFlg0_UNK8) || (!spActionButton() && !checkNoResetFlg0(daPyFlg0_PUSH_PULL_KEEP))) { @@ -177,7 +177,7 @@ BOOL daPy_lk_c::procPullMove_init() { /* 80151BC8-80151E40 .text procPullMove__9daPy_lk_cFv */ BOOL daPy_lk_c::procPullMove() { - dComIfGp_setRStatus(0x11); + dComIfGp_setRStatus(dActStts_GRAB_e); int direction = getDirectionFromShapeAngle(); setFrontWallType(); if (!checkResetFlg0(daPyRFlg0_UNK8) || (!spActionButton() && !checkNoResetFlg0(daPyFlg0_PUSH_PULL_KEEP))) { diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc index 89bd3134c..671643e57 100644 --- a/src/d/actor/d_a_player_rope.inc +++ b/src/d/actor/d_a_player_rope.inc @@ -69,7 +69,7 @@ int daPy_lk_c::changeRopeSwingProc() { /* 80142FC8-801430D4 .text changeRopeEndProc__9daPy_lk_cFi */ int daPy_lk_c::changeRopeEndProc(int param_0) { - dComIfGp_setDoStatus(0x16); + dComIfGp_setDoStatus(dActStts_LET_GO_ROPE_e); if (doTrigger() || cancelTrigger() || (!checkRopeTag() && itemTrigger())) { freeRopeItem(); voiceStart(6); @@ -282,7 +282,7 @@ BOOL daPy_lk_c::checkNextActionRopeReady() { return true; } } else if (!mpAttention->Lockon()) { - dComIfGp_setDoStatus(7); + dComIfGp_setDoStatus(dActStts_RETURN_e); } if (((itemButton()) && (mEquipItem == getReadyItem())) && (m355C == 0)) { m355E = 1; @@ -584,7 +584,7 @@ BOOL daPy_lk_c::procRopeSwing() { mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x28), &sp34); fopAc_ac_c* rope = mActorKeepRope.getActor(); mRopePos = rope->current.pos; - dComIfGp_setRStatus(0x13); + dComIfGp_setRStatus(dActStts_STOP_e); f32 f30 = (m35A8 * m35A4); f32 dVar13 = (m35AC * m35A4); mDoMtx_stack_c::ZrotS(-shape_angle.z); @@ -759,7 +759,7 @@ BOOL daPy_lk_c::procRopeHangWait() { s16 unaff_r29; float dVar4; - dComIfGp_setRStatus(0x13); + dComIfGp_setRStatus(dActStts_STOP_e); if (m34D0 > 0) { m34D0--; } @@ -913,7 +913,7 @@ BOOL daPy_lk_c::procRopeUp_init() { /* 80145DBC-80145F64 .text procRopeUp__9daPy_lk_cFv */ BOOL daPy_lk_c::procRopeUp() { - dComIfGp_setRStatus(0x13); + dComIfGp_setRStatus(dActStts_STOP_e); if (checkHangRopeActorNull()) { return true; } @@ -988,7 +988,7 @@ BOOL daPy_lk_c::procRopeDown_init() { /* 801460EC-80146240 .text procRopeDown__9daPy_lk_cFv */ BOOL daPy_lk_c::procRopeDown() { - dComIfGp_setRStatus(0x13); + dComIfGp_setRStatus(dActStts_STOP_e); if (checkHangRopeActorNull()) { return true; } @@ -1043,7 +1043,7 @@ BOOL daPy_lk_c::procRopeSwingStart_init() { /* 801463E8-80146610 .text procRopeSwingStart__9daPy_lk_cFv */ BOOL daPy_lk_c::procRopeSwingStart() { - dComIfGp_setRStatus(0x13); + dComIfGp_setRStatus(dActStts_STOP_e); cXyz local_28; local_28.set(0.0f, -m35A0, 0.0f); if (checkHangRopeActorNull()) { diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc index e7a9a3a43..a8aafe8f3 100644 --- a/src/d/actor/d_a_player_ship.inc +++ b/src/d/actor/d_a_player_ship.inc @@ -164,7 +164,7 @@ void daPy_lk_c::setShipRidePos(int param_0) { daShip_c* ship = dComIfGp_getShipActor(); if (ship != NULL) { if (ship->checkJumpOkFlg()) { - dComIfGp_setRStatus(0x12); + dComIfGp_setRStatus(dActStts_JUMP_e); } if (param_0 != 0) { shape_angle.y = ship->shape_angle.y; @@ -320,10 +320,10 @@ BOOL daPy_lk_c::changeShipEndProc() { m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_FREED) { if ((!dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e) && !spActionButton()) && - (dComIfGp_getDoStatus() == 0 && mCurProc == daPyProc_SHIP_PADDLE_e)) + (dComIfGp_getDoStatus() == dActStts_BLANK_e && mCurProc == daPyProc_SHIP_PADDLE_e)) { if (!ship->checkForceMove()) { - dComIfGp_setDoStatus(29); + dComIfGp_setDoStatus(dActStts_GET_OUT_SHIP_e); if (doTrigger()) { return procShipGetOff_init(); } @@ -333,9 +333,9 @@ BOOL daPy_lk_c::changeShipEndProc() { } } if (mCurProc != daPyProc_SHIP_SCOPE_e && !ship->getFlyFlg()) { - if (dComIfGp_getDoStatus() == 0) { + if (dComIfGp_getDoStatus() == dActStts_BLANK_e) { if (ship->getPart() == daShip_c::PART_STEER_e || ship->checkForceMove() || (ship->speedF < 3.0f && ship->getPart() != daShip_c::PART_WAIT_e)) { - dComIfGp_setDoStatus(8); + dComIfGp_setDoStatus(dActStts_PUT_AWAY_e); } } if (checkSetItemTrigger(NORMAL_SAIL, 1)) { @@ -432,7 +432,7 @@ BOOL daPy_lk_c::changeShipEndProc() { if (checkSetItemTrigger(daPyItem_ESA_e, 1)) { return procFoodThrow_init(); } - if (doTrigger() && dComIfGp_getDoStatus() == 8) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PUT_AWAY_e) { return procShipPaddle_init(); } } @@ -642,12 +642,12 @@ BOOL daPy_lk_c::procShipPaddle() { return true; } setShipRidePos(1); - dComIfGp_setRStatus(0x2c); - if (dComIfGp_getDoStatus() == 0 && dComIfGp_getShipActor()->speedF >= 3.0f) { - dComIfGp_setDoStatus(19); + dComIfGp_setRStatus(dActStts_CRUISE_e); + if (dComIfGp_getDoStatus() == dActStts_BLANK_e && dComIfGp_getShipActor()->speedF >= 3.0f) { + dComIfGp_setDoStatus(dActStts_STOP_e); } if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e)) { - dComIfGp_setAStatus(7); + dComIfGp_setAStatus(dActStts_RETURN_e); if (checkSubjectEnd(1)) { dComIfGp_clearPlayerStatus0(0, daPyStts0_UNK2000_e); } @@ -666,13 +666,13 @@ BOOL daPy_lk_c::procShipPaddle() { voiceStart(47); } } - if ((mStickDistance > 0.05f || dComIfGp_event_runCheck()) || dComIfGp_getDoStatus() != 29 || + if ((mStickDistance > 0.05f || dComIfGp_event_runCheck()) || dComIfGp_getDoStatus() != dActStts_GET_OUT_SHIP_e || ship->checkForceMove() || (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f)) { initShipBaseAnime(); m34D0 = cM_rndF(150.0f) + 300.0f; } - } else if (!dComIfGp_event_runCheck() && dComIfGp_getDoStatus() == 29 && mStickDistance <= 0.05f && + } else if (!dComIfGp_event_runCheck() && dComIfGp_getDoStatus() == dActStts_GET_OUT_SHIP_e && mStickDistance <= 0.05f && !ship->checkForceMove() && !checkShipNotNormalMode()) { m34D0--; @@ -770,7 +770,7 @@ BOOL daPy_lk_c::procShipBoomerang() { setShipRidePos(0); if (mActorKeepThrow.getActor() == NULL) { if (!checkUpperAnime(LKANM_BCK_BOOMCATCH)) { - dComIfGp_setDoStatus(7); + dComIfGp_setDoStatus(dActStts_RETURN_e); if (doTrigger()) { procShipPaddle_init(); deleteEquipItem(TRUE); @@ -850,7 +850,7 @@ BOOL daPy_lk_c::procShipHookshot() { return true; } setShipRidePos(0); - dComIfGp_setDoStatus(7); + dComIfGp_setDoStatus(dActStts_RETURN_e); daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); if (doTrigger() || hookshot == NULL || (mProcVar0.m3570 != 0 && m355E == 0 && !mpAttention->Lockon())) { procShipPaddle_init(); @@ -931,7 +931,7 @@ BOOL daPy_lk_c::procShipBow() { } setShipRidePos(0); if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) { - dComIfGp_setDoStatus(7); + dComIfGp_setDoStatus(dActStts_RETURN_e); if (doTrigger() || ((!mpAttention->Lockon() && mActorKeepEquip.getActor() == NULL) && mProcVar0.m3570 != 0)) { procShipPaddle_init(); deleteEquipItem(TRUE); @@ -986,9 +986,9 @@ BOOL daPy_lk_c::procShipCannon() { return true; } - dComIfGp_setRStatus(0x2c); - if (dComIfGp_getDoStatus() == 0 && dComIfGp_getShipActor()->speedF >= 3.0f) { - dComIfGp_setDoStatus(19); + dComIfGp_setRStatus(dActStts_CRUISE_e); + if (dComIfGp_getDoStatus() == dActStts_BLANK_e && dComIfGp_getShipActor()->speedF >= 3.0f) { + dComIfGp_setDoStatus(dActStts_STOP_e); } setShipRidePos(1); return true; diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc index 9b6d05626..54fcd2a88 100644 --- a/src/d/actor/d_a_player_swim.inc +++ b/src/d/actor/d_a_player_swim.inc @@ -93,7 +93,7 @@ BOOL daPy_lk_c::checkNextModeSwim() { BOOL res; if (mpAttnEntryA && mpAttnEntryA->mType == fopAc_Attn_TYPE_SHIP_e) { - dComIfGp_setDoStatus(0x1C); // Show `Get In` on the A Button? Ghidra says `GetInShip` is the symbol + dComIfGp_setDoStatus(dActStts_GET_IN_SHIP_e); if (doTrigger()) { return procShipReady_init(); } diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 5d7cdf6ab..e4ce847e9 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -181,11 +181,11 @@ void daPy_lk_c::setLightSaver() { pJVar7->setGlobalPrmColor(pbVar8->r, pbVar8->g, pbVar8->b); pJVar7->setGlobalEnvColor(pbVar9->r, pbVar9->g, pbVar9->b); } - if ((dComIfGp_getDoStatus() == 26 && m355C == 0) || + if ((dComIfGp_getDoStatus() == dActStts_PARRY_e && m355C == 0) || ((checkNoResetFlg1(daPyFlg1_UNK8000) || checkFinalMasterSwordEquip()) && !checkNoResetFlg1(daPyFlg1_UNK200000))) { - if (dComIfGp_getDoStatus() == 26 && m355C == 0) { + if (dComIfGp_getDoStatus() == dActStts_PARRY_e && m355C == 0) { pbVar9 = &g_prm1; pbVar8 = pbVar9; dComIfGp_getVibration().StartShock(6, 1, cXyz(0.0f, 1.0f, 0.0f)); @@ -243,7 +243,7 @@ BOOL daPy_lk_c::checkDemoSwordNoDraw(BOOL param_0) { /* 80155544-80155574 .text checkChanceMode__9daPy_lk_cFv */ BOOL daPy_lk_c::checkChanceMode() { - if (dComIfGp_getDoStatus() == 26 || checkModeFlg(ModeFlg_PARRY)) { + if (dComIfGp_getDoStatus() == dActStts_PARRY_e || checkModeFlg(ModeFlg_PARRY)) { return true; } return false; @@ -594,7 +594,7 @@ BOOL daPy_lk_c::procCutA() { } setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } @@ -697,7 +697,7 @@ BOOL daPy_lk_c::procCutF() { return true; } setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } @@ -798,7 +798,7 @@ BOOL daPy_lk_c::procCutR() { } setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } @@ -898,7 +898,7 @@ BOOL daPy_lk_c::procCutL() { } setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } if (swordTrigger() && m34C5 != 5) { @@ -992,7 +992,7 @@ BOOL daPy_lk_c::procCutEA() { current.angle.y = shape_angle.y; } setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } @@ -1073,7 +1073,7 @@ BOOL daPy_lk_c::procCutEB() { setShapeAngleToAtnActor(); current.angle.y = shape_angle.y; setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } @@ -1159,7 +1159,7 @@ BOOL daPy_lk_c::procCutExA() { } setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } @@ -1252,7 +1252,7 @@ BOOL daPy_lk_c::procCutExB() { setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } @@ -1438,7 +1438,7 @@ BOOL daPy_lk_c::procCutTurn() { mSmokeEcallBack.end(); } setSpecialBattle(1); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } @@ -2064,7 +2064,7 @@ BOOL daPy_lk_c::procCutExMJ() { current.angle.y = shape_angle.y; } setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } @@ -2147,7 +2147,7 @@ BOOL daPy_lk_c::procCutKesa() { } setSpecialBattle(TRUE); - if (doTrigger() && dComIfGp_getDoStatus() == 26) { + if (doTrigger() && dComIfGp_getDoStatus() == dActStts_PARRY_e) { return changeSpecialBattle(); } if (swordTrigger() && m34C5 != 5) { diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index 08f91f1d3..efcbd49fe 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -323,13 +323,13 @@ BOOL daPy_lk_c::procTactWait() { m35AC -= 1.0f; } if (mProcVar0.m3570 == 5) { - dComIfGp_setAStatus(7); + dComIfGp_setAStatus(dActStts_RETURN_e); } } else if (mProcVar0.m3570 != -5) { - dComIfGp_setAStatus(7); + dComIfGp_setAStatus(dActStts_RETURN_e); } - if (m34D2 == 0 || (cancelTrigger() && dComIfGp_getAStatus() == 7) || m35AC <= 0.0f) { + if (m34D2 == 0 || (cancelTrigger() && dComIfGp_getAStatus() == dActStts_RETURN_e) || m35AC <= 0.0f) { if (m34D2 != 0) { resetActAnimeUpper(UPPER_MOVE2_e, -1.0f); resetActAnimeUpper(UPPER_MOVE1_e, -1.0f); @@ -709,7 +709,7 @@ BOOL daPy_lk_c::procTactPlayEnd() { } if (mProcVar0.m3570 == 0) { - dComIfGp_setAStatus(0x07); + dComIfGp_setAStatus(dActStts_RETURN_e); } else if (mProcVar0.m3570 == 5) { if (dComIfGp_evmng_endCheck(l_tact_night_event_label) && !checkNoResetFlg0(daPyFlg0_UNK4000)) { onNoResetFlg0(daPyFlg0_UNK4000); diff --git a/src/d/actor/d_a_player_whide.inc b/src/d/actor/d_a_player_whide.inc index de0b48a53..8aff325ae 100644 --- a/src/d/actor/d_a_player_whide.inc +++ b/src/d/actor/d_a_player_whide.inc @@ -220,7 +220,7 @@ BOOL daPy_lk_c::checkWHideFrontFloor(cXyz* param_0) { int daPy_lk_c::checkWHideModeChange(cXyz* param_0) { if (!checkNoResetFlg0(daPyFlg0_UNK10000)) { if (!checkWHideFrontFloor(param_0)) { - dComIfGp_setRStatus(0); + dComIfGp_setRStatus(dActStts_BLANK_e); } else if (spActionButton()) { return 1; } @@ -239,8 +239,8 @@ int daPy_lk_c::checkWHideModeChange(cXyz* param_0) { /* 80137914-80137A00 .text changeWHideEndProc__9daPy_lk_cFP4cXyz */ int daPy_lk_c::changeWHideEndProc(cXyz* param_0) { - dComIfGp_setDoStatus(16); - dComIfGp_setRStatus(15); + dComIfGp_setDoStatus(dActStts_SIDLE_e); + dComIfGp_setRStatus(dActStts_CROUCH_e); if (((!doButton() && (!checkNoResetFlg0(daPyFlg0_UNK10000) || !mAcch.ChkRoofHit())) || (!checkUpperAnime(LKANM_BCK_REST) && swordTrigger())) || diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 0e4a5013c..2c38b9aa8 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -1067,7 +1067,7 @@ void daShip_c::decrementShipSpeed(float decrementSpeed) { /* 00002CFC-00002D5C .text firstDecrementShipSpeed__8daShip_cFf */ void daShip_c::firstDecrementShipSpeed(float decrementSpeed) { if (cLib_addCalc(&speedF, decrementSpeed, 0.1f, 5.0f, 1.0f) < 3.0f) { - m03E0 = 10000.0f; + m03E0 = 10000.0f; } } @@ -1360,7 +1360,7 @@ void daShip_c::setSelfMove(int param_1) { firstDecrementShipSpeed(m03E0); } else { - if (dComIfGp_getDoStatus() == 0x13 && (CPad_CHECK_HOLD_A(0))) { + if (dComIfGp_getDoStatus() == dActStts_STOP_e && (CPad_CHECK_HOLD_A(0))) { fVar6 = cLib_addCalc(&speedF, 0.0f, 0.1f, 1.0f, 0.1f); } else { @@ -3181,7 +3181,7 @@ void daShip_c::setRopePos() { *ropeSegments += (*currentRopeSegment - spF8) * 0.05f; } if (mRopeCnt == 20 && checkStateFlg(daSFLG_UNK10000000_e)) { - r4 = mRopeLine.getPos(0);; + r4 = mRopeLine.getPos(0); mDoMtx_multVecZero(mpSalvageArmModel->getAnmMtx(1), &spE0); spE0 -= *r4; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 39a57a091..0b61b1112 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -367,7 +367,7 @@ void dCamera_c::initialize(camera_class* camera, fopAc_ac_c* playerActor, u32 ca else if (m783) { m530 = 3; m540 = 1.0f; - m538 = daObjPirateship::getShipOffsetY(&m534, &m536, 130.0f);; + m538 = daObjPirateship::getShipOffsetY(&m534, &m536, 130.0f); m538 *= m540; } else { diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index 74759eb61..a157f6554 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -6,7 +6,7 @@ #include "d/d_meter.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DScreen.h" -#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRExpHeap.h" // IWYU pragma: keep #include "m_Do/m_Do_hostIO.h" #include "d/d_com_inf_game.h" #include "d/d_drawlist.h" @@ -731,72 +731,72 @@ const char* dMeter_actionTex(s16 id) { u8 id; const char* filename; } act[] = { - { 0, "ba_shiraberu.bti" }, - { 1, "ba_miru.bti" }, - { 2, "ba_syaberu.bti" }, - { 3, "ba_shiraberu.bti" }, - { 4, "ba_motu.bti" }, - { 5, "ba_noru.bti" }, - { 6, "ba_oriru.bti" }, - { 7, "ba_modoru.bti" }, - { 8, "ba_shimau.bti" }, - { 9, "ba_oku.bti" }, - { 10, "ba_chekku.bti" }, - { 11, "ba_hiraku.bti" }, - { 12, "ba_attack.bti" }, - { 13, "ba_osu.bti" }, - { 14, "ba_nageru.bti" }, - { 15, "ba_shagamu.bti" }, - { 16, "ba_harituku.bti" }, - { 17, "ba_tukamu.bti" }, - { 18, "ba_jump.bti" }, - { 19, "ba_tomeru.bti" }, - { 20, "ba_haru.bti" }, - { 21, "ba_tatamu.bti" }, - { 22, "ba_hanasu.bti" }, - { 23, "ba_kettei.bti" }, - { 24, "ba_kogu.bti" }, - { 25, "ba_tugihe.bti" }, - { 26, "ba_sake.bti" }, - { 27, "ba_motu_buki.bti" }, - { 28, "ba_noru_hune.bti" }, - { 29, "ba_oriru_hune.bti" }, - { 30, "ba_save.bti" }, - { 31, "ba_option.bti" }, - { 32, "ba_toru.bti" }, - { 33, "ba_setumei.bti" }, - { 34, "ba_kirikae.bti" }, - { 35, "ba_tobu.bti" }, - { 36, "ba_yobu.bti" }, - { 37, "ba_hoshii.bti" }, - { 38, "ba_yomu.bti" }, - { 39, "ba_yameru.bti" }, - { 40, "ba_kakudai.bti" }, - { 41, "ba_hikaku.bti" }, - { 42, "ba_zoom01.bti" }, - { 43, "ba_zoom02.bti" }, - { 44, "ba_susumu.bti" }, - { 45, "ba_nageru.bti" }, - { 46, "ba_motu.bti" }, - { 47, "ba_huru.bti" }, - { 48, "ba_kaizuhe.bti" }, - { 49, "ba_sake.bti" }, - { 50, "ba_modoru.bti" }, - { 51, "ba_save.bti" }, - { 52, "ba_save.bti" }, - { 53, "sword_01.bti" }, - { 54, "ba_husegu.bti" }, - { 55, "boko_stick.bti" }, - { 56, "hatchet.bti" }, - { 57, "iron_club.bti" }, - { 58, "longsword.bti" }, - { 59, "spear.bti" }, - { 60, "spear.bti" }, - { 61, "bow_01.bti" }, - { 62, "ba_modoru.bti" }, + { dActStts_BLANK_e, "ba_shiraberu.bti" }, + { dActStts_LOOK_e, "ba_miru.bti" }, + { dActStts_SPEAK_e, "ba_syaberu.bti" }, + { dActStts_CHARTS_e, "ba_shiraberu.bti" }, + { dActStts_LIFT_e, "ba_motu.bti" }, + { dActStts_CLIMB_e, "ba_noru.bti" }, + { dActStts_LET_GO_e, "ba_oriru.bti" }, + { dActStts_RETURN_e, "ba_modoru.bti" }, + { dActStts_PUT_AWAY_e, "ba_shimau.bti" }, + { dActStts_DROP_e, "ba_oku.bti" }, + { dActStts_CHECK_e, "ba_chekku.bti" }, + { dActStts_OPEN_e, "ba_hiraku.bti" }, + { dActStts_ATTACK_e, "ba_attack.bti" }, + { dActStts_ba_osu, "ba_osu.bti" }, + { dActStts_THROW_e, "ba_nageru.bti" }, + { dActStts_CROUCH_e, "ba_shagamu.bti" }, + { dActStts_SIDLE_e, "ba_harituku.bti" }, + { dActStts_GRAB_e, "ba_tukamu.bti" }, + { dActStts_JUMP_e, "ba_jump.bti" }, + { dActStts_STOP_e, "ba_tomeru.bti" }, + { dActStts_ba_haru, "ba_haru.bti" }, + { dActStts_ba_tatamu, "ba_tatamu.bti" }, + { dActStts_LET_GO_ROPE_e, "ba_hanasu.bti" }, + { dActStts_CHOOSE_e, "ba_kettei.bti" }, + { dActStts_ba_kogu, "ba_kogu.bti" }, + { dActStts_NEXT_e, "ba_tugihe.bti" }, + { dActStts_PARRY_e, "ba_sake.bti" }, + { dActStts_PICK_UP_e, "ba_motu_buki.bti" }, + { dActStts_GET_IN_SHIP_e, "ba_noru_hune.bti" }, + { dActStts_GET_OUT_SHIP_e, "ba_oriru_hune.bti" }, + { dActStts_ba_save, "ba_save.bti" }, + { dActStts_ba_option, "ba_option.bti" }, + { dActStts_TAKE_PHOTO_e, "ba_toru.bti" }, + { dActStts_INFO_e, "ba_setumei.bti" }, + { dActStts_SWAP_MODES_e, "ba_kirikae.bti" }, + { dActStts_FLY_e, "ba_tobu.bti" }, + { dActStts_CALL_e, "ba_yobu.bti" }, + { dActStts_BID_e, "ba_hoshii.bti" }, + { dActStts_READ_e, "ba_yomu.bti" }, + { dActStts_CANCEL_e, "ba_yameru.bti" }, + { dActStts_ba_kakudai, "ba_kakudai.bti" }, + { dActStts_ba_hikaku, "ba_hikaku.bti" }, + { dActStts_ba_zoom01, "ba_zoom01.bti" }, + { dActStts_ba_zoom02, "ba_zoom02.bti" }, + { dActStts_CRUISE_e, "ba_susumu.bti" }, + { dActStts_ba_nageru__dupe_2D, "ba_nageru.bti" }, + { dActStts_ba_motu__dupe_2E, "ba_motu.bti" }, + { dActStts_SWING_e, "ba_huru.bti" }, + { dActStts_SEA_CHART_e, "ba_kaizuhe.bti" }, + { dActStts_ba_sake__dupe_31, "ba_sake.bti" }, + { dActStts_ba_modoru__dupe_32, "ba_modoru.bti" }, + { dActStts_ba_save__dupe_33, "ba_save.bti" }, + { dActStts_ba_save__dupe_34, "ba_save.bti" }, + { dActStts_sword_01, "sword_01.bti" }, + { dActStts_DEFEND_e, "ba_husegu.bti" }, + { dActStts_boko_stick, "boko_stick.bti" }, + { dActStts_hatchet, "hatchet.bti" }, + { dActStts_iron_club, "iron_club.bti" }, + { dActStts_longsword, "longsword.bti" }, + { dActStts_spear, "spear.bti" }, + { dActStts_spear__dupe_3C, "spear.bti" }, + { dActStts_bow_01, "bow_01.bti" }, + { dActStts_HIDDEN_e, "ba_modoru.bti" }, }; int found = 0; - for (int i = 0; i < 63; i++) { + for (int i = 0; i < ARRAY_SIZE(act); i++) { if (id == act[i].id) { found = i; break; @@ -1667,10 +1667,9 @@ void dMeter_placeNameMove() { /* 8020240C-80202438 .text dMeter_arrowInit__FP15sub_meter_class */ void dMeter_arrowInit(sub_meter_class* i_this) { - /* Nonmatching */ for (int i = 0; i < 4; i++) i_this->field_0x2e48[i].mUserArea = 0; - // i_this->field_0x3025 = 0; + i_this->field_0x3025 = 0; } /* 80202438-80202580 .text dMeter_arrowCheckStatus__FP15sub_meter_class */ @@ -1880,9 +1879,9 @@ static cPhs_State dMeter_Create(msg_class* i_this) { fopMsgM_Create(PROC_MESG, NULL, NULL); - dComIfGp_setDoStatusForce(0); - dComIfGp_setRStatusForce(0); - dComIfGp_setAStatusForce(0); + dComIfGp_setDoStatusForce(dActStts_BLANK_e); + dComIfGp_setRStatusForce(dActStts_BLANK_e); + dComIfGp_setAStatusForce(dActStts_BLANK_e); mDoHIO_createChild("通常画面表示", &g_meterHIO); // "Normal Screen Display" mDoHIO_createChild("メニュー画面", &g_menuHIO); // "Menu Screen" diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 149b27358..9a2ace43a 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -85,7 +85,7 @@ s32 mDoMemCdRWm_Store(CARDFileInfo* card, void* data, u32 size) { if (ret != CARD_ERROR_READY) return ret; } } - } + } mDoMemCdRWm_SetCardStat(card); return ret;