diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index 1a2407eae..1f5c11901 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -63,7 +63,6 @@ void anm_init(fganon_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f32 s J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("Fganon", bckFileIdx); i_this->mpMorf->setAnm(bckAnm, loopMode, morf, speed, 0.0f, -1.0f, NULL); } - return; } /* 000002C8-00000338 .text tama_draw__FP12fganon_class */ @@ -75,7 +74,6 @@ void tama_draw(fganon_class* i_this) { i_this->mpBtkAnm->entry(pModel->getModelData()); mDoExt_modelUpdateDL(pModel); } - return; } /* 00000338-00000420 .text daFganon_Draw__FP12fganon_class */ @@ -106,7 +104,6 @@ void deru_brk(fganon_class* i_this) { i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); fopAcM_seStart(i_this, JA_SE_CM_PG_APPEAR, 0); i_this->mbIsMaterialized = TRUE; - return; } /* 00000554-000006B8 .text kieru_brk__FP12fganon_classUc */ @@ -123,7 +120,6 @@ void kieru_brk(fganon_class* i_this, unsigned char param_2) { i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); } i_this->mbIsMaterialized = FALSE; - return; } /* 000006B8-000007EC .text deru_brk2__FP12fganon_class */ @@ -135,7 +131,6 @@ void deru_brk2(fganon_class* i_this) { i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); fopAcM_seStart(i_this, JA_SE_CM_PG_APPEAR, 0); i_this->mbIsMaterialized = TRUE; - return; } /* 000007EC-00000920 .text kieru_brk2__FP12fganon_class */ @@ -148,7 +143,6 @@ void kieru_brk2(fganon_class* i_this) { i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); fopAcM_seStart(i_this, JA_SE_CM_PG_DISAPPEAR, 0); i_this->mbIsMaterialized = FALSE; - return; } /* 00000920-00000AEC .text pos_move__FP12fganon_classUc */ @@ -173,7 +167,6 @@ void pos_move(fganon_class* i_this, unsigned char param_2) { cMtx_XrotM(*calc_mtx, i_this->current.angle.x); MtxPosition(&local_44, &i_this->speed); i_this->current.pos += i_this->speed; - return; } /* 00000AEC-00000C14 .text fly_se_set__FP12fganon_class */ @@ -189,7 +182,6 @@ void fly_se_set(fganon_class* i_this) { uVar2 = 100; } fopAcM_seStart(i_this, JA_SE_CM_PG_FLYING, uVar2); - return; } /* 00000C14-00001170 .text fly__FP12fganon_class */ @@ -256,7 +248,6 @@ void fly(fganon_class* i_this) { i_this->m386 = 2; i_this->m388 = 0; } - return; } /* 000015A8-00001BD0 .text shot__FP12fganon_class */ @@ -353,7 +344,6 @@ void shot(fganon_class* i_this) { if ((i_this->m388 == 3) || (i_this->m388 == 4)) { mDoAud_monsSeStart(JA_SE_OBJ_PG_EBALL_FLY_S, &i_this->m3E0, 100, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); } - return; } /* 00001BD0-000020B8 .text spinattack__FP12fganon_class */ @@ -427,7 +417,6 @@ void spinattack(fganon_class* i_this) { break; } } - return; } /* 000020B8-00002614 .text fly2__FP12fganon_class */ @@ -570,7 +559,6 @@ void tama_set(fganon_class* i_this) { i_this->mpBrkAnm3->play(); i_this->mpBtkAnm->play(); } - return; } /* 000029C8-00002A38 .text mahou_set__FP12fganon_class */ @@ -579,7 +567,6 @@ void mahou_set(fganon_class* i_this) { fopAcM_create(PROC_FGMAHOU, i, &i_this->m664, i_this->current.roomNo); } i_this->m670 = 0; - return; } /* 00002A38-000030C4 .text shot2__FP12fganon_class */ @@ -688,7 +675,6 @@ void shot2(fganon_class* i_this) { pos_move(i_this,0); fly_se_set(i_this); tama_set(i_this); - return; } /* 000030C4-00003690 .text spinattack2__FP12fganon_class */ @@ -836,7 +822,6 @@ void down(fganon_class* i_this) { i_this->health = 100; } } - return; } /* 00003F7C-00004300 .text kabe_check__FP12fganon_class */ @@ -919,7 +904,6 @@ void deru(fganon_class* i_this) { } break; } - return; } /* 000044CC-00004584 .text kieru__FP12fganon_class */ @@ -948,7 +932,6 @@ void kieru(fganon_class* i_this) { break; } } - return; } /* 00004584-00004BC8 .text fail__FP12fganon_class */ @@ -1068,7 +1051,6 @@ void fail(fganon_class* i_this) { default: break; } - return; } /* 00004BC8-00004DB4 .text standby__FP12fganon_class */ @@ -1228,7 +1210,6 @@ void end(fganon_class* i_this) { case 6: break; } - return; } /* 00005350-000056A4 .text last_end__FP12fganon_class */ @@ -1320,7 +1301,6 @@ void last_end(fganon_class* i_this) { cLib_addCalc2(&i_this->m3C0, 100.0f, 1.0f, REG0_F(4) + 63.5f); } cLib_addCalcAngleS2(&i_this->current.angle.x, 0, 4, 0x800); - return; } /* 000056A4-00006288 .text damage_check__FP12fganon_class */ @@ -1557,7 +1537,6 @@ void damage_check(fganon_class* i_this) { } } } - return; } /* 00006288-00006560 .text move__FP12fganon_class */ @@ -2023,7 +2002,6 @@ void demo_camera(fganon_class* i_this) { JUTReport(410, 430, "K SUB COUNT %d", i_this->mB56); i_this->mB56++; } - return; } /* 00007434-0000778C .text ball_bg_check__FP12fganon_class */ @@ -2320,7 +2298,6 @@ void energy_ball_move(fganon_class* i_this) { if (local_5c.abs() > 10000.0f) { i_this->m408 = 35; } - return; } /* 00008614-000086B4 .text mahou_se_set__FPvPv */ diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index 2775de727..151dd36df 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -216,7 +216,6 @@ static void rideCallBack(dBgW* param1, fopAc_ac_c* i_act, fopAc_ac_c* i_other) { i_this->mTargetRotation.w = cM_scos(i_this->mTiltAngle); } i_this->m43D = FALSE; - return; } /* 00000CAC-00000D34 .text set_mtx__9daLlift_cFv */ @@ -225,7 +224,6 @@ void daLlift_c::set_mtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(current.angle); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); - return; } /* 00000D34-00000D9C .text setMoveBGMtx__9daLlift_cFv */ @@ -234,7 +232,6 @@ void daLlift_c::setMoveBGMtx() { mDoMtx_stack_c::YrotM(current.angle.y); mDoMtx_stack_c::quatM(&mCurrentRotation); MTXCopy(mDoMtx_stack_c::get(), mMtx); - return; } /* 00000D9C-00000F24 .text _execute__9daLlift_cFv */ @@ -286,7 +283,6 @@ void daLlift_c::emitterCtrl() { if (mEmitter2) { mEmitter2 ->setGlobalRTMatrix(mBGMtx); } - return; } /* 00000FE0-000010E0 .text MoveDownLift__9daLlift_cFv */ diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 27b58757e..e5417cfef 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -552,8 +552,6 @@ void daObjTpost_c::checkOrder() { } } } - - return; } /* 00000E48-00000EA4 .text setAttention__12daObjTpost_cFv */ diff --git a/src/d/actor/d_a_player_battle.inc b/src/d/actor/d_a_player_battle.inc index 982f7d39f..e60407a28 100644 --- a/src/d/actor/d_a_player_battle.inc +++ b/src/d/actor/d_a_player_battle.inc @@ -41,7 +41,6 @@ void daPy_lk_c::setSpecialBattle(int param_0) { } } } - return; } /* 8013E384-8013E454 .text changeSpecialBattle__9daPy_lk_cFv */ @@ -196,24 +195,25 @@ BOOL daPy_lk_c::procBtJumpCut() { } if (mAcch.ChkGroundHit()) { return changeLandProc(daPy_HIO_b_jump_c0::m.field_0xC); - } else { - if ((m3570 != 0) || (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f)) { - gravity = daPy_HIO_b_jump_c0::m.field_0x3C; - speed.y = daPy_HIO_b_jump_c0::m.field_0x34; - mVelocity = daPy_HIO_b_jump_c0::m.field_0x38; - m3570 = 1; - } else { - if ((m3570 == 1) && (speed.y < -gravity) && daPy_HIO_b_jump_c0::m.field_0x0 == 1) { - m3570 = 2; - setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, daPy_HIO_b_jump_c0::m.field_0x40); - offModeFlg(ModeFlg_00000400); - setTextureAnime(0x37, 0); - resetSeAnime(); - } - } - setFallVoice(); - return true; } + + if ((m3570 != 0) || (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f)) { + gravity = daPy_HIO_b_jump_c0::m.field_0x3C; + speed.y = daPy_HIO_b_jump_c0::m.field_0x34; + mVelocity = daPy_HIO_b_jump_c0::m.field_0x38; + m3570 = 1; + } else { + if ((m3570 == 1) && (speed.y < -gravity) && daPy_HIO_b_jump_c0::m.field_0x0 == 1) { + m3570 = 2; + setSingleMoveAnime(ANM_JMPEDS, 0.0f, 0.0f, -1, daPy_HIO_b_jump_c0::m.field_0x40); + offModeFlg(ModeFlg_00000400); + setTextureAnime(0x37, 0); + resetSeAnime(); + } + } + + setFallVoice(); + return true; } /* 8013EBD0-8013EC50 .text procBtSlide__9daPy_lk_cFv */ diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc index ac3c2c437..39c96f100 100644 --- a/src/d/actor/d_a_player_boomerang.inc +++ b/src/d/actor/d_a_player_boomerang.inc @@ -45,21 +45,21 @@ void daPy_lk_c::throwBoomerang() { procWait_init(); } } - return; } /* 80149698-801497A4 .text returnBoomerang__9daPy_lk_cFv */ int daPy_lk_c::returnBoomerang() { dComIfGp_clearPlayerStatus0(0, daPyStts0_BOOMERANG_WAIT_e); - if (mEquipItem == daPyItem_NONE_e && !checkNoControll() && !dComIfGp_event_runCheck() && - mDemo.getDemoType() == 0 && - (m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff || checkPlayerGuard() || - checkDashDamageAnime() || checkBoomerangAnime()) && - (!checkModeFlg(ModeFlg_WHIDE | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_CLIMB | - ModeFlg_SWIM | ModeFlg_00080000 | ModeFlg_GRAB | ModeFlg_PUSHPULL | - ModeFlg_LADDER | ModeFlg_CROUCH | ModeFlg_CRAWL) || - mCurProc == daPyProc_SHIP_BOOMERANG_e)) { + if (mEquipItem == daPyItem_NONE_e && !checkNoControll() && !dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && + (m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff || checkPlayerGuard() || checkDashDamageAnime() || + checkBoomerangAnime()) && + (!checkModeFlg( + ModeFlg_WHIDE | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_CLIMB | ModeFlg_SWIM | ModeFlg_00080000 | + ModeFlg_GRAB | ModeFlg_PUSHPULL | ModeFlg_LADDER | ModeFlg_CROUCH | ModeFlg_CRAWL + ) || + mCurProc == daPyProc_SHIP_BOOMERANG_e)) + { mActorKeepEquip = mActorKeepThrow; mActorKeepThrow.clearData(); mEquipItem = dItem_BOOMERANG_e; @@ -104,7 +104,6 @@ BOOL daPy_lk_c::checkNextActionBoomerangFly() { ); } } - return; } /* 801498D8-80149964 .text checkNextBoomerangMode__9daPy_lk_cFv */ @@ -117,7 +116,6 @@ BOOL daPy_lk_c::checkNextBoomerangMode() { } else { procBoomerangSubject_init(); } - return; } /* 80149964-80149A44 .text changeBoomerangCatchProc__9daPy_lk_cFv */ @@ -202,46 +200,48 @@ BOOL daPy_lk_c::procBoomerangSubject() { BOOL daPy_lk_c::procBoomerangMove_init() { if (mCurProc == daPyProc_BOOMERANG_MOVE_e) { return false; - } else { - commonProcInit(daPyProc_BOOMERANG_MOVE_e); - if (m34B8 == 2) { - current.angle.y = shape_angle.y + 0x4000; - } else { - m34B8 = 3; - current.angle.y = shape_angle.y + -0x4000; - } - setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, daPy_HIO_boom_c0::m.field_0x18, 0.0f, -1, -1.0f); - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); - dComIfGp_setPlayerStatus0(0, daPyStts0_BOOMERANG_AIM_e); - return true; } + + commonProcInit(daPyProc_BOOMERANG_MOVE_e); + if (m34B8 == 2) { + current.angle.y = shape_angle.y + 0x4000; + } else { + m34B8 = 3; + current.angle.y = shape_angle.y + -0x4000; + } + setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, daPy_HIO_boom_c0::m.field_0x18, 0.0f, -1, -1.0f); + setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + dComIfGp_setPlayerStatus0(0, daPyStts0_BOOMERANG_AIM_e); + return true; } /* 80149CC8-80149DA4 .text procBoomerangMove__9daPy_lk_cFv */ BOOL daPy_lk_c::procBoomerangMove() { if (!checkItemModeActorPointer()) { return true; - } else { - if (mpAttnActorLockOn != NULL) { - setSpeedAndAngleAtnActor(); - } else { - setSpeedAndAngleAtn(); - } - if (!checkNextMode(0)) { - f32 fVar1 = -1.0f; - if (std::fabsf(mVelocity) < 0.001f) { - onModeFlg(ModeFlg_00000001); - if (m34B8 != 3) { - m34B8 = 3; - fVar1 = daPy_HIO_basic_c0::m.field_0xC; - } - } else { - offModeFlg(ModeFlg_00000001); - } - setBlendAtnMoveAnime(fVar1); - setBodyAngleXReadyAnime(); - } } + + if (mpAttnActorLockOn != NULL) { + setSpeedAndAngleAtnActor(); + } else { + setSpeedAndAngleAtn(); + } + + if (!checkNextMode(0)) { + f32 fVar1 = -1.0f; + if (std::fabsf(mVelocity) < 0.001f) { + onModeFlg(ModeFlg_00000001); + if (m34B8 != 3) { + m34B8 = 3; + fVar1 = daPy_HIO_basic_c0::m.field_0xC; + } + } else { + offModeFlg(ModeFlg_00000001); + } + setBlendAtnMoveAnime(fVar1); + setBodyAngleXReadyAnime(); + } + return true; } @@ -249,17 +249,17 @@ BOOL daPy_lk_c::procBoomerangMove() { BOOL daPy_lk_c::procBoomerangCatch_init() { if (mCurProc == daPyProc_BOOMERANG_CATCH_e) { return false; - } else { - commonProcInit(daPyProc_BOOMERANG_CATCH_e); - setSingleMoveAnime( - ANM_BOOMCATCH, - daPy_HIO_boom_c0::m.field_0x20, - daPy_HIO_boom_c0::m.field_0x24, - daPy_HIO_boom_c0::m.field_0x2, - daPy_HIO_boom_c0::m.field_0x28 - ); - offNoResetFlg0(daPyFlg0_UNK20); } + + commonProcInit(daPyProc_BOOMERANG_CATCH_e); + setSingleMoveAnime( + ANM_BOOMCATCH, + daPy_HIO_boom_c0::m.field_0x20, + daPy_HIO_boom_c0::m.field_0x24, + daPy_HIO_boom_c0::m.field_0x2, + daPy_HIO_boom_c0::m.field_0x28 + ); + offNoResetFlg0(daPyFlg0_UNK20); return true; } diff --git a/src/d/actor/d_a_player_bottle.inc b/src/d/actor/d_a_player_bottle.inc index fcc23c8b0..64879a510 100644 --- a/src/d/actor/d_a_player_bottle.inc +++ b/src/d/actor/d_a_player_bottle.inc @@ -33,36 +33,35 @@ void daPy_lk_c::makeFairy(cXyz* param_0, u32 param_1) { onResetFlg0(daPyRFlg0_FAIRY_USE); resetCurse(); fopAcM_fastCreate(PROC_NPC_FA1, param_1, param_0, fopAcM_GetRoomNo(this), &shape_angle); - return; } /* 801521A0-80152300 .text procBottleDrink_init__9daPy_lk_cFUs */ BOOL daPy_lk_c::procBottleDrink_init(u16 param_0) { if (!dComIfGp_event_compulsory(this)) { return false; - } else { - mDemo.setDemoType(5); - int iVar1 = checkShipRideUseItem(1); - commonProcInit(daPyProc_BOTTLE_DRINK_e); - current.angle.y = shape_angle.y; - mVelocity = 0.0f; - setSingleMoveAnime( - ANM_BINDRINKPRE, - 1.0f, - daPy_HIO_bottle_c0::m.field_0x5C, - daPy_HIO_bottle_c0::m.field_0xC, - daPy_HIO_bottle_c0::m.field_0x60 - ); - if (changeBottleDrinkFace(param_0)) { - setTextureAnime(0x85, 0); - } - keepItemData(); - setBottleModel(param_0); - dComIfGp_setPlayerStatus1(0, daPyStts1_UNK2000_e); - m3570 = 1; - dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &m3570, 0); - initShipRideUseItem(iVar1, 2); } + + mDemo.setDemoType(5); + int iVar1 = checkShipRideUseItem(1); + commonProcInit(daPyProc_BOTTLE_DRINK_e); + current.angle.y = shape_angle.y; + mVelocity = 0.0f; + setSingleMoveAnime( + ANM_BINDRINKPRE, + 1.0f, + daPy_HIO_bottle_c0::m.field_0x5C, + daPy_HIO_bottle_c0::m.field_0xC, + daPy_HIO_bottle_c0::m.field_0x60 + ); + if (changeBottleDrinkFace(param_0)) { + setTextureAnime(0x85, 0); + } + keepItemData(); + setBottleModel(param_0); + dComIfGp_setPlayerStatus1(0, daPyStts1_UNK2000_e); + m3570 = 1; + dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &m3570, 0); + initShipRideUseItem(iVar1, 2); return true; } @@ -75,43 +74,43 @@ BOOL daPy_lk_c::procBottleDrink() { BOOL daPy_lk_c::procBottleOpen_init(u16 param_0) { if (mCurProc == daPyProc_BOTTLE_OPEN_e) { return true; - } else { - if (mDemo.getDemoMode() != 0x3d) { - if (!dComIfGp_event_compulsory(this)) { - return false; - } - mDemo.setDemoType(5); - } else { - param_0 = dComIfGp_event_getPreItemNo(); - } - int iVar1 = checkShipRideUseItem(1); - commonProcInit(daPyProc_BOTTLE_OPEN_e); - current.angle.y = shape_angle.y; - mVelocity = 0.0f; - setSingleMoveAnime( - ANM_BINOPENPRE, - 1.0f, - daPy_HIO_bottle_c0::m.field_0x3C, - daPy_HIO_bottle_c0::m.field_0x6, - daPy_HIO_bottle_c0::m.field_0x40 - ); - keepItemData(); - setBottleModel(param_0); - dComIfGp_setPlayerStatus1(0, daPyStts1_UNK4000_e); - if (mEquipItem == dItem_FAIRY_BOTTLE_e) { - m3570 = 3; - } else { - m3570 = 2; - } - if (mDemo.getDemoMode() != 0x3d) { - dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &m3570, 0); - } - initShipRideUseItem(iVar1, 2); - m34D4 = 0; - m34D6 = 0; - m34D0 = -1; - m34D8 = 0; } + + if (mDemo.getDemoMode() != 0x3d) { + if (!dComIfGp_event_compulsory(this)) { + return false; + } + mDemo.setDemoType(5); + } else { + param_0 = dComIfGp_event_getPreItemNo(); + } + int iVar1 = checkShipRideUseItem(1); + commonProcInit(daPyProc_BOTTLE_OPEN_e); + current.angle.y = shape_angle.y; + mVelocity = 0.0f; + setSingleMoveAnime( + ANM_BINOPENPRE, + 1.0f, + daPy_HIO_bottle_c0::m.field_0x3C, + daPy_HIO_bottle_c0::m.field_0x6, + daPy_HIO_bottle_c0::m.field_0x40 + ); + keepItemData(); + setBottleModel(param_0); + dComIfGp_setPlayerStatus1(0, daPyStts1_UNK4000_e); + if (mEquipItem == dItem_FAIRY_BOTTLE_e) { + m3570 = 3; + } else { + m3570 = 2; + } + if (mDemo.getDemoMode() != 0x3d) { + dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &m3570, 0); + } + initShipRideUseItem(iVar1, 2); + m34D4 = 0; + m34D6 = 0; + m34D0 = -1; + m34D8 = 0; return true; } diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index 7f446efc8..351b24bd0 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -20,14 +20,14 @@ BOOL daPy_lk_c::bowJointCB(int param_0) { /* Nonmatching - floats */ if (checkBowReadyAnime()) { return true; + } + + if (param_0 == 6) { + mDoMtx_trans(mDoMtx_stack_c::now, 0.0f, 4.5f, 4.5f); + mDoMtx_concat(mpEquipItemModel->getAnmMtx(6), mDoMtx_stack_c::now, mDoMtx_stack_c::now); + mpEquipItemModel->setAnmMtx(param_0, mDoMtx_stack_c::now); } else { - if (param_0 == 6) { - mDoMtx_trans(mDoMtx_stack_c::now, 0.0f, 4.5f, 4.5f); - mDoMtx_concat(mpEquipItemModel->getAnmMtx(6), mDoMtx_stack_c::now, mDoMtx_stack_c::now); - mpEquipItemModel->setAnmMtx(param_0, mDoMtx_stack_c::now); - } else { - mpEquipItemModel->setAnmMtx(11, mpEquipItemModel->getAnmMtx(6)); - } + mpEquipItemModel->setAnmMtx(11, mpEquipItemModel->getAnmMtx(6)); } return true; } @@ -79,7 +79,6 @@ void daPy_lk_c::deleteArrow() { fopAcM_delete(pfVar1); mActorKeepEquip.clearData(); } - return; } /* 8014A1CC-8014A2A0 .text setBowReadyAnime__9daPy_lk_cFv */ @@ -97,7 +96,6 @@ void daPy_lk_c::setBowReadyAnime() { setPriTextureAnime(0x70, 0); m355E = 10; seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT); - return; } /* 8014A2A0-8014A328 .text setBowReloadAnime__9daPy_lk_cFv */ @@ -114,7 +112,6 @@ void daPy_lk_c::setBowReloadAnime() { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ARROWRELORDA)); m35EC = 0.0f; seStartOnlyReverb(JA_SE_LK_DRAW_BOW); - return; } /* 8014A328-8014A60C .text checkNextActionBowReady__9daPy_lk_cFv */ @@ -202,7 +199,6 @@ LAB_8014a5d8: } LAB_8014a5ec: cancelItemUpperReadyAnime(); - return; } /* 8014A60C-8014A680 .text checkNextActionBowFly__9daPy_lk_cFv */ @@ -215,7 +211,6 @@ BOOL daPy_lk_c::checkNextActionBowFly() { m355E = 0; } } - return; } /* 8014A680-8014A6F4 .text checkNextBowMode__9daPy_lk_cFv */ @@ -225,7 +220,6 @@ BOOL daPy_lk_c::checkNextBowMode() { } else { procBowSubject_init(); } - return; } /* 8014A6F4-8014A834 .text setBowModel__9daPy_lk_cFv */ @@ -288,21 +282,21 @@ BOOL daPy_lk_c::procBowSubject() { BOOL daPy_lk_c::procBowMove_init() { if (mCurProc == daPyProc_BOW_MOVE_e) { return false; - } else { - commonProcInit(daPyProc_BOW_MOVE_e); - if (m34B8 == 2) { - current.angle.y = shape_angle.y + 0x4000; - } else { - m34B8 = 3; - current.angle.y = shape_angle.y + -0x4000; - } - if (!checkBowAnime()) { - setBowReadyAnime(); - } - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); - dComIfGp_setPlayerStatus0(0, daPyStts0_BOW_AIM_e); - return true; } + + commonProcInit(daPyProc_BOW_MOVE_e); + if (m34B8 == 2) { + current.angle.y = shape_angle.y + 0x4000; + } else { + m34B8 = 3; + current.angle.y = shape_angle.y + -0x4000; + } + if (!checkBowAnime()) { + setBowReadyAnime(); + } + setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + dComIfGp_setPlayerStatus0(0, daPyStts0_BOW_AIM_e); + return true; } /* 8014AA2C-8014AB5C .text procBowMove__9daPy_lk_cFv */ diff --git a/src/d/actor/d_a_player_climb.inc b/src/d/actor/d_a_player_climb.inc index f4345e812..69d6a5f1a 100644 --- a/src/d/actor/d_a_player_climb.inc +++ b/src/d/actor/d_a_player_climb.inc @@ -63,7 +63,6 @@ void daPy_lk_c::setClimbShapeOffset() { local_64 -= mLinkLinChk.GetCross(); m34EC = (cM_atan2s(local_64.x, local_64.z) - 0x4000 - shape_angle.y); } - return; } /* 80135DA0-80135E14 .text getClimbDirectionFromAngle__9daPy_lk_cFv */ @@ -98,7 +97,6 @@ void daPy_lk_c::changeClimbMoveProc(int param_0) { } } m34EC = sVar1; - return; } /* 80135E98-80136154 .text setMoveBGCorrectClimb__9daPy_lk_cFv */ @@ -153,7 +151,6 @@ BOOL daPy_lk_c::checkBgCorrectClimbMove(cXyz* i_startPos, cXyz* i_endPos) { current.pos += mLinkLinChk.GetCross() - *i_endPos; } } - return; } /* 80136200-80136588 .text checkBgClimbMove__9daPy_lk_cFv */ @@ -214,7 +211,6 @@ BOOL daPy_lk_c::checkBgClimbMove() { } else { setClimbShapeOffset(); } - return; } /* 80136588-801365F4 .text procClimbUpStart_init_sub__9daPy_lk_cFv */ @@ -223,7 +219,6 @@ void daPy_lk_c::procClimbUpStart_init_sub() { m3570 = 1; m34C2 = 4; dComIfGp_setPlayerStatus1(0, daPyStts1_UNK10000_e); - return; } /* 801365F4-80136708 .text procClimbUpStart_init__9daPy_lk_cFv */ @@ -382,29 +377,27 @@ BOOL daPy_lk_c::procClimbMoveUpDown_init(int param_0) { BOOL daPy_lk_c::procClimbMoveUpDown() { if (setMoveBGCorrectClimb()) { return true; - } else { - m34C2 = 5; - dComIfGp_setDoStatus(6); - if (doTrigger()) { - m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + } + + m34C2 = 5; + dComIfGp_setDoStatus(6); + if (doTrigger()) { + m34C2 = 0; + procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + } else if (std::fabsf(mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) < 0.01f) { + if (m34D0 != 0) { + m34D0 = 0; + setLadderFootSe(); } else { - if (std::fabsf(mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) < 0.01f) { - if (m34D0 != 0) { - m34D0 = 0; - setLadderFootSe(); - } else { - changeClimbMoveProc(m3570); - } - } else { - f32 dVar2 = getLadderMoveAnmSpeed(); - if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.0f) { - dVar2 *= -1.0f; - } - (mFrameCtrlUnder[UNDER_MOVE0_e]).setRate(dVar2); - checkBgClimbMove(); - } + changeClimbMoveProc(m3570); } + } else { + f32 dVar2 = getLadderMoveAnmSpeed(); + if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.0f) { + dVar2 *= -1.0f; + } + (mFrameCtrlUnder[UNDER_MOVE0_e]).setRate(dVar2); + checkBgClimbMove(); } return true; } @@ -453,37 +446,35 @@ BOOL daPy_lk_c::procClimbMoveSide_init(int param_0) { BOOL daPy_lk_c::procClimbMoveSide() { if (setMoveBGCorrectClimb()) { return true; - } else { - m34C2 = 5; - dComIfGp_setDoStatus(6); - if (doTrigger()) { - m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + } + + m34C2 = 5; + dComIfGp_setDoStatus(6); + if (doTrigger()) { + m34C2 = 0; + procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + } else if (std::fabsf(mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) < 0.01f) { + if (m34D0 != 0) { + m34D0 = 0; + setLadderFootSe(); } else { - if (std::fabsf(mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) < 0.01f) { - if (m34D0 != 0) { - m34D0 = 0; - setLadderFootSe(); - } else { - changeClimbMoveProc(m3570); - } - } else { - f32 dVar5 = getClimbMoveAnmSpeed(); - if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.0f) { - dVar5 *= -1.0f; - } - mFrameCtrlUnder[UNDER_MOVE0_e].setRate(dVar5); - cXyz local_28 = (mRightHandPos - mLeftHandPos); - dVar5 = local_28.absXZ(); - f32 fVar1 = std::fabsf(dVar5 - m35A0) * daPy_HIO_ladder_c0::m.field_0x40; - f32 fVar2 = fVar1 * cM_ssin(m34D4); - current.pos.y += fVar1 * cM_scos(m34D4); - current.pos.x += fVar2 * cM_scos(shape_angle.y); - current.pos.z -= fVar2 * cM_ssin(shape_angle.y); - m35A0 = dVar5; - checkBgClimbMove(); - } + changeClimbMoveProc(m3570); } + } else { + f32 dVar5 = getClimbMoveAnmSpeed(); + if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.0f) { + dVar5 *= -1.0f; + } + mFrameCtrlUnder[UNDER_MOVE0_e].setRate(dVar5); + cXyz local_28 = (mRightHandPos - mLeftHandPos); + dVar5 = local_28.absXZ(); + f32 fVar1 = std::fabsf(dVar5 - m35A0) * daPy_HIO_ladder_c0::m.field_0x40; + f32 fVar2 = fVar1 * cM_ssin(m34D4); + current.pos.y += fVar1 * cM_scos(m34D4); + current.pos.x += fVar2 * cM_scos(shape_angle.y); + current.pos.z -= fVar2 * cM_ssin(shape_angle.y); + m35A0 = dVar5; + checkBgClimbMove(); } return true; } diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc index 60476de46..19e9ca98d 100644 --- a/src/d/actor/d_a_player_crawl.inc +++ b/src/d/actor/d_a_player_crawl.inc @@ -143,7 +143,6 @@ void daPy_lk_c::crawlBgCheck(cXyz* param_0, cXyz* param_1) { } else if (iVar2 != 0) { current.pos -= cStack_38; } - return; } /* 801390B8-801392BC .text checkCrawlSideWall__9daPy_lk_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs */ diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index 55504818f..2243bbd71 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -100,7 +100,6 @@ void daPy_lk_c::setShapeAngleToTalkActor() { daPy_HIO_turn_c0::m.field_0xA ); } - return; } /* 8012D08C-8012D134 .text checkEndMessage__9daPy_lk_cFUl */ @@ -418,7 +417,6 @@ void daPy_lk_c::setGetItemSound(u16 param_1, int param_2) { mDoAud_subBgmStart(JA_BGM_ITEM_GET); g_dComIfG_gameInfo.play.field_0x4977 = 1; } - return; } /* 8012E418-8012E6B4 .text setGetDemo__9daPy_lk_cFv */ @@ -662,7 +660,6 @@ void daPy_lk_c::dProcLavaDamage_init_sub() { mDemo.setDemoType(5); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10000000_e); daPy_py_c::changePlayer(this); - return; } /* 8012EE0C-8012EEE4 .text dProcLavaDamage_init__9daPy_lk_cFv */ @@ -728,7 +725,6 @@ void daPy_lk_c::dProcFreezeDamage_init_sub(int param_0) { dComIfGp_particle_setP1(dPa_name::ID_SCENE_827F, &local_28); } } - return; } /* 8012F0DC-8012F174 .text dProcFreezeDamage_init__9daPy_lk_cFv */ @@ -769,7 +765,6 @@ void daPy_lk_c::dProcDead_init_sub() { m3628 = fopMsgM_create(PROC_GAMEOVER); mDemo.setDemoType(5); daPy_py_c::changePlayer(this); - return; } /* 8012F288-8012F38C .text dProcDead_init_sub2__9daPy_lk_cFv */ @@ -793,7 +788,6 @@ void daPy_lk_c::dProcDead_init_sub2() { ); m34D6 = 1; } - return; } /* 8012F38C-8012F3B8 .text checkGameOverStart__9daPy_lk_cFv */ @@ -1443,7 +1437,6 @@ void daPy_lk_c::dProcPresent_init_sub() { )); } keepItemData(); - return; } /* 80130BE8-80130CA0 .text dProcPresent_init__9daPy_lk_cFv */ diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index 6ac7e2f6c..8c6d69fbd 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -44,7 +44,6 @@ void daPy_lk_c::setWeaponBlur() { mSwBlur.mpPosBuffer = new (0x20) Vec[2 * 0x300]; mDoExt_setCurrentHeap(pJVar1); - return; } /* 8013A904-8013A97C .text checkGrabBarrelSearch__9daPy_lk_cFi */ @@ -159,7 +158,7 @@ void daPy_lk_c::setGrabItemPos() { pfVar8->speedF = 0.0f; pfVar8->current.pos.y = dVar9; freeGrabItem(); - goto LAB_8013af64; + return; } } if (fopAcM_GetName(pfVar8) == PROC_MT) { @@ -189,8 +188,6 @@ void daPy_lk_c::setGrabItemPos() { pfVar8->current.pos.y = pfVar8->current.pos.y + m35CC; } } -LAB_8013af64: - return; } /* 8013AF84-8013B05C .text freeGrabItem__9daPy_lk_cFv */ @@ -212,7 +209,6 @@ void daPy_lk_c::freeGrabItem() { m35CC = 0.0f; offNoResetFlg0(daPyFlg0_UNK400); dComIfGp_clearPlayerStatus1(0, daPyStts1_UNK40000_e); - return; } /* 8013B05C-8013B458 .text checkNextActionGrab__9daPy_lk_cFv */ @@ -222,76 +218,75 @@ BOOL daPy_lk_c::checkNextActionGrab() { if (pfVar7 == NULL) { return false; + } + + int iVar3 = checkGrabBarrelSearch(0); + if (fopAcM_CheckStatus(pfVar7, fopAcStts_UNK10000_e) && !checkGrabSpecialHeavyState()) { + g_dComIfG_gameInfo.play.field_0x492d = 14; + dComIfGp_setDoStatus(14); } else { - int iVar3 = checkGrabBarrelSearch(0); - if (fopAcM_CheckStatus(pfVar7, fopAcStts_UNK10000_e) && !checkGrabSpecialHeavyState()) { - g_dComIfG_gameInfo.play.field_0x492d = 14; - dComIfGp_setDoStatus(14); - } else { - g_dComIfG_gameInfo.play.field_0x492d = 9; - } - if (mpAttnActorLockOn == NULL && mpAttnEntryA != NULL && iVar3 == 0 && - mpAttnEntryA->mType == fopAc_Attn_TYPE_DOOR_e && fopAcM_CheckStatus(pfVar7, fopAcStts_UNK2000000_e)) - { - dComIfGp_setDoStatus(11); - } else if (iVar3 != 0) { - dComIfGp_setDoStatus(9); - } else { - if (mpAttention->Lockon()) { - int iVar4 = getDirectionFromShapeAngle(); - if ((mStickDistance <= 0.05f) || (mStickDistance > 0.05f && (iVar4 == 0 || (iVar4 == 1)))) { - dComIfGp_setDoStatus(14); - } - } else { + g_dComIfG_gameInfo.play.field_0x492d = 9; + } + if (mpAttnActorLockOn == NULL && mpAttnEntryA != NULL && iVar3 == 0 && + mpAttnEntryA->mType == fopAc_Attn_TYPE_DOOR_e && fopAcM_CheckStatus(pfVar7, fopAcStts_UNK2000000_e)) + { + dComIfGp_setDoStatus(11); + } else if (iVar3 != 0) { + dComIfGp_setDoStatus(9); + } else { + if (mpAttention->Lockon()) { + int iVar4 = getDirectionFromShapeAngle(); + if ((mStickDistance <= 0.05f) || (mStickDistance > 0.05f && (iVar4 == 0 || (iVar4 == 1)))) { dComIfGp_setDoStatus(14); } + } else { + dComIfGp_setDoStatus(14); } - if ((setHintActor()) && (doTrigger())) { - fopAcM_orderZHintEvent(this, dComIfGp_att_getZHint()); + } + if ((setHintActor()) && (doTrigger())) { + fopAcM_orderZHintEvent(this, dComIfGp_att_getZHint()); + return true; + } else { + if ((checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 1)) || + (checkNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD) && (checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 0)))) + { + changeDragonShield(1); return true; } else { - if ((checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 1)) || - (checkNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD) && (checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 0)))) + if ((checkSetItemTrigger(dItem_IRON_BOOTS_e, 1)) || + (checkNoResetFlg0(daPyFlg0_EQUIP_HEAVY_BOOTS) && (checkSetItemTrigger(dItem_IRON_BOOTS_e, 0)))) { - changeDragonShield(1); - return true; - } else { - if ((checkSetItemTrigger(dItem_IRON_BOOTS_e, 1)) || - (checkNoResetFlg0(daPyFlg0_EQUIP_HEAVY_BOOTS) && (checkSetItemTrigger(dItem_IRON_BOOTS_e, 0)))) - { - procBootsEquip_init(dItem_IRON_BOOTS_e); - } else if ((fopAcM_GetName(pfVar7) == PROC_BOMB) && (checkSetItemTrigger(dItem_BOMB_BAG_e, 0))) { - procGrabThrow_init(0); - } else if ((cancelTrigger()) && (checkSwordEquip()) && (iVar3 == 0)) { - if (g_dComIfG_gameInfo.play.field_0x492d == 14) { - procGrabThrow_init(1); - } else { - freeGrabItem(); - setAnimeEquipSword(0); - return true; - } - } else if (((!doTrigger()) || (checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000))) - ) || - (dComIfGp_getDoStatus() == 11)) - { - fopAcM_orderDoorEvent(this, mpAttnActorA); - return true; - } else if (((!doTrigger()) || (dComIfGp_getDoStatus() != 14)) && - (g_dComIfG_gameInfo.play.field_0x492d != 14 || - ((mItemTrigger & 0x1f) == 0 && (spActionTrigger())))) - { - if (cancelTrigger()) { - procGrabThrow_init(1); - } else { - procGrabThrow_init(0); - } - } else if ((((mItemTrigger & 0x1f) != 0) || (spActionTrigger())) && - (!doTrigger() || (dComIfGp_getDoStatus() != 0))) - { - procGrabPut_init(); + procBootsEquip_init(dItem_IRON_BOOTS_e); + } else if ((fopAcM_GetName(pfVar7) == PROC_BOMB) && (checkSetItemTrigger(dItem_BOMB_BAG_e, 0))) { + procGrabThrow_init(0); + } else if ((cancelTrigger()) && (checkSwordEquip()) && (iVar3 == 0)) { + if (g_dComIfG_gameInfo.play.field_0x492d == 14) { + procGrabThrow_init(1); } else { - return false; + freeGrabItem(); + setAnimeEquipSword(0); + return true; } + } else if (((!doTrigger()) || (checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000)))) || + (dComIfGp_getDoStatus() == 11)) + { + fopAcM_orderDoorEvent(this, mpAttnActorA); + return true; + } else if (((!doTrigger()) || (dComIfGp_getDoStatus() != 14)) && + (g_dComIfG_gameInfo.play.field_0x492d != 14 || + ((mItemTrigger & 0x1f) == 0 && (spActionTrigger())))) + { + if (cancelTrigger()) { + procGrabThrow_init(1); + } else { + procGrabThrow_init(0); + } + } else if ((((mItemTrigger & 0x1f) != 0) || (spActionTrigger())) && + (!doTrigger() || (dComIfGp_getDoStatus() != 0))) + { + procGrabPut_init(); + } else { + return false; } } } @@ -316,7 +311,6 @@ void daPy_lk_c::initGrabNextMode() { m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f); checkNextMode(0); } - return; } /* 8013B56C-8013B6F4 .text procGrabReady_init__9daPy_lk_cFv */ @@ -900,16 +894,15 @@ BOOL daPy_lk_c::procGrabRebound() { if (pfVar2 == NULL) { resetActAnimeUpper(UPPER_MOVE2_e, -1.0f); return checkNextMode(0); - } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { - initGrabNextMode(); - } else { - if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_grab_c0::m.field_0x9C) && - (fopAcM_CheckStatus(pfVar2, fopAcStts_UNK10000_e))) - { - initGrabNextMode(); - } - } - return true; } + if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { + initGrabNextMode(); + } else { + if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_grab_c0::m.field_0x9C) && + (fopAcM_CheckStatus(pfVar2, fopAcStts_UNK10000_e))) + { + initGrabNextMode(); + } + } + return true; } diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc index a4fc98e42..9756a05bf 100644 --- a/src/d/actor/d_a_player_hammer.inc +++ b/src/d/actor/d_a_player_hammer.inc @@ -217,11 +217,9 @@ BOOL daPy_lk_c::procHammerFrontSwingEnd_init() { BOOL daPy_lk_c::procHammerFrontSwingEnd() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { return checkNextMode(0); + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_ham_c0::m.field_0x3C) { + return checkNextMode(1); } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_ham_c0::m.field_0x3C) { - return checkNextMode(1); - } else { - return true; - } + return true; } } diff --git a/src/d/actor/d_a_player_hang.inc b/src/d/actor/d_a_player_hang.inc index 2b0209371..fb7b90b16 100644 --- a/src/d/actor/d_a_player_hang.inc +++ b/src/d/actor/d_a_player_hang.inc @@ -48,58 +48,58 @@ BOOL daPy_lk_c::changeHangMoveProc(int i_direction) { } if (triPla = dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd), triPla->GetNP()->y < 0.9986f) { return false; + } + + if (i_direction == 2) { + uVar1 = shape_angle.y + 0x4000; + } else if (i_direction == 3) { + uVar1 = shape_angle.y + -0x4000; } else { - if (i_direction == 2) { - uVar1 = shape_angle.y + 0x4000; - } else if (i_direction == 3) { - uVar1 = shape_angle.y + -0x4000; - } else { - uVar1 = current.angle.y; - } - cXyz local_28; - cXyz local_34; - local_28.x = current.pos.x; - local_28.y = 5.0f + current.pos.y; - local_28.z = current.pos.z; - local_34.x = local_28.x + 30.0f * cM_ssin(uVar1); - local_34.y = local_28.y; - local_34.z = local_28.z + 30.0f * cM_scos(uVar1); - mLinkLinChk.Set(&local_28, &local_34, this); - if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { + uVar1 = current.angle.y; + } + cXyz local_28; + cXyz local_34; + local_28.x = current.pos.x; + local_28.y = 5.0f + current.pos.y; + local_28.z = current.pos.z; + local_34.x = local_28.x + 30.0f * cM_ssin(uVar1); + local_34.y = local_28.y; + local_34.z = local_28.z + 30.0f * cM_scos(uVar1); + mLinkLinChk.Set(&local_28, &local_34, this); + if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { + return false; + } + + mGndChk.SetPos(&local_34); + if (std::fabsf(dComIfG_Bgsp()->GroundCross(&mGndChk) - current.pos.y) > 5.0f) { + cXyz local_40; + cXyz local_4c; + local_40.x = local_34.x; + local_40.y = current.pos.y - 5.0f; + local_40.z = local_34.z; + local_4c.x = local_34.x + 90.0f * cM_ssin(shape_angle.y); + local_4c.y = local_40.y; + local_4c.z = local_34.z + 90.0f * cM_scos(shape_angle.y); + mLinkLinChk.Set(&local_40, &local_4c, this); + if (!dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { + return false; + } + triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk); + if (cLib_distanceAngleS(cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z), shape_angle.y) < 0x549f) { + return false; + } + } + cXyz local_58; + local_58.x = cM_ssin(shape_angle.y) * 4.5f; + local_58.y = 62.5f; + local_58.z = cM_scos(shape_angle.y) * 4.5f; + VECSubtract(&local_28, &local_58, &local_28); + VECSubtract(&local_34, &local_58, &local_34); + mLinkLinChk.Set(&local_28, &local_34, this); + if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { + triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk); + if (cLib_distanceAngleS(cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z), shape_angle.y) < 0x549f) { return false; - } else { - mGndChk.SetPos(&local_34); - if (std::fabsf(dComIfG_Bgsp()->GroundCross(&mGndChk) - current.pos.y) > 5.0f) { - cXyz local_40; - cXyz local_4c; - local_40.x = local_34.x; - local_40.y = current.pos.y - 5.0f; - local_40.z = local_34.z; - local_4c.x = local_34.x + 90.0f * cM_ssin(shape_angle.y); - local_4c.y = local_40.y; - local_4c.z = local_34.z + 90.0f * cM_scos(shape_angle.y); - mLinkLinChk.Set(&local_40, &local_4c, this); - if (!dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { - return false; - } - triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk); - if (cLib_distanceAngleS(cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z), shape_angle.y) < 0x549f) { - return false; - } - } - cXyz local_58; - local_58.x = cM_ssin(shape_angle.y) * 4.5f; - local_58.y = 62.5f; - local_58.z = cM_scos(shape_angle.y) * 4.5f; - VECSubtract(&local_28, &local_58, &local_28); - VECSubtract(&local_34, &local_58, &local_34); - mLinkLinChk.Set(&local_28, &local_34, this); - if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { - triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk); - if (cLib_distanceAngleS(cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z), shape_angle.y) < 0x549f) { - return false; - } - } } } return true; @@ -167,7 +167,6 @@ void daPy_lk_c::setHangShapeOffset() { local_58 -= mLinkLinChk.GetCross(); m34EC = (cM_atan2s(local_58.x, local_58.z) - 0x4000 - shape_angle.y); } - return; } /* 80134630-80134908 .text procHangStart_init__9daPy_lk_cFv */ diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index 59551f326..7e4c25bff 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -31,15 +31,14 @@ BOOL daPy_lk_c::checkHookshotReturn() { BOOL daPy_lk_c::setHookshotCarryOffset(fpc_ProcID param_0, const cXyz* param_1) { daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); - if ((mEquipItem != dItem_HOOKSHOT_e) || (hookshot == NULL)) { + if (mEquipItem != dItem_HOOKSHOT_e || hookshot == NULL) { return false; - } else { - if (param_0 != hookshot->mCarryActorID) { - return false; - } - hookshot->m50C = *param_1; - return true; } + if (param_0 != hookshot->mCarryActorID) { + return false; + } + hookshot->m50C = *param_1; + return true; } /* 8014ABF4-8014ACCC .text setHookshotModel__9daPy_lk_cFv */ @@ -122,7 +121,6 @@ void daPy_lk_c::freeHookshotItem() { return; } fopAcM_SetParam(hookshot, 2); - return; } /* 8014B05C-8014B2B8 .text checkNextActionHookshotReady__9daPy_lk_cFv */ @@ -194,7 +192,6 @@ BOOL daPy_lk_c::checkNextHookshotMode() { } else { procHookshotSubject_init(); } - return; } /* 8014B350-8014B3F4 .text procHookshotSubject_init__9daPy_lk_cFv */ @@ -251,22 +248,22 @@ BOOL daPy_lk_c::procHookshotSubject() { BOOL daPy_lk_c::procHookshotMove_init() { if (mCurProc == daPyProc_HOOKSHOT_MOVE_e) { return false; - } else { - commonProcInit(daPyProc_HOOKSHOT_MOVE_e); - if (m34B8 == 3) { - current.angle.y = shape_angle.y + -0x4000; - } else { - m34B8 = 2; - current.angle.y = shape_angle.y + 0x4000; - } - daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); - if (fopAcM_GetParam(hookshot) == 0) { - setActAnimeUpper(LKANM_BCK_HOOKSHOTWAIT, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); - setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); - } - dComIfGp_setPlayerStatus0(0, daPyStts0_HOOKSHOT_AIM_e); - return true; } + + commonProcInit(daPyProc_HOOKSHOT_MOVE_e); + if (m34B8 == 3) { + current.angle.y = shape_angle.y + -0x4000; + } else { + m34B8 = 2; + current.angle.y = shape_angle.y + 0x4000; + } + daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); + if (fopAcM_GetParam(hookshot) == 0) { + setActAnimeUpper(LKANM_BCK_HOOKSHOTWAIT, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); + setBlendAtnMoveAnime(daPy_HIO_basic_c0::m.field_0xC); + } + dComIfGp_setPlayerStatus0(0, daPyStts0_HOOKSHOT_AIM_e); + return true; } /* 8014B5E8-8014B74C .text procHookshotMove__9daPy_lk_cFv */ @@ -334,39 +331,39 @@ BOOL daPy_lk_c::procHookshotFly() { if (!checkItemModeActorPointer()) { voiceStart(10); return true; - } else { - daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); - if (fopAcM_GetParam(hookshot) != 3) { - if ((hookshot->m2A2 != 0) && (procShipJumpRide_init())) { - return true; - } - if ((!mAcch.ChkGroundHit()) && (changeFrontWallTypeProc())) { - voiceStart(10); - return true; - } else { - mLinkLinChk.Set(&m370C, ¤t.pos, this); - if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { - current.pos = mLinkLinChk.GetCross(); - } - current.pos.x = hookshot->current.pos.x - 35.0f * cM_ssin(shape_angle.y); - current.pos.z = hookshot->current.pos.z - 35.0f * cM_scos(shape_angle.y); - m3688 = current.pos; - m35F0 = m3688.y; - m35F4 = m3688.y; - if (mAcch.ChkGroundHit()) { - checkNextMode(0); - } else { - procFall_init(1, 0.0f); - } - voiceStart(10); - } - } else { - shape_angle.x = hookshot->shape_angle.x; - shape_angle.y = hookshot->shape_angle.y; - current.angle.y = shape_angle.y; - current.pos += hookshot->getMoveVec(); - m370C = old.pos; + } + + daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); + if (fopAcM_GetParam(hookshot) != 3) { + if ((hookshot->m2A2 != 0) && (procShipJumpRide_init())) { + return true; } + if ((!mAcch.ChkGroundHit()) && (changeFrontWallTypeProc())) { + voiceStart(10); + return true; + } + + mLinkLinChk.Set(&m370C, ¤t.pos, this); + if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { + current.pos = mLinkLinChk.GetCross(); + } + current.pos.x = hookshot->current.pos.x - 35.0f * cM_ssin(shape_angle.y); + current.pos.z = hookshot->current.pos.z - 35.0f * cM_scos(shape_angle.y); + m3688 = current.pos; + m35F0 = m3688.y; + m35F4 = m3688.y; + if (mAcch.ChkGroundHit()) { + checkNextMode(0); + } else { + procFall_init(1, 0.0f); + } + voiceStart(10); + } else { + shape_angle.x = hookshot->shape_angle.x; + shape_angle.y = hookshot->shape_angle.y; + current.angle.y = shape_angle.y; + current.pos += hookshot->getMoveVec(); + m370C = old.pos; } return true; } diff --git a/src/d/actor/d_a_player_ladder.inc b/src/d/actor/d_a_player_ladder.inc index bbe8d2587..364d39a25 100644 --- a/src/d/actor/d_a_player_ladder.inc +++ b/src/d/actor/d_a_player_ladder.inc @@ -21,7 +21,6 @@ f32 daPy_lk_c::getLadderMoveAnmSpeed() { /* 80132F58-80133058 .text setLadderFootSe__9daPy_lk_cFv */ void daPy_lk_c::setLadderFootSe() { - /* Nonmatching - floats */ cXyz local_28( current.pos.x + cM_ssin(shape_angle.y) * 50.0f, current.pos.y, current.pos.z + cM_scos(shape_angle.y) * 50.0f ); @@ -32,12 +31,10 @@ void daPy_lk_c::setLadderFootSe() { } else { seStartOnlyReverb(JA_SE_FT_LADDER_CLIMB_D); } - return; } /* 80133058-80133240 .text changeLadderMoveProc__9daPy_lk_cFi */ int daPy_lk_c::changeLadderMoveProc(int param_0) { - /* Nonmatching - floats */ cXyz local_2c; cXyz local_38; BOOL iVar5; @@ -63,7 +60,7 @@ int daPy_lk_c::changeLadderMoveProc(int param_0) { local_38.z = local_2c.z + cM_scos(shape_angle.y) * 50.0f; local_38.y = local_2c.y; mLinkLinChk.Set(&local_2c, &local_38, this); - if ((!dComIfG_Bgsp()->LineCross(&mLinkLinChk)) || (dComIfG_Bgsp()->GetWallCode(mLinkLinChk) != 4)) { + if (!dComIfG_Bgsp()->LineCross(&mLinkLinChk) || dComIfG_Bgsp()->GetWallCode(mLinkLinChk) != 4) { if (iVar2 < 0x4000) { procLadderUpEnd_init(param_0); } else { @@ -78,7 +75,6 @@ int daPy_lk_c::changeLadderMoveProc(int param_0) { /* 80133240-801333A8 .text setMoveBGLadderCorrect__9daPy_lk_cFv */ int daPy_lk_c::setMoveBGLadderCorrect() { - /* Nonmatching - floats */ if (dComIfG_Bgsp()->ChkPolySafe(mPolyInfo)) { if (dComIfG_Bgsp()->ChkMoveBG(mPolyInfo)) { dComIfG_Bgsp()->MoveBgTransPos(mPolyInfo, true, ¤t.pos, ¤t.angle, &shape_angle); @@ -101,12 +97,10 @@ void daPy_lk_c::procLadderUpStart_init_sub() { m3570 = 1; m34C2 = 4; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000000_e); - return; } /* 80133414-8013356C .text procLadderUpStart_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procLadderUpStart_init() { - /* Nonmatching - floats */ commonProcInit(daPyProc_LADDER_UP_START_e); gravity = 0.0f; speed.y = 0.0f; @@ -139,33 +133,32 @@ BOOL daPy_lk_c::procLadderUpStart_init() { /* 8013356C-80133670 .text procLadderUpStart__9daPy_lk_cFv */ BOOL daPy_lk_c::procLadderUpStart() { - /* Nonmatching - floats */ if (setMoveBGLadderCorrect()) { return true; + } + + if (m3570 == 0) { + if (m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff) { + procLadderUpStart_init_sub(); + } } else { - if (m3570 == 0) { - if (m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff) { - procLadderUpStart_init_sub(); + J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; + m34C2 = 5; + if (frameCtrl.getRate() < 0.01f) { + dComIfGp_setDoStatus(6); + if (m34D4 == 0) { + setLadderFootSe(); + m34D4 = 1; + } + if (doTrigger()) { + m34C2 = 0; + procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + } else { + changeLadderMoveProc(1); } } else { - J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; - m34C2 = 5; - if (frameCtrl.getRate() < 0.01f) { - dComIfGp_setDoStatus(6); - if (m34D4 == 0) { - setLadderFootSe(); - m34D4 = 1; - } - if (doTrigger()) { - m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); - } else { - changeLadderMoveProc(1); - } - } else { - if (frameCtrl.checkPass(9.0f)) { - setLadderFootSe(); - } + if (frameCtrl.checkPass(9.0f)) { + setLadderFootSe(); } } } @@ -194,20 +187,19 @@ BOOL daPy_lk_c::procLadderUpEnd_init(int param_0) { /* 80133710-801337B4 .text procLadderUpEnd__9daPy_lk_cFv */ BOOL daPy_lk_c::procLadderUpEnd() { - /* Nonmatching - floats */ J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; if (setMoveBGLadderCorrect()) { return true; + } + + if (frameCtrl.getRate() < 0.01f) { + checkNextMode(0); } else { - if (frameCtrl.getRate() < 0.01f) { - checkNextMode(0); - } else { - if (frameCtrl.checkPass(9.0f) || frameCtrl.checkPass(19.0f)) { - setLadderFootSe(); - } - m34C2 = 5; + if (frameCtrl.checkPass(9.0f) || frameCtrl.checkPass(19.0f)) { + setLadderFootSe(); } + m34C2 = 5; } return true; } @@ -221,12 +213,10 @@ void daPy_lk_c::procLadderDownStart_init_sub() { setOldRootQuaternion(0, -0x8000, 0); shape_angle.y += 0x8000; current.angle.y = shape_angle.y; - return; } /* 8013384C-8013399C .text procLadderDownStart_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procLadderDownStart_init() { - /* Nonmatching - floats */ commonProcInit(daPyProc_LADDER_DOWN_START_e); gravity = 0.0f; speed.y = 0.0f; @@ -258,29 +248,28 @@ BOOL daPy_lk_c::procLadderDownStart_init() { /* 8013399C-80133AB8 .text procLadderDownStart__9daPy_lk_cFv */ BOOL daPy_lk_c::procLadderDownStart() { - /* Nonmatching - floats */ if (setMoveBGLadderCorrect()) { return true; + } + + if (m3570 == 0) { + if (m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff) { + procLadderDownStart_init_sub(); + } } else { - if (m3570 == 0) { - if (m_anm_heap_upper[UPPER_MOVE2_e].mIdx == 0xffff) { - procLadderDownStart_init_sub(); + J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; + m34C2 = 5; + if (frameCtrl.getRate() < 0.01f) { + dComIfGp_setDoStatus(6); + if (doTrigger()) { + m34C2 = 0; + procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + } else { + changeLadderMoveProc(1); } } else { - J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; - m34C2 = 5; - if (frameCtrl.getRate() < 0.01f) { - dComIfGp_setDoStatus(6); - if (doTrigger()) { - m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); - } else { - changeLadderMoveProc(1); - } - } else { - if ((frameCtrl.checkPass(26.0f) || frameCtrl.checkPass(36.0f)) || frameCtrl.checkPass(43.0f)) { - setLadderFootSe(); - } + if (frameCtrl.checkPass(26.0f) || frameCtrl.checkPass(36.0f) || frameCtrl.checkPass(43.0f)) { + setLadderFootSe(); } } } @@ -289,15 +278,14 @@ BOOL daPy_lk_c::procLadderDownStart() { /* 80133AB8-80133B4C .text procLadderDownEnd_init__9daPy_lk_cFi */ BOOL daPy_lk_c::procLadderDownEnd_init(int param_0) { - daPy_ANM dVar1; - commonProcInit(daPyProc_LADDER_DOWN_END_e); + daPy_ANM anm; if (param_0 != 0) { - dVar1 = ANM_LADDERDWEDL; + anm = ANM_LADDERDWEDL; } else { - dVar1 = ANM_LADDERDWEDR; + anm = ANM_LADDERDWEDR; } - setSingleMoveAnime(dVar1, daPy_HIO_ladder_c0::m.field_0x1C, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x20); + setSingleMoveAnime(anm, daPy_HIO_ladder_c0::m.field_0x1C, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x20); m34C2 = 7; gravity = 0.0f; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000000_e); @@ -308,21 +296,19 @@ BOOL daPy_lk_c::procLadderDownEnd_init(int param_0) { BOOL daPy_lk_c::procLadderDownEnd() { if (setMoveBGLadderCorrect()) { return true; + } + + if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { + checkNextMode(0); } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { - checkNextMode(0); - } else { - m34C2 = 5; - } + m34C2 = 5; } return true; } /* 80133BB4-80133E28 .text procLadderMove_init__9daPy_lk_cFiiP4cXyz */ BOOL daPy_lk_c::procLadderMove_init(int param_0, int param_1, cXyz* param_2) { - /* Nonmatching - floats */ - daPy_ANM dVar2; - int uVar3 = checkModeFlg(2) ? true : false; + int uVar3 = checkModeFlg(ModeFlg_MIDAIR) ? true : false; float dVar4 = getLadderMoveAnmSpeed(); commonProcInit(daPyProc_LADDER_MOVE_e); @@ -338,6 +324,8 @@ BOOL daPy_lk_c::procLadderMove_init(int param_0, int param_1, cXyz* param_2) { } m370C.x = param_2->x; m370C.z = param_2->z; + + daPy_ANM anm; if (param_0 != 0) { if (uVar3 != 0) { m3570 = 1; @@ -347,21 +335,22 @@ BOOL daPy_lk_c::procLadderMove_init(int param_0, int param_1, cXyz* param_2) { m370C.z = m370C.z - -2.0f * cM_ssin(shape_angle.y); } if (dVar4 >= 0.0f) { - dVar2 = ANM_LADDERLTOR; + anm = ANM_LADDERLTOR; } else { - dVar2 = ANM_LADDERRTOL; + anm = ANM_LADDERRTOL; } } else { m3570 = 1; if (dVar4 >= 0.0f) { - dVar2 = ANM_LADDERRTOL; + anm = ANM_LADDERRTOL; } else { - dVar2 = ANM_LADDERLTOR; + anm = ANM_LADDERLTOR; } m370C.x = m370C.x + 2.0f * cM_scos(shape_angle.y); m370C.z = m370C.z + -2.0f * cM_ssin(shape_angle.y); } - setSingleMoveAnime(dVar2, dVar4, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x2C); + + setSingleMoveAnime(anm, dVar4, 0.0f, -1, daPy_HIO_ladder_c0::m.field_0x2C); m34B8 = param_1; if (param_1 == 0) { setTextureAnime(10, 0); @@ -382,28 +371,27 @@ BOOL daPy_lk_c::procLadderMove_init(int param_0, int param_1, cXyz* param_2) { BOOL daPy_lk_c::procLadderMove() { if (setMoveBGLadderCorrect()) { return true; - } else { - m34C2 = 5; - dComIfGp_setDoStatus(6); - if (doTrigger()) { - m34C2 = 0; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); - } else { - if (std::fabsf(mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) < 0.01f) { - if ((int)m34D0 > 0) { - m34D0--; - setLadderFootSe(); - } else { - changeLadderMoveProc(m3570); - } - } else { - f32 dVar2 = getLadderMoveAnmSpeed(); - if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.0f) { - dVar2 *= -1.0f; - } - mFrameCtrlUnder[UNDER_MOVE0_e].setRate(dVar2); - } - } } + m34C2 = 5; + dComIfGp_setDoStatus(6); + + if (doTrigger()) { + m34C2 = 0; + procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + } else if (std::fabsf(mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) < 0.01f) { + if ((int)m34D0 > 0) { + m34D0--; + setLadderFootSe(); + } else { + changeLadderMoveProc(m3570); + } + } else { + f32 dVar2 = getLadderMoveAnmSpeed(); + if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.0f) { + dVar2 *= -1.0f; + } + mFrameCtrlUnder[UNDER_MOVE0_e].setRate(dVar2); + } + return true; } diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc index 61250d925..874840a3e 100644 --- a/src/d/actor/d_a_player_ship.inc +++ b/src/d/actor/d_a_player_ship.inc @@ -113,7 +113,6 @@ void daPy_lk_c::setShipRidePosUseItem() { shape_angle.y += -0x4000; current.angle.y = shape_angle.y; } - return; } /* 80140018-801403E0 .text setShipRidePos__9daPy_lk_cFi */ @@ -192,7 +191,6 @@ void daPy_lk_c::setShipRidePos(int param_0) { cLib_addCalcAngleS(&mBodyAngle.y, sVar4, 4, 0x400, 0x80); } } - return; } /* 801403E0-80140480 .text setShipAttentionAnmSpeed__9daPy_lk_cFf */ @@ -206,7 +204,6 @@ void daPy_lk_c::setShipAttentionAnmSpeed(f32 param_0) { mFrameCtrlUpper[UPPER_MOVE2_e].setRate(0.0f); mFrameCtrlUpper[UPPER_MOVE2_e].setFrame(0.0f); } - return; } /* 80140480-801405F0 .text setShipAttnetionBodyAngle__9daPy_lk_cFv */ @@ -248,7 +245,6 @@ void daPy_lk_c::setShipAttnetionBodyAngle() { shape_angle.y = shape_angle.y + m34DA; } current.angle.y = shape_angle.y; - return; } /* 801405F0-80140C88 .text changeShipEndProc__9daPy_lk_cFv */ @@ -263,7 +259,6 @@ void daPy_lk_c::initShipBaseAnime() { } setActAnimeUpper(LKANM_BCK_FN_HAIR1, UPPER_MOVE2_e, 1.0f, 0.0f, -1, -1.0f); m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f); - return; } /* 80140D04-80140D80 .text initShipCraneAnime__9daPy_lk_cFv */ @@ -282,7 +277,6 @@ void daPy_lk_c::initShipCraneAnime() { daPy_matAnm_c::m_maba_flg = 0; daPy_matAnm_c::m_maba_timer = 1; setSingleMoveAnime(dVar1, 1.0f, 0.0f, -1, 10.0f); - return; } /* 80140D80-80140EF0 .text procShipReady_init__9daPy_lk_cFv */ diff --git a/src/d/actor/d_a_player_whide.inc b/src/d/actor/d_a_player_whide.inc index 589b10e02..09e553cb8 100644 --- a/src/d/actor/d_a_player_whide.inc +++ b/src/d/actor/d_a_player_whide.inc @@ -70,7 +70,6 @@ void daPy_lk_c::setBlendWHideMoveAnime(f32 param_0) { mFrameCtrlUnder[UNDER_MOVE1_e].setFrame(mFrameCtrlUnder[UNDER_MOVE1_e].getEnd() - 0.001f); mFrameCtrlUnder[UNDER_MOVE1_e].setRate(0.0f); mAnmRatioUnder[UNDER_MOVE1_e].getAnmTransform()->setFrame(mFrameCtrlUnder[UNDER_MOVE1_e].getFrame()); - return; } /* 801371E0-80137608 .text getWHideModePolygon__9daPy_lk_cFP4cXyzP4cXyzP4cXyzi */ @@ -183,7 +182,6 @@ void daPy_lk_c::getWHideBasePos(cXyz* param_0) { fVar3 = 125.0f; } param_0->set(current.pos.x, current.pos.y + fVar3, current.pos.z); - return; } /* 80137640-8013769C .text getWHideNextPos__9daPy_lk_cFP4cXyzP4cXyz */ @@ -193,7 +191,6 @@ void daPy_lk_c::getWHideNextPos(cXyz* param_0, cXyz* param_1) { param_0->y, param_0->z + cM_scos(current.angle.y) * daPy_HIO_wall_c0::m.field_0x54 ); - return; } /* 8013769C-80137754 .text checkWHideBackWall__9daPy_lk_cFP4cXyz */ diff --git a/src/d/actor/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp index 45097202b..3c69b8232 100644 --- a/src/d/actor/d_a_shutter2.cpp +++ b/src/d/actor/d_a_shutter2.cpp @@ -89,7 +89,6 @@ void daShutter2_c::set_mtx() { mDoMtx_stack_c::YrotM(current.angle.y); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mMtx); - return; } /* 000004AC-00000528 .text Execute__12daShutter2_cFPPA3_A4_f */ @@ -156,7 +155,6 @@ void daShutter2_c::shutter_move() { dComIfGp_evmng_cutEnd(mStaffId); break; } - return; } /* 00000698-000008B0 .text demo__12daShutter2_cFv */ @@ -204,7 +202,6 @@ void daShutter2_c::demo() { fopAcM_orderOtherEventId(this, mCloseEventIdx); eventInfo.onCondition(dEvtCnd_UNK2_e); } - return; } /* 000008B0-00000950 .text Draw__12daShutter2_cFv */ diff --git a/src/d/actor/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp index 7cfc12c26..dafeb5aed 100644 --- a/src/d/actor/d_a_steam_tag.cpp +++ b/src/d/actor/d_a_steam_tag.cpp @@ -196,7 +196,6 @@ daSteamTag_c::~daSteamTag_c() { mpEmitter = NULL; } mPointWind.set_pwind_delete(); - return; } cPhs_State daSteamTag_c::create() { diff --git a/src/d/actor/d_a_tag_etc.cpp b/src/d/actor/d_a_tag_etc.cpp index 220d03582..6ded4be19 100644 --- a/src/d/actor/d_a_tag_etc.cpp +++ b/src/d/actor/d_a_tag_etc.cpp @@ -95,7 +95,6 @@ void daTag_Etc_c::demoInitProc() { field_0x29A = 15; break; } - return; } /* 00000368-00000458 .text create__11daTag_Etc_cFv */ diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index 84899acea..3ec0792c7 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -51,7 +51,6 @@ daTori_Flag_HIO_c::daTori_Flag_HIO_c() { mNo = -1; m08 = 0.0f; m0C = 0; - return; } static daTori_Flag_HIO_c l_HIO; @@ -68,7 +67,6 @@ void daTori_Flag_c::set_mtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::transM(l_flag_offset); mpCloth->setMtx(mDoMtx_stack_c::get()); - return; } /* 000001C4-000001E4 .text CheckCreateHeap__FP10fopAc_ac_c */ diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index be9060a2d..65a677f9b 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -177,8 +177,6 @@ void dComIfG_play_c::itemInit() { for (int i = 0; i < ARRAY_SIZE(field_0x4988); i++) { field_0x4988[i] = 0; } - - return; } /* 80052400-8005286C .text getLayerNo__14dComIfG_play_cFi */