From fda4313e251efff9c959cd509523f4676da0262a Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 26 Feb 2024 15:13:17 -0500 Subject: [PATCH] misc cleanup --- include/d/actor/d_a_agb.h | 32 +++--- include/d/actor/d_a_am.h | 2 +- include/d/actor/d_a_am2.h | 2 +- include/d/actor/d_a_bk.h | 2 +- include/d/actor/d_a_bomb.h | 2 +- include/d/actor/d_a_bomb2.h | 3 +- include/d/actor/d_a_branch.h | 4 +- include/d/actor/d_a_npc_md.h | 2 +- include/d/actor/d_a_obj_Ygush00.h | 2 +- include/d/actor/d_a_obj_mtest.h | 2 +- include/d/actor/d_a_player_main.h | 4 +- include/d/actor/d_a_spc_item01.h | 2 +- include/d/actor/d_a_tbox.h | 4 +- include/d/d_save_event_bit.inc | 5 + src/d/actor/d_a_agb.cpp | 163 ++++++++++++++---------------- src/d/actor/d_a_agbsw0.cpp | 24 ++--- src/d/actor/d_a_am.cpp | 4 +- src/d/actor/d_a_am2.cpp | 4 +- src/d/actor/d_a_bk.cpp | 4 +- src/d/actor/d_a_bomb2.cpp | 4 +- src/d/actor/d_a_bomb3.inc | 4 +- src/d/actor/d_a_branch.cpp | 2 +- src/d/actor/d_a_ikari.cpp | 8 +- src/d/actor/d_a_npc_md.cpp | 4 +- src/d/actor/d_a_obj_Ygush00.cpp | 4 +- src/d/actor/d_a_obj_gaship2.cpp | 8 +- src/d/actor/d_a_obj_mknjd.cpp | 6 +- src/d/actor/d_a_obj_mtest.cpp | 4 +- src/d/actor/d_a_obj_vfan.cpp | 65 ++++++------ src/d/actor/d_a_spc_item01.cpp | 8 +- 30 files changed, 189 insertions(+), 195 deletions(-) diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h index 3e9c7fae9..87d46ebb9 100644 --- a/include/d/actor/d_a_agb.h +++ b/include/d/actor/d_a_agb.h @@ -108,10 +108,10 @@ public: BOOL isFree() { return mIsFree; } void offFree() { mIsFree = false; } BOOL isHold() { return mHold; } - s32 getFollowTarget() { return mFollowTarget; } - void setFollowTarget(bool) {} - void getTargetID() {} - void setTargetID(unsigned int) {} + BOOL getFollowTarget() { return mFollowTarget; } + void setFollowTarget(bool follow) { mFollowTarget = follow; } + unsigned int getTargetID() { return mTargetID; } + void setTargetID(unsigned int pid) { mTargetID = pid; } struct daAgb_ItemBuy { union { @@ -247,7 +247,7 @@ public: /* 0x634 */ cXyz field_0x634; /* 0x640 */ int field_0x640; /* 0x648 */ u64 mPlayerName; - /* 0x650 */ u32 field_0x650; + /* 0x650 */ u32 mTargetID; /* 0x654 */ int field_0x654; /* 0x658 */ s16 field_0x658; /* 0x65A */ u16 mPrevButtons; @@ -265,23 +265,23 @@ public: /* 0x66D */ u8 field_0x66d; /* 0x66E */ u8 field_0x66e; /* 0x66F */ s8 field_0x66f; - /* 0x670 */ u8 field_0x670; + /* 0x670 */ bool field_0x670; /* 0x671 */ bool mIsFree; /* 0x672 */ bool mIsActive; - /* 0x673 */ u8 field_0x673; + /* 0x673 */ bool field_0x673; /* 0x674 */ bool mHold; - /* 0x675 */ u8 field_0x675; - /* 0x676 */ u8 field_0x676; - /* 0x677 */ u8 mFollowTarget; + /* 0x675 */ bool field_0x675; + /* 0x676 */ bool field_0x676; + /* 0x677 */ bool mFollowTarget; /* 0x678 */ bool mIsMsgSend; - /* 0x679 */ u8 field_0x679; + /* 0x679 */ bool field_0x679; /* 0x67A */ bool field_0x67a; - /* 0x67B */ u8 field_0x67b; + /* 0x67B */ bool field_0x67b; /* 0x67C */ bool mBombDeny; - /* 0x67D */ u8 field_0x67d; - /* 0x67E */ u8 field_0x67e; - /* 0x67F */ u8 field_0x67f; - /* 0x680 */ u8 field_0x680; + /* 0x67D */ bool field_0x67d; + /* 0x67E */ bool field_0x67e; + /* 0x67F */ bool field_0x67f; + /* 0x680 */ bool field_0x680; /* 0x684 */ dPa_followEcallBack field_0x684; }; diff --git a/include/d/actor/d_a_am.h b/include/d/actor/d_a_am.h index 1f097f4ba..5162fc40a 100644 --- a/include/d/actor/d_a_am.h +++ b/include/d/actor/d_a_am.h @@ -10,7 +10,7 @@ class am_class : public fopEn_enemy_c { public: - /* 0x02AC */ request_of_phase_process_class mPhs; + /* 0x02AC */ request_of_phase_process_class mPhase; /* 0x02B4 */ JntHit_c* mEyeJntHit; /* 0x02B8 */ mDoExt_McaMorf* mpMorf; /* 0x02BC */ u8 m02BC[0x02C0 - 0x02BC]; diff --git a/include/d/actor/d_a_am2.h b/include/d/actor/d_a_am2.h index e728aa66e..0d8632396 100644 --- a/include/d/actor/d_a_am2.h +++ b/include/d/actor/d_a_am2.h @@ -10,7 +10,7 @@ class am2_class : public fopEn_enemy_c { public: - /* 0x2AC */ request_of_phase_process_class mPhs; + /* 0x2AC */ request_of_phase_process_class mPhase; /* 0x2B4 */ JntHit_c* mEyeJntHit; /* 0x2B8 */ mDoExt_McaMorf* mpMorf; /* 0x2BC */ u8 m2BC[0x2C0 - 0x2BC]; diff --git a/include/d/actor/d_a_bk.h b/include/d/actor/d_a_bk.h index 5a0817ada..356f0c5d6 100644 --- a/include/d/actor/d_a_bk.h +++ b/include/d/actor/d_a_bk.h @@ -10,7 +10,7 @@ class dPath; class bk_class : public fopEn_enemy_c { public: - /* 0x02AC */ request_of_phase_process_class mPhs; + /* 0x02AC */ request_of_phase_process_class mPhase; /* 0x02B4 */ u8 mType; /* 0x02B5 */ u8 m02B5; /* 0x02B6 */ u8 m02B6; diff --git a/include/d/actor/d_a_bomb.h b/include/d/actor/d_a_bomb.h index ac4fea914..295d53ef4 100644 --- a/include/d/actor/d_a_bomb.h +++ b/include/d/actor/d_a_bomb.h @@ -168,7 +168,7 @@ public: private: /* 0x290 */ procFunc mFunc; - /* 0x29C */ request_of_phase_process_class mPhs; + /* 0x29C */ request_of_phase_process_class mPhase; /* 0x2A4 */ J3DModel* mpModel; /* 0x2A8 */ mDoExt_bckAnm mBck0; /* 0x2B8 */ mDoExt_bckAnm mBck1; diff --git a/include/d/actor/d_a_bomb2.h b/include/d/actor/d_a_bomb2.h index 097ae7d26..9a10abbad 100644 --- a/include/d/actor/d_a_bomb2.h +++ b/include/d/actor/d_a_bomb2.h @@ -173,8 +173,7 @@ namespace daBomb2 { }; private: - //some of these might need updating since i initially copied them from daBomb_c - /* 0x290 */ request_of_phase_process_class mPhs; + /* 0x290 */ request_of_phase_process_class mPhase; /* 0x298 */ J3DModel* mpModel; /* 0x29C */ mDoExt_bckAnm mBck0; /* 0x2AC */ mDoExt_brkAnm mBrk0; diff --git a/include/d/actor/d_a_branch.h b/include/d/actor/d_a_branch.h index 3d0b86a34..8f24dbc61 100644 --- a/include/d/actor/d_a_branch.h +++ b/include/d/actor/d_a_branch.h @@ -15,7 +15,7 @@ public: } } - dComIfG_resDelete(&mPhs, m_arcname); + dComIfG_resDelete(&mPhase, m_arcname); } inline s32 create(); inline BOOL draw(); @@ -30,7 +30,7 @@ public: MtxP getJointMtx(const char*); - /* 0x0290 */ request_of_phase_process_class mPhs; + /* 0x0290 */ request_of_phase_process_class mPhase; /* 0x0298 */ J3DModel* mModel[2]; /* 0x02A0 */ u8 dummy2[0x08]; /* 0x02A8 */ mDoExt_McaMorf* mAnims[2]; diff --git a/include/d/actor/d_a_npc_md.h b/include/d/actor/d_a_npc_md.h index d4de6db59..56f80d09b 100644 --- a/include/d/actor/d_a_npc_md.h +++ b/include/d/actor/d_a_npc_md.h @@ -485,7 +485,7 @@ public: static void offPlayerRoom() { m_playerRoom = false; } public: - /* 0x04EC */ request_of_phase_process_class mPhs; + /* 0x04EC */ request_of_phase_process_class mPhase; /* 0x04F4 */ J3DModel* mpHarpModel; /* 0x04F8 */ J3DModel* mpHarpLightModel; /* 0x04FC */ mDoExt_McaMorf2* mpMorf; diff --git a/include/d/actor/d_a_obj_Ygush00.h b/include/d/actor/d_a_obj_Ygush00.h index 5458a2dd5..c8345a00f 100644 --- a/include/d/actor/d_a_obj_Ygush00.h +++ b/include/d/actor/d_a_obj_Ygush00.h @@ -23,7 +23,7 @@ public: static BOOL solidHeapCB(fopAc_ac_c*); public: - /* 0x290 */ request_of_phase_process_class mPhs; + /* 0x290 */ request_of_phase_process_class mPhase; /* 0x298 */ J3DModel * mpModel; /* 0x29C */ mDoExt_btkAnm mBtkAnm; /* 0x2B0 */ mDoExt_bckAnm mBckAnm; diff --git a/include/d/actor/d_a_obj_mtest.h b/include/d/actor/d_a_obj_mtest.h index 8eaa5031b..fbf5fdb75 100644 --- a/include/d/actor/d_a_obj_mtest.h +++ b/include/d/actor/d_a_obj_mtest.h @@ -62,7 +62,7 @@ namespace daObjMtest { public: /* 0x2C8 */ Mtx mMtx; - /* 0x2F8 */ request_of_phase_process_class mPhs; + /* 0x2F8 */ request_of_phase_process_class mPhase; /* 0x300 */ J3DModel* mpModel; /* 0x304 */ dCcD_Stts mStts; /* 0x340 */ dCcD_Cyl mCyl; diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index 5b2a182e5..c3cdfcc07 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -1692,7 +1692,7 @@ public: void offModeFlg(u32 flag) { mModeFlg &= ~flag; } u32 checkModeFlg(u32 flag) const { return mModeFlg & flag; } - request_of_phase_process_class* getPhase() { return &mPhsLoad; } + request_of_phase_process_class* getPhase() { return &mPhase; } J3DAnmTransform* getNowAnmPackUnder(daPy_UNDER idx) { return mAnmRatioUnder[idx].getAnmTransform(); } J3DAnmTransform* getNowAnmPackUpper(daPy_UPPER idx) { return mAnmRatioUpper[idx].getAnmTransform(); } @@ -1798,7 +1798,7 @@ public: virtual void cancelChangeTextureAnime() { resetDemoTextureAnime(); } public: - /* 0x0320 */ request_of_phase_process_class mPhsLoad; + /* 0x0320 */ request_of_phase_process_class mPhase; /* 0x0328 */ J3DModelData* mpCLModelData; /* 0x032C */ J3DModel* mpCLModel; /* 0x0330 */ J3DModel* mpKatsuraModel; diff --git a/include/d/actor/d_a_spc_item01.h b/include/d/actor/d_a_spc_item01.h index 9893502dd..df4b873a0 100644 --- a/include/d/actor/d_a_spc_item01.h +++ b/include/d/actor/d_a_spc_item01.h @@ -9,7 +9,7 @@ class daSpcItem01_c : public daItemBase_c { public: void set_mtx(); BOOL _delete(); - cPhs__Step _create(); + s32 _create(); BOOL CreateInit(); BOOL _execute(); void set_effect(); diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h index dc7ea445d..8a0938de0 100644 --- a/include/d/actor/d_a_tbox.h +++ b/include/d/actor/d_a_tbox.h @@ -30,7 +30,7 @@ public: void flagOff(u16 flag) { mFlags &= ~flag; } void flagClr() { mFlags = 0; } BOOL flagCheck(u16 flag) { return mFlags & flag; } - request_of_phase_process_class* getPhase() { return &mPhs; } + request_of_phase_process_class* getPhase() { return &mPhase; } bool action() { return (this->*mActionFunc)(); } void setAction(ActionFunc func) { mActionFunc = func; } void deleteProc() {} // Maybe only used in the demo @@ -79,7 +79,7 @@ public: public: /* 0x290 */ s32 mRoomNo; - /* 0x294 */ request_of_phase_process_class mPhs; + /* 0x294 */ request_of_phase_process_class mPhase; /* 0x29C */ J3DModel* mpChestMdl; /* 0x2A0 */ mDoExt_bckAnm mOpenAnm; /* 0x2B0 */ mDoExt_btkAnm* mpAppearTexAnm; diff --git a/include/d/d_save_event_bit.inc b/include/d/d_save_event_bit.inc index 154a940de..d838553c0 100644 --- a/include/d/d_save_event_bit.inc +++ b/include/d/d_save_event_bit.inc @@ -6,6 +6,11 @@ public: ENDLESS_NIGHT = 0x0A02, MEDLI_GAVE_FATHERS_LETTER = 0x0E02, MET_KORL = 0x0F80, + PLACED_NAYRUS_PEARL = 0x1410, + PLACED_FARORES_PEARL = 0x1440, + PLACED_DINS_PEARL = 0x1480, + UNLOCK_TING_DISCOUNT = 0x1A08, + UNLOCK_TINGLE_BALLOON_DISCOUNT = 0x1A10, RODE_KORL = 0x2A08, BARRIER_BREAK = 0x2C02, LITHOGRAPH_1 = 0x3508, diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index b9d512050..c1497b43a 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -279,16 +279,14 @@ void daAgb_c::NameConv() { for (i = 0; i < 8; i++) { #if VERSION == VERSION_JPN u8 chr = sjis2chrNo(name); -#else - u8 chr = sjis2chrNo(*name); -#endif mPlayerName |= chr; -#if VERSION == VERSION_JPN if (*name & 0x80) name += 2; else name++; #else + u8 chr = sjis2chrNo(*name); + mPlayerName |= chr; name++; #endif @@ -310,7 +308,7 @@ int daAgb_c::uploadInitCheck() { l_msgCtrl.init(1); mUploadAction = UpAct_UNKA; } else if (!mDoGaC_getComEnable()) { - field_0x66f = 0; + field_0x66f = false; mIsMsgSend = false; JUTGba::getManager()->doInitProbe(1, NULL, NULL); JUTGba::getManager()->doInitProbe(2, NULL, NULL); @@ -393,7 +391,7 @@ int daAgb_c::uploadSelect() { mDoGaC_GbaReboot(); mDoGaC_setPortNo(mPortNo); - field_0x66f = 0; + field_0x66f = false; mIsMsgSend = false; } } @@ -514,7 +512,7 @@ int daAgb_c::uploadConnect() { int daAgb_c::uploadMessageSend() { if (mDoGaC_getDataStatus(0) == 0) { mIsMsgSend = true; - if (field_0x67a != 0) { + if (field_0x67a) { l_msgCtrl.setMsgStatus(fopMsgStts_MSG_CONTINUES_e); fopMsgM_messageSet(8); // "Tingle appeared on your Game Boy Advance!" fopMsgM_messageSendOn(); @@ -570,7 +568,7 @@ int daAgb_c::uploadMsgEndTimer() { l_msgCtrl.setMsgStatus(fopMsgStts_MSG_ENDS_e); fopMsgM_messageSendOn(); } else if (field_0x664 == 30) { - field_0x66f = 1; + field_0x66f = true; } } @@ -622,10 +620,8 @@ void daAgb_c::modeLookAttention() { se_flag = false; field_0x65c = 1; - if (mHold == 0) { - shape_angle.x = 0; - shape_angle.y = 0; - shape_angle.z = 0; + if (!mHold) { + shape_angle.setall(0); field_0x628 = 2.5f; } } @@ -640,7 +636,7 @@ u8 daAgb_c::DungeonNoGet() { u8 dungeon_no = var_r0; if (dungeon_no == 0) { - if (field_0x67e != 0) { + if (field_0x67e) { switch (field_0x66d) { case 1: dungeon_no = 10; @@ -692,8 +688,8 @@ u8 daAgb_c::DungeonNoTable[] = { void daAgb_c::MapNoSet(u8 param_0, u8 param_1, u8 param_2) { field_0x66c = param_0; field_0x66d = param_1; - field_0x67e = param_2 != 0; - field_0x670 = 1; + field_0x67e = param_2; + field_0x670 = true; mFlags.field_0xb_3 = DungeonNoGet(); } @@ -701,8 +697,8 @@ void daAgb_c::MapNoSet(u8 param_0, u8 param_1, u8 param_2) { /* 800D05D4-800D05F0 .text onFree__7daAgb_cFv */ void daAgb_c::onFree() { mIsFree = true; - field_0x650 = -1; - mFollowTarget = 0; + setTargetID(fpcM_ERROR_PROCESS_ID_e); + setFollowTarget(false); } /* 800D05F0-800D0608 .text onHold__7daAgb_cFv */ @@ -721,8 +717,8 @@ void daAgb_c::offHold() { void daAgb_c::resetCursor(bool param_0) { fopAc_ac_c* player_p = dComIfGp_getPlayer(0); mIsFree = false; - mFollowTarget = 0; - field_0x650 = -1; + setFollowTarget(false); + setTargetID(fpcM_ERROR_PROCESS_ID_e); if (fopAcM_GetName(player_p) != PROC_NPC_KAM) { current.pos = player_p->current.pos; @@ -733,17 +729,15 @@ void daAgb_c::resetCursor(bool param_0) { } field_0x628 = 2.5f; - shape_angle.x = 0; - shape_angle.y = 0; - shape_angle.z = 0; + shape_angle.setall(0); if (param_0) { if (field_0x66b == 14) { field_0x65c = 0; } - field_0x675 = 0; - field_0x676 = 0; + field_0x675 = false; + field_0x676 = false; } mHold = false; @@ -752,7 +746,7 @@ void daAgb_c::resetCursor(bool param_0) { /* 800D070C-800D0734 .text FlashCheck__7daAgb_cFv */ bool daAgb_c::FlashCheck() { - if (mIsFree != 0 || mFollowTarget == 1) { + if (mIsFree || mFollowTarget == true) { return true; } @@ -790,7 +784,7 @@ void daAgb_c::FlagsRecv() { g_mDoCPd_cpadInfo[mDoGaC_getPortNo()].mGamepadErrorFlags = 0; mPrevButtons = buttons; - field_0x673 = mGbaFlg.field_0x3 != 0; + field_0x673 = mGbaFlg.field_0x3; field_0x630 = BigLittleChange(mGbaFlg.field_0x4) >> 0x10; field_0x632 = BigLittleChange(mGbaFlg.field_0x6) >> 0x10; field_0x67a = mGbaFlg.field_0x2.m2; @@ -890,14 +884,14 @@ void daAgb_c::GbaItemUse() { ) { mEffect = BigLittleChange(0x1F0300); return; - } else if (field_0x67d != 0) { + } else if (field_0x67d) { mEffect = BigLittleChange((field_0x662 << 0x10) | 0x300); return; } - field_0x67f = 1; + field_0x67f = true; break; case 2: - if (field_0x67b != 0) { + if (field_0x67b) { mEffect = BigLittleChange((field_0x65e << 0x10) | 0x300); return; } @@ -911,14 +905,14 @@ void daAgb_c::GbaItemUse() { if (isFree() || getFollowTarget() == 1) { if (!isFree() && dComIfGs_getGbaRupeeCount() < 24 && - fopAcM_IsExecuting(field_0x650)) + fopAcM_IsExecuting(getTargetID())) { - fopAc_ac_c* actor_p = fopAcM_SearchByID(field_0x650); + fopAc_ac_c* actor_p = fopAcM_SearchByID(getTargetID()); if (cM_rndF(5.0f) < 4.0) { - field_0x640 = 3; + field_0x640 = dItem_YELLOW_RUPEE_e; } else { - field_0x640 = 4; + field_0x640 = dItem_RED_RUPEE_e; } field_0x634 = actor_p->current.pos; @@ -927,18 +921,18 @@ void daAgb_c::GbaItemUse() { } fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); - field_0x65c = 0x78; + field_0x65c = 120; } else { temp_r29 = 0xe; onFree(); - field_0x65c = 0x10e; + field_0x65c = 270; mBrk.setPlaySpeed(6.0f); } break; case 0x15: resetCursor(false); fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); - field_0x65c = 0x78; + field_0x65c = 120; break; case 0x11: mEffect = BigLittleChange(temp_r29); @@ -946,7 +940,7 @@ void daAgb_c::GbaItemUse() { case 3: daPy_getPlayerLinkActorClass()->setHoverBoots(5*30); resetCursor(false); - field_0x65c = 0x96; + field_0x65c = 150; mBrk.setPlaySpeed(6.0f); break; case 0x12: @@ -1049,7 +1043,7 @@ void daAgb_c::GbaItemUse() { return; } - mIsActive = false; + offActive(); dComIfGp_setItemRupeeCount(-mItem.field_0x1); mEffect = BigLittleChange(temp_r29); field_0x66b = temp_r29; @@ -1142,10 +1136,10 @@ void daAgb_c::FlagsSend(u32 stage_type) { mFlags.field_0x7_2 = dKy_getdaytime_minute(); mFlags.field_0x8_1 = dComIfGs_getLife(); mFlags.field_0xa_1 = dComIfGs_isEventBit(0x1708); - mFlags.field_0x7_1 = dComIfGs_isEventBit(0x1A10); - mFlags.field_0x7_0 = dComIfGs_isEventBit(0x1A08); + mFlags.field_0x7_1 = dComIfGs_isEventBit(dSv_evtBit_c::UNLOCK_TINGLE_BALLOON_DISCOUNT); + mFlags.field_0x7_0 = dComIfGs_isEventBit(dSv_evtBit_c::UNLOCK_TING_DISCOUNT); - if (!dComIfGs_isEventBit(0x0F80) || dComIfGs_isEventBit(0x1E80)) { + if (!dComIfGs_isEventBit(dSv_evtBit_c::MET_KORL) || dComIfGs_isEventBit(0x1E80)) { mFlags.field_0x9_7 = 0; mFlags.field_0x9_6 = 0; mFlags.field_0x9_5 = 0; @@ -1164,9 +1158,9 @@ void daAgb_c::FlagsSend(u32 stage_type) { } if (dComIfGs_isEventBit(0x3920)) { - mFlags.field_0x9_4 = !dComIfGs_isEventBit(0x1480); - mFlags.field_0x9_3 = !dComIfGs_isEventBit(0x1440); - mFlags.field_0x9_2 = !dComIfGs_isEventBit(0x1410); + mFlags.field_0x9_4 = !dComIfGs_isEventBit(dSv_evtBit_c::PLACED_DINS_PEARL); + mFlags.field_0x9_3 = !dComIfGs_isEventBit(dSv_evtBit_c::PLACED_FARORES_PEARL); + mFlags.field_0x9_2 = !dComIfGs_isEventBit(dSv_evtBit_c::PLACED_NAYRUS_PEARL); } else { mFlags.field_0x9_4 = 0; mFlags.field_0x9_3 = 0; @@ -1182,7 +1176,7 @@ void daAgb_c::FlagsSend(u32 stage_type) { } mFlags.field_0xa_3 = dComIfGs_isEventBit(0x1E40); mFlags.field_0xa_0 = mIsFree; - mFlags.field_0xb_7 = mFollowTarget; + mFlags.field_0xb_7 = getFollowTarget(); if (stage_type == dSv_save_c::STAGE_ET) { mFlags.field_0x8_0 = 1; } else { @@ -1214,13 +1208,13 @@ void daAgb_c::CursorMove(fopAc_ac_c* actor, u32 stage_type) { f32 f31; if (stage_type == dSv_save_c::STAGE_WT) { - f31 = field_0x67e != 0 ? 50.0f : 781.25f; + f31 = field_0x67e ? 50.0f : 781.25f; } else { f31 = 25.0f; } if (cLib_chaseF(&field_0x628, 2.5f, field_0x62c) && - field_0x673 != 0 && isActive() && !mHold && + field_0x673 && isActive() && !mHold && !CPad_CHECK_HOLD_L(mDoGaC_getPortNo()) ) { if (CPad_CHECK_HOLD_LEFT(mDoGaC_getPortNo())) { @@ -1234,7 +1228,7 @@ void daAgb_c::CursorMove(fopAc_ac_c* actor, u32 stage_type) { actor->home.pos.z += f31; } - if (stage_type == dSv_save_c::STAGE_WT && field_0x67e == 0) { + if (stage_type == dSv_save_c::STAGE_WT && !field_0x67e) { if (actor->home.pos.x < -350000.0f) { actor->home.pos.x = -350000.0f; } else if (actor->home.pos.x > 350000.0f) { @@ -1267,14 +1261,14 @@ void daAgb_c::CursorMove(fopAc_ac_c* actor, u32 stage_type) { f32 playerDist = fopAcM_searchPlayerDistanceXZ(actor); if (playerDist > 212100.0f) { - if (mIsFree || mFollowTarget == 0) { + if (mIsFree || !mFollowTarget) { cXyz r1_50 = player->current.pos - actor->current.pos; actor->home.pos.x = player->current.pos.x - r1_50.x * 212100.0f / playerDist; actor->home.pos.z = player->current.pos.z - r1_50.z * 212100.0f / playerDist; } else { mIsFree = false; - mFollowTarget = 0; - field_0x650 = -1; + setFollowTarget(false); + setTargetID(fpcM_ERROR_PROCESS_ID_e); } } } @@ -1316,7 +1310,7 @@ void daAgb_c::CursorMove(fopAc_ac_c* actor, u32 stage_type) { return; } - field_0x679 = 1; + field_0x679 = true; if (mCrrPos.ChkXCrr()) { actor->home.pos.x = actor->current.pos.x; @@ -1383,7 +1377,7 @@ void daAgb_c::modeMove() { field_0x65c--; if (field_0x66b == 0xE) { - if (field_0x65c == 0x78) { + if (field_0x65c == 120) { fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); } else if (field_0x65c == 0) { resetCursor(false); @@ -1395,10 +1389,10 @@ void daAgb_c::modeMove() { } } } - if (field_0x673 != 0 && !r26 && field_0x65c == 0) { - mIsActive = true; + if (field_0x673 && !r26 && field_0x65c == 0) { + onActive(); } else { - mIsActive = false; + offActive(); } if (mDoGaC_GbaLink() && mDoGaC_RecvStatusCheck(6) && mDoGac_SendStatusCheck(7)) { @@ -1412,10 +1406,10 @@ void daAgb_c::modeMove() { mDoGac_SendDataSet((u32*)&mEffect, 4, 7, mEffect); } - if (field_0x67f != 0) { - field_0x67f = 0; + if (field_0x67f) { + field_0x67f = false; - if (field_0x67d == 0 && + if (!field_0x67d && !daPy_getPlayerLinkActorClass()->checkNoControll() && !dComIfGp_checkPlayerStatus0(0, daPyStts0_CRAWL_e) && ( @@ -1425,7 +1419,7 @@ void daAgb_c::modeMove() { ) ) { mMode = 1; - mIsActive = false; + offActive(); mEyePos = current.pos; cXyz sp3c = mEyePos - player->current.pos; @@ -1437,7 +1431,7 @@ void daAgb_c::modeMove() { if (isHold()) { s16 angle = fopAcM_searchPlayerAngleY(this); - if (field_0x675 == 0) { + if (!field_0x675) { angle = -angle; } shape_angle.z = angle; @@ -1459,14 +1453,14 @@ void daAgb_c::modeMove() { } if ((g_mDoCPd_cpadInfo[mDoGaC_getPortNo()].mGamepadErrorFlags == 0 && fopAcM_GetName(player) != PROC_NPC_KAM) && - ((isActive() && field_0x675 == 0 && CPad_CHECK_TRIG_R(mDoGaC_getPortNo())) || + ((isActive() && !field_0x675 && CPad_CHECK_TRIG_R(mDoGaC_getPortNo())) || (mFlags.field_0x3_5 != 0 && (CPad_CHECK_TRIG_R(mDoGaC_getPortNo()) || CPad_CHECK_TRIG_A(mDoGaC_getPortNo()))))) { offHold(); mIsFree = false; if (getFollowTarget() != 0) { - field_0x650 = -1; - mFollowTarget = 0; + setTargetID(fpcM_ERROR_PROCESS_ID_e); + setFollowTarget(false); } else if (stage_type != dSv_save_c::STAGE_ET) { dAttList_c* attList = dComIfGp_getAttention().GetLockonList(0); if (attList) { @@ -1475,8 +1469,8 @@ void daAgb_c::modeMove() { if (fopAcM_CheckStatusMap(r3, 0) && !fopAcM_checkStatus(r3, fopAcStts_BOSS_e) && fopAcM_GetName(r3) != PROC_FGANON) { current.pos = r3->current.pos; home.pos = r3->current.pos; - field_0x650 = attList->getPid(); - mFollowTarget = 1; + setTargetID(attList->getPid()); + setFollowTarget(true); } } } @@ -1485,10 +1479,10 @@ void daAgb_c::modeMove() { if (!isFree()) { if (getFollowTarget() == 1) { - fopAc_ac_c* r3 = fopAcM_SearchByID(field_0x650); + fopAc_ac_c* r3 = fopAcM_SearchByID(getTargetID()); if (r3 == NULL || !fopAcM_CheckStatusMap(r3, 0)) { - field_0x650 = -1; - mFollowTarget = 0; + setTargetID(fpcM_ERROR_PROCESS_ID_e); + setFollowTarget(false); } } @@ -1500,7 +1494,7 @@ void daAgb_c::modeMove() { home.pos = player->current.pos; } } else { - fopAc_ac_c* r3 = fopAcM_SearchByID(field_0x650); + fopAc_ac_c* r3 = fopAcM_SearchByID(getTargetID()); current.pos = r3->current.pos; home.pos = r3->current.pos; } @@ -1550,7 +1544,7 @@ void daAgb_c::modeProcCall() { static int daAgb_Execute(daAgb_c* i_this) { fopAc_ac_c* i_actor = i_this; daPy_py_c* player = daPy_getPlayerActorClass(); - i_this->field_0x679 = 0; + i_this->field_0x679 = false; if (mDoGaC_GbaLink() && mDoGaC_RecvStatusCheck(4)) { i_this->FlagsRecv(); @@ -1573,11 +1567,11 @@ static int daAgb_Execute(daAgb_c* i_this) { i_this->FlagsSend(stage_type); } - i_this->field_0x680 = 1; + i_this->field_0x680 = true; } else if (i_this->field_0x680) { - i_this->field_0x680 = 0; + i_this->field_0x680 = false; i_this->resetCursor(true); - i_this->mIsActive = false; + i_this->offActive(); if (i_this->field_0x65c != 0) { if (i_this->field_0x66b == 3 || i_this->field_0x66b == 12) { @@ -1632,8 +1626,8 @@ static int daAgb_Execute(daAgb_c* i_this) { } if (i_this->isHold() && !var_r27 && i_this->mMode != 1) { - if (i_this->field_0x675 != 0) { - if (i_this->field_0x676 != 0) { + if (i_this->field_0x675) { + if (i_this->field_0x676) { i_this->shape_angle.z += 0x1000; } else { i_this->shape_angle.z = fopAcM_searchPlayerAngleY(i_actor); @@ -1661,7 +1655,7 @@ static int daAgb_Execute(daAgb_c* i_this) { } else { i_this->mBrk.play(); } - } else if (((i_this->isActive() || i_this->field_0x676 != 0) && + } else if (((i_this->isActive() || i_this->field_0x676) && (i_this->isFree() || i_this->getFollowTarget() == 1)) || (i_this->field_0x66b == 14 && i_this->field_0x65c > 120)) { @@ -1679,7 +1673,7 @@ static int daAgb_Draw(daAgb_c* i_this) { u8 var_r6 = 1; if (mDoGaC_GbaLink()) { - if (i_this->field_0x66f != 0 && !daAgb_c::mFlags.field_0xa_7 && + if (i_this->field_0x66f && !daAgb_c::mFlags.field_0xa_7 && (!dComIfGp_event_runCheck() || dComIfGp_evmng_startCheck("DEFAULT_AGB_LOOK_ATTENTION") || i_this->mMode == 2) && @@ -1698,8 +1692,7 @@ static int daAgb_Draw(daAgb_c* i_this) { mDoExt_modelUpdateDL(i_this->mpModel); - if (i_this->field_0x679 != 0 && - i_this->current.pos.y - i_this->mCrrPos.GetGroundH() > 2.5f) + if (i_this->field_0x679 && (i_this->current.pos.y - i_this->mCrrPos.GetGroundH()) > 2.5f) { dComIfGd_setSimpleShadow2(&i_this->current.pos, i_this->mCrrPos.GetGroundH(), 50.0f, i_this->mCrrPos.mGndChk, 0, 1.0f, &i_this->mTexObj); @@ -1783,16 +1776,16 @@ static int daAgb_Create(fopAc_ac_c* i_this) { TestDataManager[6].field_0x0 = (u32)&a_this->mItem; TestDataManager[12].field_0x0 = (u32)&a_this->mShop; - a_this->field_0x670 = 0; + a_this->field_0x670 = false; a_this->field_0x65c = 0; a_this->field_0x66b = 0; a_this->field_0x66f = mDoGaC_getComEnable(); a_this->mIsMsgSend = mDoGaC_getComEnable() > 0; a_this->field_0x654 = 0; - a_this->field_0x650 = -1; - a_this->mFollowTarget = 0; - a_this->field_0x67b = 0; - a_this->field_0x680 = 1; + a_this->setTargetID(fpcM_ERROR_PROCESS_ID_e); + a_this->setFollowTarget(false); + a_this->field_0x67b = false; + a_this->field_0x680 = true; fopAcM_setStageLayer(a_this); a_this->mEvtInfo.setEventName("DEFAULT_AGB_USE"); diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index 6160c7f16..74fd9bc6e 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -655,7 +655,7 @@ BOOL daAgbsw0_c::ExeSubF2() { agb->current.pos.z = z; agb->home.pos.z = z; agb->shape_angle.x = 0x3FFF; - agb->field_0x67f = 1; + agb->field_0x67f = true; mOrigScaleX = mScale.x; mOrigScaleZ = mScale.z; mScale.z = 50.0f; @@ -1294,13 +1294,13 @@ BOOL daAgbsw0_c::ExeSubB() { else if(restriction == 5) { if(agb) { if(HitCheck(player->current.pos, 60.0f)) { - agb->field_0x67d = 1; + agb->field_0x67d = true; agb->field_0x662 = fopAcM_GetParam(this); field_0x298 = 1; } else { if(field_0x298 == 1) { - agb->field_0x67d = 0; + agb->field_0x67d = false; field_0x298 = 0; } } @@ -1376,7 +1376,7 @@ BOOL daAgbsw0_c::ExeSubB() { agb->offBombDeny(); } else if(restriction != 6) { - agb->field_0x67b = 0; + agb->field_0x67b = false; } } @@ -1400,13 +1400,13 @@ BOOL daAgbsw0_c::ExeSubB() { } else { if(HitCheck(agb)) { - agb->field_0x67b = 1; - agb->field_0x65e = fopAcM_GetParam(this); + agb->field_0x67b = true; + agb->field_0x65e = fopAcM_GetParam(this) & 0xFFFF; field_0x298 = 1; } else { if(field_0x298 == 1) { - agb->field_0x67b = 0; + agb->field_0x67b = false; field_0x298 = 0; } } @@ -1438,7 +1438,7 @@ BOOL daAgbsw0_c::ExeSubD() { if(agb->isActive() && agb->isFree() && HitCheck(agb)) { MailSend(0x5F00, 0xC, 0xFF, 0xFF, 0x19); agb->onHold(); - agb->field_0x675 = 1; + agb->field_0x675 = true; f32 x = current.pos.x; agb->current.pos.x = x; @@ -1450,7 +1450,7 @@ BOOL daAgbsw0_c::ExeSubD() { agb->current.pos.z = z; agb->home.pos.z = z; agb->shape_angle.x = -0x3FFF; - agb->field_0x67f = 1; + agb->field_0x67f = true; mOrigScaleX = mScale.x; mOrigScaleZ = mScale.z; mScale.z = 50.0f; @@ -1465,7 +1465,7 @@ BOOL daAgbsw0_c::ExeSubD() { agb->shape_angle.x = 0x3FFF; agb->home.pos.y += 50.0f; agb->current.pos.y = agb->home.pos.y; - agb->field_0x676 = 1; + agb->field_0x676 = true; field_0x299 += 1; } @@ -2507,10 +2507,10 @@ static BOOL daAgbsw0_Delete(daAgbsw0_c* i_this) { daAgbsw0_c::mFigureBeat = 0; } else if(temp == 5) { - agb->field_0x67d = 0; + agb->field_0x67d = false; } else { - agb->field_0x67b = 0; + agb->field_0x67b = false; } } else if(id == 4) { diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index f065b8fcc..258a59ef5 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -1070,7 +1070,7 @@ static BOOL daAM_IsDelete(am_class* i_this) { /* 000039AC-00003A84 .text daAM_Delete__FP8am_class */ static BOOL daAM_Delete(am_class* i_this) { - dComIfG_resDelete(&i_this->mPhs, "AM"); + dComIfG_resDelete(&i_this->mPhase, "AM"); for (int i = 0; i < 4; i++) { i_this->mSmokeCbs[i].end(); @@ -1139,7 +1139,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { am_class* i_this = (am_class*)i_actor; - s32 phase_state = dComIfG_resLoad(&i_this->mPhs, "AM"); + s32 phase_state = dComIfG_resLoad(&i_this->mPhase, "AM"); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x1C80)) { return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index b4e2cd122..4aa5b3f45 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1193,7 +1193,7 @@ static BOOL daAM2_IsDelete(am2_class* i_this) { /* 00003AC0-00003B18 .text daAM2_Delete__FP9am2_class */ static BOOL daAM2_Delete(am2_class* i_this) { - dComIfG_resDelete(&i_this->mPhs, "AM2"); + dComIfG_resDelete(&i_this->mPhase, "AM2"); i_this->mSmokeCb.end(); i_this->mRippleCb.end(); @@ -1275,7 +1275,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { am2_class* i_this = (am2_class*)i_actor; - s32 phase_state = dComIfG_resLoad(&i_this->mPhs, "AM2"); + s32 phase_state = dComIfG_resLoad(&i_this->mPhase, "AM2"); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x1AA0)) { return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index deab371b6..6066e1955 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -1354,7 +1354,7 @@ static BOOL daBk_IsDelete(bk_class* i_this) { /* 0000DD24-0000DDD8 .text daBk_Delete__FP8bk_class */ static BOOL daBk_Delete(bk_class* i_this) { - dComIfG_resDelete(&i_this->mPhs, "Bk"); + dComIfG_resDelete(&i_this->mPhase, "Bk"); if (i_this->heap) { i_this->mpMorf->stopZelAnime(); } @@ -1588,7 +1588,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { fopAcM_SetupActor(i_actor, bk_class); bk_class* i_this = (bk_class*)i_actor; - s32 phase_state = dComIfG_resLoad(&i_this->mPhs, "Bk"); + s32 phase_state = dComIfG_resLoad(&i_this->mPhase, "Bk"); if (phase_state == cPhs_COMPLEATE_e) { i_this->mGbaName = 1; diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index b3684bff6..929d67bd2 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -409,7 +409,7 @@ namespace daBomb2 { int Act_c::_create() { fopAcM_SetupActor(this, Act_c); - int status = dComIfG_resLoad(&mPhs, attr().resName); + int status = dComIfG_resLoad(&mPhase, attr().resName); if(status == cPhs_COMPLEATE_e) { if(fopAcM_entrySolidHeap(this, solidHeapCB, attr().heapSize)) { @@ -428,7 +428,7 @@ namespace daBomb2 { bool Act_c::_delete() { eff_fuse_end(); mEnv.clean(); - dComIfG_resDelete(&mPhs, attr().resName); + dComIfG_resDelete(&mPhase, attr().resName); return true; } diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index 3b077ea4d..8ae5c4ee7 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -1252,7 +1252,7 @@ bool daBomb_c::bombDelete() { se_cannon_fly_stop(); if(mType == 1) { - dComIfG_resDelete(&mPhs, m_attrType[mType].resName); + dComIfG_resDelete(&mPhase, m_attrType[mType].resName); } dKy_actor_addcol_set(0, 0, 0, 0.0f); @@ -1333,7 +1333,7 @@ int daBomb_c::create() { int status; if(mType == 1) { - status = dComIfG_resLoad(&mPhs, m_attrType[mType].resName); + status = dComIfG_resLoad(&mPhase, m_attrType[mType].resName); } else { status = cPhs_COMPLEATE_e; diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index de85ee74f..02726a729 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -192,7 +192,7 @@ inline s32 daBranch_c::create() { fopAcM_SetupActor(this, daBranch_c); - phase_state = dComIfG_resLoad(&mPhs, daBranch_c::m_arcname); + phase_state = dComIfG_resLoad(&mPhase, daBranch_c::m_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, daBranch_c::solidHeapCB, 0x4000)) { for (int i = 0; i < (s32)ARRAY_SIZE(mAnims); i++) { diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index a408d3f19..4fe5f83c1 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -126,12 +126,8 @@ int daIkari_c::_create() { fopAcM_SetMtx(this, &mpModel->mBaseTransformMtx[0]); fopAcM_setCullSizeBox(this, - /* minX */ -160.0f * mScaleX, - /* minY */ -2500.0f * mScaleX, - /* minZ */ -600.0f * mScaleX, - /* maxX */ 160.0f * mScaleX, - /* maxY */ 100.0f * mScaleX, - /* maxZ */ 600.0f * mScaleX); + -160.0f * mScaleX, -2500.0f * mScaleX, -600.0f * mScaleX, + 160.0f * mScaleX, 100.0f * mScaleX, 600.0f * mScaleX); fopAcM_setCullSizeFar(this, 10.0f); mTimer = (short)(int)cM_rndF(32768.0f); diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 4dd8d2725..c94a89ea7 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -429,7 +429,7 @@ s32 daNpc_Md_c::create() { heapSizeIdx = 1; } - s32 phase_state = dComIfG_resLoad(&mPhs, mModelArcName); + s32 phase_state = dComIfG_resLoad(&mPhase, mModelArcName); m313D = 1; if (phase_state == cPhs_COMPLEATE_e) { if (dComIfGp_getCb1Player() != NULL) { @@ -3044,7 +3044,7 @@ void daNpc_Md_c::emitterDelete(JPABaseEmitter** pEmitter) { /* 000109DC-000110BC .text __dt__10daNpc_Md_cFv */ daNpc_Md_c::~daNpc_Md_c() { - dComIfG_resDelete(&mPhs, mModelArcName); + dComIfG_resDelete(&mPhase, mModelArcName); if (heap) { mpMorf->stopZelAnime(); } diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 566ff0786..3879d1392 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -67,7 +67,7 @@ s32 daObjYgush00_c::_create() { mType = 0; } - s32 ret = dComIfG_resLoad(&mPhs, l_arcname); + s32 ret = dComIfG_resLoad(&mPhase, l_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x740) == 1) { @@ -89,7 +89,7 @@ s32 daObjYgush00_c::_create() { /* 000004F4-00000524 .text _delete__14daObjYgush00_cFv */ bool daObjYgush00_c::_delete() { - dComIfG_resDelete(&mPhs, l_arcname); + dComIfG_resDelete(&mPhase, l_arcname); return true; } diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp index a20d41653..fa03a87ec 100644 --- a/src/d/actor/d_a_obj_gaship2.cpp +++ b/src/d/actor/d_a_obj_gaship2.cpp @@ -43,17 +43,17 @@ bool daObjGaship2::Act_c::create_heap() { /* 00000220-000002F8 .text _create__Q212daObjGaship25Act_cFv */ s32 daObjGaship2::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mphs, M_arcname); - if (phase == cPhs_COMPLEATE_e) { + int phase_state = dComIfG_resLoad(&mphs, M_arcname); + if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); dComIfG_Bgsp()->Regist(mpBgW, this); mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); } else { - phase = cPhs_ERROR_e; + phase_state = cPhs_ERROR_e; } } - return phase; + return phase_state; } /* 000002F8-00000384 .text _delete__Q212daObjGaship25Act_cFv */ diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 601378ad7..b6d317d0b 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -281,7 +281,7 @@ int daObjMknjD::Act_c::Create() { mAttentionInfo.mDistances[3] = 0x3D; mAttentionInfo.mFlags |= fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_CHECK_e; - if (checkItemGet(mGiveItemNo, 1) == 0) { + if (!checkItemGet(mGiveItemNo, 1)) { m043F = 8; mEvtInfo.setXyCheckCB(daObjMknjD_XyCheckCB); mEvtInfo.setXyEventCB(daObjMknjD_XyEventCB); @@ -859,7 +859,7 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) { privateCut(); if (!dComIfGp_event_runCheck()) { - if (checkItemGet(mGiveItemNo, 1) != 0) { + if (checkItemGet(mGiveItemNo, 1)) { m043F = 0; } else { @@ -877,7 +877,7 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) { player->offPlayerNoDraw(); dComIfGp_event_reset(); - if (checkItemGet(mGiveItemNo, 1) != 0) { + if (checkItemGet(mGiveItemNo, 1)) { m043F = 0; } else { diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index a82259639..e357b0bd2 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -279,7 +279,7 @@ s32 daObjMtest::Act_c::Mthd_Create() { M_type = prm_get_type(); JUT_ASSERT(327, M_type < Type_Max); - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname[M_type]); + s32 phase_state = dComIfG_resLoad(&mPhase, M_arcname[M_type]); if (phase_state == cPhs_COMPLEATE_e) { s32 dzb_idx = 0; if (prm_get_arg1() == 1) { @@ -322,7 +322,7 @@ BOOL daObjMtest::Act_c::Delete() { /* 00000960-000009B8 .text Mthd_Delete__Q210daObjMtest5Act_cFv */ BOOL daObjMtest::Act_c::Mthd_Delete() { s32 result = MoveBGDelete(); - dComIfG_resDelete(&mPhs, M_arcname[M_type]); + dComIfG_resDelete(&mPhase, M_arcname[M_type]); return result; } diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 3268c8db6..9dcaf9f1e 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -13,36 +13,37 @@ s16 m_evid; } Mtx daObjVfan::Act_c::M_tmp_mtx; -const char daObjVfan::Act_c::M_arcname[5] = "Vfan"; +const char daObjVfan::Act_c::M_arcname[] = "Vfan"; -static dCcD_SrcCyl cyl_check_src = {{ - /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_PGANON_SWORD, - /* SrcObjTg SPrm */ 9, - /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ 0, - /* SrcGObjAt HitMark */ 0, - /* SrcGObjAt Spl */ 0, - /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ 0, - /* SrcGObjTg HitMark */ 0, - /* SrcGObjTg Spl */ 0, - /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ 0, - /* SrcGObjCo SPrm */ 0, - }, - { - /* Center */ - 0.0f, - 0.0f, - 0.0f, - /* Radius */ 100.0f, - /* Height */ 300.0f, - }}; +static dCcD_SrcCyl cyl_check_src = { + // dCcD_SrcGObjInf + { + /* Flags */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_PGANON_SWORD, + /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjCo SPrm */ 0, + /* SrcGObjAt Se */ 0, + /* SrcGObjAt HitMark */ 0, + /* SrcGObjAt Spl */ 0, + /* SrcGObjAt Mtrl */ 0, + /* SrcGObjAt SPrm */ 0, + /* SrcGObjTg Se */ 0, + /* SrcGObjTg HitMark */ 0, + /* SrcGObjTg Spl */ 0, + /* SrcGObjTg Mtrl */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, + }, + // cM3dGCylS + { + /* Center */ 0.0f, 0.0f, 0.0f, + /* Radius */ 100.0f, + /* Height */ 300.0f, + } +}; /* 00000078-00000134 .text CreateHeap__Q29daObjVfan5Act_cFv */ int daObjVfan::Act_c::CreateHeap() { @@ -84,14 +85,14 @@ int daObjVfan::Act_c::Create() { s32 daObjVfan::Act_c::Mthd_Create() { fopAcM_SetupActor(this, daObjVfan::Act_c); - cPhs__Step phase_state; + int phase_state; if (fopAcM_isSwitch(this, prm_get_swSave())) { return cPhs_UNK3_e; } else { - phase_state = (cPhs__Step)dComIfG_resLoad(&mPhs, M_arcname); + phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { - phase_state = (cPhs__Step)MoveBGCreate(M_arcname, 7, NULL, 0xa60); + phase_state = MoveBGCreate(M_arcname, 7, NULL, 0xa60); JUT_ASSERT(0xc6, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp index eaad3adba..7954bdf18 100644 --- a/src/d/actor/d_a_spc_item01.cpp +++ b/src/d/actor/d_a_spc_item01.cpp @@ -75,15 +75,15 @@ BOOL daSpcItem01_c::_delete() { } /* 8015DBF4-8015DDD0 .text _create__13daSpcItem01_cFv */ -cPhs__Step daSpcItem01_c::_create() { +s32 daSpcItem01_c::_create() { fopAcM_SetupActor(this, daSpcItem01_c); m_itemNo = daSpcItem01_prm::getItemNo(this); if (m_itemNo == SHIELD && dComIfGs_isEventBit(0xE20)) { setLoadError(); return cPhs_ERROR_e; } - cPhs__Step phs_step = (cPhs__Step)dComIfG_resLoad(&mPhs, dItem_data::getFieldArc(m_itemNo)); - if (phs_step == cPhs_COMPLEATE_e) { + int phase_state = dComIfG_resLoad(&mPhs, dItem_data::getFieldArc(m_itemNo)); + if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, &CheckFieldItemCreateHeap, dItem_data::getHeapSize(m_itemNo))) { @@ -91,7 +91,7 @@ cPhs__Step daSpcItem01_c::_create() { } CreateInit(); } - return phs_step; + return phase_state; } /* 8015DDD0-8015DF4C .text CreateInit__13daSpcItem01_cFv */