diff options
Diffstat (limited to 'src/d/actor/d_a_bk.cpp')
| -rw-r--r-- | src/d/actor/d_a_bk.cpp | 180 |
1 files changed, 90 insertions, 90 deletions
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index b031e6e3..cf9e74ae 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -924,11 +924,11 @@ static BOOL daBk_player_way_check(bk_class* i_this) { /* 00003A5C-00003B2C .text wait_set__FP8bk_class */ static void wait_set(bk_class* i_this) { if (i_this->m0B30 != 0 || i_this->m11F3 != 0) { - anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_KYORO1); + anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1); } else if (i_this->dr.mState >= 4) { - anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_KYORO1); + anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1); } else { - anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2); } i_this->m0300[1] = 40.0f + cM_rndF(60.0f); } @@ -936,11 +936,11 @@ static void wait_set(bk_class* i_this) { /* 00003B2C-00003C34 .text walk_set__FP8bk_class */ static void walk_set(bk_class* i_this) { if (i_this->m0B30 != 0 || i_this->m1214 != 0) { - anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK); + anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK); } else if (i_this->m11F3 == 0) { - anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_NIGERU); + anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU); } else { - anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK); + anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK); } if (i_this->m0B30 == 0 && i_this->m121F != 0) { fopAcM_monsSeStart(i_this, JA_SE_CV_BK_LOST_BOKO, 0); @@ -950,7 +950,7 @@ static void walk_set(bk_class* i_this) { /* 00003C34-00003C74 .text fight_run_set__FP8bk_class */ static void fight_run_set(bk_class* i_this) { - anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_bkHIO.m070, BK_BAS_BK_RUN); + anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN); } /* 00003C74-00004104 .text path_check__FP8bk_classUc */ @@ -1202,7 +1202,7 @@ static void stand(bk_class* i_this) { switch (i_this->dr.m004) { case -20: fopAcM_OnStatus(i_this, fopAcStts_UNK4000_e); - anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WAIT); + anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WAIT); i_this->dr.m004 = -19; i_this->m0300[1] = 20; i_this->m02B5 = 0; @@ -1230,14 +1230,14 @@ static void stand(bk_class* i_this) { i_this->dr.m004 = 1; if (i_this->m02DC != 0) { if (cM_rndF(1.0f) < 0.5f) { - anm_init(i_this, BK_BCK_BK_NOZOKU, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_NOZOKU, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m0300[1] = 200.0f + cM_rndF(200.0f); } else { - anm_init(i_this, BK_BCK_BK_TATAKU, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_TATAKU, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m0300[1] = 100.0f + cM_rndF(100.0f); } } else { - anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WAIT); + anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WAIT); } i_this->m121E++; // Fall-through @@ -1247,7 +1247,7 @@ static void stand(bk_class* i_this) { cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->home.angle.y, 2, 0x800); i_this->speedF = 0.0f; if (i_this->m0300[1] == 0) { - anm_init(i_this, BK_BCK_BK_NOBI, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_NOBI); + anm_init(i_this, BK_BCK_BK_NOBI, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_NOBI); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_NOBI, 0); if (i_this->m121E < 3) { i_this->dr.m004 = 2; @@ -1268,7 +1268,7 @@ static void stand(bk_class* i_this) { r28 = true; i_this->m02CA = 2; if (i_this->mpMorf->isStop()) { - anm_init(i_this, BK_BCK_BK_SLEEP, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_SLEEP); + anm_init(i_this, BK_BCK_BK_SLEEP, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_SLEEP); i_this->m0300[1] = l_bkHIO.m108 + cM_rndF(l_bkHIO.m10A - l_bkHIO.m108); i_this->dr.m004 += 1; } @@ -1277,17 +1277,17 @@ static void stand(bk_class* i_this) { r28 = true; i_this->m02CA = 2; if (i_this->m0300[1] == 0) { - anm_init(i_this, BK_BCK_BK_NOBI, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_NOBI); + anm_init(i_this, BK_BCK_BK_NOBI, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_NOBI); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_NOBI, 0); i_this->dr.m004 = 2; } break; case 10: if (i_this->m0300[1] == 30) { - anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } if (i_this->m0300[1] == 0) { - anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2); i_this->dr.m004 = 11; i_this->m0300[3] = 30.0f + cM_rndF(30.0f); } @@ -1309,7 +1309,7 @@ static void stand(bk_class* i_this) { } break; case 50: - anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_KYORO1); + anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1); i_this->dr.m004 += 1; i_this->m0300[1] = 50; // Fall-through @@ -1319,7 +1319,7 @@ static void stand(bk_class* i_this) { r28 = true; } if (i_this->m0300[1] == 0) { - anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_RUN); + anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_RUN); i_this->dr.m004 += 1; i_this->m0300[2] = 60; } @@ -1341,7 +1341,7 @@ static void stand(bk_class* i_this) { } i_this->speed.y = 100.0f + REG0_F(16); - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0); i_this->dr.m004 = 53; } @@ -1352,7 +1352,7 @@ static void stand(bk_class* i_this) { if (!i_this->dr.mAcch.ChkGroundHit()) { break; } - anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); i_this->dr.m004 += 1; break; case 54: @@ -1394,7 +1394,7 @@ static void stand(bk_class* i_this) { i_this->dr.m004 = 0; } else { i_this->dr.m004 = 20; - anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0300[1] = 30; fopAcM_monsSeStart(i_this, JA_SE_CV_BK_FOUND_LINK, 0); } @@ -1473,10 +1473,10 @@ static void stand2(bk_class* i_this) { i_this->m0B7B = 1; s16 r28 = i_this->m1224 - i_this->m1228; if (i_this->m122A >= 0 && r28 < 0) { - anm_init(i_this, BK_BCK_BK_MIGIROT, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_MIGIROT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } if (i_this->m122A <= 0 && r28 > 0) { - anm_init(i_this, BK_BCK_BK_HIDARIROT, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_HIDARIROT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->m122A = r28; i_this->m1228 = i_this->m1224; @@ -1490,10 +1490,10 @@ static void stand2(bk_class* i_this) { case 10: i_this->m0B7B = 1; if (i_this->m0300[1] == 30) { - anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } if (i_this->m0300[1] == 0) { - anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2); i_this->dr.m004 = 11; i_this->m0300[3] = 30.0f + cM_rndF(30.0f); } @@ -1516,14 +1516,14 @@ static void stand2(bk_class* i_this) { } break; case 50: - anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_KYORO1); + anm_init(i_this, BK_BCK_BK_KYORO1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO1); i_this->dr.m004 += 1; i_this->m0300[1] = 50; // Fall-through case 51: i_this->speedF = 0.0f; if (i_this->m0300[1] == 0) { - anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_RUN); + anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_RUN); i_this->dr.m004 += 1; path_check(i_this, 1); if (i_this->m1216 >= 4) { @@ -1585,7 +1585,7 @@ temp_568: i_this->dr.m004 = 0; } else { i_this->dr.m004 = 20; - anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_BIKKURI, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m0300[1] = 30; fopAcM_monsSeStart(i_this, JA_SE_CV_BK_FOUND_LINK, 0); } @@ -1609,7 +1609,7 @@ static void path_run(bk_class* i_this) { switch (i_this->dr.m004) { case 0: - anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_bkHIO.m070, BK_BAS_BK_RUN); + anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN); i_this->dr.m004 = 1; // Fall-through case 1: @@ -1652,7 +1652,7 @@ static void path_run(bk_class* i_this) { i_this->speedF = l_bkHIO.m054; if (i_this->m0300[2] == 0) { i_this->m0300[2] = cM_rndF(100.0f) + 50.0f; - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); i_this->m120C = 1; i_this->m1210 = 0; } @@ -1661,7 +1661,7 @@ static void path_run(bk_class* i_this) { case 0: i_this->speedF = l_bkHIO.m054 * 1.2f; if (i_this->dr.mAcch.ChkGroundHit() && i_this->mpMorf->isStop()) { - anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); i_this->m1210 = 1; i_this->m034C = l_bkHIO.m00C + 2; i_this->m034E = 4; @@ -1671,14 +1671,14 @@ static void path_run(bk_class* i_this) { i_this->speedF = 0.0f; if (i_this->dr.mAcch.ChkGroundHit() && i_this->mpMorf->isStop()) { i_this->m1210 = 0; - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); i_this->speed.y = cM_rndF(REG8_F(7) + 10.0f) + 65.0f + REG8_F(8); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0); } if (i_this->m0300[2] == 0) { i_this->m0300[2] = cM_rndF(100.0f) + 50.0f; - anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_bkHIO.m070, BK_BAS_BK_RUN); + anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN); i_this->m120C = 0; } break; @@ -1743,7 +1743,7 @@ static void attack_set(bk_class* i_this, u8 r28) { i_this->m0B60 = 0; attack_info_s* info = attack_info[i_this->m0B5C]; - anm_init(i_this, info->bckFileIdx, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, info->speed, info->soundFileIdx); + anm_init(i_this, info->bckFileIdx, 5.0f, J3DFrameCtrl::EMode_NONE, info->speed, info->soundFileIdx); if (bk_attack_ready_SE[i_this->m0B5C] != -0xDCF) { fopAcM_monsSeStart(i_this, bk_attack_ready_SE[i_this->m0B5C], 0); } @@ -1802,7 +1802,7 @@ static void fight_run(bk_class* i_this) { i_this->m1212++; if (daBk_player_way_check(i_this) && (i_this->m1212 & 0x30) && !r29) { if (i_this->m120C != 0) { - anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_bkHIO.m070, BK_BAS_BK_RUN); + anm_init(i_this, BK_BCK_BK_RUN, 10.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m070, BK_BAS_BK_RUN); i_this->m120C = 0; } if (i_this->mPlayerDistance < l_bkHIO.m02C) { @@ -1824,11 +1824,11 @@ static void fight_run(bk_class* i_this) { case 0: i_this->m1210 = 1; cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->dr.m4D0, 2, 0x2000); - anm_init(i_this, BK_BCK_BK_JUMP2, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, BK_BCK_BK_JUMP2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); break; case 1: if (i_this->dr.mAcch.ChkGroundHit() && i_this->mpMorf->isStop()) { - anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); i_this->m1210 = 2; i_this->m034C = l_bkHIO.m00C + 2; i_this->m034E = 4; @@ -1839,7 +1839,7 @@ static void fight_run(bk_class* i_this) { cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->dr.m4D0, 2, 0x2000); if (i_this->dr.mAcch.ChkGroundHit() && i_this->mpMorf->isStop()) { i_this->m1210 = 1; - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); i_this->speed.y = 65.0f + cM_rndF(10.0f + REG8_F(7)) + REG8_F(8); if ((i_this->m02DD & 0xC) == 0) { s16 temp = cM_rndFX(3000.0f + REG6_F(13));; @@ -1869,9 +1869,9 @@ static void fight_run(bk_class* i_this) { } if ((i_this->m02DD & 0xC) == 0 && std::fabsf(stickPosX) > 0.1f) { if (i_this->m0B30 != 0 || i_this->m11F3 != 0) { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); } else { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); } if (stickPosX > 0.0f) { i_this->dr.m004 = 5; @@ -1880,16 +1880,16 @@ static void fight_run(bk_class* i_this) { } } else if (i_this->mPlayerDistance < l_bkHIO.m030) { if (i_this->m0B30 != 0 || i_this->m11F3 != 0) { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); } else { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); } i_this->dr.m004 = 4; } else { if (i_this->m0B30 != 0 || i_this->m11F3 != 0) { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); } else { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); } i_this->dr.m004 = 3; } @@ -1899,7 +1899,7 @@ static void fight_run(bk_class* i_this) { cLib_addCalc2(&i_this->speedF, l_bkHIO.m060, 1.0f, 20.0f); if (r29) { i_this->speed.y = 100.0f + REG0_F(16); - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0); i_this->dr.m004 = 33; break; @@ -1910,7 +1910,7 @@ static void fight_run(bk_class* i_this) { break; case 33: if (i_this->dr.mAcch.ChkGroundHit()) { - anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); i_this->dr.m004++; } break; @@ -1930,9 +1930,9 @@ static void fight_run(bk_class* i_this) { } i_this->dr.m004 = 3; if (i_this->m0B30 != 0 || i_this->m11F3 != 0) { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); } else { - anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WALK2); + anm_init(i_this, BK_BCK_BK_WALK2, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WALK2); } break; case 5: @@ -2017,7 +2017,7 @@ static void fight_run(bk_class* i_this) { if ((ground_4_check(i_this, 4, i_this->current.angle.y, 200.0f) & 0xD) == 0) { i_this->dr.mState = 5; attack_set(i_this, 1); - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); i_this->dr.m004 = -10; i_this->speedF = -60.0f + REG0_F(3); i_this->speed.y = 80.0f + REG0_F(4); @@ -2140,7 +2140,7 @@ static void fight(bk_class* i_this) { switch (i_this->dr.m004) { case -10: if (i_this->dr.mAcch.ChkGroundHit()) { - anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); i_this->dr.m004 = -9; i_this->speedF = 0.0f; } @@ -2149,7 +2149,7 @@ static void fight(bk_class* i_this) { if (i_this->mpMorf->isStop()) { i_this->dr.m004 = 1; i_this->m0300[2] = 8; - anm_init(i_this, BK_BCK_BK_JATTACK1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_JATTACK1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->speedF = 80.0f + REG0_F(5); i_this->speed.y = 115.0f + REG0_F(6); goto temp_1B8; @@ -2330,7 +2330,7 @@ temp_1B8: i_this->m0B60--; speed = -r6[i_this->m0B60].speed; } - anm_init(i_this, r6[i_this->m0B60].bckFileIdx, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, speed, r6[i_this->m0B60].soundFileIdx); + anm_init(i_this, r6[i_this->m0B60].bckFileIdx, 0.0f, J3DFrameCtrl::EMode_NONE, speed, r6[i_this->m0B60].soundFileIdx); } break; @@ -2354,7 +2354,7 @@ static void p_lost(bk_class* i_this) { // Fall-through case 0: i_this->dr.m004 = 1; - anm_init(i_this, BK_BCK_BK_KYORO2, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, BK_BCK_BK_KYORO2, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_KYORO2); i_this->speedF = 0.0f; i_this->m0300[1] = 30.0f + cM_rndF(30.0f); // Fall-through @@ -2398,7 +2398,7 @@ static void b_nige(bk_class* i_this) { switch (i_this->dr.m004) { case 0: i_this->dr.m004 = 1; - anm_init(i_this, BK_BCK_BK_HAKKEN, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_HAKKEN); + anm_init(i_this, BK_BCK_BK_HAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_HAKKEN); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_FOUND_LINK, 0); i_this->m0300[1] = 20; // Fall-through @@ -2407,7 +2407,7 @@ static void b_nige(bk_class* i_this) { cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->dr.m4D0 + 0x8000, 2, 0x3000); if (i_this->m0300[1] == 0) { i_this->dr.m004 = 2; - anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_NIGERU); + anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_LOST_BOKO, 0); } break; @@ -2418,7 +2418,7 @@ static void b_nige(bk_class* i_this) { cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->dr.m4D0, 4, 0x1000); if (std::sqrtf(sp10.x*sp10.x + sp10.z*sp10.z) > 800.0f) { i_this->dr.m004 = 3; - anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_WAIT); + anm_init(i_this, BK_BCK_BK_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_WAIT); } break; case 3: @@ -2441,7 +2441,7 @@ static void defence(bk_class* i_this) { switch (i_this->dr.m004) { case 0: i_this->dr.m004 = 1; - anm_init(i_this, BK_BCK_BK_BOUGYO1, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_BOUGYO1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->speedF = 0.0f; // Fall-through case 1: @@ -2465,7 +2465,7 @@ static void defence(bk_class* i_this) { static void oshi(bk_class* i_this) { i_this->dr.mState = 5; attack_set(i_this, 1); - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); i_this->dr.m004 = -10; i_this->speedF = -90.0f + REG6_F(10); i_this->speed.y = 85.0f + REG6_F(11); @@ -2485,11 +2485,11 @@ static void hukki(bk_class* i_this) { switch (i_this->dr.m004) { case 10: - anm_init(i_this, BK_BCK_BK_OKIRUA, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_OKIRUA); + anm_init(i_this, BK_BCK_BK_OKIRUA, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_OKIRUA); i_this->m0300[2] = 15; goto temp_194; case 12: - anm_init(i_this, BK_BCK_BK_OKIRUU, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_OKIRUU); + anm_init(i_this, BK_BCK_BK_OKIRUU, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_OKIRUU); i_this->m0300[2] = 15 + REG0_S(5); temp_194: i_this->speedF = 0.0f; @@ -2544,7 +2544,7 @@ temp_194: i_this->m0B60 = 1; attack_info_s* info = attack_info[i_this->m0B5C]; info += 1; - anm_init(i_this, info->bckFileIdx, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, info->speed, info->soundFileIdx); + anm_init(i_this, info->bckFileIdx, 5.0f, J3DFrameCtrl::EMode_NONE, info->speed, info->soundFileIdx); i_this->dr.m004 = 1; i_this->m11F2 = 1; } else { @@ -2656,7 +2656,7 @@ static void yogan_fail(bk_class* i_this) { switch (i_this->dr.m004) { case 0: - anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_NIGERU); + anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU); i_this->dr.m004 = 1; i_this->speed.y = 190.0f + REG0_F(19); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_SURPRISE, 0); @@ -2697,7 +2697,7 @@ static void water_fail(bk_class* i_this) { switch (i_this->dr.m004) { case 0: - anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, BK_BAS_BK_NIGERU); + anm_init(i_this, BK_BCK_BK_NIGERU, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, BK_BAS_BK_NIGERU); i_this->dr.m004 = 1; fopAcM_monsSeStart(i_this, JA_SE_CV_BK_SURPRISE, 0); i_this->dr.m458.y = 0.0f; @@ -2749,7 +2749,7 @@ static void wepon_search(bk_class* i_this) { case -1: i_this->dr.m004 = 0; i_this->m11F3 = 0; - anm_init(i_this, BK_BCK_BK_HAKKEN, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_HAKKEN); + anm_init(i_this, BK_BCK_BK_HAKKEN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_HAKKEN); if (f31 < 900.0f) { i_this->m0300[1] = 20; } else { @@ -2765,7 +2765,7 @@ static void wepon_search(bk_class* i_this) { if (i_this->mpMorf->isStop() || i_this->m0300[1] == 0) { i_this->dr.m004 = 1; i_this->m030A = l_bkHIO.m08E; - anm_init(i_this, BK_BCK_BK_RUN, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_bkHIO.m074, BK_BAS_BK_RUN); + anm_init(i_this, BK_BCK_BK_RUN, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, BK_BAS_BK_RUN); i_this->m02CE = 0; } } @@ -2777,7 +2777,7 @@ static void wepon_search(bk_class* i_this) { cLib_addCalcAngleS2(&actor->current.angle.y, i_this->dr.m4D0, 4, 0x1000); if (f31 < REG8_F(2) + 150.0f) { i_this->dr.m004 = 2; - anm_init(i_this, BK_BCK_BK_CATCH, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_CATCH); + anm_init(i_this, BK_BCK_BK_CATCH, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_CATCH); i_this->m0300[1] = 29; } else { if (i_this->m030A == 0) { @@ -2787,7 +2787,7 @@ static void wepon_search(bk_class* i_this) { } else if (i_this->dr.mAcch.ChkGroundHit() && i_this->dr.mAcch.ChkWallHit()) { if (i_this->m02CE < 2) { actor->speed.y = 100.0f + REG0_F(16); - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); fopAcM_monsSeStart(actor, JA_SE_CV_BK_JUMP, 0); i_this->dr.m004 = 5; i_this->m02CE++; @@ -2841,7 +2841,7 @@ static void wepon_search(bk_class* i_this) { i_this->m0B60 = 1; attack_info_s* info = attack_info[i_this->m0B5C]; info++; // TODO: fakematch? - anm_init(i_this, info->bckFileIdx, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, info->speed, info->soundFileIdx); + anm_init(i_this, info->bckFileIdx, 5.0f, J3DFrameCtrl::EMode_NONE, info->speed, info->soundFileIdx); i_this->dr.m004 = 1; i_this->m11F2 = 1; } else { @@ -2855,7 +2855,7 @@ static void wepon_search(bk_class* i_this) { case 5: actor->speedF = l_bkHIO.m05C * 0.5f; if (i_this->dr.mAcch.ChkGroundHit()) { - anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, BK_BCK_BK_JUMP2, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); i_this->dr.m004++; } break; @@ -2863,7 +2863,7 @@ static void wepon_search(bk_class* i_this) { actor->speedF = 0.0f; if (i_this->mpMorf->isStop()) { i_this->dr.m004 = 1; - anm_init(i_this, BK_BCK_BK_RUN, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_bkHIO.m074, BK_BAS_BK_RUN); + anm_init(i_this, BK_BCK_BK_RUN, 3.0f, J3DFrameCtrl::EMode_LOOP, l_bkHIO.m074, BK_BAS_BK_RUN); } break; } @@ -2880,10 +2880,10 @@ static void d_dozou(bk_class* i_this) { i_this->dr.m004 = 1; i_this->dr.mStts.Init(0xFF, 0xFF, i_this); if (i_this->m02B5 == 0) { - anm_init(i_this, BK_BCK_BK_ATTACK2, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, BK_BAS_BK_ATTACK2); + anm_init(i_this, BK_BCK_BK_ATTACK2, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, BK_BAS_BK_ATTACK2); i_this->mpMorf->setFrame(0.0f); } else { - anm_init(i_this, BK_BCK_BK_NOBI, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, BK_BAS_BK_NOBI); + anm_init(i_this, BK_BCK_BK_NOBI, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f, BK_BAS_BK_NOBI); i_this->mpMorf->setFrame(27.0f); } // Fall-through @@ -2926,11 +2926,11 @@ static void carry_drop(bk_class* i_this) { case 0: dComIfGs_onEventBit(0x0004); i_this->dr.m004 = 1; - anm_init(i_this, BK_BCK_BK_KOUKA, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_KOUKA, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); // Fall-through case 1: if (i_this->dr.mAcch.ChkGroundHit()) { - anm_init(i_this, BK_BCK_BK_TYAKU, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_TYAKU, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->dr.m004 = 2; i_this->m034C = l_bkHIO.m00C + 15; i_this->m034E = 3; @@ -2945,7 +2945,7 @@ static void carry_drop(bk_class* i_this) { cLib_addCalcAngleS2(&i_this->shape_angle.z, 0, 1, 0x1000); cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f); if (i_this->mpMorf->isStop()) { - anm_init(i_this, BK_BCK_BK_KIME, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_KIME, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->dr.m004 = 3; fopAcM_monsSeStart(actor, JA_SE_CV_BK_SURPRISE, 0); } @@ -2966,7 +2966,7 @@ static void d_mahi(bk_class* i_this) { switch (i_this->dr.m004) { case 0: i_this->dr.m004 = 1; - anm_init(i_this, BK_BCK_BK_SUWARI, 20.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_SUWARI); + anm_init(i_this, BK_BCK_BK_SUWARI, 20.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_SUWARI); i_this->m0300[0] = 100; // Fall-through case 1: @@ -3013,14 +3013,14 @@ static void rope_on(bk_class* i_this) { switch (i_this->dr.m004) { case 0: i_this->speedF = 0.0f; - anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 2.0f, BK_BAS_BK_KYORO2); + anm_init(i_this, BK_BCK_BK_KYORO2, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_KYORO2); i_this->dr.m004 = 1; i_this->m0300[0] = 40; // Fall-through case 1: if (i_this->m0300[0] == 0) { i_this->dr.m004 = 2; - anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 2.0f, BK_BAS_BK_WALK); + anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_WALK); } break; case 2: { @@ -3029,12 +3029,12 @@ static void rope_on(bk_class* i_this) { cLib_addCalcAngleS2(&i_this->current.angle.y, targetAngle, 4, 0x1000); if (i_this->dr.mAcch.ChkWallHit()) { i_this->speed.y = 100.0f + REG0_F(16); - anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP1); + anm_init(i_this, BK_BCK_BK_JUMP1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP1); fopAcM_monsSeStart(i_this, JA_SE_CV_BK_JUMP, 0); i_this->dr.m004 = 3; } if (fopAcM_searchPlayerDistance(i_this) < 200.0f) { - anm_init(i_this, BK_BCK_BK_SUWARI, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_SUWARI); + anm_init(i_this, BK_BCK_BK_SUWARI, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_SUWARI); i_this->dr.m004 = 5; } break; @@ -3042,7 +3042,7 @@ static void rope_on(bk_class* i_this) { case 3: i_this->speedF = 35.0f; if (i_this->dr.mAcch.ChkGroundHit()) { - anm_init(i_this, BK_BCK_BK_JUMP2, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_JUMP2); + anm_init(i_this, BK_BCK_BK_JUMP2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_JUMP2); i_this->dr.m004 = 4; } break; @@ -3050,14 +3050,14 @@ static void rope_on(bk_class* i_this) { i_this->speedF = 0.0f; if (i_this->mpMorf->isStop()) { i_this->dr.m004 = 2; - anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 2.0f, BK_BAS_BK_WALK); + anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_WALK); } break; case 5: i_this->speedF = 0.0f; if (fopAcM_searchPlayerDistance(i_this) > 250.0f) { i_this->dr.m004 = 2; - anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 2.0f, BK_BAS_BK_WALK); + anm_init(i_this, BK_BCK_BK_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 2.0f, BK_BAS_BK_WALK); } break; } @@ -3171,7 +3171,7 @@ static BOOL daBk_Execute(bk_class* i_this) { } if (enemy_ice(&i_this->mEnemyIce)) { - i_this->mpMorf->setPlayMode(J3DFrameCtrl::LOOP_ONCE_e); + i_this->mpMorf->setPlayMode(J3DFrameCtrl::EMode_NONE); i_this->mpMorf->setPlaySpeed(3.0f); i_this->mpMorf->play(&i_this->eyePos, 0, 0); i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -3323,14 +3323,14 @@ static BOOL daBk_Execute(bk_class* i_this) { i_this->m11FC = fpcM_ERROR_PROCESS_ID_e; switch (r3) { case 1: - anm_init(i_this, BK_BCK_BK_AOMUKE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_AOMUKE); + anm_init(i_this, BK_BCK_BK_AOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_AOMUKE); if (i_this->m0B30 != 0) { i_this->m0B34 = 1; } i_this->dr.mState = 0; break; case 2: - anm_init(i_this, BK_BCK_BK_UTUBUSE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_UTUBUSE); + anm_init(i_this, BK_BCK_BK_UTUBUSE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_UTUBUSE); break; case 5: if (i_this->dr.mState != 4 && i_this->dr.mState != 11) { @@ -3361,7 +3361,7 @@ static BOOL daBk_Execute(bk_class* i_this) { i_this->dr.m4C8[2] = l_bkHIO.m08C; break; case 30: - anm_init(i_this, BK_BCK_BK_AOMUKE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, BK_BAS_BK_AOMUKE); + anm_init(i_this, BK_BCK_BK_AOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, BK_BAS_BK_AOMUKE); if (i_this->m0B30 != 0) { i_this->m0B34 = 1; } @@ -3544,7 +3544,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BK), NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Bk", BK_BCK_BK_SUWARI), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, dComIfG_getObjectRes("Bk", BK_BAS_BK_SUWARI), 0x00080000, 0x37221203 @@ -3579,7 +3579,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { return cPhs_ERROR_e; } J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bk", BK_BTP_TMABATAKI); - if (!i_this->m02C4->init(model->getModelData(), btp, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) { + if (!i_this->m02C4->init(model->getModelData(), btp, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { // Bug: Same as above. // TODO check this case as well. return cPhs_ERROR_e; @@ -3850,7 +3850,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { i_this->dr.mState = 29; i_this->dr.mMaxFallDistance = 300.0f; } else if (i_this->mType == 5) { - anm_init(i_this, BK_BCK_BK_HAKOBI, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, BK_BCK_BK_HAKOBI, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->dr.mState = 30; i_this->dr.mMaxFallDistance = 100000.0f; } else if (i_this->mType == 2 || i_this->mType == 3) { |
