diff --git a/include/d/actor/d_a_boomerang.h b/include/d/actor/d_a_boomerang.h index 2faa0aa1e..a32f8116b 100644 --- a/include/d/actor/d_a_boomerang.h +++ b/include/d/actor/d_a_boomerang.h @@ -3,6 +3,10 @@ #include "f_op/f_op_actor.h" #include "d/d_cc_d.h" +#include "JSystem/J3DGraphBase/J3DPacket.h" +#include "d/d_bg_s_lin_chk.h" +#include "d/d_bg_s_gnd_chk.h" +#include "d/d_drawlist.h" #define BOOMERANG_LOCK_MAX 5 diff --git a/include/d/actor/d_a_fgmahou.h b/include/d/actor/d_a_fgmahou.h index 63f685987..19c6ba02f 100644 --- a/include/d/actor/d_a_fgmahou.h +++ b/include/d/actor/d_a_fgmahou.h @@ -4,7 +4,7 @@ #include "f_op/f_op_actor.h" #include "d/d_bg_s_acch.h" #include "d/d_cc_d.h" -#include "m_do/m_Do_ext.h" +#include "m_Do/m_Do_ext.h" #include "d/d_particle.h" class fgmahou_class : public fopAc_ac_c { diff --git a/include/d/actor/d_a_npc_tc.h b/include/d/actor/d_a_npc_tc.h index 0ea9ef3b1..0a38706f4 100644 --- a/include/d/actor/d_a_npc_tc.h +++ b/include/d/actor/d_a_npc_tc.h @@ -3,6 +3,7 @@ #include "f_op/f_op_actor.h" #include "d/d_npc.h" +#include "d/d_particle.h" namespace daObjSmplbg { class Act_c; }; diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index 18ca2d9e5..cdc957ee9 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -263,7 +263,7 @@ cPhs_State daBeam_c::CreateInit() { fopAcM_SetMtx(this, M_mdl->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -50.0f, -50.0f, 0.0f, 50.0f, 50.0f, 2000.0f); - if (parentActorID == -1) { + if (parentActorID == fpcM_ERROR_PROCESS_ID_e) { u8 params1 = fopAcM_GetParam(this) & 0xFF; s8 params2 = (fopAcM_GetParam(this) >> 8) & 0xFF; params1 = cLib_maxLimit(params1, 2); diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index dc6643561..26a122bfa 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -69,8 +69,8 @@ void daBoomerang_blur_c::copyBlur(MtxP mtx, s16 yRot) { for (i = 0; i < SEGMENTS_PER_STEP; i++) { mDoMtx_stack_c::multVec(&l_blur_top, &trail0_vtxArr0[i]); mDoMtx_stack_c::multVec(&l_blur_root, &trail0_vtxArr1[i]); - VECAdd(&trail0_vtxArr0[i], &(diff * t), &trail0_vtxArr0[i]); - VECAdd(&trail0_vtxArr1[i], &(diff * t), &trail0_vtxArr1[i]); + trail0_vtxArr0[i] += diff * t; + trail0_vtxArr1[i] += diff * t; t += 1.0f / SEGMENTS_PER_STEP; mDoMtx_stack_c::YrotM(yRotPerStep); } @@ -84,8 +84,8 @@ void daBoomerang_blur_c::copyBlur(MtxP mtx, s16 yRot) { for (i = 0; i < SEGMENTS_PER_STEP; i++) { mDoMtx_stack_c::multVec(&l_blur_top, &trail1_vtxArr0[i]); mDoMtx_stack_c::multVec(&l_blur_root, &trail1_vtxArr1[i]); - VECAdd(&trail1_vtxArr0[i], &(diff * t), &trail1_vtxArr0[i]); - VECAdd(&trail1_vtxArr1[i], &(diff * t), &trail1_vtxArr1[i]); + trail1_vtxArr0[i] += diff * t; + trail1_vtxArr1[i] += diff * t; t += 1.0f / SEGMENTS_PER_STEP; mDoMtx_stack_c::YrotM(-yRotPerStep); } @@ -622,7 +622,7 @@ BOOL daBoomerang_c::procMove() { } } } else { - if (dist < speedF || mCps.ChkAtHit() && mCps.GetAtHitAc() == mLockActors[mCurLockIdx]) { + if (dist < speedF || (mCps.ChkAtHit() && mCps.GetAtHitAc() == mLockActors[mCurLockIdx])) { // Boomerang hit its current target. mJustHit = true; mLockActors[mCurLockIdx] = NULL; diff --git a/src/d/actor/d_a_dai.cpp b/src/d/actor/d_a_dai.cpp index 3ea07d4e9..e0cf866af 100644 --- a/src/d/actor/d_a_dai.cpp +++ b/src/d/actor/d_a_dai.cpp @@ -268,7 +268,7 @@ void daDai_c::proc() { } } - if ((m84C != 0) && talk(1) == 0x12) { + if ((m84C != 0) && talk(1) == fopMsgStts_BOX_CLOSED_e) { dComIfGp_event_reset(); m84C = 0; } diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp index f3a01504d..e25e8a174 100644 --- a/src/d/actor/d_a_npc_rsh1.cpp +++ b/src/d/actor/d_a_npc_rsh1.cpp @@ -879,7 +879,7 @@ u16 daNpc_Rsh1_c::shop_talk() { /* 00001DE4-00001FE0 .text talk__12daNpc_Rsh1_cFv */ u16 daNpc_Rsh1_c::talk() { - u16 result = 0xFF; + u16 status = 0xFF; if (m961 == 0) { l_msgId = fpcM_ERROR_PROCESS_ID_e; @@ -904,10 +904,10 @@ u16 daNpc_Rsh1_c::talk() { setAnmFromMsgTag(); switch (m961) { case 2: - result = normal_talk(); + status = normal_talk(); break; case 3: - result = shop_talk(); + status = shop_talk(); break; } if (dComIfGp_checkMesgSendButton()) { @@ -933,7 +933,7 @@ u16 daNpc_Rsh1_c::talk() { mShopCamAct.m54 = mpShopItems->mSelectedItemIdx; } - return result; + return status; } /* 00001FE0-00002358 .text CreateInit__12daNpc_Rsh1_cFv */ diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp index 9797facad..5e4e22b8f 100644 --- a/src/d/actor/d_a_npc_tc.cpp +++ b/src/d/actor/d_a_npc_tc.cpp @@ -723,7 +723,7 @@ void daNpc_Tc_c::anmAtr(u16 i_msgStatus) { }; switch (i_msgStatus) { - case fopMsgStts_MSG_TYPING_e: + case fopMsgStts_MSG_TYPING_e: { if(field_0x6C8) { return; } @@ -734,7 +734,7 @@ void daNpc_Tc_c::anmAtr(u16 i_msgStatus) { } mAnmPrmIdx = anm_atr[msgAnmAtr]; break; - + } case fopMsgStts_MSG_DISPLAYED_e: field_0x6C8 = FALSE; break; @@ -1278,7 +1278,7 @@ void daNpc_Tc_c::statusWalkToJail() { void daNpc_Tc_c::statusTalkNearJail() { mTargetSpeed = 0.0f; speedF = 0.0f; - if (talk(1) == 0x12) { + if (talk(1) == fopMsgStts_BOX_CLOSED_e) { mStatus = STATUS_WAIT_NEAR_JAIL; dComIfGp_event_reset(); mTalkingNearJail = false; @@ -1391,7 +1391,7 @@ void daNpc_Tc_c::statusSitToStool() { /* 00002F94-00003028 .text statusTalk__10daNpc_Tc_cFv */ void daNpc_Tc_c::statusTalk() { - if(talk(1) != 0x12) { + if(talk(1) != fopMsgStts_BOX_CLOSED_e) { return; } @@ -1415,7 +1415,7 @@ void daNpc_Tc_c::statusTalk() { /* 00003028-00003088 .text statusPayRupee__10daNpc_Tc_cFv */ void daNpc_Tc_c::statusPayRupee() { - if(talk(1) == 0x12) { + if(talk(1) == fopMsgStts_BOX_CLOSED_e) { dComIfGp_event_reset(); mEventIdx = 9; mStatus = STATUS_DEMO_PAY_RUPEE; @@ -1433,7 +1433,7 @@ void daNpc_Tc_c::statusDemoPayRupee() { /* 000030F8-00003158 .text statusGetRupee__10daNpc_Tc_cFv */ void daNpc_Tc_c::statusGetRupee() { - if(talk(1) == 0x12) { + if(talk(1) == fopMsgStts_BOX_CLOSED_e) { dComIfGp_event_reset(); mEventIdx = 8; mStatus = STATUS_DEMO_GET_RUPEE; @@ -1452,7 +1452,7 @@ void daNpc_Tc_c::statusDemoGetRupee() { /* 000031CC-0000322C .text statusMonumentComplete__10daNpc_Tc_cFv */ void daNpc_Tc_c::statusMonumentComplete() { - if(talk(1) == 0x12) { + if(talk(1) == fopMsgStts_BOX_CLOSED_e) { dComIfGp_event_reset(); mEventIdx = 8; mStatus = STATUS_DEMO_MONUMENT_COMPLETE; diff --git a/src/d/actor/d_a_npc_tc_msg_normal2.inc b/src/d/actor/d_a_npc_tc_msg_normal2.inc index 90b3a5206..203b5e336 100644 --- a/src/d/actor/d_a_npc_tc_msg_normal2.inc +++ b/src/d/actor/d_a_npc_tc_msg_normal2.inc @@ -1,6 +1,9 @@ // The original name of this file is unknown, but it must exist because d_a_npc_tc's "normal2's" functions // are in a separate .text section from the rest of its functions. +#include "d/actor/d_a_npc_tc.h" +#include "d/d_com_inf_game.h" + /* 00004BAC-00004E6C .text next_msgStatusNormal2__10daNpc_Tc_cFPUl */ u16 daNpc_Tc_c::next_msgStatusNormal2(u32* pMsgNo) { u16 msgStatus = fopMsgStts_MSG_CONTINUES_e; diff --git a/src/d/actor/d_a_npc_tc_msg_red.inc b/src/d/actor/d_a_npc_tc_msg_red.inc index 417d38320..fdb39f569 100644 --- a/src/d/actor/d_a_npc_tc_msg_red.inc +++ b/src/d/actor/d_a_npc_tc_msg_red.inc @@ -1,6 +1,9 @@ // The original name of this file is unknown, but it must exist because d_a_npc_tc's "red's" functions // are in a separate .text section from the rest of its functions. +#include "d/actor/d_a_npc_tc.h" +#include "d/d_com_inf_game.h" + /* 00005498-00005720 .text next_msgStatusRed__10daNpc_Tc_cFPUl */ u16 daNpc_Tc_c::next_msgStatusRed(u32* pMsgNo) { u16 msgStatus = fopMsgStts_MSG_CONTINUES_e; diff --git a/src/d/actor/d_a_npc_tc_msg_white.inc b/src/d/actor/d_a_npc_tc_msg_white.inc index 1292743d3..df6359f48 100644 --- a/src/d/actor/d_a_npc_tc_msg_white.inc +++ b/src/d/actor/d_a_npc_tc_msg_white.inc @@ -1,6 +1,9 @@ // The original name of this file is unknown, but it must exist because d_a_npc_tc's "white's" functions // are in a separate .text section from the rest of its functions. +#include "d/actor/d_a_npc_tc.h" +#include "d/d_com_inf_game.h" + /* 00005158-000053D4 .text next_msgStatusWhite__10daNpc_Tc_cFPUl */ u16 daNpc_Tc_c::next_msgStatusWhite(u32* pMsgNo) { m_jnt.offHeadLock(); diff --git a/src/d/actor/d_a_tag_hint.cpp b/src/d/actor/d_a_tag_hint.cpp index a04049fc2..5296788dd 100644 --- a/src/d/actor/d_a_tag_hint.cpp +++ b/src/d/actor/d_a_tag_hint.cpp @@ -496,7 +496,7 @@ void daTag_Hint_c::talkInit() { /* 000018C0-00001A00 .text talk__12daTag_Hint_cFv */ u16 daTag_Hint_c::talk() { - u16 sVar3 = 0xff; + u16 status = 0xff; if (m294 == 0) { l_msgId = fpcM_ERROR_PROCESS_ID_e; m290 = getMsg(); @@ -513,13 +513,13 @@ u16 daTag_Hint_c::talk() { } break; case 2: - sVar3 = l_msg->mStatus; - if (sVar3 == fopMsgStts_MSG_DISPLAYED_e) { + status = l_msg->mStatus; + if (status == fopMsgStts_MSG_DISPLAYED_e) { l_msg->mStatus = next_msgStatus(&m290); if (l_msg->mStatus == fopMsgStts_MSG_CONTINUES_e) { fopMsgM_messageSet(m290); } - } else if (sVar3 == fopMsgStts_BOX_CLOSED_e) { + } else if (status == fopMsgStts_BOX_CLOSED_e) { l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e; m294 = -1; } @@ -527,7 +527,7 @@ u16 daTag_Hint_c::talk() { } } } - return sVar3; + return status; } /* 00001A00-00001D98 .text actionEvent__12daTag_Hint_cFv */ @@ -573,7 +573,7 @@ BOOL daTag_Hint_c::actionEvent() { switch (iVar2) { case 1: sVar3 = talk(); - if (sVar3 == 0x12) { + if (sVar3 == fopMsgStts_BOX_CLOSED_e) { mDoAud_seStart(JA_SE_ITM_OMAMORI_ED_TALK); dComIfGp_evmng_cutEnd(m29C); setActio(1); diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp index 5bacf50f1..ad2a30ca8 100644 --- a/src/d/actor/d_a_tag_island.cpp +++ b/src/d/actor/d_a_tag_island.cpp @@ -154,7 +154,7 @@ void daTag_Island_c::talkInit() { /* 0000056C-000006AC .text talk__14daTag_Island_cFv */ u16 daTag_Island_c::talk() { - u16 ret = 0xFF; + u16 status = 0xFF; if (mTalkState == 0) { l_msgId = fpcM_ERROR_PROCESS_ID_e; @@ -171,13 +171,13 @@ u16 daTag_Island_c::talk() { mTalkState = 2; break; case 2: - ret = l_msg->mStatus; - if (ret == fopMsgStts_MSG_DISPLAYED_e) { + status = l_msg->mStatus; + if (status == fopMsgStts_MSG_DISPLAYED_e) { l_msg->mStatus = next_msgStatus(&mMsg); if (l_msg->mStatus == fopMsgStts_MSG_CONTINUES_e) { fopMsgM_messageSet(mMsg); } - } else if (ret == fopMsgStts_BOX_CLOSED_e) { + } else if (status == fopMsgStts_BOX_CLOSED_e) { l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e; mTalkState = -1; } @@ -186,7 +186,7 @@ u16 daTag_Island_c::talk() { } } - return ret; + return status; } /* 000006AC-00000778 .text demoInitTact_Bf__14daTag_Island_cFv */