From b97eeed779b9fb2bfcad07c650b2d4d09e88a9c9 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 17 Mar 2025 16:21:46 -0400 Subject: [PATCH] Rename J3DFrameCtrl loop mode enum See https://github.com/zeldaret/tp/pull/2327/commits/2a284165cf35a2324d36d825add5c06ffa864398 --- .../JSystem/J3DGraphAnimator/J3DAnimation.h | 10 +- src/JSystem/J3DGraphAnimator/J3DAnimation.cpp | 22 +-- src/d/actor/d_a_agb.cpp | 2 +- src/d/actor/d_a_am.cpp | 32 ++-- src/d/actor/d_a_am2.cpp | 36 ++-- src/d/actor/d_a_arrow_iceeff.cpp | 2 +- src/d/actor/d_a_arrow_lighteff.cpp | 4 +- src/d/actor/d_a_bflower.cpp | 10 +- src/d/actor/d_a_bg.cpp | 4 +- src/d/actor/d_a_bita.cpp | 2 +- src/d/actor/d_a_bk.cpp | 180 +++++++++--------- src/d/actor/d_a_bomb2.cpp | 4 +- src/d/actor/d_a_bomb3.inc | 10 +- src/d/actor/d_a_dai_item.cpp | 24 +-- src/d/actor/d_a_deku_item.cpp | 4 +- src/d/actor/d_a_dr.cpp | 14 +- src/d/actor/d_a_fan.cpp | 6 +- src/d/actor/d_a_fganon.cpp | 96 +++++----- src/d/actor/d_a_ghostship.cpp | 2 +- src/d/actor/d_a_ib.cpp | 6 +- src/d/actor/d_a_itembase.cpp | 8 +- src/d/actor/d_a_kaji.cpp | 2 +- src/d/actor/d_a_komore.cpp | 2 +- src/d/actor/d_a_kytag03.cpp | 2 +- src/d/actor/d_a_lbridge.cpp | 6 +- src/d/actor/d_a_mozo.cpp | 6 +- src/d/actor/d_a_nh.cpp | 2 +- src/d/actor/d_a_npc_bs1.cpp | 24 +-- src/d/actor/d_a_npc_btsw2.cpp | 26 +-- src/d/actor/d_a_npc_ji1.cpp | 16 +- src/d/actor/d_a_npc_kamome.cpp | 8 +- src/d/actor/d_a_npc_md.cpp | 110 +++++------ src/d/actor/d_a_npc_os.cpp | 30 +-- src/d/actor/d_a_npc_people.cpp | 4 +- src/d/actor/d_a_npc_roten.cpp | 8 +- src/d/actor/d_a_obj_AjavW.cpp | 2 +- src/d/actor/d_a_obj_Vteng.cpp | 2 +- src/d/actor/d_a_obj_Yboil.cpp | 6 +- src/d/actor/d_a_obj_Ygush00.cpp | 4 +- src/d/actor/d_a_obj_barrier.cpp | 16 +- src/d/actor/d_a_obj_dmgroom.cpp | 2 +- src/d/actor/d_a_obj_figure.cpp | 6 +- src/d/actor/d_a_obj_gong.cpp | 2 +- src/d/actor/d_a_obj_gryw00.cpp | 6 +- src/d/actor/d_a_obj_hat.cpp | 2 +- src/d/actor/d_a_obj_hha.cpp | 6 +- src/d/actor/d_a_obj_toripost.cpp | 10 +- src/d/actor/d_a_obj_vgnfd.cpp | 4 +- src/d/actor/d_a_obj_vmc.cpp | 6 +- src/d/actor/d_a_obj_zouK.cpp | 2 +- src/d/actor/d_a_pedestal.cpp | 8 +- src/d/actor/d_a_player_fan.inc | 2 +- src/d/actor/d_a_player_main.cpp | 12 +- src/d/actor/d_a_player_particle.inc | 4 +- src/d/actor/d_a_player_sword.inc | 2 +- src/d/actor/d_a_pw.cpp | 24 +-- src/d/actor/d_a_rd.cpp | 56 +++--- src/d/actor/d_a_swhit0.cpp | 4 +- src/d/actor/d_a_syan.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 14 +- src/d/actor/d_a_title.cpp | 8 +- src/d/actor/d_a_tornado.cpp | 12 +- src/d/actor/d_a_wind_tag.cpp | 6 +- src/d/actor/d_a_ygcwp.cpp | 4 +- src/d/d_attention.cpp | 2 +- src/d/d_door.cpp | 8 +- src/d/d_ky_thunder.cpp | 4 +- src/d/d_lib.cpp | 8 +- src/d/d_material.cpp | 2 +- src/d/d_shop.cpp | 2 +- src/d/d_wind_arrow.cpp | 2 +- 71 files changed, 493 insertions(+), 493 deletions(-) diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 9a8ac4c24..0b950c4d3 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -801,11 +801,11 @@ private: class J3DFrameCtrl { public: enum Attribute_e { - LOOP_ONCE_e, - LOOP_ONCE_RESET_e, - LOOP_REPEAT_e, - LOOP_MIRROR_ONCE_e, - LOOP_MIRROR_REPEAT_e, + EMode_NONE, + EMode_RESET, + EMode_LOOP, + EMode_REVERSE, + EMode_LOOP_REVERSE, }; enum State_e { diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp index 0fa5ac9e6..fc2c58b4e 100644 --- a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -9,7 +9,7 @@ /* 802EF5D8-802EF608 .text init__12J3DFrameCtrlFs */ void J3DFrameCtrl::init(s16 end) { - mAttribute = 2; + mAttribute = EMode_LOOP; mState = 0; mStart = 0; mEnd = end; @@ -24,8 +24,8 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) { f32 next_frame = cur_frame + mRate; switch (mAttribute) { - case LOOP_ONCE_e: - case LOOP_ONCE_RESET_e: + case EMode_NONE: + case EMode_RESET: if (next_frame < mStart) { next_frame = mStart; } @@ -46,7 +46,7 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) { return true; } return false; - case LOOP_REPEAT_e: + case EMode_LOOP: if (cur_frame < mStart) { while (next_frame < mStart) { if (mLoop - mStart <= 0.0f) { @@ -110,8 +110,8 @@ BOOL J3DFrameCtrl::checkPass(f32 pass_frame) { return true; } return false; - case LOOP_MIRROR_ONCE_e: - case LOOP_MIRROR_REPEAT_e: + case EMode_REVERSE: + case EMode_LOOP_REVERSE: if (next_frame >= mEnd) { next_frame = mEnd - 0.001f; } @@ -142,7 +142,7 @@ void J3DFrameCtrl::update() { mState = 0; mFrame += mRate; switch (mAttribute) { - case LOOP_ONCE_e: + case EMode_NONE: if (mFrame < mStart) { mFrame = mStart; mRate = 0.0f; @@ -154,7 +154,7 @@ void J3DFrameCtrl::update() { mState |= 1; } break; - case LOOP_ONCE_RESET_e: + case EMode_RESET: if (mFrame < mStart) { mFrame = mStart; mRate = 0.0f; @@ -166,7 +166,7 @@ void J3DFrameCtrl::update() { mState |= 1; } break; - case LOOP_REPEAT_e: + case EMode_LOOP: while (mFrame < mStart) { mState |= 2; if (mLoop - mStart <= 0.0f) { @@ -182,7 +182,7 @@ void J3DFrameCtrl::update() { mFrame -= mEnd - mLoop; } break; - case LOOP_MIRROR_ONCE_e: + case EMode_REVERSE: if (mFrame >= mEnd) { mFrame = mEnd - 0.001f; mRate = -mRate; @@ -193,7 +193,7 @@ void J3DFrameCtrl::update() { mState |= 1; } break; - case LOOP_MIRROR_REPEAT_e: + case EMode_LOOP_REVERSE: if (mFrame >= mEnd) { mFrame = mEnd - 0.001f; mRate = -mRate; diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 2387c76a4..541c4cd50 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -1724,7 +1724,7 @@ int daAgb_c::createHeap() { } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Agb", AGB_BRK_AGBCURSOR); - if (!mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 1)) { + if (!mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 1)) { return 0; } diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 7e6757b97..5e1a53b26 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -279,7 +279,7 @@ static BOOL medama_atari_check(am_class* i_this) { mDoAud_seStart(JA_SE_LK_MS_WEP_HIT, &i_this->eyePos, 0x42, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); ret = true; if (i_this->mCurrBckIdx == AM_BCK_SLEEP || i_this->mCurrBckIdx == AM_BCK_SLEEP_LOOP) { - anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; i_this->mNeedleCyl.OnAtSPrmBit(cCcD_AtSPrm_Set_e); i_this->mNeedleCyl.OnAtHitBit(); @@ -486,7 +486,7 @@ static void action_dousa(am_class* i_this) { for (int i = 0; i < ARRAY_SIZE(i_this->mCountUpTimers); i++) { i_this->mCountUpTimers[i] = 0; } - anm_init(i_this, AM_BCK_SLEEP_LOOP, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, AM_BCK_SLEEP_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mState += 1; // Fall-through case 1: @@ -501,7 +501,7 @@ static void action_dousa(am_class* i_this) { break; } if (Line_check(i_this, player->current.pos)) { - anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_monsSeStart(i_this, JA_SE_CV_AM_AWAKE, 0); i_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; i_this->mNeedleCyl.OnAtSetBit(); @@ -524,7 +524,7 @@ static void action_dousa(am_class* i_this) { // fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_CLOSE, 0); mDoAud_seStart(JA_SE_CM_AM_MOUTH_CLOSE, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); } - anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mCountDownTimers[2] = 6; } i_this->mTargetAngleY = fopAcM_searchPlayerAngleY(i_this); @@ -578,7 +578,7 @@ static void action_dousa(am_class* i_this) { case 6: if (i_this->mCurrBckIdx == AM_BCK_CLOSE) { if (i_this->mpMorf->isStop()) { - anm_init(i_this, AM_BCK_CLOSE_LOOP, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, AM_BCK_CLOSE_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } if (!i_this->mAcch.ChkGroundHit()) { @@ -606,7 +606,7 @@ static void action_dousa(am_class* i_this) { if (i_this->mCountUpTimers[0] > 2) { i_this->mCountDownTimers[0] = 100; i_this->mCountUpTimers[0] = 0; - anm_init(i_this, AM_BCK_DAMAGE, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_DAMAGE, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match. // fopAcM_seStart(i_this, JA_SE_CM_AM_NEEDLE_IN, 0); mDoAud_seStart(JA_SE_CM_AM_NEEDLE_IN, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); @@ -639,7 +639,7 @@ static void action_dousa(am_class* i_this) { } break; case STATE_DOUSA_SLEEP_INIT: - anm_init(i_this, AM_BCK_SLEEP, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_SLEEP, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(i_this, JA_SE_CM_AM_NEEDLE_IN, 0); i_this->mNeedleCyl.OffAtSetBit(); i_this->mNeedleCyl.OffAtSetBit(); @@ -666,7 +666,7 @@ static void action_dousa(am_class* i_this) { static void action_modoru_move(am_class* i_this) { switch (i_this->mState) { case STATE_MODORU_MOVE_INIT: { - anm_init(i_this, AM_BCK_CLOSE_LOOP, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, AM_BCK_CLOSE_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mNeedleCyl.OnAtSetBit(); i_this->mNeedleCyl.OnAtHitBit(); i_this->gravity = -11.0f; @@ -741,7 +741,7 @@ static void action_handou_move(am_class* i_this) { // Using the fopAcM_seStart inline multiple times makes the codegen not match. // fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_CLOSE, 0); mDoAud_seStart(JA_SE_CM_AM_MOUTH_CLOSE, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); - anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } i_this->mState += 1; // Fall-through @@ -771,7 +771,7 @@ static void action_itai_move(am_class* i_this) { i_this->current.angle.y = fopAcM_searchPlayerAngleY(i_this); i_this->mTargetAngleY = i_this->current.angle.y; fopAcM_seStart(i_this, JA_SE_CM_AM_NEEDLE_IN, 0); - anm_init(i_this, AM_BCK_DAMAGE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState += 1; // Fall-through case 41: @@ -781,14 +781,14 @@ static void action_itai_move(am_class* i_this) { } i_this->mCountDownTimers[0] = 100; i_this->speedF = 0.0f; - anm_init(i_this, AM_BCK_DAMAGE_LOOP, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, AM_BCK_DAMAGE_LOOP, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mState += 1; break; case 42: if (i_this->mCountDownTimers[0] != 0) { break; } - anm_init(i_this, AM_BCK_DAMAGE_END, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_DAMAGE_END, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(i_this, JA_SE_CM_AM_NEEDLE_OUT, 0); // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match. // fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_CLOSE, 0); @@ -813,7 +813,7 @@ static void action_itai_move(am_class* i_this) { 0xB9, &i_this->mSmokeCbs[3], fopAcM_GetRoomNo(i_this) ); fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_CLOSE, 0); - anm_init(i_this, AM_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); mDoAud_onEnemyDamage(); i_this->mEyeRot.setall(0); i_this->mNeedleCyl.OffAtSetBit(); @@ -873,7 +873,7 @@ static void action_itai_move(am_class* i_this) { if (i_this->mCountDownTimers[0] != 0) { break; } - anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); dComIfGp_particle_set(dPa_name::ID_SCENE_8127, &i_this->mWaistPos); dComIfGp_particle_set(dPa_name::ID_SCENE_8128, &i_this->mWaistPos); @@ -967,7 +967,7 @@ static BOOL daAM_Execute(am_class* i_this) { } if (i_this->mAction != ACTION_ITAI_MOVE && i_this->mSpawnPosY - 1500.0f > i_this->current.pos.y) { - anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); dComIfGp_particle_set(dPa_name::ID_SCENE_8127, &i_this->mWaistPos); dComIfGp_particle_set(dPa_name::ID_SCENE_8128, &i_this->mWaistPos); @@ -1083,7 +1083,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { (J3DModelData*)dComIfG_getObjectRes("AM", AM_BDL_AM), NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("AM", AM_BCK_SLEEP_LOOP), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00000000, 0x11020203 diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 9cb03061f..8bec7ef99 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -170,7 +170,7 @@ static BOOL medama_atari_check(am2_class* i_this) { if (hitObj->ChkAtType(AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW)) { ret = true; if (i_this->mCurrBckIdx == AM2_BCK_SLEEP) { - anm_init(i_this, AM2_BCK_WAIT, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_WAIT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; fopAcM_OnStatus(i_this, fopAcStts_SHOWMAP_e); i_this->mNeedleCyl.OnAtSetBit(); @@ -463,7 +463,7 @@ static void action_dousa(am2_class* i_this) { } i_this->mAcchRadius = 80.0f + REG8_F(11); if (i_this->mCurrBckIdx != AM2_BCK_WAIT) { - anm_init(i_this, AM2_BCK_WAIT, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_WAIT, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } i_this->mState++; // Fall-through @@ -475,7 +475,7 @@ static void action_dousa(am2_class* i_this) { if (Line_check(i_this, centerPos)) { i_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; fopAcM_OnStatus(i_this, fopAcStts_SHOWMAP_e); - anm_init(i_this, AM2_BCK_START, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_START, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_monsSeStart(i_this, JA_SE_CV_AM2_AWAKE, 0); i_this->mEyeSph.OnTgSetBit(); i_this->mWeakSph.OnTgSetBit(); @@ -510,7 +510,7 @@ static void action_dousa(am2_class* i_this) { i_this->gravity = -3.0f; i_this->speed.y = 12.0f; if (i_this->mCurrBckIdx != AM2_BCK_JUMP) { - anm_init(i_this, AM2_BCK_JUMP, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_JUMP, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->mState++; } @@ -566,7 +566,7 @@ static void action_dousa(am2_class* i_this) { } break; case 6: - anm_init(i_this, AM2_BCK_SLEEP, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_SLEEP, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(i_this, JA_SE_CM_AM2_SPIKE_IN, 0); i_this->mWeakSph.OffTgSetBit(); i_this->mWeakSph.ClrTgHit(); @@ -629,7 +629,7 @@ static void action_mahi(am2_class* i_this) { actor->speedF = 20.0f; fopAcM_seStart(actor, JA_SE_CM_AM2_SPIKE_IN, 0); - anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState++; break; @@ -639,7 +639,7 @@ static void action_mahi(am2_class* i_this) { if (i_this->mpMorf->isStop()) { actor->speedF = 0.0f; i_this->mCountDownTimers[2] = 20*30; - anm_init(i_this, AM2_BCK_MAHI, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_MAHI, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mState++; } } @@ -795,7 +795,7 @@ static void action_mahi(am2_class* i_this) { if (i_this->mCountDownTimers[2] == 0) { if (i_this->mCurrBckIdx != AM2_BCK_BURUBURU) { - anm_init(i_this, AM2_BCK_BURUBURU, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_BURUBURU, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mCountDownTimers[3] = 20*30; cLib_offBit(actor->attention_info.flags, fopAc_Attn_ACTION_CARRY_e); fopAcM_seStart(i_this, JA_SE_CM_AM2_RECOVER, 0); @@ -841,7 +841,7 @@ static void action_itai(am2_class* i_this) { dComIfGp_particle_set(dPa_name::ID_SCENE_81AE, &i_this->mWeakPos, &i_this->shape_angle); if (i_this->health > 0) { - anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); if (i_this->mCountDownTimers[2] > 5) { i_this->speedF = 5.0f; } @@ -859,7 +859,7 @@ static void action_itai(am2_class* i_this) { i_this->mAction = ACTION_DOUSA; i_this->mState = 3; } else { - anm_init(i_this, AM2_BCK_MAHI, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_MAHI, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mAction = ACTION_MAHI; i_this->mState = 12; } @@ -870,7 +870,7 @@ static void action_itai(am2_class* i_this) { i_this->mWeakSph.OffTgSetBit(); i_this->mEyeSph.ClrTgHit(); i_this->mWeakSph.ClrTgHit(); - anm_init(i_this, AM2_BCK_DEAD1, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_DEAD1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState++; break; case 23: @@ -884,7 +884,7 @@ static void action_itai(am2_class* i_this) { i_this->speedF = 10.0f; i_this->mCountDownTimers[0] = 100; i_this->current.angle.y = fopAcM_searchPlayerAngleY(i_this); - anm_init(i_this, AM2_BCK_DEAD2, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_DEAD2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState++; // Fall-through case 24: @@ -916,7 +916,7 @@ static void action_itai(am2_class* i_this) { } if (i_this->mCountDownTimers[0] == 0) { - anm_init(i_this, AM2_BCK_DEAD3, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_DEAD3, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(i_this, JA_SE_CM_AM2_BEF_EXPLODE, 0); i_this->speedF = 0.0f; @@ -943,7 +943,7 @@ static void action_itai(am2_class* i_this) { if (naraku_check(i_this)) { if (i_this->mbNotInHomeRoom || i_this->health <= 0) { if (i_this->mState != 25) { - anm_init(i_this, AM2_BCK_DEAD3, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_DEAD3, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(i_this, JA_SE_CM_AM2_BEF_EXPLODE, 0); i_this->speedF = 0.0f; i_this->mState = 25; @@ -1011,7 +1011,7 @@ static void action_modoru_move(am2_class* i_this) { i_this->mInAbyssTimer = 0; i_this->mbMadeWaterSplash = false; i_this->mRippleCb.end(); - anm_init(i_this, AM2_BCK_WAIT, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, AM2_BCK_WAIT, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); fopAcM_seStart(i_this, JA_SE_CM_AM2_WTR_RECOVER, 0); i_this->mState++; // Fall-through @@ -1187,7 +1187,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { (J3DModelData*)dComIfG_getObjectRes("AM2", AM2_BDL_AM2), NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("AM2", AM2_BCK_WAIT), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00000000, 0x11020203 @@ -1200,14 +1200,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { i_this->mpBtkAnm = new mDoExt_btkAnm(); if (!i_this->mpBtkAnm) { return FALSE; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("AM2", AM2_BTK_AM2); - int ret = i_this->mpBtkAnm->init(model->getModelData(), pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + int ret = i_this->mpBtkAnm->init(model->getModelData(), pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); if (!ret) { return FALSE; } if (!i_this->mpBtkAnm) { return FALSE; } i_this->mpBrkAnm = new mDoExt_brkAnm(); if (!i_this->mpBrkAnm) { return FALSE; } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("AM2", AM2_BRK_AM2); - ret = i_this->mpBrkAnm->init(model->getModelData(), pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + ret = i_this->mpBrkAnm->init(model->getModelData(), pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); if (!ret) { return FALSE; } if (!i_this->mpBrkAnm) { return FALSE; } diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index 768f5bc9d..e435b8857 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -38,7 +38,7 @@ BOOL daArrow_Iceeff_c::CreateHeap() { J3DAnmTransform* bck = static_cast(dComIfG_getObjectRes("Link", LINK_BCK_GICER01)); JUT_ASSERT(107, bck != NULL); - if(!mBck.init(modelData, bck, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) { + if(!mBck.init(modelData, bck, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { return false; } } diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index d3d9bcf2f..0cfa551b4 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -114,10 +114,10 @@ BOOL daArrow_Lighteff_c::CreateHeap() { JUT_ASSERT(216, btk != NULL); JUT_ASSERT(217, brk != NULL); - if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { return false; } - if(!mBrk.init(modelData, brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) { + if(!mBrk.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { return false; } diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index 5306416b3..2c9899e66 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -129,7 +129,7 @@ BOOL daBFlower_c::CreateHeap() { J3DAnmTransform* pbck = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAHX)); JUT_ASSERT(0x1C3, pbck != NULL); - if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_RESET_e, 1.0f, 0, -1, false)) { + if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, false)) { return FALSE; } mBck1.setFrame(mBck1.getEndFrame()); @@ -137,7 +137,7 @@ BOOL daBFlower_c::CreateHeap() { J3DAnmTevRegKey* pbrk = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAHX)); JUT_ASSERT(0x1D9, pbrk != NULL); - if (!mBrk1.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) { + if (!mBrk1.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { return FALSE; } mBrk1.setPlaySpeed(0.0f); @@ -153,7 +153,7 @@ BOOL daBFlower_c::CreateHeap() { pbck = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAMX)); JUT_ASSERT(0x1F7, pbck != NULL); - if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) { + if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { return FALSE; } mBck2.setPlaySpeed(0.0f); @@ -161,7 +161,7 @@ BOOL daBFlower_c::CreateHeap() { pbrk = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAMX)); JUT_ASSERT(0x208, pbrk != NULL); - if (!mBrk2.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) { + if (!mBrk2.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { return FALSE; } mBrk2.setPlaySpeed(0.0f); @@ -230,7 +230,7 @@ int daBFlower_c::init_bck_anm(s16 param) { J3DModelData* pModelData = static_cast(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKH)); J3DAnmTransform* pBck = static_cast(dComIfG_getObjectRes(m_arcname, param)); - return mBck1.init(pModelData, pBck, TRUE, J3DFrameCtrl::LOOP_ONCE_RESET_e, 1.0f, 0, -1, true); + return mBck1.init(pModelData, pBck, TRUE, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, true); } /* 0000080C-000008AC .text _create__11daBFlower_cFv */ diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 5aaa93c38..7e540b085 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -50,7 +50,7 @@ BOOL daBg_btkAnm_c::create(J3DModelData* modelData, J3DAnmTextureSRTKey* anmData if (anm == NULL) return FALSE; - if (!anm->init(modelData, anmData, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) + if (!anm->init(modelData, anmData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) return FALSE; J3DAnmTextureSRTKey * data = anm->getBtkAnm(); @@ -91,7 +91,7 @@ BOOL daBg_brkAnm_c::create(J3DModelData* modelData, J3DAnmTevRegKey* anmData) { if (anm == NULL) return FALSE; - if (!anm->init(modelData, anmData, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) + if (!anm->init(modelData, anmData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) return FALSE; J3DAnmTevRegKey * data = anm->getBrkAnm(); diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index b58e81450..994ef91de 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -187,7 +187,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_ac) { if (i_this->mpBrkAnm == NULL) return FALSE; J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Bita", ita_Ef[type]); - if (!i_this->mpBrkAnm->init(i_this->mpModelEf->getModelData(), brk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) + if (!i_this->mpBrkAnm->init(i_this->mpModelEf->getModelData(), brk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) return FALSE; i_this->mpBgW = new dBgW(); diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index b031e6e3f..cf9e74ae0 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) { diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index bd65ad7d0..e1c1471d3 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -273,11 +273,11 @@ namespace daBomb2 { J3DAnmTransform* bck_data = static_cast(dComIfG_getObjectRes(resName, VBAKH_BCK_VBAKM)); JUT_ASSERT(0x30D, bck_data != NULL); - int temp = mBck0.init(mdl_data, bck_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false); + int temp = mBck0.init(mdl_data, bck_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); J3DAnmTevRegKey* brk_data = static_cast(dComIfG_getObjectRes(resName, VBAKH_BRK_VBAKM)); JUT_ASSERT(0x314, brk_data != NULL); - int temp3 = mBrk0.init(mdl_data, brk_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0); + int temp3 = mBrk0.init(mdl_data, brk_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); return mpModel && temp && temp3; } diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index ac6ff3243..82aff58af 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -1284,19 +1284,19 @@ BOOL daBomb_c::createHeap() { J3DAnmTransform* bck0_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAMX)); JUT_ASSERT(0x9AE, bck0_data != NULL); - int temp = mBck0.init(modelData, bck0_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false); + int temp = mBck0.init(modelData, bck0_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); J3DAnmTransform* bck1_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAKM)); JUT_ASSERT(0x9B4, bck1_data != NULL); - int temp2 = mBck1.init(modelData, bck1_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false); + int temp2 = mBck1.init(modelData, bck1_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); J3DAnmTevRegKey* brk0_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAMX)); JUT_ASSERT(0x9BB, brk0_data != NULL); - int temp3 = mBrk0.init(modelData, brk0_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0); + int temp3 = mBrk0.init(modelData, brk0_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); J3DAnmTevRegKey* brk1_data = static_cast(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAKM)); JUT_ASSERT(0x9C1, brk1_data != NULL); - int temp4 = mBrk1.init(modelData, brk1_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0); + int temp4 = mBrk1.init(modelData, brk1_data, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); return mpModel && temp && temp2 && temp3 && temp4; } @@ -1310,7 +1310,7 @@ BOOL daBomb_c::createHeap() { } else { J3DAnmTransform* bck0_data = (J3DAnmTransform*)dComIfG_getObjectRes(m_attrType[mType].resName, LINK_BCK_BOMB); - int temp = mBck0.init(modelData, bck0_data, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false); + int temp = mBck0.init(modelData, bck0_data, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); return temp ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp index 26a3edb0c..4baefa8f3 100644 --- a/src/d/actor/d_a_dai_item.cpp +++ b/src/d/actor/d_a_dai_item.cpp @@ -236,18 +236,18 @@ BOOL daStandItem_c::CreateHeap() { mpBckAnm = new mDoExt_bckAnm(); static const u32 playmode[] = { - J3DFrameCtrl::LOOP_REPEAT_e, /* FLOWER_1 */ - J3DFrameCtrl::LOOP_REPEAT_e, /* FLOWER_2 */ - J3DFrameCtrl::LOOP_REPEAT_e, /* FLOWER_3 */ - -1, /* HEROS_FLAG */ - -1, /* TAIRYO_FLAG */ - J3DFrameCtrl::LOOP_REPEAT_e, /* SALES_FLAG */ - J3DFrameCtrl::LOOP_REPEAT_e, /* WIND_FLAG */ - J3DFrameCtrl::LOOP_REPEAT_e, /* RED_FLAG */ - J3DFrameCtrl::LOOP_REPEAT_e, /* FOSSIL_HEAD */ - J3DFrameCtrl::LOOP_ONCE_e, /* WATER_STATUE */ - J3DFrameCtrl::LOOP_REPEAT_e, /* POSTMAN_STATUE */ - J3DFrameCtrl::LOOP_REPEAT_e, /* PRESIDENT_STATUE */ + /* FLOWER_1 */ J3DFrameCtrl::EMode_LOOP, + /* FLOWER_2 */ J3DFrameCtrl::EMode_LOOP, + /* FLOWER_3 */ J3DFrameCtrl::EMode_LOOP, + /* HEROS_FLAG */ -1, + /* TAIRYO_FLAG */ -1, + /* SALES_FLAG */ J3DFrameCtrl::EMode_LOOP, + /* WIND_FLAG */ J3DFrameCtrl::EMode_LOOP, + /* RED_FLAG */ J3DFrameCtrl::EMode_LOOP, + /* FOSSIL_HEAD */ J3DFrameCtrl::EMode_LOOP, + /* WATER_STATUE */ J3DFrameCtrl::EMode_NONE, + /* POSTMAN_STATUE */ J3DFrameCtrl::EMode_LOOP, + /* PRESIDENT_STATUE */ J3DFrameCtrl::EMode_LOOP, }; if (mpBckAnm == NULL || !mpBckAnm->init(modelData, pbck, TRUE, playmode[mItemType], 1.0f, 0, -1, false)) diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index 2cd0b88e3..122683cb0 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -72,14 +72,14 @@ BOOL daDekuItem_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDK); JUT_ASSERT(0x103, pbck != NULL); - if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) { + if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { return FALSE; } pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDM); JUT_ASSERT(0x110, pbck != NULL); - if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) { + if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { return FALSE; } diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 436c879cd..6ea0294df 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -61,14 +61,14 @@ static void move(dr_class* i_this) { switch (i_this->mState) { case 0: isIdle = true; - anm_init(i_this, DR_BCK_DR_WAIT1, l_HIO.mWait1Morf, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, DR_BCK_DR_WAIT1, l_HIO.mWait1Morf, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mState++; i_this->mCountDownTimers[0] = (s16)(200.0f + cM_rndF(200.0f)); break; case 1: isIdle = true; if (i_this->mCountDownTimers[0] == 0) { - anm_init(i_this, DR_BCK_DR_AKUBI1, l_HIO.mAkubi1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_AKUBI1); + anm_init(i_this, DR_BCK_DR_AKUBI1, l_HIO.mAkubi1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_AKUBI1); i_this->mState++; } break; @@ -79,7 +79,7 @@ static void move(dr_class* i_this) { } break; case 10: - anm_init(i_this, DR_BCK_DR_BIKU1, l_HIO.mBiku1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_BIKU1); + anm_init(i_this, DR_BCK_DR_BIKU1, l_HIO.mBiku1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_BIKU1); i_this->mState++; i_this->mCountDownTimers[0] = l_HIO.m0E; i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C4, &i_this->current.pos); @@ -99,11 +99,11 @@ static void move(dr_class* i_this) { if (i_this->mCountDownTimers[0] != 0) { if (cM_rndF(1.0f) < 0.5f) { - anm_init(i_this, DR_BCK_DR_ABARE1, l_HIO.mAbare1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_ABARE1); + anm_init(i_this, DR_BCK_DR_ABARE1, l_HIO.mAbare1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_ABARE1); i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C5, &i_this->current.pos); i_this->mCountDownTimers[1] = 500; } else { - anm_init(i_this, DR_BCK_DR_ABARE2, l_HIO.mAbare2Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, DR_BAS_ABARE2); + anm_init(i_this, DR_BCK_DR_ABARE2, l_HIO.mAbare2Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_ABARE2); cXyz rootPos; cXyz offset(0.0f, 0.0f, 0.0f); @@ -116,7 +116,7 @@ static void move(dr_class* i_this) { i_this->mCountDownTimers[1] = 0; } } else { - anm_init(i_this, DR_BCK_DR_HO1, l_HIO.mHo1Morf, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, DR_BCK_DR_HO1, l_HIO.mHo1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C6, &i_this->current.pos); i_this->mState++; } @@ -219,7 +219,7 @@ static BOOL createHeap(fopAc_ac_c* i_actor) { (J3DModelData*)dComIfG_getObjectRes("Dr", DR_BMD_DR1), NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Dr", DR_BCK_DR_BIKU1), - J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, 1, dComIfG_getObjectRes("Dr", DR_BAS_BIKU1), 0x00000000, 0x11020203 diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index efdb5b8ff..beccfae66 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -86,17 +86,17 @@ int daFan_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_01); JUT_ASSERT(400, pbtk != NULL); - if (!mWindBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,-1, false, 0)) + if (!mWindBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,-1, false, 0)) return FALSE; pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_02); JUT_ASSERT(0x19c, pbtk != NULL); - if (!mWindBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0,-1, false, 0)) + if (!mWindBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0,-1, false, 0)) return FALSE; J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BCK_YAFLW00); JUT_ASSERT(0x1a9, pbck != NULL); - if (!mWindBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,-1, false)) + if (!mWindBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,-1, false)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index 0e4e9dd41..e8a0f204b 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -101,9 +101,9 @@ static BOOL daFganon_Draw(fganon_class* i_this) { /* Appear Animation 1 */ void deru_brk(fganon_class* i_this) { J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_MAIN1); - i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, TRUE, 0); + i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_KEN1); - i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, TRUE, 0); + 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; @@ -115,12 +115,12 @@ void kieru_brk(fganon_class* i_this, unsigned char param_2) { J3DAnmTevRegKey* ptrkAnm; if ((param_2 == 0) || (param_2 == 1)) { ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_KIERU_MAIN1); - i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, TRUE, 0); + i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); fopAcM_seStart(i_this, JA_SE_CM_PG_DISAPPEAR, 0); } if ((param_2 == 0) || (param_2 == 2)) { ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Pgsw", PGSW_BRK_KIERU_KEN1); - i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, TRUE, 0); + i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); } i_this->mbIsMaterialized = FALSE; return; @@ -130,9 +130,9 @@ void kieru_brk(fganon_class* i_this, unsigned char param_2) { /* Appear Animation 2 */ void deru_brk2(fganon_class* i_this) { J3DAnmTevRegKey* ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_MAIN2); - i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, TRUE, 0); + i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_KEN2); - i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, TRUE, 0); + 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; @@ -143,9 +143,9 @@ void deru_brk2(fganon_class* i_this) { void kieru_brk2(fganon_class* i_this) { J3DAnmTevRegKey* ptrkAnm; ptrkAnm = (J3DAnmTevRegKey *)(J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_KIERU_MAIN2); - i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, TRUE, 0); + i_this->mpBrkAnm1->init(i_this->mpMorf->getModel()->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, TRUE, 0); ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_KIERU_KEN2); - i_this->mpBrkAnm2->init(i_this->mpKenModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, TRUE, 0); + 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; @@ -210,18 +210,18 @@ void fly(fganon_class* i_this) { i_this->current.pos.y = player->current.pos.y + l_HIO.m10; i_this->shape_angle.y = fopAcM_searchPlayerAngleY(a_this); i_this->m388 = 1; - anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m3A4[1] = 60; break; case 0: - anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m388++; i_this->m3A0 = 0.0f; i_this->m3A4[1] = (short)(cM_rndF(50.0f) + 50.0f); // Fall-through case 1: if (i_this->m68A == 1) { - anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } mDoMtx_YrotS(*calc_mtx, i_this->m398); cXyz posVec; @@ -266,7 +266,7 @@ void shot(fganon_class* i_this) { switch(i_this->m388) { case 0: { if (!i_this->m408) { - anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m388++; i_this->m3A4[0] = 40; fopAcM_monsSeStart(i_this, JA_SE_CV_PG_EBALL_MAKE_S, 0); @@ -283,7 +283,7 @@ void shot(fganon_class* i_this) { fopAcM_seStart(i_this, JA_SE_CM_PG_EBALL_MAKING_S, 0); } if (i_this->m3A4[0] == 0) { - anm_init(i_this, FGANON_BCK_NAGERU1, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_NAGERU1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m388++; fopAcM_monsSeStart(i_this, JA_SE_CV_PG_EBALL_FIRE_S, 0); mDoAud_seStart(JA_SE_CM_PG_EBALL_FIRE_S, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); @@ -299,7 +299,7 @@ void shot(fganon_class* i_this) { i_this->m689 = 0; } if (i_this->mpMorf->isStop()) { - anm_init(i_this, FGANON_BCK_WAIT1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m388++; } // Fall-through @@ -310,10 +310,10 @@ void shot(fganon_class* i_this) { if (std::sqrtf(PSVECSquareMag(&local_34)) < REG0_F(1) + (i_this->m404 * (REG0_F(0) + 10.0f) + 400.0f)) { if (i_this->m689 == 0) { if (cM_rndF(1.0f) < 0.5f) { - anm_init(i_this, FGANON_BCK_TENNISLR1, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_TENNISLR1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } else { - anm_init(i_this, FGANON_BCK_TENNISRL1, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_TENNISRL1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } i_this->m388++; fopAcM_monsSeStart(i_this, JA_SE_CV_PG_REFLECT_EBALL, 0); @@ -338,7 +338,7 @@ void shot(fganon_class* i_this) { } if (i_this->mpMorf->isStop() || ((i_this->m2BC >= 1) && (i_this->mpMorf->getFrame() >= 20.0f))) { - anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m388 = 3; } // Fall-through @@ -378,7 +378,7 @@ void spinattack(fganon_class* i_this) { linChk.Set(&player->eyePos, &i_this->current.pos, a_this); if (!dComIfG_Bgsp()->LineCross(&linChk)) { i_this->current.pos.y -= 100.0f; - anm_init(i_this, FGANON_BCK_WAIT1, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m388 = 2; i_this->m3A4[0] = 30; deru_brk(i_this); @@ -391,7 +391,7 @@ void spinattack(fganon_class* i_this) { } case 2: { if (i_this->m3A4[0] == 0) { - anm_init(i_this, FGANON_BCK_KAITEN1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_KAITEN1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m388 = 3; i_this->speedF = 0.0f; fopAcM_monsSeStart(i_this, JA_SE_CV_PG_EBALL_FIRE_S, 0); @@ -447,18 +447,18 @@ void fly2(fganon_class* i_this) { i_this->current.pos.y = player->current.pos.y + l_HIO.m18; i_this->shape_angle.y = fopAcM_searchPlayerAngleY(a_this); i_this->m388 = 1; - anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m3A4[1] = 40; break; case 0: - anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m388++; i_this->m3A0 = 0.0f; i_this->m3A4[1] = (short)(cM_rndF(50.0f) + 50.0f); // Fall-through case 1: if (i_this->m68A == 1) { - anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } mDoMtx_YrotS(*calc_mtx, i_this->m398); cXyz posVec; @@ -589,7 +589,7 @@ void shot2(fganon_class* i_this) { int mFrame = i_this->mpMorf->mFrameCtrl.getFrame(); switch(i_this->m388) { case 0: { - anm_init(i_this, FGANON_BCK_TAME_S1, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_TAME_S1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); for (int i = 0; i < 2; i++) { if (i_this->mEmitters2[i] != NULL) { i_this->mEmitters2[i]->becomeInvalidEmitter(); @@ -610,7 +610,7 @@ void shot2(fganon_class* i_this) { } } if (i_this->mpMorf->isStop()) { - anm_init(i_this, FGANON_BCK_TAME_S2, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_TAME_S2, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m3A4[0] = l_HIO.m3C; i_this->m388++; for (int i = 0; i < 2; i++) { @@ -629,7 +629,7 @@ void shot2(fganon_class* i_this) { case 2: { fopAcM_seStart(i_this, JA_SE_CM_PG_EBALL_MAKING_L, 0); if (i_this->m3A4[0] == 0) { - anm_init(i_this, FGANON_BCK_NAGERU_S1, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_NAGERU_S1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m388++; i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_821C, &i_this->current.pos, NULL); i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_821D, &i_this->current.pos, NULL); @@ -673,7 +673,7 @@ void shot2(fganon_class* i_this) { } case 4: { if (i_this->m68A == 1) { - anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } if (i_this->m3A4[0] == 0) { i_this->m386 = 9; @@ -717,7 +717,7 @@ void spinattack2(fganon_class* i_this) { cXyz transformedPos; MtxPosition(&posVec, &transformedPos); i_this->current.pos = player->current.pos + transformedPos; - anm_init(i_this, 10, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, 10, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m388 = 2; deru_brk(i_this); i_this->m38C = player->current.pos; @@ -731,7 +731,7 @@ void spinattack2(fganon_class* i_this) { local_e4 = i_this->m38C - i_this->current.pos; float fVar11 = std::sqrtf(PSVECSquareMag(&local_e4)); if (fVar11 < l_HIO.m38) { - anm_init(i_this, 9, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, 9, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m388 = 3; i_this->speedF = 0.0f; fopAcM_monsSeStart(i_this, JA_SE_CV_PG_EBALL_FIRE_S, 0); @@ -754,7 +754,7 @@ void spinattack2(fganon_class* i_this) { if (i_this->m68F == 0) { i_this->m388 = 4; i_this->m3A4[0] = 40; - anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } else { i_this->m386 = 2; @@ -779,7 +779,7 @@ void spinattack2(fganon_class* i_this) { void down(fganon_class* i_this) { switch(i_this->m388) { case 0: { - anm_init(i_this, 6, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, 6, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m388++; i_this->speed.y = 0.0f; } @@ -788,7 +788,7 @@ void down(fganon_class* i_this) { if (i_this->mAcch.ChkGroundHit()) { if (i_this->mpMorf->isStop()) { i_this->m388++; - anm_init(i_this, FGANON_BCK_TYAKUTI1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_TYAKUTI1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); } } i_this->m3A4[0] = l_HIO.m48; @@ -797,7 +797,7 @@ void down(fganon_class* i_this) { case 2: { if (i_this->mpMorf->isStop()) { i_this->m388++; - anm_init(i_this, 8, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, 8, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } break; } @@ -809,7 +809,7 @@ void down(fganon_class* i_this) { break; } case 10: { - anm_init(i_this, 7, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, 7, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m388 = 2; } default: @@ -962,7 +962,7 @@ void fail(fganon_class* i_this) { case 0: { kieru_brk(i_this, 1); i_this->m388 = 1; - anm_init(i_this, 7, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, 7, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); break; } case 1: { @@ -1133,7 +1133,7 @@ void start(fganon_class* i_this) { if (distXZ < i_this->m2BD * 10.0f) { i_this->mB54 = 1; i_this->m388 = 1; - anm_init(i_this, FGANON_BCK_WAIT1, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WAIT1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); mDoAud_bgmAllMute(30); } break; @@ -1143,7 +1143,7 @@ void start(fganon_class* i_this) { break; } case 2: { - anm_init(i_this, FGANON_BCK_WARAU1, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WARAU1, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); fopAcM_monsSeStart(i_this, JA_SE_CV_PG_LAUGH_2, 0); i_this->m388 = 3; break; @@ -1151,7 +1151,7 @@ void start(fganon_class* i_this) { case 4: { i_this->m388 = 5; i_this->m3A4[0] = REG0_S(0) + 0x50; - anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_TAME1, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } case 5: { if (i_this->m3A4[0] == (s16)(REG0_S(0) + 0x4B)) { @@ -1190,7 +1190,7 @@ void end(fganon_class* i_this) { switch(i_this->m388) { case 0: { i_this->m388 = 1; - anm_init(i_this, FGANON_BCK_LAST_DAMAGE1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_LAST_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mB54 = 50; dComIfGs_onEventBit(0x3f20); // PG_DEFEATED? It appears further down in `energy_ball_move` break; @@ -1202,14 +1202,14 @@ void end(fganon_class* i_this) { } case 2: { deru_brk(i_this); - anm_init(i_this, FGANON_BCK_WARAU1, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WARAU1, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); fopAcM_monsSeStart(i_this, JA_SE_CV_PG_LAUGH_2, 0); i_this->m388 = 3; break; } case 4: { deru_brk(i_this); - anm_init(i_this, FGANON_BCK_SARU1, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_SARU1, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m388 = 5; i_this->speed.y = 0.0f; fopAcM_seStart(i_this, JA_SE_CM_PG_END_1, 0); @@ -1243,7 +1243,7 @@ void last_end(fganon_class* i_this) { switch(i_this->m388) { case 0: { i_this->m388 = 1; - anm_init(i_this, FGANON_BCK_MOGAKU1, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_MOGAKU1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mB54 = 100; i_this->m3C0 = 10000.0f; i_this->m3A4[0] = REG0_S(4) + 25; @@ -1412,7 +1412,7 @@ void damage_check(fganon_class* i_this) { if (atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == PROC_FGMAHOU)) { i_this->m670++; - anm_init(i_this, 6, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, 6, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m3A4[0] = 60; @@ -2364,7 +2364,7 @@ static BOOL daFganon_Execute(fganon_class* i_this) { if (((((i_this->m386 == 5) || (i_this->m386 == 9)) || (i_this->m386 == 7)) || (i_this->m386 == 10)) && ((i_this->m68B != 0 && (i_this->m68A == 0)))) { i_this->m68B = 0; - anm_init(i_this, FGANON_BCK_WARAU1, 6.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, FGANON_BCK_WARAU1, 6.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->m68A = 60; fopAcM_monsSeStart(i_this, JA_SE_CV_PG_LAUGH_3, 0); } @@ -2606,7 +2606,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { mDoExt_McaMorf* morf = new mDoExt_McaMorf((J3DModelData *)dComIfG_getObjectRes("Fganon", FGANON_BDL_BPG), NULL, NULL, (J3DAnmTransformKey *)dComIfG_getObjectRes("Fganon", FGANON_BCK_WAIT1), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, NULL, 0, 0x11020203); + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0, 0x11020203); i_this->mpMorf = morf; if ((i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL)) @@ -2617,7 +2617,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_MAIN1); - iVar4 = i_this->mpBrkAnm1->init(i_this->mpMorf->mpModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, FALSE, 0); + iVar4 = i_this->mpBrkAnm1->init(i_this->mpMorf->mpModel->getModelData(), ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, FALSE, 0); if (iVar4 == 0) return FALSE; @@ -2632,7 +2632,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_DERU_KEN1); - iVar4 = i_this->mpBrkAnm2->init(pModelData, ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, FALSE, 0); + iVar4 = i_this->mpBrkAnm2->init(pModelData, ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, FALSE, 0); if (iVar4 == 0) return FALSE; @@ -2646,7 +2646,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; ptsrtkAnm = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("Fganon", FGANON_BTK_YDKBL00); - iVar4 = i_this->mpBtkAnm->init(pModelData, ptsrtkAnm, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, FALSE, 0); + iVar4 = i_this->mpBtkAnm->init(pModelData, ptsrtkAnm, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, FALSE, 0); if (iVar4 == 0) return FALSE; @@ -2655,7 +2655,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { return FALSE; ptrkAnm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Fganon", FGANON_BRK_YDKBL00); - iVar4 = i_this->mpBrkAnm3->init(pModelData, ptrkAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, FALSE, 0); + iVar4 = i_this->mpBrkAnm3->init(pModelData, ptrkAnm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, FALSE, 0); if (iVar4 == 0) return FALSE; diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 9998b8f44..44c4f2f0b 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -44,7 +44,7 @@ BOOL daGhostship_c::_createHeap() { J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH)); JUT_ASSERT(95, btk != NULL); - if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { return false; } diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index 017f8c2ed..4733ddf8f 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -428,12 +428,12 @@ BOOL daIball_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, ALWAYS_BCK_START); JUT_ASSERT(1152, pbck != NULL); - int ret = mBckAnm.init(modelData, pbck, 1, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false); + int ret = mBckAnm.init(modelData, pbck, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); if (!ret) { return FALSE; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, ALWAYS_BTK_IB); JUT_ASSERT(1164, pbtk != NULL); - ret = mBtkAnm.init(modelData, pbtk, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + ret = mBtkAnm.init(modelData, pbtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); if (!ret) { return FALSE; } int brkIds[ARRAY_SIZE(mBrkAnm)] = { @@ -444,7 +444,7 @@ BOOL daIball_c::CreateHeap() { for (int i = 0; i < (int)ARRAY_SIZE(mBrkAnm); i++) { pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, brkIds[i]); JUT_ASSERT(1182, pbrk != NULL); - ret = mBrkAnm[i].init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + ret = mBrkAnm[i].init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); if (!ret) { return FALSE; } } diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index b1e99fd8a..282b6d15e 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -61,7 +61,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm1); JUT_ASSERT(140, pbtk != NULL); mpBtkAnm1 = new mDoExt_btkAnm(); - if (!mpBtkAnm1 || !mpBtkAnm1->init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if (!mpBtkAnm1 || !mpBtkAnm1->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { return FALSE; } } @@ -71,7 +71,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm2); JUT_ASSERT(156, pbtk != NULL); mpBtkAnm2 = new mDoExt_btkAnm(); - if (!mpBtkAnm2 || !mpBtkAnm2->init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if (!mpBtkAnm2 || !mpBtkAnm2->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { return FALSE; } } @@ -87,7 +87,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, shouldAnimate = FALSE; } mpBrkAnm1 = new mDoExt_brkAnm(); - if (!mpBrkAnm1 || !mpBrkAnm1->init(modelData, pbrk, shouldAnimate, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, false)) { + if (!mpBrkAnm1 || !mpBrkAnm1->init(modelData, pbrk, shouldAnimate, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, false)) { return FALSE; } } @@ -97,7 +97,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(resName, brkAnm2); JUT_ASSERT(197, pbrk != NULL); mpBrkAnm2 = new mDoExt_brkAnm(); - if (!mpBrkAnm2 || !mpBrkAnm2->init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, false)) { + if (!mpBrkAnm2 || !mpBrkAnm2->init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, false)) { return FALSE; } } diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index 1b14ce583..71ec47a30 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -31,7 +31,7 @@ BOOL daKaji_c::CreateHeap() { modelData, NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Kaji", KAJI_INDEX_BCK_KJ_WAIT), - J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, 1, dComIfG_getObjectRes("Kaji", KAJI_INDEX_BAS_KJ_WAIT), 0x00080000, 0x11000002 diff --git a/src/d/actor/d_a_komore.cpp b/src/d/actor/d_a_komore.cpp index e43820856..ab82e1087 100644 --- a/src/d/actor/d_a_komore.cpp +++ b/src/d/actor/d_a_komore.cpp @@ -32,7 +32,7 @@ bool daKomore::Act_c::create_heap() { JUT_ASSERT(0x6d, btk_data != NULL); s32 btkRet = - mBtkAnm.init(mdl_data, btk_data, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + mBtkAnm.init(mdl_data, btk_data, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); bool ret = FALSE; if (mdl_data != NULL && this->mpModel != NULL && btkRet != NULL) { diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index 152811cd8..f098dac50 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -14,7 +14,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_ac) { kytag03_class* i_this = (kytag03_class*)i_ac; i_this->mpModel = new mDoExt_McaMorf( (J3DModelData*)dComIfG_getObjectRes("M_DOOR", M_DOOR_BDL_MYAMIF), - NULL, NULL, NULL, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0, -1, 1, NULL, 0x0, 0x11020203 + NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 0.0f, 0, -1, 1, NULL, 0x0, 0x11020203 ); if (i_this->mpModel == NULL || i_this->mpModel->getModel() == NULL) diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index 32e0f23fd..ba28c82b2 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -29,14 +29,14 @@ BOOL daLbridge_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BTK_GBRG00); JUT_ASSERT(0xE8, pbtk != NULL); - if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { return FALSE; } J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(m_arcname, GBRG00_BPK_GBRG00); JUT_ASSERT(0xF6, pbpk != NULL); - if (!mBpkAnm.init(modelData, pbpk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) { + if (!mBpkAnm.init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { return FALSE; } @@ -46,7 +46,7 @@ BOOL daLbridge_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BRK_GBRG00); JUT_ASSERT(0x106, pbrk != NULL); - if (!mBrkAnm.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if (!mBrkAnm.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { return FALSE; } diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index a39315af2..b3fad07be 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -79,7 +79,7 @@ BOOL daMozo_c::CreateHeap() { 0, 0, static_cast(dComIfG_getObjectRes("Mozo", MOZO_BCK_MOZ)), - J3DFrameCtrl::LOOP_REPEAT_e, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, @@ -97,8 +97,8 @@ BOOL daMozo_c::CreateHeap() { m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_BTK_MOZ); JUT_ASSERT(0x16D, m_btk != NULL); - int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0); - int btkInitResult = mBtkAnm.init(mdlData, m_btk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0); + int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); + int btkInitResult = mBtkAnm.init(mdlData, m_btk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); return mdlData != 0 && mAnimMorf != 0 && mAnimMorf->getModel() != 0 && brkInitResult != 0 && btkInitResult != 0; } diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 3ac7c7355..67728799b 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -429,7 +429,7 @@ BOOL daNh_c::initBrkAnm(bool i_modify) { J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", ALWAYS_BRK_TNH); JUT_ASSERT(883, a_brk != NULL); - if (mBrkAnm.init(modelData, a_brk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, i_modify, false)) { + if (mBrkAnm.init(modelData, a_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, i_modify, false)) { success = true; } return success; diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index db88c0976..789611ff2 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -190,7 +190,7 @@ BOOL daNpc_Bs1_c::initTexPatternAnm(bool i_modify) { J3DModelData* modelData = mpMorf->getModel()->getModelData(); m_head_tex_pattern = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bs", l_btp_ix_tbl[m828]); JUT_ASSERT(0x1bd, m_head_tex_pattern != NULL); - if (!mBtpAnm.init(modelData, m_head_tex_pattern, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, i_modify, 0)) { + if (!mBtpAnm.init(modelData, m_head_tex_pattern, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, i_modify, 0)) { return FALSE; } mFrame = 0; @@ -213,16 +213,16 @@ void daNpc_Bs1_c::playTexPatternAnm() { /* 000007F8-0000087C .text setAnm__11daNpc_Bs1_cFSc */ void daNpc_Bs1_c::setAnm(s8 index) { static u32 play_mode_tbl[10] = { - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_ONCE_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_NONE, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, }; static f32 morf_frame_tbl[10] = {8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f}; static f32 play_speed_tbl[10] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f}; @@ -2168,7 +2168,7 @@ BOOL daNpc_Bs1_c::CreateHeap() { modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Bs", BS_INDEX_BCK_BS_WAIT01), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, NULL, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0, 0x11020203 ); if (!mpMorf || !mpMorf->getModel()) { diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 6331d2b4c..687757870 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -135,7 +135,7 @@ BOOL daNpc_Btsw2_c::initTexPatternAnm(bool i_modify) { J3DModelData* modelData = mpMorf->getModel()->getModelData(); m_btp = static_cast(dComIfG_getObjectRes(m_arc_name, l_btp_ix_tbl[m744])); JUT_ASSERT(282, m_btp != NULL); - if (!mBtpAnm.init(modelData, m_btp, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, i_modify, 0)) { + if (!mBtpAnm.init(modelData, m_btp, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, i_modify, 0)) { return FALSE; } mBtpFrame = 0; @@ -158,17 +158,17 @@ void daNpc_Btsw2_c::playTexPatternAnm() { /* 000005B0-0000067C .text setAnm__13daNpc_Btsw2_cFSc */ void daNpc_Btsw2_c::setAnm(s8 param_0) { static int a_play_mode_tbl[] = { - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_ONCE_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_ONCE_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_ONCE_e, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_NONE, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_NONE, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_NONE, }; static f32 a_morf_frame_tbl[] = { 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, @@ -347,7 +347,7 @@ BOOL daNpc_Btsw2_c::CreateHeap() { modelData, NULL, NULL, static_cast(dComIfG_getObjectRes(m_arc_name, BTSW_INDEX_BCK_BN_WAIT01)), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, NULL, 0x80000, 0x15020022 + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, 0x15020022 ); if (mpMorf == NULL || mpMorf->getModel() == NULL) { return FALSE; diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 1ab4c6b2b..db58a3bc9 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -1754,7 +1754,7 @@ u32 daNpc_Ji1_c::evn_hide_init(int staffIdx) { /* 00005508-000055E4 .text AnimeControlToWait__11daNpc_Ji1_cFv */ void daNpc_Ji1_c::AnimeControlToWait() { /* Nonmatching */ - if(field_0x330->getPlayMode() == J3DFrameCtrl::LOOP_ONCE_e) { + if(field_0x330->getPlayMode() == J3DFrameCtrl::EMode_NONE) { if(field_0x330->checkFrame(field_0x330->getEndFrame() - 1.0f)) { if(isAttackAnim() || isGuardAnim()) { setAnm(5, 4.0f, 0); @@ -3035,10 +3035,10 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) { field_0x330->setAnm(temp1, temp2, param_2, speed, 0.0f, -1.0f, pSoundAnimRes); if(field_0xD64 == 0x13) { - mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_TATEATTACK), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f, NULL); + mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_TATEATTACK), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f, NULL); } else if(field_0xD64 == 0x14) { - mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_YOKOATTACK), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f, NULL); + mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_YOKOATTACK), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f, NULL); } return true; @@ -3171,7 +3171,7 @@ BOOL daNpc_Ji1_c::CreateHeap() { modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("Ji", JI_BCK_WAIT01)), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, dComIfG_getObjectRes("Ji", JI_BAS_WAIT01), 0x00000000, 0x11020203 @@ -3204,7 +3204,7 @@ BOOL daNpc_Ji1_c::CreateHeap() { static_cast(dComIfG_getObjectRes("Ji", JI_BDL_JI_YARI)), NULL, NULL, static_cast(dComIfG_getObjectRes("Ji", JI_BCK_JIYARI_TATEATTACK)), - J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1, 1, + J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, 0, 0x00000000, 0x11020203 @@ -3224,8 +3224,8 @@ BOOL daNpc_Ji1_c::CreateHeap() { J3DAnmTextureSRTKey* a_btk = static_cast(dComIfG_getObjectRes("Ji", JI_BTK_YJITR00)); JUT_ASSERT(0x15D0, a_btk != NULL); - int temp1 = field_0x3FC.init(modelData, a_brk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); - int temp2 = field_0x418.init(modelData, a_btk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + int temp1 = field_0x3FC.init(modelData, a_brk, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + int temp2 = field_0x418.init(modelData, a_btk, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); if(field_0x3F8 == 0 || temp1 == 0 || temp2 == 0) { return false; @@ -3234,7 +3234,7 @@ BOOL daNpc_Ji1_c::CreateHeap() { headTexPattern = static_cast(dComIfG_getObjectRes("Ji", JI_BTP_JI)); JUT_ASSERT(0x15D8, headTexPattern != NULL); - if(field_0x3D8.init(modelData, headTexPattern, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0) == 0) { + if(field_0x3D8.init(modelData, headTexPattern, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0) == 0) { return false; } diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index a15b68775..5d477b605 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -219,7 +219,7 @@ BOOL daNpc_kam_c::createHeap() { modelData, NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Kamome", KAMOME_BCK_KA_WAIT1), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, 0x11000002 @@ -1118,21 +1118,21 @@ void daNpc_kam_c::setAnm(int anmIdx) { static anmPrm_c l_anmPrm[] = { { /* mAnmTblIdx */ 0, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e, + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, /* m10 */ 0, }, { /* mAnmTblIdx */ 1, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e, + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, /* m10 */ 0, }, { /* mAnmTblIdx */ 2, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e, + /* mLoopMode */ J3DFrameCtrl::EMode_NONE, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, /* m10 */ 0, diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index e672e2c60..e93f6ec1e 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -761,7 +761,7 @@ BOOL daNpc_Md_c::createHeap() { NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes(mModelArcName, wait_anim_name), NULL, - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, 0x11020022 @@ -807,7 +807,7 @@ BOOL daNpc_Md_c::createHeap() { NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes(mModelArcName, arm_wait_anim_name), NULL, - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 0, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0x00000000, 0x11020203 @@ -836,7 +836,7 @@ BOOL daNpc_Md_c::createHeap() { modelData, NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes(mModelArcName, "mdwing_wait01.bck"), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 0, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0x00000000, 0x11020203 @@ -2410,7 +2410,7 @@ BOOL daNpc_Md_c::initTexPatternAnm(u8 btpAnmTblIdx, bool param_2) { bool ret = false; J3DAnmTexPattern* eyeTexPtrn = (J3DAnmTexPattern*)dComIfG_getObjectRes(mModelArcName, btpAnmTbl[btpAnmTblIdx].m00); JUT_ASSERT(7502, eyeTexPtrn != NULL); - if (m0520.init(modelData, eyeTexPtrn, TRUE, J3DFrameCtrl::LOOP_ONCE_RESET_e, 1.0f, 0, -1, param_2, 0)) { + if (m0520.init(modelData, eyeTexPtrn, TRUE, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, param_2, 0)) { m3112 = eyeTexPtrn->getFrameMax(); m3133 = 0; m3136 = btpAnmTbl[btpAnmTblIdx].m20; @@ -2430,7 +2430,7 @@ void daNpc_Md_c::playTexPatternAnm() { if (m0520.play()) { if (cLib_calcTimer(&m3133) == 0) { m3133 = 30.0f + cM_rndF(60.0f); - m0520.initPlay(m3112, J3DFrameCtrl::LOOP_ONCE_RESET_e, 1.0f, 0, -1, true); + m0520.initPlay(m3112, J3DFrameCtrl::EMode_RESET, 1.0f, 0, -1, true); } } } @@ -2502,56 +2502,56 @@ BOOL daNpc_Md_c::setAnm(int anmIdx) { {"md_unazuki.bck", ""}, }; static anm_prm l_anmPrm[] = { - {0x00, 0x00, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x00, 0x00, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, - {0x01, 0x01, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 4.0f, 1.0f}, - {0x02, 0x02, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 4.0f, 1.0f}, - {0x03, 0x03, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 4.0f, 1.0f}, - {0x04, 0x04, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 4.0f, 1.0f}, - {0x05, 0x81, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 1.0f}, - {0x06, 0x82, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f}, - {0x06, 0x82, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f}, - {0x07, 0x83, 0x03, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x07, 0x83, 0x03, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, - {0x08, 0x84, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 4.0f, 1.0f}, - {0x09, 0x05, 0x01, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x0A, 0x06, 0x02, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x0B, 0x07, 0x06, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 1.0f}, - {0x0C, 0x08, 0x07, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 1.0f}, - {0x0D, 0x09, 0x06, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 1.0f}, - {0x0E, 0x0A, 0x05, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x0F, 0x0B, 0x04, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, - {0x0F, 0x0B, 0x04, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, -1.0f}, - {0x10, 0x0C, 0x08, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x11, 0x0D, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, - {0x12, 0x0E, 0x09, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x13, 0x0F, 0x09, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x14, 0x10, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, - {0x15, 0x85, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, - {0x16, 0x11, 0x0A, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, - {0x17, 0x12, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x18, 0x13, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x19, 0x14, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x1A, 0x15, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x1B, 0x16, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.4f}, - {0x1C, 0x17, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 0.0f}, - {0x1B, 0x16, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, -1.4f}, - {0x1D, 0x18, 0x0B, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x1E, 0x19, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x1F, 0x86, 0x0C, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x20, 0x87, 0x0C, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x17, 0x12, 0x05, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x21, 0x1A, 0x0D, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x22, 0x1B, 0x00, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, - {0x1A, 0x15, 0x05, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, - {0x23, 0x1C, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x24, 0x1D, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x25, 0x1E, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x25, 0x1E, 0x05, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x07, 0x83, 0x03, J3DFrameCtrl::LOOP_REPEAT_e, 8.0f, 1.0f}, - {0x04, 0x04, 0x05, J3DFrameCtrl::LOOP_REPEAT_e, 4.0f, 1.0f}, - {0x00, 0x00, 0x00, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f}, - {0x26, 0x1F, 0x0F, J3DFrameCtrl::LOOP_ONCE_e, 8.0f, 1.0f}, + {0x00, 0x00, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x00, 0x00, 0x00, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, + {0x01, 0x01, 0x00, J3DFrameCtrl::EMode_LOOP, 4.0f, 1.0f}, + {0x02, 0x02, 0x00, J3DFrameCtrl::EMode_NONE, 4.0f, 1.0f}, + {0x03, 0x03, 0x00, J3DFrameCtrl::EMode_LOOP, 4.0f, 1.0f}, + {0x04, 0x04, 0x00, J3DFrameCtrl::EMode_LOOP, 4.0f, 1.0f}, + {0x05, 0x81, 0x00, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f}, + {0x06, 0x82, 0x00, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f}, + {0x06, 0x82, 0x00, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f}, + {0x07, 0x83, 0x03, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x07, 0x83, 0x03, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, + {0x08, 0x84, 0x00, J3DFrameCtrl::EMode_LOOP, 4.0f, 1.0f}, + {0x09, 0x05, 0x01, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x0A, 0x06, 0x02, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x0B, 0x07, 0x06, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f}, + {0x0C, 0x08, 0x07, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f}, + {0x0D, 0x09, 0x06, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f}, + {0x0E, 0x0A, 0x05, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x0F, 0x0B, 0x04, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, + {0x0F, 0x0B, 0x04, J3DFrameCtrl::EMode_NONE, 8.0f, -1.0f}, + {0x10, 0x0C, 0x08, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x11, 0x0D, 0x00, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, + {0x12, 0x0E, 0x09, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x13, 0x0F, 0x09, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x14, 0x10, 0x00, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, + {0x15, 0x85, 0x00, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, + {0x16, 0x11, 0x0A, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, + {0x17, 0x12, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x18, 0x13, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x19, 0x14, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x1A, 0x15, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x1B, 0x16, 0x00, J3DFrameCtrl::EMode_NONE, 8.0f, 1.4f}, + {0x1C, 0x17, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 0.0f}, + {0x1B, 0x16, 0x00, J3DFrameCtrl::EMode_NONE, 8.0f, -1.4f}, + {0x1D, 0x18, 0x0B, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x1E, 0x19, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x1F, 0x86, 0x0C, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x20, 0x87, 0x0C, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x17, 0x12, 0x05, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x21, 0x1A, 0x0D, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x22, 0x1B, 0x00, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, + {0x1A, 0x15, 0x05, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, + {0x23, 0x1C, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x24, 0x1D, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x25, 0x1E, 0x00, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x25, 0x1E, 0x05, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x07, 0x83, 0x03, J3DFrameCtrl::EMode_LOOP, 8.0f, 1.0f}, + {0x04, 0x04, 0x05, J3DFrameCtrl::EMode_LOOP, 4.0f, 1.0f}, + {0x00, 0x00, 0x00, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f}, + {0x26, 0x1F, 0x0F, J3DFrameCtrl::EMode_NONE, 8.0f, 1.0f}, }; static anm_tbl armAnmTbl[] = { {"mdarm_wait01.bck", ""}, diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 480f9f1e9..955ccfc79 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -239,7 +239,7 @@ BOOL daNpc_Os_c::createHeap() { modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("Os", OS_BCK_OS_MOVE01)), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, 0x11000002 @@ -1608,35 +1608,35 @@ void daNpc_Os_c::setAnm(int param_1) { static anmPrm_c l_anmPrm[] = { { /* mAnmTblIdx */ 0, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e, + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP, /* mMorf */ 8.0f, /* mPlaySpeed */ 0.0f, /* m10 */ 0, }, { /* mAnmTblIdx */ 1, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e, + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP, /* mMorf */ 8.0f, /* mPlaySpeed */ 2.0f, /* m10 */ 0, }, { /* mAnmTblIdx */ 2, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e, + /* mLoopMode */ J3DFrameCtrl::EMode_NONE, /* mMorf */ 0.0f, /* mPlaySpeed */ 1.0f, /* m10 */ 0, }, { /* mAnmTblIdx */ 2, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e, + /* mLoopMode */ J3DFrameCtrl::EMode_NONE, /* mMorf */ 0.0f, /* mPlaySpeed */ -1.0f, /* m10 */ 0, }, { /* mAnmTblIdx */ 2, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e, + /* mLoopMode */ J3DFrameCtrl::EMode_NONE, /* mMorf */ 0.0f, /* mPlaySpeed */ 0.0f, /* m10 */ -1, @@ -1682,15 +1682,15 @@ BOOL daNpc_Os_c::initBrkAnm(u8 param_1, bool param_2) { }; // Size: 0x10 static AnmTableEntry brkAnmTbl[] = { - {OS_BRK_TURN_OFF, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0}, - {OS_BRK_TURN_OFF, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1}, - {OS_BRK_OS_AWAKE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0}, - {OS_BRK_OS_AWAKE, J3DFrameCtrl::LOOP_ONCE_e, -1.0f, 0}, - {OS_BRK_TURN_ON, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0}, - {OS_BRK_TURN_ON, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0}, - {OS_BRK_TENMETU, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0}, - {OS_BRK_OS_AWAKE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, -1}, - {OS_BRK_LINK, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0}, + {OS_BRK_TURN_OFF, J3DFrameCtrl::EMode_NONE, 1.0f, 0}, + {OS_BRK_TURN_OFF, J3DFrameCtrl::EMode_NONE, 1.0f, -1}, + {OS_BRK_OS_AWAKE, J3DFrameCtrl::EMode_NONE, 1.0f, 0}, + {OS_BRK_OS_AWAKE, J3DFrameCtrl::EMode_NONE, -1.0f, 0}, + {OS_BRK_TURN_ON, J3DFrameCtrl::EMode_NONE, 1.0f, 0}, + {OS_BRK_TURN_ON, J3DFrameCtrl::EMode_NONE, 0.0f, 0}, + {OS_BRK_TENMETU, J3DFrameCtrl::EMode_LOOP, 1.0f, 0}, + {OS_BRK_OS_AWAKE, J3DFrameCtrl::EMode_NONE, 0.0f, -1}, + {OS_BRK_LINK, J3DFrameCtrl::EMode_LOOP, 1.0f, 0}, }; J3DModelData* modelData = mpMorf->getModel()->getModelData(); diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index d536f7804..f6891c1b6 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -4200,7 +4200,7 @@ BOOL daNpcPeople_c::createHeap() { modelData, NULL, NULL, (J3DAnmTransformKey*)(dComIfG_getObjectIDRes(l_arcname_tbl[mNpcType], getBck(m793))), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, l_diff_flag_tbl[mNpcType] @@ -4223,7 +4223,7 @@ BOOL daNpcPeople_c::createHeap() { headModelData, NULL, NULL, (J3DAnmTransformKey*)(dComIfG_getObjectIDRes(l_arcname_tbl[mNpcType], getHeadBck(m793))), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, l_head_diff_flag_tbl[mNpcType] diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 1b2d04bf2..2d8b8ba51 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -1633,7 +1633,7 @@ BOOL daNpcRoten_c::createHeap() { modelData, NULL, NULL, (J3DAnmTransformKey*)(dComIfG_getObjectIDRes(l_arcname_tbl[mNpcNo], l_bck_ix_tbl[mNpcNo][field_0x9C0])), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, l_diff_flag_tbl[mNpcNo] @@ -1648,7 +1648,7 @@ BOOL daNpcRoten_c::createHeap() { headModelData, NULL, NULL, (J3DAnmTransformKey*)(dComIfG_getObjectIDRes(l_arcname_tbl[mNpcNo], l_head_bck_ix_tbl[mNpcNo])), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, 0x37441422 @@ -1998,7 +1998,7 @@ void daNpcRoten_c::executeTurn() { s32 daNpcRoten_c::executeWindInit() { setAnmTbl(l_npc_anm_wind); J3DAnmTransform* pAnmRes = static_cast(dComIfG_getObjectIDRes(l_arcname_tbl[mNpcNo], l_head_bck_ix_tbl[mNpcNo])); - field_0x6D8->setAnm(pAnmRes, J3DFrameCtrl::LOOP_ONCE_e, 14.0f, 1.0f, 0.0f, 39.0f, NULL); + field_0x6D8->setAnm(pAnmRes, J3DFrameCtrl::EMode_NONE, 14.0f, 1.0f, 0.0f, 39.0f, NULL); return 4; } @@ -2689,7 +2689,7 @@ BOOL daNpcRoten_c::initTexPatternAnm(bool modify) { m_head_tex_pattern = static_cast(dComIfG_getObjectIDRes(l_arcname_tbl[mNpcNo], l_btp_ix_tbl[mNpcNo])); JUT_ASSERT(0xBFF, m_head_tex_pattern != NULL); - if(!mBtpAnm.init(modelData, m_head_tex_pattern, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, modify, 0)) { + if(!mBtpAnm.init(modelData, m_head_tex_pattern, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, modify, 0)) { return false; } diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index fd6a1a4d9..f0d165eaf 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -34,7 +34,7 @@ bool daObjAjavW_c::create_heap() { ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222); - s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, AJAVW_DZB_AJAVW), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx()); if (!mpModel || !btkRet || !mpBgW) diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index 99ae6f413..98b8ac7a7 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -47,7 +47,7 @@ bool daObjVteng_c::create_heap() { pModelData, NULL, NULL, pAnm, - J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0x3B, -1, 0, + J3DFrameCtrl::EMode_NONE, 1.0f, 0x3B, -1, 0, NULL, 0x00000000, 0x11020203 diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index a65ea7f5c..f3ac22b85 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -33,11 +33,11 @@ BOOL daObjYboil_c::CreateHeap() { if (mModel[i] == NULL) return FALSE; - if (!mBckAnm[i].init(modelData, bck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) + if (!mBckAnm[i].init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) return FALSE; - if (!mBtkAnm[i].init(modelData, btk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) + if (!mBtkAnm[i].init(modelData, btk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) return FALSE; - if (!mBrkAnm[i].init(modelData, brk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) + if (!mBrkAnm[i].init(modelData, brk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) return FALSE; } diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 02b342d10..e2ff0247d 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -54,8 +54,8 @@ bool daObjYgush00_c::create_heap() { ret = false; } else { mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222); - s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); - s32 bckRet = mBckAnm.init(pModelData, pBck, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false); + s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); + s32 bckRet = mBckAnm.init(pModelData, pBck, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); if (!mpModel || !btkRet || !bckRet) ret = false; diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 59bc66b02..62ab0dcee 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -109,9 +109,9 @@ bool daObjBarrier_anm_c::init() { } else { mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x1000200); BOOL btk_init = - mBtk.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + mBtk.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); BOOL brk_init = - mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); if (mpModel == NULL || !btk_init || !brk_init) { rt = false; @@ -383,11 +383,11 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente J3DAnmTevRegKey* brk_anm_p = static_cast(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00)); JUT_ASSERT(947, brk_anm_p != NULL); - mBtk[effect_idx].init(modelData, btk_anm_p, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, + mBtk[effect_idx].init(modelData, btk_anm_p, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0); - mBck[effect_idx].init(modelData, bck_anm_p, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1, + mBck[effect_idx].init(modelData, bck_anm_p, TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, true); - mBrk[effect_idx].init(modelData, brk_anm_p, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1, + mBrk[effect_idx].init(modelData, brk_anm_p, TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, true, 0); mDoMtx_stack_c::transS(pos.x, pos.y, pos.z); @@ -414,11 +414,11 @@ bool daObjBarrier_ef_c::init() { mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x5020200); setDummyTexture(i); - BOOL btk_init = mBtk[i].init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, + BOOL btk_init = mBtk[i].init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); BOOL bck_init = - mBck[i].init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1, false); - BOOL brk_init = mBrk[i].init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, + mBck[i].init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, false); + BOOL brk_init = mBrk[i].init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, false, 0); if (mpModel[i] == NULL || !btk_init || !bck_init || !brk_init) { diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index 9110509b5..2806bae87 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -28,7 +28,7 @@ BOOL daObjDmgroom_c::CreateHeap() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BRK_DMGROOM)); JUT_ASSERT(0x5c, brk != NULL); - if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) + if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index 763c8081a..6b72fafca 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -957,7 +957,7 @@ BOOL daObjFigure_c::createHeap() { return false; } - if(!mpBrkAnm->init(pModelData, pBrkData, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if(!mpBrkAnm->init(pModelData, pBrkData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { return false; } } @@ -967,7 +967,7 @@ BOOL daObjFigure_c::createHeap() { p1, NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectIDRes(arcname, 0), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11001222 @@ -1002,7 +1002,7 @@ BOOL daObjFigure_c::createHeap() { return false; } - if(!mBtpAnm1.init(pPedestalData, mpPedestalBtp, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if(!mBtpAnm1.init(pPedestalData, mpPedestalBtp, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { return false; } diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index 72b9e533a..cc0f2434b 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -47,7 +47,7 @@ bool daObjGong::Act_c::create_heap() { modelData, NULL, NULL, bck, - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 0, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0x00000000, 0x11020203 diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index 9bc32e452..20a0ec240 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -33,7 +33,7 @@ BOOL daObjGryw00_c::setup_high_water_level_btk_anm() { BOOL ret = TRUE; J3DAnmTextureSRTKey* btk_anm_p = static_cast(dComIfG_getObjectRes(l_arcname, GRYW00_BTK_GRYW00)); JUT_ASSERT(223, btk_anm_p != NULL); - if (!mBtk.init(mpModel->getModelData(), btk_anm_p, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0x191, -1, -1, 0)) { + if (!mBtk.init(mpModel->getModelData(), btk_anm_p, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0x191, -1, -1, 0)) { ret = FALSE; } return ret; @@ -102,9 +102,9 @@ int daObjGryw00_c::CreateHeap() { } else { mpModel = mDoExt_J3DModel__create(mdlData, 0x80000U, 0x11000222U); BOOL btk_inited = mBtk.init(mpModel->getModelData(), pbtk, TRUE, - J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, 0x190, FALSE, 0); + J3DFrameCtrl::EMode_NONE, 0.0f, 0, 0x190, FALSE, 0); BOOL bck_inited = mBck.init(mpModel->getModelData(), pbck, TRUE, - J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1, FALSE); + J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, FALSE); if (!mpModel || !btk_inited || !bck_inited) { ret = FALSE; } diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp index 1582d362a..b37ce8fb2 100644 --- a/src/d/actor/d_a_obj_hat.cpp +++ b/src/d/actor/d_a_obj_hat.cpp @@ -84,7 +84,7 @@ BOOL daObjHat_c::createHeap() { mDoExt_McaMorf* morf = new mDoExt_McaMorf( pModelData, NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectIDRes("Ro", l_bck_ix_tbl[mHatNo]), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422); + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, 0x37441422); mpMorf = morf; if (mpMorf == NULL || mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index b9d1eef53..07521f959 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -73,7 +73,7 @@ const dCcD_SrcSph daObjHha_c::M_sph_data = { const HHA_RES_FILE_ID l_daObjHha_bdl_idx_table[2] = {HHA_BDL_HHA1, HHA_BDL_HHA2}; const HHA_RES_FILE_ID l_daObjHha_dzb_idx_table[2] = {HHA_DZB_HHA1, HHA_DZB_HHA2}; const HHA_RES_FILE_ID l_daObjHha_btk_idx_table[2] = {HHA_BTK_YSWTR00_01, HHA_BTK_YSWTR00_02}; -const J3DFrameCtrl::Attribute_e l_daObjHha_btk_mode_table[2] = {J3DFrameCtrl::LOOP_REPEAT_e, J3DFrameCtrl::LOOP_ONCE_e}; +const J3DFrameCtrl::Attribute_e l_daObjHha_btk_mode_table[2] = {J3DFrameCtrl::EMode_LOOP, J3DFrameCtrl::EMode_NONE}; const u16 l_daObjHha_splash_id_table[] = { dPa_name::ID_SCENE_810D, dPa_name::ID_SCENE_810E, @@ -201,11 +201,11 @@ BOOL daObjHhaYgush_c::create_area(const char* arcname) { J3DAnmTextureSRTKey* btk_data = static_cast(dComIfG_getObjectRes(arcname, HHA_BTK_YGSTP00)); JUT_ASSERT(0x290, btk_data != NULL); - if(mBtk.init(M_mdl->getModelData(), btk_data, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, false) != false){ + if(mBtk.init(M_mdl->getModelData(), btk_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, false) != false){ J3DAnmTransform* bck_data = static_cast(dComIfG_getObjectRes(arcname, HHA_BCK_YGSTP00)); JUT_ASSERT(0x295, bck_data != NULL); - if(mBck.init(M_mdl->getModelData(), bck_data, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false) != false){ + if(mBck.init(M_mdl->getModelData(), bck_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) != false){ ret = TRUE; } } diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index e93bcd80a..95049ac2b 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -579,7 +579,7 @@ void daObjTpost_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP }, { // AnmPrm_POST_GET0 @@ -588,7 +588,7 @@ void daObjTpost_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 0.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_POST_GET1 @@ -597,7 +597,7 @@ void daObjTpost_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_POST_PUTOUT @@ -606,7 +606,7 @@ void daObjTpost_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_POST_WAIT @@ -615,7 +615,7 @@ void daObjTpost_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP }, }; diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index fbcf1fc2b..db78e1b7a 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -92,7 +92,7 @@ BOOL daObjVgnfd_c::create_bdl_brk(int i) { J3DAnmTevRegKey* brk_p = (J3DAnmTevRegKey*)dComIfG_getObjectRes(M_arcname, M_brk_table[i]); JUT_ASSERT(0x105, brk_p != NULL); if (brk_p != NULL) { - if (mBrkAnm[i].init(mdl_data, brk_p, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, FALSE)) + if (mBrkAnm[i].init(mdl_data, brk_p, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) ret = TRUE; } } else { @@ -136,7 +136,7 @@ BOOL daObjVgnfd_c::create_heap() { J3DAnmTextureSRTKey* btk_data = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(M_arcname, VGNFD_BTK_YGCBD00); JUT_ASSERT(0x144, btk_data != NULL); - if (btk_data == NULL || !mBtkAnm.init(mModel2[1]->getModelData(), btk_data, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, FALSE)) { + if (btk_data == NULL || !mBtkAnm.init(mModel2[1]->getModelData(), btk_data, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, FALSE)) { ret = FALSE; } } diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index 70ef06238..0c0930d4f 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -70,7 +70,7 @@ bool daObjVmc::Act_c::create_heap() { { J3DAnmTransform* bck_wg = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, VMC_BCK_VMCWG); JUT_ASSERT(215, bck_wg != NULL); - BOOL ret = mBckAnmGrow.init(mdl_wd_data, bck_wg, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false); + BOOL ret = mBckAnmGrow.init(mdl_wd_data, bck_wg, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); mBckAnmGrow.setPlaySpeed(0.75f); if (!ret) return false; @@ -79,7 +79,7 @@ bool daObjVmc::Act_c::create_heap() { { J3DAnmTransform* bck_wh = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, VMC_BCK_VMCWH); JUT_ASSERT(226, bck_wh != NULL); - if (!mBckAnmHookshot.init(mdl_wd_data, bck_wh, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) + if (!mBckAnmHookshot.init(mdl_wd_data, bck_wh, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) return false; } @@ -225,7 +225,7 @@ void daObjVmc::Act_c::daObjVmc_tree_main() { if (mCyl.ChkCoHit()) { J3DAnmTransform* bck_wh = (J3DAnmTransform*)dComIfG_getObjectRes(M_arcname, VMC_BCK_VMCWH); JUT_ASSERT(0x1ad, bck_wh != NULL); - mBckAnmHookshot.init(mModelTree->getModelData(), bck_wh, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, true); + mBckAnmHookshot.init(mModelTree->getModelData(), bck_wh, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true); mHookshotAnim = true; } } else { diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 6273a7344..5ed291be6 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -74,7 +74,7 @@ bool daObjZouk::Act_c::create_heap() { mdl_data, NULL, NULL, M_bck_data, - J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, 1, NULL, 0x00000000, 0x11020203 diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 7f6a560a3..24f1bc03f 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -338,10 +338,10 @@ BOOL daPds_c::initBrkAnm(u8 param_1, bool param_2) { }; // Size: 0x0C static AnmTableEntry brkAnmTbl[] = { - {J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0}, - {J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0}, - {J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0}, - {J3DFrameCtrl::LOOP_ONCE_e, 0.0f, -1}, + {J3DFrameCtrl::EMode_LOOP, 1.0f, 0}, + {J3DFrameCtrl::EMode_NONE, 0.0f, 0}, + {J3DFrameCtrl::EMode_NONE, 0.0f, 0}, + {J3DFrameCtrl::EMode_NONE, 0.0f, -1}, }; J3DModelData* modelData = mpModel->getModelData(); diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 2ad14c9db..c831fe23b 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -87,7 +87,7 @@ void daPy_lk_c::setParachuteFanModel(f32 f31) { mpParachuteFanMorf = new mDoExt_McaMorf( modelData, NULL, NULL, bck, - J3DFrameCtrl::LOOP_ONCE_e, daPy_HIO_fan_c0::m.field_0x20, f31, daPy_HIO_fan_c0::m.field_0x4, 0, + J3DFrameCtrl::EMode_NONE, daPy_HIO_fan_c0::m.field_0x20, f31, daPy_HIO_fan_c0::m.field_0x4, 0, NULL, 0x00000000, 0x11020203 diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index da2891ba3..b526d9c35 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -3990,7 +3990,7 @@ BOOL daPy_lk_c::createHeap() { tmp_modelData = initModel(&mpSwgripmsModel, LINK_BDL_SWGRIPMS, 0x37221222); bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_SWGRIPMSAB); - ret = mSwgripmsabBckAnim.init(mpSwgripmsModel->getModelData(), bck, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false); + ret = mSwgripmsabBckAnim.init(mpSwgripmsModel->getModelData(), bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); if (!ret) { JUT_ASSERT(21046, FALSE); } mpTswgripmsabBrk = entryBrk(tmp_modelData, LINK_BRK_TSWGRIPMSAB); mpTswgripmsBtk = entryBtk(tmp_modelData, LINK_BTK_TSWGRIPMS); @@ -3999,7 +3999,7 @@ BOOL daPy_lk_c::createHeap() { tmp_modelData = initModel(&mpShaModel, LINK_BDL_SHA, 0x37221222); bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_ATNGSHA); - ret = mAtngshaBck.init(mpShaModel->getModelData(), bck, false, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false); + ret = mAtngshaBck.init(mpShaModel->getModelData(), bck, false, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false); if (!ret) { JUT_ASSERT(21063, FALSE); } tmp_modelData = initModel(&mpShmsModel, LINK_BDL_SHMS, 0x37221222); @@ -4019,7 +4019,7 @@ BOOL daPy_lk_c::createHeap() { tmp_modelData = initModel(&mpYuchw00Model, LINK_BDL_YUCHW00, 0x13000222); bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_YUCHW00); - ret = mYuchw00Bck.init(tmp_modelData, bck, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false); + ret = mYuchw00Bck.init(tmp_modelData, bck, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); if (!ret) { JUT_ASSERT(21113, FALSE); } mpYuchw00Btk = entryBtk(tmp_modelData, LINK_BTK_YUCHW00); mpYuchw00Brk = entryBrk(tmp_modelData, LINK_BRK_YUCHW00); @@ -4039,14 +4039,14 @@ BOOL daPy_lk_c::createHeap() { } mpYaura00Btk = entryBtk(tmp_modelData, LINK_BTK_YAURA00); brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, LINK_BRK_YAURA00_R); - ret = mYaura00rBrk.init(tmp_modelData, brk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + ret = mYaura00rBrk.init(tmp_modelData, brk, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); if (!ret) { JUT_ASSERT(21147, FALSE); } mYaura00rBrk.entryFrame(0.0f); tmp_modelData = initModel(&mpYmgcs00Model, LINK_BDL_YMGCS00, 0x11001222); mpYmgcs00Btk = entryBtk(tmp_modelData, LINK_BTK_YMGCS00); brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, LINK_BRK_YMGCS00_MS); - ret = mYmgcs00Brk.init(tmp_modelData, brk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + ret = mYmgcs00Brk.init(tmp_modelData, brk, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); if (!ret) { JUT_ASSERT(21161, FALSE); } mYmgcs00Brk.entryFrame(0.0f); @@ -4525,7 +4525,7 @@ void daPy_lk_c::initSeAnime() { mJAIZelAnime.initActorAnimSound(m_sanm_buffer, direction, loop); } - if (mpSeAnmFrameCtrl->getAttribute() == J3DFrameCtrl::LOOP_REPEAT_e) { + if (mpSeAnmFrameCtrl->getAttribute() == J3DFrameCtrl::EMode_LOOP) { f32 position = mpSeAnmFrameCtrl->getFrame() - mpSeAnmFrameCtrl->getRate(); if (position <= mpSeAnmFrameCtrl->getStart()) { position = mpSeAnmFrameCtrl->getEnd() - position; diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc index 234761e8c..236615932 100644 --- a/src/d/actor/d_a_player_particle.inc +++ b/src/d/actor/d_a_player_particle.inc @@ -513,12 +513,12 @@ void daPy_lk_c::setAuraEffect() { } if (pYaura00Brk != curYaura00Brk) { - mYaura00rBrk.init(mMagicArmorAuraEntries[0].getModel()->getModelData(), pYaura00Brk, FALSE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, true, 0); + mYaura00rBrk.init(mMagicArmorAuraEntries[0].getModel()->getModelData(), pYaura00Brk, FALSE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0); curYaura00Brk = pYaura00Brk; } if (pYmgcs00Brk != curYmgcs00Brk) { - mYmgcs00Brk.init(mpYmgcs00Model->getModelData(), pYmgcs00Brk, FALSE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, true, 0); + mYmgcs00Brk.init(mpYmgcs00Model->getModelData(), pYmgcs00Brk, FALSE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true, 0); curYmgcs00Brk = pYmgcs00Brk; } } diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 37acd01b6..87bf9542e 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -58,7 +58,7 @@ void daPy_lk_c::setSwordModel(BOOL r28) { const sword_model_tbl_s& model_tbl = checkNormalSwordEquip() ? sword_model_tbl[0] : sword_model_tbl[1]; J3DModelData* modelData = initModel(&mpEquipItemModel, model_tbl.bladeModel, 0x37221222); - BOOL ret = mSwordAnim.init(modelData, bck, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false); + BOOL ret = mSwordAnim.init(modelData, bck, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); if (!ret) { JUT_ASSERT(86, FALSE); } if (!checkNormalSwordEquip()) { diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 6d81c6d28..d5ad2ce9e 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -176,13 +176,13 @@ void action_dousa(pw_class* i_this) { cXyz camfwd; switch (i_this->mState) { case 0: - anm_init(i_this, PW_BCK_WAIT1, 7.0, J3DFrameCtrl::LOOP_REPEAT_e, 1.0, -1); + anm_init(i_this, PW_BCK_WAIT1, 7.0, J3DFrameCtrl::EMode_LOOP, 1.0, -1); i_this->m346 = 0; i_this->mState += 1; break; case 1: if (fopAcM_searchPlayerDistance(i_this) < 500.0f) { - anm_init(i_this, PW_BCK_DERUA1, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_DERUA1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->m38C = fopAcM_searchPlayerAngleY(i_this); i_this->current.angle.y = i_this->m38C; i_this->shape_angle.y = i_this->m38C; @@ -277,7 +277,7 @@ void action_dousa(pw_class* i_this) { i_this->m38C = fopAcM_searchPlayerAngleY(i_this); i_this->current.angle.y = i_this->m38C; i_this->shape_angle.y = i_this->m38C; - anm_init(i_this, PW_BCK_DERUB2, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_DERUB2, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState = 6; } break; @@ -285,7 +285,7 @@ void action_dousa(pw_class* i_this) { i_this->m380 = 2; i_this->m346 = 1; if (fopAcM_searchPlayerDistance(i_this) < i_this->m3AC) { - anm_init(i_this, PW_BCK_DERUB1, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_DERUB1, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); i_this->mState = 7; } break; @@ -297,9 +297,9 @@ void action_dousa(pw_class* i_this) { i_this->m341 = 0; i_this->m378 = cM_rndF(60.0f) + 60.0f; if (i_this->m346 && i_this->mBckIdx != PW_BCK_WAIT1) { - anm_init(i_this, PW_BCK_WAIT1, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_WAIT1, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } else if (i_this->mBckIdx != PW_BCK_WAIT2) { - anm_init(i_this, PW_BCK_WAIT2, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_WAIT2, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } i_this->mState += 1; // Fall-through @@ -314,11 +314,11 @@ void action_dousa(pw_class* i_this) { i_this->m378 = cM_rndF(120.0f) + 120.0f; if (i_this->m346 == 1) { if (i_this->mBckIdx != PW_BCK_IDOU1) { - anm_init(i_this, PW_BCK_IDOU1, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_IDOU1, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } else { if (i_this->mBckIdx != PW_BCK_IDOU2) { - anm_init(i_this, PW_BCK_IDOU2, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_IDOU2, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); } } i_this->m38C += (s16)cM_rndFX(16384.0f); @@ -359,7 +359,7 @@ void action_dousa(pw_class* i_this) { break; case 25: i_this->m38C = fopAcM_searchPlayerAngleY(i_this); - anm_init(i_this, PW_BCK_DAMAGE_K1, 9.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_DAMAGE_K1, 9.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->speedF = -2.0f; i_this->mState += 1; break; @@ -384,11 +384,11 @@ void action_dousa(pw_class* i_this) { case 92: break; case 100: - anm_init(i_this, PW_BCK_JITTAIKA1, 6.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_JITTAIKA1, 6.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState += 1; break; case 110: - anm_init(i_this, PW_BCK_ATTACK1, 7.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1); + anm_init(i_this, PW_BCK_ATTACK1, 7.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1); // TODO i_this->mState += 1; break; @@ -403,7 +403,7 @@ void action_dousa(pw_class* i_this) { i_this->speedF = 0.0f; i_this->speed.setall(0.0f); i_this->gravity = 0.0f; - anm_init(i_this, PW_BCK_SIRIMOTI1, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); + anm_init(i_this, PW_BCK_SIRIMOTI1, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); i_this->mState += 1; case 112: // Fall-through diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 360f290d9..fb64b5fe5 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -204,7 +204,7 @@ BOOL daRd_c::_createHeap() { modelData, NULL, NULL, static_cast(dComIfG_getObjectRes(m_arc_name, RD_BCK_SUWARIP)), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, 0x37441622 @@ -220,7 +220,7 @@ BOOL daRd_c::_createHeap() { J3DAnmTextureSRTKey* btk = static_cast(dComIfG_getObjectRes(m_arc_name, RD_BTK_RD_CLOSE)); JUT_ASSERT(525, btk != NULL); - if (!mBtkAnm.init(modelData, btk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) { + if (!mBtkAnm.init(modelData, btk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { return FALSE; } @@ -228,7 +228,7 @@ BOOL daRd_c::_createHeap() { J3DAnmTevRegKey* brk = static_cast(dComIfG_getObjectRes(m_arc_name, RD_BRK_NML)); JUT_ASSERT(550, brk != NULL); - if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) { + if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) { return FALSE; } @@ -1329,10 +1329,10 @@ void daRd_c::setBrkAnm(s8 idx) { RD_BRK_BEAM_END, }; static const int a_play_mod_tbl[] = { - J3DFrameCtrl::LOOP_ONCE_e, - J3DFrameCtrl::LOOP_ONCE_e, - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_ONCE_e, + J3DFrameCtrl::EMode_NONE, + J3DFrameCtrl::EMode_NONE, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_NONE, }; J3DModel* model = mpMorf->getModel(); @@ -1355,11 +1355,11 @@ void daRd_c::setBtkAnm(s8 idx) { int loopMode; }; static const anm_prm_struct a_anm_prm_tbl[] = { - {0x01, -1, J3DFrameCtrl::LOOP_ONCE_e}, - {0x00, -1, J3DFrameCtrl::LOOP_REPEAT_e}, - {0x01, -1, J3DFrameCtrl::LOOP_REPEAT_e}, - {0x02, 0x01, J3DFrameCtrl::LOOP_ONCE_e}, - {0x03, 0x02, J3DFrameCtrl::LOOP_ONCE_e}, + {0x01, -1, J3DFrameCtrl::EMode_NONE}, + {0x00, -1, J3DFrameCtrl::EMode_LOOP}, + {0x01, -1, J3DFrameCtrl::EMode_LOOP}, + {0x02, 0x01, J3DFrameCtrl::EMode_NONE}, + {0x03, 0x02, J3DFrameCtrl::EMode_NONE}, }; if (idx != 5) { @@ -1374,7 +1374,7 @@ void daRd_c::setBtkAnm(s8 idx) { mBtkAnm.init(modelData, btk, true, a_anm_prm_tbl[m6DB].loopMode, 1.0f, 0, -1, true, 0); if (mBtkAnm.isStop()) { - if (a_anm_prm_tbl[m6DB].m01 != -1 && a_anm_prm_tbl[m6DB].loopMode == J3DFrameCtrl::LOOP_ONCE_e) { + if (a_anm_prm_tbl[m6DB].m01 != -1 && a_anm_prm_tbl[m6DB].loopMode == J3DFrameCtrl::EMode_NONE) { m6DB = a_anm_prm_tbl[m6DB].m01; } } @@ -1409,7 +1409,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP }, { // AnmPrm_TACHIP1 @@ -1418,7 +1418,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP }, { // AnmPrm_SUWARIP @@ -1427,7 +1427,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP }, { // AnmPrm_WALK2ATACK @@ -1436,7 +1436,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_ATACK @@ -1445,7 +1445,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP }, { // AnmPrm_ATACK2WALK @@ -1454,7 +1454,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_WALK @@ -1463,7 +1463,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP }, { // AnmPrm_DAMAGE @@ -1472,7 +1472,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 2.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_DEAD @@ -1481,7 +1481,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 2.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_TATSU @@ -1490,7 +1490,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 0.5f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_SUWARU @@ -1499,7 +1499,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 0.5f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_KANOKEP @@ -1508,7 +1508,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 8.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP }, { // AnmPrm_BEAM_HIT @@ -1517,7 +1517,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 2.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, { // AnmPrm_BEAM @@ -1526,7 +1526,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 2.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_REPEAT_e + /* mLoopMode */ J3DFrameCtrl::EMode_LOOP }, { // AnmPrm_BEAM_END @@ -1535,7 +1535,7 @@ void daRd_c::setAnm(s8 anmPrmIdx, bool param_2) { /* field_0x02 */ 0, /* mMorf */ 2.0f, /* mPlaySpeed */ 1.0f, - /* mLoopMode */ J3DFrameCtrl::LOOP_ONCE_e + /* mLoopMode */ J3DFrameCtrl::EMode_NONE }, }; diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 84c16f0aa..e8dea9425 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -111,12 +111,12 @@ BOOL daSwhit0_c::CreateHeap() { } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", ALWAYS_BCK_OBM_SYOUGEKISW); - if (mAnm.init(modelData, anm, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false) == 0) { + if (mAnm.init(modelData, anm, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) == 0) { return FALSE; } J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_OBM_SYOUGEKISW); - if (mTexAnm.init(modelData, texAnm, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0) == 0) { + if (mTexAnm.init(modelData, texAnm, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0) == 0) { return FALSE; } diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index 968ebfd61..c4b86f4f2 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -199,7 +199,7 @@ static BOOL daSyan_solidHeapCB(fopAc_ac_c* i_ac) { (J3DModelData*)dComIfG_getObjectRes("Syan", SYAN_BDL_SYAN), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Syan", SYAN_BCK_SYAN), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000002 + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000002 ); return i_this->morf != NULL; } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 7977ea9be..5058b0410 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -92,7 +92,7 @@ s32 daTbox_c::commonShapeSet() { // Load open animation J3DAnmTransform* openAnm = (J3DAnmTransform*)dComIfG_getObjectRes("Dalways", mdlInfo.openBckId); - if (mOpenAnm.init(modelData, openAnm, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false) == 0) { + if (mOpenAnm.init(modelData, openAnm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { return cPhs_ERROR_e; } @@ -104,7 +104,7 @@ s32 daTbox_c::commonShapeSet() { } J3DAnmTextureSRTKey* appearTexData = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dalways", mdlInfo.btkId); - if (mpAppearTexAnm->init(modelData, appearTexData, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0) == 0) { + if (mpAppearTexAnm->init(modelData, appearTexData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0) == 0) { return cPhs_ERROR_e; } @@ -119,7 +119,7 @@ s32 daTbox_c::commonShapeSet() { } J3DAnmTevRegKey* appearRegData = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", mdlInfo.brkId); - if (mpAppearRegAnm->init(modelData, appearRegData, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0) == 0) { + if (mpAppearRegAnm->init(modelData, appearRegData, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) { return cPhs_ERROR_e; } @@ -143,7 +143,7 @@ s32 daTbox_c::commonShapeSet() { } J3DAnmTevRegKey* tactPlatformBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BRK_YTRIF00); - if (mTactPlatformBrk.init(modelData, tactPlatformBrk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0) == 0) { + if (mTactPlatformBrk.init(modelData, tactPlatformBrk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) { return cPhs_ERROR_e; } } @@ -175,17 +175,17 @@ s32 daTbox_c::effectShapeSet() { } J3DAnmTransform* flashAnm = (J3DAnmTransform*)dComIfG_getObjectRes("Dalways", DALWAYS_BCK_IT_TAKARA_FLASH2); - if (mFlashAnm.init(flashModelData, flashAnm, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false) == 0) { + if (mFlashAnm.init(flashModelData, flashAnm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { return cPhs_ERROR_e; } J3DAnmTextureSRTKey* flashTexAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BTK_IT_TAKARA_FLASH); - if (mFlashTexAnm.init(flashModelData, flashTexAnm, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0) == 0) { + if (mFlashTexAnm.init(flashModelData, flashTexAnm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) { return cPhs_ERROR_e; } J3DAnmTevRegKey* flashRegAnm = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dalways", DALWAYS_BRK_IT_TAKARA_FLASH); - int regInit = mFlashRegAnm.init(flashModelData, flashRegAnm, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0); + int regInit = mFlashRegAnm.init(flashModelData, flashRegAnm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); if (regInit) { return cPhs_COMPLEATE_e; diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index ba4f13039..0f1fa2098 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -101,13 +101,13 @@ void daTitle_proc_c::proc_init3D() { J3DAnmTransform* bck_ship = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BCK_TITLE_SHIP, TLOGOE_BCK_TITLE_SHIP, TLOGOE0_BCK_TITLE_SHIP))); JUT_ASSERT(VERSION_SELECT(0xED, 0x118, 0x118), bck_ship != NULL); - BOOL ok_bck = mBckShip.init(modelData_ship, bck_ship, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false); + BOOL ok_bck = mBckShip.init(modelData_ship, bck_ship, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false); JUT_ASSERT(VERSION_SELECT(0xF4, 0x11F, 0x11F), ok_bck != FALSE); J3DAnmColor* bpk_ship = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BPK_TITLE_SHIP, TLOGOE_BPK_TITLE_SHIP, TLOGOE0_BPK_TITLE_SHIP))); JUT_ASSERT(VERSION_SELECT(0xF9, 0x124, 0x124), bpk_ship != NULL); - BOOL ok_bpk = mBpkShip.init(modelData_ship, bpk_ship, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + BOOL ok_bpk = mBpkShip.init(modelData_ship, bpk_ship, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); JUT_ASSERT(VERSION_SELECT(0xFF, 0x12A, 0x12A), ok_bpk != FALSE); mBpkShip.setFrame(0.0f); @@ -116,13 +116,13 @@ void daTitle_proc_c::proc_init3D() { J3DAnmTextureSRTKey* btk_sub = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_START_ANIM, TLOGOE_BTK_SUBTITLE_START_ANIM_E, TLOGOE0_BTK_SUBTITLE_START_ANIM_E))); JUT_ASSERT(VERSION_SELECT(0x106, 0x131, 0x131), btk_sub != NULL); - BOOL ok_btk_subtitle = mBtkSub.init(modelData_sub, btk_sub, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0); + BOOL ok_btk_subtitle = mBtkSub.init(modelData_sub, btk_sub, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); JUT_ASSERT(VERSION_SELECT(0x10D, 0x138, 0x138), ok_btk_subtitle != FALSE); J3DAnmTextureSRTKey* btk_kirari = static_cast(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_KIRARI, TLOGOE_BTK_SUBTITLE_KIRARI_E, TLOGOE0_BTK_SUBTITLE_KIRARI_E))); JUT_ASSERT(VERSION_SELECT(0x112, 0x13D, 0x13D), btk_kirari != NULL); - BOOL ok_btk_kirari = mBtkKirari.init(modelData_kirari, btk_kirari, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + BOOL ok_btk_kirari = mBtkKirari.init(modelData_kirari, btk_kirari, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); JUT_ASSERT(VERSION_SELECT(0x119, 0x144, 0x144), ok_btk_kirari != FALSE); mDoExt_restoreCurrentHeap(); diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index 0b1dc292c..c9a8854ad 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -262,11 +262,11 @@ BOOL daTornado_c::createHeap() { mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202); if (!mpModel) return FALSE; - if (!mBck.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, TRND_BCK_YTRND00), true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) + if (!mBck.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, TRND_BCK_YTRND00), true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) return FALSE; - if (!mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YTRND00), false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) + if (!mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YTRND00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) return FALSE; - if (!mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YTRND00), false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) + if (!mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YTRND00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) return FALSE; modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, TRND_BDL_YWUWT00); @@ -274,11 +274,11 @@ BOOL daTornado_c::createHeap() { mpModelUnder = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202); if (!mpModelUnder) return FALSE; - if (!mBckUnder.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, TRND_BCK_YWUWT00), false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) + if (!mBckUnder.init(modelData, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, TRND_BCK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) return FALSE; - if (!mBtkUnder.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YWUWT00), false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) + if (!mBtkUnder.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, TRND_BTK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) return FALSE; - if (!mBrkUnder.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YWUWT00), false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) + if (!mBrkUnder.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, TRND_BRK_YWUWT00), false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 5e26f324a..7a203b8de 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -75,17 +75,17 @@ BOOL daWindTag::daWindTag_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname[mType], m_btkidx[mType]); JUT_ASSERT(0x17A, pbtk != NULL); - if (!mBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) + if (!mBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) return FALSE; pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname[mType], m_btkidx2[mType]); JUT_ASSERT(0x17A, pbtk != NULL); - if (!mBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) + if (!mBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) return FALSE; J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname[mType], m_bckidx[mType]); JUT_ASSERT(0x192, pbck != NULL); - if (!mBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) + if (!mBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index fe2ed226e..ca00d08ec 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -21,8 +21,8 @@ const u32 daYgcwp_c::M_brk_table[] = { }; const u32 daYgcwp_c::M_brk_mode_table[] = { - J3DFrameCtrl::LOOP_REPEAT_e, - J3DFrameCtrl::LOOP_ONCE_e, + J3DFrameCtrl::EMode_LOOP, + J3DFrameCtrl::EMode_NONE, }; const char daYgcwp_c::M_arcname[6] = "Ygcwp"; diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 3bce13c4b..3c2b56b27 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -75,7 +75,7 @@ dAttention_c::dAttention_c(fopAc_ac_c* player, u32 playerNo) { modelData, &mCallBack, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Always", ALWAYS_BCK_YJ_LOOP), - J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x00080000, 0x01000003 diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp index c3a5ace00..90d78f8db 100644 --- a/src/d/d_door.cpp +++ b/src/d/d_door.cpp @@ -468,7 +468,7 @@ BOOL dDoor_key2_c::keyCreate_Nkey() { return FALSE; J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("Key", KEY_BCK_VLOCN); - if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) + if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) return FALSE; return TRUE; @@ -484,7 +484,7 @@ BOOL dDoor_key2_c::keyCreate_Bkey() { return FALSE; J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("Key", KEY_BCK_VLOCB); - if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) + if (!mBckAnim.init(modelData, bck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) return FALSE; J3DSkinDeform* deform = new J3DSkinDeform(); @@ -715,7 +715,7 @@ BOOL dDoor_hkyo_c::create() { return FALSE; J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Hkyo", HKYO_BRK_HKYO1B); - if (!mpBrkAnm->init(modelData, brk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) + if (!mpBrkAnm->init(modelData, brk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) return FALSE; return TRUE; @@ -739,7 +739,7 @@ void dDoor_hkyo_c::setAnm(u8 idx) { J3DModelData* modelData = mpModel->getModelData(); J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Hkyo", fileIndex); - mpBrkAnm->init(modelData, brk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, true, 0); + mpBrkAnm->init(modelData, brk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, 0); } /* 8006D3A8-8006D3B4 .text init__12dDoor_hkyo_cFv */ diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index a630ebcf1..37ab8f479 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -149,12 +149,12 @@ s32 dThunder_c::create() { J3DAnmTextureSRTKey * anm = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("Always", ALWAYS_BTK_YTHDR00); JUT_ASSERT(0x7d, anm != NULL); - if (!mModelInfo.mBtk.init(modelData, anm, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) + if (!mModelInfo.mBtk.init(modelData, anm, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) return cPhs_ERROR_e; J3DAnmTevRegKey * canm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Always", ALWAYS_BRK_YTHDR00); JUT_ASSERT(0x8c, canm != NULL); - if (!mModelInfo.mBrk.init(modelData, canm, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) + if (!mModelInfo.mBrk.init(modelData, canm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) return cPhs_ERROR_e; mBtkTime = cM_rndF(1.0f); diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index a3792ad8c..5060d4f24 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -106,7 +106,7 @@ void dLib_debugDrawFan(cXyz& center, s16 angleY, s16 fanSpreadAngle, f32 radius, bool dLib_brkInit(J3DModelData* modelData, mDoExt_brkAnm* anm, const char* arcName, int fileno) { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(arcName, fileno); JUT_ASSERT(0xae, brk != NULL); - if (anm->init(modelData, brk, 1, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0) == 0) + if (anm->init(modelData, brk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) return false; return true; } @@ -115,7 +115,7 @@ bool dLib_brkInit(J3DModelData* modelData, mDoExt_brkAnm* anm, const char* arcNa bool dLib_btkInit(J3DModelData* modelData, mDoExt_btkAnm* anm, const char* arcName, int fileno) { J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(arcName, fileno); JUT_ASSERT(0xbb, btk != NULL); - if (anm->init(modelData, btk, 1, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0) == 0) + if (anm->init(modelData, btk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0) == 0) return false; return true; } @@ -140,7 +140,7 @@ void dLib_setAnm(const char* arcName, mDoExt_McaMorf* morf, s8* pAnmIdx, s8* pPr *pOldPrmIdx = *pPrmIdx; if (morf->isStop()) { - if (anmPrmTbl[*pPrmIdx].mNextPrmIdx != -1 && anmPrmTbl[*pPrmIdx].mLoopMode == J3DFrameCtrl::LOOP_ONCE_e) { + if (anmPrmTbl[*pPrmIdx].mNextPrmIdx != -1 && anmPrmTbl[*pPrmIdx].mLoopMode == J3DFrameCtrl::EMode_NONE) { *pPrmIdx = anmPrmTbl[*pPrmIdx].mNextPrmIdx; } } @@ -159,7 +159,7 @@ void dLib_bcks_setAnm(const char* arcName, mDoExt_McaMorf* morf, s8* pAnmIdx, s8 *pOldPrmIdx = *pPrmIdx; if (morf->isStop()) { - if (anmPrmTbl[*pPrmIdx].mNextPrmIdx != -1 && anmPrmTbl[*pPrmIdx].mLoopMode == J3DFrameCtrl::LOOP_ONCE_e) { + if (anmPrmTbl[*pPrmIdx].mNextPrmIdx != -1 && anmPrmTbl[*pPrmIdx].mLoopMode == J3DFrameCtrl::EMode_NONE) { *pPrmIdx = anmPrmTbl[*pPrmIdx].mNextPrmIdx; } } diff --git a/src/d/d_material.cpp b/src/d/d_material.cpp index 26813d5f4..d5a6abac3 100644 --- a/src/d/d_material.cpp +++ b/src/d/d_material.cpp @@ -23,7 +23,7 @@ void dMat_backup_c::restore() { /* 8006F69C-8006F740 .text create__10dMat_ice_cFP16J3DMaterialTableP19J3DAnmTextureSRTKey */ void dMat_ice_c::create(J3DMaterialTable* param_1, J3DAnmTextureSRTKey* param_2) { mMaterialTable = param_1; - int rt = mBtkAnm.init(mMaterialTable, param_2, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0); + int rt = mBtkAnm.init(mMaterialTable, param_2, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0); JUT_ASSERT(98, rt != FALSE); mBtkAnm.entry(mMaterialTable, mBtkAnm.getFrameCtrl()->getFrame()); } diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index 2eaaf6591..b4e32e9c9 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -1409,7 +1409,7 @@ ShopCursor_c::ShopCursor_c(J3DModelData* modelData, J3DAnmTevRegKey* brkData, f3 } mpBrkData = brkData; - if (!mBrkAnm.init(modelData, mpBrkData, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if (!mBrkAnm.init(modelData, mpBrkData, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { mpBrkData = NULL; } diff --git a/src/d/d_wind_arrow.cpp b/src/d/d_wind_arrow.cpp index 442833289..eee0232ca 100644 --- a/src/d/d_wind_arrow.cpp +++ b/src/d/d_wind_arrow.cpp @@ -125,7 +125,7 @@ s32 dWindArrow_c::create() { J3DAnmTextureSRTKey* anm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_YA); JUT_ASSERT(0x65, anm != NULL); - if (!mModelInfo.mBtkAnm.init(modelData, anm, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { + if (!mModelInfo.mBtkAnm.init(modelData, anm, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) { return cPhs_ERROR_e; }