diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-07-23 17:48:51 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-07-23 17:48:51 -0400 |
| commit | 4efda6f35537a2d546841d1eb9579563bb581ab8 (patch) | |
| tree | f349c9f5d0ccff91c2bb919d9d0ab908118567f4 /src | |
| parent | 2115d05965267975bde15c7d898c9fd7f3bbde68 (diff) | |
Minor cleanup
Inlines, wrong indentation, enums, private fields, etc
Diffstat (limited to 'src')
41 files changed, 1652 insertions, 1787 deletions
diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index 03619a6c..9ccd40f0 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -2341,48 +2341,48 @@ static BOOL daBb_Execute(bb_class* i_this) { break; case 2: { - fopAc_ac_c* ac = fopAcM_SearchByID(i_this->unk_2E8); - if (ac != NULL) { - i_this->unk_2E4 = ac; - i_this->unk_2DF = 3; - } + fopAc_ac_c* ac = fopAcM_SearchByID(i_this->unk_2E8); + if (ac != NULL) { + i_this->unk_2E4 = ac; + i_this->unk_2DF = 3; } break; + } case 3: { - fopAc_ac_c* ac = i_this->unk_2E4; - - sp10.x = (i_this->unk_A6C[1].x - i_this->unk_A6C[0].x) / 2.0f + i_this->unk_A6C[0].x; - sp10.y = (i_this->unk_A6C[1].y - i_this->unk_A6C[0].y) / 2.0f + i_this->unk_A6C[0].y; - sp10.z = (i_this->unk_A6C[1].z - i_this->unk_A6C[0].z) / 2.0f + i_this->unk_A6C[0].z; - - ac->current.pos = sp10; - ac->current.angle = i_this->actor.current.angle; - ac->shape_angle = i_this->actor.current.angle; - - if (i_this->unk_2EC == fpcNm_MO2_e || i_this->unk_2EC == fpcNm_BK_e) { - damagereaction* dr; - - if (i_this->unk_2EC == fpcNm_MO2_e) { - dr = &((mo2_class*)ac)->mDamageReaction; - dr->m468 = REG0_F(8) * 10.0f + -110.0f; - dr->m46C = REG0_F(9) * 10.0f + 10.0f; - } else if (i_this->unk_2EC == fpcNm_BK_e) { - dr = &((bk_class*)ac)->dr; - dr->m468 = REG0_F(8) * 10.0f + -100.0f; - dr->m46C = REG0_F(9) * 10.0f; - } - - if (i_this->unk_2E0 != 0) { - i_this->unk_2DF = 0; - anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); - dr->mAction = 31; - ac->speedF = 40.0f; - } + fopAc_ac_c* ac = i_this->unk_2E4; + + sp10.x = (i_this->unk_A6C[1].x - i_this->unk_A6C[0].x) / 2.0f + i_this->unk_A6C[0].x; + sp10.y = (i_this->unk_A6C[1].y - i_this->unk_A6C[0].y) / 2.0f + i_this->unk_A6C[0].y; + sp10.z = (i_this->unk_A6C[1].z - i_this->unk_A6C[0].z) / 2.0f + i_this->unk_A6C[0].z; + + ac->current.pos = sp10; + ac->current.angle = i_this->actor.current.angle; + ac->shape_angle = i_this->actor.current.angle; + + if (i_this->unk_2EC == fpcNm_MO2_e || i_this->unk_2EC == fpcNm_BK_e) { + damagereaction* dr; + + if (i_this->unk_2EC == fpcNm_MO2_e) { + dr = &((mo2_class*)ac)->mDamageReaction; + dr->m468 = REG0_F(8) * 10.0f + -110.0f; + dr->m46C = REG0_F(9) * 10.0f + 10.0f; + } else if (i_this->unk_2EC == fpcNm_BK_e) { + dr = &((bk_class*)ac)->dr; + dr->m468 = REG0_F(8) * 10.0f + -100.0f; + dr->m46C = REG0_F(9) * 10.0f; } + if (i_this->unk_2E0 != 0) { + i_this->unk_2DF = 0; + anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e); + dr->mAction = 31; + ac->speedF = 40.0f; + } } + break; + } } } diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index 3e03b4e6..03843c2b 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -2544,7 +2544,7 @@ static void hensin(bgn_class* i_this) { i_this->mC728.y = REG0_F(2) + -1000.0f; i_this->mC770 = REG0_S(0) + 0x14; for (s32 i = 0; i < 8; i++) { - i_this->mAAA8[i].m2F8 = REG0_S(7) + 0x3c; + i_this->mAAA8[i].m2F8 = REG0_S(7) + 60; i_this->mAAA8[i].m2F4 = REG0_F(15) + 6000.0f; } if (i_this->mC74A == 1) { @@ -2592,7 +2592,7 @@ static void hensin(bgn_class* i_this) { } cLib_addCalc2(&i_this->mC728.y, REG0_F(9) + 1000.0f, 0.05f, actor->speed.y); cLib_addCalc2(&actor->speed.y, 50.0f, 1.0f, 0.2f); - if (i_this->mC7AC[0] <= 0x64) { + if (i_this->mC7AC[0] <= 100) { cLib_addCalc0(&i_this->mCC80, 1.0f, 0.02f); if (i_this->mC7AC[0] == 100) { mDoAud_seStart(JA_SE_CM_BGN_D_TO_T_1, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -2811,6 +2811,7 @@ static void action_s(bgn_class* i_this, move_s* param_2, int param_3) { param_2->m2E0.x = l_HIO.m0CE; param_2->m2E0.y = l_HIO.m0D0; param_2->m2E0.z = l_HIO.m0D2; + break; } } if (param_2->m2D0 == 0) { @@ -2867,7 +2868,7 @@ static void action_main(bgn_class* i_this) { pcVar5 = i_this->mRedRopeMat.getSize(0); for (s32 i = 0; i < 60; i++, pcVar7++, pcVar5++) { dVar9 = i_this->mC774 * cM_ssin(cM_rad2s(0.053247336f * (f32)(i))); - dVar9 *= (0.01666667f * (f32)(0x3B - i)); + dVar9 *= (0.01666667f * (f32)(59 - i)); local_90.x = dVar9 * cM_ssin(i_this->mC746 * (REG0_S(3) + 300) + i * (REG0_S(4) + 2000)); local_90.z = dVar9 * cM_ssin(i_this->mC746 * (REG0_S(5) + 0xfa) + i * (REG0_S(6) + 2000)); *pcVar7 = local_9c + local_90; @@ -2908,6 +2909,7 @@ static void action_main(bgn_class* i_this) { case 10: i_this->mC754 = 1; i_this->mCC80 = 1.0f; + break; } if (i_this->mC748 > 0) { cLib_addCalcAngleS2(&i_this->mC750, 0, 10, 0x200); @@ -3516,16 +3518,16 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) { return FALSE; } pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e); - if (!i_this->mRedRopeMat.init(1, 0x3C, pBti, 1)) { + if (!i_this->mRedRopeMat.init(1, 60, pBti, 1)) { return FALSE; } pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_HIMO_e); - if (!i_this->mBlueRopeMat.init(8, 0x3C, pBti, 1)) { + if (!i_this->mBlueRopeMat.init(8, 60, pBti, 1)) { return FALSE; } #if VERSION > VERSION_DEMO pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e); - if (!i_this->mDefeatCSRopeMat.init(1, 0x3C, pBti, 1)) { + if (!i_this->mDefeatCSRopeMat.init(1, 60, pBti, 1)) { return FALSE; } #endif @@ -3709,7 +3711,7 @@ static cPhs_State daBgn_Create(fopAc_ac_c* a_this) { } i_this->mCC80 = 1.0f; i_this->mC748 = 7; - i_this->mC7AC[0] = 0x3c; + i_this->mC7AC[0] = 60; #if VERSION > VERSION_DEMO bg_tevstr = a_this->tevStr; i_this->mWaterTevStr = a_this->tevStr; diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index b0973185..684e0064 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -1864,7 +1864,6 @@ static void fight_run(bk_class* i_this) { } break; } - } if (i_this->mPlayerDistance < l_bkHIO.m030) { diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index e57fb4e8..82192c65 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -575,6 +575,7 @@ void move(bmdfoot_class* i_this) { break; case 0xb: end(i_this); + break; } if (boss->m332 == 3) { housi_off(i_this); diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index a6b36e44..8403d281 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -174,13 +174,13 @@ BOOL daBoko_c::draw() { if (checkNoDraw()) { if (mParticleCallBack.getEmitter() != NULL) { - mParticleCallBack.getEmitter()->setStatus(4); + mParticleCallBack.getEmitter()->stopDrawParticle(); } return TRUE; } if (mParticleCallBack.getEmitter() != NULL) { - mParticleCallBack.getEmitter()->clearStatus(4); + mParticleCallBack.getEmitter()->playDrawParticle(); } if (mFlameTimer != 0) { diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 9a8ea6bc..1b6001b1 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -783,15 +783,15 @@ namespace daBomb2 { } void Act_c::se_explode() { - fopAcM_seStart(this, JA_SE_OBJ_BOMB_EXPLODE, 0); + fopAcM_seStart(this, JA_SE_OBJ_BOMB_EXPLODE, 0); } void Act_c::se_explode_water() { - fopAcM_seStart(this, JA_SE_OBJ_BOMB_WATER, 0); + fopAcM_seStart(this, JA_SE_OBJ_BOMB_WATER, 0); } void Act_c::se_ignition() { - fopAcM_seStart(this, JA_SE_OBJ_BOMB_IGNITION, 0); + fopAcM_seStart(this, JA_SE_OBJ_BOMB_IGNITION, 0); } void Act_c::set_sound_env(int param_1, int param_2) { diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index c9f2e031..f3569a20 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -1080,7 +1080,6 @@ static void damage(bst_class* i_this) { /* 00003DD8-00003EC4 .text bom_eat_check__FP9bst_class */ static BOOL bom_eat_check(bst_class* i_this) { if (i_this->mHandHurtCyl.ChkCoHit()) { - cCcD_Obj* hit_obj = i_this->mHandHurtCyl.GetCoHitObj(); if (hit_obj != NULL) { fopAc_ac_c* hit_actor = (fopAc_ac_c*)hit_obj->GetAc(); @@ -1496,7 +1495,6 @@ static void damage_check(bst_class* i_this) { if (i_this->mHandHurtCyl.ChkTgHit()) { i_this->mState = 10; if (player_way_check(i_this)) { - atInfo.mpObj = i_this->mHandHurtCyl.GetTgHitObj(); atInfo.pParticlePos = i_this->mHandHurtCyl.GetTgHitPosP(); atInfo.mpActor = cc_at_check(actor, &atInfo); diff --git a/src/d/actor/d_a_coming2.cpp b/src/d/actor/d_a_coming2.cpp index 236aa2dc..8759d8d8 100644 --- a/src/d/actor/d_a_coming2.cpp +++ b/src/d/actor/d_a_coming2.cpp @@ -291,8 +291,8 @@ BOOL daComing2::Act_c::request_all_flag_exit() { daObjBarrel2::Act_c* buoy; if (buoyProc != fpcM_ERROR_PROCESS_ID_e && fopAcM_SearchByID(buoyProc, (fopAc_ac_c**)&buoy) != NULL && buoy != NULL) { - buoy->exit_req(); - mStartBuoy[i].unk_00 = fpcM_ERROR_PROCESS_ID_e; + buoy->exit_req(); + mStartBuoy[i].unk_00 = fpcM_ERROR_PROCESS_ID_e; } } @@ -309,28 +309,28 @@ void daComing2::Act_c::barrel_execute(int idx) { if (barrelProc != fpcM_ERROR_PROCESS_ID_e) { if ((BOOL)fopAcM_SearchByID(barrelProc, (fopAc_ac_c**)&barrel) == TRUE) { - if (barrel != NULL) { + if (barrel != NULL) { mBarrelInfo[idx].unk_06 = barrel->chk_item_give(); - } + } - if (mBarrelInfo[idx].unk_04 == 0) { - request_barrel_exitN(idx); - } else if (mBarrelInfo[idx].unk_04 > 0) { - mBarrelInfo[idx].unk_04--; - } + if (mBarrelInfo[idx].unk_04 == 0) { + request_barrel_exitN(idx); + } else if (mBarrelInfo[idx].unk_04 > 0) { + mBarrelInfo[idx].unk_04--; + } } else if (mBarrelInfo[idx].unk_06 == 0) { - init_barrelN_info(idx); - coming_process_init(0); + init_barrelN_info(idx); + coming_process_init(0); } if (mBarrelInfo[idx].unk_06 == 1) { - if (unk_2A4 >= 15u) { - coming_process_init(0); - } else { - request_barrel_exitN(idx); - init_barrelN_info(idx); - unk_29A = 1; - } + if (unk_2A4 >= 15u) { + coming_process_init(0); + } else { + request_barrel_exitN(idx); + init_barrelN_info(idx); + unk_29A = 1; + } } } } diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index 733c0457..1dc98335 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -1102,7 +1102,6 @@ void standby(fganon_class* i_this) { } } } - } /* 00004DB4-00005128 .text start__FP12fganon_class */ @@ -2008,6 +2007,7 @@ void demo_camera(fganon_class* i_this) { if (DEMO_SELECT(REG17_S(3), REG0_S(3)) == 0) { dComIfGs_onSwitch(i_this->mSwitchNo, fopAcM_GetRoomNo(a_this)); } + // Fall-through } case 150: { case_150: @@ -2016,6 +2016,7 @@ void demo_camera(fganon_class* i_this) { dMeter_mtrShow(); dComIfGp_event_reset(); i_this->mB54 = 0; + break; } } if (i_this->mB54 && bVar3) { diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index 3dfecb9d..228c188a 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -365,7 +365,6 @@ BOOL daFm_c::_createHeap() { /* 00000718-0000086C .text holeCreateHeap__6daFm_cFv */ bool daFm_c::holeCreateHeap() { - J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BDL_YPIT00_e)); JUT_ASSERT(0x2C7, modelData != NULL); @@ -516,7 +515,6 @@ bool daFm_c::jntHitCreateHeap() { /* mRadius */ 4.0f, /* mpOffsets */ yubi_cyl_offset, }, - }; mpJntHit = JntHit_create(mpMorf->getModel(), search_data, ARRAY_SIZE(search_data)); if (mpJntHit) { @@ -582,17 +580,16 @@ fopAc_ac_c* daFm_c::searchNearOtherActor(fopAc_ac_c* i_actor) { if(dist2 < l_HIO.field_0x0E8) { if(dist3 > REG12_F(0) + 80.0f || fopAcM_GetID(i_actor) == pLink->getGrabActorID()) { - switch(((daTsubo::Act_c*)i_actor)->prm_get_type()) { - case 0: - case 1: - case 2: - case 4: - case 5: - case 6: - mpActorTarget = i_actor; - return i_actor; - } - + switch(((daTsubo::Act_c*)i_actor)->prm_get_type()) { + case 0: + case 1: + case 2: + case 4: + case 5: + case 6: + mpActorTarget = i_actor; + return i_actor; + } } } } @@ -646,9 +643,8 @@ void daFm_c::moveRndBack() { field_0x648 = l_HIO.field_0x0A0; } } - - } + if(field_0xAE4 != 0 && !mObjAcch.ChkWallHit()) { cLib_addCalcPosXZ2(¤t.pos, field_0x660, 0.1f, l_HIO.field_0x0B0); } @@ -734,7 +730,6 @@ void daFm_c::bodySetMtx() { mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::transM(field_0x610); pModel->setBaseTRMtx(mDoMtx_stack_c::get()); - } /* 00001864-00001920 .text holeSetMtx__6daFm_cFv */ @@ -745,7 +740,6 @@ void daFm_c::holeSetMtx() { mDoMtx_stack_c::YrotM(current.angle.y); mDoMtx_stack_c::transM(l_HIO.field_0x020); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); - } /* 00001920-00001A50 .text setCollision__6daFm_cFv */ @@ -773,7 +767,6 @@ void daFm_c::setAttention() { if(field_0x2E4 != 0) { attention_info.position = current.pos; eyePos = current.pos; - } else { if(mMode == 0xe || mMode == 0x10 || mMode == 0xf || (mMode == 0 || mMode == 0x11)) { attention_info.position = current.pos; @@ -910,7 +903,6 @@ bool daFm_c::checkTgHit() { mHitType = 0xD; temp = false; break; - } CcAtInfo atInfo; atInfo.pParticlePos = NULL; @@ -992,7 +984,6 @@ cXyz daFm_c::getOffsetPos() { if(isLink(mpActorTarget)) { offset.set(0.0f, -10.0f, 0.0f); } else { - s16 procName = fopAcM_GetName(mpActorTarget); if(procName == fpcNm_NPC_CB1_e) { if(fopAcM_checkCarryNow(mpActorTarget)) { @@ -1000,19 +991,15 @@ cXyz daFm_c::getOffsetPos() { } else { offset.set(0.0f, 80.0f, 0.0f); } - } else if(procName == fpcNm_NPC_MD_e) { if(fopAcM_checkCarryNow(mpActorTarget)) { offset.set(0.0f, 20.0f, 0.0f); } else { offset.set(0.0f, 140.0f, 0.0f); } - } else if(procName == fpcNm_BOMB_e) { offset.set(0.0f, 80.0f, 0.0f); - } else if(procName == fpcNm_TSUBO_e) { - switch(((daTsubo::Act_c*)mpActorTarget)->prm_get_type()) { case 5: case 0: @@ -1307,7 +1294,6 @@ void daFm_c::modePathMove() { if(isGrabFoot() && !dComIfGp_event_runCheck()) { modeProc(PROC_INIT_e,0xf); } else { - dLib_pathMove(&field_0x3B0, &field_0x3BC, mpPath, 3.0f, pathMove_CB, this); cLib_addCalcPosXZ2(¤t.pos, field_0x3B0, (l_HIO.field_0x0D0 + 1.0f) * 0.005f * field_0x394, 20.0f); @@ -1326,7 +1312,6 @@ void daFm_c::modeGoalKeeperInit() { /* 000036B4-000038DC .text modeGoalKeeper__6daFm_cFv */ void daFm_c::modeGoalKeeper() { - if(field_0x2E5 && dComIfGp_evmng_endCheck("DEFAULT_FM_SUIKOMI_NPC")) { modeProc(PROC_INIT_e,6); return; @@ -1491,7 +1476,7 @@ void daFm_c::modeWait() { } } if(field_0x2D0 == 2 && (mBaseTarget->current.pos - field_0x69C).absXZ() > field_0x2E0) { - modeProc(PROC_INIT_e, 6); + modeProc(PROC_INIT_e, 6); } else { moveRndBack(); } @@ -1552,7 +1537,6 @@ void daFm_c::modeAttack() { f32 oldGrabPosY = mGrabPos.y; mGrabPos = daPy_getPlayerLinkActorClass()->current.pos; mGrabPos.y = oldGrabPosY; - } else { if (isGrabPos()) { setGrabPos(); @@ -1613,7 +1597,6 @@ void daFm_c::modeAttack() { !dComIfGp_event_runCheck()) { modeProcInit(0x10); } else { - modeProcInit(0xD); } } @@ -1646,7 +1629,6 @@ void daFm_c::modeAttack() { } } } - } } else if (isLink(mpActorTarget) && mAnmPrmIdx == 4) { dist = (mGrabPos - field_0x63C).absXZ(); @@ -1663,7 +1645,6 @@ void daFm_c::modeAttack() { f32 temp5 = l_HIO.field_0x118 * (std::fabsf(dist - l_HIO.field_0x110) / dist3); pLink->setOutPower(temp5, targetAngle, 0); } - } else if (mpMorf->isStop() && cLib_calcTimer(&field_0x650) == 0) { setAnm(5, false); } @@ -1925,7 +1906,6 @@ void daFm_c::modeGrab() { if (cLib_distanceAngleS(shape_angle.y, angle) > l_HIO.field_0x09A) { cLib_addCalcAngleS2(&shape_angle.y, angle, 4, l_HIO.field_0x096); } - } else { dist = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0)); if (field_0x2D0 == 2 && isNpc(mpActorTarget) && dist < l_HIO.field_0x0C4) { @@ -1951,8 +1931,6 @@ void daFm_c::modeGrab() { modeProcInit(0xE); field_0x684 = 1; } else { - // temp.absXZ() matches offsets but cant store mGrabPos - field_0x63C in temp first - // dist = temp.absXZ(); dist = (mGrabPos - field_0x63C).absXZ(); if (dist > l_HIO.field_0x110 && dist < l_HIO.field_0x114) { daPy_lk_c* pLink = (daPy_lk_c*)daPy_getPlayerLinkActorClass(); @@ -1963,7 +1941,6 @@ void daFm_c::modeGrab() { } f32 temp5 = l_HIO.field_0x118 * (std::fabsf(dist - l_HIO.field_0x110) / temp4); pLink->setOutPower(temp5, angle, 0); - } else { if (!isGrab()) { setAnm(5, false); @@ -1975,7 +1952,6 @@ void daFm_c::modeGrab() { } } } - } else { if (isNpc(mpActorTarget) == true) { mGrabPos = field_0x61C; @@ -1983,7 +1959,6 @@ void daFm_c::modeGrab() { if (!isLinkControl()) { modeProcInit(0x10); } - } else { dist = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0)); if (dist < l_HIO.field_0x0B4 && field_0x2D0 == 2) { @@ -2001,7 +1976,6 @@ void daFm_c::modeGrab() { } else if (field_0x2DC == 1) { modeProcInit(9); } - } } else { s16 procName = fopAcM_GetName(mpActorTarget); @@ -2189,7 +2163,6 @@ void daFm_c::modeGrabNpcDemo() { setAnm(12, false); if(mpMorf->isStop()) { dComIfGp_evmng_cutEnd(staffIdx); - } } else { dComIfGp_evmng_cutEnd(staffIdx); @@ -2228,7 +2201,6 @@ void daFm_c::modePlayerStartDemo() { char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx); daPy_py_c* pLink = (daPy_py_c*)dComIfGp_getLinkPlayer(); - pLink->changeOriginalDemo(); @@ -2238,7 +2210,6 @@ void daFm_c::modePlayerStartDemo() { pLink->setPlayerPosAndAngle(&pos, &pLink->shape_angle); pLink->onPlayerNoDraw(); dComIfGp_evmng_cutEnd(staffIdx); - } else if(strcmp(cutName, "OPEN") == 0) { cXyz pos2 = current.pos; pos2.y -= REG12_F(2); @@ -2247,7 +2218,6 @@ void daFm_c::modePlayerStartDemo() { if(setHoleScale(l_HIO.field_0x124, 0.1f, l_HIO.field_0x128)) { dComIfGp_evmng_cutEnd(staffIdx); } - } else if(strcmp(cutName, "PL_OUT") == 0) { pLink->offPlayerNoDraw(); pLink->setThrowDamage( @@ -2258,13 +2228,11 @@ void daFm_c::modePlayerStartDemo() { 0 ); dComIfGp_evmng_cutEnd(staffIdx); - } else if(strcmp(cutName, "CLOSE") == 0) { pLink->offPlayerNoDraw(); if(setHoleScale(l_HIO.field_0x120, 0.1f, l_HIO.field_0x128)) { dComIfGp_evmng_cutEnd(staffIdx); } - } else if(strcmp(cutName, "DELETE") == 0) { modeProc(PROC_INIT_e, 0x12); } @@ -2962,7 +2930,6 @@ bool daFm_c::areaCheck() { if(!lineCheck(&temp2, &field_0xA48[i])) { field_0xAD8[i] = false; ret = false; - } else { field_0xAD8[i] = true; } @@ -3091,7 +3058,6 @@ bool daFm_c::_execute() { case 3: grabTsubo(); break; - } } field_0x660.y = current.pos.y; @@ -3197,7 +3163,6 @@ void daFm_c::debugDraw() { temp5.y += 20.0f; temp6.y += 20.0f; - } if (l_HIO.field_0x009) { @@ -3366,7 +3331,6 @@ void daFm_c::createInit() { case FM_JNT_TE_e: modelData->getJointNodePointer(i)->setCallBack(nodeControl_CB); break; - } } diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index 271966ac..644b3ddd 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -922,7 +922,6 @@ void ki_path_move(ki_class* i_this) { } } break; - } i_this->mPosMoveTarget = l_kiHIO.m28; diff --git a/src/d/actor/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp index 608d7caf..3bb651df 100644 --- a/src/d/actor/d_a_knob00.cpp +++ b/src/d/actor/d_a_knob00.cpp @@ -264,7 +264,7 @@ BOOL daKnob00_c::openProc(int arg1) { } else if (mBckAnm.checkFrame(25.0f)) { fopAcM_seStart(this, JA_SE_OBJ_DOOR_N_OPEN, 0); } else if (mBckAnm.checkFrame(49.0f)) { - fopAcM_seStart(this, JA_SE_OBJ_DOOR_N_CLOSE_1, 0); + fopAcM_seStart(this, JA_SE_OBJ_DOOR_N_CLOSE_1, 0); } else if (mBckAnm.checkFrame(64.0f) && arg1 == 0xf) { fopAcM_seStart(this, JA_SE_OBJ_DOOR_N_CLOSE_2, 0); } diff --git a/src/d/actor/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp index 14e5e3b1..b4fd506a 100644 --- a/src/d/actor/d_a_kokiie.cpp +++ b/src/d/actor/d_a_kokiie.cpp @@ -385,7 +385,6 @@ static cPhs_State daKokiie_Create(fopAc_ac_c* a_this) { } #endif { - i_this->m2A0 = fopAcM_GetParam(a_this); if (i_this->m2A0 == 0xff) { i_this->m2A0 = 0; diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp index aa8be909..77769717 100644 --- a/src/d/actor/d_a_mo2.cpp +++ b/src/d/actor/d_a_mo2.cpp @@ -3238,6 +3238,7 @@ static u8 damage_check(mo2_class* i_this) { tex_anm_set(i_this, 4); i_this->mDamageReaction.m424 |= 0x10; i_this->mDamageReaction.m428 = 26.0f; + break; } if (i_this->mDamageReaction.m424 != 0) { local_54.x = 0.0f; diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 393f556d..b5282b97 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -1646,20 +1646,20 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) // clang-format off #ifdef __MWERKS__ asm { - lwz cnt,info->cnt; - subfic code,cnt,33; - lwz cb,info->currByte; + lwz cnt,info->cnt; + subfic code,cnt,33; + lwz cb,info->currByte; - subfc. tmp, code, t; - subi cnt1,cnt,1; + subfc. tmp, code, t; + subi cnt1,cnt,1; - bgt _notEnoughBitsDIFF; - add v,cnt,t; + bgt _notEnoughBitsDIFF; + add v,cnt,t; - slw cnt,cb,cnt1; - stw v,info->cnt; - subfic v,t,32; - srw diff,cnt,v; + slw cnt,cb,cnt1; + stw v,info->cnt; + subfic v,t,32; + srw diff,cnt,v; } #endif // clang-format on @@ -1894,22 +1894,22 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) // clang-format off #ifdef __MWERKS__ asm { - li cnt, sizeof(s32)*5; - add maxcodebase, maxcodebase, cnt; + li cnt, sizeof(s32)*5; + add maxcodebase, maxcodebase, cnt; - slwi tmp, code, 32-5; - li cnt,5; - rlwimi tmp, cb, 32-1, 1,31; + slwi tmp, code, 32-5; + li cnt,5; + rlwimi tmp, cb, 32-1, 1,31; - __DR4_WHILE_START: + __DR4_WHILE_START: - subfic ssss, cnt, 31; - lwzu tmp2, 4(maxcodebase); - srw code, tmp, ssss; - __DR4_WHILE_CHECK: - cmpw code, tmp2 - addi cnt, cnt, 1 - bgt __DR4_WHILE_START; + subfic ssss, cnt, 31; + lwzu tmp2, 4(maxcodebase); + srw code, tmp, ssss; + __DR4_WHILE_CHECK: + cmpw code, tmp2 + addi cnt, cnt, 1 + bgt __DR4_WHILE_START; } #endif @@ -1930,31 +1930,31 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) // clang-format off #ifdef __MWERKS__ asm { - lwz tmp, info->c; - subfic tmp2, cnt, 33; - addi tmp3, tmp2, 1; - slwi tmp2, tmp2, 2; - lwzu cb, 4(tmp); - add mask,mask, tmp2; - stw tmp, info->c; - slwi code, code, 1; - rlwimi code, cb, 1, 31, 31; - lwzu tmp2, 4(mask); - li cnt, 2; - b __FCNB1_WHILE_CHECK; - - __FCNB1_WHILE_START: - slwi code, code, 1; - - addi tmp3, tmp3, 1; - lwzu tmp2, 4(mask); - add code, code, rrrr; - addi cnt, cnt, 1; - - __FCNB1_WHILE_CHECK: - cmpw code, tmp2; - rlwnm rrrr, cb, cnt, 31, 31; - bgt __FCNB1_WHILE_START; + lwz tmp, info->c; + subfic tmp2, cnt, 33; + addi tmp3, tmp2, 1; + slwi tmp2, tmp2, 2; + lwzu cb, 4(tmp); + add mask,mask, tmp2; + stw tmp, info->c; + slwi code, code, 1; + rlwimi code, cb, 1, 31, 31; + lwzu tmp2, 4(mask); + li cnt, 2; + b __FCNB1_WHILE_CHECK; + + __FCNB1_WHILE_START: + slwi code, code, 1; + + addi tmp3, tmp3, 1; + lwzu tmp2, 4(mask); + add code, code, rrrr; + addi cnt, cnt, 1; + + __FCNB1_WHILE_CHECK: + cmpw code, tmp2; + rlwnm rrrr, cb, cnt, 31, 31; + bgt __FCNB1_WHILE_START; } #endif diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp index bb8f6c0b..6fcc5551 100644 --- a/src/d/actor/d_a_npc_bm1.cpp +++ b/src/d/actor/d_a_npc_bm1.cpp @@ -10,65 +10,56 @@ #include "d/d_snap.h" #include "res/Object/Bm.h" -struct hio_prm_c{ - s16 mMaxHeadX; - s16 mMaxHeadY; - s16 mMinHeadX; - s16 mMinHeadY; - s16 mMaxBackboneX; - s16 mMaxBackboneY; - s16 mMinBackboneX; - s16 mMinBackboneY; - s16 mMaxTurnStep; - s16 mCalcAngleTarget; - f32 mAttPosOffsetY; - u8 m18; - s16 mFlyScale; - s16 mFlyMaxStep; - s16 m1E; - f32 m20; - f32 m24; - f32 m28; - f32 m2C; - f32 m30; - s16 m34; - s16 m36; - f32 m38; - f32 m3C; - f32 m40; - f32 m44; - f32 m48; -}; - - -class daNpc_Bm1_childHIO_c : public mDoHIO_entry_c{ - +class daNpc_Bm1_childHIO_c : public mDoHIO_entry_c { public: + struct hio_prm_c { + /* 0x00 */ s16 mMaxHeadX; + /* 0x02 */ s16 mMaxHeadY; + /* 0x04 */ s16 mMinHeadX; + /* 0x06 */ s16 mMinHeadY; + /* 0x08 */ s16 mMaxBackboneX; + /* 0x0A */ s16 mMaxBackboneY; + /* 0x0C */ s16 mMinBackboneX; + /* 0x0E */ s16 mMinBackboneY; + /* 0x10 */ s16 mMaxTurnStep; + /* 0x12 */ s16 mCalcAngleTarget; + /* 0x14 */ f32 mAttPosOffsetY; + /* 0x18 */ u8 m18; + /* 0x1A */ s16 mFlyScale; + /* 0x1C */ s16 mFlyMaxStep; + /* 0x20 */ f32 m20; + /* 0x24 */ f32 m24; + /* 0x28 */ f32 m28; + /* 0x2C */ f32 m2C; + /* 0x30 */ f32 m30; + /* 0x34 */ s16 m34; + /* 0x36 */ s16 m36; + /* 0x38 */ f32 m38; + /* 0x3C */ f32 m3C; + /* 0x40 */ f32 m40; + /* 0x44 */ f32 m44; + /* 0x48 */ f32 m48; + }; // Size: 0x4C + daNpc_Bm1_childHIO_c(); - void genMessage(JORMContext* ctx){}; + void genMessage(JORMContext* ctx) {}; + public: /* 0x04 */ hio_prm_c hio_prm; /* 0x50 */ u32 m50; -}; - //SIZE: 0x54 +}; // Size: 0x54 -class daNpc_Bm1_HIO_c :public mDoHIO_entry_c{ +class daNpc_Bm1_HIO_c : public mDoHIO_entry_c { public: daNpc_Bm1_HIO_c(); - virtual ~daNpc_Bm1_HIO_c(){}; + virtual ~daNpc_Bm1_HIO_c() {}; void genMessage(JORMContext* ctx); -public: +public: /* 0x04 */ s8 m4; /* 0x08 */ s32 m8; /* 0x0C */ daNpc_Bm1_childHIO_c children[10]; - -}; - //SIZE: 0x354 - - - - +}; // Size: 0x354 static daNpc_Bm1_HIO_c l_HIO; static fopAc_ac_c* l_check_inf[20]; @@ -76,218 +67,306 @@ static s32 l_check_wrk = 0; static char l_BCKName[0x1E]; static char l_BTPName[0x1E]; - - - /* 000000EC-00000108 .text __ct__20daNpc_Bm1_childHIO_cFv */ daNpc_Bm1_childHIO_c::daNpc_Bm1_childHIO_c() { - } /* 00000150-0000020C .text __ct__15daNpc_Bm1_HIO_cFv */ daNpc_Bm1_HIO_c::daNpc_Bm1_HIO_c() { - - static hio_prm_c a_prm_tbl[] = { - 0x2000,0x0FA0, - 0xF63C,0xF060, - 0x0000,0x1B58, - 0xFC18,0xE4A8, - 0x0800,0x04B0, - 220.0f, - 0x0,0x0A, - 0x0400,0x0000, - 0, - 0, - 0, - 0, - 180.0f, - 0x0006,0x0400, - 0.5f, - 3.0f, - 0.1f, - 40.0f, - 870.0f, - 0x2000,0x2000, - 0xF8BB,0xE000, - 0x0000,0x1036, - 0x0000,0xEFCA, - 0x0479,0x0000, - 209.0f, - 0,0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0x2000,0x2000, - 0xF8BB,0xE000, - 0x0000,0x1036, - 0x0000,0xEFCA, - 0x0479,0x0000, - 209.0f, - 0,0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0x2000,0x2000, - 0xF000,0xE000, - 0x0000,0x1000, - 0x0000,0xF000, - 0x0578,0x0000, - 220.0f, - 0,0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0x2000,0x2000, - 0xF000,0xE000, - 0x0000,0x1000, - 0x0000,0xF000, - 0x0578,0x0000, - 220.0f, - 0,0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0x2000,0x2000, - 0xE5BA,0xE000, - 0x0000,0x1000, - 0x0000,0xF000, - 0x0508,0x0313, - 220.0f, - 0,0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0,0, - 0, - 0, - 0, - 0, - 0, - 0x2000,0x2000, - 0xF000,0xE000, - 0x0000,0x1000, - 0x0000,0xF000, - 0x03E8,0x0596, - 220.0f, - 0,0xA, - 0x0400,0x0000, - 20.0f, - 1.0f, - 20.0f, - 0.6f, - 180.0f, - 0x0006,0x0400, - 0.3f, - 4.0f, - 0.3f, - 40.0f, - 0x00000000, - 0x2000,0x2000, - 0xF000,0xE000, - 0x0000,0x2000, - 0x0000,0xE000, - 0x0640,0x0578, - 220.0f, - 0,0,0, - 0,0,0,0,0,0,0x0006,0x0400, - 0.3f, - 4.0f, - 0.3f, - 40.0f, - 0, - 0x2000,0x2000, - 0xF000,0xE000, - 0x0000,0x2000, - 0x0000,0xE000, - 0x0640,0x0578, - 220.0f, - 0,0,0, - 0, - 0, - 0, - 0, - 0, - 0, - 0x0006,0x0400, - 0.3f, - 4.0f, - 0.3f, - 40.0f, - 0,0x2000,0x2000, - 0xF000,0xE000, - 0x0000,0x1000, - 0x0000,0xF000, - 0x0640,0x04B0, - 220.0f, - 0,0xA, - 0x0400,0x0000, - 20.0f, - 1.0f, - 20.0f, - 0.3f, - 180.0f, - 0x0006,0x0400, - 0.5f, - 4.0f, - 0.3f, - 40.0f, + static daNpc_Bm1_childHIO_c::hio_prm_c a_prm_tbl[] = { + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x0FA0, + /* mMinHeadX */ 0xF63C, + /* mMinHeadY */ 0xF060, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x1B58, + /* mMinBackboneX */ 0xFC18, + /* mMinBackboneY */ 0xE4A8, + /* mMaxTurnStep */ 0x0800, + /* mCalcAngleTarget */ 0x04B0, + /* mAttPosOffsetY */ 220.0f, + /* m18 */ 0x0, + /* mFlyScale */ 0x0A, + /* mFlyMaxStep */ 0x0400, + /* m20 */ 0, + /* m24 */ 0, + /* m28 */ 0, + /* m2C */ 0, + /* m30 */ 180.0f, + /* m34 */ 0x0006, + /* m36 */ 0x0400, + /* m38 */ 0.5f, + /* m3C */ 3.0f, + /* m40 */ 0.1f, + /* m44 */ 40.0f, + /* m48 */ 870.0f, + }, + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x2000, + /* mMinHeadX */ 0xF8BB, + /* mMinHeadY */ 0xE000, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x1036, + /* mMinBackboneX */ 0x0000, + /* mMinBackboneY */ 0xEFCA, + /* mMaxTurnStep */ 0x0479, + /* mCalcAngleTarget */ 0x0000, + /* mAttPosOffsetY */ 209.0f, + /* m18 */ 0, + /* mFlyScale */ 0, + /* mFlyMaxStep */ 0, + /* m20 */ 0, + /* m24 */ 0, + /* m28 */ 0, + /* m2C */ 0, + /* m30 */ 0, + /* m34 */ 0, + /* m36 */ 0, + /* m38 */ 0, + /* m3C */ 0, + /* m40 */ 0, + /* m44 */ 0, + /* m48 */ 0, + }, + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x2000, + /* mMinHeadX */ 0xF8BB, + /* mMinHeadY */ 0xE000, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x1036, + /* mMinBackboneX */ 0x0000, + /* mMinBackboneY */ 0xEFCA, + /* mMaxTurnStep */ 0x0479, + /* mCalcAngleTarget */ 0x0000, + /* mAttPosOffsetY */ 209.0f, + /* m18 */ 0, + /* mFlyScale */ 0, + /* mFlyMaxStep */ 0, + /* m20 */ 0, + /* m24 */ 0, + /* m28 */ 0, + /* m2C */ 0, + /* m30 */ 0, + /* m34 */ 0, + /* m36 */ 0, + /* m38 */ 0, + /* m3C */ 0, + /* m40 */ 0, + /* m44 */ 0, + /* m48 */ 0, + }, + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x2000, + /* mMinHeadX */ 0xF000, + /* mMinHeadY */ 0xE000, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x1000, + /* mMinBackboneX */ 0x0000, + /* mMinBackboneY */ 0xF000, + /* mMaxTurnStep */ 0x0578, + /* mCalcAngleTarget */ 0x0000, + /* mAttPosOffsetY */ 220.0f, + /* m18 */ 0, + /* mFlyScale */ 0, + /* mFlyMaxStep */ 0, + /* m20 */ 0, + /* m24 */ 0, + /* m28 */ 0, + /* m2C */ 0, + /* m30 */ 0, + /* m34 */ 0, + /* m36 */ 0, + /* m38 */ 0, + /* m3C */ 0, + /* m40 */ 0, + /* m44 */ 0, + /* m48 */ 0, + }, + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x2000, + /* mMinHeadX */ 0xF000, + /* mMinHeadY */ 0xE000, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x1000, + /* mMinBackboneX */ 0x0000, + /* mMinBackboneY */ 0xF000, + /* mMaxTurnStep */ 0x0578, + /* mCalcAngleTarget */ 0x0000, + /* mAttPosOffsetY */ 220.0f, + /* m18 */ 0, + /* mFlyScale */ 0, + /* mFlyMaxStep */ 0, + /* m20 */ 0, + /* m24 */ 0, + /* m28 */ 0, + /* m2C */ 0, + /* m30 */ 0, + /* m34 */ 0, + /* m36 */ 0, + /* m38 */ 0, + /* m3C */ 0, + /* m40 */ 0, + /* m44 */ 0, + /* m48 */ 0, + }, + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x2000, + /* mMinHeadX */ 0xE5BA, + /* mMinHeadY */ 0xE000, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x1000, + /* mMinBackboneX */ 0x0000, + /* mMinBackboneY */ 0xF000, + /* mMaxTurnStep */ 0x0508, + /* mCalcAngleTarget */ 0x0313, + /* mAttPosOffsetY */ 220.0f, + /* m18 */ 0, + /* mFlyScale */ 0, + /* mFlyMaxStep */ 0, + /* m20 */ 0, + /* m24 */ 0, + /* m28 */ 0, + /* m2C */ 0, + /* m30 */ 0, + /* m34 */ 0, + /* m36 */ 0, + /* m38 */ 0, + /* m3C */ 0, + /* m40 */ 0, + /* m44 */ 0, + /* m48 */ 0, + }, + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x2000, + /* mMinHeadX */ 0xF000, + /* mMinHeadY */ 0xE000, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x1000, + /* mMinBackboneX */ 0x0000, + /* mMinBackboneY */ 0xF000, + /* mMaxTurnStep */ 0x03E8, + /* mCalcAngleTarget */ 0x0596, + /* mAttPosOffsetY */ 220.0f, + /* m18 */ 0, + /* mFlyScale */ 0xA, + /* mFlyMaxStep */ 0x0400, + /* m20 */ 20.0f, + /* m24 */ 1.0f, + /* m28 */ 20.0f, + /* m2C */ 0.6f, + /* m30 */ 180.0f, + /* m34 */ 0x0006, + /* m36 */ 0x0400, + /* m38 */ 0.3f, + /* m3C */ 4.0f, + /* m40 */ 0.3f, + /* m44 */ 40.0f, + /* m48 */ 0x00000000, + }, + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x2000, + /* mMinHeadX */ 0xF000, + /* mMinHeadY */ 0xE000, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x2000, + /* mMinBackboneX */ 0x0000, + /* mMinBackboneY */ 0xE000, + /* mMaxTurnStep */ 0x0640, + /* mCalcAngleTarget */ 0x0578, + /* mAttPosOffsetY */ 220.0f, + /* m18 */ 0, + /* mFlyScale */ 0, + /* mFlyMaxStep */ 0, + /* m20 */ 0, + /* m24 */ 0, + /* m28 */ 0, + /* m2C */ 0, + /* m30 */ 0, + /* m34 */ 0x0006, + /* m36 */ 0x0400, + /* m38 */ 0.3f, + /* m3C */ 4.0f, + /* m40 */ 0.3f, + /* m44 */ 40.0f, + /* m48 */ 0, + }, + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x2000, + /* mMinHeadX */ 0xF000, + /* mMinHeadY */ 0xE000, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x2000, + /* mMinBackboneX */ 0x0000, + /* mMinBackboneY */ 0xE000, + /* mMaxTurnStep */ 0x0640, + /* mCalcAngleTarget */ 0x0578, + /* mAttPosOffsetY */ 220.0f, + /* m18 */ 0, + /* mFlyScale */ 0, + /* mFlyMaxStep */ 0, + /* m20 */ 0, + /* m24 */ 0, + /* m28 */ 0, + /* m2C */ 0, + /* m30 */ 0, + /* m34 */ 0x0006, + /* m36 */ 0x0400, + /* m38 */ 0.3f, + /* m3C */ 4.0f, + /* m40 */ 0.3f, + /* m44 */ 40.0f, + /* m48 */ 0, + }, + { + /* mMaxHeadX */ 0x2000, + /* mMaxHeadY */ 0x2000, + /* mMinHeadX */ 0xF000, + /* mMinHeadY */ 0xE000, + /* mMaxBackboneX */ 0x0000, + /* mMaxBackboneY */ 0x1000, + /* mMinBackboneX */ 0x0000, + /* mMinBackboneY */ 0xF000, + /* mMaxTurnStep */ 0x0640, + /* mCalcAngleTarget */ 0x04B0, + /* mAttPosOffsetY */ 220.0f, + /* m18 */ 0, + /* mFlyScale */ 0xA, + /* mFlyMaxStep */ 0x0400, + /* m20 */ 20.0f, + /* m24 */ 1.0f, + /* m28 */ 20.0f, + /* m2C */ 0.3f, + /* m30 */ 180.0f, + /* m34 */ 0x0006, + /* m36 */ 0x0400, + /* m38 */ 0.5f, + /* m3C */ 4.0f, + /* m40 */ 0.3f, + /* m44 */ 40.0f, + /* m48 */ 0, + }, }; - for(int i = 0; i < 10; i++){ + for (int i = 0; i < 10; i++) { children[i].m50 = i; - memcpy(&children[i].hio_prm,&a_prm_tbl[i],0x4C); + memcpy(&children[i].hio_prm, &a_prm_tbl[i], 0x4C); } m4 = -1; m8 = -1; } - - - - /* 00000268-000002E0 .text searchActor_Zl__FPvPv */ static void* searchActor_Zl(void* i_param_1, void*) { - - if(l_check_wrk < 0x14 && fopAcM_IsActor(i_param_1) && fopAcM_GetName(i_param_1) == fpcNm_NPC_ZL1_e){ - l_check_inf[l_check_wrk] =(fopAc_ac_c*)i_param_1; + if (l_check_wrk < 0x14 && fopAcM_IsActor(i_param_1) && fopAcM_GetName(i_param_1) == fpcNm_NPC_ZL1_e) { + l_check_inf[l_check_wrk] = (fopAc_ac_c*)i_param_1; l_check_wrk += 1; } return NULL; @@ -295,8 +374,7 @@ static void* searchActor_Zl(void* i_param_1, void*) { /* 000002E0-00000358 .text searchActor_Gp__FPvPv */ static void* searchActor_Gp(void* i_param_1, void*) { - - if(l_check_wrk < 0x14 && fopAcM_IsActor(i_param_1) && fopAcM_GetName(i_param_1) == fpcNm_NPC_GP1_e){ + if (l_check_wrk < 0x14 && fopAcM_IsActor(i_param_1) && fopAcM_GetName(i_param_1) == fpcNm_NPC_GP1_e) { l_check_inf[l_check_wrk] = (fopAc_ac_c*)i_param_1; l_check_wrk += 1; } @@ -305,9 +383,8 @@ static void* searchActor_Gp(void* i_param_1, void*) { /* 00000358-000003DC .text searchActor_Bm_Skt__FPvPv */ static void* searchActor_Bm_Skt(void* i_param_1, void*) { - - if(l_check_wrk < 0x14 && fopAcM_IsActor(i_param_1) && fopAcM_GetName(i_param_1) == fpcNm_NPC_BM2_e){ - if(reinterpret_cast<daNpc_Bm1_c*>(i_param_1)->IamSukketo()){ + if (l_check_wrk < 0x14 && fopAcM_IsActor(i_param_1) && fopAcM_GetName(i_param_1) == fpcNm_NPC_BM2_e) { + if (reinterpret_cast<daNpc_Bm1_c*>(i_param_1)->IamSukketo()) { l_check_inf[l_check_wrk] = (fopAc_ac_c*)i_param_1; l_check_wrk += 1; } @@ -317,9 +394,8 @@ static void* searchActor_Bm_Skt(void* i_param_1, void*) { /* 000003DC-00000460 .text searchActor_Bm_Kkt__FPvPv */ static void* searchActor_Bm_Kkt(void* i_param_1, void*) { - - if(l_check_wrk < 0x14 && fopAcM_IsActor(i_param_1) && fopAcM_GetName(i_param_1) == fpcNm_NPC_BM2_e){ - if(reinterpret_cast<daNpc_Bm1_c*>(i_param_1)->IamKakkuto()){ + if (l_check_wrk < 0x14 && fopAcM_IsActor(i_param_1) && fopAcM_GetName(i_param_1) == fpcNm_NPC_BM2_e) { + if (reinterpret_cast<daNpc_Bm1_c*>(i_param_1)->IamKakkuto()) { l_check_inf[l_check_wrk] = (fopAc_ac_c*)i_param_1; l_check_wrk += 1; } @@ -329,10 +405,9 @@ static void* searchActor_Bm_Kkt(void* i_param_1, void*) { /* 00000460-000004AC .text nodeCallBack_Wng__FP7J3DNodei */ static BOOL nodeCallBack_Wng(J3DNode* i_param_1, int i_param_2) { - - if(i_param_2 == 0){ - if(j3dSys.getModel()->getUserArea() != NULL){ - reinterpret_cast<daNpc_Bm1_c*>(j3dSys.getModel()->getUserArea())->nodeWngControl(i_param_1,j3dSys.getModel()); + if (i_param_2 == 0) { + if (j3dSys.getModel()->getUserArea() != NULL) { + reinterpret_cast<daNpc_Bm1_c*>(j3dSys.getModel()->getUserArea())->nodeWngControl(i_param_1, j3dSys.getModel()); } } return TRUE; @@ -340,33 +415,29 @@ static BOOL nodeCallBack_Wng(J3DNode* i_param_1, int i_param_2) { /* 000004AC-000005BC .text nodeWngControl__11daNpc_Bm1_cFP7J3DNodeP8J3DModel */ void daNpc_Bm1_c::nodeWngControl(J3DNode* i_node, J3DModel* i_model) { - s32 uVar1 = ((J3DJoint*)i_node)->getJntNo(); mDoMtx_stack_c::copy(i_model->getAnmMtx(uVar1)); - if(uVar1 == m_wngL1_jnt_num){ - cMtx_copy(mLeftArmMtx,j3dSys.mCurrentMtx); - i_model->setAnmMtx(uVar1,mLeftArmMtx); + if (uVar1 == m_wngL1_jnt_num) { + cMtx_copy(mLeftArmMtx, j3dSys.mCurrentMtx); + i_model->setAnmMtx(uVar1, mLeftArmMtx); } - if(uVar1 == m_wngL3_jnt_num){ + if (uVar1 == m_wngL3_jnt_num) { mDoMtx_stack_c::multVecZero(&mWingLPos); - } - if(uVar1 == m_wngR1_jnt_num){ - cMtx_copy(mRightArmMtx,j3dSys.mCurrentMtx); - i_model->setAnmMtx(uVar1,mRightArmMtx); + if (uVar1 == m_wngR1_jnt_num) { + cMtx_copy(mRightArmMtx, j3dSys.mCurrentMtx); + i_model->setAnmMtx(uVar1, mRightArmMtx); } - if(uVar1 == m_wngR3_jnt_num){ + if (uVar1 == m_wngR3_jnt_num) { mDoMtx_stack_c::multVecZero(&mWingRPos); - } } /* 000005BC-00000608 .text nodeCallBack_Arm__FP7J3DNodei */ static BOOL nodeCallBack_Arm(J3DNode* i_param_1, int i_param_2) { - - if(i_param_2 == 0){ - if(j3dSys.getModel()->getUserArea() != NULL){ - reinterpret_cast<daNpc_Bm1_c*>(j3dSys.getModel()->getUserArea())->nodeArmControl(i_param_1,j3dSys.getModel()); + if (i_param_2 == 0) { + if (j3dSys.getModel()->getUserArea() != NULL) { + reinterpret_cast<daNpc_Bm1_c*>(j3dSys.getModel()->getUserArea())->nodeArmControl(i_param_1, j3dSys.getModel()); } } return TRUE; @@ -374,31 +445,29 @@ static BOOL nodeCallBack_Arm(J3DNode* i_param_1, int i_param_2) { /* 00000608-00000718 .text nodeArmControl__11daNpc_Bm1_cFP7J3DNodeP8J3DModel */ void daNpc_Bm1_c::nodeArmControl(J3DNode* i_node, J3DModel* i_model) { - s32 uVar1 = ((J3DJoint*)i_node)->getJntNo(); mDoMtx_stack_c::copy(i_model->getAnmMtx(uVar1)); - if(uVar1 == m_armL1_jnt_num){ - cMtx_copy(mLeftArmMtx,j3dSys.mCurrentMtx); - i_model->setAnmMtx(uVar1,mLeftArmMtx); + if (uVar1 == m_armL1_jnt_num) { + cMtx_copy(mLeftArmMtx, j3dSys.mCurrentMtx); + i_model->setAnmMtx(uVar1, mLeftArmMtx); } - if(uVar1 == m_armL2_jnt_num){ + if (uVar1 == m_armL2_jnt_num) { mDoMtx_stack_c::multVecZero(&mArmLPos); } - if(uVar1 == m_armR1_jnt_num){ - cMtx_copy(mRightArmMtx,j3dSys.mCurrentMtx); - i_model->setAnmMtx(uVar1,mRightArmMtx); + if (uVar1 == m_armR1_jnt_num) { + cMtx_copy(mRightArmMtx, j3dSys.mCurrentMtx); + i_model->setAnmMtx(uVar1, mRightArmMtx); } - if(uVar1 == m_armR2_jnt_num){ + if (uVar1 == m_armR2_jnt_num) { mDoMtx_stack_c::multVecZero(&mArmRPos); } } /* 00000718-00000764 .text nodeCallBack_Bm1__FP7J3DNodei */ static BOOL nodeCallBack_Bm1(J3DNode* i_param_1, int i_param_2) { - - if(i_param_2 == 0){ - if(j3dSys.getModel()->getUserArea() != NULL){ - reinterpret_cast<daNpc_Bm1_c*>(j3dSys.getModel()->getUserArea())->nodeBm1Control(i_param_1,j3dSys.getModel()); + if (i_param_2 == 0) { + if (j3dSys.getModel()->getUserArea() != NULL) { + reinterpret_cast<daNpc_Bm1_c*>(j3dSys.getModel()->getUserArea())->nodeBm1Control(i_param_1, j3dSys.getModel()); } } return TRUE; @@ -406,77 +475,77 @@ static BOOL nodeCallBack_Bm1(J3DNode* i_param_1, int i_param_2) { /* 00000764-00000900 .text nodeBm1Control__11daNpc_Bm1_cFP7J3DNodeP8J3DModel */ void daNpc_Bm1_c::nodeBm1Control(J3DNode* i_node, J3DModel* i_model) { - - static cXyz a_eye_pos_off(26.0f,26.0f,0.0f); + static cXyz a_eye_pos_off(26.0f, 26.0f, 0.0f); s32 uVar1 = ((J3DJoint*)i_node)->getJntNo(); mDoMtx_stack_c::copy(i_model->getAnmMtx(uVar1)); - if(uVar1 == m_nec_jnt_num){ + if (uVar1 == m_nec_jnt_num) { mDoMtx_stack_c::XrotM(m_jnt.getHead_y()); - mDoMtx_stack_c::ZrotM(-m_jnt.getHead_x()); + mDoMtx_stack_c::ZrotM(-m_jnt.getHead_x()); } - if(uVar1 == m_bbone_jnt_num){ - mDoMtx_stack_c::XrotM(m_jnt.getBackbone_y()); - mDoMtx_stack_c::ZrotM(-m_jnt.getBackbone_x()); - } - if(uVar1 == m_arm_L_jnt_num){ - cMtx_copy(mDoMtx_stack_c::get(),mLeftArmMtx); + if (uVar1 == m_bbone_jnt_num) { + mDoMtx_stack_c::XrotM(m_jnt.getBackbone_y()); + mDoMtx_stack_c::ZrotM(-m_jnt.getBackbone_x()); } - if(uVar1 == m_arm_R_jnt_num){ - cMtx_copy(mDoMtx_stack_c::get(),mRightArmMtx); + if (uVar1 == m_arm_L_jnt_num) { + cMtx_copy(mDoMtx_stack_c::get(), mLeftArmMtx); } - if(uVar1 == m_hed_jnt_num){ - mDoMtx_stack_c::multVec(&a_eye_pos_off,&mEyePos); + if (uVar1 == m_arm_R_jnt_num) { + cMtx_copy(mDoMtx_stack_c::get(), mRightArmMtx); } - cMtx_copy(mDoMtx_stack_c::get(),j3dSys.mCurrentMtx); - i_model->setAnmMtx(uVar1,mDoMtx_stack_c::get()); - + if (uVar1 == m_hed_jnt_num) { + mDoMtx_stack_c::multVec(&a_eye_pos_off, &mEyePos); + } + cMtx_copy(mDoMtx_stack_c::get(), j3dSys.mCurrentMtx); + i_model->setAnmMtx(uVar1, mDoMtx_stack_c::get()); } -char* l_evn_tbl[] = { - "Get_Mo3_Ltr","Met_Ryu_Islnd","Get_Rupee","Skn_Islnd", + +static char* l_evn_tbl[] = { + "Get_Mo3_Ltr", + "Met_Ryu_Islnd", + "Get_Rupee", + "Skn_Islnd", }; + /* 0000093C-00000A9C .text chk_appCnd__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::chk_appCnd() { switch (mSpawnCondition) { case 0: return TRUE; case 1: - if(!dComIfGs_isSymbol(1)){ + if (!dComIfGs_isSymbol(1)) { return TRUE; } break; case 2: - if(dComIfGs_isSymbol(1)){ + if (dComIfGs_isSymbol(1)) { return !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80); } break; case 3: - if(!dComIfGs_isSymbol(1)){ + if (!dComIfGs_isSymbol(1)) { return FALSE; } - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)){ + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)) { return dKy_daynight_check() == 0; } break; case 4: - if(!dComIfGs_isSymbol(1)){ + if (!dComIfGs_isSymbol(1)) { return FALSE; } - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)){ + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)) { return dKy_daynight_check() == 1; } break; } return false; - } /* 00000A9C-00000B38 .text init_PST_0__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_PST_0() { - - bool o_retval = false; - if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)){ - set_action(&daNpc_Bm1_c::demo_action1,NULL); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { + set_action(&daNpc_Bm1_c::demo_action1, NULL); fopAcM_ClearStatusMap(this); mbInitPostman0 = true; o_retval = true; @@ -486,17 +555,15 @@ bool daNpc_Bm1_c::init_PST_0() { /* 00000B38-00000B84 .text init_PST_1__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_PST_1() { - - set_action(&daNpc_Bm1_c::wait_action1,NULL); + set_action(&daNpc_Bm1_c::wait_action1, NULL); return true; } /* 00000B84-00000C0C .text init_PST_2__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_PST_2() { - bool o_retval = false; - if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F40)){ - set_action(&daNpc_Bm1_c::wait_action3,NULL); + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F40)) { + set_action(&daNpc_Bm1_c::wait_action3, NULL); o_retval = true; } return o_retval; @@ -504,13 +571,12 @@ bool daNpc_Bm1_c::init_PST_2() { /* 00000C0C-00000CB8 .text init_PST_3__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_PST_3() { - bool result; result = dComIfGs_isSymbol(1) == 0; - if(result){ + if (result) { result = dComIfGs_isEventBit(dSv_event_flag_c::UNK_1102) != 0; - if(result){ - set_action(&daNpc_Bm1_c::wait_action1,NULL); + if (result) { + set_action(&daNpc_Bm1_c::wait_action1, NULL); } } return result; @@ -518,13 +584,12 @@ bool daNpc_Bm1_c::init_PST_3() { /* 00000CB8-00000D58 .text init_PST_4__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_PST_4() { - bool result = dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E80) == 0; - if(result){ + if (result) { m888 = 1; gravity = 0.0f; - set_action(&daNpc_Bm1_c::wait_action9,NULL); - fopAcM_OnStatus(this,fopAcStts_UNK4000_e); + set_action(&daNpc_Bm1_c::wait_action9, NULL); + fopAcM_OnStatus(this, fopAcStts_UNK4000_e); return true; } return result; @@ -532,53 +597,46 @@ bool daNpc_Bm1_c::init_PST_4() { /* 00000D58-00000DA4 .text init_BMB_0__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_BMB_0() { - - set_action(&daNpc_Bm1_c::wait_action6,NULL); + set_action(&daNpc_Bm1_c::wait_action6, NULL); return true; } /* 00000DA4-00000DC4 .text init_BMB_1__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_BMB_1() { - - init_BMB_0(); + return init_BMB_0(); } /* 00000DC4-00000E10 .text init_BMB_2__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_BMB_2() { - - set_action(&daNpc_Bm1_c::wait_action8,NULL); + set_action(&daNpc_Bm1_c::wait_action8, NULL); return true; } /* 00000E10-00000E5C .text init_BMC_0__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_BMC_0() { - - set_action(&daNpc_Bm1_c::wait_action2,NULL); + set_action(&daNpc_Bm1_c::wait_action2, NULL); return true; } /* 00000E5C-00000F04 .text init_BMC_1__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_BMC_1() { - bool result = false; - if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1808)){ + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1808)) { result = dComIfGs_isEventBit(dSv_event_flag_c::UNK_1220); - if(result){ - set_action(&daNpc_Bm1_c::wait_action4,NULL); + if (result) { + set_action(&daNpc_Bm1_c::wait_action4, NULL); } } return result; - } /* 00000F04-00000FB0 .text init_BMC_2__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_BMC_2() { - bool result = false; - if(!dComIfGs_isGetItemReserve(0x0F)){ + if (!dComIfGs_isGetItemReserve(0x0F)) { result = dComIfGs_isEventBit(dSv_event_flag_c::UNK_1808); - if(result){ - set_action(&daNpc_Bm1_c::wait_action5,NULL); + if (result) { + set_action(&daNpc_Bm1_c::wait_action5, NULL); } } return result; @@ -586,10 +644,9 @@ bool daNpc_Bm1_c::init_BMC_2() { /* 00000FB0-00001010 .text init_BMC_3__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_BMC_3() { - - if(mPathRun.getPath()){ - set_action(&daNpc_Bm1_c::wait_actionA,NULL); - return true; + if (mPathRun.getPath()) { + set_action(&daNpc_Bm1_c::wait_actionA, NULL); + return true; } return false; @@ -597,14 +654,12 @@ bool daNpc_Bm1_c::init_BMC_3() { /* 00001010-00001030 .text init_BMD_0__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_BMD_0() { - return init_BMC_3(); } /* 00001030-00001084 .text init_BMD_1__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_BMD_1() { - - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1620)){ + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1620)) { return false; } return init_BMC_0(); @@ -612,27 +667,24 @@ bool daNpc_Bm1_c::init_BMD_1() { /* 00001084-000010DC .text init_SKT_0__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_SKT_0() { - - fopAcM_OffStatus(this,fopAcStts_NOCULLEXEC_e); - set_action(&daNpc_Bm1_c::wait_action7,NULL); + fopAcM_OffStatus(this, fopAcStts_NOCULLEXEC_e); + set_action(&daNpc_Bm1_c::wait_action7, NULL); return true; } /* 000010DC-000010FC .text init_KKT_0__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::init_KKT_0() { - return init_SKT_0(); } /* 000010FC-00001404 .text createInit__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::createInit() { - - static u8 a_att_dis_TBL[11][2] = {0xA9,0xA9,0xA9,0xA9, - 0x6D,0x6D,0x6F,0x6D,0xA9,0xA9,0x80,0x80,0x80,0x80,0xA9,0xA9,0xA8,0xA8,0xA8,0xA8,0xAA,0xAA}; - if(chk_appCnd() == 0){ + static u8 a_att_dis_TBL[11][2] = {0xA9, 0xA9, 0xA9, 0xA9, 0x6D, 0x6D, 0x6F, 0x6D, 0xA9, 0xA9, 0x80, + 0x80, 0x80, 0x80, 0xA9, 0xA9, 0xA8, 0xA8, 0xA8, 0xA8, 0xAA, 0xAA}; + if (chk_appCnd() == 0) { return false; } - for(int i = 0; i < 4; i++){ + for (int i = 0; i < 4; i++) { mEventIdTable[i] = dComIfGp_evmng_getEventIdx(l_evn_tbl[i]); } attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e; @@ -641,23 +693,23 @@ bool daNpc_Bm1_c::createInit() { gravity = -4.5; m82C = current.pos; s32 iVar5 = 0xFF; - u32 param = fopAcM_GetParam(this); - if(((param >> 16) & 0xFF) != 0xFF){ - mPathRun.setInf((param >> 16) & 0xFF,fopAcM_GetRoomNo(this),true); + if (((fopAcM_GetParam(this) >> 16) & 0xFF) != 0xFF) { + mPathRun.setInf((fopAcM_GetParam(this) >> 16) & 0xFF, fopAcM_GetRoomNo(this), true); - if(mPathRun.isPath()){ - fopAcM_OffStatus(this,fopAcStts_NOCULLEXEC_e); - iVar5 = 0xF0; - }else{ + if (mPathRun.isPath()) { + fopAcM_OffStatus(this, fopAcStts_NOCULLEXEC_e); + iVar5 = 0xF0; + } else { return false; } - } - static char* a_staff_tbl[0x10] = {"Bm1","Bm1","Bm1","Bm1","Bm1","Bm2","Bm2","Bm3","Bm3","Bm3","Bm4","Bm4","Bm4","Bm4","Bm5","Bm5"}; - mEventCut.setActorInfo2(a_staff_tbl[mSpecificType],this); + + static char* a_staff_tbl[0x10] = {"Bm1", "Bm1", "Bm1", "Bm1", "Bm1", "Bm2", "Bm2", "Bm3", "Bm3", "Bm3", "Bm4", "Bm4", "Bm4", "Bm4", "Bm5", "Bm5"}; + mEventCut.setActorInfo2(a_staff_tbl[mSpecificType], this); mAnmNum = 0x16; + bool init_success; - switch(mSpecificType){ + switch (mSpecificType) { case SPECIFIC_TYPE_Quill_0_e: init_success = init_PST_0(); break; @@ -710,20 +762,22 @@ bool daNpc_Bm1_c::createInit() { init_success = false; break; } - if(init_success){ - shape_angle = current.angle; - }else{ + + if (init_success) { + shape_angle = current.angle; + } else { return false; } - mStts.Init(iVar5,0xFF,this); + + mStts.Init(iVar5, 0xFF, this); mCyl.SetStts(&mStts); mCyl.Set(dNpc_cyl_src); mpMorf->setMorf(0.0f); - if(mbHasArms){ + if (mbHasArms) { mpArmMorf->setMorf(0.0f); - }else{ + } else { mpWingMorf->setMorf(0.0f); } mpHeadMorf->setMorf(0.0f); @@ -733,62 +787,61 @@ bool daNpc_Bm1_c::createInit() { /* 00001404-000017A8 .text setMtx__11daNpc_Bm1_cFb */ void daNpc_Bm1_c::setMtx(bool i_param_1) { - - if(mbInDemo == 0){ + if (mbInDemo == 0) { int uVar5 = 0; plyTexPttrnAnm(); - if(mObjAcch.ChkGroundHit()){ + if (mObjAcch.ChkGroundHit()) { uVar5 = dComIfG_Bgsp()->GetMtrlSndId(mObjAcch.m_gnd); } s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this)); - mbMorfAnimStopped = mpMorf->play(&eyePos,uVar5,reverb); - if(mpMorf->getFrame() < mFrame){ + mbMorfAnimStopped = mpMorf->play(&eyePos, uVar5, reverb); + if (mpMorf->getFrame() < mFrame) { mbMorfAnimStopped = true; } mFrame = mpMorf->getFrame(); - if(mbHasArms){ - mpArmMorf->play(&eyePos,0,0); - }else{ - mpWingMorf->play(&eyePos,0,0); + if (mbHasArms) { + mpArmMorf->play(&eyePos, 0, 0); + } else { + mpWingMorf->play(&eyePos, 0, 0); } - mpHeadMorf->play(&eyePos,0,0); + mpHeadMorf->play(&eyePos, 0, 0); mObjAcch.CrrPos(*dComIfG_Bgsp()); } tevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(mObjAcch.m_gnd); tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mObjAcch.m_gnd); - mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(current.angle.y); mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); mpMorf->calc(); - if(!mbHasArms){ + if (!mbHasArms) { mpWingMorf->calc(); - }else{ + } else { mpArmMorf->calc(); } mpHeadMorf->getModel()->setBaseTRMtx(mpMorf->getModel()->getAnmMtx(m_hed_jnt_num)); mpHeadMorf->calc(); - if(mpBinderModel){ - if(mAnmNum == 4){ + if (mpBinderModel) { + if (mAnmNum == 4) { mDoMtx_stack_c::copy(mpArmMorf->getModel()->getAnmMtx(m_hnd_R_jnt_num)); - mDoMtx_stack_c::transM(13.5f,3.0f,-5.5f); - mDoMtx_stack_c::XYZrotM(cM_deg2s(228),cM_deg2s(-114),cM_deg2s(-215)); + mDoMtx_stack_c::transM(13.5f, 3.0f, -5.5f); + mDoMtx_stack_c::XYZrotM(cM_deg2s(228), cM_deg2s(-114), cM_deg2s(-215)); mpBinderModel->setBaseTRMtx(mDoMtx_stack_c::get()); - }else{ + } else { mpBinderModel->setBaseTRMtx(mpArmMorf->getModel()->getAnmMtx(m_hnd_R_jnt_num)); } mpBinderModel->calc(); } - if(mpBagModel){ + if (mpBagModel) { mpBagModel->setBaseTRMtx(mpMorf->getModel()->getAnmMtx(m_bbone_jnt_num)); mpBagModel->calc(); } - if(mpKnifeModel){ + if (mpKnifeModel) { mpKnifeModel->setBaseTRMtx(mpMorf->getModel()->getAnmMtx(m_bbone_jnt_num)); mpKnifeModel->calc(); } - if(mbHasArms && mpStickModel){ + if (mbHasArms && mpStickModel) { mpStickModel->setBaseTRMtx(mpArmMorf->getModel()->getAnmMtx(m_hnd_R_jnt_num)); - mpStickModel->calc(); + mpStickModel->calc(); } setPrtcl_Flyaway(); setPrtcl_Land0(); @@ -798,53 +851,74 @@ void daNpc_Bm1_c::setMtx(bool i_param_1) { } /* 000017A8-000017F8 .text anmNum_toResID__11daNpc_Bm1_cFi */ -char* daNpc_Bm1_c::anmNum_toResID(int i_param_1) { - - static char* a_BCKName_TBL[0x16] = {"bm_dwait","bm_fly01","bm_lookup","bm_orooro","bm_wait01","bm_wait02","bm_talk01","bm_nadame","bm_gliding","bm_endurance","bm_flyaway","bm_flyaway2","bm_talk02","bm_landing","bm_walk","bm02_wait01","bm02_talk01","bm02_talk02","bm_talk03","bm_turn","bm_walk02","bm_check"}; - strcpy(l_BCKName,a_BCKName_TBL[i_param_1]); - return strcat(l_BCKName,".bck"); +char* daNpc_Bm1_c::anmNum_toResID(int i_anmNum) { + static char* a_BCKName_TBL[0x16] = {"bm_dwait", "bm_fly01", "bm_lookup", "bm_orooro", "bm_wait01", "bm_wait02", "bm_talk01", "bm_nadame", + "bm_gliding", "bm_endurance", "bm_flyaway", "bm_flyaway2", "bm_talk02", "bm_landing", "bm_walk", "bm02_wait01", + "bm02_talk01", "bm02_talk02", "bm_talk03", "bm_turn", "bm_walk02", "bm_check"}; + strcpy(l_BCKName, a_BCKName_TBL[i_anmNum]); + return strcat(l_BCKName, ".bck"); } /* 000017F8-00001848 .text headAnmNum_toResID__11daNpc_Bm1_cFi */ -char* daNpc_Bm1_c::headAnmNum_toResID(int i_param_1) { - - static char* a_BCKName_TBL[0x16] = {"bmhead01_dwait","bmhead01_fly01","bmhead01_lookup","bmhead01_orooro","bmhead01_wait01","bmhead01_wait02","bmhead01_talk01","bmhead01_nadame","bmhead01_gliding","bmhead01_endurance","bmhead01_flyaway","bmhead01_flyaway2","bmhead01_talk02","bmhead01_landing","bmhead01_walk","bmhead01_wait01","bmhead01_wait01","bmhead01_wait01","bmhead01_talk03","bmhead01_turn","bmhead01_wait01","bmhead01_wait01"}; - strcpy(l_BCKName,a_BCKName_TBL[i_param_1]); - return strcat(l_BCKName,".bck"); +char* daNpc_Bm1_c::headAnmNum_toResID(int i_anmNum) { + static char* a_BCKName_TBL[0x16] = {"bmhead01_dwait", "bmhead01_fly01", "bmhead01_lookup", "bmhead01_orooro", "bmhead01_wait01", + "bmhead01_wait02", "bmhead01_talk01", "bmhead01_nadame", "bmhead01_gliding", "bmhead01_endurance", + "bmhead01_flyaway", "bmhead01_flyaway2", "bmhead01_talk02", "bmhead01_landing", "bmhead01_walk", + "bmhead01_wait01", "bmhead01_wait01", "bmhead01_wait01", "bmhead01_talk03", "bmhead01_turn", + "bmhead01_wait01", "bmhead01_wait01"}; + strcpy(l_BCKName, a_BCKName_TBL[i_anmNum]); + return strcat(l_BCKName, ".bck"); } /* 00001848-00001898 .text wingAnmNum_toResID__11daNpc_Bm1_cFi */ -char* daNpc_Bm1_c::wingAnmNum_toResID(int i_param_1) { - - static char* a_BCKName_TBL[0x16] = {"bmwing_dwait","bmwing_fly01","bmwing_lookup","bmwing_orooro","bmarm_wait01","bmarm_wait02","bmarm_talk01","bmarm_nadame","bmwing_gliding","bmwing_endurance","bmarm_flyaway","bmwing_flyaway2","bmarm_talk02","bmarm_landing","bmarm_walk","bmarm02_wait01","bmarm02_talk01","bmarm02_talk02","bmarm_talk03","bmarm_turn","bmarm_walk02","bmarm_check"}; - strcpy(l_BCKName,a_BCKName_TBL[i_param_1]); - return strcat(l_BCKName,".bck"); +char* daNpc_Bm1_c::wingAnmNum_toResID(int i_anmNum) { + static char* a_BCKName_TBL[0x16] = {"bmwing_dwait", "bmwing_fly01", "bmwing_lookup", "bmwing_orooro", "bmarm_wait01", "bmarm_wait02", + "bmarm_talk01", "bmarm_nadame", "bmwing_gliding", "bmwing_endurance", "bmarm_flyaway", "bmwing_flyaway2", + "bmarm_talk02", "bmarm_landing", "bmarm_walk", "bmarm02_wait01", "bmarm02_talk01", "bmarm02_talk02", + "bmarm_talk03", "bmarm_turn", "bmarm_walk02", "bmarm_check"}; + strcpy(l_BCKName, a_BCKName_TBL[i_anmNum]); + return strcat(l_BCKName, ".bck"); } /* 00001898-00001948 .text btpNum_toResID__11daNpc_Bm1_cFi */ char* daNpc_Bm1_c::btpNum_toResID(int i_param_1) { - static char* a_BTPName_TBL[] = {"bmhead01"}; - static char* a_BTPName_TBL_2[] = {"bmhead01","bmhead01","bmhead01","bmhead01","bmhead01","bmhead02","bmhead02","bmhead07","bmhead07","bmhead05","bmhead03","bmhead04","bmhead04","bmhead09","bmhead06","bmhead04"}; - if(!strcmp(a_BTPName_TBL[i_param_1],"bmhead01")){ - strcpy(l_BTPName,a_BTPName_TBL_2[i_param_1]); - return strcat(l_BTPName,".btp"); - }else{ - strcpy(l_BTPName,a_BTPName_TBL[i_param_1]); - return strcat(l_BTPName,".btp"); + static char* a_BTPName_TBL_2[] = { + "bmhead01", + "bmhead01", + "bmhead01", + "bmhead01", + "bmhead01", + "bmhead02", + "bmhead02", + "bmhead07", + "bmhead07", + "bmhead05", + "bmhead03", + "bmhead04", + "bmhead04", + "bmhead09", + "bmhead06", + "bmhead04" + }; + if (!strcmp(a_BTPName_TBL[i_param_1], "bmhead01")) { + strcpy(l_BTPName, a_BTPName_TBL_2[i_param_1]); + return strcat(l_BTPName, ".btp"); + } else { + strcpy(l_BTPName, a_BTPName_TBL[i_param_1]); + return strcat(l_BTPName, ".btp"); } } /* 00001948-00001A4C .text setBtp__11daNpc_Bm1_cFbi */ bool daNpc_Bm1_c::setBtp(bool i_param_1, int i_btp_num) { - J3DModelData* model_data = mpHeadMorf->getModel()->getModelData(); char* res_id = btpNum_toResID(i_btp_num); - m_hed_tex_pttrn = reinterpret_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes(mArcName,res_id)); - JUT_ASSERT(0x529,m_hed_tex_pttrn != NULL); - int iVar1 = mHeadBtpAnm.init(model_data,m_hed_tex_pttrn,1,2,1.0f,0,-1,i_param_1,0); + m_hed_tex_pttrn = reinterpret_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes(mArcName, res_id)); + JUT_ASSERT(0x529, m_hed_tex_pttrn != NULL); + int iVar1 = mHeadBtpAnm.init(model_data, m_hed_tex_pttrn, 1, 2, 1.0f, 0, -1, i_param_1, 0); bool o_retval = iVar1 == 1; - if(o_retval){ + if (o_retval) { mBlinkFrame = 0; mBlinkTimer = 0; } @@ -853,54 +927,51 @@ bool daNpc_Bm1_c::setBtp(bool i_param_1, int i_btp_num) { /* 00001A4C-00001A74 .text iniTexPttrnAnm__11daNpc_Bm1_cFb */ bool daNpc_Bm1_c::iniTexPttrnAnm(bool i_param_1) { - return setBtp(i_param_1,mBtpNum); + return setBtp(i_param_1, mBtpNum); } /* 00001A74-00001B20 .text plyTexPttrnAnm__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::plyTexPttrnAnm() { - - if(mBtpNum != 0 || !cLib_calcTimer(&mBlinkTimer)){ + if (mBtpNum != 0 || !cLib_calcTimer(&mBlinkTimer)) { mBlinkFrame += 1; - if(mBlinkFrame >= m_hed_tex_pttrn->getFrameMax()){ - if(mBtpNum != 0){ + if (mBlinkFrame >= m_hed_tex_pttrn->getFrameMax()) { + if (mBtpNum != 0) { mBlinkFrame = m_hed_tex_pttrn->getFrameMax(); - }else{ + } else { mBlinkTimer = cM_rndF(60.0f) + 30.0f; mBlinkFrame = 0; - } } } } /* 00001B20-00001B5C .text setAnm_tex__11daNpc_Bm1_cFSc */ -void daNpc_Bm1_c::setAnm_tex(signed char i_param_1) { - if(mBtpNum != i_param_1){ +void daNpc_Bm1_c::setAnm_tex(s8 i_param_1) { + if (mBtpNum != i_param_1) { mBtpNum = i_param_1; iniTexPttrnAnm(true); } } /* 00001B5C-00001CF4 .text setAnm_anm__11daNpc_Bm1_cFPQ211daNpc_Bm1_c9anm_prm_c */ -BOOL daNpc_Bm1_c::setAnm_anm(daNpc_Bm1_c::anm_prm_c* i_anmPrmP) { - - if(mAnmNum == i_anmPrmP->mAnmNum){ - return 1; +BOOL daNpc_Bm1_c::setAnm_anm(anm_prm_c* i_anmPrmP) { + if (mAnmNum == i_anmPrmP->anmNum) { + return TRUE; } - mAnmNum = i_anmPrmP->mAnmNum; - dNpc_setAnmFNDirect(mpMorf,i_anmPrmP->mLoopMode,i_anmPrmP->mMorf,i_anmPrmP->mSpeed,anmNum_toResID(mAnmNum),NULL,mArcName); - mbHasArms = i_anmPrmP->mbHasArms == 1; - if(mbHasArms){ - dNpc_setAnmFNDirect(mpArmMorf,i_anmPrmP->mLoopMode,i_anmPrmP->mMorf,i_anmPrmP->mSpeed,wingAnmNum_toResID(mAnmNum),NULL,mArcName); - }else{ - dNpc_setAnmFNDirect(mpWingMorf,i_anmPrmP->mLoopMode,i_anmPrmP->mMorf,i_anmPrmP->mSpeed,wingAnmNum_toResID(mAnmNum),NULL,mArcName); - + mAnmNum = i_anmPrmP->anmNum; + dNpc_setAnmFNDirect(mpMorf, i_anmPrmP->loopMode, i_anmPrmP->morf, i_anmPrmP->speed, anmNum_toResID(mAnmNum), NULL, mArcName); + mbHasArms = i_anmPrmP->hasArms == 1; + if (mbHasArms) { + dNpc_setAnmFNDirect(mpArmMorf, i_anmPrmP->loopMode, i_anmPrmP->morf, i_anmPrmP->speed, wingAnmNum_toResID(mAnmNum), NULL, mArcName); + } else { + dNpc_setAnmFNDirect(mpWingMorf, i_anmPrmP->loopMode, i_anmPrmP->morf, i_anmPrmP->speed, wingAnmNum_toResID(mAnmNum), NULL, mArcName); } - dNpc_setAnmFNDirect(mpHeadMorf,i_anmPrmP->mLoopMode,i_anmPrmP->mMorf,i_anmPrmP->mSpeed,headAnmNum_toResID(mAnmNum),NULL,mArcName); + dNpc_setAnmFNDirect(mpHeadMorf, i_anmPrmP->loopMode, i_anmPrmP->morf, i_anmPrmP->speed, headAnmNum_toResID(mAnmNum), NULL, mArcName); delPrtcl_Hane0(); delPrtcl_Hane1(); - switch(mAnmNum){ + + switch (mAnmNum) { case 2: setPrtcl_Hane1(); break; @@ -908,15 +979,16 @@ BOOL daNpc_Bm1_c::setAnm_anm(daNpc_Bm1_c::anm_prm_c* i_anmPrmP) { setPrtcl_Hane0(); break; } + mFrame = 0; m87B = 0; mbMorfAnimStopped = false; + return TRUE; } /* 00001CF4-00001D60 .text setAnm_NUM__11daNpc_Bm1_cFii */ void daNpc_Bm1_c::setAnm_NUM(int i_param_1, int i_param_2) { - static anm_prm_c a_anm_prm_tbl[0x17] = { { 0, 0, 0.0f, 1.0f, 2, 0 }, { 1, 0, 8.0f, 1.0f, 2, 0 }, @@ -942,15 +1014,14 @@ void daNpc_Bm1_c::setAnm_NUM(int i_param_1, int i_param_2) { {21, 0, 8.0f, 1.0f, 2, 1 }, { 6, 0, 20.0f, 1.0f, 2, 1 }, }; - if(i_param_2 != 0){ - setAnm_tex(a_anm_prm_tbl[i_param_1].mBtpNum); + if (i_param_2 != 0) { + setAnm_tex(a_anm_prm_tbl[i_param_1].btpNum); } setAnm_anm(&a_anm_prm_tbl[i_param_1]); } /* 00001D60-00001DE0 .text setAnm__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::setAnm() { - static anm_prm_c a_anm_prm_tbl[] = { {-1, -1, 0.0f, 0.0f, -1, -1}, { 0, 0, 0.0f, 1.0f, 2, 0}, @@ -972,10 +1043,10 @@ bool daNpc_Bm1_c::setAnm() { {20, 0, 8.0f, 1.0f, 2, 1}, {21, 0, 8.0f, 1.0f, 2, 1}, }; - if(a_anm_prm_tbl[mStatus].mBtpNum >= 0){ - setAnm_tex(a_anm_prm_tbl[mStatus].mBtpNum); + if (a_anm_prm_tbl[mStatus].btpNum >= 0) { + setAnm_tex(a_anm_prm_tbl[mStatus].btpNum); } - if(a_anm_prm_tbl[mStatus].mAnmNum >= 0){ + if (a_anm_prm_tbl[mStatus].anmNum >= 0) { setAnm_anm(&a_anm_prm_tbl[mStatus]); } return true; @@ -983,13 +1054,11 @@ bool daNpc_Bm1_c::setAnm() { /* 00001DE0-00001E24 .text setPlaySpd__11daNpc_Bm1_cFf */ void daNpc_Bm1_c::setPlaySpd(float i_speed) { - - if(mbHasArms){ + if (mbHasArms) { mpArmMorf->setPlaySpeed(i_speed); mpHeadMorf->setPlaySpeed(i_speed); mpMorf->setPlaySpeed(i_speed); - return; - }else{ + } else { mpWingMorf->setPlaySpeed(i_speed); mpHeadMorf->setPlaySpeed(i_speed); mpMorf->setPlaySpeed(i_speed); @@ -998,29 +1067,27 @@ void daNpc_Bm1_c::setPlaySpd(float i_speed) { /* 00001E24-00001E28 .text chg_anmTag__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::chg_anmTag() { - } /* 00001E28-00001E2C .text control_anmTag__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::control_anmTag() { - } /* 00001E2C-00001EFC .text chg_anmAtr__11daNpc_Bm1_cFUc */ -void daNpc_Bm1_c::chg_anmAtr(unsigned char i_param_1) { - - if(i_param_1 >= 0xF || i_param_1 == m8F7){ +void daNpc_Bm1_c::chg_anmAtr(u8 i_param_1) { + if (i_param_1 >= 0xF || i_param_1 == m8F7) { return; } + m8F7 = i_param_1; - if(IamSukketo() || IamKakkuto()){ - switch(m8F7){ + if (IamSukketo() || IamKakkuto()) { + switch (m8F7) { case 9: mLookBackState = 1; m_jnt.setTrn(); break; case 0xD: - if(mPartnerProcID != -1){ + if (mPartnerProcID != -1) { fopAc_ac_c* actor = searchByID(mPartnerProcID); m82C = actor->eyePos; mLookBackState = 2; @@ -1033,13 +1100,12 @@ void daNpc_Bm1_c::chg_anmAtr(unsigned char i_param_1) { /* 00001EFC-00001F68 .text control_anmAtr__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::control_anmAtr() { - - switch(m8F7){ + switch (m8F7) { case 8: - if(mbMorfAnimStopped){ - if(++m87B >= 2){ + if (mbMorfAnimStopped) { + if (++m87B >= 2) { m8F7 = 6; - setAnm_NUM(0x16,1); + setAnm_NUM(0x16, 1); } } break; @@ -1051,93 +1117,92 @@ void daNpc_Bm1_c::control_anmAtr() { /* 00001F68-00001FD0 .text setAnm_ATR__11daNpc_Bm1_cFi */ void daNpc_Bm1_c::setAnm_ATR(int i_param_1) { - static anm_prm_c a_anm_prm_tbl[] = { - { 4, 0, 8.0f, 1.0f, 2, 1 }, - { 1, 0, 8.0f, 1.0f, 2, 0 }, - { 0, 0, 6.0f, 1.0f, 2, 0 }, - { 2, 0, 8.0f, 1.0f, 0, 0 }, - { 3, 0, 8.0f, 1.8f, 2, 0 }, - { 5, 0, 12.0f, 1.0f, 2, 1 }, - { 6, 0, 8.0f, 1.0f, 2, 1 }, - { 7, 0, 8.0f, 1.0f, 2, 1 }, - { 7, 0, 5.0f, 1.0f, 2, 1 }, - {12, 0, 8.0f, 1.0f, 2, 1 }, - {15, 0, 12.0f, 1.0f, 2, 1 }, - {16, 0, 12.0f, 1.0f, 2, 1 }, - {17, 0, 12.0f, 1.0f, 2, 1 }, - { 6, 0, 8.0f, 1.0f, 2, 1 }, - {18, 0, 8.0f, 1.0f, 2, 1 }, + {4, 0, 8.0f, 1.0f, 2, 1}, + {1, 0, 8.0f, 1.0f, 2, 0}, + {0, 0, 6.0f, 1.0f, 2, 0}, + {2, 0, 8.0f, 1.0f, 0, 0}, + {3, 0, 8.0f, 1.8f, 2, 0}, + {5, 0, 12.0f, 1.0f, 2, 1}, + {6, 0, 8.0f, 1.0f, 2, 1}, + {7, 0, 8.0f, 1.0f, 2, 1}, + {7, 0, 5.0f, 1.0f, 2, 1}, + {12, 0, 8.0f, 1.0f, 2, 1}, + {15, 0, 12.0f, 1.0f, 2, 1}, + {16, 0, 12.0f, 1.0f, 2, 1}, + {17, 0, 12.0f, 1.0f, 2, 1}, + {6, 0, 8.0f, 1.0f, 2, 1}, + {18, 0, 8.0f, 1.0f, 2, 1}, }; - if(i_param_1 != 0){ - setAnm_tex(a_anm_prm_tbl[m8F7].mBtpNum); + if (i_param_1 != 0) { + setAnm_tex(a_anm_prm_tbl[m8F7].btpNum); } setAnm_anm(&a_anm_prm_tbl[m8F7]); } /* 00001FD0-000020D8 .text anmAtr__11daNpc_Bm1_cFUs */ -void daNpc_Bm1_c::anmAtr(unsigned short i_param_1) { +void daNpc_Bm1_c::anmAtr(u16 i_param_1) { dComIfG_MesgCamInfo_c* caminfo = dComIfGp_getMesgCameraInfo(); - if(mbManzai != 0 && this != caminfo->mActor[caminfo->mBasicID-1]){ + if (mbManzai != 0 && this != caminfo->mActor[caminfo->mBasicID - 1]) { control_anmTag(); control_anmAtr(); return; } - u32 uVar1; - switch(i_param_1){ - case 0x6: - if(m905 == 0){ + + switch (i_param_1) { + case 0x6: { + if (m905 == 0) { m8F7 = 0xFF; chg_anmAtr(dComIfGp_getMesgAnimeAttrInfo()); m905 += 1; - } - uVar1 = dComIfGp_getMesgAnimeTagInfo(); + } + u32 uVar1 = dComIfGp_getMesgAnimeTagInfo(); dComIfGp_clearMesgAnimeTagInfo(); - if(uVar1 != 0xFF && m8F8 != uVar1){ + if (uVar1 != 0xFF && m8F8 != uVar1) { m8F8 = uVar1; chg_anmTag(); } break; + } case 0xE: m905 = 0; break; } control_anmTag(); control_anmAtr(); - } /* 000020D8-0000217C .text eventOrder__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::eventOrder() { s8 condition = m8FD; - if(condition == 1 || condition == 2){ + if (condition == 1 || condition == 2) { eventInfo.onCondition(dEvtCnd_CANTALK_e); - if(mSpecificType == SPECIFIC_TYPE_Hoskit_e){ + if (mSpecificType == SPECIFIC_TYPE_Hoskit_e) { eventInfo.onCondition(dEvtCnd_CANTALKITEM_e); } - if(m8FD == 1){ + if (m8FD == 1) { fopAcM_orderSpeakEvent(this); } - }else if(condition >= 3){ + } else if (condition >= 3) { mEventIdx = condition - 3; - fopAcM_orderOtherEventId(this,mEventIdTable[mEventIdx]); + fopAcM_orderOtherEventId(this, mEventIdTable[mEventIdx]); } } /* 0000217C-00002234 .text checkOrder__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::checkOrder() { - if(eventInfo.checkCommandDemoAccrpt()){ - if(dComIfGp_evmng_startCheck(mEventIdTable[mEventIdx])){ - switch(mEventIdx){ + if (eventInfo.checkCommandDemoAccrpt()) { + if (dComIfGp_evmng_startCheck(mEventIdTable[mEventIdx])) { + switch (mEventIdx) { case 3: - fopAcM_OffStatus(this,fopAcStts_UNK4000_e); + fopAcM_OffStatus(this, fopAcStts_UNK4000_e); break; case 2: break; } m8FD = 0; } - }else if(eventInfo.getCommand() == dEvtCmd_INTALK_e && (m8FD == 1 || m8FD == 2)){ + } else if (eventInfo.getCommand() == dEvtCmd_INTALK_e && (m8FD == 1 || m8FD == 2)) { m8FD = 0; m895 = true; } @@ -1146,16 +1211,16 @@ void daNpc_Bm1_c::checkOrder() { /* 00002234-00002304 .text chk_manzai__11daNpc_Bm1_cFv */ u8 daNpc_Bm1_c::chk_manzai() { u8 o_retval = 1; - if(mPartnerProcID != -1){ + if (mPartnerProcID != -1) { daNpc_Bm1_c* actor = static_cast<daNpc_Bm1_c*>(searchByID(mPartnerProcID)); - if(actor == NULL){ + if (actor == NULL) { return 0; - }else{ + } else { mbManzai = actor->getStt() == 9; - if(mbManzai){ - dComIfGp_setMesgCameraInfoActor(this,actor,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); - }else{ - fopAcM_OnStatus(actor,fopAcStts_UNK4000_e); + if (mbManzai) { + dComIfGp_setMesgCameraInfoActor(this, actor, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + } else { + fopAcM_OnStatus(actor, fopAcStts_UNK4000_e); actor->set_manzai(); o_retval = 0; } @@ -1166,21 +1231,18 @@ u8 daNpc_Bm1_c::chk_manzai() { /* 00002304-000023A0 .text chk_talk__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::chk_talk() { - bool uVar3 = true; m87D = 0xFF; - if(dComIfGp_event_chkTalkXY()){ - if(dComIfGp_evmng_ChkPresentEnd()){ - m87D = dComIfGp_event_getPreItemNo(); - - }else{ - uVar3 = false; - } + if (dComIfGp_event_chkTalkXY()) { + if (dComIfGp_evmng_ChkPresentEnd()) { + m87D = dComIfGp_event_getPreItemNo(); + } else { + uVar3 = false; + } } return uVar3; - } /* 000023A0-000023E0 .text chk_partsNotMove__11daNpc_Bm1_cFv */ @@ -1189,8 +1251,7 @@ bool daNpc_Bm1_c::chk_partsNotMove() { } /* 000023E0-00002590 .text lookBack__11daNpc_Bm1_cFv */ -BOOL daNpc_Bm1_c::lookBack() { - +void daNpc_Bm1_c::lookBack() { cXyz dstPos; cXyz* dstPos_p; cXyz src_pos; @@ -1202,12 +1263,12 @@ BOOL daNpc_Bm1_c::lookBack() { src_pos.y = current.pos.y; src_pos.z = current.pos.z; src_pos.y = eyePos.y; - dstPos.set(0.0f,0.0f,0.0f); + dstPos.set(0.0f, 0.0f, 0.0f); dstPos_p = NULL; desiredYrot = current.angle.y; bool headOnlyFollow = m896; - switch(mLookBackState){ + switch (mLookBackState) { case 1: dstPos = dNpc_playerEyePos(-20.0f); dstPos_p = &dstPos; @@ -1228,18 +1289,17 @@ BOOL daNpc_Bm1_c::lookBack() { desiredYrot = m876; break; } - cLib_addCalcAngleS2(&mHeadLookAtMaxVel,l_HIO.children[mType-1].hio_prm.mCalcAngleTarget,4,0x800); - if(!m_jnt.trnChk()){ + cLib_addCalcAngleS2(&mHeadLookAtMaxVel, l_HIO.children[mType - 1].hio_prm.mCalcAngleTarget, 4, 0x800); + if (!m_jnt.trnChk()) { mHeadLookAtMaxVel = 0; } - m_jnt.lookAtTarget(¤t.angle.y,dstPos_p,src_pos,desiredYrot,mHeadLookAtMaxVel,headOnlyFollow); + m_jnt.lookAtTarget(¤t.angle.y, dstPos_p, src_pos, desiredYrot, mHeadLookAtMaxVel, headOnlyFollow); } /* 00002590-00002A58 .text next_msgStatus__11daNpc_Bm1_cFPUl */ -u16 daNpc_Bm1_c::next_msgStatus(unsigned long* i_msg_no) { - - u16 var_r0 = 0xF; - switch (*i_msg_no) { +u16 daNpc_Bm1_c::next_msgStatus(u32* i_msg_no) { + u16 msg_status = fopMsgStts_MSG_CONTINUES_e; + switch (*i_msg_no) { case 0x1771: *i_msg_no = 0x1772; break; @@ -1255,19 +1315,19 @@ u16 daNpc_Bm1_c::next_msgStatus(unsigned long* i_msg_no) { case 0x18A1: *i_msg_no = 0x18A2; break; - case 0x5FE: + case 0x5FE: *i_msg_no = 0x5FF; break; - case 0x601: + case 0x601: *i_msg_no = 0x602; break; - case 0x602: + case 0x602: *i_msg_no = 0x603; break; - case 0x603: + case 0x603: *i_msg_no = 0x604; break; - case 0x604: + case 0x604: *i_msg_no = 0x605; break; case 0x186B: @@ -1358,20 +1418,19 @@ u16 daNpc_Bm1_c::next_msgStatus(unsigned long* i_msg_no) { *i_msg_no = 0x199F; break; case 0x199F: - if(dComIfGs_getBeastNum(dBeastIdx_GOLDEN_FEATHER_e) >= 0x14){ + if (dComIfGs_getBeastNum(dBeastIdx_GOLDEN_FEATHER_e) >= 20) { *i_msg_no = 0x19A1; - }else{ + } else { *i_msg_no = 0x19A0; } break; case 0x19A1: - - switch (mpCurrMsg->mSelectNum) { + switch (mpCurrMsg->mSelectNum) { case 0: *i_msg_no = 0x19A3; - dComIfGp_setItemBeastNumCount(dBeastIdx_GOLDEN_FEATHER_e,-0x14); + dComIfGp_setItemBeastNumCount(dBeastIdx_GOLDEN_FEATHER_e, -20); break; - case 1: + case 1: *i_msg_no = 0x19A2; break; } @@ -1395,26 +1454,26 @@ u16 daNpc_Bm1_c::next_msgStatus(unsigned long* i_msg_no) { *i_msg_no = 0x1EF5; break; case 0x1EF5: - switch (mpCurrMsg->mSelectNum) { + switch (mpCurrMsg->mSelectNum) { case 0: *i_msg_no = 0x1EF6; break; - case 1: + case 1: *i_msg_no = 0x1EF8; break; } break; - default: - var_r0 = 0x10; + default: + msg_status = fopMsgStts_MSG_ENDS_e; break; } - return var_r0; + return msg_status; } /* 00002A58-00002AC4 .text getBitMask__11daNpc_Bm1_cFv */ s8 daNpc_Bm1_c::getBitMask() { s8 o_retval = 0; - switch(mSpecificType){ + switch (mSpecificType) { case SPECIFIC_TYPE_Basht_e: o_retval = 1; break; @@ -1436,31 +1495,22 @@ s8 daNpc_Bm1_c::getBitMask() { /* 00002AC4-00002B00 .text getMsg_PST_1__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_PST_1() { - return dComIfGs_isEventBit(dSv_event_flag_c::UNK_1401) ? 0xC93 : 0xC92; } /* 00002B00-00002B40 .text getMsg_PST_3__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_PST_3() { - return dComIfGs_isEventBit(dSv_event_flag_c::UNK_2202) ? 0x18A3 : 0x18A1; } /* 00002B40-00002BE8 .text getMsg_SKT_0__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_SKT_0() { - - - u32 o_retval; - if(dComIfGs_isSymbol(1)){ - if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)){ - o_retval = 0x186B; - return o_retval; - } - else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)){ - o_retval = 0x1873; - return o_retval; - } - else{ + if (dComIfGs_isSymbol(1)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)) { + return 0x186B; + } else if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { + return 0x1873; + } else { return !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04) ? 0x187B : 0x1883; } } @@ -1469,18 +1519,12 @@ u32 daNpc_Bm1_c::getMsg_SKT_0() { /* 00002BE8-00002C90 .text getMsg_KKT_0__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_KKT_0() { - - u32 o_retval; - if(dComIfGs_isSymbol(1)){ - if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)){ - o_retval = 0x186F; - return o_retval; - } - else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)){ - o_retval = 0x1877; - return o_retval; - } - else{ + if (dComIfGs_isSymbol(1)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1A80)) { + return 0x186F; + } else if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { + return 0x1877; + } else { return !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E04) ? 0x187F : 0x1887; } } @@ -1489,11 +1533,10 @@ u32 daNpc_Bm1_c::getMsg_KKT_0() { /* 00002C90-00002DBC .text getMsg_BMB_0__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_BMB_0() { - s8 reg = dComIfGs_getEventReg(0xB8FF); s8 mask = getBitMask(); u32 var_r29 = 0; - if (reg&mask) { + if (reg & mask) { switch (mSpawnCondition) { case 1: var_r29 = 0x18A0; @@ -1533,11 +1576,10 @@ u32 daNpc_Bm1_c::getMsg_BMB_0() { /* 00002DBC-00002EE8 .text getMsg_BMB_1__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_BMB_1() { - s8 reg = dComIfGs_getEventReg(0xB8FF); s8 mask = getBitMask(); u32 var_r29 = 0; - if (reg&mask) { + if (reg & mask) { switch (mSpawnCondition) { case 1: var_r29 = 0x18A9; @@ -1577,38 +1619,40 @@ u32 daNpc_Bm1_c::getMsg_BMB_1() { /* 00002EE8-00003010 .text getMsg_BMB_2__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_BMB_2() { - - if(m87C != 0){ + if (m87C != 0) { return 0x199C; } - if(m87D == 0x47){ - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2180)){ + if (m87D == 0x47) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2180)) { return 0x199D; } - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2140)){ - return (dComIfGs_getBeastNum(dBeastIdx_GOLDEN_FEATHER_e) >= 0x14) ? 0x19A1: 0x19A0; + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2140)) { + if (dComIfGs_getBeastNum(dBeastIdx_GOLDEN_FEATHER_e) >= 20) { + return 0x19A1; + } else { + return 0x19A0; + } } dComIfGs_onEventBit(dSv_event_flag_c::UNK_2140); return 0x199E; - } - else if(m87D != 0xFF){ + } else if (m87D != 0xFF) { return 0x19A5; } - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2180)){ + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2180)) { return 0x199B; } - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2001)){ + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2001)) { return 0x199A; } - return dComIfGs_isEventBit(dSv_event_flag_c::UNK_2120)? 0x1998 : 0x1996; - - + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2120)) { + return 0x1998; + } + return 0x1996; } /* 00003010-00003058 .text getMsg_BMC_0__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_BMC_0() { - - switch(mSpawnCondition){ + switch (mSpawnCondition) { case 1: return 0x18A6; case 2: @@ -1619,16 +1663,14 @@ u32 daNpc_Bm1_c::getMsg_BMC_0() { break; } return 0; - } /* 00003058-000030D0 .text getMsg_BMC_2__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_BMC_2() { - - if(m87C != 0){ + if (m87C != 0) { return 0x1EF7; } - if(dComIfGs_isGetItemReserve(0xF)){ + if (dComIfGs_isGetItemReserve(0xF)) { return 0x1EF9; } return dComIfGs_isEventBit(dSv_event_flag_c::UNK_1908) ? 0x1EF2 : 0x1EF0; @@ -1636,11 +1678,10 @@ u32 daNpc_Bm1_c::getMsg_BMC_2() { /* 000030D0-000031FC .text getMsg_BMC_3__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_BMC_3() { - s8 reg = dComIfGs_getEventReg(0xB8FF); s8 mask = getBitMask(); u32 var_r29 = 0; - if (reg&mask) { + if (reg & mask) { switch (mSpawnCondition) { case 1: var_r29 = 0x18C5; @@ -1680,11 +1721,10 @@ u32 daNpc_Bm1_c::getMsg_BMC_3() { /* 000031FC-00003328 .text getMsg_BMD_0__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_BMD_0() { - s8 reg = dComIfGs_getEventReg(0xB8FF); s8 mask = getBitMask(); u32 var_r29 = 0; - if (reg&mask) { + if (reg & mask) { switch (mSpawnCondition) { case 1: var_r29 = 0x189E; @@ -1724,14 +1764,13 @@ u32 daNpc_Bm1_c::getMsg_BMD_0() { /* 00003328-00003470 .text getMsg_BMD_1__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg_BMD_1() { - s8 reg = dComIfGs_getEventReg(0xB8FF); s8 mask = getBitMask(); u32 var_r29 = 0; - if (reg&mask) { - if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)){ + if (reg & mask) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { var_r29 = 0x18A5; - }else{ + } else { switch (mSpawnCondition) { case 1: case 2: @@ -1746,9 +1785,9 @@ u32 daNpc_Bm1_c::getMsg_BMD_1() { } } } else { - if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820) ){ + if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { var_r29 = 0x18A4; - }else{ + } else { switch (mSpawnCondition) { case 1: case 2: @@ -1772,9 +1811,8 @@ u32 daNpc_Bm1_c::getMsg_BMD_1() { /* 00003470-00003548 .text getMsg__11daNpc_Bm1_cFv */ u32 daNpc_Bm1_c::getMsg() { - u32 o_retval = 0; - switch(this->mSpecificType) { + switch (mSpecificType) { case SPECIFIC_TYPE_Quill_1_e: o_retval = getMsg_PST_1(); break; @@ -1810,62 +1848,50 @@ u32 daNpc_Bm1_c::getMsg() { break; case SPECIFIC_TYPE_Kogoli_e: o_retval = getMsg_BMD_1(); + break; } return o_retval; } /* 00003548-000035C8 .text chkAttention__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::chkAttention() { - dAttention_c& attention = dComIfGp_getAttention(); if (attention.LockonTruth()) { return this == attention.LockonTarget(0); } else { return this == attention.ActionTarget(0); } - } /* 000035C8-00003630 .text setAttention__11daNpc_Bm1_cFb */ void daNpc_Bm1_c::setAttention(bool i_setEyePos) { - - f32 l_hio_offset = l_HIO.children[mType-1].hio_prm.mAttPosOffsetY; - attention_info.position.set( - current.pos.x, - current.pos.y + l_hio_offset, - current.pos.z - ); + f32 l_hio_offset = l_HIO.children[mType - 1].hio_prm.mAttPosOffsetY; + attention_info.position.set(current.pos.x, current.pos.y + l_hio_offset, current.pos.z); if (!mbSetEyePos && !i_setEyePos) { return; } - eyePos.set( - mEyePos.x, - mEyePos.y, - mEyePos.z - ); + eyePos.set(mEyePos.x, mEyePos.y, mEyePos.z); } /* 00003630-00003664 .text searchByID__11daNpc_Bm1_cFUi */ fopAc_ac_c* daNpc_Bm1_c::searchByID(fpc_ProcID i_procID) { - fopAc_ac_c* o_actor = NULL; - fopAcM_SearchByID(i_procID,&o_actor); + fopAcM_SearchByID(i_procID, &o_actor); return o_actor; } /* 00003664-00003714 .text partner_srch_sub__11daNpc_Bm1_cFPFPvPv_Pv */ bool daNpc_Bm1_c::partner_srch_sub(void* (*i_searchFunc)(void*, void*)) { - bool o_retval = false; mPartnerProcID = -1; l_check_wrk = 0; - for(int i = 0; i < 20; i++){ + for (int i = 0; i < 20; i++) { l_check_inf[i] = 0; } - fpcM_Search(i_searchFunc,this); - if(l_check_wrk != 0){ - mPartnerProcID = fopAcM_GetID(l_check_inf[0]); + fpcM_Search(i_searchFunc, this); + if (l_check_wrk != 0) { + mPartnerProcID = fopAcM_GetID(l_check_inf[0]); o_retval = true; } return o_retval; @@ -1873,10 +1899,9 @@ bool daNpc_Bm1_c::partner_srch_sub(void* (*i_searchFunc)(void*, void*)) { /* 00003714-00003818 .text partner_srch__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::partner_srch() { - bool found_partner = false; - if(m904 == 1){ - switch(mSpecificType){ + if (m904 == 1) { + switch (mSpecificType) { case SPECIFIC_TYPE_Quill_1_e: found_partner = partner_srch_sub(searchActor_Zl); break; @@ -1887,16 +1912,16 @@ void daNpc_Bm1_c::partner_srch() { found_partner = partner_srch_sub(searchActor_Bm_Skt); break; case SPECIFIC_TYPE_Ilari_0xB_e: - if(partner_srch_sub(searchActor_Gp) ){ + if (partner_srch_sub(searchActor_Gp)) { fopAc_ac_c* actor = searchByID(mPartnerProcID); - if(actor){ - current.angle.y = cLib_targetAngleY(¤t.pos,&actor->current.pos); + if (actor) { + current.angle.y = cLib_targetAngleY(¤t.pos, &actor->current.pos); } found_partner = true; } break; } - if(found_partner){ + if (found_partner) { m904 += 1; } } @@ -1904,43 +1929,38 @@ void daNpc_Bm1_c::partner_srch() { /* 00003818-00003A24 .text bm_movPass__11daNpc_Bm1_cFb */ u32 daNpc_Bm1_c::bm_movPass(bool i_param_1) { - cXyz cmpCoords; cXyz idxCoords; u8 point_idx; u32 o_retval = 0; f32 dist_xz; - if(mPathRun.isPath() && (point_idx = mPathRun.getIdx(),dPath_ChkClose(mPathRun.getPath()))){ - if(mPathRun.chkPointPass(current.pos,mPathRun.getDir())){ + if (mPathRun.isPath() && (point_idx = mPathRun.getIdx(), dPath_ChkClose(mPathRun.getPath()))) { + if (mPathRun.chkPointPass(current.pos, mPathRun.getDir())) { mPathRun.nextIdxAuto(); o_retval = 1; - if(i_param_1){ + if (i_param_1) { goto block_18c; } } return o_retval; - - } dist_xz = (mTargetPos - current.pos).absXZ(); - if( dist_xz <= m858){ + if (dist_xz <= m858) { o_retval = 1; - if(mPathRun.isPath()){ - if(point_idx < mPathRun.maxPoint()-2){ + if (mPathRun.isPath()) { + if (point_idx < mPathRun.maxPoint() - 2) { mPathRun.nextIdxAuto(); - }else{ + } else { o_retval = 2; } - } - if(i_param_1 != 0){ + if (i_param_1 != 0) { goto block_18c; } - } return o_retval; - + block_18c: u8 idx = mPathRun.getIdx(); idxCoords = mPathRun.getPoint(idx); @@ -1952,62 +1972,54 @@ block_18c: /* 00003A24-00003A68 .text bm_setFlyAnm__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::bm_setFlyAnm() { - - if(m889){ - setAnm_NUM(9,1); - }else{ - setAnm_NUM(8,1); + if (m889) { + setAnm_NUM(9, 1); + } else { + setAnm_NUM(8, 1); } } /* 00003A68-00003BF0 .text bm_clcFlySpd__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::bm_clcFlySpd() { - s16 target; - if(m8F4 == 2 || m8F4 == 5){ - target = cLib_targetAngleY(¤t.pos,&mTargetPos); - cLib_addCalcAngleS(¤t.angle.y,target,l_HIO.children[mType-1].hio_prm.mFlyScale,l_HIO.children[mType-1].hio_prm.mFlyMaxStep,0); + if (m8F4 == 2 || m8F4 == 5) { + target = cLib_targetAngleY(¤t.pos, &mTargetPos); + cLib_addCalcAngleS(¤t.angle.y, target, l_HIO.children[mType - 1].hio_prm.mFlyScale, l_HIO.children[mType - 1].hio_prm.mFlyMaxStep, 0); } - switch(m8F4){ - + switch (m8F4) { case 3: speed.y -= mFlyAccelY; break; case 2: case 5: - - if(m889 != 0){ + if (m889 != 0) { if (mTargetPos.y > current.pos.y) { - - speed.y = cLib_maxLimit(speed.y + mFlyAccelY,mFlySpeedY); + speed.y = cLib_maxLimit(speed.y + mFlyAccelY, mFlySpeedY); } else { - speed.y = cLib_minLimit(speed.y - mFlyAccelY,0.0f); + speed.y = cLib_minLimit(speed.y - mFlyAccelY, 0.0f); } - }else if(mTargetPos.y > current.pos.y){ - speed.y = cLib_maxLimit(speed.y + mFlyAccelY,0.0f); - }else{ + } else if (mTargetPos.y > current.pos.y) { + speed.y = cLib_maxLimit(speed.y + mFlyAccelY, 0.0f); + } else { speed.y -= mFlyAccelY; } - break; + break; case 0: case 1: break; } - cLib_chaseF(&speedF,mTargetFlySpeed,mTargetFlyStep); - + cLib_chaseF(&speedF, mTargetFlySpeed, mTargetFlyStep); } /* 00003BF0-00003C64 .text bm_clcMovSpd__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::bm_clcMovSpd() { - - s16 target = cLib_targetAngleY(¤t.pos,&mTargetPos); - cLib_addCalcAngleS(¤t.angle.y,target,l_HIO.children[mType-1].hio_prm.m34,l_HIO.children[mType-1].hio_prm.m36,0); - cLib_chaseF(&speedF,mTargetFlySpeed,mTargetFlyStep); + s16 target = cLib_targetAngleY(¤t.pos, &mTargetPos); + cLib_addCalcAngleS(¤t.angle.y, target, l_HIO.children[mType - 1].hio_prm.m34, l_HIO.children[mType - 1].hio_prm.m36, 0); + cLib_chaseF(&speedF, mTargetFlySpeed, mTargetFlyStep); } /* 00003C64-00003ED4 .text bm_flyMove__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::bm_flyMove() { - s32 temp_r3; if (m8F4 == 0) { @@ -2021,14 +2033,14 @@ bool daNpc_Bm1_c::bm_flyMove() { mTargetPos = mPathRun.getPoint(mPathRun.getIdx()); } switch (m8F4) { - case 1: + case 1: if (mAnmNum != 0xA) { setAnm_NUM(0xA, 1); } else if (mbMorfAnimStopped) { m8F4 = 2; } break; - case 2: + case 2: if (mAnmNum != 0xB) { setAnm_NUM(0xB, 1); speed.y = mTargetFlySpeed * 0.7f; @@ -2038,7 +2050,7 @@ bool daNpc_Bm1_c::bm_flyMove() { bm_setFlyAnm(); } goto case_5; - case 3: + case 3: setAnm_NUM(9, 1); if (!mObjAcch.ChkGroundHit() != 0) { bm_clcFlySpd(); @@ -2050,8 +2062,7 @@ bool daNpc_Bm1_c::bm_flyMove() { } break; - - case 4: + case 4: if (mAnmNum != 0xD) { setAnm_NUM(0xD, 1); } else if (mbMorfAnimStopped) { @@ -2062,8 +2073,8 @@ bool daNpc_Bm1_c::bm_flyMove() { } break; - case 5: -case_5: + case 5: + case_5: bm_clcFlySpd(); temp_r3 = bm_movPass(1); switch (temp_r3) { @@ -2087,35 +2098,34 @@ case_5: /* 00003ED4-00003FA4 .text bm_nMove__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::bm_nMove() { - - if(m88B){ + if (m88B) { m887 = 1; return; } - switch(mAnmNum){ + + switch (mAnmNum) { case 0x14: case 0xE: bm_clcMovSpd(); - f32 speed = speedF * l_HIO.children[mType-1].hio_prm.m38; - if(speed < 0.5f){ + f32 speed = speedF * l_HIO.children[mType - 1].hio_prm.m38; + if (speed < 0.5f) { speed = 0.5f; } setPlaySpd(speed); s32 iVar3 = bm_movPass(false); - if(3 <= iVar3 || iVar3 < 1){ + if (iVar3 >= 3 || iVar3 < 1) { return; } m88B = 1; + break; } } /* 00003FA4-000040EC .text setPrtcl_Flyaway__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::setPrtcl_Flyaway() { - - - if (mAnmNum == 0xB && mpMorf->checkFrame(10.0f)){ + if (mAnmNum == 0xB && mpMorf->checkFrame(10.0f)) { #if VERSION == VERSION_DEMO - JGeometry::TVec3<f32> direction(-1.0f,1.0f,0.0f); + JGeometry::TVec3<f32> direction(-1.0f, 1.0f, 0.0f); #endif delPrtcl_Flyaway(); mpFlyawayEmitterL = dComIfGp_particle_set( @@ -2123,7 +2133,9 @@ void daNpc_Bm1_c::setPrtcl_Flyaway() { &mWingLPos, ¤t.angle, NULL, - -1,NULL,fopAcM_GetRoomNo(this), + -1, + NULL, + fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0 ); @@ -2132,22 +2144,25 @@ void daNpc_Bm1_c::setPrtcl_Flyaway() { dPa_name::ID_IT_SN_BM_HANEL_FLYAWAY00, &mWingRPos, ¤t.angle, - NULL,-1,NULL,fopAcM_GetRoomNo(this), + NULL, + -1, + NULL, + fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0 ); #if VERSION > VERSION_DEMO if (mpFlyawayEmitterL != NULL) { - mpFlyawayEmitterL->setStatus(0x40); + mpFlyawayEmitterL->becomeImmortalEmitter(); } if (mpFlyawayEmitterR != NULL) { - JGeometry::TVec3<f32> rot(-1.0f,1.0f,0.0f); - mpFlyawayEmitterR->setStatus(0x40); + JGeometry::TVec3<f32> rot(-1.0f, 1.0f, 0.0f); + mpFlyawayEmitterR->becomeImmortalEmitter(); mpFlyawayEmitterR->setDirection(rot); } #else - if(mpFlyawayEmitterR != NULL){ + if (mpFlyawayEmitterR != NULL) { mpFlyawayEmitterR->setDirection(direction); } #endif @@ -2156,9 +2171,7 @@ void daNpc_Bm1_c::setPrtcl_Flyaway() { /* 000040EC-00004160 .text delPrtcl_Flyaway__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::delPrtcl_Flyaway() { - - - if(mpFlyawayEmitterL){ + if (mpFlyawayEmitterL) { #if VERSION > VERSION_DEMO mpFlyawayEmitterL->quitImmortalEmitter(); #endif @@ -2166,7 +2179,7 @@ void daNpc_Bm1_c::delPrtcl_Flyaway() { mpFlyawayEmitterL = NULL; } - if(mpFlyawayEmitterR){ + if (mpFlyawayEmitterR) { #if VERSION > VERSION_DEMO mpFlyawayEmitterR->quitImmortalEmitter(); #endif @@ -2177,10 +2190,9 @@ void daNpc_Bm1_c::delPrtcl_Flyaway() { /* 00004160-000042A8 .text setPrtcl_Land0__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::setPrtcl_Land0() { - - if (mAnmNum == 0xD && mpMorf->checkFrame(1.0f)){ + if (mAnmNum == 0xD && mpMorf->checkFrame(1.0f)) { #if VERSION == VERSION_DEMO - JGeometry::TVec3<f32> direction(-1.0f,0.5f,0.0f); + JGeometry::TVec3<f32> direction(-1.0f, 0.5f, 0.0f); #endif delPrtcl_Land0(); mpLandEmitterL = dComIfGp_particle_set( @@ -2209,16 +2221,16 @@ void daNpc_Bm1_c::setPrtcl_Land0() { #if VERSION > VERSION_DEMO if (mpLandEmitterL != NULL) { - mpLandEmitterL->setStatus(0x40); + mpLandEmitterL->becomeImmortalEmitter(); } if (mpLandEmitterR != NULL) { - JGeometry::TVec3<f32> rot(-1.0f,0.5f,0.0f); - mpLandEmitterR->setStatus(0x40); + JGeometry::TVec3<f32> rot(-1.0f, 0.5f, 0.0f); + mpLandEmitterR->becomeImmortalEmitter(); mpLandEmitterR->setDirection(rot); } #else - if(mpLandEmitterR != NULL){ + if (mpLandEmitterR != NULL) { mpLandEmitterR->setDirection(direction); } #endif @@ -2227,8 +2239,7 @@ void daNpc_Bm1_c::setPrtcl_Land0() { /* 000042A8-0000431C .text delPrtcl_Land0__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::delPrtcl_Land0() { - - if(mpLandEmitterL){ + if (mpLandEmitterL) { #if VERSION > VERSION_DEMO mpLandEmitterL->quitImmortalEmitter(); #endif @@ -2236,7 +2247,7 @@ void daNpc_Bm1_c::delPrtcl_Land0() { mpLandEmitterL = NULL; } - if(mpLandEmitterR){ + if (mpLandEmitterR) { #if VERSION > VERSION_DEMO mpLandEmitterR->quitImmortalEmitter(); #endif @@ -2247,122 +2258,71 @@ void daNpc_Bm1_c::delPrtcl_Land0() { /* 0000431C-000043E0 .text setPrtcl_Hane0__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::setPrtcl_Hane0() { - delPrtcl_Hane0(); - mpFeatherEmitterL = dComIfGp_particle_set( - dPa_name::ID_IT_SN_TORIZOKU_HANE00, - ¤t.pos, - NULL, - NULL, - 0xFF, - NULL, - fopAcM_GetRoomNo(this), - NULL, - NULL - ); - - mpFeatherEmitterR = dComIfGp_particle_set( - dPa_name::ID_IT_SN_TORIZOKU_HANE00, - ¤t.pos, - NULL, - NULL, - 0xFF, - NULL, - fopAcM_GetRoomNo(this), - NULL, - NULL - ); - - + mpFeatherEmitterL = dComIfGp_particle_set(dPa_name::ID_IT_SN_TORIZOKU_HANE00, ¤t.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this)); + mpFeatherEmitterR = dComIfGp_particle_set(dPa_name::ID_IT_SN_TORIZOKU_HANE00, ¤t.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this)); } /* 000043E0-00004470 .text flwPrtcl_Hane0__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::flwPrtcl_Hane0() { - - if(mpFeatherEmitterL){ + if (mpFeatherEmitterL) { mpFeatherEmitterL->setGlobalRTMatrix(mpWingMorf->getModel()->getAnmMtx(m_wngL3_jnt_num)); } - if(mpFeatherEmitterR){ + if (mpFeatherEmitterR) { mpFeatherEmitterR->setGlobalRTMatrix(mpWingMorf->getModel()->getAnmMtx(m_wngR3_jnt_num)); } } /* 00004470-000044C4 .text delPrtcl_Hane0__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::delPrtcl_Hane0() { - - - if(mpFeatherEmitterL){ + if (mpFeatherEmitterL) { mpFeatherEmitterL->becomeInvalidEmitter(); mpFeatherEmitterL = NULL; } - - if(mpFeatherEmitterR){ + + if (mpFeatherEmitterR) { mpFeatherEmitterR->becomeInvalidEmitter(); mpFeatherEmitterR = NULL; } - } /* 000044C4-000045B8 .text setPrtcl_Hane1__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::setPrtcl_Hane1() { - delPrtcl_Hane1(); - mpFeather1EmitterL = dComIfGp_particle_set( - dPa_name::ID_IT_SN_TORIZOKU_HANE01, - ¤t.pos, - NULL, - NULL, - 0xFF, - NULL, - fopAcM_GetRoomNo(this), - NULL, - NULL - ); + mpFeather1EmitterL = dComIfGp_particle_set(dPa_name::ID_IT_SN_TORIZOKU_HANE01, ¤t.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this)); #if VERSION > VERSION_DEMO - if(mpFeather1EmitterL){ - mpFeather1EmitterL->setStatus(0x40); + if (mpFeather1EmitterL) { + mpFeather1EmitterL->becomeImmortalEmitter(); } #endif - mpFeather1EmitterR = dComIfGp_particle_set( - dPa_name::ID_IT_SN_TORIZOKU_HANE01, - ¤t.pos, - NULL, - NULL, - 0xFF, - NULL, - fopAcM_GetRoomNo(this), - NULL, - NULL - ); + mpFeather1EmitterR = dComIfGp_particle_set(dPa_name::ID_IT_SN_TORIZOKU_HANE01, ¤t.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this)); #if VERSION > VERSION_DEMO - if(mpFeather1EmitterR){ - mpFeather1EmitterR->setStatus(0x40); + if (mpFeather1EmitterR) { + mpFeather1EmitterR->becomeImmortalEmitter(); } #endif } /* 000045B8-00004648 .text flwPrtcl_Hane1__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::flwPrtcl_Hane1() { - - if(mpFeather1EmitterL){ + if (mpFeather1EmitterL) { mpFeather1EmitterL->setGlobalRTMatrix(mpWingMorf->getModel()->getAnmMtx(m_wngL3_jnt_num)); } - if(mpFeather1EmitterR){ + if (mpFeather1EmitterR) { mpFeather1EmitterR->setGlobalRTMatrix(mpWingMorf->getModel()->getAnmMtx(m_wngR3_jnt_num)); } } /* 00004648-000046BC .text delPrtcl_Hane1__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::delPrtcl_Hane1() { - - if(mpFeather1EmitterL){ + if (mpFeather1EmitterL) { #if VERSION > VERSION_DEMO mpFeather1EmitterL->quitImmortalEmitter(); #endif mpFeather1EmitterL->becomeInvalidEmitter(); mpFeather1EmitterL = NULL; } - if(mpFeather1EmitterR){ + if (mpFeather1EmitterR) { #if VERSION > VERSION_DEMO mpFeather1EmitterR->quitImmortalEmitter(); #endif @@ -2373,121 +2333,121 @@ void daNpc_Bm1_c::delPrtcl_Hane1() { /* 000046BC-000049B8 .text decideType__11daNpc_Bm1_cFii */ bool daNpc_Bm1_c::decideType(int i_type_param, int i_spawn_cond_param) { - mSpawnCondition = 0; mType = TYPE_Invalid_e; mSpecificType = SPECIFIC_TYPE_Invalid_e; - fpc_ProcID procName = fopAcM_GetName(this); - switch(procName){ - case fpcNm_NPC_BM1_e: - mType = TYPE_Quill_e; - switch (i_type_param) { - case 0: - mSpecificType = SPECIFIC_TYPE_Quill_0_e; + + switch (fopAcM_GetName(this)) { + case fpcNm_NPC_BM1_e: + mType = TYPE_Quill_e; + switch (i_type_param) { + case 0: + mSpecificType = SPECIFIC_TYPE_Quill_0_e; + break; + case 1: + mSpecificType = SPECIFIC_TYPE_Quill_1_e; + break; + case 2: + mSpecificType = SPECIFIC_TYPE_Quill_2_e; + break; + case 3: + mSpecificType = SPECIFIC_TYPE_Quill_3_e; + break; + case 4: + mSpecificType = SPECIFIC_TYPE_Quill_4_e; + break; + default: + return false; + } break; - case 1: - mSpecificType = SPECIFIC_TYPE_Quill_1_e; + case fpcNm_NPC_BM2_e: + switch (i_type_param) { + case 0: + mSpecificType = SPECIFIC_TYPE_Skett_e; + mType = TYPE_Skett_e; + break; + case 1: + mSpecificType = SPECIFIC_TYPE_Akoot_e; + mType = TYPE_Akoot_e; + break; + default: + return false; + } break; - case 2: - mSpecificType = SPECIFIC_TYPE_Quill_2_e; + case fpcNm_NPC_BM3_e: + switch (i_type_param) { + case 0: + mSpecificType = SPECIFIC_TYPE_Basht_e; + mType = TYPE_Basht_e; + break; + case 1: + mSpecificType = SPECIFIC_TYPE_Bisht_e; + mType = TYPE_Bisht_e; + break; + case 2: + mSpecificType = SPECIFIC_TYPE_Hoskit_e; + mType = TYPE_Hoskit_e; + break; + default: + return false; + } break; - case 3: - mSpecificType = SPECIFIC_TYPE_Quill_3_e; + case fpcNm_NPC_BM4_e: + switch (i_type_param) { + case 0: + mSpecificType = SPECIFIC_TYPE_Ilari_0xA_e; + mType = TYPE_Ilari_e; + break; + case 1: + mSpecificType = SPECIFIC_TYPE_Ilari_0xB_e; + mType = TYPE_Ilari_e; + break; + case 2: + mSpecificType = SPECIFIC_TYPE_Ilari_0xC_e; + mType = TYPE_Ilari_e; + break; + case 3: + mSpecificType = SPECIFIC_TYPE_Pashli_e; + mType = TYPE_Pashli_e; + break; + default: + return false; + } break; - case 4: - mSpecificType = SPECIFIC_TYPE_Quill_4_e; + case fpcNm_NPC_BM5_e: + switch (i_type_param) { + case 0: + mSpecificType = SPECIFIC_TYPE_Namali_e; + mType = TYPE_Namali_e; + break; + case 1: + mSpecificType = SPECIFIC_TYPE_Kogoli_e; + mType = TYPE_Kogoli_e; + break; + default: + return false; + } break; default: return false; - } - break; - case fpcNm_NPC_BM2_e: - switch (i_type_param) { - case 0: - mSpecificType = SPECIFIC_TYPE_Skett_e; - mType = TYPE_Skett_e; - break; - case 1: - mSpecificType = SPECIFIC_TYPE_Akoot_e; - mType = TYPE_Akoot_e; - break; - default: - return false; - } - break; - case fpcNm_NPC_BM3_e: - switch (i_type_param) { - case 0: - mSpecificType = SPECIFIC_TYPE_Basht_e; - mType = TYPE_Basht_e; - break; - case 1: - mSpecificType = SPECIFIC_TYPE_Bisht_e; - mType = TYPE_Bisht_e; - break; - case 2: - mSpecificType = SPECIFIC_TYPE_Hoskit_e; - mType = TYPE_Hoskit_e; - break; - default: - return false; - } - break; - case fpcNm_NPC_BM4_e: - switch (i_type_param) { - case 0: - mSpecificType = SPECIFIC_TYPE_Ilari_0xA_e; - mType = TYPE_Ilari_e; - break; - case 1: - mSpecificType = SPECIFIC_TYPE_Ilari_0xB_e; - mType = TYPE_Ilari_e; - break; - case 2: - mSpecificType = SPECIFIC_TYPE_Ilari_0xC_e; - mType = TYPE_Ilari_e; - break; - case 3: - mSpecificType = SPECIFIC_TYPE_Pashli_e; - mType = TYPE_Pashli_e; - break; - default: - return false; - } - break; - case fpcNm_NPC_BM5_e: - switch (i_type_param) { - case 0: - mSpecificType = SPECIFIC_TYPE_Namali_e; - mType = TYPE_Namali_e; - break; - case 1: - mSpecificType = SPECIFIC_TYPE_Kogoli_e; - mType = TYPE_Kogoli_e; - break; - default: - return false; - } - break; - default: - return false; } switch (i_spawn_cond_param) { - case 0: + case 0: mSpawnCondition = 1; break; - case 1: + case 1: mSpawnCondition = 2; break; - case 2: + case 2: mSpawnCondition = 3; break; - case 3: + case 3: mSpawnCondition = 4; break; } - switch(mSpecificType){ + + switch (mSpecificType) { case SPECIFIC_TYPE_Quill_0_e: strcpy(mArcName, "Bm2"); break; @@ -2511,159 +2471,150 @@ bool daNpc_Bm1_c::decideType(int i_type_param, int i_spawn_cond_param) { default: return false; } + return true; } /* 000049B8-000049FC .text eInit_setLocFlag__11daNpc_Bm1_cFPi */ void daNpc_Bm1_c::eInit_setLocFlag(int* i_param_1) { - m896 = false; - if(i_param_1 == NULL){ + if (i_param_1 == NULL) { return; } - switch(*i_param_1){ + switch (*i_param_1) { case 2: m_jnt.setTrn(); - return; + break; case 1: m896 = true; - return; + break; } } /* 000049FC-00004A34 .text eInit_setShapeAngleY__11daNpc_Bm1_cFPis */ void daNpc_Bm1_c::eInit_setShapeAngleY(int* i_setShapeAngle, short i_shapeAngle) { - mbSetShapeAngle = false; - if(i_setShapeAngle == NULL){ + if (i_setShapeAngle == NULL) { return; } mbSetShapeAngle = *i_setShapeAngle == 1; - if(!mbSetShapeAngle){ + if (!mbSetShapeAngle) { return; } shape_angle.y = i_shapeAngle; - return; } /* 00004A34-00004A50 .text eInit_setEvTimer__11daNpc_Bm1_cFPi */ void daNpc_Bm1_c::eInit_setEvTimer(int* i_param_1) { - m86C = false; - if(i_param_1 == NULL){ + if (i_param_1 == NULL) { return; } m86C = *i_param_1; - return; } /* 00004A50-00004B30 .text eInit_calcRelativPos__11daNpc_Bm1_cFP4cXyzPi */ cXyz daNpc_Bm1_c::eInit_calcRelativPos(cXyz* i_param_2, int* arg2) { - s16 sVar1; - if(arg2){ + if (arg2) { sVar1 = shape_angle.y + (s16)*arg2; - }else{ + } else { sVar1 = shape_angle.y; } cXyz local_1c; cXyz local_28; - if(i_param_2){ - local_1c.set( - i_param_2->x, - i_param_2->y, - i_param_2->z - ); + if (i_param_2) { + local_1c.set(i_param_2->x, i_param_2->y, i_param_2->z); - }else{ - local_1c.set(0.0f,0.0f,0.0f); + } else { + local_1c.set(0.0f, 0.0f, 0.0f); } - mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(sVar1); - mDoMtx_stack_c::multVec(&local_1c,&local_28); - return local_28; + mDoMtx_stack_c::multVec(&local_1c, &local_28); + return local_28; } /* 00004B30-00004D10 .text eInit_ATTENTION___11daNpc_Bm1_cFPiPiPiP4cXyzPiPiPi */ void daNpc_Bm1_c::eInit_ATTENTION_(int* i_prm_0_p, int* i_prm_1_p, int* i_prm_2_p, cXyz* i_offset_p, int* i_angle_p, int* i_index_p, int* i_timer_p) { - - u8 pointIndex; - s16 unaff_r27; - fopAc_ac_c* iVar1; if (!i_prm_0_p) { return; } - switch(*i_prm_0_p) { + s16 unaff_r27; + switch (*i_prm_0_p) { case 0: break; case 1: mLookBackState = 1; - unaff_r27 = cLib_targetAngleY(¤t.pos,&dComIfGp_getLinkPlayer()->current.pos); + unaff_r27 = cLib_targetAngleY(¤t.pos, &dComIfGp_getLinkPlayer()->current.pos); break; case 2: if (!i_offset_p) { - return; + return; } mLookBackState = 2; - unaff_r27 = cLib_targetAngleY(¤t.pos,i_offset_p); + unaff_r27 = cLib_targetAngleY(¤t.pos, i_offset_p); break; case 3: mLookBackState = 2; - m82C = eInit_calcRelativPos(i_offset_p,i_angle_p); - unaff_r27 = cLib_targetAngleY(¤t.pos,&m82C); + m82C = eInit_calcRelativPos(i_offset_p, i_angle_p); + unaff_r27 = cLib_targetAngleY(¤t.pos, &m82C); break; case 4: - if (i_angle_p == (int *)0x0) { + if (i_angle_p == NULL) { return; } mLookBackState = 3; unaff_r27 = *i_angle_p; break; - case 5: + case 5: { if (mPathRun.isPath() == false) { return; } - pointIndex = mPathRun.getIdx(); + u8 pointIndex = mPathRun.getIdx(); if (i_index_p) { - pointIndex = *i_index_p; + pointIndex = *i_index_p; } m82C = mPathRun.getPoint(pointIndex); mLookBackState = 2; break; - case 6: - iVar1 = searchByID(mPartnerProcID); + } + case 6: { + fopAc_ac_c* iVar1 = searchByID(mPartnerProcID); if (iVar1 == NULL) { return; } mLookBackState = 2; m82C = iVar1->eyePos; - unaff_r27 = cLib_targetAngleY(¤t.pos,&m82C); + unaff_r27 = cLib_targetAngleY(¤t.pos, &m82C); break; + } default: mLookBackState = 0; + break; } + eInit_setLocFlag(i_prm_1_p); - eInit_setShapeAngleY(i_prm_2_p,unaff_r27); + // !@bug Possible use of uninitialized variable + eInit_setShapeAngleY(i_prm_2_p, unaff_r27); eInit_setEvTimer(i_timer_p); - return; } /* 00004D10-00004DC4 .text eInit_SET_PLYER_GOL___11daNpc_Bm1_cFPiP4cXyzPi */ void daNpc_Bm1_c::eInit_SET_PLYER_GOL_(int* i_prm_0_p, cXyz* i_offset_p, int* i_angle_p) { - cXyz local_c; - if(i_prm_0_p != NULL){ - switch(*i_prm_0_p){ + if (i_prm_0_p != NULL) { + switch (*i_prm_0_p) { case 0: - if(i_offset_p != NULL){ - local_c.set(i_offset_p->x,i_offset_p->y,i_offset_p->z); + if (i_offset_p != NULL) { + local_c.set(i_offset_p->x, i_offset_p->y, i_offset_p->z); dComIfGp_evmng_setGoal(&local_c); } break; case 1: - local_c = eInit_calcRelativPos(i_offset_p,i_angle_p); + local_c = eInit_calcRelativPos(i_offset_p, i_angle_p); dComIfGp_evmng_setGoal(&local_c); break; } @@ -2673,8 +2624,7 @@ void daNpc_Bm1_c::eInit_SET_PLYER_GOL_(int* i_prm_0_p, cXyz* i_offset_p, int* i_ /* 00004DC4-00004DD4 .text eInit_prmFloat__11daNpc_Bm1_cFPff */ float daNpc_Bm1_c::eInit_prmFloat(float* param_1, float param_2) { - - if(param_1 == NULL){ + if (param_1 == NULL) { return param_2; } return *param_1; @@ -2682,24 +2632,19 @@ float daNpc_Bm1_c::eInit_prmFloat(float* param_1, float param_2) { /* 00004DD4-00004FB8 .text eInit_FLY___11daNpc_Bm1_cFPiPfPfPfPf */ void daNpc_Bm1_c::eInit_FLY_(int* i_prm_0_p, float* i_speed_p, float* i_spd_y_p, float* i_accel_p, float* i_acc_y_p) { - - int iVar1; - - if (i_prm_0_p == (int *)0x0) { + if (i_prm_0_p == NULL) { return; } - m858 = l_HIO.children[mType-1].hio_prm.m30; + m858 = l_HIO.children[mType - 1].hio_prm.m30; if (*i_prm_0_p != 2) { - - mTargetFlySpeed = eInit_prmFloat(i_speed_p,l_HIO.children[mType-1].hio_prm.m20); - mFlySpeedY = eInit_prmFloat(i_spd_y_p,l_HIO.children[mType-1].hio_prm.m28); - mTargetFlyStep = eInit_prmFloat(i_accel_p,l_HIO.children[mType-1].hio_prm.m24); - mFlyAccelY = eInit_prmFloat(i_acc_y_p,l_HIO.children[mType-1].hio_prm.m2C); + mTargetFlySpeed = eInit_prmFloat(i_speed_p, l_HIO.children[mType - 1].hio_prm.m20); + mFlySpeedY = eInit_prmFloat(i_spd_y_p, l_HIO.children[mType - 1].hio_prm.m28); + mTargetFlyStep = eInit_prmFloat(i_accel_p, l_HIO.children[mType - 1].hio_prm.m24); + mFlyAccelY = eInit_prmFloat(i_acc_y_p, l_HIO.children[mType - 1].hio_prm.m2C); } mLookBackState = 0; m88A = 0; - iVar1 = *i_prm_0_p; - switch(*i_prm_0_p){ + switch (*i_prm_0_p) { case 1: m8F4 = 5; speedF = mTargetFlySpeed; @@ -2711,7 +2656,7 @@ void daNpc_Bm1_c::eInit_FLY_(int* i_prm_0_p, float* i_speed_p, float* i_spd_y_p, case 3: speedF = mTargetFlySpeed; break; - case 4: + case 4: m8F4 = 3; mTargetFlySpeed = 0; case 5: @@ -2726,21 +2671,17 @@ void daNpc_Bm1_c::eInit_FLY_(int* i_prm_0_p, float* i_speed_p, float* i_spd_y_p, speedF = 0.0f; gravity = 0.0f; case 2: - return; + break; } - - return; } /* 00004FB8-00004FD8 .text eInit_DEL_ACTOR___11daNpc_Bm1_cFv */ void daNpc_Bm1_c::eInit_DEL_ACTOR_() { - fopAcM_delete(this); } /* 00004FD8-00005190 .text eInit_WLK___11daNpc_Bm1_cFPiPfPfP4cXyzPiPiPi */ void daNpc_Bm1_c::eInit_WLK_(int* i_prm_0_p, float* i_speed_p, float* i_accel_p, cXyz* i_offset_p, int* i_angle_p, int* i_index_p, int* i_timer_p) { - s32 temp_r0; u8 var_r3; @@ -2750,12 +2691,12 @@ void daNpc_Bm1_c::eInit_WLK_(int* i_prm_0_p, float* i_speed_p, float* i_accel_p, switch (temp_r0) { case 0: if (i_offset_p != NULL) { - mTargetPos.set(i_offset_p->x,i_offset_p->y,i_offset_p->z); + mTargetPos.set(i_offset_p->x, i_offset_p->y, i_offset_p->z); var_r3 = 1; } break; case 1: - mTargetPos = eInit_calcRelativPos(i_offset_p,i_angle_p); + mTargetPos = eInit_calcRelativPos(i_offset_p, i_angle_p); var_r3 = 1; break; case 2: @@ -2772,9 +2713,9 @@ void daNpc_Bm1_c::eInit_WLK_(int* i_prm_0_p, float* i_speed_p, float* i_accel_p, if (var_r3) { eInit_setEvTimer(i_timer_p); - mTargetFlySpeed = eInit_prmFloat(i_speed_p,l_HIO.children[mType-1].hio_prm.m3C); - mTargetFlyStep = eInit_prmFloat(i_accel_p,l_HIO.children[mType-1].hio_prm.m40); - m858 = l_HIO.children[mType-1].hio_prm.m44; + mTargetFlySpeed = eInit_prmFloat(i_speed_p, l_HIO.children[mType - 1].hio_prm.m3C); + mTargetFlyStep = eInit_prmFloat(i_accel_p, l_HIO.children[mType - 1].hio_prm.m40); + m858 = l_HIO.children[mType - 1].hio_prm.m44; mLookBackState = 0; setAnm_NUM(0xE, 1); } @@ -2783,16 +2724,14 @@ void daNpc_Bm1_c::eInit_WLK_(int* i_prm_0_p, float* i_speed_p, float* i_accel_p, /* 00005190-0000519C .text eInit_INI_EVN_1___11daNpc_Bm1_cFv */ void daNpc_Bm1_c::eInit_INI_EVN_1_() { - m888 = 0; } /* 0000519C-000051EC .text eInit_SET_NXT_PTH_INF___11daNpc_Bm1_cFv */ void daNpc_Bm1_c::eInit_SET_NXT_PTH_INF_() { - if (mPathRun.getPath()) { dPath* path = mPathRun.nextPath(fopAcM_GetRoomNo(this)); - if ( path != NULL) { + if (path != NULL) { mPathRun.setInfDrct(path); } } @@ -2800,7 +2739,6 @@ void daNpc_Bm1_c::eInit_SET_NXT_PTH_INF_() { /* 000051EC-0000522C .text eInit_SET_ANM___11daNpc_Bm1_cFPi */ void daNpc_Bm1_c::eInit_SET_ANM_(int* i_anmno_p) { - if (i_anmno_p != NULL) { s32 temp_r4 = *i_anmno_p; if ((temp_r4 >= 0) && (temp_r4 <= 0x16)) { @@ -2823,94 +2761,78 @@ void daNpc_Bm1_c::eInit_MOV_PTH_POINT_(int* i_prm_0_p, int* i_anm_no_p, int* i_i current.pos = mPathRun.getPoint(idx); mPathRun.nextIdxAuto(); pathpos = mPathRun.getPoint(mPathRun.getIdx()); - current.angle.y = cLib_targetAngleY(¤t.pos,&pathpos); + current.angle.y = cLib_targetAngleY(¤t.pos, &pathpos); if (i_prm_0_p != NULL) { - switch(*i_prm_0_p){ + switch (*i_prm_0_p) { case 1: current.angle.y = cLib_targetAngleY(¤t.pos, &dComIfGp_getLinkPlayer()->current.pos); break; } - }else if (i_angle_p != NULL) { + } else if (i_angle_p != NULL) { current.angle.y = *i_angle_p; } eInit_SET_ANM_(i_anm_no_p); } - } /* 00005368-00005650 .text event_actionInit__11daNpc_Bm1_cFi */ void daNpc_Bm1_c::event_actionInit(int arg0) { - - cXyz *offset_p; - int *act_no_p; - int *prm_0_p; - int *prm_1_p; - int *prm_2_p; - int *angle_p; - int *index_p; - int *timer_p; - int *anmno_p; - float *speed_p; - float *accel_p; - float *spd_y_p; - float *acc_y_p; - - offset_p = dComIfGp_evmng_getMyXyzP(arg0,"Offst"); - act_no_p = dComIfGp_evmng_getMyIntegerP(arg0,"ActNo"); - prm_0_p = dComIfGp_evmng_getMyIntegerP(arg0,"prm_0"); - prm_1_p = dComIfGp_evmng_getMyIntegerP(arg0,"prm_1"); - prm_2_p = dComIfGp_evmng_getMyIntegerP(arg0,"prm_2"); - angle_p = dComIfGp_evmng_getMyIntegerP(arg0,"Angle"); - index_p = dComIfGp_evmng_getMyIntegerP(arg0,"Index"); - timer_p = dComIfGp_evmng_getMyIntegerP(arg0,"Timer"); - anmno_p = dComIfGp_evmng_getMyIntegerP(arg0,"AnmNo"); - speed_p = dComIfGp_evmng_getMyFloatP(arg0,"Speed"); - accel_p = dComIfGp_evmng_getMyFloatP(arg0,"Accel"); - spd_y_p = dComIfGp_evmng_getMyFloatP(arg0,"Spd_y"); - acc_y_p = dComIfGp_evmng_getMyFloatP(arg0,"Acc_y"); - - if (act_no_p != NULL) { - mActNo = *act_no_p; - switch(mActNo) { - case 4: - eInit_DEL_ACTOR_(); - break; - case 0x10: - eInit_SET_NXT_PTH_INF_(); - break; - case 0x14: - eInit_INI_EVN_1_(); - break; - case 0x15: - eInit_MOV_PTH_POINT_(prm_0_p,anmno_p,index_p,angle_p); - break; - case 0x16: - case 0x17: - eInit_FLY_(prm_0_p,speed_p,spd_y_p,accel_p,acc_y_p); - break; - case 0x18: - eInit_SET_PLYER_GOL_(prm_0_p,offset_p,angle_p); - break; - case 0x19: - eInit_ATTENTION_(prm_0_p,prm_1_p,prm_2_p,offset_p,angle_p,index_p,timer_p); - break; - case 0x1a: - eInit_SET_ANM_(anmno_p); - break; - case 0x1b: - eInit_WLK_(prm_0_p,speed_p,accel_p,offset_p,angle_p,index_p,timer_p); + cXyz* offset_p = dComIfGp_evmng_getMyXyzP(arg0, "Offst"); + int* act_no_p = dComIfGp_evmng_getMyIntegerP(arg0, "ActNo"); + int* prm_0_p = dComIfGp_evmng_getMyIntegerP(arg0, "prm_0"); + int* prm_1_p = dComIfGp_evmng_getMyIntegerP(arg0, "prm_1"); + int* prm_2_p = dComIfGp_evmng_getMyIntegerP(arg0, "prm_2"); + int* angle_p = dComIfGp_evmng_getMyIntegerP(arg0, "Angle"); + int* index_p = dComIfGp_evmng_getMyIntegerP(arg0, "Index"); + int* timer_p = dComIfGp_evmng_getMyIntegerP(arg0, "Timer"); + int* anmno_p = dComIfGp_evmng_getMyIntegerP(arg0, "AnmNo"); + f32* speed_p = dComIfGp_evmng_getMyFloatP(arg0, "Speed"); + f32* accel_p = dComIfGp_evmng_getMyFloatP(arg0, "Accel"); + f32* spd_y_p = dComIfGp_evmng_getMyFloatP(arg0, "Spd_y"); + f32* acc_y_p = dComIfGp_evmng_getMyFloatP(arg0, "Acc_y"); + + if (act_no_p != NULL) { + mActNo = *act_no_p; + switch (mActNo) { + case 4: + eInit_DEL_ACTOR_(); + break; + case 0x10: + eInit_SET_NXT_PTH_INF_(); + break; + case 0x14: + eInit_INI_EVN_1_(); + break; + case 0x15: + eInit_MOV_PTH_POINT_(prm_0_p, anmno_p, index_p, angle_p); + break; + case 0x16: + case 0x17: + eInit_FLY_(prm_0_p, speed_p, spd_y_p, accel_p, acc_y_p); + break; + case 0x18: + eInit_SET_PLYER_GOL_(prm_0_p, offset_p, angle_p); + break; + case 0x19: + eInit_ATTENTION_(prm_0_p, prm_1_p, prm_2_p, offset_p, angle_p, index_p, timer_p); + break; + case 0x1a: + eInit_SET_ANM_(anmno_p); + break; + case 0x1b: + eInit_WLK_(prm_0_p, speed_p, accel_p, offset_p, angle_p, index_p, timer_p); + break; + } } - } - return; + return; } /* 00005650-0000569C .text eMove_ATTENTION___11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::eMove_ATTENTION_() { if (m86C >= 0) { return cLib_calcTimer(&m86C) == 0; - } - else { + } else { return m_jnt.trnChk() == 0; } } @@ -2922,29 +2844,25 @@ bool daNpc_Bm1_c::eMove_KMA_FLY_() { /* 000056A4-000056C0 .text eMove_FLY___11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::eMove_FLY_() { - m88A = 0; return m8F4 == 0; } /* 000056C0-00005734 .text eMove_WLK___11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::eMove_WLK_() { - s16 timer = cLib_calcTimer(&m86C); bool is_terminate = timer == 0; if (is_terminate) { - setAnm_NUM(4,1); + setAnm_NUM(4, 1); mTargetFlySpeed = 0; speedF = mTargetFlySpeed; - } - return is_terminate; + } + return is_terminate; } /* 00005734-000057D0 .text event_action__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::event_action() { - - - switch(mActNo) { + switch (mActNo) { case 4: return 1; break; @@ -2978,30 +2896,26 @@ bool daNpc_Bm1_c::event_action() { return 1; break; } - } /* 000057D0-0000580C .text cut_init_360_TRN__11daNpc_Bm1_cFi */ void daNpc_Bm1_c::cut_init_360_TRN(int) { - - setAnm_NUM(0x13,1); + setAnm_NUM(0x13, 1); mLookBackState = 0; } /* 0000580C-000058B8 .text cut_move_360_TRN__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::cut_move_360_TRN() { - bool uVar1; - + if (mbMorfAnimStopped) { uVar1 = 0; current.angle.y += 0x10000 + -0x8000; - setAnm_NUM(4,1); + setAnm_NUM(4, 1); mpMorf->setMorf(0.0); if (mbHasArms) { mpArmMorf->setMorf(0.0f); - } - else { + } else { mpWingMorf->setMorf(0.0f); } mpHeadMorf->setMorf(0.0f); @@ -3013,27 +2927,24 @@ bool daNpc_Bm1_c::cut_move_360_TRN() { /* 000058B8-000059E0 .text privateCut__11daNpc_Bm1_cFi */ void daNpc_Bm1_c::privateCut(int arg0) { - - static char* a_cut_tbl[] = {"ACTION","360_TRN"}; - + static char* a_cut_tbl[] = {"ACTION", "360_TRN"}; + if (arg0 != -1) { - mActionIndex = dComIfGp_evmng_getMyActIdx(arg0,a_cut_tbl,ARRAY_SIZE(a_cut_tbl),1,0); + mActionIndex = dComIfGp_evmng_getMyActIdx(arg0, a_cut_tbl, ARRAY_SIZE(a_cut_tbl), 1, 0); if (mActionIndex == -1) { - dComIfGp_evmng_cutEnd(arg0); - } - else { + dComIfGp_evmng_cutEnd(arg0); + } else { if (dComIfGp_evmng_getIsAddvance(arg0)) { - switch(mActionIndex){ + switch (mActionIndex) { case 0: event_actionInit(arg0); break; case 1: cut_init_360_TRN(arg0); } - } bool cVar3; - switch(mActionIndex){ + switch (mActionIndex) { case 0: cVar3 = event_action(); break; @@ -3054,24 +2965,21 @@ void daNpc_Bm1_c::privateCut(int arg0) { /* 000059E0-00005A00 .text endEvent__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::endEvent() { - dComIfGp_event_reset(); m8F7 = 0xFF; } /* 00005A00-00005A38 .text isEventEntry__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::isEventEntry() { - - return dComIfGp_evmng_getMyStaffId(mEventCut.getActorName(),NULL); + return dComIfGp_evmng_getMyStaffId(mEventCut.getActorName(), NULL); } /* 00005A38-00005B60 .text event_proc__11daNpc_Bm1_cFi */ void daNpc_Bm1_c::event_proc(int arg0) { - short sVar1; if (dComIfGp_evmng_endCheck(mEventIdTable[mEventIdx])) { sVar1 = mEventIdx; - switch(mEventIdx){ + switch (mEventIdx) { case 0: m8FD = 1; m87C = 1; @@ -3088,11 +2996,9 @@ void daNpc_Bm1_c::event_proc(int arg0) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_1E80); fopAcM_delete(this); break; - } endEvent(); - } - else { + } else { if (!mEventCut.cutProc()) { privateCut(arg0); } @@ -3101,10 +3007,9 @@ void daNpc_Bm1_c::event_proc(int arg0) { } /* 00005B60-00005C0C .text set_action__11daNpc_Bm1_cFM11daNpc_Bm1_cFPCvPvPv_iPv */ -BOOL daNpc_Bm1_c::set_action(int (daNpc_Bm1_c::*i_action)(void*), void* i_param_2) { - - if(mCurrActionFunc != i_action){ - if(mCurrActionFunc){ +BOOL daNpc_Bm1_c::set_action(ActionFunc i_action, void* i_param_2) { + if (mCurrActionFunc != i_action) { + if (mCurrActionFunc) { m904 = 9; (this->*mCurrActionFunc)(i_param_2); } @@ -3113,98 +3018,93 @@ BOOL daNpc_Bm1_c::set_action(int (daNpc_Bm1_c::*i_action)(void*), void* i_param_ (this->*mCurrActionFunc)(i_param_2); } return TRUE; - } /* 00005C0C-00005E84 .text setStt__11daNpc_Bm1_cFSc */ -void daNpc_Bm1_c::setStt(signed char i_param_1) { +void daNpc_Bm1_c::setStt(s8 i_status) { cXyz local_20; s8 previous_status = mStatus; m86E = 0; - mStatus = i_param_1; - switch(mStatus) { - case 1: - m870 = 0x50; - break; - case 3: - m880 = 1; - m870 = 0x5A; - break; - case 5: - m8F7 = 0xff; - mLookBackState = 1; - m8FF = previous_status; - m_jnt.setTrn(); - return; - case 8: - m870 = cM_rndF(180.0f) + 180.0f; - break; - case 9: - m8F7 = 0xff; - m8FF = previous_status; - return; - case 10: - mLookBackState = 0; - local_20.set(0.0f,9999.0f,100.0f); - mTargetPos = eInit_calcRelativPos(&local_20,NULL); - m870 = 0x5A; - mTargetFlySpeed = 0; - mTargetFlyStep = 0; - mFlySpeedY = l_HIO.children[mType-1].hio_prm.m28; - mFlyAccelY = l_HIO.children[mType-1].hio_prm.m2C; - m858 = l_HIO.children[mType-1].hio_prm.m30; - speedF = 0.0; - speed.y = 0.0; - gravity = 0.0; - m889 = 1; - m8F4 = 1; - break; - case 0xd: - mLookBackState = 2; - local_20.set(0.0f,1000.0f,100.0f); - m82C = eInit_calcRelativPos(&local_20,NULL); - break; - case 0x10: - m872 = (g_Counter.mCounter0 & 3) + 1; - break; - case 0x11: - mTargetFlySpeed = l_HIO.children[mType-1].hio_prm.m3C; - mTargetFlyStep = l_HIO.children[mType-1].hio_prm.m40; - m858 = l_HIO.children[mType-1].hio_prm.m44; - break; - case 0x12: - m870 = 0x3c; - speedF = 0.0; + mStatus = i_status; + switch (mStatus) { + case 1: + m870 = 0x50; + break; + case 3: + m880 = 1; + m870 = 0x5A; + break; + case 5: + m8F7 = 0xff; + mLookBackState = 1; + m8FF = previous_status; + m_jnt.setTrn(); + return; + case 8: + m870 = cM_rndF(180.0f) + 180.0f; + break; + case 9: + m8F7 = 0xff; + m8FF = previous_status; + return; + case 10: + mLookBackState = 0; + local_20.set(0.0f, 9999.0f, 100.0f); + mTargetPos = eInit_calcRelativPos(&local_20, NULL); + m870 = 0x5A; + mTargetFlySpeed = 0; + mTargetFlyStep = 0; + mFlySpeedY = l_HIO.children[mType - 1].hio_prm.m28; + mFlyAccelY = l_HIO.children[mType - 1].hio_prm.m2C; + m858 = l_HIO.children[mType - 1].hio_prm.m30; + speedF = 0.0; + speed.y = 0.0; + gravity = 0.0; + m889 = 1; + m8F4 = 1; + break; + case 0xd: + mLookBackState = 2; + local_20.set(0.0f, 1000.0f, 100.0f); + m82C = eInit_calcRelativPos(&local_20, NULL); + break; + case 0x10: + m872 = (g_Counter.mCounter0 & 3) + 1; + break; + case 0x11: + mTargetFlySpeed = l_HIO.children[mType - 1].hio_prm.m3C; + mTargetFlyStep = l_HIO.children[mType - 1].hio_prm.m40; + m858 = l_HIO.children[mType - 1].hio_prm.m44; + break; + case 0x12: + m870 = 0x3c; + speedF = 0.0; + break; } setAnm(); return; - } /* 00005E84-00005EE0 .text d_wait__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::d_wait() { - - if(m881 && m882){ + if (m881 && m882) { setStt(2); - fopAcM_SetStatusMap(this,7); + fopAcM_SetStatusMap(this, 7); } return true; - } /* 00005EE0-00005F14 .text lookup__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::lookup() { - - if(mbMorfAnimStopped){ + if (mbMorfAnimStopped) { setStt(3); } - return true; + return true; } /* 00005F14-00005F64 .text orooro__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::orooro() { - - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)){ + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { fopAcM_delete(this); } return true; @@ -3213,15 +3113,15 @@ BOOL daNpc_Bm1_c::orooro() { /* 00005F64-00006028 .text wait_1__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::wait_1() { s16 sVar1; - if (m8FD == 1 || m8FD >= 3){ - return TRUE; + if (m8FD == 1 || m8FD >= 3) { + return TRUE; } if (m895) { if (chk_talk()) { setStt(5); m896 = false; } - return TRUE; + return TRUE; } m8FD = 2; mLookBackState = 0; @@ -3238,7 +3138,6 @@ BOOL daNpc_Bm1_c::wait_1() { /* 00006028-0000622C .text talk_1__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::talk_1() { - u8 temp_r31 = chk_partsNotMove(); if (mpCurrMsg != NULL) { mOldMsgStat = mpCurrMsg->mStatus; @@ -3248,52 +3147,51 @@ BOOL daNpc_Bm1_c::talk_1() { talk(1); if (mpCurrMsg != NULL) { switch (mpCurrMsg->mStatus) { - case fopMsgStts_MSG_TYPING_e: - case fopMsgStts_BOX_OPENING_e: - break; - case fopMsgStts_MSG_DESTROYED_e: - switch (mCurrMsgNo) { - case 0xC92: - dComIfGs_onEventBit(dSv_event_flag_c::UNK_1401); - break; - case 0x18A2: - dComIfGs_onEventBit(dSv_event_flag_c::UNK_2202); - break; - case 0x1997: - dComIfGs_onEventBit(dSv_event_flag_c::UNK_2120); - break; - case 0x19A2: - dComIfGs_onEventBit(dSv_event_flag_c::UNK_2001); - break; - case 0x19A4: - m8FD = 5; - break; - case 0x1EF6: - m8FD = 3; - break; - case 0x1EF8: - dComIfGs_onEventBit(dSv_event_flag_c::UNK_1908); - break; - case 0x1EF7: - m87C = 0; - break; - } - m87D = 0xFF; - m895 = false; - switch(mSpecificType){ - case SPECIFIC_TYPE_Akoot_e: - case SPECIFIC_TYPE_Skett_e: - setStt(0xB); - break; - case SPECIFIC_TYPE_Ilari_0xA_e: - setStt(0xA); - break; - default: - setStt(m8FF); - m86E = 0x28; - endEvent(); - } - + case fopMsgStts_MSG_TYPING_e: + case fopMsgStts_BOX_OPENING_e: + break; + case fopMsgStts_MSG_DESTROYED_e: + switch (mCurrMsgNo) { + case 0xC92: + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1401); + break; + case 0x18A2: + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2202); + break; + case 0x1997: + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2120); + break; + case 0x19A2: + dComIfGs_onEventBit(dSv_event_flag_c::UNK_2001); + break; + case 0x19A4: + m8FD = 5; + break; + case 0x1EF6: + m8FD = 3; + break; + case 0x1EF8: + dComIfGs_onEventBit(dSv_event_flag_c::UNK_1908); + break; + case 0x1EF7: + m87C = 0; + break; + } + m87D = 0xFF; + m895 = false; + switch (mSpecificType) { + case SPECIFIC_TYPE_Akoot_e: + case SPECIFIC_TYPE_Skett_e: + setStt(0xB); + break; + case SPECIFIC_TYPE_Ilari_0xA_e: + setStt(0xA); + break; + default: + setStt(m8FF); + m86E = 0x28; + endEvent(); + } } } return temp_r31; @@ -3301,29 +3199,25 @@ BOOL daNpc_Bm1_c::talk_1() { /* 0000622C-000062C8 .text talk_2__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::talk_2() { - - if(mPartnerProcID == -1){ + if (mPartnerProcID == -1) { return TRUE; } daNpc_Bm1_c* actor = static_cast<daNpc_Bm1_c*>(searchByID(mPartnerProcID)); - if(actor){ + if (actor) { bool somebool = actor->getStt() != 9; actor->clr_manzai(); - if(somebool){ - fopAcM_OffStatus(actor,fopAcStts_UNK4000_e); + if (somebool) { + fopAcM_OffStatus(actor, fopAcStts_UNK4000_e); setStt(m8FF); endEvent(); clr_manzai(); } } - return TRUE; - + return TRUE; } /* 000062C8-00006344 .text manzai__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::manzai() { - - if (mPartnerProcID == -1) { return 1; } @@ -3338,40 +3232,36 @@ BOOL daNpc_Bm1_c::manzai() { /* 00006344-00006424 .text wait_4__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::wait_4() { - - cLib_addCalcAngleS(¤t.angle.y,m818.y,4,0x800,0x80); - if(m8FD == 1 || m8FD >= 3){ + cLib_addCalcAngleS(¤t.angle.y, m818.y, 4, 0x800, 0x80); + if (m8FD == 1 || m8FD >= 3) { return TRUE; } - if(m895){ - if(chk_talk()){ + if (m895) { + if (chk_talk()) { setStt(5); m896 = false; } return TRUE; - }else{ + } else { m8FD = 2; mLookBackState = 0; m896 = true; - if(mbAttention){ + if (mbAttention) { m86E = 0x28; } } - if(cLib_calcTimer(&m86E)){ + if (cLib_calcTimer(&m86E)) { mLookBackState = 1; } return TRUE; - } /* 00006424-0000647C .text flyawy__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::flyawy() { - if (cLib_calcTimer(&m870) == 0) { endEvent(); - fopAcM_delete(this); - } - else { + fopAcM_delete(this); + } else { m88A = 0; } return 1; @@ -3379,26 +3269,27 @@ BOOL daNpc_Bm1_c::flyawy() { /* 0000647C-000065B8 .text wait_5__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::wait_5() { - - if(m8FD == 0){ + if (m8FD == 0) { f32 fVar2 = (dComIfGp_getLinkPlayer()->current.pos - current.pos).absXZ(); f32 fVar1 = dComIfGp_getLinkPlayer()->current.pos.y - current.pos.y; - if(fVar2 < l_HIO.children[mType-1].hio_prm.m48 && -40.0f < fVar1 && fVar1 < 300.0f){ + if (fVar2 < l_HIO.children[mType - 1].hio_prm.m48 && -40.0f < fVar1 && fVar1 < 300.0f) { m8FD = 4; } } return TRUE; } -BOOL daNpc_Bm1_c::wait_6(){} //unused +BOOL daNpc_Bm1_c::wait_6() { + /* Unused stripped function */ + return TRUE; +} /* 000065B8-00006688 .text h_wait__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::h_wait() { - if ((m8FD == 1) || (m8FD >= '\x03')) { return TRUE; } - if(m895){ + if (m895) { if (chk_talk() != '\0') { setStt(5); } @@ -3411,8 +3302,7 @@ BOOL daNpc_Bm1_c::h_wait() { if (cLib_calcTimer(&m86E)) { mLookBackState = 1; m896 = 0; - } - else { + } else { mLookBackState = 3; m876 = m818.y; m_jnt.setTrn(); @@ -3422,35 +3312,29 @@ BOOL daNpc_Bm1_c::h_wait() { /* 00006688-0000677C .text wait_7__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::wait_7() { - - - if ((m8FD == 1) || (m8FD >= 3)) { return TRUE; } if (m895) { - if (chk_talk() && chk_manzai()) { + if (chk_talk() && chk_manzai()) { setStt(5); } return TRUE; - }else{ + } else { if (mbManzai) { setStt(9); return TRUE; - } - else { + } else { m8FD = 2; if (mbAttention != 0) { m86E = 0x28; } if (cLib_calcTimer(&m86E)) { mLookBackState = 1; - } - else { + } else { mLookBackState = 3; m876 = m818.y; m_jnt.setTrn(); - } } } @@ -3459,31 +3343,30 @@ BOOL daNpc_Bm1_c::wait_7() { /* 0000677C-000068A8 .text wait_3__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::wait_3() { - - cLib_addCalcAngleS(¤t.angle.y,m818.y,4,0x800,0x80); - if(m8FD == 1 || m8FD >= 3){ + cLib_addCalcAngleS(¤t.angle.y, m818.y, 4, 0x800, 0x80); + if (m8FD == 1 || m8FD >= 3) { return TRUE; } - if(m895){ - if(chk_talk()){ + if (m895) { + if (chk_talk()) { setStt(5); m896 = false; } return TRUE; - }else{ + } else { m8FD = 2; mLookBackState = 0; m896 = true; - if(mbAttention){ + if (mbAttention) { m86E = 0x28; } } - if(cLib_calcTimer(&m86E)){ + if (cLib_calcTimer(&m86E)) { mLookBackState = 1; m870 = cM_rndF(180.0f) + 180.0f; return TRUE; } - if(!cLib_calcTimer(&m870)){ + if (!cLib_calcTimer(&m870)) { setStt(0x10); } return TRUE; @@ -3491,13 +3374,12 @@ BOOL daNpc_Bm1_c::wait_3() { /* 000068A8-0000692C .text wait_8__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::wait_8() { - m8FD = 2; - if(mbMorfAnimStopped){ - if(!cLib_calcTimer(&m872)){ + if (mbMorfAnimStopped) { + if (!cLib_calcTimer(&m872)) { setStt(0x8); } - if(m895 && chk_talk()){ + if (m895 && chk_talk()) { setStt(0x8); } } @@ -3506,11 +3388,10 @@ BOOL daNpc_Bm1_c::wait_8() { /* 0000692C-0000699C .text wait_2__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::wait_2() { - - if(m8FD == 1 || m8FD >= 3){ + if (m8FD == 1 || m8FD >= 3) { return TRUE; } - if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT)){ + if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT)) { m8FD = 6; } return TRUE; @@ -3518,20 +3399,15 @@ BOOL daNpc_Bm1_c::wait_2() { /* 0000699C-00006A94 .text walk_1__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::walk_1() { - - char cVar1; - u32 uVar2; - cXyz local_18; - if (m895) { - setAnm_NUM(4,1); + setAnm_NUM(4, 1); speedF = 0.0; if (chk_talk()) { setStt(5); m896 = false; } return TRUE; - }else { + } else { mTargetPos = mPathRun.getPoint(mPathRun.getIdx()); mLookBackState = 0; @@ -3543,37 +3419,32 @@ BOOL daNpc_Bm1_c::walk_1() { } m88B = 0; } - m87E = mPathRun.pointArg(mPathRun.getIdx()); + m87E = mPathRun.pointArg(mPathRun.getIdx()); } return TRUE; } /* 00006A94-00006B74 .text CHKwai__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::CHKwai() { - - if (m895) { if (chk_talk()) { setStt(5); mLookBackState = 1; m896 = false; - m_jnt.setTrn(); - + m_jnt.setTrn(); } - return TRUE; - } - else { + return TRUE; + } else { m8FD = 2; if (!cLib_calcTimer(&m870)) { setStt(0x11); return TRUE; - } - else { - mLookBackState = 2; - m82C = mPathRun.getPoint(mPathRun.getIdx()); - m82C.y = eyePos.y; - m896 = false; - m_jnt.setTrn(); + } else { + mLookBackState = 2; + m82C = mPathRun.getPoint(mPathRun.getIdx()); + m82C.y = eyePos.y; + m896 = false; + m_jnt.setTrn(); } } return 1; @@ -3581,7 +3452,7 @@ BOOL daNpc_Bm1_c::CHKwai() { /* 00006B74-00006C4C .text demo_action1__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::demo_action1(void*) { - switch(m904){ + switch (m904) { case 0: setStt(1); m904 += 1; @@ -3590,7 +3461,7 @@ BOOL daNpc_Bm1_c::demo_action1(void*) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 1: mbSetEyePos = d_wait(); break; @@ -3610,9 +3481,8 @@ BOOL daNpc_Bm1_c::demo_action1(void*) { } /* 00006C4C-00006D08 .text wait_action1__11daNpc_Bm1_cFPv */ -BOOL daNpc_Bm1_c::wait_action1(void* arg0) { - - switch(m904){ +BOOL daNpc_Bm1_c::wait_action1(void*) { + switch (m904) { case 0: setStt(4); m904 += 1; @@ -3621,7 +3491,7 @@ BOOL daNpc_Bm1_c::wait_action1(void* arg0) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 4: mbSetEyePos = wait_1(); break; @@ -3639,11 +3509,10 @@ BOOL daNpc_Bm1_c::wait_action1(void* arg0) { /* 00006D08-00006E28 .text wait_action2__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::wait_action2(void*) { - - switch(m904){ + switch (m904) { case 0: setStt(0xC); - if(mSpecificType == SPECIFIC_TYPE_Kogoli_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820) && !dKy_daynight_check()){ + if (mSpecificType == SPECIFIC_TYPE_Kogoli_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820) && !dKy_daynight_check()) { current.angle.y -= 0x6000; m818.y = current.angle.y; } @@ -3653,7 +3522,7 @@ BOOL daNpc_Bm1_c::wait_action2(void*) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 0xC: mbSetEyePos = wait_4(); break; @@ -3671,14 +3540,11 @@ BOOL daNpc_Bm1_c::wait_action2(void*) { break; } return TRUE; - } - /* 00006E28-00006EC4 .text wait_action3__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::wait_action3(void*) { - - switch(m904){ + switch (m904) { case 0: setStt(0xD); m904 += 1; @@ -3687,7 +3553,7 @@ BOOL daNpc_Bm1_c::wait_action3(void*) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 0xD: mbSetEyePos = wait_5(); break; @@ -3702,10 +3568,9 @@ BOOL daNpc_Bm1_c::wait_action3(void*) { /* 00006EC4-00006F30 .text wait_action4__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::wait_action4(void*) { - - switch(m904){ + switch (m904) { case 0: - setAnm_NUM(4,1); + setAnm_NUM(4, 1); m904 += 1; break; case 1: @@ -3719,8 +3584,7 @@ BOOL daNpc_Bm1_c::wait_action4(void*) { /* 00006F30-00006FEC .text wait_action5__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::wait_action5(void*) { - - switch(m904){ + switch (m904) { case 0: setStt(0xE); m904 += 1; @@ -3729,7 +3593,7 @@ BOOL daNpc_Bm1_c::wait_action5(void*) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 0xE: mbSetEyePos = wait_4(); break; @@ -3747,8 +3611,7 @@ BOOL daNpc_Bm1_c::wait_action5(void*) { /* 00006FEC-000070B0 .text wait_action6__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::wait_action6(void*) { - - switch(m904){ + switch (m904) { case 0: setStt(0x7); m904 += 1; @@ -3757,7 +3620,7 @@ BOOL daNpc_Bm1_c::wait_action6(void*) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 0x7: mbSetEyePos = h_wait(); break; @@ -3775,8 +3638,7 @@ BOOL daNpc_Bm1_c::wait_action6(void*) { /* 000070B0-00007198 .text wait_action7__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::wait_action7(void*) { - - switch(m904){ + switch (m904) { case 0: setStt(0xF); m904 += 1; @@ -3785,7 +3647,7 @@ BOOL daNpc_Bm1_c::wait_action7(void*) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 0xF: mbSetEyePos = wait_7(); break; @@ -3809,8 +3671,7 @@ BOOL daNpc_Bm1_c::wait_action7(void*) { /* 00007198-00007270 .text wait_action8__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::wait_action8(void*) { - - switch(m904){ + switch (m904) { case 0: setStt(8); m904 += 1; @@ -3819,7 +3680,7 @@ BOOL daNpc_Bm1_c::wait_action8(void*) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 8: mbSetEyePos = wait_3(); break; @@ -3841,8 +3702,7 @@ BOOL daNpc_Bm1_c::wait_action8(void*) { /* 00007270-0000730C .text wait_action9__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::wait_action9(void*) { - - switch(m904){ + switch (m904) { case 0: setStt(0x6); m904 += 1; @@ -3851,7 +3711,7 @@ BOOL daNpc_Bm1_c::wait_action9(void*) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 0x6: mbSetEyePos = wait_2(); break; @@ -3866,8 +3726,7 @@ BOOL daNpc_Bm1_c::wait_action9(void*) { /* 0000730C-000073E4 .text wait_actionA__11daNpc_Bm1_cFPv */ BOOL daNpc_Bm1_c::wait_actionA(void*) { - - switch(m904){ + switch (m904) { case 0: setStt(0x11); m904 += 1; @@ -3876,7 +3735,7 @@ BOOL daNpc_Bm1_c::wait_actionA(void*) { case 2: case 3: mbAttention = chkAttention(); - switch(mStatus){ + switch (mStatus) { case 0x11: mbSetEyePos = walk_1(); break; @@ -3885,7 +3744,7 @@ BOOL daNpc_Bm1_c::wait_actionA(void*) { break; case 5: mbSetEyePos = talk_1(); - break; + break; } lookBack(); break; @@ -3898,91 +3757,93 @@ BOOL daNpc_Bm1_c::wait_actionA(void*) { /* 000073E4-00007514 .text demo__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::demo() { - - if(demoActorID == 0){ - if(mbInDemo != 0){ + if (demoActorID == 0) { + if (mbInDemo != 0) { mbInDemo = 0; } - }else{ + } else { mbInDemo = 1; dDemo_actor_c* demo_actor = dComIfGp_demo_getActor(demoActorID); - if(m_hed_tex_pttrn){ + if (m_hed_tex_pttrn) { mBlinkFrame += 1; if (mBlinkFrame >= m_hed_tex_pttrn->getFrameMax()) { mBlinkFrame = m_hed_tex_pttrn->getFrameMax(); } } J3DAnmTexPattern* demopattern = demo_actor->getP_BtpData(mArcName); - if(demopattern){ - m_hed_tex_pttrn = demopattern; - if(mHeadBtpAnm.init(mpHeadMorf->getModel()->getModelData(),m_hed_tex_pttrn,1,2,1.0f,0,-1,true,FALSE)){ + if (demopattern) { + m_hed_tex_pttrn = demopattern; + if (mHeadBtpAnm.init(mpHeadMorf->getModel()->getModelData(), m_hed_tex_pttrn, 1, 2, 1.0f, 0, -1, true, FALSE)) { mBtpNum = 1; mBlinkFrame = 0; } } - dDemo_setDemoData(this,0x6A, mpMorf,mArcName); + dDemo_setDemoData(this, 0x6A, mpMorf, mArcName); } return mbInDemo; } /* 00007514-0000768C .text shadowDraw__11daNpc_Bm1_cFv */ void daNpc_Bm1_c::shadowDraw() { - - cXyz local_18(current.pos.x,current.pos.y + 150.0f, current.pos.z); - - mShadowID = dComIfGd_setShadow(mShadowID,1,mpMorf->getModel(),&local_18,800.0f,40.0f,current.pos.y,mObjAcch.GetGroundH(), - mObjAcch.m_gnd,&tevStr,0,1.0,dDlst_shadowControl_c::getSimpleTex()); - if(mShadowID){ - if(mbHasArms){ - dComIfGd_addRealShadow(mShadowID,mpArmMorf->getModel()); - }else{ - dComIfGd_addRealShadow(mShadowID,mpWingMorf->getModel()); - + cXyz local_18(current.pos.x, current.pos.y + 150.0f, current.pos.z); + + mShadowID = dComIfGd_setShadow( + mShadowID, + 1, + mpMorf->getModel(), + &local_18, + 800.0f, + 40.0f, + current.pos.y, + mObjAcch.GetGroundH(), + mObjAcch.m_gnd, + &tevStr, + 0, + 1.0, + dDlst_shadowControl_c::getSimpleTex() + ); + if (mShadowID) { + if (mbHasArms) { + dComIfGd_addRealShadow(mShadowID, mpArmMorf->getModel()); + } else { + dComIfGd_addRealShadow(mShadowID, mpWingMorf->getModel()); } - if(mpBinderModel){ - dComIfGd_addRealShadow(mShadowID,mpBinderModel); + if (mpBinderModel) { + dComIfGd_addRealShadow(mShadowID, mpBinderModel); } - if(mpBagModel){ - dComIfGd_addRealShadow(mShadowID,mpBagModel); + if (mpBagModel) { + dComIfGd_addRealShadow(mShadowID, mpBagModel); } - if(mpKnifeModel){ - dComIfGd_addRealShadow(mShadowID,mpKnifeModel); + if (mpKnifeModel) { + dComIfGd_addRealShadow(mShadowID, mpKnifeModel); } - if(mpStickModel){ - dComIfGd_addRealShadow(mShadowID,mpStickModel); + if (mpStickModel) { + dComIfGd_addRealShadow(mShadowID, mpStickModel); } - dComIfGd_addRealShadow(mShadowID,mpHeadMorf->getModel()); - + dComIfGd_addRealShadow(mShadowID, mpHeadMorf->getModel()); } } -static const u32 dummyColor[] = { - 0xFF000080, - 0x0000FF80, - 0x00FF0080, -}; - /* 0000768C-00007AB4 .text _draw__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::_draw() { - J3DModel* model = mpHeadMorf->getModel(); J3DModelData* model_data = model->getModelData(); J3DModel* morf_model = mpMorf->getModel(); - if ((mbInitPostman0) || (m888)) { - return 1; + if (mbInitPostman0 || m888) { + return TRUE; } - g_env_light.settingTevStruct(TEV_TYPE_ACTOR,¤t.pos,&tevStr); - g_env_light.setLightTevColorType(morf_model,&tevStr); - switch(mType){ + g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType(morf_model, &tevStr); + switch (mType) { case TYPE_Akoot_e: case TYPE_Skett_e: case TYPE_Basht_e: case TYPE_Bisht_e: case TYPE_Hoskit_e: - mpMorf->entryDL((J3DMaterialTable*)dComIfG_getObjectRes(mArcName,"bm02.bmt")); + mpMorf->entryDL((J3DMaterialTable*)dComIfG_getObjectRes(mArcName, "bm02.bmt")); break; case TYPE_Quill_e: case TYPE_Ilari_e: @@ -3992,176 +3853,182 @@ BOOL daNpc_Bm1_c::_draw() { default: mpMorf->entryDL(); break; - } - mHeadBtpAnm.entry(model_data,mBlinkFrame); + mHeadBtpAnm.entry(model_data, mBlinkFrame); mpHeadMorf->entryDL(); mHeadBtpAnm.remove(model_data); - g_env_light.setLightTevColorType(model,&tevStr); - if(mbHasArms){ - g_env_light.setLightTevColorType(mpArmMorf->getModel(),&tevStr); - - J3DMaterialTable* mattable; - switch(mType){ - case TYPE_Akoot_e: - case TYPE_Skett_e: - case TYPE_Basht_e: - case TYPE_Bisht_e: - case TYPE_Hoskit_e: - mattable = reinterpret_cast<J3DMaterialTable*>(dComIfG_getObjectRes(mArcName,"bmarm02.bmt")); - mpArmMorf->entryDL(mattable); - break; - case TYPE_Quill_e: - case TYPE_Ilari_e: - case TYPE_Pashli_e: - case TYPE_Namali_e: - case TYPE_Kogoli_e: - default: - mpArmMorf->entryDL(); - break; - } + g_env_light.setLightTevColorType(model, &tevStr); + if (mbHasArms) { + g_env_light.setLightTevColorType(mpArmMorf->getModel(), &tevStr); + + J3DMaterialTable* mattable; + switch (mType) { + case TYPE_Akoot_e: + case TYPE_Skett_e: + case TYPE_Basht_e: + case TYPE_Bisht_e: + case TYPE_Hoskit_e: + mattable = reinterpret_cast<J3DMaterialTable*>(dComIfG_getObjectRes(mArcName, "bmarm02.bmt")); + mpArmMorf->entryDL(mattable); + break; + case TYPE_Quill_e: + case TYPE_Ilari_e: + case TYPE_Pashli_e: + case TYPE_Namali_e: + case TYPE_Kogoli_e: + default: + mpArmMorf->entryDL(); + break; + } - }else{ - g_env_light.setLightTevColorType(mpWingMorf->getModel(),&tevStr); + } else { + g_env_light.setLightTevColorType(mpWingMorf->getModel(), &tevStr); mpWingMorf->entryDL(); } - if(mpBinderModel){ - - g_env_light.setLightTevColorType(mpBinderModel,&tevStr); + if (mpBinderModel) { + g_env_light.setLightTevColorType(mpBinderModel, &tevStr); mDoExt_modelEntryDL(mpBinderModel); - } - if(mpBagModel){ - g_env_light.setLightTevColorType(mpBagModel,&tevStr); + if (mpBagModel) { + g_env_light.setLightTevColorType(mpBagModel, &tevStr); mDoExt_modelEntryDL(mpBagModel); - } - if(mpKnifeModel){ - g_env_light.setLightTevColorType(mpKnifeModel,&tevStr); + if (mpKnifeModel) { + g_env_light.setLightTevColorType(mpKnifeModel, &tevStr); mDoExt_modelEntryDL(mpKnifeModel); - } - if(mpStickModel){ - g_env_light.setLightTevColorType(mpStickModel,&tevStr); + if (mpStickModel) { + g_env_light.setLightTevColorType(mpStickModel, &tevStr); mDoExt_modelEntryDL(mpStickModel); } + shadowDraw(); - switch(mType){ + + switch (mType) { case TYPE_Quill_e: - dSnap_RegistFig(DSNAP_TYPE_UNK8D,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK8D, this, 1.0f, 1.0f, 1.0f); break; case TYPE_Akoot_e: - dSnap_RegistFig(DSNAP_TYPE_UNK8E,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK8E, this, 1.0f, 1.0f, 1.0f); break; case TYPE_Skett_e: - dSnap_RegistFig(DSNAP_TYPE_UNK8E,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK8E, this, 1.0f, 1.0f, 1.0f); break; case TYPE_Basht_e: - dSnap_RegistFig(DSNAP_TYPE_UNK93,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK93, this, 1.0f, 1.0f, 1.0f); break; case TYPE_Bisht_e: - dSnap_RegistFig(DSNAP_TYPE_UNK93,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK93, this, 1.0f, 1.0f, 1.0f); break; case TYPE_Hoskit_e: - dSnap_RegistFig(DSNAP_TYPE_UNK91,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK91, this, 1.0f, 1.0f, 1.0f); break; case TYPE_Ilari_e: - dSnap_RegistFig(DSNAP_TYPE_UNK90,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK90, this, 1.0f, 1.0f, 1.0f); break; case TYPE_Pashli_e: - dSnap_RegistFig(DSNAP_TYPE_UNK97,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK97, this, 1.0f, 1.0f, 1.0f); break; case TYPE_Namali_e: - dSnap_RegistFig(DSNAP_TYPE_UNK92,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK92, this, 1.0f, 1.0f, 1.0f); break; case TYPE_Kogoli_e: - dSnap_RegistFig(DSNAP_TYPE_UNK8F,this,1.0f,1.0f,1.0f); + dSnap_RegistFig(DSNAP_TYPE_UNK8F, this, 1.0f, 1.0f, 1.0f); break; } - if(l_HIO.children[mType-1].hio_prm.m18 != 0 && mSpecificType == SPECIFIC_TYPE_Quill_2_e){ - + if (l_HIO.children[mType - 1].hio_prm.m18 != 0 && mSpecificType == SPECIFIC_TYPE_Quill_2_e) { cXyz somevec = current.pos; somevec.y = eyePos.y; - } - return 1; -} + // Debug: + (GXColor){0xFF, 0x00, 0x00, 0x80}; + (GXColor){0x00, 0x00, 0xFF, 0x80}; + (GXColor){0x00, 0xFF, 0x00, 0x80}; + // dDbVw_drawSphereXlu + // dDbVw_drawCircleOpa + + return TRUE; +} /* 00007AB4-00007CAC .text _execute__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::_execute() { - - if(!mbRanExecute){ + if (!mbRanExecute) { mInitialPos = current.pos; m818 = current.angle; mbRanExecute = true; } - m_jnt.setParam(l_HIO.children[mType-1].hio_prm.mMaxBackboneX ,l_HIO.children[mType-1].hio_prm.mMaxBackboneY, - l_HIO.children[mType-1].hio_prm.mMinBackboneX,l_HIO.children[mType-1].hio_prm.mMinBackboneY, - l_HIO.children[mType-1].hio_prm.mMaxHeadX,l_HIO.children[mType-1].hio_prm.mMaxHeadY, - l_HIO.children[mType-1].hio_prm.mMinHeadX,l_HIO.children[mType-1].hio_prm.mMinHeadY, - l_HIO.children[mType-1].hio_prm.mMaxTurnStep); - if(!m881 && mbInitPostman0 && demoActorID == 0){ + m_jnt.setParam( + l_HIO.children[mType - 1].hio_prm.mMaxBackboneX, + l_HIO.children[mType - 1].hio_prm.mMaxBackboneY, + l_HIO.children[mType - 1].hio_prm.mMinBackboneX, + l_HIO.children[mType - 1].hio_prm.mMinBackboneY, + l_HIO.children[mType - 1].hio_prm.mMaxHeadX, + l_HIO.children[mType - 1].hio_prm.mMaxHeadY, + l_HIO.children[mType - 1].hio_prm.mMinHeadX, + l_HIO.children[mType - 1].hio_prm.mMinHeadY, + l_HIO.children[mType - 1].hio_prm.mMaxTurnStep + ); + if (!m881 && mbInitPostman0 && demoActorID == 0) { return TRUE; } m887 = 0; mbInitPostman0 = false; partner_srch(); checkOrder(); - if(!demo()){ + if (!demo()) { s32 iVar1 = -1; - if(dComIfGp_event_runCheck() && eventInfo.checkCommandTalk() == 0){ + if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk() == 0) { iVar1 = isEventEntry(); } - if(iVar1 >= 0){ + if (iVar1 >= 0) { event_proc(iVar1); - }else{ + } else { (this->*mCurrActionFunc)(NULL); } - if(!bm_flyMove()){ + if (!bm_flyMove()) { bm_nMove(); } - if(!m887){ - fopAcM_posMoveF(this,mStts.GetCCMoveP()); + if (!m887) { + fopAcM_posMoveF(this, mStts.GetCCMoveP()); } - - if(!mbSetShapeAngle){ + + if (!mbSetShapeAngle) { shape_angle = current.angle; } } - eventOrder(); - setMtx(false); - if(!mbInDemo){ - setCollision(50.0f,160.0f); - } - return TRUE; + eventOrder(); + setMtx(false); + if (!mbInDemo) { + setCollision(50.0f, 160.0f); + } + return TRUE; } /* 00007CAC-00007D50 .text _delete__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::_delete() { - - #if VERSION == VERSION_DEMO - if(m87F){ - dComIfG_resDelete(&mPhs,mArcName); - mDoExt_McaMorf* this_00; + if (m87F) { + dComIfG_resDelete(&mPhs, mArcName); } - if(mpMorf){ + if (mpMorf) { mpMorf->stopZelAnime(); } - { #else - dComIfG_resDelete(&mPhs,mArcName); - mDoExt_McaMorf* this_00; - if (heap != (JKRHeap *)0x0) { - this_00 = mpMorf; - if (this_00 != NULL) { + dComIfG_resDelete(&mPhs, mArcName); +#endif + +#if VERSION > VERSION_DEMO + if (heap != NULL) +#endif + { +#if VERSION > VERSION_DEMO + if (mpMorf != NULL) { mpMorf->stopZelAnime(); } #endif - if (mpHeadMorf != NULL) { mpHeadMorf->stopZelAnime(); } @@ -4172,107 +4039,147 @@ BOOL daNpc_Bm1_c::_delete() { mpArmMorf->stopZelAnime(); } } + delPrtcl_Flyaway(); delPrtcl_Land0(); delPrtcl_Hane0(); delPrtcl_Hane1(); #if VERSION == VERSION_DEMO -l_HIO.removeHIO(); + l_HIO.removeHIO(); #endif - return 1; + return TRUE; } /* 00007D50-00007D70 .text CheckCreateHeap__FP10fopAc_ac_c */ -static BOOL CheckCreateHeap(fopAc_ac_c* this00) { - - static_cast<daNpc_Bm1_c*>(this00)->CreateHeap(); +static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast<daNpc_Bm1_c*>(i_this)->CreateHeap(); } /* 00007D70-00007ED4 .text _create__11daNpc_Bm1_cFv */ cPhs_State daNpc_Bm1_c::_create() { - fopAcM_ct_Retail(this, daNpc_Bm1_c); - static u32 a_size_tbl[0xB] = {}; + static u32 a_size_tbl[] = { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + }; u32 param = fopAcM_GetParam(this); u8 param2 = param; - if(!decideType(param2 ,(param >> 8) & 0xFF)){ + if (!decideType(param2, (param >> 8) & 0xFF)) { return cPhs_ERROR_e; } - cPhs_State state = dComIfG_resLoad(&mPhs,mArcName); - m87F = state == cPhs_COMPLEATE_e; - if(!m87F){ + cPhs_State state = dComIfG_resLoad(&mPhs, mArcName); + m87F = state == cPhs_COMPLEATE_e; + if (!m87F) { return state; - }else{ + } else { #if VERSION == VERSION_DEMO l_HIO.entryHIO("リト族"); - fopAcM_ct(this,daNpc_Bm1_c); + fopAcM_ct(this, daNpc_Bm1_c); #endif - if(!fopAcM_entrySolidHeap(this,CheckCreateHeap,a_size_tbl[mType])){ + if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, a_size_tbl[mType])) { return cPhs_ERROR_e; } - fopAcM_SetMtx(this,mpMorf->getModel()->getBaseTRMtx()); - if(mSpecificType == SPECIFIC_TYPE_Quill_0_e){ - fopAcM_setCullSizeBox(this,-250.0,-20.0,-200.0,250.0,500.0,200.0); - }else{ - fopAcM_setCullSizeBox(this,-70.0,-20.0,-70.0,70.0,220.0,70.0); + fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + if (mSpecificType == SPECIFIC_TYPE_Quill_0_e) { + fopAcM_setCullSizeBox(this, -250.0, -20.0, -200.0, 250.0, 500.0, 200.0); + } else { + fopAcM_setCullSizeBox(this, -70.0, -20.0, -70.0, 70.0, 220.0, 70.0); } - if(!createInit()){ + if (!createInit()) { return cPhs_ERROR_e; } } return state; - - - } /* 000083E8-00008710 .text create_Anm__11daNpc_Bm1_cFv */ J3DModelData* daNpc_Bm1_c::create_Anm() { - - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName,"bm.bdl"); - JUT_ASSERT(DEMO_SELECT(0x153E,0x1551),a_mdl_dat != NULL); - mpMorf = new mDoExt_McaMorf(a_mdl_dat,NULL,NULL,(J3DAnmTransform*)dComIfG_getObjectRes(mArcName,"bm_dwait.bck"),J3DFrameCtrl::EMode_LOOP,1.0f,0,-1,1,NULL,0x80000,0x15021222); - if(mpMorf == NULL ){ + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName, "bm.bdl"); + JUT_ASSERT(DEMO_SELECT(0x153E, 0x1551), a_mdl_dat != NULL); + mpMorf = new mDoExt_McaMorf( + a_mdl_dat, + NULL, + NULL, + (J3DAnmTransform*)dComIfG_getObjectRes(mArcName, "bm_dwait.bck"), + J3DFrameCtrl::EMode_LOOP, + 1.0f, + 0, + -1, + TRUE, + NULL, + 0x80000, + 0x15021222 + ); + if (mpMorf == NULL) { return NULL; - }else if(mpMorf->getModel() == NULL){ + } else if (mpMorf->getModel() == NULL) { mpMorf = NULL; return NULL; } m_hed_jnt_num = a_mdl_dat->getJointName()->getIndex("head"); - JUT_ASSERT(DEMO_SELECT(0x1552,0x1565),m_hed_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x1552, 0x1565), m_hed_jnt_num >= 0); m_nec_jnt_num = a_mdl_dat->getJointName()->getIndex("neck"); - JUT_ASSERT(DEMO_SELECT(0x1555,0x1568),m_nec_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x1555, 0x1568), m_nec_jnt_num >= 0); m_bbone_jnt_num = a_mdl_dat->getJointName()->getIndex("backbone"); - JUT_ASSERT(DEMO_SELECT(0x1558,0x156B),m_bbone_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x1558, 0x156B), m_bbone_jnt_num >= 0); m_arm_L_jnt_num = a_mdl_dat->getJointName()->getIndex("armL"); - JUT_ASSERT(DEMO_SELECT(0x155B,0x156E),m_arm_L_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x155B, 0x156E), m_arm_L_jnt_num >= 0); m_arm_R_jnt_num = a_mdl_dat->getJointName()->getIndex("armR"); - JUT_ASSERT(DEMO_SELECT(0x155E,0x1571),m_arm_R_jnt_num >= 0); - return a_mdl_dat; - + JUT_ASSERT(DEMO_SELECT(0x155E, 0x1571), m_arm_R_jnt_num >= 0); + return a_mdl_dat; } /* 00008710-00008878 .text create_hed_Anm__11daNpc_Bm1_cFv */ J3DModelData* daNpc_Bm1_c::create_hed_Anm() { - static char* a_headBDLName_TBL[] = { - "bmhead01.bdl","bmhead01.bdl","bmhead01.bdl","bmhead01.bdl","bmhead01.bdl", - "bmhead02.bdl","bmhead02.bdl", - "bmhead07.bdl","bmhead07.bdl", + "bmhead01.bdl", + "bmhead01.bdl", + "bmhead01.bdl", + "bmhead01.bdl", + "bmhead01.bdl", + "bmhead02.bdl", + "bmhead02.bdl", + "bmhead07.bdl", + "bmhead07.bdl", "bmhead05.bdl", - "bmhead04.bdl","bmhead04.bdl","bmhead04.bdl", + "bmhead04.bdl", + "bmhead04.bdl", + "bmhead04.bdl", "bmhead09.bdl", "bmhead06.bdl", - "bmhead03.bdl",}; - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName,a_headBDLName_TBL[mSpecificType]); - JUT_ASSERT(DEMO_SELECT(0x1580,0x1593),a_mdl_dat != NULL); - mpHeadMorf = new mDoExt_McaMorf(a_mdl_dat,NULL,NULL,(J3DAnmTransform*)dComIfG_getObjectRes(mArcName,"bmhead01_dwait.bck"),2,1.0,0,-1,1,NULL,0x80000,0x11020022); - if(!mpHeadMorf){ + "bmhead03.bdl", + }; + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName, a_headBDLName_TBL[mSpecificType]); + JUT_ASSERT(DEMO_SELECT(0x1580, 0x1593), a_mdl_dat != NULL); + mpHeadMorf = new mDoExt_McaMorf( + a_mdl_dat, + NULL, + NULL, + (J3DAnmTransform*)dComIfG_getObjectRes(mArcName, "bmhead01_dwait.bck"), + J3DFrameCtrl::EMode_LOOP, + 1.0f, + 0, + -1, + TRUE, + NULL, + 0x80000, + 0x11020022 + ); + if (!mpHeadMorf) { return NULL; } - if(!mpHeadMorf->getModel()){ + if (!mpHeadMorf->getModel()) { mpHeadMorf = NULL; return NULL; } @@ -4281,91 +4188,113 @@ J3DModelData* daNpc_Bm1_c::create_hed_Anm() { /* 00008878-00008B44 .text create_wng_Anm__11daNpc_Bm1_cFv */ J3DModelData* daNpc_Bm1_c::create_wng_Anm() { - - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName,"bmwing.bdl"); - JUT_ASSERT(DEMO_SELECT(0x159E,0x15B1),a_mdl_dat != NULL); - mpWingMorf = new mDoExt_McaMorf(a_mdl_dat,NULL,NULL,(J3DAnmTransform*)dComIfG_getObjectRes(mArcName,"bmwing_dwait.bck"),2,1.0,0,-1,1,NULL,0x80000,0x15021222); - if(!mpWingMorf){ + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName, "bmwing.bdl"); + JUT_ASSERT(DEMO_SELECT(0x159E, 0x15B1), a_mdl_dat != NULL); + mpWingMorf = new mDoExt_McaMorf( + a_mdl_dat, + NULL, + NULL, + (J3DAnmTransform*)dComIfG_getObjectRes(mArcName, "bmwing_dwait.bck"), + J3DFrameCtrl::EMode_LOOP, + 1.0f, + 0, + -1, + TRUE, + NULL, + 0x80000, + 0x15021222 + ); + if (!mpWingMorf) { return NULL; } - if(!mpWingMorf->getModel()){ + if (!mpWingMorf->getModel()) { mpWingMorf = NULL; return NULL; } m_wngL1_jnt_num = a_mdl_dat->getJointName()->getIndex("wingLloc"); - JUT_ASSERT(DEMO_SELECT(0x15B2,0x15C5),m_wngL1_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x15B2, 0x15C5), m_wngL1_jnt_num >= 0); m_wngL3_jnt_num = a_mdl_dat->getJointName()->getIndex("wingL3"); - JUT_ASSERT(DEMO_SELECT(0x15B5,0x15C8),m_wngL3_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x15B5, 0x15C8), m_wngL3_jnt_num >= 0); m_wngR1_jnt_num = a_mdl_dat->getJointName()->getIndex("wingRloc"); - JUT_ASSERT(DEMO_SELECT(0x15B8,0x15CB),m_wngR1_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x15B8, 0x15CB), m_wngR1_jnt_num >= 0); m_wngR3_jnt_num = a_mdl_dat->getJointName()->getIndex("wingR3"); - JUT_ASSERT(DEMO_SELECT(0x15BB,0x15CE),m_wngR3_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x15BB, 0x15CE), m_wngR3_jnt_num >= 0); return a_mdl_dat; - } /* 00008B44-00008E6C .text create_arm_Anm__11daNpc_Bm1_cFv */ J3DModelData* daNpc_Bm1_c::create_arm_Anm() { - - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName,"bmarm.bdl"); - JUT_ASSERT(DEMO_SELECT(0x15CA,0x15DD),a_mdl_dat != NULL); - mpArmMorf = new mDoExt_McaMorf(a_mdl_dat,NULL,NULL,(J3DAnmTransform*)dComIfG_getObjectRes(mArcName,"bmarm_wait01.bck"),2,1.0,0,-1,1,NULL,0x80000,0x15021222); - if(!mpArmMorf){ + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName, "bmarm.bdl"); + JUT_ASSERT(DEMO_SELECT(0x15CA, 0x15DD), a_mdl_dat != NULL); + mpArmMorf = new mDoExt_McaMorf( + a_mdl_dat, + NULL, + NULL, + (J3DAnmTransform*)dComIfG_getObjectRes(mArcName, "bmarm_wait01.bck"), + J3DFrameCtrl::EMode_LOOP, + 1.0f, + 0, + -1, + TRUE, + NULL, + 0x80000, + 0x15021222 + ); + if (!mpArmMorf) { return NULL; } - if(!mpArmMorf->getModel()){ + if (!mpArmMorf->getModel()) { mpArmMorf = NULL; return NULL; } m_armL1_jnt_num = a_mdl_dat->getJointName()->getIndex("armLloc"); - JUT_ASSERT(DEMO_SELECT(0x15DE,0x15F1),m_armL1_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x15DE, 0x15F1), m_armL1_jnt_num >= 0); m_armR1_jnt_num = a_mdl_dat->getJointName()->getIndex("armRloc"); - JUT_ASSERT(DEMO_SELECT(0x15E1,0x15F4),m_armR1_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x15E1, 0x15F4), m_armR1_jnt_num >= 0); m_armL2_jnt_num = a_mdl_dat->getJointName()->getIndex("armL2"); - JUT_ASSERT(DEMO_SELECT(0x15E4,0x15F7),m_armL2_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x15E4, 0x15F7), m_armL2_jnt_num >= 0); m_armR2_jnt_num = a_mdl_dat->getJointName()->getIndex("armR2"); - JUT_ASSERT(DEMO_SELECT(0x15E7,0x15FA),m_armR2_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x15E7, 0x15FA), m_armR2_jnt_num >= 0); m_hnd_R_jnt_num = a_mdl_dat->getJointName()->getIndex("handR"); - JUT_ASSERT(DEMO_SELECT(0x15EA,0x15FD),m_hnd_R_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x15EA, 0x15FD), m_hnd_R_jnt_num >= 0); return a_mdl_dat; } /* 00008E6C-00009174 .text create_itm_Mdl__11daNpc_Bm1_cFv */ bool daNpc_Bm1_c::create_itm_Mdl() { - mpBinderModel = NULL; mpBagModel = NULL; mpKnifeModel = NULL; mpStickModel = NULL; - if(mType == TYPE_Pashli_e || mType == TYPE_Namali_e){ - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName,"bm_binder.bdl"); - JUT_ASSERT(DEMO_SELECT(0x1603,0x1616),a_mdl_dat != NULL); - mpBinderModel = mDoExt_J3DModel__create(a_mdl_dat,0x80000,0x11000002); - if(!mpBinderModel){ + if (mType == TYPE_Pashli_e || mType == TYPE_Namali_e) { + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName, "bm_binder.bdl"); + JUT_ASSERT(DEMO_SELECT(0x1603, 0x1616), a_mdl_dat != NULL); + mpBinderModel = mDoExt_J3DModel__create(a_mdl_dat, 0x80000, 0x11000002); + if (!mpBinderModel) { return FALSE; } } - if(mType == TYPE_Quill_e || mType == TYPE_Ilari_e || mType == TYPE_Pashli_e){ - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName,"bm_bag.bdl"); - JUT_ASSERT(DEMO_SELECT(0x1612,0x1625),a_mdl_dat != NULL); - mpBagModel = mDoExt_J3DModel__create(a_mdl_dat,0x80000,0x11000002); - if(!mpBagModel){ + if (mType == TYPE_Quill_e || mType == TYPE_Ilari_e || mType == TYPE_Pashli_e) { + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName, "bm_bag.bdl"); + JUT_ASSERT(DEMO_SELECT(0x1612, 0x1625), a_mdl_dat != NULL); + mpBagModel = mDoExt_J3DModel__create(a_mdl_dat, 0x80000, 0x11000002); + if (!mpBagModel) { return FALSE; } } - if(mType == TYPE_Akoot_e || mType == TYPE_Skett_e){ - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName,"bm_knife.bdl"); - JUT_ASSERT(DEMO_SELECT(0x161F,0x1632),a_mdl_dat != NULL); - mpKnifeModel = mDoExt_J3DModel__create(a_mdl_dat,0x80000,0x11000002); - if(!mpKnifeModel){ + if (mType == TYPE_Akoot_e || mType == TYPE_Skett_e) { + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName, "bm_knife.bdl"); + JUT_ASSERT(DEMO_SELECT(0x161F, 0x1632), a_mdl_dat != NULL); + mpKnifeModel = mDoExt_J3DModel__create(a_mdl_dat, 0x80000, 0x11000002); + if (!mpKnifeModel) { return FALSE; } } - if(mType == TYPE_Basht_e || mType == TYPE_Bisht_e || mType == TYPE_Hoskit_e){ - J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName,"bm_stick.bdl"); - JUT_ASSERT(DEMO_SELECT(0x162D,0x1640),a_mdl_dat != NULL); - mpStickModel = mDoExt_J3DModel__create(a_mdl_dat,0x80000,0x11000002); - if(!mpStickModel){ + if (mType == TYPE_Basht_e || mType == TYPE_Bisht_e || mType == TYPE_Hoskit_e) { + J3DModelData* a_mdl_dat = (J3DModelData*)dComIfG_getObjectRes(mArcName, "bm_stick.bdl"); + JUT_ASSERT(DEMO_SELECT(0x162D, 0x1640), a_mdl_dat != NULL); + mpStickModel = mDoExt_J3DModel__create(a_mdl_dat, 0x80000, 0x11000002); + if (!mpStickModel) { return FALSE; } } @@ -4374,56 +4303,54 @@ bool daNpc_Bm1_c::create_itm_Mdl() { /* 00009174-0000946C .text CreateHeap__11daNpc_Bm1_cFv */ BOOL daNpc_Bm1_c::CreateHeap() { - J3DModelData* modeldat; J3DModelData* anm_model = create_Anm(); - if(!anm_model){ + if (!anm_model) { return FALSE; } J3DModelData* head_modeldat = create_hed_Anm(); - if(!head_modeldat){ + if (!head_modeldat) { mpMorf = NULL; return FALSE; } mBtpNum = 0; - if(!iniTexPttrnAnm(false)){ + if (!iniTexPttrnAnm(false)) { mpMorf = NULL; mpHeadMorf = NULL; return FALSE; } modeldat = create_wng_Anm(); - if(!modeldat){ + if (!modeldat) { mpMorf = NULL; mpHeadMorf = NULL; return FALSE; } J3DModelData* arm_anmdata = create_arm_Anm(); - if(arm_anmdata != NULL && create_itm_Mdl()){ - - for(u16 i = 0; i < modeldat->getJointNum(); i++){ - if((i == m_wngL1_jnt_num) ||( i == m_wngL3_jnt_num) || (i == m_wngR1_jnt_num) || (i == m_wngR3_jnt_num)){ + if (arm_anmdata != NULL && create_itm_Mdl()) { + for (u16 i = 0; i < modeldat->getJointNum(); i++) { + if ((i == m_wngL1_jnt_num) || (i == m_wngL3_jnt_num) || (i == m_wngR1_jnt_num) || (i == m_wngR3_jnt_num)) { mpWingMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Wng); } } mpWingMorf->getModel()->setUserArea((u32)this); - for(u16 i = 0; i < arm_anmdata->getJointNum(); i++){ - if((i == m_armL1_jnt_num) ||( i == m_armL2_jnt_num) || (i == m_armR1_jnt_num) || (i == m_armR2_jnt_num)){ + for (u16 i = 0; i < arm_anmdata->getJointNum(); i++) { + if ((i == m_armL1_jnt_num) || (i == m_armL2_jnt_num) || (i == m_armR1_jnt_num) || (i == m_armR2_jnt_num)) { mpArmMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Arm); } } mpArmMorf->getModel()->setUserArea((u32)this); - for(u16 i = 0; i < anm_model->getJointNum(); i++){ - if((i == m_hed_jnt_num) ||( i == m_nec_jnt_num) || (i == m_bbone_jnt_num) || (i == m_arm_L_jnt_num) || i == m_arm_R_jnt_num){ + for (u16 i = 0; i < anm_model->getJointNum(); i++) { + if ((i == m_hed_jnt_num) || (i == m_nec_jnt_num) || (i == m_bbone_jnt_num) || (i == m_arm_L_jnt_num) || i == m_arm_R_jnt_num) { mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Bm1); } } mpMorf->getModel()->setUserArea((u32)this); - mAcchCir.SetWall(30.0f,50.0f); - mObjAcch.Set(fopAcM_GetPosition_p(this),fopAcM_GetOldPosition_p(this),this,1,&mAcchCir,fopAcM_GetSpeed_p(this),NULL,NULL); + mAcchCir.SetWall(30.0f, 50.0f); + mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), NULL, NULL); return TRUE; - }else{ + } else { mpMorf = NULL; mpHeadMorf = NULL; mpWingMorf = NULL; @@ -4464,8 +4391,15 @@ static actor_method_class l_daNpc_Bm1_Method = { (process_method_func)daNpc_Bm1_Draw, }; -static BOOL daNpc_Bm1_ToFore(daNpc_Bm1_c*){}; //Unused -static BOOL daNpc_Bm1_ToBack(daNpc_Bm1_c*){}; //Unused +static BOOL daNpc_Bm1_ToFore(daNpc_Bm1_c*) { + /* Unused stripped function */ + return TRUE; +} + +static BOOL daNpc_Bm1_ToBack(daNpc_Bm1_c*) { + /* Unused stripped function */ + return TRUE; +} actor_process_profile_definition g_profile_NPC_BM1 = { /* Layer ID */ fpcLy_CURRENT_e, diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 8e6d044f..14ac09e1 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -1208,12 +1208,12 @@ void daNpc_Bs1_c::talkInit() { BOOL daNpc_Bs1_c::shopMsgCheck(u32 msgNo) { if(mType == 0) { if((0xF42 <= msgNo && msgNo <= 0xF54) || (0xF67 <= msgNo && msgNo <= 0xF6E) || (0xF63 <= msgNo && msgNo <= 0xF66) || msgNo == 0xF3E) { - return true; + return true; } } else { if((0x2F4A <= msgNo && msgNo <= 0x2F53) || (0x2F6B <= msgNo && msgNo <= 0x2F78) || msgNo == 0x2F47) { - return true; + return true; } } @@ -1267,7 +1267,7 @@ BOOL daNpc_Bs1_c::shopStickMoveMsgCheck(u32 msgNo) { } else { if((0x2F4A <= msgNo && msgNo <= 0x2F4C) || ((0x2F72 <= msgNo && msgNo <= 0x2F76) && !(msgNo & 1)) || msgNo == 0x2F78 || msgNo == 0x2F6B || msgNo == 0x2F47) { - return true; + return true; } } diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp index 8bb3150c..94f0eb96 100644 --- a/src/d/actor/d_a_npc_hi1.cpp +++ b/src/d/actor/d_a_npc_hi1.cpp @@ -884,7 +884,6 @@ BOOL daNpc_Hi1_c::_delete() { /* 00001F30-0000205C .text _create__11daNpc_Hi1_cFv */ cPhs_State daNpc_Hi1_c::_create() { - static int a_siz_tbl[] = { 0, 0 diff --git a/src/d/actor/d_a_npc_ho.cpp b/src/d/actor/d_a_npc_ho.cpp index f43a07fd..610bd072 100644 --- a/src/d/actor/d_a_npc_ho.cpp +++ b/src/d/actor/d_a_npc_ho.cpp @@ -46,7 +46,6 @@ static BOOL nodeCallBack_Ho(J3DNode* node, int calcTiming) { MtxPosition(&temp, &temp2); i_this->setEyePos(temp2); i_this->incAttnSetCount(); - } else if (jntNo == i_this->getBackboneJntNum()) { cMtx_XrotM(*calc_mtx, (s16)i_this->getBackbone_y()); } @@ -294,7 +293,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) { receivePendant(1); break; case 0x273E: - if (dComIfGs_getBeastNum(7) >= 0x14) { + if (dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e) >= 20) { *pMsgNo = 0x2741; } else { *pMsgNo = 0x273F; @@ -324,7 +323,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) { break; case 0x274D: *pMsgNo = 0x274E; - receivePendant(dComIfGs_getBeastNum(7)); + receivePendant(dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e)); break; case 0x274E: if (dComIfGs_getEventReg(dSv_event_flag_c::UNK_C0FF) >= 0x28 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1C04)) { @@ -335,7 +334,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) { break; case 0x2754: { *pMsgNo = 0x2755; - int numPendantsGiven = dComIfGs_getBeastNum(7); + int numPendantsGiven = dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e); receivePendant(numPendantsGiven); if (numPendantsGiven < 3) { mItemNum = dItemNo_RED_RUPEE_e; @@ -632,7 +631,6 @@ bool daNpc_Ho_c::talk01() { mState = HO_STATE_PREACH; fopAcM_orderChangeEvent(dComIfGp_getLinkPlayer(), this, "HO_PREACH", 0, 0xFFFF); clrFlag(HO_FLAG_00000020); - } else { mState = mPrevState; setAnmStatus(); @@ -822,7 +820,6 @@ BOOL daNpc_Ho_c::_execute() { setAnm(0); } break; - } } checkOrder(); diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 152c59b0..d8d7480a 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -1738,6 +1738,7 @@ u32 daNpc_Ji1_c::evn_sound_proc_init(int staffIdx) { break; case 3: dComIfGp_getVibration().StartShock(5, -0x11, cXyz(0.0f, 1.0f, 0.0f)); + break; } } diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index 856877df..05004638 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -107,7 +107,6 @@ bool daNpc_Km1_c::createInit() { field_0x7BC = 1; setMtx(); return true; - } /* 0000043C-0000054C .text setMtx__11daNpc_Km1_cFv */ @@ -184,13 +183,11 @@ bool daNpc_Km1_c::init_btp(bool param_1, int param_2) { /* 00000850-00000894 .text initTexPatternAnm__11daNpc_Km1_cFb */ bool daNpc_Km1_c::initTexPatternAnm(bool param_1) { - bool var_31 = false; if(init_btp(param_1,field_0x7CD)){ var_31 = true; } return var_31; - } /* 00000894-00000958 .text playTexPatternAnm__11daNpc_Km1_cFv */ @@ -211,7 +208,6 @@ void daNpc_Km1_c::playTexPatternAnm() { if(field_0x7CD){ mBtpFrame = m_head_tex_pattern->getFrameMax(); return; - }else{ mBtpFrame = 0; field_0x6F2 = cM_rndF(60.0) + 30.0f; @@ -290,7 +286,6 @@ void daNpc_Km1_c::setAnm_ATR(int param_1) { setAnm_tex(a_anm_prm_tbl[field_0x7CB].field_0x1); } setAnm_anm((&a_anm_prm_tbl[field_0x7CB])); - } /* 00000B50-00000C0C .text anmAtr__11daNpc_Km1_cFUs */ @@ -493,7 +488,6 @@ void daNpc_Km1_c::privateCut() { if(bVar1){ dComIfGp_evmng_cutEnd(staffIdx); } - } } @@ -501,7 +495,6 @@ void daNpc_Km1_c::privateCut() { void daNpc_Km1_c::endEvent() { dComIfGp_event_reset(); field_0x7CB = 0xFF; - } /* 00001164-000011C4 .text event_proc__11daNpc_Km1_cFv */ @@ -694,7 +687,6 @@ BOOL daNpc_Km1_c::_delete() { } } return true; - } /* 0000188C-000018AC .text CheckCreateHeap__FP10fopAc_ac_c */ @@ -739,7 +731,6 @@ cPhs_State daNpc_Km1_c::_create() { resLoadResult = cPhs_ERROR_e; } return resLoadResult; - } /* 00001E4C-00002158 .text CreateHeap__11daNpc_Km1_cFv */ diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp index 5f8f347a..609f4a32 100644 --- a/src/d/actor/d_a_npc_mt.cpp +++ b/src/d/actor/d_a_npc_mt.cpp @@ -966,7 +966,7 @@ u32 daNpcMt_c::getMsg() { } } else if (dComIfGp_event_chkTalkXY()) { - + } else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3080)) { if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_4080) == 0) { if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3A01)) { @@ -1075,6 +1075,7 @@ void daNpcMt_c::setAnmFromMsgTag() { break; case 6: setAnmTbl(l_npc_anm_tukuru); + break; } dComIfGp_setMesgAnimeAttrInfo(0xff); } @@ -1411,6 +1412,7 @@ u8 daNpcMt_c::changePhotoNo(u8 photoNo) { break; case DSNAP_TYPE_UNK06: photoNo = DSNAP_TYPE_NPC_UB4; + break; } return photoNo; } diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index 9cde0d5f..053261ed 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -6086,7 +6086,6 @@ void daNpcPeople_c::eventUb1TalkInit(int) { if(!is1GetMap20()) { m73C = l_msg_ub1_no_collect_map20; dComIfGs_onEventBit(dSv_event_flag_c::UNK_2102); - } else if(!is1DayGetMap20()) { m73C = l_msg_ub1_collect_map20; diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index a8ed1630..caa680c6 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -968,7 +968,6 @@ void daNpcPhoto_c::executeWait() { if(pActor && fopAcM_GetProfName(pActor) == fpcNm_PLAYER_e) { field_0x9BE = 2; } - } } else if(field_0x9C1 == 4 && ((field_0x9C6 & 0x10) == 0)){ daPy_py_c* link = (daPy_py_c*)dComIfGp_getLinkPlayer(); @@ -1028,13 +1027,11 @@ void daNpcPhoto_c::executeTalk() { field_0x9C6 = temp & 254; mItemNo = 31; field_0x9BE = 4; - } else { if((temp & 2) != 0){ field_0x9C6 = temp & ~0x02; mItemNo = 38; field_0x9BE = 5; - } else { if((temp & 4) != 0){ field_0x9C6 = temp & ~0x04; @@ -1085,7 +1082,6 @@ void daNpcPhoto_c::executeWalk() { if (point2.y - point.y > 400.0f) { field_0x984 = l_npc_dat.field_0x3C * l_npc_dat.field_0x40; } - } else{ executeSetMode(0); field_0x9C1 = 2; @@ -1324,7 +1320,6 @@ void daNpcPhoto_c::eventMesSetInit(int i_staffId) { field_0x980 = l_msg_1st_talk_photo; field_0x9D0 = NULL; dComIfGs_onEventBit(l_save_dat.field_0x04); - } else { int temp = 0; daTagPhoto_c* ac = (daTagPhoto_c*)dComIfGp_event_getPt2(); @@ -1781,7 +1776,6 @@ u32 daNpcPhoto_c::getMsg() { if(dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302)) { field_0x980 = l_msg_get_photo; field_0x9D0 = 0; - } else { if(isPhotoDxOk()) { dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0302); @@ -1798,7 +1792,6 @@ u32 daNpcPhoto_c::getMsg() { field_0x9D0 = (u8*)l_msg_color_c; } } - } } else { eventReg = dComIfGs_getEventReg(l_save_dat.field_0x06); @@ -1902,6 +1895,7 @@ void daNpcPhoto_c::setAnmFromMsgTag() { case 9: setAnmTbl(l_npc_anm_spit); field_0x9C9 &= 0x7f; + break; } dComIfGp_setMesgAnimeAttrInfo(0xFF); } @@ -1938,7 +1932,6 @@ void daNpcPhoto_c::chkAttention() { if (!field_0x9BD) { field_0x9BD = true; } - } else { fopAc_ac_c* link = dComIfGp_getLinkPlayer(); f32 temp = l_npc_dat.field_0x2C; diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp index 9ade0000..f11fb747 100644 --- a/src/d/actor/d_a_npc_tc.cpp +++ b/src/d/actor/d_a_npc_tc.cpp @@ -1117,7 +1117,6 @@ void daNpc_Tc_c::lookBack() { dstPos = &temp6; temp3.set(current.pos); temp3.y = eyePos.y; - } else if (mHasAttention){ temp6 = dNpc_playerEyePos(l_HIO.mNpc.m04); dstPos = &temp6; @@ -1232,7 +1231,6 @@ void daNpc_Tc_c::statusWalkToJail() { dComIfGs_onEventBit(dSv_event_flag_c::UNK_0B40); mHasTalkedNearJail = true; return; - } mStatus = STATUS_TALK_NEAR_JAIL; } else if (mHasAttention) { @@ -1293,7 +1291,6 @@ void daNpc_Tc_c::statusWaitNearJail() { dComIfGs_onEventBit(dSv_event_flag_c::UNK_0B40); mHasTalkedNearJail = true; return; - } mStatus = STATUS_TALK_NEAR_JAIL; } else if (mHasAttention) { @@ -1323,7 +1320,6 @@ void daNpc_Tc_c::statusWalkToStool() { if (speedF == 0.0f) { mStatus = STATUS_WALK_TO_JAIL; } - } else { mStoolLookPos.set(mStoolPos); cLib_targetAngleY(¤t.pos, &mWalkToStoolPos); @@ -1707,7 +1703,6 @@ void daNpc_Tc_c::setTower() { temp = l_HIO.field_0x6C; temp2 = l_HIO.field_0x78; break; - } switch(mType) { @@ -1769,7 +1764,6 @@ BOOL daNpc_Tc_c::_execute() { case 0: mAnmPrmIdx = ANM_PRM_IDX_WAIT01; break; - } } else { mAnmPrmIdx = ANM_PRM_IDX_WAIT01; 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 fdb39f56..c073671f 100644 --- a/src/d/actor/d_a_npc_tc_msg_red.inc +++ b/src/d/actor/d_a_npc_tc_msg_red.inc @@ -167,7 +167,6 @@ u32 daNpc_Tc_c::getMsgRed() { return 0xDEB; case false: return 0xDEA; - } } 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 df6359f4..f1be0ae6 100644 --- a/src/d/actor/d_a_npc_tc_msg_white.inc +++ b/src/d/actor/d_a_npc_tc_msg_white.inc @@ -115,7 +115,7 @@ u32 daNpc_Tc_c::getMsgWhite() { m_jnt.onHeadLock(); } else { - if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B80)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B80)) { if (!field_0x80E) { msg = 0xDC8; m_jnt.onHeadLock(); diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index 6ff21df8..762070e5 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/src/d/actor/d_a_obj_doguu.cpp @@ -348,7 +348,6 @@ void daObjDoguu_c::setQuake(int i_staffIdx) { u32 pattern = 0x0010FFEE; dComIfGp_getVibration().StartQuake((u8*)&pattern, 0, 63, cXyz(0.0f, 1.0f, 0.0f)); mTimer = *dComIfGp_evmng_getMyIntegerP(i_staffIdx, "Timer"); - } /* 00000FB8-0000100C .text setJDemo__12daObjDoguu_cFi */ diff --git a/src/d/actor/d_a_obj_hami4.cpp b/src/d/actor/d_a_obj_hami4.cpp index a05e08aa..4681002a 100644 --- a/src/d/actor/d_a_obj_hami4.cpp +++ b/src/d/actor/d_a_obj_hami4.cpp @@ -183,7 +183,6 @@ bool daObjHami4_c::_execute() { } set_mtx(); return true; - } /* 000009DC-00000A58 .text daObjHami4_Execute__FPv */ diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index 8e3702c1..9772e64b 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -611,18 +611,16 @@ bool daObjHha_c::_execute() { mState = State_SWITCHING; } } - else { - if(dComIfGp_evmng_startCheck(mEventIdx) != FALSE){ - mWtrState = 2; - mWtrTimer = 35; - mPartTimer = 0; - mState = State_CLOSED; - } + else if(dComIfGp_evmng_startCheck(mEventIdx) != FALSE){ + mWtrState = 2; + mWtrTimer = 35; + mPartTimer = 0; + mState = State_CLOSED; } } break; - - case State_SWITCHING: if(dComIfGp_evmng_endCheck(mEventIdx)){ + case State_SWITCHING: + if(dComIfGp_evmng_endCheck(mEventIdx)){ dComIfGp_event_reset(); mState = State_CLOSED; } diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index 9493e65a..af4bd03d 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -173,9 +173,9 @@ BOOL daObjVolcano::Act_c::Create() { field_0x4F8 = 0.0f; if (dComIfGs_getStartPoint() == 2 #if VERSION > VERSION_DEMO - && current.roomNo == dComIfGs_getRestartRoomNo() + && current.roomNo == dComIfGs_getRestartRoomNo() #endif - ) { + ) { field_0x500 = 6; } else { field_0x500 = 3; diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 83193b72..dc0a5d12 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -13111,7 +13111,7 @@ void daPy_lk_c::endDemoMode() { return; } if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { - daShip_c* ship = (daShip_c*)dComIfGp_getShipActor(); + daShip_c* ship = (daShip_c*)dComIfGp_getShipActor(); if (ship == NULL) { checkNextMode(0); } else if (daPy_getPlayerActorClass() != this) { diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc index ef0333f7..4e3ff858 100644 --- a/src/d/actor/d_a_player_swim.inc +++ b/src/d/actor/d_a_player_swim.inc @@ -609,7 +609,7 @@ BOOL daPy_lk_c::procSwimMove() { procSwimWait_init(TRUE); } else if ((mDirection == DIR_FORWARD && frameCtrl.checkPass(20.0f)) || (mDirection != DIR_FORWARD && frameCtrl.checkPass(0.0f))) { - seStartOnlyReverb(JA_SE_LK_SWIM); + seStartOnlyReverb(JA_SE_LK_SWIM); } setSwimTimerStartStop(); diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index db8f5147..7c69d8ea 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -79,7 +79,7 @@ bool daSalvage_c::CreateInit() { mEventIdx = dComIfGp_evmng_getEventIdx("SLVG_HAZURE_LEFT", 0xff); mEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_SALVAGELIGHT00, ¤t.pos); if (mEmitter != NULL) { - mEmitter->setStatus(1); + mEmitter->stopCreateParticle(); } return true; } diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 1bcc605d..723b35c9 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -1262,7 +1262,6 @@ BOOL daShip_c::checkNextMode(int i_curMode) { tgRVecP = mSph.GetTgRVecP(); tgHitPos = mSph.GetTgHitPosP(); tgHitObj = mSph.GetTgHitGObj(); - } else { dCcD_Cyl* cyl = mCyl; @@ -1781,7 +1780,6 @@ BOOL daShip_c::procCannon() { cLib_addCalcAngleS(&m0396, cM_atan2s(-cannonPos.y, cannonPos.absXZ()) + 0x4000, 5, 0x180, 0x40); cLib_addCalcAngleS(&m0394, cM_atan2s(cannonPos.x, cannonPos.z) - shape_angle.y, 5, 0x180, 0x40); - } else if (!mDoCPd_R_LOCK_BUTTON(0)) { float adjust = mStickMVal * (m0404 * 4.0f + 1.0f); m0396 += (adjust * 384.0f) * cM_scos(mStickMAng); @@ -2986,7 +2984,6 @@ void daShip_c::setEffectData(float param_1, short param_2) { mWaveL.stop(); mSplash.stop(); } - } fVar3 = speedF + 150.0f; mEffPos.set(current.pos.x + fVar3 * cM_ssin(shape_angle.y), param_1, current.pos.z + fVar3 * cM_scos(shape_angle.y)); @@ -3786,7 +3783,7 @@ BOOL daShip_c::execute() { fVar4 = m0404 * 30.0f + 10.0f; // Bug? This room check assumes we're on the sea without checking? if (dComIfGs_getBombNum() == 0 && fopAcM_GetRoomNo(this) == dIsleRoom_OutsetIsland_e) { - fVar4 *= 1.2f; + fVar4 *= 1.2f; } } firstDecrementShipSpeed(fVar4); @@ -3869,7 +3866,6 @@ BOOL daShip_c::execute() { fopAcM_posMove(this, mStts.GetCCMoveP()); if (dComIfGp_event_runCheck()) { m1044 = cXyz::Zero; - } else { cXyz sp108; @@ -3881,7 +3877,6 @@ BOOL daShip_c::execute() { } else { cLib_addCalcPosXZ(&m1044, cXyz::Zero, 0.05f, 0.1f, 0.02f); - } current.pos += m1044; } @@ -4014,7 +4009,6 @@ BOOL daShip_c::execute() { if (mProc != &daShip_c::procCannon) { m0396 = getAnglePartRate() * 0x4000; m0394 *= getAnglePartRate(); - } mpCannonModel->calc(); @@ -4134,8 +4128,8 @@ BOOL daShip_c::execute() { r23_2 = TRUE; } else if ((mCurMode == 10 || mCurMode == 11) && m0434 && mRopeCnt > 0) { - spC0 = *m0434 - eyePos; - r23_2 = TRUE; + spC0 = *m0434 - eyePos; + r23_2 = TRUE; } else if (mCurMode == 8 || distXz > 125.0f) { if ( @@ -4348,7 +4342,6 @@ BOOL daShip_c::execute() { if (mPart == PART_STEER_e) { dComIfGp_setPlayerStatus1(0, daPyStts1_SAIL_e); mDoAud_setShipSailState(1); - } else { dComIfGp_clearPlayerStatus1(0, daPyStts1_SAIL_e); diff --git a/src/d/actor/d_a_st.cpp b/src/d/actor/d_a_st.cpp index a33602eb..f910e773 100644 --- a/src/d/actor/d_a_st.cpp +++ b/src/d/actor/d_a_st.cpp @@ -633,6 +633,7 @@ static void fight(st_class* i_this) { switch (i_this->m02C4) { case 0: i_this->m02DC = 0.0f; + break; } i_this->m0ED1 = 0; switch (i_this->mFightBehavior) { @@ -1519,6 +1520,7 @@ static void St_move(st_class* i_this) { break; case 0x21: sita_move(i_this); + break; } if (i_this->mActionState != 0x10) { speed_pos_calc(i_this); diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index f7907dbe..836d5212 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -3107,6 +3107,7 @@ static u8 damage_check(tn_class* i_this) { case 7: i_this->mDamageReaction.m424 |= 0x10; i_this->mDamageReaction.m428 = 26.0f; + break; } if (i_this->mDamageReaction.m424 != 0) { cXyz local_8c(0.0f, 0.0f, -10.0f); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index ded5f1ac..487eaaff 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -2221,7 +2221,7 @@ bool dCamera_c::bumpCheck(u32 i_flags) { curr_hit_type = 3; } else if (prev_hit_type != 3) { - curr_hit_type = 4; + curr_hit_type = 4; } else { curr_hit_type = 5; @@ -2645,11 +2645,11 @@ bool dCamera_c::followCamera2(s32 param_0) { /* 8016A110-8016C4F8 .text followCamera__9dCamera_cFl */ bool dCamera_c::followCamera(s32 param_1) { + /* Nonmatching */ bool bVar1; bool bVar2; bool bVar3; bool bVar4; - int iVar5; float fVar37; f32 fVar40 = 0.9f; @@ -3050,7 +3050,7 @@ bool dCamera_c::followCamera(s32 param_1) { cSGlobe local_484(mViewCache.mEye - mViewCache.mCenter); if (mWork.follow.m392 <= 0 || iVar17 <= mWork.follow.m392) { - dVar20 = dCamMath::rationalBezierRatio((float) iVar5 / (float)iVar17, fVar38); + dVar20 = dCamMath::rationalBezierRatio((float)mWork.follow.m392 / (float)iVar17, fVar38); mWork.follow.m3D8 = 1; mWork.follow.m3B8 = (1.0f - mWork.follow.m3B8) * dVar20; } @@ -3131,7 +3131,7 @@ bool dCamera_c::followCamera(s32 param_1) { mWork.follow.m38C = 1; } else if (mWork.follow.m38C < 0xf) { - mWork.follow.m3B8 = iVar5 * 0.033333335f; + mWork.follow.m3B8 = mWork.follow.m38C * 0.033333335f; mWork.follow.m38C++; } else if (check_owner_action(mPadId, daPyStts0_UNK40_e | daPyStts0_UNK20_e)) { @@ -3555,7 +3555,7 @@ bool dCamera_c::lockonCamera(s32 param_1) { if (mpLockonTarget && mLockOnActorId != -1) { cXyz local_120 = attentionPos(mpPlayerActor); if (lineBGCheck(&local_120, &mViewCache.mCenter, 0x7f)) { - ForceLockOff(mLockOnActorId); + ForceLockOff(mLockOnActorId); } } @@ -3789,11 +3789,11 @@ bool dCamera_c::CalcSubjectAngle(s16* param_1, s16* param_2) { fVar4 = mCamSetup.m030; if (!bVar9) { - cSAngle local_88(fVar2 * mWork.subject.m384); - cSAngle local_8c(fVar1 * mWork.subject.m388); - s16 local_98 = local_88.Val() + mWork.subject.m3BA; - *param_2 = local_98; - *param_1 = local_8c.Val(); + cSAngle local_88(fVar2 * mWork.subject.m384); + cSAngle local_8c(fVar1 * mWork.subject.m388); + s16 local_98 = local_88.Val() + mWork.subject.m3BA; + *param_2 = local_98; + *param_1 = local_8c.Val(); } fVar6 = g_mDoCPd_cpadInfo[mPadId].mMainStickPosX; diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 59f89bd8..8adbd4df 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -683,7 +683,7 @@ void dEvt_control_c::remove() { mMode = dEvtMode_NONE_e; mbEndProc = 0; mOrderCount = 0; - field_0xdd = 0; + mDebugStb = 0; mEventEndSound = 0; field_0xdb = 0; mCullFarClipRatio = 0.0f; diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 143ec0cf..718d18dd 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -649,8 +649,8 @@ void dFile_select_c::makeRecInfo(u8 param_1) { } } else { - ((J2DPicture*)field_0x828[i].pane)->changeTexture("heart_04_2.bti", 0); - ((J2DPicture*)field_0xc88[i].pane)->changeTexture("heart_04_2.bti", 0); + ((J2DPicture*)field_0x828[i].pane)->changeTexture("heart_04_2.bti", 0); + ((J2DPicture*)field_0xc88[i].pane)->changeTexture("heart_04_2.bti", 0); } } else { diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index b48dcd09..21f647bb 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1056,7 +1056,7 @@ fopAc_ac_c* fopAcM_createItemForKP2(cXyz* pos, int i_itemNo, int roomNo, csXyz* daItem_c* fopAcM_createItemForSimpleDemo(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, cXyz* scale, f32 speedF, f32 speedY) { daItem_c* item = (daItem_c*)fopAcM_fastCreateItem(pos, i_itemNo, roomNo, angle, scale, speedF, speedY, -7.0f); if (item != NULL) - item->setStatus(5); + item->setStatus(daItem_c::STATUS_INIT_NORMAL); return item; } |